From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Oct 2017 11:55:17 +0000 (+0100)
Subject: captive-portal: Serve Ubuntu font files locally
X-Git-Tag: v2.19-core115~60^2~1
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1f06098ba7f4894c9e3dfb744c38f6ef5c576743

captive-portal: Serve Ubuntu font files locally

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 4a5cb6a4cc..531f8bdad5 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -96,6 +96,9 @@ srv/web/ipfire/cgi-bin/wlanap.cgi
 srv/web/ipfire/html/blob.gif
 #srv/web/ipfire/html/captive
 #srv/web/ipfire/html/captive/assets
+srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
+srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
+srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
 srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css
 srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css.map
 srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css
diff --git a/html/html/captive/assets/captive.css b/html/html/captive/assets/captive.css
index f575f01ee4..6f231bc473 100644
--- a/html/html/captive/assets/captive.css
+++ b/html/html/captive/assets/captive.css
@@ -1,3 +1,21 @@
+@font-face {
+	font-family: "Ubuntu";
+	font-weight: 300;
+	src: local("Ubuntu Light"), local("Ubuntu-Light"), url("Ubuntu-L.ttf") format("truetype");
+}
+
+@font-face {
+	font-family: "Ubuntu";
+	font-weight: 400;
+	src: local("Ubuntu Regular"), local("Ubuntu-Regular"), url("Ubuntu-R.ttf") format("truetype");
+}
+
+@font-face {
+	font-family: "Ubuntu";
+	font-weight: 500;
+	src: local("Ubuntu Medium"), local("Ubuntu-Medium"), url("Ubuntu-M.ttf") format("truetype");
+}
+
 body {
 	background-image: url("../cgi-bin/logo.cgi");
 	background-size: 100%;
diff --git a/html/html/captive/template.html b/html/html/captive/template.html
index 3349bb07cd..04be2b1448 100644
--- a/html/html/captive/template.html
+++ b/html/html/captive/template.html
@@ -16,8 +16,6 @@
 			</style>
 		</TMPL_IF>
 
-		<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500" rel="stylesheet">
-
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	</head>
 
diff --git a/lfs/web-user-interface b/lfs/web-user-interface
index 475bb68c31..3e9eb9aba6 100644
--- a/lfs/web-user-interface
+++ b/lfs/web-user-interface
@@ -80,4 +80,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -svf --relative /usr/share/bootstrap/css/bootstrap-reboot.min.css.map \
 		/srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css.map
 
+	# Captive Portal Fonts
+	ln -svf --relative /usr/share/fonts/Ubuntu-L.ttf \
+		/srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
+	ln -svf --relative /usr/share/fonts/Ubuntu-M.ttf \
+		/srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
+	ln -svf --relative /usr/share/fonts/Ubuntu-R.ttf \
+		/srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
+
 	@$(POSTBUILD)