From: Michael Tremer Date: Tue, 25 Apr 2017 11:24:45 +0000 (+0100) Subject: captive: Import new design X-Git-Tag: v2.19-core115~60^2~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48fb1d3b6935e0c94f022df389e1212ef2dbf9d7;p=people%2Fstevee%2Fipfire-2.x.git captive: Import new design This is the new design of the access page of the captive portal. It is based on the Bootstrap 4 grid system and reboot but does not use anything else from it. It is responsive and customisable. Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index b755e6e7bb..3c8f314c30 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -93,9 +93,11 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/wlanap.cgi srv/web/ipfire/html/blob.gif #srv/web/ipfire/html/captive/assets +srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css +srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css srv/web/ipfire/html/captive/assets/captive.css srv/web/ipfire/html/captive/assets/favicon.ico -srv/web/ipfire/html/captive/assets/internet.png +srv/web/ipfire/html/captive/assets/ipfire.png srv/web/ipfire/html/captive/template.html srv/web/ipfire/html/clwarn.cgi srv/web/ipfire/html/dial.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index 9abbf97e12..8c669afcdd 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -671,6 +671,10 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive GAIN ACCESS +WARNING: untranslated string: Captive agree tac +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: bytes diff --git a/doc/language_issues.es b/doc/language_issues.es index 5008c40524..cb333db544 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -618,19 +618,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -638,7 +645,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 503ad3ed65..ccf9393218 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -628,19 +628,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -648,7 +655,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.it b/doc/language_issues.it index 2de425c2d7..e3b59adb5a 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -695,19 +695,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -715,7 +722,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f39586dca4..595971b77c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -691,19 +691,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -711,7 +718,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 5008c40524..cb333db544 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -618,19 +618,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -638,7 +645,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.ru b/doc/language_issues.ru index fa4146bf1a..239c25f31f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -620,19 +620,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -640,7 +647,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b2152225b8..a736678348 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -703,19 +703,26 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive ACTIVATE +WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive activate WARNING: untranslated string: Captive activated WARNING: untranslated string: Captive active on +WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive auth_lic WARNING: untranslated string: Captive auth_vou WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire +WARNING: untranslated string: Captive genvoucher +WARNING: untranslated string: Captive heading tac +WARNING: untranslated string: Captive heading voucher WARNING: untranslated string: Captive invalid logosize WARNING: untranslated string: Captive invalid_voucher WARNING: untranslated string: Captive logo_set WARNING: untranslated string: Captive logo_upload +WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime @@ -723,7 +730,6 @@ WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive title WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive voucher -WARNING: untranslated string: Captive voucherout WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout WARNING: untranslated string: Captive wrong ext diff --git a/doc/language_missings b/doc/language_missings index b51964b451..44b534c8dd 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -36,6 +36,7 @@ < Captive 1month < Captive 1week < Captive activate +< Captive ACTIVATE < Captive activated < Captive active on < Captive authentication @@ -44,11 +45,13 @@ < Captive config < Captive err doublevoucher < Captive expire +< Captive genvoucher < Captive invalid logosize < Captive invalid_voucher < Captive ip < Captive logo_set < Captive logo_upload +< Captive logo_upload1 < Captive mac < Captive menu < Captive noexpiretime @@ -58,7 +61,6 @@ < Captive title < Captive voactive < Captive voucher -< Captive voucherout < Captive vouchervalid < Captive vout < Captive wrong ext @@ -708,6 +710,7 @@ < Captive 1month < Captive 1week < Captive activate +< Captive ACTIVATE < Captive activated < Captive active on < Captive authentication @@ -716,11 +719,13 @@ < Captive config < Captive err doublevoucher < Captive expire +< Captive genvoucher < Captive invalid logosize < Captive invalid_voucher < Captive ip < Captive logo_set < Captive logo_upload +< Captive logo_upload1 < Captive mac < Captive menu < Captive noexpiretime @@ -730,7 +735,6 @@ < Captive title < Captive voactive < Captive voucher -< Captive voucherout < Captive vouchervalid < Captive vout < Captive wrong ext @@ -1361,6 +1365,7 @@ < Captive 1month < Captive 1week < Captive activate +< Captive ACTIVATE < Captive activated < Captive active on < Captive authentication @@ -1369,11 +1374,13 @@ < Captive config < Captive err doublevoucher < Captive expire +< Captive genvoucher < Captive invalid logosize < Captive invalid_voucher < Captive ip < Captive logo_set < Captive logo_upload +< Captive logo_upload1 < Captive mac < Captive menu < Captive noexpiretime @@ -1383,7 +1390,6 @@ < Captive title < Captive voactive < Captive voucher -< Captive voucherout < Captive vouchervalid < Captive vout < Captive wrong ext @@ -2001,6 +2007,7 @@ < Captive 1month < Captive 1week < Captive activate +< Captive ACTIVATE < Captive activated < Captive active on < Captive authentication @@ -2009,11 +2016,13 @@ < Captive config < Captive err doublevoucher < Captive expire +< Captive genvoucher < Captive invalid logosize < Captive invalid_voucher < Captive ip < Captive logo_set < Captive logo_upload +< Captive logo_upload1 < Captive mac < Captive menu < Captive noexpiretime @@ -2023,7 +2032,6 @@ < Captive title < Captive voactive < Captive voucher -< Captive voucherout < Captive vouchervalid < Captive vout < Captive wrong ext diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi index 71bff37a29..8067f25d97 100755 --- a/html/cgi-bin/captive/index.cgi +++ b/html/cgi-bin/captive/index.cgi @@ -142,10 +142,23 @@ my $tmpl = HTML::Template->new( $tmpl->param(REDIRECT_URL => $url); -$tmpl->param(AUTH => $settings{'AUTH'}); +# Voucher +if ($settings{'AUTH'} eq "VOUCHER") { + $tmpl->param(VOUCHER => 1); +} + $tmpl->param(TITLE => $settings{'TITLE'}); $tmpl->param(ERROR => $errormessage); +$tmpl->param(TAC => &gettac()); + +# Some translated strings +$tmpl->param(L_ACTIVATE => $Lang::tr{'Captive ACTIVATE'}); +$tmpl->param(L_GAIN_ACCESS => $Lang::tr{'Captive GAIN ACCESS'}); +$tmpl->param(L_HEADING_TAC => $Lang::tr{'Captive heading tac'}); +$tmpl->param(L_HEADING_VOUCHER => $Lang::tr{'Captive heading voucher'}); +$tmpl->param(L_AGREE_TAC => $Lang::tr{'Captive agree tac'}); + # Print header print "Pragma: no-cache\n"; print "Cache-control: no-cache\n"; @@ -153,7 +166,7 @@ print "Connection: close\n"; print "Content-type: text/html\n\n"; # Print rendered template -print $tmpl->output; +print $tmpl->output(); sub getcgihash { my ($hash, $params) = @_; @@ -187,11 +200,20 @@ sub getcgihash { return; } -sub getagb(){ - open( my $handle, "<:utf8", "/var/ipfire/captive/agb.txt" ) or die("$!"); - while(<$handle>){ - $_ = HTML::Entities::decode_entities($_); - print $_; - } - close( $handle ); +sub gettac() { + my @tac = (); + + open(my $handle, "<:utf8", "/var/ipfire/captive/agb.txt" ) or die("$!"); + while(<$handle>) { + $_ = HTML::Entities::decode_entities($_); + push(@tac, $_); + } + close($handle); + + my $tac = join("\n", @tac); + + # Format paragraphs + $tac =~ s/\n\n/<\/p>\n

