2010-06-07 Raul Mateos <raulofpandora@gmail.com>

* godmode/agentes/agent_conf_gis.php: Changed warning text and style.
	* include/styles/install.css, include/styles/pandora_minimal.css:
	Fixed some typos.
	* include/styles/pandora.css: Add new warn style to shown warning texts.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2870 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-06-07 15:22:29 +00:00
parent 8c73d8143a
commit 02bbed5923
5 changed files with 25 additions and 14 deletions

View File

@ -1,3 +1,12 @@
2010-06-07 Raúl Mateos <raulofpandora@gmail.com>
* godmode/agentes/agent_conf_gis.php: Changed warning text and style.
* include/styles/install.css, include/styles/pandora_minimal.css:
Fixed some typos.
* include/styles/pandora.css: Add new warn style to shown warning texts.
2010-06-07 Miguel de Dios <miguel.dedios@artica.es> 2010-06-07 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the uncolour path between parent * include/functions_visual_map.php: fixed the uncolour path between parent

View File

@ -39,8 +39,7 @@ if (!getAgentMap($id_agente, "500px", "98%", false)) {
if ($agentData === false) { if ($agentData === false) {
echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>"; echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>";
} }
echo "<div class='warn'>" .__("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "</div>";
echo "<h4>" . __("Warning: When you change the position the agent automatily enables Ignore GIS Data") . "</h4>";
$table->width = '60%'; $table->width = '60%';
$table->data = array(); $table->data = array();

View File

@ -1,7 +1,7 @@
/* /*
// Pandora FMS - the Flexible Monitoring System // Pandora FMS - the Flexible Monitoring System
// ============================================= // =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L // Copyright (c) 2004-2010 Artica Soluciones Tecnológicas S.L
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
@ -22,7 +22,6 @@ h1 {
font-size: 18px; font-size: 18px;
color: #ffffff; color: #ffffff;
} }
lef
h2 { h2 {
font: bold 1em Arial, Sans-serif; font: bold 1em Arial, Sans-serif;
text-transform: uppercase; text-transform: uppercase;
@ -60,7 +59,7 @@ div#install_img {
div#foot_install { div#foot_install {
font-size: 7pt; font-size: 7pt;
color: #fff; color: #fff;
margin-top: solid 2px #000; margin-top: #000;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
padding-left: 20px; padding-left: 20px;
@ -71,7 +70,7 @@ div#foot_install {
border-left: 1px solid #999; border-left: 1px solid #999;
border-right: 1px solid #999; border-right: 1px solid #999;
} }
div#foot_install a{ div#foot_install a {
color: #ccc; color: #ccc;
} }
input#step4, input#step4:hover { input#step4, input#step4:hover {
@ -92,17 +91,17 @@ div.info {
margin-top: 7px; margin-top: 7px;
padding: 2px 1px 6px 25px; padding: 2px 1px 6px 25px;
} }
span.arr{ span.arr {
background: url(../../images/arrow.png) no-repeat; background: url(../../images/arrow.png) no-repeat;
margin-top: 2px; margin-top: 2px;
margin-left: 5px; margin-left: 5px;
padding: 2px 1px 6px 15px; padding: 2px 1px 6px 15px;
display: block; display: block;
font-face: verdana,arial, sans; font-family: verdana,arial, sans;
font-size: 8.5pt; font-size: 8.5pt;
} }
body { body {
font-face: verdana,arial, sans; font-family: verdana,arial, sans;
font-size: 9pt; font-size: 9pt;
background-color: #fff; background-color: #fff;
} }

View File

@ -1059,3 +1059,9 @@ div#pandora_logo_header {
.disabled_module { .disabled_module {
color: #aaa; color: #aaa;
} }
div.warn {
background: url(../../images/info.png) no-repeat;
color: #ac4444;
margin-top: 7px;
padding: 2px 1px 6px 25px;
}

View File

@ -6,7 +6,7 @@ Description: A minimal layout
// Pandora FMS - the Flexible Monitoring System // Pandora FMS - the Flexible Monitoring System
// ============================================= // =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L // Copyright (c) 2004-2010 Artica Soluciones Tecnológicas S.L
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
@ -47,7 +47,7 @@ a:hover {
input { input {
padding: 2px 3px 4px 3px; padding: 2px 3px 4px 3px;
border: 1px solid #ddd; border: 1px solid #ddd;
font: verdana, sans-serif; font-family: verdana, sans-serif;
font-size: 8pt font-size: 8pt
} }
input:hover { input:hover {
@ -86,10 +86,8 @@ table, img {
border:1px solid #000; border:1px solid #000;
position:absolute; position:absolute;
margin:0; margin:0;
width:400px; width:400px;
height:240px; height:240px;
visibility:hidden; visibility:hidden;
filter:alpha(opacity=90); filter:alpha(opacity=90);
-moz-opacity: 0.90; -moz-opacity: 0.90;
@ -123,4 +121,4 @@ tr.rowOdd:hover {
.disabled_module { .disabled_module {
color: #98c2ed; color: #98c2ed;
} }