captive: Cleanup logo upload

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

diff --git a/doc/language_issues.de b/doc/language_issues.de
index d45948ec7f55d383aa8a5b5a98faea22c72b1294..c6de3919553157b368a0ec2dbe11d2d27ad10812 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -10,6 +10,8 @@ WARNING: translation string unused: Captive invalid logosize
 WARNING: translation string unused: Captive invalid_voucher
 WARNING: translation string unused: Captive ip
 WARNING: translation string unused: Captive logo_set
+WARNING: translation string unused: Captive logo_upload
+WARNING: translation string unused: Captive logo_upload1
 WARNING: translation string unused: Captive nr
 WARNING: translation string unused: Captive time
 WARNING: translation string unused: Captive voucher
@@ -686,6 +688,8 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive terms
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 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 6f82813f39fee8f119f2c91eb5a03be1cf66a153..307e09b3eadc57219412763b1c026b5221b0b232 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 31a1b4c2bf9975492f87ce7397f04127f720d2c6..b0cd0f3caafc7674b5e3ee62bff1273929416e7d 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -644,14 +644,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 4dad12cc1bb0f66e5ffa7c3dd31556f878bb5f04..b517978165eee996e78a23db76a4e17005702e17 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -711,14 +711,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 805d92809620702665d25df362dd77bd65f2fb4d..101b6eb6dc8545d099bba7ee932fe188fb82214b 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -707,14 +707,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6f82813f39fee8f119f2c91eb5a03be1cf66a153..307e09b3eadc57219412763b1c026b5221b0b232 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b10a7aca67bf25a34c39d064ef912e35626fac13..30973d0b7c99f22a00ca3c6d0545375eae97c438 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -636,14 +636,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 75574de50e4616c685e653293eea4bdd73959f08..3654219baa137f08f188d6944567758d12d594ab 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -719,14 +719,14 @@ WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
 WARNING: untranslated string: Captive generate coupon
 WARNING: untranslated string: Captive logo uploaded
-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
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive title
+WARNING: untranslated string: Captive upload logo
+WARNING: untranslated string: Captive upload logo recommendations
 WARNING: untranslated string: Captive voactive
 WARNING: untranslated string: Captive vouchervalid
 WARNING: untranslated string: Captive vout

diff --git a/doc/language_missings b/doc/language_missings
index dc02710dd9f4729370cc54e505ae92a4401ac5fd..3637342759b08655e4fdd0abc09e9c80f581438b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -3,6 +3,8 @@
 ############################################################################
 < addon
 < Captive genvoucher
+< Captive logo_upload
+< Captive logo_upload1
 < ccd maxclients
 < ovpn_fragment
 ############################################################################

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 99412074adcc3adaebf81b2379f5be3760c001bb..6a1467752bfd6db0db0b6f0f3efc567ac88a44fc 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -326,18 +326,13 @@ print<<END;
                        <input type="color" name="COLOR" value="$settings{'COLOR'}">
                </td>
        </tr>
-END
-
-# Logo Upload
-print <<END;
        <tr>
                <td>
-                       $Lang::tr{'Captive logo_upload'}
-                       <br>
-                       $Lang::tr{'Captive logo_upload1'}
+                       $Lang::tr{'Captive upload logo'}
                </td>
                <td>
                        <input type="file" name="logo">
+                       <br>$Lang::tr{'Captive upload logo recommendations'}
                </td>
        </tr>
 END

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 86f84b48d3fb5833628731a0163ef9bb963dbf2a..0ad852cb94e12ddf77068df07f507e5449a5719f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -35,8 +35,6 @@
 'Captive ip' => 'IP Address',
 'Captive logo uploaded' => 'Logo uploaded',
 'Captive logo_set' => 'Current Logo',
-'Captive logo_upload' => 'Upload Logo',
-'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' => 'MAC Address',
 'Captive menu' => 'Captive Portal',
 'Captive noexpiretime' => 'No valid connection time range given',
@@ -45,6 +43,8 @@
 'Captive terms' => 'Terms & Conditions',
 'Captive time' => 'Access time post activation (hours)',
 'Captive title' => 'Title of Login Page',
+'Captive upload logo' => 'Upload Logo',
+'Captive upload logo recommendations' => '(PNG or JPEG, recommended 1280x720 pixels)',
 'Captive voactive' => 'Active Vouchers',
 'Captive voucher' => 'Voucher',
 'Captive vouchervalid' => 'Allowed time for this voucher',