/g; + + return $tac; } diff --git a/html/html/captive/assets/captive.css b/html/html/captive/assets/captive.css index 7e8eac6b3f..e405cc94a4 100644 --- a/html/html/captive/assets/captive.css +++ b/html/html/captive/assets/captive.css @@ -1,76 +1,161 @@ -h1{ - font-family: sans-serif; +body { + background-color: #eceff1; + color: #263238; + + display: flex; + min-height: 100vh; + flex-direction: column; } -body { - height: 100%; - background-image: url("internet.png"); - background-size: cover; /* <------ */ - background-repeat: no-repeat; - background-position: center center; +body, input { + font-family: "Ubuntu", sans-serif; + font-size: 14px; } -.title{ - position: relative; - background: #f5f5f5; - border: 1px solid #FFF; - width: 40em; - height: 6em; - left: 1em; - top: 2em; - padding-left: 2em; - padding-right: 2em; - padding-top: 0,5em; - opacity: 0.9; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - box-shadow: 1px 2px 4px rgba(0,0,0,.4); -} - -.login{ +.content { + flex: 1; +} + +.box { + margin: 272px 0 48px 0; + padding: 0 30px 48px 30px; + position: relative; - background: #f5f5f5; - border: 1px solid #FFF; - width: 40em; - left: 1em; - top: 2em; - margin-top: 0,2em; - padding-left: 2em; - padding-right: 2em; - padding-top: 1em; - text-align: left; - font-family: sans-serif; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - box-shadow: 1px 2px 4px rgba(0,0,0,.4); -} - -.agb{ + display: flex; + flex-direction: column; + background-color: white; + + border: none; + border-radius: 4px; + box-shadow: + 0 19px 38px 0 rgba(0, 0, 0, 0.3), + 0 15px 12px 0 rgba(0, 0, 0, 0.22); +} + +.box-header { + display: flex; + align-items: center; + justify-content: center; + min-height: 128px; +} + +.box-header h1 { + font-size: 40px; +} + +@media (min-width: 1200px) { + .box-header { + min-height: none; + } + + .box-header h1 { + margin-top: 24px; + margin-bottom: 20px; + } +} + +.box-block { + padding: 24px 16px 24px 16px; + margin: 0 -8px 40px -8px; + + text-align: center; + background-color: #b71c1c; + color: white; + border-radius: 4px; +} + +@media (min-width: 1200px) { + .box-block { + padding: 18px 16px 18px 16px; + margin: 0 0 48px 0; + } +} + +.box-block h4 { + font-size: 20px; +} + +footer { + height: 64px; + background-color: rgba(84, 110, 122, 0.06); /* #546e7a */ +} + +.footer { + display: flex; + align-items: center; +} + +.footer .logo { + width: 64px; + height: 64px; + padding: 8px; +} + +.form-text { + display: inline-block; + height: 36px; + + color: #263238; + background-color: rgba(38, 49, 56, 0,08); + + border: 0; + border-radius: 2px; + box-shadow: inset 0 -2px 0 0 #546e7a; +} + +.form-text .error { + box-shadow: 0 -2px 0 0 #ff3d00; +} + +.form-submit { + display: inline-block; + + font-weight: 500; + text-transform: uppercase; + + height: 36px; + padding: 0 16px 0 16px; + margin: 0 8px 0 8px; + + color: #263238; + background-color: white; + + border: none; + border-radius: 2px; + box-shadow: + 0 2px 4px 0 rgba(0, 0, 0, 0.16), + 0 1px 2px 0 rgba(0, 0, 0, 0.23); +} + +.form-submit:hover { + box-shadow: + 0 3px 6px 0 rgba(0, 0, 0, 0.16), + 0 3px 6px 0 rgba(0, 0, 0, 0.23); +} + +.form-submit:active { + background-color: black; + opacity: 0.16; + box-shadow: none; +} + +.checkbox { position: relative; - background: #f5f5f5; - border: 1px solid #FFF; - width: 40em; - left: 1em; - top: 2em; - margin-top: 0,2em; - padding-left: 2em; - padding-right: 2em; - padding-top: 1em; - text-align: left; - font-family: sans-serif; - opacity: 0.9; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - box-shadow: 1px 2px 4px rgba(0,0,0,.4); -} - -#agbtext{ - font-size: 12px; - font-weight: normal; - resize: none; - overflow-y: scroll; + display: block; + + margin-top: 20px; } +.checkbox .form-checkbox { + position: absolute; + margin-top: 1px; + margin-left: -24px; + + width: 20px; + height: 20px; + + background-color: rgba(38, 49, 56, 0.08); + + border: 2px solid #546e7a; + border-radius: 2px; +} diff --git a/html/html/captive/assets/internet.png b/html/html/captive/assets/internet.png deleted file mode 100644 index b4f20df25b..0000000000 Binary files a/html/html/captive/assets/internet.png and /dev/null differ diff --git a/html/html/captive/assets/ipfire.png b/html/html/captive/assets/ipfire.png new file mode 100644 index 0000000000..cd84ad53d5 Binary files /dev/null and b/html/html/captive/assets/ipfire.png differ diff --git a/html/html/captive/template.html b/html/html/captive/template.html index 20b79198c2..26f4142089 100644 --- a/html/html/captive/template.html +++ b/html/html/captive/template.html @@ -1 +1,72 @@ -TEMPLATE GOES HERE + + + + + <TMPL_VAR NAME="TITLE"> + + + + + + + + + + + +

+
+
+
+
+

+
+ +
+ +

+ +

+ + +
+ "> + + + + "> + + "> + + + +
+ +
+ +
+
+ + + + +
+
+
+
+ + + + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a47bc727cf..562000bf80 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -10,6 +10,7 @@ 'Captive 1day' => '1 Tag', 'Captive 1month' => '1 Monat', 'Captive 1week' => '1 Woche', +'Captive ACTIVATE' => 'AKTIVIEREN', 'Captive activate' => 'Aktivieren', 'Captive activated' => 'Aktiviert', 'Captive active on' => 'Aktiviert auf', @@ -19,6 +20,7 @@ 'Captive config' => 'Konfiguration', 'Captive err doublevoucher' => 'Ein Gutschein mit diesem Code ist bereits im Umlauf', 'Captive expire' => 'Ablauf', +'Captive genvoucher' => 'Gutschein generieren', 'Captive invalid logosize' => 'Die hochgeladene Datei entspricht nicht der vorgegeben Auflösung von mindestens 1280x400 und maximal 1920x800 Pixeln', 'Captive invalid_voucher' => 'Dieser Code ist ungültig. Bitte versuchen Sie es erneut', 'Captive ip' => 'IP-Addresse', @@ -33,7 +35,6 @@ 'Captive time' => 'Erlaubter Nutzungszeitraum nach Aktivierung (Stunden)', 'Captive title' => 'Titel der Anmeldeseite', 'Captive voactive' => 'Aktive Gutscheine', -'Captive genvoucher' => 'Gutschein generieren', 'Captive voucher' => 'Gutschein', 'Captive vouchervalid' => 'Erlaubter Zeitraum für Gutschein', 'Captive vout' => 'Ausgegebene Gutscheine', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 995685fb13..c1409570c2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -10,15 +10,21 @@ 'Captive 1day' => '1 day', 'Captive 1month' => '1 month', 'Captive 1week' => '1 week', +'Captive ACTIVATE' => 'ACTIVATE', +'Captive GAIN ACCESS' => 'GAIN ACCESS', 'Captive activate' => 'Activate', 'Captive activated' => 'Activated', 'Captive active on' => 'Activated on', +'Captive agree tac' => 'I agree with the terms & conditions below.', 'Captive auth_lic' => 'License', 'Captive auth_vou' => 'Voucher', 'Captive authentication' => 'Type of Access', 'Captive config' => 'Settings', 'Captive err doublevoucher' => 'A voucher with this code already exists', 'Captive expire' => 'Expire', +'Captive genvoucher' => 'Generate voucher', +'Captive heading tac' => 'Terms & Conditions', +'Captive heading voucher' => 'Voucher or Access Code', 'Captive invalid logosize' => 'The uploaded image file does not meet the required resolution of at least 1280x400 but not larger than 1920x800 pixels', 'Captive invalid_voucher' => 'Invalid code. Please try again', 'Captive ip' => 'IP Address', @@ -33,7 +39,6 @@ 'Captive time' => 'Access time post activation (hours)', 'Captive title' => 'Title of Login Page', 'Captive voactive' => 'Active Vouchers', -'Captive genvoucher' => 'Generate voucher', 'Captive voucher' => 'Voucher', 'Captive vouchervalid' => 'Allowed time for this voucher', 'Captive vout' => 'Issued Vouchers', diff --git a/lfs/web-user-interface b/lfs/web-user-interface index a8e3e39607..4b01eb721a 100644 --- a/lfs/web-user-interface +++ b/lfs/web-user-interface @@ -70,4 +70,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Reset permissions of redirect templates and theme directories find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755 + + # Captive Portal CSS + ln -svf --relative /usr/share/bootstrap/css/bootstrap-grid.min.css \ + /srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css + ln -svf --relative /usr/share/bootstrap/css/bootstrap-reboot.min.css \ + /srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css + @$(POSTBUILD)