tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
zarzuelo 2013-09-24 13:20:59 +00:00
parent d3052bb0c7
commit de5fd12338
8 changed files with 97 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -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> 2013-09-23 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager.php, * extensions/update_manager.php,

37
pandora_console/extensions/agents_modules.php
View File

@ -170,7 +170,7 @@ function mainAgentsModules() {
return; 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>"; echo "<tr>";
@ -298,30 +298,17 @@ function mainAgentsModules() {
echo "</table>"; echo "</table>";
echo "<br><br><p>" . __("The colours meaning:") . echo "<div class='legend_basic' style='width: 96%'>";
"<ul style='float: left;'>" .
'<li style="clear: both;"> echo "<table>";
<div style="float: left; background: #ffa300; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' . echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
__("Orange cell when the module has fired alerts") . 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>";
'</li>' . 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>";
'<li style="clear: both;"> 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>";
<div style="float: left; background: #cc0000; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' . 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>";
__("Red cell when the module has a critical status") . 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>";
'</li>' . echo "</table>";
'<li style="clear: both;"> echo "</div>";
<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 " echo "
<style type='text/css'> <style type='text/css'>

40
pandora_console/extensions/module_groups.php
View File

@ -284,34 +284,18 @@ function mainModuleGroups() {
html_print_table($table); html_print_table($table);
echo "</div>"; echo "</div>";
echo "<p>" . __("The colours meaning:") . echo "<div class='legend_basic' style='width: 94%'>";
"<ul style='float: left;'>" .
'<li style="clear: both;"> echo "<table>";
<div style="float: left; background: #ffa300; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' . echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
__("Orange cell when the module group and agent have at least one alarm fired.") . 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>";
'</li>' . 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>";
'<li style="clear: both;"> 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>";
<div style="float: left; background: #cc0000; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' . 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>";
__("Red cell when the module group and agent have at least one module in critical status and the others in any status") . 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>";
'</li>' . 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>";
'<li style="clear: both;"> echo "</table>";
<div style="float: left; background: #fce94f; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' . echo "</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>";
} }
else { else {
echo "<div class='nf'>".__('There are no defined groups or module groups')."</div>"; echo "<div class='nf'>".__('There are no defined groups or module groups')."</div>";

2
pandora_console/general/login_help_dialog.php
View File

@ -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 '&nbsp;<span style="font-size: 12px;">' .__("Click here to don't show again this message") . '</span>';
echo '</div>'; echo '</div>';
echo '<div style="float: right; width: 20%;">'; 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>';
echo '</div>'; echo '</div>';

3
pandora_console/general/login_page.php
View File

@ -150,7 +150,7 @@ if (isset ($login_failed)) {
echo '</div>'; echo '</div>';
echo '<div style="position:absolute; margin: 0 auto; top: 70px; left: 35%; ">'; 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>';
echo '</div>'; echo '</div>';
@ -158,6 +158,7 @@ if (isset ($login_failed)) {
echo '</div>'; echo '</div>';
} }
ui_require_css_file ('dialog');
ui_require_css_file ('jquery-ui-1.10.0.custom'); ui_require_css_file ('jquery-ui-1.10.0.custom');
ui_require_jquery_file('jquery-ui-1.10.0.custom'); ui_require_jquery_file('jquery-ui-1.10.0.custom');
?> ?>

BIN
pandora_console/images/license_key.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

4
pandora_console/include/javascript/jquery.pandora.js
View File

@ -90,8 +90,8 @@ $(document).ready (function () {
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 280, height: 310,
width: 600, width: 650,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"

61
pandora_console/include/styles/pandora.css
View File

@ -1144,7 +1144,6 @@ tr.disabled_row_user * {
} }
.red, .redb, .redi, .error { .red, .redb, .redi, .error {
color: #c00; color: #c00;
http://localhost/pandora_blackout/index.php?sec=gpolicies&sec2=enterprise/godmode/policies/policies&tab=agents&id=3
} }
.sep { .sep {
@ -2295,18 +2294,20 @@ tr.group_view_data, .group_view_data {
} }
tr.group_view_crit, .group_view_crit { tr.group_view_crit, .group_view_crit {
background-color: #FA3030; background-color: #FF4040;
color: #fff;
} }
tr.group_view_norm, .group_view_norm { tr.group_view_norm, .group_view_norm {
background-color: #ffffff; background-color: #ffffff;
} }
tr.group_view_ok, .group_view_ok { 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 { 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; color: #3F3F3F !important;
} }
@ -2315,11 +2316,12 @@ a.group_view_warn {
} }
tr.group_view_alrm, .group_view_alrm { tr.group_view_alrm, .group_view_alrm {
background-color: #ED8701; background-color: #FF8800;
} }
tr.group_view_unk, .group_view_unk { tr.group_view_unk, .group_view_unk {
background-color: #C4C4C4; background-color: #AAAAAA;
color: #fff;
} }
/* classes for event priorities. Sits now in functions.php */ /* classes for event priorities. Sits now in functions.php */
@ -2682,3 +2684,50 @@ div#agent_wizard_subtabs {
.agent_wizard_tab:hover { .agent_wizard_tab:hover {
cursor: default; 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;
}