firewall: Update the re-read button.

Change to a more meaningful description and remove the
big green box.

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index ef94db1453f0b20da59063018a934439e7fc40dc..31dab30ab3f3a03c5451482df5d3dc32d89cc90e 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -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;
 }

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 48ee78b30b81e9e6b534bb492e35072302588901..dd0a39a065de3e87da10332c5008fc655adf112f 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -963,7 +963,7 @@
 'fwdfw pol text1' => 'Firewall-Standardverhalten für von der Firewall selbst initiierte Verbindungen.',
 'fwdfw pol title' => 'Standardverhalten der Firewall',
 'fwdfw red' => 'ROT',
-'fwdfw reread' => 'Ã\9cbernehmen',
+'fwdfw reread' => 'Ã\84nderungen übernehmen',
 'fwdfw rule action' => 'Regelaktion:',
 'fwdfw rule activate' => 'Regel aktivieren',
 'fwdfw rulepos' => 'Regelposition',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2e34b9b869f27c19dccb88cd9bb60e42d9e47823..e682026cb0c19300f4ded10ee59d10056b16167d 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -988,7 +988,7 @@
 'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
 'fwdfw pol title' => 'Default firewall behaviour',
 'fwdfw red' => 'RED',
-'fwdfw reread' => 'Apply',
+'fwdfw reread' => 'Apply changes',
 'fwdfw rule action' => 'Rule action:',
 'fwdfw rule activate' => 'Activate rule',
 'fwdfw rulepos' => 'Rule position',