From de5fd12338295019ff94b9271ad4fcb961ce8a1e Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Tue, 24 Sep 2013 13:20:59 +0000
Subject: [PATCH] 2013-09-24  Sergio Martin <sergio.martin@artica.es>

	* include/styles/pandora.css
	include/javascript/jquery.pandora.js
	images/license_key.png
	general/login_help_dialog.php
	general/login_page.php: Change the visual styles
	of some dialogs

	* extensions/agents_modules.php
	extensions/module_groups.php: Improve the visual
	style of extensions and their legends



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8803 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  13 ++++
 pandora_console/extensions/agents_modules.php |  37 ++++-------
 pandora_console/extensions/module_groups.php  |  40 ++++--------
 pandora_console/general/login_help_dialog.php |   2 +-
 pandora_console/general/login_page.php        |   3 +-
 pandora_console/images/license_key.png        | Bin 4364 -> 4337 bytes
 .../include/javascript/jquery.pandora.js      |   4 +-
 pandora_console/include/styles/pandora.css    |  61 ++++++++++++++++--
 8 files changed, 97 insertions(+), 63 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2c56b2b80a..554cc7c2e3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-24  Sergio Martin <sergio.martin@artica.es>
+
+	* include/styles/pandora.css
+	include/javascript/jquery.pandora.js
+	images/license_key.png
+	general/login_help_dialog.php
+	general/login_page.php: Change the visual styles
+	of some dialogs
+
+	* extensions/agents_modules.php
+	extensions/module_groups.php: Improve the visual
+	style of extensions and their legends
+
 2013-09-23 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* extensions/update_manager.php,
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index b48182e036..0fa270f5ba 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -170,7 +170,7 @@ function mainAgentsModules() {
 		return;
 	}
 	
-	echo '<table cellpadding="4" cellspacing="4" border="0">';
+	echo '<table cellpadding="4" cellspacing="4" border="0" style="width:98%;" class="agents_modules_table">';
 	
 	echo "<tr>";
 	
