ovpnmain.cgi: Redesign the roadwarrior section

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 62dc1f76ad7ede0a89964039072bc6825cb3eae4..93775ac7142158630042e4a7676d43878f67dd98 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5241,34 +5241,51 @@ END
        });
 
        print <<END;
-    <table width='100%' border='0'>
-    <form method='post'>
-    <tr><td class='boldbase'>$Lang::tr{'enabled'}</td>
-    <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
+           <form method='POST'>
+                   <table class="form">
+                               <tr>
+                                       <td class='boldbase'>
+                                               $Lang::tr{'enabled'}
+                                       </td>
+                                       <td>
+                                               <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} />
+                                       </td>
+                               </tr>
 
-       <tr><td colspan='4'><br></td></tr>
-       <tr>
-               <td class='base'><b>$Lang::tr{'net config'}:</b></td>
-       </tr>
-    <tr><td colspan='1'><br></td></tr>
+                               <tr>
+                                       <td colspan='2'></td>
+                               </tr>
+
+                               <tr>
+                                       <td>
+                                               $Lang::tr{'local vpn hostname/ip'}
+                                       </td>
+                                       <td>
+                                               <input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' />
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td>
+                                               $Lang::tr{'ovpn subnet'}
+                                       </td>
+                                       <td>
+                                               <input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' />
+                                       </td>
+                               </tr>
 
-    <tr><td class='base' nowrap='nowrap' colspan='2'>$Lang::tr{'local vpn hostname/ip'}:<br /><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' size='30' /></td>
-       <td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
+                               <tr class="action">
+                                       <td colspan="2">
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' />
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
 END
-;
 
-       print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />";
-       print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />";
-       print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />";
-       if (( -e "${General::swroot}/ovpn/ca/cacert.pem" &&
-            -e "${General::swroot}/ovpn/certs/servercert.pem" &&
-            -e "${General::swroot}/ovpn/certs/serverkey.pem") &&
-           ($cgiparams{'ENABLED'} eq 'on')) {
-           print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td></tr>";
-       } else {
-           print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>";
-       }
-    print "</form></table>";
     &Header::closebox();
 
     if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) {

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index c373a941139781548b33de8c12218c7350f0b80e..81cba833cef5f151b4c991f9f15aa684ff0add6d 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -315,6 +315,30 @@ table {
        border-spacing: 0;
 }
 
+/*
+       Form Tables
+*/
+table.form {
+       width: 100%;
+
+       margin-top: 1rem;
+       margin-bottom: 1rem;
+}
+
+table.form:last-child {
+       margin-bottom: 0;
+}
+
+table.form tr td:first-child {
+       width: 30%;
+}
+
+table.form tr.action td {
+       padding-top: 1rem;
+
+       text-align: right;
+}
+
 .tbl {
        width: 100%;
 }