From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] BUG11140: Captive logo dimensions
Date: Tue, 05 Jul 2016 11:39:16 +0200
Message-ID: <1467711556-28047-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4288322342136520894=="
List-Id: <development.lists.ipfire.org>

--===============4288322342136520894==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/captive.cgi | 2 +-
 langs/de/cgi-bin/de.pl   | 3 ++-
 langs/en/cgi-bin/en.pl   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 803c03d..50f4795 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -307,7 +307,7 @@ END
 	&agbbox();
=20
 	#Logo Upload
-	print "<tr><td>$Lang::tr{'Captive logo_upload'}</td><td><INPUT TYPE=3D'file=
' NAME=3D'uploaded_file' SIZE=3D30 MAXLENGTH=3D80></td></tr><tr>";
+	print "<tr><td>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_=
upload1'}</td><td><INPUT TYPE=3D'file' NAME=3D'uploaded_file' SIZE=3D30 MAXLE=
NGTH=3D80></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 bd1b8e7..3b400f4 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -23,7 +23,8 @@
 'Captive invalid_voucher' =3D> 'Dieser Code ist ung=C3=BCltig. Bitte versuch=
en Sie es erneut',
 'Captive ip' =3D> 'IP-Addresse',
 'Captive logo_set' =3D> 'Aktuelles Logo',
-'Captive logo_upload' =3D> 'Logo hochladen (PNG, max. 1920x800)',
+'Captive logo_upload' =3D> 'Logo hochladen',
+'Captive logo_upload1' =3D> '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' =3D> 'MAC-Adresse',
 'Captive menu' =3D> 'Captive-Portal',
 'Captive noexpiretime' =3D> 'Es wurde kein g=C3=BCltiger Verbindungszeitraum=
 angegeben',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 476d945..c23470a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -23,7 +23,8 @@
 'Captive invalid_voucher' =3D> 'Invalid code. Please try again',
 'Captive ip' =3D> 'IP Address',
 'Captive logo_set' =3D> 'Current Logo',
-'Captive logo_upload' =3D> 'Upload Logo (PNG, max. 1920x800)',
+'Captive logo_upload' =3D> 'Upload Logo',
+'Captive logo_upload1' =3D> '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' =3D> 'MAC Address',
 'Captive menu' =3D> 'Captive Portal',
 'Captive noexpiretime' =3D> 'No valid connection time range given',
--=20
2.7.4


--===============4288322342136520894==--