From f8d35875d8c83347c71a724e1d5af06d1660d4c9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 26 Apr 2017 12:03:08 +0100 Subject: [PATCH] captive: Allow selecting highlight colour in web interface To be able to customise the access page, we now allow the user to select a brand colour. Signed-off-by: Michael Tremer --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 3 +-- doc/language_issues.fr | 3 +-- doc/language_issues.it | 3 +-- doc/language_issues.nl | 3 +-- doc/language_issues.pl | 3 +-- doc/language_issues.ru | 3 +-- doc/language_issues.tr | 3 +-- doc/language_missings | 4 ++++ html/cgi-bin/captive.cgi | 8 ++++++++ html/cgi-bin/captive/index.cgi | 1 + html/html/captive/template.html | 8 ++++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 15 files changed, 34 insertions(+), 14 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 8c669afcdd..8e22d2b08a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -2,6 +2,8 @@ WARNING: translation string unused: Async logging enabled WARNING: translation string unused: Captive 1day WARNING: translation string unused: Captive 1month WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive invalid_voucher WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time diff --git a/doc/language_issues.en b/doc/language_issues.en index 8923a5854a..79767e6635 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2,6 +2,8 @@ WARNING: translation string unused: Async logging enabled WARNING: translation string unused: Captive 1day WARNING: translation string unused: Captive 1month WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive invalid_voucher WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time diff --git a/doc/language_issues.es b/doc/language_issues.es index cb333db544..1fec9c45c7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -620,13 +620,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -634,7 +634,6 @@ 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 diff --git a/doc/language_issues.fr b/doc/language_issues.fr index ccf9393218..06cc489ee0 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -630,13 +630,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -644,7 +644,6 @@ 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 diff --git a/doc/language_issues.it b/doc/language_issues.it index e3b59adb5a..e3e4dae864 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -697,13 +697,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -711,7 +711,6 @@ 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 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 595971b77c..4a249760e5 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -693,13 +693,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -707,7 +707,6 @@ 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 diff --git a/doc/language_issues.pl b/doc/language_issues.pl index cb333db544..1fec9c45c7 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -620,13 +620,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -634,7 +634,6 @@ 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 diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 239c25f31f..2ad66758ef 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -622,13 +622,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -636,7 +636,6 @@ 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 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a736678348..73a0717526 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -705,13 +705,13 @@ 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 brand color WARNING: untranslated string: Captive config WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire @@ -719,7 +719,6 @@ 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 diff --git a/doc/language_missings b/doc/language_missings index 44b534c8dd..2607199583 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -42,6 +42,7 @@ < Captive authentication < Captive auth_lic < Captive auth_vou +< Captive brand color < Captive config < Captive err doublevoucher < Captive expire @@ -716,6 +717,7 @@ < Captive authentication < Captive auth_lic < Captive auth_vou +< Captive brand color < Captive config < Captive err doublevoucher < Captive expire @@ -1371,6 +1373,7 @@ < Captive authentication < Captive auth_lic < Captive auth_vou +< Captive brand color < Captive config < Captive err doublevoucher < Captive expire @@ -2013,6 +2016,7 @@ < Captive authentication < Captive auth_lic < Captive auth_vou +< Captive brand color < Captive config < Captive err doublevoucher < Captive expire diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index bdded8b2a3..ed9637f08a 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -73,6 +73,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $settings{'AUTH'} = $cgiparams{'AUTH'}; $settings{'TITLE'} = $cgiparams{'TITLE'}; $settings{'UNLIMITED'} = $cgiparams{'UNLIMITED'}; + $settings{'COLOR'} = $cgiparams{'COLOR'}; if (!$errormessage){ #Check if we need to upload a new logo @@ -311,6 +312,13 @@ END print"
$Lang::tr{'no'}"; } print< + $Lang::tr{'Captive brand color'} + + + + + diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi index 932467eb29..4e0963dd47 100755 --- a/html/cgi-bin/captive/index.cgi +++ b/html/cgi-bin/captive/index.cgi @@ -148,6 +148,7 @@ if ($settings{'AUTH'} eq "VOUCHER") { } $tmpl->param(TITLE => $settings{'TITLE'}); +$tmpl->param(COLOR => $settings{'COLOR'}); $tmpl->param(ERROR => $errormessage); $tmpl->param(TAC => &gettac()); diff --git a/html/html/captive/template.html b/html/html/captive/template.html index 369532a084..cf0f54c707 100644 --- a/html/html/captive/template.html +++ b/html/html/captive/template.html @@ -8,6 +8,14 @@ + + + + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 562000bf80..fb6a429edc 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -17,6 +17,7 @@ 'Captive auth_lic' => 'Lizenz', 'Captive auth_vou' => 'Gutschein', 'Captive authentication' => 'Art der Anmeldung', +'Captive brand color' => 'Highlight-Farbe', 'Captive config' => 'Konfiguration', 'Captive err doublevoucher' => 'Ein Gutschein mit diesem Code ist bereits im Umlauf', 'Captive expire' => 'Ablauf', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c1409570c2..8c5760c407 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -19,6 +19,7 @@ 'Captive auth_lic' => 'License', 'Captive auth_vou' => 'Voucher', 'Captive authentication' => 'Type of Access', +'Captive brand color' => 'Brand Color', 'Captive config' => 'Settings', 'Captive err doublevoucher' => 'A voucher with this code already exists', 'Captive expire' => 'Expire', -- 2.39.2