diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-07-12 23:18:37 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-07-12 23:18:37 +0000 |
commit | 5c9cc1decd4197b17202d272db1a1591a3529347 (patch) | |
tree | 031c5c5108e3121f981da62a4690c7cf2beb2367 /usr/local/www | |
parent | 7616c10733d7964707e14c1e1de2c785f9bd6752 (diff) | |
download | pfsense-5c9cc1decd4197b17202d272db1a1591a3529347.zip pfsense-5c9cc1decd4197b17202d272db1a1591a3529347.tar.gz |
When an alert is in progress show it in its own box
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/fbegin.inc | 62 | ||||
-rwxr-xr-x | usr/local/www/fend.inc | 6 |
2 files changed, 36 insertions, 32 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index a3e986a..7164437 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -68,43 +68,17 @@ function showhide_black(tspan, tri) { <strong><a href="/"><img src="/logo.gif" border="0"></a></strong> </td> <td height="100%"> - <div style="height:99%" id="topbox" name="topbox"> + <div style="height:100%" id="topbox" name="topbox"> <table bgcolor="#990000" background="top_background.gif" border="0" cellspacing="0" cellpadding="0" width="100%" height="85%"> <tr><td align="left" valign="bottom"><span class="tfrtitle"> webConfigurator</span></td> <td align="right" valign="bottom"> <span class="hostname"><?=$config['system']['hostname'] . "." . $config['system']['domain'];?> </span> </td> </tr> - <?php - /* display a top alert bar if need be */ - $need_alert_display = false; - $display_text .= ""; - if(file_exists("{$g["tmp_path"]}/filter_reloading")) { - $need_alert_display = true; - $display_text .= "The filter rules are currently reloading. You will receive an alert if there is an error.<br>"; - } - $found_notices = are_notices_pending(); - if($found_notices == true) { - $notices = get_notices(); - if(!$notices) { - $need_alert_display = true; - $display_text .= print_notices() . "<br>"; - } - } - if($need_alert_display == true) { - // XXX: make rounded. - echo "<tr bgcolor=\"#000000\"><td colspan=\"2\"><font color=\"#ffffff\">"; - echo "<div id=\"roundalert\">"; - echo "<img src=\"/top_notification.gif\"> "; - echo $display_text; - echo "</div>"; - echo "</td></tr>"; - } - ?> </table> - </div> + </div> </td> - </tr> + </tr> <tr valign="top"> <td valign="top" height="100%" width="150"> <div id="niftyMenu" style="height:100%"> @@ -210,3 +184,33 @@ function showhide_black(tspan, tri) { </td> <td width="600"><table width="100%" border="0" cellpadding="10" cellspacing="0"> <tr><td> + +<?php + /* display a top alert bar if need be */ + $need_alert_display = false; + $display_text .= ""; + if(file_exists("{$g["tmp_path"]}/filter_reloading")) { + $need_alert_display = true; + $display_text .= "The filter rules are currently reloading. You will receive an alert if there is an error.<br>"; + } + $found_notices = are_notices_pending(); + if($found_notices == true) { + $notices = get_notices(); + if(!$notices) { + $need_alert_display = true; + $display_text .= print_notices() . "<br>"; + } + } + if($need_alert_display == true) { + echo "<div style=\"background-color:#000000\" id=\"roundalert\">"; + echo "<table>"; + echo "<tr><td><font color=\"#ffffff\">"; + echo " <img align=\"middle\" src=\"/top_notification.gif\"> "; + echo $display_text; + echo "</td>"; + echo "</tr>"; + echo "</table>"; + echo "</div>"; + } + +?>
\ No newline at end of file diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc index 792b2ea..1f8d785 100755 --- a/usr/local/www/fend.inc +++ b/usr/local/www/fend.inc @@ -18,10 +18,10 @@ Rounded("tr#fend","bl br tl tr","#FFF","#990000","smooth"); <?php /* if we displayed an alert earlier, round the bottom edges */ if($need_alert_display == true) { - echo "Rounded(\"div#roundalert\",\"bl br\",\"#FFF\",\"#990000\",\"smooth\");\n"; - echo "Rounded(\"div#topbox\",\"tl tr\",\"#FFF\",\"#990000\",\"smooth\");\n"; + echo "Rounded(\"div#roundalert\",\"all\",\"#FFF\",\"#000000\",\"smooth\");\n"; + echo "Rounded(\"div#topbox\",\"all\",\"#FFF\",\"#990000\",\"smooth\");\n"; } else { - echo "Rounded(\"div#topbox\",\"tl tr bl br\",\"#FFF\",\"#990000\",\"smooth\");\n"; + echo "Rounded(\"div#topbox\",\"all\",\"#FFF\",\"#990000\",\"smooth\");\n"; } ?> </script> |