diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-07-11 23:03:35 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-07-11 23:03:35 +0000 |
| commit | bc17d579fb22fa7a3a1de2e59498e0ca5ac247d3 (patch) | |
| tree | 31f7dd32e54abd4e7295d68fd830e60ae1713671 | |
| parent | ccb7b0f5d9d4be1b3ab14e582c51b5f97783eb42 (diff) | |
| download | pfsense-bc17d579fb22fa7a3a1de2e59498e0ca5ac247d3.zip pfsense-bc17d579fb22fa7a3a1de2e59498e0ca5ac247d3.tar.gz | |
Move alerts to top area to match mockups by hoba
| -rwxr-xr-x | usr/local/www/fbegin.inc | 38 | ||||
| -rwxr-xr-x | usr/local/www/fend.inc | 6 | ||||
| -rwxr-xr-x | usr/local/www/index.php | 10 |
3 files changed, 39 insertions, 15 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 2fd5c4f..268b54a 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -66,11 +66,39 @@ function showhide_black(tspan, tri) { <td width="150" height="65" align="center" valign="middle"> <strong><a href="/"><img src="/logo.gif" border="0"></a></strong></td> <td bgcolor="#990000" background="top_background.gif"> <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <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></table> - </td> + <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> + </td> </tr> <tr valign="top"> <td valign="top" width="150"> diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc index 81fbba4..2ab5d7a 100755 --- a/usr/local/www/fend.inc +++ b/usr/local/www/fend.inc @@ -15,4 +15,10 @@ Rounded("div#niftyMenu","top bottom","#FFFFFF","#000000","smooth"); Rounded("div#mainarea","bl br tr","#FFF","#eeeeee","smooth"); Rounded("div#boxarea","bl br tl tr","#FFF","#eeeeee","smooth"); 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"; + } +?> </script> diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 70f7c34..a8787a9 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -155,16 +155,6 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <center><img src="logobig.jpg"></center> <br> - <?php - $found_notices = are_notices_pending(); - print_notice_box(); - - if(file_exists("{$g["tmp_path"]}/filter_reloading")) - print_info_box_np("The filter rules are currently reloading. You will receive an alert if there is an error."); - - - ?> - <br> <div id="niftyOutter" width="650"> <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> |
