diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a5b8743a0d..18e9fe2c1b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,28 @@ +2007-05-18 Sancho Lerena + + * include/styles/pandora.css : Some style changes. + + * include/functions.php: Changed format_numeric and format_for_graph to show a + better number formatting. + + * index.php: Some minor changes in layout and bgcolor (not used style because + some pages that don't have the same color uses main style, f.e: stat_win for graphs). + + * godmode/agentes/module_manager.php + * operation/agentes/estado_ultimopaquete.php + * operation/agentes/estado_monitores.php + * operation/agentes/estado_generalagente.php + * operation/agentes/datos_agente.php, estado_ul: Updated output render and fixes + some tables, added databox style, removed line. + + * operation/menu.php: Removed active console. This don't go with 1.3 version + finally due many unfixed bugs. + + * reporting/stat_win.php: White background fixed. + + * general/header.php + * general/footer.php: Some adjustments in styles. + 2007-05-18 Raul Mateos * images/header.png: New graphic image for header in the new design. diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index cc8ad0e76d..a648c6a8be 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -15,25 +15,15 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -?> -

- - +echo ""; +echo ' Pandora FMS '.$pandora_version.' Build '.$build_version.' '. $lang_label["gpl_notice"].'
'; -if (isset($_SESSION['id_usuario'])) { - if (isset($_SERVER['REQUEST_TIME'])) { $time = $_SERVER['REQUEST_TIME']; } else { $time = time(); } - echo $lang_label["gen_date"]." ".date("D F d, Y H:i:s", $time)."
"; -} + echo "".$lang_label["gen_date"]." ".date("D F d, Y H:i:s", $time)."
"; +echo ""; ?> - -Pandora FMS is a -SourceForge registered project -

\ No newline at end of file diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index be9969eb92..246347b149 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -22,30 +22,32 @@ echo '
Pandora FMS
- +
logo
'; -/* echo " +echo "
"; + +echo "
"; if (isset ($_SESSION["id_usuario"])){ echo "
"; $id_usuario = entrada_limpia ($_SESSION["id_usuario"]); - if (dame_admin($id_usuario)==1) + if (dame_admin($_SESSION["id_usuario"])==1) echo " "; else echo " "; - echo $lang_label["has_connected"]. ' - ['. $id_usuario. ']'; - echo ""; - echo " ". $lang_label["information"].""; - echo ""; - echo " ". $lang_label["help"].""; - echo ""; - echo " ". $lang_label["logout"].""; + echo "".$lang_label["has_connected"]. ' + ['. $id_usuario. ']'; + echo "
"; + echo " ". $lang_label["logout"].""; + echo "		 "; + echo " ". $lang_label["information"].""; + echo "
"; + echo " ". $lang_label["help"].""; } echo "
"; -*/ +echo ""; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index c208d97a22..03c355fa37 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -171,7 +171,7 @@ echo "

".$lang_label["agent_conf"]." > ".$lang_label["assigned_modules"]." echo "   ".$lang_label["module_asociation_form"].""; echo "

"; if ($row=mysql_num_rows($result)){ - echo ''; + echo '
'; echo ''; echo ""; echo "
".$lang_label["module_name"]; echo "".$lang_label["type"]; @@ -237,7 +237,6 @@ if ($row=mysql_num_rows($result)){ echo ""; } } - echo "
"; } else echo "
No modules
"; @@ -271,8 +270,7 @@ else { // Create } echo ' '; -echo ''; -echo "
"; +echo ''; echo ' -"; + echo "
'; echo $lang_label["network_component"]; @@ -375,7 +373,7 @@ if (isset($_POST["oid"])){ } ?> - +
@@ -393,19 +391,17 @@ if (isset($_POST["oid"])){ -
"; + echo ""; + echo "
"; if ($update_module == "1"){ echo ''; } else { echo ''; } echo ""; - + echo "
"; ?> -
- diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 09c11b0903..78572cc6e1 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -377,7 +377,7 @@ function format_numeric ( $number, $decimals=2, $dec_point=".", $thousands_sep=" return 0; // If has decimals if (fmod($number , 1)> 0) - return number_format ($number, 2, $dec_point, $thousands_sep); + return number_format ($number, $decimals, $dec_point, $thousands_sep); else return number_format ($number, 0, $dec_point, $thousands_sep); } @@ -385,12 +385,16 @@ function format_numeric ( $number, $decimals=2, $dec_point=".", $thousands_sep=" // --------------------------------------------------------------- // Render numeric data in a easy way to the user // --------------------------------------------------------------- -function format_for_graph ( $number ) { +function format_for_graph ( $number , $decimals=2, $dec_point=".", $thousands_sep=",") { if ($number > "1000000") - return number_format ($number/1000000, 1, ".", ",")." M"; + return number_format ($number/1000000, $decimals, $dec_point, $thousands_sep)." M"; if ($number > "1000") - return number_format ($number/1000, 1, ".", ",")." K"; - return $number; + return number_format ($number/1000, $decimals, $dec_point, $thousands_sep )." K"; + // If has decimals + if (fmod($number , 1)> 0) + return number_format ($number, $decimals, $dec_point, $thousands_sep); + else + return number_format ($number, 0, $dec_point, $thousands_sep); } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 05b3bfd19e..26325ed485 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -32,11 +32,10 @@ font-size: 11px; } body { - background-color: #555; margin-top: 0; } input, textarea { - border: 1px solid #eee; + border: 1px solid #ddd; font: Verdana, sans-serif, Arial; } textarea { @@ -55,8 +54,8 @@ input.button { margin: 10px 15px; } select { - padding: 2px; - border:1px solid #eee; + padding: 0px; + border:1px solid #ddd; font: normal 1em/1.5em Verdana, sans-serif; } checkbox { @@ -64,13 +63,14 @@ checkbox { border:1px solid #eee; font: normal 1em/1.5em Verdana, sans-serif; } -h1, h2 { - color: #103a3a; +h1, h2, h3 { + font: bold 1em 'Trebuchet MS', Tahoma, Sans-serif; + text-transform: uppercase; + color: #778855; padding-bottom: 15px; padding-top: 10px; } h3 { - color: #3c566d; font-size: 13px; } h1 { @@ -87,6 +87,16 @@ a:hover { color: #003a3a; text-decoration: underline; } +a.white_bold { + color: #eeeeee; + text-decoration: none; + font-weight: bold; +} +a.white { + color: #eeeeee; + text-decoration: none; +} + p.center { text-align: center; } @@ -156,12 +166,12 @@ div#page { width: 960px; background: #fff; clear: both; + border-bottom: solid 5px #778855; } div#main { - width: 770px; + width: 780px; float: right; - border-top: 5px solid #778855; - padding-left: 20px; + padding-left: 0px; padding-top: 0px; padding-bottom: 20px; margin-bottom: 25px; @@ -181,13 +191,13 @@ div#head { font-size: 10px; width: 960px; height: 60px; - border-bottom: solid 3px #000; background: url(../../images/header.jpg); } div#foot { - padding-top: 15px; + margin-top: solid 2px #000; + padding-top: 5px; text-align: center; - background: #fff; + background: #000; width: 960px; clear: both; } @@ -533,10 +543,11 @@ span.master, span.snmp, span.binary, span.recon { border: 1px solid #f2f2f2; } .databox { + margin: 0px; background-color: #fafafa; } .databox_color { - border-left: 3px solid #ec981f; + border-left: 4px solid #778855; } #head_l { float: left; @@ -549,6 +560,12 @@ span.master, span.snmp, span.binary, span.recon { margin-right: 10px; padding-top: 10px; } +#head_m { + position: absolute; + padding-top: 7px; + padding-left: 210px; + +} span#logo_text1 { font: bolder 3em Arial, Sans-serif; letter-spacing: -2px; diff --git a/pandora_console/index.php b/pandora_console/index.php index e97cceeacd..d3c424ef26 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -97,7 +97,7 @@ if (isset ($_GET["refr"])){ '; + echo ''; $REMOTE_ADDR = getenv ("REMOTE_ADDR"); global $REMOTE_ADDR; @@ -188,10 +188,11 @@ if (isset ($_GET["refr"])){ session_write_close(); ?> -