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 [thread overview]
Message-ID: <1467711556-28047-1-git-send-email-alexander.marx@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2262 bytes --]
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();
#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 bd1b8e7..3b400f4 100644
--- 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 476d945..c23470a 100644
--- 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',
--
2.7.4
reply other threads:[~2016-07-05 9:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467711556-28047-1-git-send-email-alexander.marx@ipfire.org \
--to=alexander.marx@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox