BUG11140: Captive logo dimensions

Now the min and max logo dimensions are shown in webinterface.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 803c03d913ef028c1998b5c9af8667e7e4e902a4..50f4795ddfe4205331486f066c735babcbcf1d49 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -307,7 +307,7 @@ END
        &agbbox();
 
        #Logo Upload
-       print "<tr><td>$Lang::tr{'Captive logo_upload'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
+       print "<tr><td>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
        #Show Logo in webinterface with 1/2 size if set
        if (-f "$logopath/logo.png"){
                print"<td>$Lang::tr{'Captive logo_set'}</td>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0fc571bca78a2724adb7841fa9eea0a47a4434b8..8cfc16b5d8de01a0a8411bd3feacb8c4a1d9ef1b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -23,7 +23,8 @@
 'Captive invalid_voucher' => 'Dieser Code ist ungültig. Bitte versuchen Sie es erneut',
 'Captive ip' => 'IP-Addresse',
 'Captive logo_set' => 'Aktuelles Logo',
-'Captive logo_upload' => 'Logo hochladen (PNG, max. 1920x800)',
+'Captive logo_upload' => 'Logo hochladen',
+'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' => 'MAC-Adresse',
 'Captive menu' => 'Captive-Portal',
 'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5d556ebef703f4c5f17c4e8ed8d56c465caa0151..135a4bc3b948936b4a85e626b0c10565ef2d7845 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -23,7 +23,8 @@
 'Captive invalid_voucher' => 'Invalid code. Please try again',
 'Captive ip' => 'IP Address',
 'Captive logo_set' => 'Current Logo',
-'Captive logo_upload' => 'Upload Logo (PNG, max. 1920x800)',
+'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',