public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1468303984-5711-1-git-send-email-alexander.marx@ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]

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
 
 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>";
-- 
2.7.4


                 reply	other threads:[~2016-07-12  6:13 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=1468303984-5711-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