From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 12 Jul 2016 06:13:04 +0000 (+0200)
Subject: Captive-portal: Design changes
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59a2d9c2d5ab9be52d437f890dcb513a0b4af0c1;p=people%2Fms%2Fipfire-2.x.git

Captive-portal: Design changes

When choosing voucher as authentication type there is no need to display the license agreement textbox

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 a8add4d87f..bdded8b2a3 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -277,10 +277,10 @@ END
 
 print<<END
 		<tr>
-			<td>
+			<td><br>
 				$Lang::tr{'Captive authentication'}
 			</td>
-			<td>
+			<td><br>
 				<select name='AUTH' style='width:8em;'>
 END
 ;
@@ -298,11 +298,10 @@ END
 		</tr>
 END
 ;
-
-	&agbbox();
+	if ($settings{'AUTH'} eq 'LICENSE'){	&agbbox(); };
 
 	#Logo Upload
-	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>";
+	print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><br><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>";