2008-12-21 Raul Mateos <raulofpandora@gmail.com>

* index.php: Updated build, there were some changes in last month that make
	this build to change.
	* include/styles/link.css: updated and renamed to menu.css, more coherent.
	Updated header.
	* include/styles/pandora.css: updated header. Reduced height in
	administration and link menu titles.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2008-12-21 15:26:55 +00:00
parent e9f72727e4
commit be7a13d75c
4 changed files with 37 additions and 30 deletions

View File

@ -1,3 +1,14 @@
2008-12-21 Raul Mateos <raulofpandora@gmail.com>
* index.php: Updated build, there were some changes in last month that make
this build to change.
* include/styles/link.css: updated and renamed to menu.css, more coherent.
Updated header.
* include/styles/pandora.css: updated header. Reduced height in
administration and link menu titles.
2008-12-19 Evi Vanoost <vanooste@rcbi.rochester.edu>
* general/footer.php: Updated print_timestamp to always print full.

View File

@ -1,9 +1,10 @@
/*
// Pandora FMS - the Free monitoring system
// ========================================
// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info
// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas
// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com
// Pandora FMS - the Flexible Monitoring System
// ============================================
// Copyright (c) 2004-2008 Sancho Lerena, slerena@openideas.info
// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas
// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com
// Copyright (c) 2008-2008 Evi Vanoost, vanooste@rcbi.rochester.edu
// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net
// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com
@ -18,10 +19,9 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
.menu {
background-color: #E9F3D2;
border: 1px solid #DADBDC;
background-color: #e9f3d2;
border: 1px solid #dadbdc;
width: 155px;
}
.menu ul {
@ -29,15 +29,13 @@
padding: 0;
margin: 0;
}
.menu li {
background-color: #E9F3D2;
background-color: #e9f3d2;
border: 0px solid black;
border-bottom: 1px solid #D4D4D4;
border-bottom: 1px solid #d4d4d4;
padding: 5px 5px 5px 30px;
margin: 0;
}
.menu a, .menu a:hover {
font-family: Arial, Verdana, sans-serif, Helvetica;
color: #000000;
@ -45,7 +43,6 @@
text-decoration:none;
}
/* This is for the dropout menu */
.menu.int ul {
height: 26px;
@ -173,5 +170,5 @@
#god-agents:hover, #god-modules:hover, #god-alerts:hover, #god-dbmaint:hover, #god-users:hover, #god-reporting:hover, #god-profiles:hover, #god-servers:hover, #god-audit:hover, #god-setup:hover, #god-snmpc:hover, #god-extensions:hover,
#god-agents.selected, #god-modules.selected, #god-alerts.selected, #god-dbmaint.selected, #god-users.selected, #god-reporting.selected, #god-profiles.selected, #god-servers.selected, #god-audit.selected, #god-setup.selected, #god-snmpc.selected, #god-extensions.selected
{
background-color: #EFEFBD;
background-color: #efefbd;
}

View File

@ -1,13 +1,11 @@
/*
// Pandora FMS - the Flexible monitoring system
// Pandora FMS - the Flexible Monitoring System
// =============================================
// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
// Main PHP/SQL code development and project architecture and management
// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.comnt
// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com
// CSS and some PHP additions
// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas, info@artica.es
//
// Copyright (c) 2008-2008 Evi Vanoost, vanooste@rcbi.rochester.edu
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; version 2
@ -20,7 +18,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
@import url(link.css);
@import url(menu.css);
@import url(tip.css);
* {
font-family: verdana, sans-serif;
@ -317,9 +315,14 @@ td.datos_id {
}
.bg, .bg2, .bg3, .bg4 {
position: relative;
height: 20px;
width: 100%;
}
.bg {
height: 20px;
}
.bg2, .bg3, .bg4 {
height: 17px;
}
.f10, #ip {
font-size: 7pt;
text-align: center;
@ -443,8 +446,6 @@ div.title_line {
float:left;
border-bottom: 1px solid #778866;
}
#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
padding: 0px;
list-style: none;
@ -470,13 +471,11 @@ div.title_line {
font-weight: bold;
line-height: 18px;
}
#menu_tab .mn li a {
display: block;
text-decoration: none;
}
#menu_tab li.nomn:hover a,
#menu_tab li:hover ul a:hover {
#menu_tab li.nomn:hover a, #menu_tab li:hover ul a:hover {
background: #799E48;
color: #fff;
}

View File

@ -20,7 +20,7 @@
// Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/
// Pandora FMS uses Pear Image::Graph code
$build_version="PC081123";
$build_version="PC081221";
$pandora_version="v2.1-dev";
global $build_version;
global $pandora_version;
@ -130,7 +130,7 @@ echo '</head>';
if ($config["pure"] == 0) {
echo '<body bgcolor="#555555">';
} else {
echo '<body bgcolor="#FFFFFF">';
echo '<body bgcolor="#ffffff">';
}
$REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
@ -170,7 +170,7 @@ if (! isset ($_SESSION['id_usuario']) && isset ($_GET["login"])) {
// $ultima = substr ($pass, strlen ($pass) - 1, 1);
// $pass = $primera . "****" . $ultima;
audit_db ($nick, $REMOTE_ADDR, "Logon Failed",
"Incorrect password: " . $nick);
"Incorrect password: " . $nick);
exit;
}
} else {
@ -183,7 +183,7 @@ if (! isset ($_SESSION['id_usuario']) && isset ($_GET["login"])) {
//$ultima = substr ($pass, strlen ($pass) - 1, 1);
//$pass = $primera . "****" . $ultima;
audit_db ($nick, $REMOTE_ADDR, "Logon Failed",
"Invalid username: " . $nick);
"Invalid username: " . $nick);
exit;
}
} elseif (! isset ($_SESSION['id_usuario'])) {