From mboxrd@z Thu Jan 1 00:00:00 1970
From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Captive-portal: Design changes
Date: Tue, 12 Jul 2016 08:13:04 +0200
Message-ID: <1468303984-5711-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7103865481568475268=="
List-Id: <development.lists.ipfire.org>
--===============7103865481568475268==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
When choosing voucher as authentication type there is no need to display the =
license agreement textbox
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
html/cgi-bin/captive.cgi | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index a8add4d..bdded8b 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -277,10 +277,10 @@ END
=20
print<<END
<tr>
- <td>
+ <td><br>
$Lang::tr{'Captive authentication'}
</td>
- <td>
+ <td><br>
<select name=3D'AUTH' style=3D'width:8em;'>
END
;
@@ -298,11 +298,10 @@ END
</tr>
END
;
-
- &agbbox();
+ if ($settings{'AUTH'} eq 'LICENSE'){ &agbbox(); };
=20
#Logo Upload
- 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>";
+ print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive l=
ogo_upload1'}</td><td><br><INPUT TYPE=3D'file' NAME=3D'uploaded_file' SIZE=3D=
30 MAXLENGTH=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>";
--=20
2.7.4
--===============7103865481568475268==--