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 <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 8c669afcddf1814b1902fd52b3a5354f86d72570..8e22d2b08a9b44534c3b74266e87d4fb28cc074f 100644 (file)
--- 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 8923a5854af126d4dd3f5223008a4bea9d498bcc..79767e6635773aa85f14804fd6e1de26ad6d238e 100644 (file)
--- 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 cb333db5445d30276dde9c6be0cfd187dfadd87b..1fec9c45c7236f93d89d17280320f86dd1375c76 100644 (file)
--- 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 ccf9393218950a3d24204ba03c6b0a1139e61082..06cc489ee0476e28df2ae1ea0996b506427a1f69 100644 (file)
--- 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 e3b59adb5ad38d38d7f7a4e1b0de84f7777ad81e..e3e4dae864302ea1ef44a84a4f97a089c2acf585 100644 (file)
--- 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 595971b77cfa2c079650cdd61139c715de79ccee..4a249760e54ca696fcd7ec822de9d863e548a948 100644 (file)
--- 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 cb333db5445d30276dde9c6be0cfd187dfadd87b..1fec9c45c7236f93d89d17280320f86dd1375c76 100644 (file)
--- 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 239c25f31f266d22877854c09530f57305c33c31..2ad66758efef6825f6dcbdfe85ec39577498c53b 100644 (file)
--- 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 a73667834831976342c38a9fe5fc7eaab50a9713..73a0717526cfede559b9ba393401e6083c2cf3b7 100644 (file)
--- 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 44b534c8dd0218eb6d8a8eac2c66ef327b08b905..2607199583d6f5025fe2e05725bfdd82ae8aa17c 100644 (file)
--- 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 bdded8b2a3d05dcca48d4668d18ab34445dfc9dc..ed9637f08ac4d4fe789b8f6295b9067360e50c8b 100755 (executable)
--- 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"<td><br>$Lang::tr{'no'}</td></tr>";
        }
 print<<END
+               <tr>
+                       <td>$Lang::tr{'Captive brand color'}</td>
+                       <td>
+                               <input type="color" name="COLOR" value="$settings{'COLOR'}">
+                       </td>
+               </tr>
+
                <tr>
                        <td>
                        </td>

diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index 932467eb296abaa4bd190a57a26ade4ce0ca2e1f..4e0963dd47f4a17274dfdf4cdab3aaeb6dd7659c 100755 (executable)
--- 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 369532a084e1d7207335da4af22d0fa80e9d74e2..cf0f54c707119a67fd716e31ff1e25cdb34e1e4e 100644 (file)
--- a/html/html/captive/template.html
+++ b/html/html/captive/template.html
@@ -8,6 +8,14 @@
                <link rel="stylesheet" href="../assets/bootstrap-grid.min.css">
                <link rel="stylesheet" href="../assets/captive.css">
 
+               <TMPL_IF NAME="COLOR">
+                       <style>
+                               .box-block {
+                                       background-color: <TMPL_VAR NAME="COLOR">;
+                               }
+                       </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">

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 562000bf80877710b47be888f794720a9da2e42b..fb6a429edc073ce9add513b56559b177f93f16b4 100644 (file)
--- 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 c1409570c25661216e9cbf4f577124df64a4d71b..8c5760c4071169b88df2308b747a6cfdec8311d8 100644 (file)
--- 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',