@@ -298,30 +298,17 @@ function mainAgentsModules() {
 	
 	echo "</table>";
 	
-	echo "<br><br><p>" . __("The colours meaning:") .
-		"<ul style='float: left;'>" .
-		'<li style="clear: both;">
-			<div style="float: left; background: #ffa300; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Orange cell when the module has fired alerts") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #cc0000; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Red cell when the module has a critical status") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #fce94f; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Yellow cell when the module has a warning status") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #8ae234; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Green cell when the module has a normal status") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #babdb6; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Grey cell when the module has an unknown status") .
-		'</li>' .
-		"</ul>" .
-	"</p>";
+	echo "<div class='legend_basic' style='width: 96%'>";
+
+	echo "<table>";
+	echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
+	echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module has fired alerts") . "</td></tr>";
+	echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module has a critical status") . "</td></tr>";
+	echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_WARNING . ";'></div></td><td>" . __("Yellow cell when the module has a warning status") . "</td></tr>";
+	echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_NORMAL . ";'></div></td><td>" . __("Green cell when the module has a normal status") . "</td></tr>";
+	echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_UNKNOWN . ";'></div></td><td>" . __("Grey cell when the module has an unknown status") . "</td></tr>";
+	echo "</table>";
+	echo "</div>";
 	
 	echo "
 		<style type='text/css'>
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index bdd55a0fab..38862c3d60 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -284,34 +284,18 @@ function mainModuleGroups() {
 		html_print_table($table);
 		echo "</div>";
 		
-		echo "<p>" . __("The colours meaning:") .
-			"<ul style='float: left;'>" .
-				'<li style="clear: both;">
-					<div style="float: left; background: #ffa300; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Orange cell when the module group and agent have at least one alarm fired.") .
-				'</li>' .
-				'<li style="clear: both;">
-					<div style="float: left; background: #cc0000; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Red cell when the module group and agent have at least one module in critical status and the others in any status") .
-				'</li>' .
-				'<li style="clear: both;">
-					<div style="float: left; background: #fce94f; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") .
-				'</li>' .
-				'<li style="clear: both;">
-					<div style="float: left; background: #8ae234; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Green cell when the module group and agent have all modules in OK status") .
-				'</li>' .
-				'<li style="clear: both;">
-					<div style="float: left; background: #babdb6; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Grey cell when the module group and agent have at least one in unknown status and the others in green status") .
-				'</li>' .
-				'<li style="clear: both;">
-					<div style="float: left; background: #729fcf; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-					__("Blue cell when the module group and agent have all modules in not init status.") .
-				'</li>' .
-			"</ul>" .
-		"</p>";
+		echo "<div class='legend_basic' style='width: 94%'>";
+
+		echo "<table>";
+		echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module group and agent have at least one alarm fired.") . "</td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . "</td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_WARNING . ";'></div></td><td>" . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . "</td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_NORMAL . ";'></div></td><td>" . __("Green cell when the module group and agent have all modules in OK status") . "</td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_UNKNOWN . ";'></div></td><td>" . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . "</td></tr>";
+		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_MAINTENANCE . ";'></div></td><td>" .__("Blue cell when the module group and agent have all modules in not init status.") . "</td></tr>";
+		echo "</table>";
+		echo "</div>";
 	}
 	else {
 		echo "<div class='nf'>".__('There are no defined groups or module groups')."</div>";
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index 1ffc8c3224..917844c649 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -90,7 +90,7 @@ echo '<div id="login_help_dialog" title="' .
 			echo '&nbsp;<span style="font-size: 12px;">' .__("Click here to don't show again this message") . '</span>';
 		echo '</div>';
 		echo '<div style="float: right; width: 20%;">';
-		html_print_submit_button("Ok", 'hide-login-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only" style="width:100px;"');  
+		html_print_submit_button("Ok", 'hide-login-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');  
 		echo '</div>';
 	echo '</div>';
 	
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 1eb95dc26e..bd80609f8b 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -150,7 +150,7 @@ if (isset ($login_failed)) {
 			echo '</div>';
 			
 			echo '<div style="position:absolute; margin: 0 auto; top: 70px; left: 35%; ">';
-				html_print_submit_button("Ok", 'hide-login-error', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only" style="width:100px;"');  
+				html_print_submit_button("Ok", 'hide-login-error', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');  
 			echo '</div>';
 			
 		echo '</div>';
@@ -158,6 +158,7 @@ if (isset ($login_failed)) {
 	echo '</div>';
 }
 
+ui_require_css_file ('dialog');
 ui_require_css_file ('jquery-ui-1.10.0.custom');
 ui_require_jquery_file('jquery-ui-1.10.0.custom');
 ?>
diff --git a/pandora_console/images/license_key.png b/pandora_console/images/license_key.png
index a93a800ff7a1fb911eafa41431763e8f81aff2c7..ed132c407df2534ff8f5e8439012b01acdf73087 100644
GIT binary patch
literal 4337
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
a)3VEr?W^eFJLDffA>4O)VH=&p+5ZC&34-YW

literal 4364
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
E0Z#cs&Hw-a

diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index 8f42daa19e..134cd2c930 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -90,8 +90,8 @@ $(document).ready (function () {
 					resizable: true,
 					draggable: true,
 					modal: true,
-					height: 280,
-					width: 600,
+					height: 310,
+					width: 650,
 					overlay: {
 								opacity: 0.5,
 								background: "black"
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8c850ca168..356a60d94c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1144,7 +1144,6 @@ tr.disabled_row_user * {
 }
 .red, .redb, .redi, .error {
 	color: #c00;
-http://localhost/pandora_blackout/index.php?sec=gpolicies&sec2=enterprise/godmode/policies/policies&tab=agents&id=3
 }
 
 .sep {
@@ -2295,18 +2294,20 @@ tr.group_view_data, .group_view_data {
 }
 
 tr.group_view_crit, .group_view_crit {
-	background-color:  #FA3030;
+	background-color:  #FF4040;
+	color: #fff;
 }
 
 tr.group_view_norm, .group_view_norm {
 	background-color: #ffffff;
 }
 tr.group_view_ok, .group_view_ok {
-	background-color: #00C000;
+	background-color: #6EB432;
+	color: #fff;
 }
 
 tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn {
-	background-color: #F5E535;
+	background-color: #F2D400;
 	color: #3F3F3F !important;
 }
 
@@ -2315,11 +2316,12 @@ a.group_view_warn {
 }
 
 tr.group_view_alrm, .group_view_alrm {
-	background-color: #ED8701;
+	background-color: #FF8800;
 }
 
 tr.group_view_unk, .group_view_unk {
-	background-color: #C4C4C4;
+	background-color: #AAAAAA;
+	color: #fff;
 }
 
 /* classes for event priorities. Sits now in functions.php */
@@ -2682,3 +2684,50 @@ div#agent_wizard_subtabs {
 .agent_wizard_tab:hover {
 	cursor: default;
 }
+
+#container_servicemap_legend {
+	position: absolute;
+	width: 200px;
+	background: #F4F4F4;
+	margin-top: 10px;
+	right: 2px;
+	border-radius: 5px;
+	padding: 10px;
+	opacity: .90;
+}
+
+#container_servicemap_legend table {
+	text-align: left;
+}
+
+.legend_square {
+	width: 20px;
+	padding-left: 20px;
+	padding-right: 10px;
+}
+
+.legend_square_simple {
+	padding-left:0px;
+	padding-right: 10px;
+	padding-bottom: 3px;
+}
+.legend_square div, .legend_square_simple div {
+	width: 20px;
+	height: 20px;
+	border-radius: 3px;
+}
+
+.legend_basic {
+	background: #F4F4F4;
+	margin-top: 10px;
+	border-radius: 5px;
+	padding: 10px;
+}
+
+.agents_modules_table th {
+	background: #3F3F3F;
+}
+
+.agents_modules_table th * {
+	color: #FFFFFF;
+}