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

2009-02-05 Esteban Sanchez <estebans@artica.es> 

* godmode/agentes/alert_manager.php: Hide actions and templates form.
	Removed unncessary check when there's no module set.

	* include/styles/ie.css: Added to repository. IE fixes. Added fixes
	for menu, because IE doesn't support hover in other elements than a.

	* include/styles/menu.css: Removed font-family property.

	* include/functions_db.php: Style correction.

	* index.php: Added IE CSS fixes if needed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Esteban Sanchez 2009-02-05 12:12:42 +00:00
parent c895f84161
commit 3f4e66287b
6 changed files with 65 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2009-02-05 Esteban Sanchez <estebans@artica.es>
* godmode/agentes/alert_manager.php: Hide actions and templates form.
Removed unncessary check when there's no module set.
* include/styles/ie.css: Added to repository. IE fixes. Added fixes
for menu, because IE doesn't support hover in other elements than a.
* include/styles/menu.css: Removed font-family property.
* include/functions_db.php: Style correction.
* index.php: Added IE CSS fixes if needed.
2009-02-05 Esteban Sanchez <estebans@artica.es>
* operation/visual_console/render_view.php: Recoverd countdown when

71
pandora_console/godmode/agentes/alert_manager.php
View File

@ -254,44 +254,41 @@ foreach ($modules as $id_agent_module => $module) {
$table->data = array ();
}
if (isset($module)){
/* This hidden value is used in Javascript. It's a workaraound for IE because
it doesn't allow input elements creation. */
print_input_hidden ('add_action', 1);
print_input_hidden ('id_alert_module', 0);
/* This hidden value is used in Javascript. It's a workaraound for IE because
it doesn't allow input elements creation. */
print_input_hidden ('add_action', 1);
print_input_hidden ('id_alert_module', 0);
echo '<form class="add_alert_form" method="post" class="invisible"
action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.
$module['id_agente'].'">';
echo '<div style="float:left">';
print_label (__('Template'), 'template');
$templates = get_alert_templates ();
if (empty ($templates))
$templates = array ();
print_select ($templates, 'template', '', '', __('None'), 0);
echo '</div><div style="margin-left: 270px">';
print_label (__('Action'), 'action');
$actions = get_alert_actions ();
if (empty ($actions))
$actions = array ();
print_select ($actions, 'action', '', '', __('None'), 0);
echo '<br />';
echo '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
echo '<span class="advanced_actions invisible">';
echo __('From').' ';
print_input_text ('fires_min', -1, '', 4, 10);
echo ' '.__('to').' ';
print_input_text ('fires_max', -1, '', 4, 10);
echo ' '.__('matches of the alert');
echo pandora_help("alert-matches", true);
echo '</span></div>';
echo '<div style="float: right; margin-left: 30px;"><br />';
print_submit_button (__('Add'), 'add', false, 'class="sub next"');
print_input_hidden ('id_agent_module', 0);
print_input_hidden ('create_alert', 1);
echo '</div></form>';
}
echo '<form class="add_alert_form invisible" method="post"
action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.
$id_agente.'">';
echo '<div style="float:left">';
print_label (__('Template'), 'template');
$templates = get_alert_templates ();
if (empty ($templates))
$templates = array ();
print_select ($templates, 'template', '', '', __('None'), 0);
echo '</div><div style="margin-left: 270px">';
print_label (__('Action'), 'action');
$actions = get_alert_actions ();
if (empty ($actions))
$actions = array ();
print_select ($actions, 'action', '', '', __('None'), 0);
echo '<br />';
echo '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
echo '<span class="advanced_actions invisible">';
echo __('From').' ';
print_input_text ('fires_min', -1, '', 4, 10);
echo ' '.__('to').' ';
print_input_text ('fires_max', -1, '', 4, 10);
echo ' '.__('matches of the alert');
echo pandora_help("alert-matches", true);
echo '</span></div>';
echo '<div style="float: right; margin-left: 30px;"><br />';
print_submit_button (__('Add'), 'add', false, 'class="sub next"');
print_input_hidden ('id_agent_module', 0);
print_input_hidden ('create_alert', 1);
echo '</div></form>';
?>
<link rel="stylesheet" href="include/styles/cluetip.css" type="text/css" />

4
pandora_console/include/functions_db.php
View File

@ -302,10 +302,10 @@ function get_group_agents ($id_group = 0, $disabled = false, $case = "lower") {
foreach ($result as $row) {
switch ($case) {
case "lower":
$agents[$row["id_agente"]] = mb_strtolower ($row["nombre"],"UTF-8");
$agents[$row["id_agente"]] = mb_strtolower ($row["nombre"], "UTF-8");
break;
case "upper":
$agents[$row["id_agente"]] = mb_strtoupper ($row["nombre"],"UTF-8");
$agents[$row["id_agente"]] = mb_strtoupper ($row["nombre"], "UTF-8");
break;
default:
$agents[$row["id_agente"]] = $row["nombre"];

12
pandora_console/include/styles/ie.css Normal file
View File

@ -0,0 +1,12 @@
.title .toggle {
background: none;
}
.title .toggle {
background: transparent url(images/toggle.gif) no-repeat scroll !important;
}
.title a {
clear: none;
zoom: 100%;
padding: 1;
}

1
pandora_console/include/styles/menu.css
View File

@ -41,7 +41,6 @@ li.not_selected a {
background: #E9F3D2;
}
.menu a {
font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
color: #000000;
display:block; /* This makes it so that the whole li is clickable */
text-decoration:none;

3
pandora_console/index.php
View File

@ -143,6 +143,9 @@ echo '<title>Pandora FMS - '.__('the Flexible Monitoring System').'</title>
<meta name="robots" content="index, follow" />
<link rel="icon" href="images/pandora.ico" type="image/ico" />
<link rel="stylesheet" href="include/styles/'.$config["style"].'.css" type="text/css" />
<!--[if gte IE 6]>
<link rel="stylesheet" href="include/styles/ie.css" type="text/css"/>
<![endif]-->
<script type="text/javascript" src="include/javascript/jquery.js"></script>
<script type="text/javascript" src="include/javascript/wz_jsgraphics.js"></script>
<script type="text/javascript" src="include/javascript/pandora.js"></script>