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 a8add4d87fbf8971c94464b9c7f7ae9c739e3ad9..bdded8b2a3d05dcca48d4668d18ab34445dfc9dc 100755 (executable)
--- 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>";