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 4a5cb6a4cc5096e5ef48ff76d9a1207b0069e310..531f8bdad50fe2f8fb38c57ba677409b2e1b74af 100644 (file)
--- 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/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
 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 f575f01ee47c4c27ac6da36155ba60c9b14229cc..6f231bc4736e2e1fe86ee8864c9f2749e123e350 100644 (file)
--- 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%;
 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 3349bb07cdc31166d8c38a284b2bca87532c3c90..04be2b1448c83f027aa66b0cf56bbd5aaceb4795 100644 (file)
--- a/html/html/captive/template.html
+++ b/html/html/captive/template.html
@@ -16,8 +16,6 @@
                        </style>
                </TMPL_IF>
 
                        </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>
 
                <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 475bb68c311339b7b9e9e9471b3f16d3cd49ae93..3e9eb9aba63f18aab1c411a93cef1f372c86e99a 100644 (file)
--- 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
 
        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)
        @$(POSTBUILD)