firewall: Fix collapsing the NAT menu.

[people/teissler/ipfire-2.x.git] / html / cgi-bin / forwardfw.cgi

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index ef94db1453f0b20da59063018a934439e7fc40dc..ecd8c24ec66dc6e34f084cd36778a912f49a24a3 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -137,13 +137,13 @@ print<<END;
                update_protocol();
 
                // When nat not used, hide it
-               if (! \$("#nat").attr("checked")) {
-                       \$("#natpart").hide();
+               if (! \$("#USE_NAT").attr("checked")) {
+                       \$("#NAT").hide();
                }
 
                // Show NAT area when "use nat" checkbox is clicked
-               \$("#nat").change(function() {
-                       \$("#natpart").toggle();
+               \$("#USE_NAT").change(function() {
+                       \$("#NAT").toggle();
                });
 
                // Time constraints
@@ -457,14 +457,32 @@ if ($fwdfwsettings{'ACTION'} eq '' or $fwdfwsettings{'ACTION'} eq 'reset')
 sub addrule
 {
        &error;
-       if (-f "${General::swroot}/forward/reread"){
-               print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div></td></tr></table></form><br>";
-       }
+
        &Header::openbox('100%', 'left',  $Lang::tr{'fwdfw menu'});
-       print "<form method='post'>";
-       print "<table border='0'>";
-       print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
-       print"</tr></table></form><hr>";        
+       print <<END;
+               <form method="POST" action="">
+                       <table border='0' width="100%">
+                               <tr>
+                                       <td>
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
+                                       </td>
+                                       <td align="right">
+END
+
+       if (-f "${General::swroot}/forward/reread") {
+               print <<END;
+                       <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-weight: bold; color: green;'>
+END
+       }
+
+       print <<END;
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+
+               <hr>
+END
        &Header::closebox();
        &viewtablerule;
 }
@@ -1638,11 +1656,18 @@ END
                #---SNAT / DNAT ------------------------------------------------
                &Header::openbox('100%', 'left', 'NAT');
                print<<END;
-               <div id="nat"><table width='100%' border='0'>
-               <tr><td width='1%'><input type='checkbox' name='USE_NAT' id='USE_NAT' value='ON' $checked{'USE_NAT'}{'ON'} ></td><td width='15%'>$Lang::tr{'fwdfw use nat'}</td><td colspan='5'></td></tr></table></div>
-               <div id="natpart" class="noscript">
-               <table width='100%' border='0'><tr>
-               <tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='dnat' value='dnat' checked ></td><td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
+                       <label>
+                               <input type='checkbox' name='USE_NAT' id='USE_NAT' $checked{'USE_NAT'}{'ON'}>
+                               $Lang::tr{'fwdfw use nat'}
+                       </label>
+                       <div id="NAT">
+                               <table width='100%' border='0'>
+                                       <tr>
+                                               <td colspan='2'></td>
+                                               <td width='1%'>
+                                                       <input type='radio' name='nat' id='dnat' value='dnat' checked>
+                                               </td>
+                                               <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
 END
                print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
                print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
@@ -1672,7 +1697,7 @@ END
                        print ">$network</option>";
                }
                print"</select></td></tr></table>";
-               print"</div><br><hr>";
+               print"</div>";
                &Header::closebox();
                #---TARGET------------------------------------------------------
                &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});