diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e65f1e04b3..12f55eeb89 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,191 @@
+2011-07-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+ * include/functions_html.php
+ include/styles/dialog.css
+ include/styles/pandora_blackmetal.css
+ include/styles/menu.css
+ include/styles/pandora_black.css
+ include/styles/pandora.css
+ include/functions_ui.php
+ extensions/update_manager/main.php
+ operation/visual_console/index.php
+ operation/agentes/status_monitor.php
+ operation/agentes/estado_ultimopaquete.php
+ operation/agentes/alerts_status.php
+ operation/agentes/estado_generalagente.php
+ operation/agentes/estado_agente.php
+ operation/agentes/gis_view.php
+ operation/agentes/estado_monitores.php
+ operation/agentes/ver_agente.php
+ operation/agentes/graphs.php
+ operation/agentes/group_view.php
+ operation/users/user_edit.php
+ operation/events/events_list.php
+ operation/messages/message.php
+ operation/reporting/graph_viewer.php
+ pandoradb.data.postgreSQL.sql
+ pandoradb.data.oracle.sql
+ images/agents_group.png
+ images/application_double.png
+ images/sitemap.png
+ images/application_edit.png
+ images/file.png
+ images/page_white_text.png
+ images/zoom.png
+ images/page_refresh.png
+ images/cog_del.png
+ images/setup.png
+ images/tag_red.png
+ images/computer_error.png
+ images/ok.png
+ images/link_delete.png
+ images/attachment.png
+ images/god5.png
+ images/god9.png
+ images/down.png
+ images/lightbulb.png
+ images/help.png
+ images/brick.png
+ images/pill.png
+ images/link_edit.png
+ images/database_gear.png
+ images/b_white.png
+ images/wrench_orange.png
+ images/up.png
+ images/link_add.png
+ images/chart_curve.png
+ images/email_open.png
+ images/page_white.png
+ images/link2.png
+ images/box.png
+ images/clock.png
+ images/note.png
+ images/rss.png
+ images/skin/skin_default/include/styles/pandora.css
+ images/extensions.png
+ images/flag_red.png
+ images/database.png
+ images/images.png
+ images/cog.png
+ images/b_yellow.png
+ images/groups_small/clock.png
+ images/groups_small/world.png
+ images/groups_small/server_database.png
+ images/groups_small/computer.png
+ images/cancel.png
+ images/add.png
+ images/mouse.png
+ images/server_database.png
+ images/computer.png
+ images/book_edit.png
+ images/lupa.png
+ images/heart.png
+ images/database_lightning.png
+ images/user.png
+ images/link_break.png
+ images/edit.png
+ images/page_white_magnify.png
+ images/normalscreen.png
+ images/sitemap_color.png
+ images/go.png
+ images/config.png
+ images/database_refresh.png
+ images/link_go.png
+ images/comments.png
+ images/email.png
+ images/lock.png
+ images/os_icons/so_linux.png
+ images/os_icons/android_small.png
+ images/os_icons/android.png
+ images/os_icons/so_linux_small.png
+ images/error.png
+ images/god3.png
+ images/god7.png
+ images/calendar_view_day.png
+ images/data.png
+ images/fullscreen.png
+ images/server_web.png
+ images/lupa_15x15.png
+ images/lightning_go.png
+ images/star.png
+ images/user_suit.png
+ images/upd.png
+ images/application.png
+ images/music_note.png
+ images/lightbulb_off.png
+ images/application_not_writable.png
+ images/sort_down.png
+ images/eye.png
+ images/lightning.png
+ images/header.jpg
+ images/wrench.png
+ images/mimetypes/unknown.png
+ images/mimetypes/image.png
+ images/mimetypes/zip.png
+ images/mimetypes/directory.png
+ images/mimetypes/text.png
+ images/delete.png
+ images/bricks.png
+ images/world.png
+ images/wand.png
+ images/delete_modules.png
+ images/disk.png
+ images/group.png
+ images/god8.png
+ images/server.png
+ images/bug.png
+ images/page_lightning.png
+ images/house.png
+ images/log-out.png
+ images/monitor.png
+ images/information.png
+ images/cross.png
+ images/sort_up.png
+ general/login_page.php
+ general/logon_ok.php
+ general/logoff.php
+ godmode/groups/group_list.php
+ godmode/admin_access_logs.php
+ godmode/db/db_audit.php
+ godmode/db/db_refine.php
+ godmode/db/db_event.php
+ godmode/agentes/agent_template.php
+ godmode/agentes/module_manager_editor_common.php
+ godmode/agentes/fields_manager.php
+ godmode/agentes/module_manager.php
+ godmode/agentes/modificar_agente.php
+ godmode/agentes/agent_manager.php
+ godmode/servers/recon_script.php
+ godmode/servers/plugin.php
+ godmode/servers/manage_recontask.php
+ godmode/servers/modificar_server.php
+ godmode/alerts/alert_list.list.php
+ godmode/alerts/alert_templates.php
+ godmode/alerts/alert_actions.php
+ godmode/alerts/alert_commands.php
+ godmode/snmpconsole/snmp_alert.php
+ godmode/snmpconsole/snmp_filters.php
+ godmode/users/user_list.php
+ godmode/users/profile_list.php
+ godmode/gis_maps/index.php
+ godmode/massive/massive_operations.php
+ godmode/modules/manage_network_templates.php
+ godmode/modules/manage_network_components.php
+ godmode/reporting/reporting_builder.list_items.php
+ godmode/reporting/reporting_builder.main.php
+ godmode/reporting/visual_console_builder.data.php
+ godmode/reporting/reporting_builder.php
+ godmode/reporting/graph_builder.preview.php
+ godmode/tag/tag.php
+ godmode/tag/edit_tag.php: Improved Css styles.
+
+ * images/splash_pandora.png
+ images/black_red_header.png
+ images/black_background.png: Added images for new styles.
+
+ *include/styles/pandora_red.css
+ include/styles/pandora_width.css: Deleted old styles.
+
2011-07-06 Sergio Martin <sergio.martin@artica.es>
* include/functions_servers.php: Fixed divison by zero
diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php
index e992f9b154..2572e2064e 100644
--- a/pandora_console/extensions/update_manager/main.php
+++ b/pandora_console/extensions/update_manager/main.php
@@ -191,7 +191,7 @@ if (check_acl ($config['id_user'], 0, 'PM')) {
$table->data = array ();
$table->colspan[0][0] = 2;
- $table->data[0][0] = '<h3>'.__('Offline packages loader').'</h3>';
+ $table->data[0][0] = '<h4>'.__('Offline packages loader').'</h4>';
$table->data[1][0] = '<input type="hidden" name="upload_package" value="1">';
$table->data[1][0] .= '<input type="file" size="55" name="fileloaded">';
$table->data[1][1] = '<input type="submit" name="upload_button" value="'.__('Upload').'">';
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index a08231c848..bb8d83e066 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -22,20 +22,22 @@ if (!empty ($page) && !empty ($sec)) {
}
}
-echo '<div class="databox" id="login">';
+echo '<div class="databox_login" id="login">';
//echo '<h1>Put here your custom welcome message</h1>";
-echo '<br /><br />';
+//echo '<br /><br /><br />';
echo '
<div id="login_in">
<form method="post" action="index.php'.$url.'">
<table cellpadding="4" cellspacing="1" width="420">';
if (isset ($login_failed)) {
- echo '<tr><td colspan="3">';
+// echo '<tr><td colspan="3">';
+ echo '<div style="margin-top:-35px;">';
echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>';
- echo '</td></tr>';
+ echo '</div>';
+// echo '</td></tr>';
}
echo '<tr><td rowspan="3" align="left">';
diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php
index 692fa43592..f90f11bf97 100644
--- a/pandora_console/general/logoff.php
+++ b/pandora_console/general/logoff.php
@@ -15,9 +15,9 @@
// GNU General Public License for more details.
?>
-<div class="databox" id="login">
+<div class="databox_login" id="login">
<h1 id="log"><?php echo __('Logged out'); ?></h1>
- <div class="databox" style="width: 400px;">
+ <div class="databox" style="width: 400px; margin: 0 auto auto;">
<table cellpadding="4" cellspacing="1" width="400">
<tr><td align="left">
<?php
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index d4fb6738b0..07f2004b13 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -35,7 +35,7 @@ ui_print_page_header (__('Welcome to Pandora FMS Web Console'));
// ---------------------------------------------------------------------------
echo '<div style="width:50%; float:left; padding-right: 30px;" id="leftcolumn">';
-echo '<h2>' . __('Site news') . '</h2>';
+
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
@@ -149,7 +149,7 @@ echo '<div id="activity" style="width:87%;">';
echo "<br /><br />";
// Show last activity from this user
-echo "<h2>" . __('This is your last activity in Pandora FMS console') . "</h2>";
+echo "<h4>" . __('This is your last activity in Pandora FMS console') . "</h4>";
$table->width = '98%'; //Don't specify px
$table->data = array ();
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index bcf1cdbae9..5a4bd7485f 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -76,7 +76,7 @@ $table->data[5][1] = html_print_submit_button(__('Filter'), 'filter', false, 'cl
html_print_table($table);
echo '</form>';
echo '</div>';
-echo '<div style="float: right; width: 250px;">';
+echo '<div style="float: right; width: 300px;">';
echo graphic_user_activity2(300, 140);
@@ -168,7 +168,7 @@ if (empty ($result)) {
$table->cellpadding = 4;
$table->cellspacing = 4;
-$table->width = 750;
+$table->width = '98%';
$table->class = "databox";
$table->size = array ();
$table->data = array ();
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 37e7639ca6..358cf5a88c 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -99,7 +99,7 @@ $table->data = array ();
$table->data[0][0] = __('Agent name') .
ui_print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
-$table->data[0][1] = html_print_input_text ('agente', $nombre_agente, '', 30, 100,true);
+$table->data[0][1] = html_print_input_text ('agente', $nombre_agente, '', 50, 100,true);
if ($id_agente) {
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index ecc3eb9a91..ee223321b7 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -88,7 +88,7 @@ if (isset ($_POST["template_id"])) {
'estado' => 0,
'id_agente' => $id_agente,
'utimestamp' => 0);
- process_sql_insert('tagente_estado', $values);
+ db_process_sql_insert('tagente_estado', $values);
}
else {
echo '<h3 class="error">'.__('Error adding module').'</h3>';
@@ -118,16 +118,21 @@ foreach ($nps as $row) {
$select[$row["id_np"]] = $row["name"];
}
-echo '<div>'.__('Template');
-html_print_select ($select, "template_id");
-echo ' ';
+echo '<table width="98%" cellpadding="2" cellspacing="2" class="databox" >';
+echo "<tr><td class='datos' style='width:50%'>";
+html_print_select ($select, "template_id", '', '', '', 0, false, false, true, '', false, 'max-width: 200px !important');
+echo '</td>';
+echo '<td class="datos">';
html_print_submit_button (__('Assign'), 'crt', false, 'class="sub next"');
-echo '</div></form>';
+echo '</td>';
+echo '</tr>';
+echo "</form>";
+echo "</table>";
+echo '</form>';
// ==========================
// MODULE VISUALIZATION TABLE
// ==========================
-echo "<h4>".__('Assigned modules')."</h4>";
switch ($config["dbtype"]) {
case "mysql":
@@ -143,7 +148,7 @@ if ($result === false) {
$result = array ();
}
-$table->width = '95%';
+$table->width = '98%';
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = "databox";
@@ -162,7 +167,7 @@ $table->align[3] = "center";
foreach ($result as $row) {
$data = array ();
- $data[0] = $row["nombre"];
+ $data[0] = '<span style="font-size: 7.2pt">' . $row["nombre"];
if ($row["id_tipo_modulo"] > 0) {
$data[1] = html_print_image("images/" . modules_show_icon_type ($row["id_tipo_modulo"]), true, array("border" => "0"));
} else {
@@ -170,9 +175,9 @@ foreach ($result as $row) {
}
$data[2] = mb_substr ($row["descripcion"], 0, 60);
- $data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . html_print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a> ';
+ $data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . html_print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a> ';
- $data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+ $data[3] .= ' <a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index 703c96ca63..c986dc1591 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -116,7 +116,7 @@ foreach ($fields as $field) {
}
$data[2] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configure_field&id_field='.$field['id_field'].'">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')) . '</a>';
- $data[2] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . '</a>';
+ $data[2] .= ' <a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . '</a>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index b0e60f3dbf..b13381c1d6 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -373,7 +373,7 @@ if ($agents !== false) {
echo '<span class="left">';
echo "<strong><a href='index.php?sec=gagente&
sec2=godmode/agentes/configurar_agente&tab=main&
- id_agente=".$agent["id_agente"]."'>" . ui_print_truncate_text($agent["nombre"], 40, true)."</a></strong>";
+ id_agente=".$agent["id_agente"]."'>" . ui_print_truncate_text($agent["nombre"], 60, true, true, true, '[…]', 'font-size: 7pt')."</a></strong>";
if ($agent["disabled"]) {
ui_print_help_tip(__('Disabled'));
echo "</em>";
@@ -453,7 +453,7 @@ $(document).ready (function () {
},
function () {
$(".actions", this).css ("visibility", "hidden");
- });
+ });
$("#ag_group").click (
function () {
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 4ddcfbc0df..32e876f7a6 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -26,9 +26,9 @@ require_once ('include/functions_agents.php');
require_once ('include/functions_servers.php');
// Create module/type combo
-echo '<table width="95%" cellpadding="4" cellspacing="4" class="databox" style="text-align:center; ">';
+echo '<table width="98%" cellpadding="2" cellspacing="2" class="databox" >';
echo '<form id="create_module_type" method="post" action="'.$url.'">';
-echo "<tr><td class='datos'>";
+echo "<tr><td class='datos' style='width:50%'>";
// Check if there is at least one server of each type available to assign that
// kind of modules. If not, do not show server type in combo
@@ -153,8 +153,6 @@ if ($multiple_delete) {
// MODULE VISUALIZATION TABLE
// ==========================
-echo "<h4>".__('Assigned modules')."</h4>";
-
$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=' . $id_agente;
$selectNameUp = '';
$selectNameDown = '';
@@ -269,7 +267,7 @@ if ($modules === false) {
return;
}
-$table->width = '95%';
+$table->width = '98%';
$table->head = array ();
$table->head[0] = __('Name') . ' ' .
'<a href="' . $url . '&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
@@ -296,7 +294,7 @@ $table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->size = array ();
$table->size[2] = '55px';
-$table->size[7] = '90px';
+$table->size[7] = '100px';
$table->align = array ();
$table->align[2] = 'center';
$table->align[7] = 'left';
@@ -345,9 +343,9 @@ foreach ($modules as $module) {
$data[0] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$module['id_agente_modulo'].'">';
if ($module["disabled"])
- $data[0] .= '<em class="disabled_module">' . ui_print_truncate_text($module['nombre'], 25, false).'</em>';
+ $data[0] .= '<em class="disabled_module">' . ui_print_truncate_text($module['nombre'], 50, false, true, true, '[…]', 'font-size: 7.2pt').'</em>';
else
- $data[0] .= ui_print_truncate_text($module['nombre'], 25, false);
+ $data[0] .= ui_print_truncate_text($module['nombre'], 50, false, true, true, '[…]', 'font-size: 7.2pt');
$data[0] .= '</a>';
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
@@ -420,12 +418,12 @@ foreach ($modules as $module) {
// Delete module
$data[7] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
- $data[7] .= '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$module['id_agente_modulo'].'"
+ $data[7] .= ' <a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$module['id_agente_modulo'].'"
onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[7] .= html_print_image ('images/cross.png', true,
array ('title' => __('Delete')));
$data[7] .= '</a> ';
- $data[7] .= '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
+ $data[7] .= ' <a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[7] .= html_print_image ('images/copy.png', true,
array ('title' => __('Duplicate')));
@@ -435,7 +433,7 @@ foreach ($modules as $module) {
if (isset($numericModules[$type])) {
if ($numericModules[$type] === true) {
- $data[7] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
+ $data[7] .= ' <a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[7] .= html_print_image ('images/chart_curve.png', true,
array ('title' => __('Normalize')));
$data[7] .= '</a>';
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 34ecbd8f51..81cb3f9e78 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -122,7 +122,7 @@ $table_simple->style[0] = 'font-weight: bold; vertical-align: top';
$table_simple->style[2] = 'font-weight: bold; vertical-align: top';
$table_simple->data[0][0] = __('Name');
-$table_simple->data[0][1] = html_print_input_text ('name', $name, '', 20, 100, true, $disabledBecauseInPolicy);
+$table_simple->data[0][1] = html_print_input_text ('name', $name, '', 50, 100, true, $disabledBecauseInPolicy);
$table_simple->data[0][2] = __('Disabled');
$table_simple->data[0][3] = html_print_checkbox ("disabled", 1, $disabled, true);
@@ -245,14 +245,14 @@ if ($__code_from == 'modules') {
$__id_where = 'b.id_policy_module';
$__id = $__id_pol_mod;
}
-$table_advanced->data[6][1] = html_print_select_from_sql ("SELECT id_tag, name
+$table_advanced->data[6][1] = html_print_select_from_sql ("SELECT id_tag, name
FROM ttag
WHERE id_tag NOT IN (
SELECT a.id_tag
FROM ttag a, $__table_modules b
WHERE a.id_tag = b.id_tag AND $__id_where = $__id )
ORDER BY name",
- 'id_tag_available[]', $id_tag, '',__('None'),'0', true, true, false, false);
+ 'id_tag_available[]', $id_tag, '',__('None'),'0', true, true, false, false, 'width: 200px', '5');
$table_advanced->data[6][2] = html_print_image('images/darrowright.png', true, array('id' => 'right', 'title' => __('Add tags to module'))); //html_print_input_image ('add', 'images/darrowright.png', 1, '', true, array ('title' => __('Add tags to module')));
$table_advanced->data[6][2] .= '<br><br><br><br>' . html_print_image('images/darrowleft.png', true, array('id' => 'left', 'title' => __('Delete tags to module'))); //html_print_input_image ('add', 'images/darrowleft.png', 1, '', true, array ('title' => __('Delete tags to module')));
@@ -261,7 +261,7 @@ $table_advanced->data[6][4] = html_print_select_from_sql ("SELECT a.id_tag, nam
FROM ttag a, $__table_modules b
WHERE a.id_tag = b.id_tag AND $__id_where = $__id
ORDER BY name",
- 'id_tag_selected[]', $id_tag, '',__('None'),'0', true, true, false, false);
+ 'id_tag_selected[]', $id_tag, '',__('None'),'0', true, true, false, false, 'width: 200px', '5');
//$table_advanced->data[6][4] .= html_print_input_hidden('id_tag_serialize', '');
?>
diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index 1326d85e2e..8345ba5a8b 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -260,9 +260,11 @@ $table->head[3] = __('Delete');
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->size = array ();
+$table->size[1] = '30px';
$table->size[2] = '40px';
$table->size[3] = '40px';
$table->align = array ();
+$table->align[1] = 'center';
$table->align[2] = 'center';
$table->align[3] = 'center';
@@ -284,7 +286,7 @@ foreach ($actions as $action) {
$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'">'.
$action['name'].'</a>';
- $data[1] = ui_print_group_icon ($action["id_group"], true) .' '. ui_print_truncate_text(groups_get_name ($action["id_group"], true));
+ $data[1] = ui_print_group_icon ($action["id_group"], true) .' ';
$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&copy_action=1&id='.$action['id'].'"
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' .
html_print_image("images/copy.png", true) . '</a>';
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 852aa40653..ae5961fdcb 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -144,11 +144,13 @@ if ($commands === false)
foreach ($commands as $command) {
$data = array ();
+ $data[0] = '<span style="font-size: 7.5pt">';
if (! $command['internal'])
- $data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command&id='.$command['id'].'">'.
+ $data[0] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command&id='.$command['id'].'">'.
$command['name'].'</a>';
else
- $data[0] = $command['name'];
+ $data[0] .= $command['name'];
+ $data[0] .= '</span>';
$data[1] = $command['id'];
$data[2] = $command['description'];
$data[3] = '';
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index b5ee39d17d..d76e86f4c2 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -300,75 +300,67 @@ $table->class = 'alert_list';
$table->width = '98%';
$table->size = array ();
-$table->align[0] = 'center';
-$table->align[1] = 'center';
+$table->align[2] = 'center';
+$table->align[3] = 'center';
+$table->align[4] = 'center';
+$table->align[5] = 'center';
$table->head = array ();
-$table->head[0] = "<span title='" . __('Enabled / Disabled') . "'>" . __('E/D') . "</span><br>" .
- '<a href="' . $url . '&sort_field=disabled&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDisabledUp)) . '</a>' .
- '<a href="' . $url . '&sort_field=disabled&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDisabledDown)) . '</a>';
-$table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span><br>" .
- '<a href="' . $url . '&sort_field=standby&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectStandbyUp)) . '</a>' .
- '<a href="' . $url . '&sort_field=standby&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectStandbyDown)) . '</a>';
+
if (! $id_agente) {
$table->style = array ();
- $table->style[2] = 'font-weight: bold';
- $table->head[2] = __('Agent') . '<br>' .
+ $table->style[0] = 'font-weight: bold';
+ $table->head[0] = __('Agent') . '<br>' .
'<a href="' . $url . '&sort_field=agent&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
'<a href="' . $url . '&sort_field=agent&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
- $table->size[0] = '6%';
- $table->size[1] = '6%';
- $table->size[2] = '20%';
- $table->size[3] = '20%';
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
- $table->size[4] = '15%';
- }
- $table->size[5] = '6%';
- $table->size[6] = '15%';
+ $table->size[0] = '20%';
+ $table->size[1] = '15%';
+ $table->size[2] = '15%';
+ $table->size[3] = '15%';
+ $table->size[4] = '2%';
+ $table->size[5] = '8%';
+
+/* if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+ $table->size[4] = '8%';
+ }*/
}
else {
/* Different sizes or the layout screws up */
- $table->size[0] = '6%';
- $table->size[1] = '6%';
+ $table->size[0] = '0%';
+ $table->size[1] = '25%';
$table->size[3] = '25%';
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+/* if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->size[4] = '25%';
- }
- $table->size[5] = '6%';
- $table->size[6] = '25%';
- $table->size[7] = '10%';
-
+ } */
+ $table->size[4] = '3%';
+ $table->size[5] = '10%';
}
-$table->head[3] = __('Module') . '<br>' .
+$table->head[1] = __('Module') . '<br>' .
'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
-$table->head[4] = __('Template') . '<br>' .
+$table->head[2] = __('Template') . '<br>' .
'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
-if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+/*if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->head[5] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
-}
-$table->head[6] = __('Actions');
-$table->head[7] = __('Status');
-$table->head[8] = "<span title='" . __('Delete') . "'>" . __('D.') . "</span>";
+}*/
+$table->head[3] = __('Actions');
+$table->head[4] = __('Status');
+$table->head[5] = "<span title='" . __('Operations') . "'>" . __('Op.') . "</span>";
$table->valign[0] = 'middle';
$table->valign[1] = 'middle';
$table->valign[2] = 'middle';
$table->valign[3] = 'middle';
$table->valign[4] = 'middle';
-$table->valign[6] = 'middle';
-$table->valign[7] = 'middle';
-$table->valign[8] = 'middle';
+$table->valign[5] = 'middle';
$table->align[2] = 'center';
-if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+$table->align[3] = 'center';
+
+/*if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->align[5] = 'center';
-}
-$table->align[4] = 'center';
-$table->align[6] = 'left';
-$table->align[7] = 'center';
-$table->align[8] = 'center';
+}*/
$table->data = array ();
@@ -394,7 +386,7 @@ foreach ($simple_alerts as $alert) {
$data = array ();
- $data[0] = '<form class="disable_alert_form" method="post" style="display: inline;">';
+/* $data[0] = '<form class="disable_alert_form" method="post" style="display: inline;">';
if ($alert['disabled']) {
$data[0] .= html_print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
$data[0] .= html_print_input_hidden ('enable_alert', 1, true);
@@ -416,28 +408,28 @@ foreach ($simple_alerts as $alert) {
$data[1] .= html_print_input_hidden ('standbyoff_alert', 1, true);
}
$data[1] .= html_print_input_hidden ('id_alert', $alert['id'], true);
- $data[1] .= '</form>';
+ $data[1] .= '</form>'; */
if (! $id_agente) {
$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
- $data[2] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agent.'">';
+ $data[0] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agent.'">';
if ($alert['disabled'])
- $data[2] .= '<span style="font-style: italic; color: #aaaaaa;">';
- $data[2] .= agents_get_name ($id_agent);
+ $data[0] .= '<span style="font-style: italic; color: #aaaaaa;">';
+ $data[0] .= '<span style="font-size: 7.2pt">' . agents_get_name ($id_agent) . '</span>';
if ($alert['disabled'])
- $data[2] .= '</span>';
- $data[2] .= '</a>';
+ $data[0] .= '</span>';
+ $data[0] .= '</a>';
}
- $data[3] = ui_print_truncate_text(modules_get_agentmodule_name ($alert['id_agent_module']), 25, false);
- $data[4] = ' <a class="template_details"
+ $data[1] = ui_print_truncate_text(modules_get_agentmodule_name ($alert['id_agent_module']), 35, false, true, true, '[…]', 'font-size: 7.2pt');
+
+ $data[2] = ' <a class="template_details"
href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$alert['id_alert_template'].'">' .
html_print_image("images/zoom.png", true, array("id" => 'template-details-'.$alert['id_alert_template'], "class" => "img_help")) . '</a> ';
-
- $data[4] .= "<a href='index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id=".$alert['id_alert_template']."'>";
- $data[4] .= ui_print_truncate_text(alerts_get_alert_template_name ($alert['id_alert_template']), 15, false);
- $data[4] .= "</a>";
+ $data[2] .= "<a href='index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id=".$alert['id_alert_template']."'>";
+ $data[2] .= ui_print_truncate_text(alerts_get_alert_template_name ($alert['id_alert_template']), 55, false, true, true, '[…]', 'font-size: 7.1pt');
+ $data[2] .= "</a>";
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+/* if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$policyInfo = policies_is_alert_in_policy2($alert['id'], false);
if ($policyInfo === false)
$data[5] = '';
@@ -448,93 +440,93 @@ foreach ($simple_alerts as $alert) {
html_print_image($img,true, array('title' => $policyInfo['name'])) .
'</a>';
}
- }
+ } */
$actions = alerts_get_alert_agent_module_actions ($alert['id']);
- $data[6] = '';
+ $data[3] = '';
if (empty($actions)){
// Get and show default actions for this alert
$default_action = db_get_sql ("SELECT id_alert_action FROM talert_templates WHERE id = ".$alert["id_alert_template"]);
if ($default_action != ""){
- $data[6] = __("Default"). " : ".db_get_sql ("SELECT name FROM talert_actions WHERE id = $default_action");
+ $data[3] = __("Default"). " : ".db_get_sql ("SELECT name FROM talert_actions WHERE id = $default_action");
}
}
else {
- $data[6] = '<ul class="action_list">';
+ $data[3] = '<ul class="action_list">';
foreach ($actions as $action_id => $action) {
- $data[6] .= '<li>';
+ $data[3] .= '<li>';
if ($alert['disabled'])
- $data[6] .= '<font class="action_name" style="font-style: italic; color: #aaaaaa;">';
+ $data[3] .= '<font class="action_name" style="font-style: italic; color: #aaaaaa;">';
else
- $data[6] .= '<font class="action_name">';
- $data[6] .= ui_print_truncate_text($action['name'], 15, false);
- $data[6] .= ' <em>(';
+ $data[3] .= '<font class="action_name">';
+ $data[3] .= ui_print_truncate_text($action['name'], 15, false);
+ $data[3] .= ' <em>(';
if ($action['fires_min'] == $action['fires_max']) {
if ($action['fires_min'] == 0)
- $data[6] .= __('Always');
+ $data[3] .= __('Always');
else
- $data[6] .= __('On').' '.$action['fires_min'];
+ $data[3] .= __('On').' '.$action['fires_min'];
}
else {
if ($action['fires_min'] == 0)
- $data[6] .= __('Until').' '.$action['fires_max'];
+ $data[3] .= __('Until').' '.$action['fires_max'];
else
- $data[6] .= __('From').' '.$action['fires_min'].
+ $data[3] .= __('From').' '.$action['fires_min'].
' '.__('to').' '.$action['fires_max'];
}
if ($action['module_action_threshold'] != 0)
- $data[6] .= ' '.__('Threshold').' '.$action['module_action_threshold'];
+ $data[3] .= ' '.__('Threshold').' '.$action['module_action_threshold'];
- $data[6] .= ')</em>';
- $data[6] .= '</font>';
+ $data[3] .= ')</em>';
+ $data[3] .= '</font>';
// $data[6] .= ' <span class="delete" style="clear:right">';
- $data[6] .= '<form method="post" class="delete_link" style="display: inline; vertical-align: -50%;">';
- $data[6] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
- $data[6] .= html_print_input_hidden ('delete_action', 1, true);
- $data[6] .= html_print_input_hidden ('id_alert', $alert['id'], true);
- $data[6] .= html_print_input_hidden ('id_action', $action_id, true);
- $data[6] .= '</form>';
-// $data[6] .= '</span>';
- $data[6] .= '</li>';
+ $data[3] .= '<form method="post" class="delete_link" style="display: inline; vertical-align: -50%;">';
+ $data[3] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
+ $data[3] .= html_print_input_hidden ('delete_action', 1, true);
+ $data[3] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+ $data[3] .= html_print_input_hidden ('id_action', $action_id, true);
+ $data[3] .= '</form>';
+// $data[3] .= '</span>';
+ $data[3] .= '</li>';
}
- $data[6] .= '</ul>';
+ $data[3] .= '</ul>';
}
- $data[6] .= '<a class="add_action" id="add-action-'.$alert['id'].'" href="#">';
- $data[6] .= html_print_image ('images/add.png', true);
+ $data[3] .= '<a class="add_action" id="add-action-'.$alert['id'].'" href="#">';
+ $data[3] .= html_print_image ('images/add.png', true);
if ($alert['disabled'])
- $data[6] .= ' '. '<span style="font-style: italic; color: #aaaaaa;">' .__('Add action') . '</span>';
+ $data[3] .= ' '. '<span style="font-style: italic; color: #aaaaaa;">' .__('Add action') . '</span>';
else
- $data[6] .= ' ' . __('Add action');
- $data[6] .= '</a>';
+ $data[3] .= ' ' . __('Add action');
+ $data[3] .= '</a>';
- $data[6] .= '<form id="add_action_form-'.$alert['id'].'" method="post" class="invisible">';
- $data[6] .= html_print_input_hidden ('add_action', 1, true);
- $data[6] .= html_print_input_hidden ('id_alert_module', $alert['id'], true);
+ $data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post" class="invisible">';
+ $data[3] .= html_print_input_hidden ('add_action', 1, true);
+ $data[3] .= html_print_input_hidden ('id_alert_module', $alert['id'], true);
$own_info = get_user_info($config['id_user']);
$own_groups = users_get_groups($config['id_user'], 'LW', $own_info['is_admin']);
$filter_groups = '';
$filter_groups = implode(',', array_keys($own_groups));
$actions = alerts_get_alert_actions_filter(true, 'id_group IN (' . $filter_groups . ')');
- $data[6] .= html_print_select ($actions, 'action', '', '', __('None'), 0, true);
- $data[6] .= '<br />';
- $data[6] .= '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' » </a></span>';
- $data[6] .= '<span class="advanced_actions invisible">';
- $data[6] .= __('Number of alerts match from').' ';
- $data[6] .= html_print_input_text ('fires_min', -1, '', 4, 10, true);
- $data[6] .= ' '.__('to').' ';
- $data[6] .= html_print_input_text ('fires_max', -1, '', 4, 10, true);
- $data[6] .= ui_print_help_icon ("alert-matches", true);
- $data[6] .= '<br />' . __('Threshold');
- $data[6] .= html_print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
- $data[6] .= '</span>';
- $data[6] .= '<div class="right">';
- $data[6] .= html_print_submit_button (__('Add'), 'add_action', false, 'class="sub next"', true);
- $data[6] .= '</div>';
- $data[6] .= '</form>';
+ $data[3] .= html_print_select ($actions, 'action', '', '', __('None'), 0, true);
+ $data[3] .= '<br />';
+ $data[3] .= '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' » </a></span>';
+ $data[3] .= '<span class="advanced_actions invisible">';
+ $data[3] .= __('Number of alerts match from').' ';
+ $data[3] .= html_print_input_text ('fires_min', -1, '', 4, 10, true);
+ $data[3] .= ' '.__('to').' ';
+ $data[3] .= html_print_input_text ('fires_max', -1, '', 4, 10, true);
+ $data[3] .= ui_print_help_icon ("alert-matches", true);
+ $data[3] .= '<br />' . __('Threshold');
+ $data[3] .= html_print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
+ $data[3] .= '</span>';
+ $data[3] .= '<div class="right">';
+ $data[3] .= html_print_submit_button (__('Add'), 'add_action', false, 'class="sub next"', true);
+ $data[3] .= '</div>';
+ $data[3] .= '</form>';
$status = STATUS_ALERT_NOT_FIRED;
$title = "";
@@ -552,14 +544,50 @@ foreach ($simple_alerts as $alert) {
$title = __('Alert not fired');
}
- $data[7] = ui_print_status_image($status, $title, true);
+ $data[4] = ui_print_status_image($status, $title, true);
- $data[8] = '<form class="delete_alert_form" method="post" style="display: inline;">';
+ $data[5] = '<form class="disable_alert_form" method="post" style="display: inline;">';
+ if ($alert['disabled']) {
+ $data[5] .= html_print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
+ $data[5] .= html_print_input_hidden ('enable_alert', 1, true);
+ }
+ else {
+ $data[5] .= html_print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
+ $data[5] .= html_print_input_hidden ('disable_alert', 1, true);
+ }
+ $data[5] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+ $data[5] .= '</form>';
- $data[8] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
- $data[8] .= html_print_input_hidden ('delete_alert', 1, true);
- $data[8] .= html_print_input_hidden ('id_alert', $alert['id'], true);
- $data[8] .= '</form>';
+ $data[5] .= ' <form class="standby_alert_form" method="post" style="display: inline;">';
+ if (!$alert['standby']) {
+ $data[5] .= html_print_input_image ('standby_off', 'images/bell.png', 1, '', true);
+ $data[5] .= html_print_input_hidden ('standbyon_alert', 1, true);
+ }
+ else {
+ $data[5] .= html_print_input_image ('standby_on', 'images/bell_pause.png', 1, '', true);
+ $data[5] .= html_print_input_hidden ('standbyoff_alert', 1, true);
+ }
+ $data[5] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+ $data[5] .= '</form>';
+
+ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+ $policyInfo = policies_is_alert_in_policy2($alert['id'], false);
+ if ($policyInfo === false)
+ $data[5] .= '';
+ else {
+ $img = 'images/policies.png';
+
+ $data[5] .= ' <a href="?sec=gpolicies&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id'] . '">' .
+ html_print_image($img,true, array('title' => $policyInfo['name'])) .
+ '</a>';
+ }
+ }
+
+ $data[5] .= ' <form class="delete_alert_form" method="post" style="display: inline;">';
+ $data[5] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
+ $data[5] .= html_print_input_hidden ('delete_alert', 1, true);
+ $data[5] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+ $data[5] .= '</form>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index fc5c2caab7..b125663008 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -240,8 +240,9 @@ $table->head[4] = __('Op.');
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->size = array ();
-$table->size[4] = '50px';
+$table->size[4] = '65px';
$table->align = array ();
+$table->align[1] = 'center';
$table->align[4] = 'center';
$rowPair = true;
@@ -259,7 +260,7 @@ foreach ($templates as $template) {
$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$template['id'].'">'.
$template['name'].'</a>';
- $data[1] = ui_print_group_icon ($template["id_group"], true) .' '. ui_print_truncate_text(groups_get_name ($template['id_group'], true));
+ $data[1] = ui_print_group_icon ($template["id_group"], true);
$data[3] = alerts_get_alert_templates_type_name ($template['type']);
$data[4] = '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template" style="display: inline; float: left">';
@@ -268,7 +269,7 @@ foreach ($templates as $template) {
$data[4] .= html_print_input_image ('dup', 'images/copy.png', 1, '', true, array ('title' => __('Duplicate')));
$data[4] .= '</form> ';
- $data[4] .= '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
+ $data[4] .= ' <form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden ('delete_template', 1, true);
$data[4] .= html_print_input_hidden ('id', $template['id'], true);
$data[4] .= html_print_input_image ('del', 'images/cross.png', 1, '', true, array ('title' => __('Delete')));
diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php
index 3d9a2f1b5a..8fda0b21b0 100644
--- a/pandora_console/godmode/db/db_audit.php
+++ b/pandora_console/godmode/db/db_audit.php
@@ -84,7 +84,7 @@ echo "<b>".__('Latest date')."</b></td>";
echo "<td class='datos'>".$result["latest_date"]."</td>";
echo "</tr></table>";
?>
-<h3><?php echo __('Purge data') ?></h3>
+<h4><?php echo __('Purge data') ?></h4>
<form name="db_audit" method="post" action="index.php?sec=gdbman&sec2=godmode/db/db_audit">
<table width='98%' cellpadding='4' cellspacing='4' class='databox'>
<tr><td class='datos'>
diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php
index a9f7578fcd..d33b6dd2cf 100644
--- a/pandora_console/godmode/db/db_event.php
+++ b/pandora_console/godmode/db/db_event.php
@@ -63,7 +63,7 @@ $table->data[2][1] = $row["latest_date"];
html_print_table ($table);
unset ($table);
-echo '<h3>'.__('Purge data').'</h3>';
+echo '<h4>'.__('Purge data').'</h4>';
echo '<form name="db_audit" method="post" action="index.php?sec=gdbman&sec2=godmode/db/db_event">';
echo '<table width="98%" cellpadding="4" cellspacing="4" class="databox">
diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php
index fb372ce225..a599746738 100644
--- a/pandora_console/godmode/db/db_refine.php
+++ b/pandora_console/godmode/db/db_refine.php
@@ -70,7 +70,7 @@ echo '<b>'.__('Source agent').'</b><br /><br />';
$agent_selected = get_parameter_post ("origen", 0);
$agents = agents_get_group_agents (array_keys (users_get_groups ($config["id_user"], "AW")));
-html_print_select ($agents, "origen", $agent_selected, 'javascript:this.form.update_agent.click();', __('No agent selected'), '0', false, false, false, 'w130');
+html_print_select ($agents, "origen", $agent_selected, 'javascript:this.form.update_agent.click();', __('No agent selected'), '0', false, false, false, '', false, 'max-width:300px !important;');
echo ' ';
@@ -82,11 +82,11 @@ echo '<b>'.__('Modules').'</b><br /><br />';
$module_selected = get_parameter_post ("origen", array ());
$modules = agents_get_modules ($module_selected, false, 'delete_pending != 1');
-html_print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, true, false, 'w130');
+html_print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, true, false, '', false, 'max-width: 300px !important;');
echo '</div>'; //Left div
-echo '<div style="float:left; width:"98%";"><b>'.__('Purge data out of these limits').'</b><br /><br />';
+echo '<div style="float:left; width:\'98%\'; margin-left:20% "><b>'.__('Purge data out of these limits').'</b><br /><br />';
echo '<table><tr><td>';
echo __('Minimum').': ';
echo '</td><td>';
diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php
index 3fe4374c40..c51e19ba40 100644
--- a/pandora_console/godmode/gis_maps/index.php
+++ b/pandora_console/godmode/gis_maps/index.php
@@ -70,12 +70,14 @@ $table->head[1] = __('Group');
$table->head[2] = __('View');
if ($display_default_column)
$table->head[3] = __('Default');
-$table->head[4] = __('Delete');
+$table->head[4] = '<span title="Operations">' . __('Op.') . '</span>';
$table->align[1] = 'center';
$table->align[2] = 'center';
$table->align[3] = 'center';
$table->align[4] = 'center';
+$table->size = array();
+$table->size[4] = '60px';
$maps = db_get_all_rows_in_table ('tgis_map','map_name');
@@ -106,8 +108,9 @@ if (!$maps) {
$default_button = html_print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true);
array_push($table_info, $default_button);
}
- $delete_button = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/index&map_id='.$map['id_tgis_map'].'&action=delete_map" onclick="return confirmDelete();">' . html_print_image ("images/cross.png", true).'</a>';
- array_push ($table_info, $delete_button);
+ $buttons = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&action=edit_map">' . html_print_image ("images/config.png", true).'</a> ';
+ $buttons .= '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/index&map_id='.$map['id_tgis_map'].'&action=delete_map" onclick="return confirmDelete();">' . html_print_image ("images/cross.png", true).'</a>';
+ array_push ($table_info, $buttons);
$table->data[] = $table_info;
}
html_print_table($table);
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 8d86430729..240f60aa7d 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -282,7 +282,7 @@ foreach ($groups as $id_group => $group) {
'<a href="javascript: showBranch(' . $group['id_grupo'] . ', ' . $group['parent'] . ');" title="' . __('Show branch children') . '"><span class="symbol_' . $group['id_grupo'] . ' ' . $symbolBranchs . '">' . $symbol . '</span> '. ui_print_truncate_text($group['nombre']).'</a></strong>';
}
else {
- $data[0] = '<strong>'.$tabulation . ' '. ui_print_truncate_text($group['nombre']).'</strong>';
+ $data[0] = '<strong>'.$tabulation . ' '. ui_print_truncate_text($group['nombre'], 60).'</strong>';
}
$data[1] = $group['id_grupo'];
$data[2] = ui_print_group_icon($group['id_grupo'], true);
@@ -292,7 +292,7 @@ foreach ($groups as $id_group => $group) {
}
else {
$data[4] = '<a href="index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'].'">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0'));
- $data[4] .= '<a href="index.php?sec=gagente&sec2=godmode/groups/group_list&id_group='.$id_group.'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0'));
+ $data[4] .= ' <a href="index.php?sec=gagente&sec2=godmode/groups/group_list&id_group='.$id_group.'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0'));
}
array_push ($table->data, $data);
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 9f69793d81..98473e047a 100644
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -132,7 +132,6 @@ ui_print_page_header (__('Massive operations'). ' » '. $options[$option],
echo '<form method="post" id="form_options" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations">';
echo '<table border="0"><tr><td>';
-echo '<h3>'.__('Massive options').':</h3>';
echo '</td><td>';
html_print_select($options, 'option', $option, 'this.form.submit()', '', 0, false, false, false);
if($option == 'edit_agents' || $option == 'edit_modules')
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index b82e709451..80db141c5c 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -324,7 +324,7 @@ foreach ($components as $component) {
$data[6] = '<a style="display: inline; float: left" href="' . $url . '&search_id_group=' . $search_id_group .
'search_string=' . $search_string . '&duplicate_network_component=1&source_id=' . $component['id_nc'] . '">' .
html_print_image('images/copy.png', true, array('alt' => __('Duplicate'), 'title' => __('Duplicate'))) . '</a>';
- $data[6] .= '<a href="' . $url . '&delete_component=1&id=' . $component['id_nc'] . '&search_id_group=' . $search_id_group .
+ $data[6] .= ' <a href="' . $url . '&delete_component=1&id=' . $component['id_nc'] . '&search_id_group=' . $search_id_group .
'search_string=' . $search_string .
'" onclick="if (! confirm (\''.__('Are you sure?').'\')) return false" >' .
html_print_image('images/cross.png', true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>';
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index bd077d5129..baecd0c0ed 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -144,6 +144,9 @@ $table->head = array ();
$table->head[0] = __('Name');
$table->head[1] = __('Description');
$table->head[2] = __('Action');
+$table->size = array ();
+$table->size[1] = '65%';
+$table->size[2] = '10%';
$table->align = array ();
$table->align[2] = "center";
@@ -153,7 +156,7 @@ $table->data = array ();
foreach ($result as $row) {
$data = array ();
$data[0] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$row["id_np"].'">'. io_safe_output($row["name"]).'</a>';
- $data[1] = ui_print_truncate_text(io_safe_output($row["description"]), 70, true, true, true, true);
+ $data[1] = ui_print_truncate_text(io_safe_output($row["description"]), 80, true, true, true, '[…]');
$data[2] = html_print_input_image ("delete_profile", "images/cross.png",
$row["id_np"],'', true,
array ('onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;'));
@@ -162,7 +165,7 @@ foreach ($result as $row) {
$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates' .
'&delete_profile=1&delete_profile=' . $row['id_np'] . '" ' .
'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true) . '</a>';
- $data[2] .= '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates' .
+ $data[2] .= ' <a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates' .
'&export_profile=' . $row['id_np'] . '">' . html_print_image("images/lightning_go.png", true) . '</a>';
array_push ($table->data, $data);
diff --git a/pandora_console/godmode/reporting/graph_builder.preview.php b/pandora_console/godmode/reporting/graph_builder.preview.php
index a7713e90a8..643e3ca1c6 100644
--- a/pandora_console/godmode/reporting/graph_builder.preview.php
+++ b/pandora_console/godmode/reporting/graph_builder.preview.php
@@ -133,7 +133,7 @@ foreach ($graphRows as $graphRow) {
$modules = implode(',', $module_array);
$weights = implode(',', $weight_array);
-echo "<table class='databox_frame' cellpadding='0' cellspacing='0'>";
+echo "<table class='databox_frame' cellpadding='0' cellspacing='0' style='width:98%'>";
echo "<tr><td>";
if(!empty($modules)) {
@@ -143,13 +143,13 @@ if(!empty($modules)) {
'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked, $unixdate);
}
else {
- echo "<div class='nf'>".__('Empty graph')."</div>";
+ echo "<div class='nf' style='width: 98%'>".__('Empty graph')."</div>";
}
echo "</td></tr></table>";
echo "<form method = 'POST' action='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&tab=preview&edit_graph=1&id=$id_graph'>";
-echo "<table class='databox_frame' cellpadding='4' cellspacing='4'>";
+echo "<table class='databox_frame' cellpadding='4' cellspacing='4' style='width: 98%'>";
echo "<tr>";
echo "<td>";
echo "<b>".__('Date')."</b>"." ";
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 46d28edeb6..aecb60cdbd 100644
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -216,7 +216,7 @@ if ($items){
}
$table->head[4] = __('Period');
$table->head[5] = __('Description');
- $table->head[6] = '<span title="' . __('Options') . '">' . __('O.') . '</span>';
+ $table->head[6] = '<span title="' . __('Options') . '">' . __('Op.') . '</span>';
$table->align[6] = 'center';
} else {
@@ -307,7 +307,7 @@ foreach ($items as $item) {
}
$row[6] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=edit&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . '">' . html_print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . '</a>';
- $row[6] .= ' ';
+ $row[6] .= ' ';
$row[6] .= '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . html_print_image("images/cross.png", true, array("title" => __('Delete'))) .'</a>';
$table->data[] = $row;
diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php
index 7b7f0532aa..9647ef8610 100644
--- a/pandora_console/godmode/reporting/reporting_builder.main.php
+++ b/pandora_console/godmode/reporting/reporting_builder.main.php
@@ -51,7 +51,7 @@ $table->size[1] = '90%';
$table->style[0] = 'font-weight: bold; vertical-align: top;';
$table->data['name'][0] = __('Name');
-$table->data['name'][1] = html_print_input_text('name', $reportName, __('Name'), 20, 40, true);
+$table->data['name'][1] = html_print_input_text('name', $reportName, __('Name'), 80, 100, true);
$table->data['group'][0] = __('Group');
$own_info = get_user_info ($config['id_user']);
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index fdad93ad22..37d67cff77 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -72,9 +72,9 @@ switch ($action) {
$table->head[1] = __('Description');
$table->head[2] = __('Private');
$table->head[3] = __('Group');
- $table->head[4] = __('Delete');
+ $table->head[4] = '<span title="Operations">' . __('Op.') . '</span>';
$table->size = array ();
- $table->size[4] = '40px';
+ $table->size[4] = '60px';
foreach ($reports as $report) {
@@ -96,12 +96,17 @@ switch ($action) {
$data[2] = __('No');
$data[3] = ui_print_group_icon($report['id_group'], true);
- $data[4] = '<form method="post" style="display:inline" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
+ $data[4] = '<form method="post" action="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&action=edit" style="display:inline">';
+ $data[4] .= html_print_input_hidden ('id_report', $report['id_report'], true);
+ $data[4] .= html_print_input_image ('edit', 'images/config.png', 1, '', true, array ('title' => __('Edit')));
+ $data[4] .= '</form>';
+
+ $data[4] .= ' <form method="post" style="display:inline" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
$data[4] .= html_print_input_hidden ('id_report', $report['id_report'], true);
$data[4] .= html_print_input_hidden ('action','delete_report', true);
$data[4] .= html_print_input_image ('delete', 'images/cross.png', 1, '',
true, array ('title' => __('Delete')));
- $data[4] .= '</form>';
+ $data[4] .= '</form>';
array_push ($table->data, $data);
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index 92f4f70216..5f2b55f14a 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -47,7 +47,7 @@ $table->width = '98%';
$table->data = array ();
$table->data[0][0] = __('Name:'). ui_print_help_tip (__("Use [ or ( as first character, for example '[*] Map name', to render this map name in main menu"), true);
-$table->data[0][1] = html_print_input_text ('name', $visualConsoleName, '', 21, 30, true);
+$table->data[0][1] = html_print_input_text ('name', $visualConsoleName, '', 80, 100, true);
$table->data[1][0] = __('Group:');
$groups = users_get_groups ($config['id_user']);
diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php
index 620334cd54..bf1d55ddee 100644
--- a/pandora_console/godmode/servers/manage_recontask.php
+++ b/pandora_console/godmode/servers/manage_recontask.php
@@ -200,6 +200,8 @@ if ($result !== false) {
$table->cellspacing = 4;
$table->class = "databox";
$table->data = array ();
+ $table->size = array ();
+ $table->size[8] = '70px';
foreach ($result as $row) {
@@ -253,9 +255,9 @@ if ($result !== false) {
}
// ACTION
- $data[8] = "<a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=".$row["id_recon_server"]."'>" . html_print_image("images/eye.png", true) . "</a> ".
- '<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete='.$row["id_rt"].'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a> <a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update='.$row["id_rt"].'">' .
- html_print_image("images/config.png", true) . '</a>';
+ $data[8] = "<a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=".$row["id_recon_server"]."'>" . html_print_image("images/eye.png", true) . "</a> " .
+ '<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update='.$row["id_rt"].'">' . html_print_image("images/config.png", true) . '</a> ' .
+ '<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete='.$row["id_rt"].'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
$table->data[] = $data;
}
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index ad5c0bd17e..8b9dcb4980 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -47,7 +47,7 @@ if (isset($_GET["server"])) {
html_print_table ($table);
- echo '<div class="action-buttons" style="width: 450px">';
+ echo '<div class="action-buttons" style="width: 98%">';
echo '<input type="submit" class="sub upd" value="'.__('Update').'">';
echo "</div>";
@@ -94,8 +94,7 @@ else {
$table->align[3] = "center";
$table->align[4] = "center";
$table->align[5] = "center";
- $table->align[6] = "center";
- $table->align[7] = "center";
+ $table->align[6] = "left";
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->head = array ();
@@ -106,9 +105,12 @@ else {
$table->head[4] = __('Started');
$table->head[5] = __('Updated');
+ $table->size = array();
+ $table->size[6] = '50px';
+
//Only Pandora Administrator can delete servers
if (check_acl ($config["id_user"], 0, "PM")) {
- $table->head[6] = __('Delete');
+ $table->head[6] = '<span title="Operations">' . __('Op.') . '</span>';
}
foreach ($servers as $server) {
@@ -127,9 +129,13 @@ else {
$data[4] = human_time_comparation ($server["laststart"]);
$data[5] = human_time_comparation ($server["keepalive"]);
+ $data[6] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';
+ $data[6] .= html_print_image ('images/config.png', true, array ('title' => __('Edit')));
+ $data[6] .= '</a>';
+
//Only Pandora Administrator can delete servers
if (check_acl ($config["id_user"], 0, "PM")) {
- $data[6] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&delete=1">';
+ $data[6] .= ' <a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&delete=1">';
$data[6] .= html_print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
$data[6] .= '</a>';
}
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 31c9effde6..cf3216a0e6 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -70,12 +70,12 @@ if ($create != ""){
if (($create != "") OR ($view != "")){
if ($create != "")
- ui_print_page_header (__('Plugin creation'), "", false, "", true);
+ ui_print_page_header (__('Plugin creation') . ui_print_help_icon("plugin_definition", true), "", false, "", true);
else {
- ui_print_page_header (__('Plugin update'), "", false, "", true);
+ ui_print_page_header (__('Plugin update') . ui_print_help_icon("plugin_definition", true), "", false, "", true);
$plugin_id = get_parameter ("view","");
}
- ui_print_help_icon("plugin_definition");
+
if ($create == "")
echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&update_plugin=$plugin_id'>";
@@ -86,7 +86,7 @@ if (($create != "") OR ($view != "")){
echo '<tr><td class="datos">'.__('Name');
echo '<td class="datos">';
- echo '<input type="text" name="form_name" size=30 value="'.$form_name.'"></td>';
+ echo '<input type="text" name="form_name" size=100 value="'.$form_name.'"></td>';
echo '<tr><td class="datos2">'.__('Plugin command');
echo '<td class="datos2">';
@@ -231,7 +231,7 @@ else {
echo "<th>".__('Name')."</th>";
echo "<th>".__('Type')."</th>";
echo "<th>".__('Command')."</th>";
- echo "<th>".__('Delete')."</th>";
+ echo "<th style='width:50px;'>" . '<span title="Operations">' . __('Op.') . '</span>' . "</th>";
$color = 0;
foreach ($rows as $row) {
@@ -256,16 +256,17 @@ else {
echo "</td><td class=$tdcolor>";
echo $row["execute"];
echo "</td><td class=$tdcolor>";
+ echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&view=".$row["id"]."'>" . html_print_image('images/config.png', true, array("title" => __("Edit"))) . "</a> ";
echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&kill_plugin=".$row["id"]."'>" . html_print_image("images/cross.png", true, array("border" => '0')) . "</a>";
echo "</td></tr>";
}
echo "</table>";
}
else {
- echo '<div class="nf">'. __('There are no plugins in the system');
+ echo '<div class="nf">'. __('There are no plugins in the system') . '</div>';
echo "<br>";
}
- echo "<table width=730>";
+ echo "<table width='98%'>";
echo "<tr><td align=right>";
echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&create=1'>";
echo "<input name='crtbutton' type='submit' class='sub next' value='".__('Add')."'>";
diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php
index 8913d17f08..cbb046f9d0 100644
--- a/pandora_console/godmode/servers/recon_script.php
+++ b/pandora_console/godmode/servers/recon_script.php
@@ -58,12 +58,12 @@ if ($create != ""){
if (($create != "") OR ($view != "")){
if ($create != "")
- ui_print_page_header (__('Recon script creation'), "", false, "", true);
+ ui_print_page_header (__('Recon script creation') . ui_print_help_icon("reconscript_definition", true), "", false, "", true);
else {
- ui_print_page_header (__('Recon script update'), "", false, "", true);
+ ui_print_page_header (__('Recon script update') . ui_print_help_icon("reconscript_definition", true), "", false, "", true);
$id_recon_script = get_parameter ("view","");
}
- ui_print_help_icon("reconscript_definition");
+
if ($create == "")
echo "<form name=reconscript method='post' action='index.php?sec=gservers&sec2=godmode/servers/recon_script&update_reconscript=$id_recon_script'>";
@@ -195,7 +195,7 @@ else {
echo "</table>";
}
else {
- echo '<div class="nf">'. __('There are no recon scripts in the system');
+ echo '<div class="nf">'. __('There are no recon scripts in the system') . '</div>';
echo "<br>";
}
echo "<table width=98%>";
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 04e125c4f5..1ba4cdce86 100644
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -301,7 +301,7 @@ if (isset ($_GET["update_alert"])) {
foreach ($result as $row) {
$data = array ();
- $data[0] = alerts_get_alert_action_name ($row["id_alert"]);
+ $data[0] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' . alerts_get_alert_action_name ($row["id_alert"]) . '</a>';
$data[1] = __('SNMP Agent');
$data[1] = $row["agent"];
@@ -319,10 +319,10 @@ if (isset ($_GET["update_alert"])) {
$data[6] = __('Never');
}
- $data[7] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' .
- html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>
- <a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
- html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+ $data[7] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
+ html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' .
+ ' <a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' .
+ html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';
$idx = count ($table->data); //The current index of the table is 1 less than the count of table data so we count before adding to table->data
array_push ($table->data, $data);
diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index 0b079e2c26..829212c3b3 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -131,12 +131,12 @@ if ($edit_filter > -2) {
foreach ($result as $row) {
$data = array ();
- $data[0] = $row['description'];
+ $data[0] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$row['id_snmp_filter'].'">' . $row['description'] . '</a>';
$data[1] = $row['filter'];
- $data[2] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$row['id_snmp_filter'].'">' .
- html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>
- <a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$row['id_snmp_filter'].'">' .
- html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+ $data[2] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$row['id_snmp_filter'].'">' .
+ html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' .
+ ' <a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$row['id_snmp_filter'].'">' .
+ html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';
array_push ($table->data, $data);
}
@@ -146,7 +146,7 @@ if ($edit_filter > -2) {
unset ($table);
- echo '<div style="text-align:right; width:740px">';
+ echo '<div style="text-align:right; width:98%">';
echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter=-1">';
html_print_submit_button (__('Create'), 'submit_button', false, 'class="sub next"');
echo '</form></div>';
diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php
index 30b88b21b0..21b176d13b 100644
--- a/pandora_console/godmode/tag/edit_tag.php
+++ b/pandora_console/godmode/tag/edit_tag.php
@@ -114,16 +114,6 @@ echo '<form method="post" action="index.php?sec=gtag&sec2=godmode/tag/edit_tag&a
echo '<div align=left style="width: 98%" class="pandora_form">';
echo "<table border=0 cellpadding=4 cellspacing=4 class=databox width=98%>";
- echo "<tr>";
- echo "<td>";
- if ($action == "update"){
- echo '<h3>'.__("Edit tag").'</h3>';
- }
- if ($action == "new"){
- echo '<h3>'.__("New tag").'</h3>';
- }
- echo "</td>";
- echo "</tr>";
echo "<tr>";
echo "<td align=center>";
html_print_label (__("Name"),'name');
diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php
index dd48eb4d0b..99838b990a 100644
--- a/pandora_console/godmode/tag/tag.php
+++ b/pandora_console/godmode/tag/tag.php
@@ -150,7 +150,7 @@ if (!empty($result)){
$data = array ();
- $data[0] = $tag["name"];
+ $data[0] = "<a href='index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . $tag["name"] . "</a>";
$data[1] = ui_print_truncate_text($tag["description"], 25, false);
$data[2] = '<a href="' . $tag["url"] . '">' . $tag["url"] . '</a>';
$data[3] = ' <a class="tag_details"
@@ -160,7 +160,7 @@ if (!empty($result)){
$data[3] .= tags_get_modules_count($tag["id_tag"]);
- $data[4] = "<a href='index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a>";
+ $data[4] = "<a href='index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a> ";
$data[4] .= '<a href="index.php?sec=gtag&sec2=godmode/tag/tag&delete_tag='.$tag["id_tag"] . '"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">' . html_print_image("images/cross.png", true, array("title" => "Delete")) . '</a>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index 5765d9eec3..7fd91b4e0e 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -69,7 +69,7 @@ $table->head[7] = "UM" . ui_print_help_tip (__('Users management'), true);
$table->head[8] = "DM" . ui_print_help_tip (__('Database management'), true);
$table->head[9] = "LM" . ui_print_help_tip (__('Alerts management'), true);
$table->head[10] = "PM" . ui_print_help_tip (__('Systems management'), true);
-$table->head[11] = __('Delete');
+$table->head[11] = '<span title="Operations">' . __('Op.') . '</span>';
$table->align = array_fill (1, 11, "center");
$table->size = array_fill (1, 10, 40);
@@ -90,7 +90,8 @@ foreach ($profiles as $profile) {
$data[8] = ($profile["db_management"] ? $img : '');
$data[9] = ($profile["alert_management"] ? $img : '');
$data[10] = ($profile["pandora_management"] ? $img : '');
- $data[11] = '<a href="index.php?sec=gagente&sec2=godmode/users/configure_profile&delete_profile=1&id='.$profile["id_perfil"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. html_print_image("images/cross.png", true) . '</a>';
+ $data[11] = '<a href="index.php?sec=gusuarios&sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'"><b>'. html_print_image('images/config.png', true, array('title' => __('Edit'))) .'</b></a>';
+ $data[11] .= ' <a href="index.php?sec=gagente&sec2=godmode/users/configure_profile&delete_profile=1&id='.$profile["id_perfil"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. html_print_image("images/cross.png", true) . '</a>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 35ea70f816..e3b082a573 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -150,12 +150,12 @@ $table->head[2] = __('Last contact') . ' ' .
'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=last_connect&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastConnectDown)) . '</a>';
$table->head[3] = __('Profile');
$table->head[4] = __('Description');
-$table->head[5] = __('Delete');
+$table->head[5] = '<span title="Operations">' . __('Op.') . '</span>';
$table->align[2] = "center";
$table->align[3] = "center";
-$table->align[5] = "center";
-$table->size[5] = 40;
+$table->align[5] = "left";
+$table->size[5] = '45px';
$info1 = array ();
@@ -228,10 +228,11 @@ foreach ($info as $user_id => $user_info) {
$data[4] = ui_print_string_substr ($user_info["comments"], 24, true);
+ $data[5] = '<a href="index.php?sec=gusuarios&sec2=godmode/users/configure_user&id='.$user_id.'">'.html_print_image('images/config.png', true, array('title' => __('Edit'))).'</a>';
if ($config["admin_can_delete_user"] && $user_info['id_user'] != $config['id_user']) {
- $data[5] = "<a href='index.php?sec=gusuarios&sec2=godmode/users/user_list&user_del=1&delete_user=".$user_info['id_user']."'>".html_print_image('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" .__('Deleting User'). " ". $user_info['id_user'] . ". " . __('Are you sure?') ."')) return false"))."</a>";
+ $data[5] .= " <a href='index.php?sec=gusuarios&sec2=godmode/users/user_list&user_del=1&delete_user=".$user_info['id_user']."'>".html_print_image('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" .__('Deleting User'). " ". $user_info['id_user'] . ". " . __('Are you sure?') ."')) return false"))."</a>";
} else {
- $data[5] = ''; //Delete button not in this mode
+ $data[5] .= ''; //Delete button not in this mode
}
array_push ($table->data, $data);
}
diff --git a/pandora_console/images/add.png b/pandora_console/images/add.png
index 1aa7f095c6..0ea124a744 100644
Binary files a/pandora_console/images/add.png and b/pandora_console/images/add.png differ
diff --git a/pandora_console/images/agents_group.png b/pandora_console/images/agents_group.png
index 5c140d838d..0c60827c04 100644
Binary files a/pandora_console/images/agents_group.png and b/pandora_console/images/agents_group.png differ
diff --git a/pandora_console/images/application.png b/pandora_console/images/application.png
index 20e87ddcfd..217d1ecc6e 100644
Binary files a/pandora_console/images/application.png and b/pandora_console/images/application.png differ
diff --git a/pandora_console/images/application_double.png b/pandora_console/images/application_double.png
index be1e331642..db4511144e 100644
Binary files a/pandora_console/images/application_double.png and b/pandora_console/images/application_double.png differ
diff --git a/pandora_console/images/application_edit.png b/pandora_console/images/application_edit.png
index 97f2f4f335..1d61fd2314 100644
Binary files a/pandora_console/images/application_edit.png and b/pandora_console/images/application_edit.png differ
diff --git a/pandora_console/images/application_not_writable.png b/pandora_console/images/application_not_writable.png
index 39975bcbf6..ea4e4fe577 100644
Binary files a/pandora_console/images/application_not_writable.png and b/pandora_console/images/application_not_writable.png differ
diff --git a/pandora_console/images/attachment.png b/pandora_console/images/attachment.png
index 529bb7f554..169a845c14 100644
Binary files a/pandora_console/images/attachment.png and b/pandora_console/images/attachment.png differ
diff --git a/pandora_console/images/b_white.png b/pandora_console/images/b_white.png
index 04e90c063b..5cf32c0a2b 100644
Binary files a/pandora_console/images/b_white.png and b/pandora_console/images/b_white.png differ
diff --git a/pandora_console/images/b_yellow.png b/pandora_console/images/b_yellow.png
index a706306eae..117285ff7e 100644
Binary files a/pandora_console/images/b_yellow.png and b/pandora_console/images/b_yellow.png differ
diff --git a/pandora_console/images/black_background.png b/pandora_console/images/black_background.png
new file mode 100644
index 0000000000..aebd80b5d5
Binary files /dev/null and b/pandora_console/images/black_background.png differ
diff --git a/pandora_console/images/black_red_header.png b/pandora_console/images/black_red_header.png
new file mode 100644
index 0000000000..aa4b8f009b
Binary files /dev/null and b/pandora_console/images/black_red_header.png differ
diff --git a/pandora_console/images/book_edit.png b/pandora_console/images/book_edit.png
index 5320d8a12c..c60368abf7 100644
Binary files a/pandora_console/images/book_edit.png and b/pandora_console/images/book_edit.png differ
diff --git a/pandora_console/images/box.png b/pandora_console/images/box.png
index 8443c23eb9..a94519eb5a 100644
Binary files a/pandora_console/images/box.png and b/pandora_console/images/box.png differ
diff --git a/pandora_console/images/brick.png b/pandora_console/images/brick.png
index f83bd06f89..d69e9f7137 100644
Binary files a/pandora_console/images/brick.png and b/pandora_console/images/brick.png differ
diff --git a/pandora_console/images/bricks.png b/pandora_console/images/bricks.png
index 678cb4d957..c7d1ee031c 100644
Binary files a/pandora_console/images/bricks.png and b/pandora_console/images/bricks.png differ
diff --git a/pandora_console/images/bug.png b/pandora_console/images/bug.png
index 58ab766f8c..c7299fd7d1 100644
Binary files a/pandora_console/images/bug.png and b/pandora_console/images/bug.png differ
diff --git a/pandora_console/images/calendar_view_day.png b/pandora_console/images/calendar_view_day.png
index 106a592e67..945af71e33 100644
Binary files a/pandora_console/images/calendar_view_day.png and b/pandora_console/images/calendar_view_day.png differ
diff --git a/pandora_console/images/cancel.png b/pandora_console/images/cancel.png
index c149c2bc01..33c876b23a 100644
Binary files a/pandora_console/images/cancel.png and b/pandora_console/images/cancel.png differ
diff --git a/pandora_console/images/chart_curve.png b/pandora_console/images/chart_curve.png
index 8c9436e19f..fafb7e144b 100644
Binary files a/pandora_console/images/chart_curve.png and b/pandora_console/images/chart_curve.png differ
diff --git a/pandora_console/images/clock.png b/pandora_console/images/clock.png
index b0df165d75..9906fb26f9 100644
Binary files a/pandora_console/images/clock.png and b/pandora_console/images/clock.png differ
diff --git a/pandora_console/images/cog.png b/pandora_console/images/cog.png
index 259ed26dd0..8f4eeb7611 100644
Binary files a/pandora_console/images/cog.png and b/pandora_console/images/cog.png differ
diff --git a/pandora_console/images/cog_del.png b/pandora_console/images/cog_del.png
index 621ef0b011..e5105cbba0 100644
Binary files a/pandora_console/images/cog_del.png and b/pandora_console/images/cog_del.png differ
diff --git a/pandora_console/images/comments.png b/pandora_console/images/comments.png
index f6e83254b6..90583971ec 100644
Binary files a/pandora_console/images/comments.png and b/pandora_console/images/comments.png differ
diff --git a/pandora_console/images/computer.png b/pandora_console/images/computer.png
index d0b397bef9..d07d5fde68 100644
Binary files a/pandora_console/images/computer.png and b/pandora_console/images/computer.png differ
diff --git a/pandora_console/images/computer_error.png b/pandora_console/images/computer_error.png
index 763190920b..06eb7c65b7 100644
Binary files a/pandora_console/images/computer_error.png and b/pandora_console/images/computer_error.png differ
diff --git a/pandora_console/images/config.png b/pandora_console/images/config.png
index a40d7e8ebe..a10dc9d5e3 100644
Binary files a/pandora_console/images/config.png and b/pandora_console/images/config.png differ
diff --git a/pandora_console/images/cross.png b/pandora_console/images/cross.png
index a37cf4bde5..33a383748b 100644
Binary files a/pandora_console/images/cross.png and b/pandora_console/images/cross.png differ
diff --git a/pandora_console/images/data.png b/pandora_console/images/data.png
index 43ed514317..ffc935d503 100644
Binary files a/pandora_console/images/data.png and b/pandora_console/images/data.png differ
diff --git a/pandora_console/images/database.png b/pandora_console/images/database.png
index 5a397ae85c..ffc935d503 100644
Binary files a/pandora_console/images/database.png and b/pandora_console/images/database.png differ
diff --git a/pandora_console/images/database_gear.png b/pandora_console/images/database_gear.png
index 1cb5d576ee..c736dac611 100644
Binary files a/pandora_console/images/database_gear.png and b/pandora_console/images/database_gear.png differ
diff --git a/pandora_console/images/database_lightning.png b/pandora_console/images/database_lightning.png
index edb626c0f0..a15b536d1a 100644
Binary files a/pandora_console/images/database_lightning.png and b/pandora_console/images/database_lightning.png differ
diff --git a/pandora_console/images/database_refresh.png b/pandora_console/images/database_refresh.png
index 9baa64ef7b..a0500fc6be 100644
Binary files a/pandora_console/images/database_refresh.png and b/pandora_console/images/database_refresh.png differ
diff --git a/pandora_console/images/delete.png b/pandora_console/images/delete.png
index 08f249365a..ace289edd9 100644
Binary files a/pandora_console/images/delete.png and b/pandora_console/images/delete.png differ
diff --git a/pandora_console/images/delete_modules.png b/pandora_console/images/delete_modules.png
index 19cad2216c..47662c26cd 100644
Binary files a/pandora_console/images/delete_modules.png and b/pandora_console/images/delete_modules.png differ
diff --git a/pandora_console/images/disk.png b/pandora_console/images/disk.png
index f1d7a19859..d0d400ec64 100644
Binary files a/pandora_console/images/disk.png and b/pandora_console/images/disk.png differ
diff --git a/pandora_console/images/down.png b/pandora_console/images/down.png
index 4ac7794358..691f6e0c7c 100644
Binary files a/pandora_console/images/down.png and b/pandora_console/images/down.png differ
diff --git a/pandora_console/images/edit.png b/pandora_console/images/edit.png
index 188e1c12bd..4ac94c486d 100644
Binary files a/pandora_console/images/edit.png and b/pandora_console/images/edit.png differ
diff --git a/pandora_console/images/email.png b/pandora_console/images/email.png
index 1b28457a33..832787392d 100644
Binary files a/pandora_console/images/email.png and b/pandora_console/images/email.png differ
diff --git a/pandora_console/images/email_open.png b/pandora_console/images/email_open.png
index 859251fe0f..cf8c51a23a 100644
Binary files a/pandora_console/images/email_open.png and b/pandora_console/images/email_open.png differ
diff --git a/pandora_console/images/error.png b/pandora_console/images/error.png
index a9e4ff3991..dbfda22975 100644
Binary files a/pandora_console/images/error.png and b/pandora_console/images/error.png differ
diff --git a/pandora_console/images/extensions.png b/pandora_console/images/extensions.png
index f1e4c95bf8..88b6da212e 100644
Binary files a/pandora_console/images/extensions.png and b/pandora_console/images/extensions.png differ
diff --git a/pandora_console/images/eye.png b/pandora_console/images/eye.png
index 564a1a9714..403aaa4126 100644
Binary files a/pandora_console/images/eye.png and b/pandora_console/images/eye.png differ
diff --git a/pandora_console/images/file.png b/pandora_console/images/file.png
index f1d7a19859..d0d400ec64 100644
Binary files a/pandora_console/images/file.png and b/pandora_console/images/file.png differ
diff --git a/pandora_console/images/flag_red.png b/pandora_console/images/flag_red.png
index e8a602da7b..b99e36b283 100644
Binary files a/pandora_console/images/flag_red.png and b/pandora_console/images/flag_red.png differ
diff --git a/pandora_console/images/fullscreen.png b/pandora_console/images/fullscreen.png
index ffdabd4e97..82ca9d58fd 100644
Binary files a/pandora_console/images/fullscreen.png and b/pandora_console/images/fullscreen.png differ
diff --git a/pandora_console/images/go.png b/pandora_console/images/go.png
index bc4faa709e..8d204afeb0 100644
Binary files a/pandora_console/images/go.png and b/pandora_console/images/go.png differ
diff --git a/pandora_console/images/god3.png b/pandora_console/images/god3.png
index fae2c48761..9b3cdbe875 100644
Binary files a/pandora_console/images/god3.png and b/pandora_console/images/god3.png differ
diff --git a/pandora_console/images/god5.png b/pandora_console/images/god5.png
index 095bdfea86..b65a459540 100644
Binary files a/pandora_console/images/god5.png and b/pandora_console/images/god5.png differ
diff --git a/pandora_console/images/god7.png b/pandora_console/images/god7.png
index 68f916c9d3..3f02301aa6 100644
Binary files a/pandora_console/images/god7.png and b/pandora_console/images/god7.png differ
diff --git a/pandora_console/images/god8.png b/pandora_console/images/god8.png
index 9473581a46..202c13c7f6 100644
Binary files a/pandora_console/images/god8.png and b/pandora_console/images/god8.png differ
diff --git a/pandora_console/images/god9.png b/pandora_console/images/god9.png
index e8c442f662..e5f113c5f8 100755
Binary files a/pandora_console/images/god9.png and b/pandora_console/images/god9.png differ
diff --git a/pandora_console/images/group.png b/pandora_console/images/group.png
index 9d2d500813..247af645ea 100644
Binary files a/pandora_console/images/group.png and b/pandora_console/images/group.png differ
diff --git a/pandora_console/images/groups_small/clock.png b/pandora_console/images/groups_small/clock.png
index b0df165d75..9906fb26f9 100644
Binary files a/pandora_console/images/groups_small/clock.png and b/pandora_console/images/groups_small/clock.png differ
diff --git a/pandora_console/images/groups_small/computer.png b/pandora_console/images/groups_small/computer.png
index d0b397bef9..d07d5fde68 100644
Binary files a/pandora_console/images/groups_small/computer.png and b/pandora_console/images/groups_small/computer.png differ
diff --git a/pandora_console/images/groups_small/server_database.png b/pandora_console/images/groups_small/server_database.png
index e4e2859121..3bf1440e71 100644
Binary files a/pandora_console/images/groups_small/server_database.png and b/pandora_console/images/groups_small/server_database.png differ
diff --git a/pandora_console/images/groups_small/world.png b/pandora_console/images/groups_small/world.png
index ac5957ad62..8ec6efe8db 100644
Binary files a/pandora_console/images/groups_small/world.png and b/pandora_console/images/groups_small/world.png differ
diff --git a/pandora_console/images/header.jpg b/pandora_console/images/header.jpg
index defdaf98ae..fa0b183b1d 100644
Binary files a/pandora_console/images/header.jpg and b/pandora_console/images/header.jpg differ
diff --git a/pandora_console/images/heart.png b/pandora_console/images/heart.png
index 3acb57dc97..53e1013a58 100644
Binary files a/pandora_console/images/heart.png and b/pandora_console/images/heart.png differ
diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png
index f25fc3fbf1..723c404a95 100644
Binary files a/pandora_console/images/help.png and b/pandora_console/images/help.png differ
diff --git a/pandora_console/images/house.png b/pandora_console/images/house.png
index a46fb22206..da024e5ad4 100644
Binary files a/pandora_console/images/house.png and b/pandora_console/images/house.png differ
diff --git a/pandora_console/images/images.png b/pandora_console/images/images.png
index 184860d1e0..cca966894b 100644
Binary files a/pandora_console/images/images.png and b/pandora_console/images/images.png differ
diff --git a/pandora_console/images/information.png b/pandora_console/images/information.png
index 12cd1aef90..85c1876b5f 100644
Binary files a/pandora_console/images/information.png and b/pandora_console/images/information.png differ
diff --git a/pandora_console/images/lightbulb.png b/pandora_console/images/lightbulb.png
index a706306eae..117285ff7e 100644
Binary files a/pandora_console/images/lightbulb.png and b/pandora_console/images/lightbulb.png differ
diff --git a/pandora_console/images/lightbulb_off.png b/pandora_console/images/lightbulb_off.png
index 8851b99ba1..5cf32c0a2b 100644
Binary files a/pandora_console/images/lightbulb_off.png and b/pandora_console/images/lightbulb_off.png differ
diff --git a/pandora_console/images/lightning.png b/pandora_console/images/lightning.png
index cdc9e4904f..c933224385 100644
Binary files a/pandora_console/images/lightning.png and b/pandora_console/images/lightning.png differ
diff --git a/pandora_console/images/lightning_go.png b/pandora_console/images/lightning_go.png
index c4fd881bd3..ed62c56bca 100644
Binary files a/pandora_console/images/lightning_go.png and b/pandora_console/images/lightning_go.png differ
diff --git a/pandora_console/images/link2.png b/pandora_console/images/link2.png
index 25eacb7c25..c4f00cb223 100644
Binary files a/pandora_console/images/link2.png and b/pandora_console/images/link2.png differ
diff --git a/pandora_console/images/link_add.png b/pandora_console/images/link_add.png
index 00be352c57..8cb6488bff 100644
Binary files a/pandora_console/images/link_add.png and b/pandora_console/images/link_add.png differ
diff --git a/pandora_console/images/link_break.png b/pandora_console/images/link_break.png
index 523575306d..57bafcfc30 100644
Binary files a/pandora_console/images/link_break.png and b/pandora_console/images/link_break.png differ
diff --git a/pandora_console/images/link_delete.png b/pandora_console/images/link_delete.png
index f66e2974ef..509b5f3a45 100644
Binary files a/pandora_console/images/link_delete.png and b/pandora_console/images/link_delete.png differ
diff --git a/pandora_console/images/link_edit.png b/pandora_console/images/link_edit.png
index 5b3aed090f..d8dc44f9ec 100644
Binary files a/pandora_console/images/link_edit.png and b/pandora_console/images/link_edit.png differ
diff --git a/pandora_console/images/link_go.png b/pandora_console/images/link_go.png
index ae8cae806e..37a839f793 100644
Binary files a/pandora_console/images/link_go.png and b/pandora_console/images/link_go.png differ
diff --git a/pandora_console/images/lock.png b/pandora_console/images/lock.png
index 0bd7647132..ddf83d9535 100644
Binary files a/pandora_console/images/lock.png and b/pandora_console/images/lock.png differ
diff --git a/pandora_console/images/log-out.png b/pandora_console/images/log-out.png
index 0010931e2c..23805d2701 100644
Binary files a/pandora_console/images/log-out.png and b/pandora_console/images/log-out.png differ
diff --git a/pandora_console/images/lupa.png b/pandora_console/images/lupa.png
index 4e522b23d8..b81b18de12 100644
Binary files a/pandora_console/images/lupa.png and b/pandora_console/images/lupa.png differ
diff --git a/pandora_console/images/lupa_15x15.png b/pandora_console/images/lupa_15x15.png
index 2f048b00d1..b81b18de12 100644
Binary files a/pandora_console/images/lupa_15x15.png and b/pandora_console/images/lupa_15x15.png differ
diff --git a/pandora_console/images/mimetypes/directory.png b/pandora_console/images/mimetypes/directory.png
index b67403d9fe..f1ed9abe03 100644
Binary files a/pandora_console/images/mimetypes/directory.png and b/pandora_console/images/mimetypes/directory.png differ
diff --git a/pandora_console/images/mimetypes/image.png b/pandora_console/images/mimetypes/image.png
index 68da5027cf..032e177618 100644
Binary files a/pandora_console/images/mimetypes/image.png and b/pandora_console/images/mimetypes/image.png differ
diff --git a/pandora_console/images/mimetypes/text.png b/pandora_console/images/mimetypes/text.png
index 188e1c12bd..8bc294fa6a 100755
Binary files a/pandora_console/images/mimetypes/text.png and b/pandora_console/images/mimetypes/text.png differ
diff --git a/pandora_console/images/mimetypes/unknown.png b/pandora_console/images/mimetypes/unknown.png
index 2d7f2d6017..f64dd01170 100644
Binary files a/pandora_console/images/mimetypes/unknown.png and b/pandora_console/images/mimetypes/unknown.png differ
diff --git a/pandora_console/images/mimetypes/zip.png b/pandora_console/images/mimetypes/zip.png
index 9015426153..5c93c4fe7d 100644
Binary files a/pandora_console/images/mimetypes/zip.png and b/pandora_console/images/mimetypes/zip.png differ
diff --git a/pandora_console/images/monitor.png b/pandora_console/images/monitor.png
index 226881fd25..c6ca8eea75 100644
Binary files a/pandora_console/images/monitor.png and b/pandora_console/images/monitor.png differ
diff --git a/pandora_console/images/mouse.png b/pandora_console/images/mouse.png
index eeda4db864..8bdc31333e 100644
Binary files a/pandora_console/images/mouse.png and b/pandora_console/images/mouse.png differ
diff --git a/pandora_console/images/music_note.png b/pandora_console/images/music_note.png
index e2133d0c92..e8c20b9f9f 100644
Binary files a/pandora_console/images/music_note.png and b/pandora_console/images/music_note.png differ
diff --git a/pandora_console/images/normalscreen.png b/pandora_console/images/normalscreen.png
index a3da561e55..16838a7258 100644
Binary files a/pandora_console/images/normalscreen.png and b/pandora_console/images/normalscreen.png differ
diff --git a/pandora_console/images/note.png b/pandora_console/images/note.png
index a8ba568a1e..a9db17ae29 100644
Binary files a/pandora_console/images/note.png and b/pandora_console/images/note.png differ
diff --git a/pandora_console/images/ok.png b/pandora_console/images/ok.png
index 89c8129a49..719e39151b 100644
Binary files a/pandora_console/images/ok.png and b/pandora_console/images/ok.png differ
diff --git a/pandora_console/images/os_icons/android.png b/pandora_console/images/os_icons/android.png
index da95c5d4e0..71e9265ee9 100644
Binary files a/pandora_console/images/os_icons/android.png and b/pandora_console/images/os_icons/android.png differ
diff --git a/pandora_console/images/os_icons/android_small.png b/pandora_console/images/os_icons/android_small.png
index da95c5d4e0..71e9265ee9 100644
Binary files a/pandora_console/images/os_icons/android_small.png and b/pandora_console/images/os_icons/android_small.png differ
diff --git a/pandora_console/images/os_icons/so_linux.png b/pandora_console/images/os_icons/so_linux.png
index bbefe2ec45..f99c0fd1d2 100755
Binary files a/pandora_console/images/os_icons/so_linux.png and b/pandora_console/images/os_icons/so_linux.png differ
diff --git a/pandora_console/images/os_icons/so_linux_small.png b/pandora_console/images/os_icons/so_linux_small.png
index c198a0664e..f99c0fd1d2 100755
Binary files a/pandora_console/images/os_icons/so_linux_small.png and b/pandora_console/images/os_icons/so_linux_small.png differ
diff --git a/pandora_console/images/page_lightning.png b/pandora_console/images/page_lightning.png
index 74c40b2c0f..c500eff235 100644
Binary files a/pandora_console/images/page_lightning.png and b/pandora_console/images/page_lightning.png differ
diff --git a/pandora_console/images/page_refresh.png b/pandora_console/images/page_refresh.png
index 369f056681..257cfee396 100644
Binary files a/pandora_console/images/page_refresh.png and b/pandora_console/images/page_refresh.png differ
diff --git a/pandora_console/images/page_white.png b/pandora_console/images/page_white.png
index db5ce0a5ce..eda4488639 100644
Binary files a/pandora_console/images/page_white.png and b/pandora_console/images/page_white.png differ
diff --git a/pandora_console/images/page_white_magnify.png b/pandora_console/images/page_white_magnify.png
index d072d3cbe2..ef8c5e2eb7 100644
Binary files a/pandora_console/images/page_white_magnify.png and b/pandora_console/images/page_white_magnify.png differ
diff --git a/pandora_console/images/page_white_text.png b/pandora_console/images/page_white_text.png
index 2d7f2d6017..018816b068 100644
Binary files a/pandora_console/images/page_white_text.png and b/pandora_console/images/page_white_text.png differ
diff --git a/pandora_console/images/pill.png b/pandora_console/images/pill.png
index 45399071a4..e24982b061 100644
Binary files a/pandora_console/images/pill.png and b/pandora_console/images/pill.png differ
diff --git a/pandora_console/images/rss.png b/pandora_console/images/rss.png
index cc66f84367..99987a306a 100644
Binary files a/pandora_console/images/rss.png and b/pandora_console/images/rss.png differ
diff --git a/pandora_console/images/server.png b/pandora_console/images/server.png
index 91d0650d31..7f9ee88885 100644
Binary files a/pandora_console/images/server.png and b/pandora_console/images/server.png differ
diff --git a/pandora_console/images/server_database.png b/pandora_console/images/server_database.png
index e4e2859121..3bf1440e71 100644
Binary files a/pandora_console/images/server_database.png and b/pandora_console/images/server_database.png differ
diff --git a/pandora_console/images/server_web.png b/pandora_console/images/server_web.png
index 7b5e80d1ee..8ec6efe8db 100644
Binary files a/pandora_console/images/server_web.png and b/pandora_console/images/server_web.png differ
diff --git a/pandora_console/images/setup.png b/pandora_console/images/setup.png
index 68f916c9d3..3f02301aa6 100644
Binary files a/pandora_console/images/setup.png and b/pandora_console/images/setup.png differ
diff --git a/pandora_console/images/sitemap.png b/pandora_console/images/sitemap.png
index ca779f3237..5c5262e7b4 100644
Binary files a/pandora_console/images/sitemap.png and b/pandora_console/images/sitemap.png differ
diff --git a/pandora_console/images/sitemap_color.png b/pandora_console/images/sitemap_color.png
index c64582bcd4..64f075bcc3 100644
Binary files a/pandora_console/images/sitemap_color.png and b/pandora_console/images/sitemap_color.png differ
diff --git a/pandora_console/images/skin/skin_default/include/styles/pandora.css b/pandora_console/images/skin/skin_default/include/styles/pandora.css
index dff96aab96..cdb2d60934 100644
--- a/pandora_console/images/skin/skin_default/include/styles/pandora.css
+++ b/pandora_console/images/skin/skin_default/include/styles/pandora.css
@@ -40,7 +40,8 @@ body.pure {
body[style] {
background: #FFFFFF none!important;
}
-
+.toggle { border-collapse: collapse;}
+.toggle td { border-left: 1px solid #D3D3D3;}
input, textarea {
@@ -620,6 +621,7 @@ th {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
+ font-size: 7pt;
}
td {
@@ -1127,7 +1129,8 @@ img.img_title[src="images/configure_agent.png"] {
/* New styles for data box */
.databox, .databox_color, .databox_frame {
- margin: 0px auto 5px auto;
+/* margin: 0px auto 5px auto; */
+ margin-bottom: 5px;
border: 1px solid #D0E6FD;
-moz-border-radius: 5px;
diff --git a/pandora_console/images/sort_down.png b/pandora_console/images/sort_down.png
index c54de445be..cb4bc456a0 100644
Binary files a/pandora_console/images/sort_down.png and b/pandora_console/images/sort_down.png differ
diff --git a/pandora_console/images/sort_up.png b/pandora_console/images/sort_up.png
index 2d2a24f177..0515a8a73b 100644
Binary files a/pandora_console/images/sort_up.png and b/pandora_console/images/sort_up.png differ
diff --git a/pandora_console/images/splash_pandora.png b/pandora_console/images/splash_pandora.png
new file mode 100644
index 0000000000..4d0afbc70f
Binary files /dev/null and b/pandora_console/images/splash_pandora.png differ
diff --git a/pandora_console/images/star.png b/pandora_console/images/star.png
index 3b8a8859de..883e4decc0 100644
Binary files a/pandora_console/images/star.png and b/pandora_console/images/star.png differ
diff --git a/pandora_console/images/tag_red.png b/pandora_console/images/tag_red.png
index 6ebb37d25f..357842f7e2 100644
Binary files a/pandora_console/images/tag_red.png and b/pandora_console/images/tag_red.png differ
diff --git a/pandora_console/images/up.png b/pandora_console/images/up.png
index 5641155fbd..30d005f256 100644
Binary files a/pandora_console/images/up.png and b/pandora_console/images/up.png differ
diff --git a/pandora_console/images/upd.png b/pandora_console/images/upd.png
index be63cfc28c..7da5cfd01f 100644
Binary files a/pandora_console/images/upd.png and b/pandora_console/images/upd.png differ
diff --git a/pandora_console/images/user.png b/pandora_console/images/user.png
index 79f35ccbda..4166dbfe0e 100644
Binary files a/pandora_console/images/user.png and b/pandora_console/images/user.png differ
diff --git a/pandora_console/images/user_suit.png b/pandora_console/images/user_suit.png
index b3454e15fb..656c2a4f64 100644
Binary files a/pandora_console/images/user_suit.png and b/pandora_console/images/user_suit.png differ
diff --git a/pandora_console/images/wand.png b/pandora_console/images/wand.png
index 44ccbf8128..1da4964f22 100644
Binary files a/pandora_console/images/wand.png and b/pandora_console/images/wand.png differ
diff --git a/pandora_console/images/world.png b/pandora_console/images/world.png
index ac5957ad62..8ec6efe8db 100644
Binary files a/pandora_console/images/world.png and b/pandora_console/images/world.png differ
diff --git a/pandora_console/images/wrench.png b/pandora_console/images/wrench.png
index eac5690a48..7c8cc7a2ad 100644
Binary files a/pandora_console/images/wrench.png and b/pandora_console/images/wrench.png differ
diff --git a/pandora_console/images/wrench_orange.png b/pandora_console/images/wrench_orange.png
index 4371c192af..a10dc9d5e3 100644
Binary files a/pandora_console/images/wrench_orange.png and b/pandora_console/images/wrench_orange.png differ
diff --git a/pandora_console/images/zoom.png b/pandora_console/images/zoom.png
index fd7f0b07a5..3280a45d21 100644
Binary files a/pandora_console/images/zoom.png and b/pandora_console/images/zoom.png differ
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 5d14679406..b73efa19c4 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -231,11 +231,12 @@ function html_print_select_groups($id_user = false, $privilege = "AR", $returnAl
* @param bool Set the input to allow multiple selections (optional, single selection by default).
* @param bool Whether to sort the options or not (optional, unsorted by default).
* @param string $style The string of style.
+ * @param mixed $size Max elements showed in the select or default (size=10).
*
* @return string HTML code if return parameter is true.
*/
function html_print_select ($fields, $name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false,
- $multiple = false, $sort = true, $class = '', $disabled = false, $style = false, $option_style = false) {
+ $multiple = false, $sort = true, $class = '', $disabled = false, $style = false, $option_style = false, $size = false) {
$output = "\n";
@@ -255,7 +256,12 @@ function html_print_select ($fields, $name, $selected = '', $script = '', $nothi
$attributes .= ' onchange="'.$script.'"';
}
if (!empty ($multiple)) {
- $attributes .= ' multiple="multiple" size="10"';
+ if ($size !== false) {
+ $attributes .= ' multiple="multiple" size="' . $size . '"';
+ }
+ else {
+ $attributes .= ' multiple="multiple" size="10"';
+ }
}
if (!empty ($class)) {
$attributes .= ' class="'.$class.'"';
@@ -355,18 +361,19 @@ function html_print_select ($fields, $name, $selected = '', $script = '', $nothi
* @param bool $sort Whether to sort the options or not. Sorted by default.
* @param bool $disabled if it's true, disable the select.
* @param string $style The string of style.
+ * @param mixed $size Max elements showed in select or default (size=10)
*
* @return string HTML code if return parameter is true.
*/
function html_print_select_from_sql ($sql, $name, $selected = '', $script = '', $nothing = '', $nothing_value = '0', $return = false,
- $multiple = false, $sort = true, $disabled = false, $style = false) {
+ $multiple = false, $sort = true, $disabled = false, $style = false, $size = false) {
global $config;
-
+
$fields = array ();
$result = db_get_all_rows_sql ($sql);
if ($result === false)
$result = array ();
-
+
foreach ($result as $row) {
$id = array_shift($row);
$value = array_shift($row);
@@ -378,7 +385,7 @@ function html_print_select_from_sql ($sql, $name, $selected = '', $script = '',
}
}
- return html_print_select ($fields, $name, $selected, $script, $nothing, $nothing_value, $return, $multiple, $sort,'',$disabled, $style);
+ return html_print_select ($fields, $name, $selected, $script, $nothing, $nothing_value, $return, $multiple, $sort,'',$disabled, $style,'', $size);
}
/**
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 0fe659fe1b..72ed90a95a 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -34,10 +34,11 @@ require_once ($config['homedir'] . '/include/functions_groups.php');
* @param boolean $return Flag to return as string or not.
* @param boolean $showTextInTitle Flag to show the text on title.
* @param string $suffix String at the end of a strimmed string.
+ * @param string $style Style associated to the text.
*
* @return string Truncated text.
*/
-function ui_print_truncate_text($text, $numChars = 25, $showTextInAToopTip = true, $return = true, $showTextInTitle = true, $suffix = '[…]') {
+function ui_print_truncate_text($text, $numChars = 25, $showTextInAToopTip = true, $return = true, $showTextInTitle = true, $suffix = '[…]', $style = false) {
if ($numChars == 0) {
if ($return == true) {
return $text;
@@ -46,7 +47,7 @@ function ui_print_truncate_text($text, $numChars = 25, $showTextInAToopTip = tru
echo $text;
}
}
-
+
$text = io_safe_output($text);
if ((strlen($text)) > ($numChars)) {
$half_length = intval(($numChars - 3) / 2); // '/2' because [...] is in the middle of the word.
@@ -57,14 +58,34 @@ function ui_print_truncate_text($text, $numChars = 25, $showTextInAToopTip = tru
$truncateText=$truncateText . $truncateText2;
if ($showTextInTitle) {
- $truncateText = '<span title="'.$text.'">'.$truncateText.'</span>';
+ if ($style !== false){
+ $truncateText = '<span style="' . $style . '" title="'.$text.'">'.$truncateText.'</span>';
+ }
+ else{
+ $truncateText = '<span title="'.$text.'">'.$truncateText.'</span>';
+ }
}
if ($showTextInAToopTip) {
- $truncateText = $truncateText . '<a href="#" class="tip"> <span>' . $text . '</span></a>';
+ if ($style !== false){
+ $truncateText = $truncateText . '<a href="#" class="tip"> <span style="' . $style . '">' . $text . '</span></a>';
+ }
+ else{
+ $truncateText = $truncateText . '<a href="#" class="tip"> <span>' . $text . '</span></a>';
+ }
+ }
+ else{
+ if ($style !== false){
+ $truncateText = '<span style="' . $style . '">'.$truncateText.'</span>';
+ }
}
}
else {
- $truncateText = $text;
+ if ($style !== false){
+ $truncateText = '<span style="' . $style . '">' . $text . '</span>';
+ }
+ else{
+ $truncateText = $text;
+ }
}
if ($return == true) {
@@ -288,6 +309,8 @@ function ui_print_username ($username, $return = false) {
* @param int Group id
* @param bool Whether to return or print
* @param string What path to use (relative to images/). Defaults to groups_small
+ * @param string Style for group image
+ * @param bool Whether the group have link or not
*
* @return string HTML code if return parameter is true.
*/
@@ -401,9 +424,9 @@ function ui_print_agent_name ($id_agent, $return = false, $cutoff = 0, $style =
$agent_name = (string) agents_get_name ($id_agent);
$agent_name_full = $agent_name;
if ($cutname) {
- $agent_name = ui_print_truncate_text($agent_name, $cutoff);
+ $agent_name = ui_print_truncate_text($agent_name, $cutoff, true, true, true, '[…]', $style);
}
- $output = '<a style="' . $style . '" href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agent.'" title="'.$agent_name_full.'"><b>'.$agent_name.'</b></a>';
+ $output = '<a style="' . $style . '" href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agent.'" title="'.$agent_name_full.'"><b><span style="'.$style.'">'.$agent_name.'</span></b></a>';
//TODO: Add a pretty javascript (using jQuery) popup-box with agent details
@@ -420,10 +443,11 @@ function ui_print_agent_name ($id_agent, $return = false, $cutoff = 0, $style =
* @param bool Whether or not this is a combined alert
* @param bool Whether to print the agent information with the module information
* @param string Tab where the function was called from (used for urls)
+ * @param mixed Style for agent name or default (false)
*
* @return array A formatted array with proper html for use in $table->data (6 columns)
*/
-function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '') {
+function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '', $agent_style = false) {
$actionText = "";
require_once ("include/functions_alerts.php");
@@ -521,13 +545,23 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
$data[$index['agent_name']] = $disabledHtmlStart;
if ($compound) {
- $data[$index['agent_name']] .= ui_print_agent_name ($id_agent, true, 20, $styleDisabled);
+ if ($agent_style !== false) {
+ $data[$index['agent_name']] .= ui_print_agent_name ($id_agent, true, 20, $styleDisabled . " $agent_style");
+ }
+ else {
+ $data[$index['agent_name']] .= ui_print_agent_name ($id_agent, true, 20, $styleDisabled);
+ }
}
elseif ($agent == 0) {
$data[$index['module_name']] .= mb_substr (modules_get_agentmodule_name ($alert["id_agent_module"]), 0, 20);
}
else {
- $data[$index['agent_name']] .= ui_print_agent_name (modules_get_agentmodule_agent ($alert["id_agent_module"]), true, 20, $styleDisabled);
+ if ($agent_style !== false) {
+ $data[$index['agent_name']] .= ui_print_agent_name (modules_get_agentmodule_agent ($alert["id_agent_module"]), true, 20, $styleDisabled . " $agent_style");
+ }
+ else {
+ $data[$index['agent_name']] .= ui_print_agent_name (modules_get_agentmodule_agent ($alert["id_agent_module"]), true, 20, $styleDisabled);
+ }
$data[$index['module_name']] = mb_substr (modules_get_agentmodule_name ($alert["id_agent_module"]), 0, 20);
}
$data[$index['agent_name']] .= $disabledHtmlEnd;
diff --git a/pandora_console/include/styles/dialog.css b/pandora_console/include/styles/dialog.css
index 68c3fa51d0..14603f44eb 100644
--- a/pandora_console/include/styles/dialog.css
+++ b/pandora_console/include/styles/dialog.css
@@ -15,7 +15,7 @@
}
.ui-dialog .ui-dialog-titlebar {
- background: #778866 url(../../images/dialog-title.gif) repeat-x;
+ background: #9BC969 url(../../images/dialog-title.gif) repeat-x;
height: 28px;
_height: 29px;
width: 97%;
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 9b1726d19c..477c15f0e9 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -32,7 +32,7 @@
margin: 0;
}
.menu li.selected {
- background-color: #D3F389 !important;
+ background-color: #d9fb86 !important;
}
.menu li a {
background-color: inherit;
@@ -77,7 +77,7 @@
}
.menu .menu_icon, .menu li.links {
- background-color: #E9F3D2;
+ background-color: #daedae;
background-position: 4px 4px;
background-repeat: no-repeat;
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2d97957794..962717ef14 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -6,7 +6,7 @@ Description: The default Pandora FMS theme layout
// Pandora FMS - http://pandorafms.com
// ==========================================================
-// Copyright (c) 2004-2010 Artica Soluciones Tecnológicas S.L
+// Copyright (c) 2004-2011 Artica Soluciones Tecnológicas S.L
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -99,6 +99,7 @@ h4 {
padding-top: 5px;
font-size: 13px;
color: #000;
+ text-transform: none;
}
a {
color: #000;
@@ -145,6 +146,7 @@ div#login {
border-right: solid 2px #000;
}
div#login_in, #login_f {
+ padding-top: 30px;
margin: 0 auto;
width: 400px;
}
@@ -190,8 +192,8 @@ div#page {
width: 960px;
background: #fff;
clear: both;
- border-bottom: solid 5px #3f4e2f;
- border-top: solid 5px #3f4e2f;
+ border-bottom: solid 5px #80ab51;
+ border-top: solid 5px #80ab51;
}
div#main {
width: 785px;
@@ -400,13 +402,17 @@ input.icon_min {
input.icon_min[disabled] {
background: #e5e5e5 url(../../images/photo.disabled.png) no-repeat center;
}
+#toolbox {
+ margin-top: 10px;
+}
table, img {
border: 0px;
}
th {
color: #fff;
- background-color: #9eac8b;
+ background-color: #90b165;
text-align:center;
+ font-size: 7pt;
}
tr.datos, tr.datost, tr.datosb , tr.datos_id,
tr.datosf9, tr.datos2, tr.datos2t,
@@ -442,13 +448,13 @@ tr.rowOdd:hover {
background-color: #E0E0E0
}
.bg { /* op menu */
- background-color: #3f4e2f;
+ background-color: #80ab51;
}
.bg2 { /* main page */
- background-color: #ce5c00;
+ background-color: #e79b5d;
}
.bg3 { /* godmode */
- background-color: #ce5c00;
+ background-color: #e79b5d;
}
.bg4 { /* links */
background-color: #5385bf;
@@ -569,10 +575,10 @@ a.mn, .gr {
font-family: Arial, Verdana, sans-serif, Helvetica;
}
div.nf {
- background: url(../../images/info.png) no-repeat;
+ background: url(../../images/info.png) no-repeat scroll 0 50% transparent;
color: #ac4444;
margin-left: 7px;
- padding: 2px 1px 6px 25px;
+ padding: 8px 1px 6px 25px;
}
div.title_line {
background-color: #4e682c;
@@ -581,7 +587,7 @@ div.title_line {
}
#menu_tab_frame, #menu_tab_frame_view {
display: block !important;
- background:#ce5c00 none repeat scroll 0 0;
+ background:#e79b5d none repeat scroll 0 0;
border-bottom:1px solid #778866;
/* float:left; */
margin-left:-8px;
@@ -590,7 +596,7 @@ div.title_line {
width:100%;
}
#menu_tab_frame_view {
- background: #66AA44;
+ background: #9bc969;
}
#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
padding: 0px;
@@ -605,18 +611,18 @@ div.title_line {
background: #d4ddc6;
padding: 3px 5px;
color: #666;
- border-left: 2px solid #778866;
+ border-left: 2px solid #80AB51;
font-weight: bold;
line-height: 18px;
}
#menu_tab li.separator_view {
- background: #66AA44;
+ background: #9BC969;
padding: 4px;
}
#menu_tab li.separator {
- background: #ce5c00;
+ background: #e79b5d;
padding: 4px;
}
@@ -654,7 +660,7 @@ div.title_line {
}
#menu_tab_left li a, #menu_tab_left li span {
/* text-transform: uppercase; */
- background: #ce5c00;
+ background: #e79b5d;
padding: 2px 5px 2px 5px;
color: #fff;
font-weight: bold;
@@ -761,6 +767,18 @@ span.rmess, span.nrmess {
.databox {
background-color: #fafafa;
}
+/* Style for login form */
+.databox_login {
+ margin-top: 100px !important;
+ width: 550px !important;
+ height: 290px;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ margin-left: 0px;
+ border: none !important;
+ background-color: #fafafa;
+ background: url(../../images/splash_pandora.png);
+}
.databox_color {
background-color: #fafafa;
}
@@ -982,6 +1000,9 @@ table#simple label {
table#agent_list tr, table.alert_list tr {
vertical-align: top;
}
+.toggle { border-collapse: collapse;}
+.toggle td { border-left: 1px solid #D3D3D3;}
+
ul.actions_list {
list-style-image: url(../../images/arrow.png);
list-style-position: inside;
@@ -1080,7 +1101,7 @@ ul.action_list li div {
margin-left: 15px;
}
span.action_name {
- float: left;
+ float: none;
}
div.actions_container {
overflow:auto;
@@ -1189,3 +1210,62 @@ div.warn {
-webkit-border-radius: 4px;
border-radius: 4px;
}
+
+/* Pandora width style theme */
+
+div#container {
+ width: 95%;
+}
+div#page {
+ width: auto;
+}
+div#main {
+ width: auto;
+ float: none;
+ padding-left: 0px;
+ padding-top: 0px;
+ padding-bottom: 20px;
+ margin-left: 175px;
+ margin-right: 20px;
+}
+div#head {
+ width: auto;
+}
+div#foot {
+ width: auto;
+}
+ol.steps {
+ margin-bottom: 70px;
+}
+div#steps_clean {
+ display:none;
+}
+#menu_tab_frame, #menu_tab_frame_view {
+ width: 100%;
+ padding-right: 28px;
+ margin-left: -8px;
+}
+div#events_list {
+ float: left;
+ width: 100%;
+}
+span#logo_text1 {
+ font: bolder 3em Arial, Sans-serif;
+ letter-spacing: -2px;
+ color: #eee;
+}
+span#logo_text2 {
+ font: 3em Arial, Sans-serif;
+ letter-spacing: -2px;
+ color: #aaa;
+}
+div#logo_text3 {
+ text-align: right;
+ font: 2em Arial, Sans-serif;
+ letter-spacing: 6px;
+ color: #aaa;
+ font-weight: bold;
+ margin-top: 0px;
+ margin-left: 4px;
+ padding-top: 0px;
+}
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 8a50d88998..022953945b 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -22,10 +22,12 @@ Description: A theme with a dark style
*/
@import url(pandora.css);
+@import url(pandora_width.css);
body, body.pure {
color: #EEE;
- background-color: #000;
+ background-color: #4b4949;
+ background: #4b4949 url(../../images/black_background.png) repeat-x left top;
}
h1, h2, h3, h4 {
color: #BBB;
@@ -43,6 +45,7 @@ h1#log {
div#container, div#page, div#main, div#head {
background-image: none;
background-color: #000;
+ background: #4b4949 url(../../images/black_background.png) repeat-x left top;
}
div#page {
border-bottom: solid 5px #001E40;
@@ -51,6 +54,9 @@ div#page {
div#foot {
background-color: #960003;
}
+div#head {
+ background: url(../../images/black_red_header.png);
+}
input:hover {
background-color: #d4dccd;
}
diff --git a/pandora_console/include/styles/pandora_blackmetal.css b/pandora_console/include/styles/pandora_blackmetal.css
index f2b69ac6e6..4870f2a483 100644
--- a/pandora_console/include/styles/pandora_blackmetal.css
+++ b/pandora_console/include/styles/pandora_blackmetal.css
@@ -38,7 +38,7 @@ Description: A theme with a variable width layout
*/
-@import url(pandora_width.css);
+@import url(pandora.css);
div#pandora_logo_header {
/* Put here your company logo */
diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css
deleted file mode 100644
index a15c6d0d98..0000000000
--- a/pandora_console/include/styles/pandora_red.css
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
-
-Author: The Pandora FMS team
-Name: Red theme
-Description: A red theme for Pandora FMS
-
-// Pandora FMS - the Flexible Monitoring System
-// =============================================
-// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
-
-// 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
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-@import url(op.css);
-@import url(god.css);
-@import url(link.css);
-@import url(tip.css);
-* {
- font-family: verdana, sans-serif;
- font-size: 8pt;
-}
-body {
- text-align: center;
-}
-input, textarea {
- border: 1px solid #ddd;
- font: verdana, sans-serif;
- font-size: 8pt;
-}
-textarea {
- padding: 5px;
- height: 100px;
- font-family: verdana, sans-serif;
- font-size: 8pt;
-}
-textarea.conf_editor {
- padding: 5px;
- width: 650;
- height: 350;
- font-family: verdana, sans-serif;
- font-size: 8pt;
-}
-input {
- padding: 2px 3px 4px 3px;
-}
-input.button {
- margin: 0;
- font: bold, Arial, Sans-serif;
- border: 1px solid #ccc;
- background: #fff;
- padding: 2px 3px;
- margin: 10px 15px;
-}
-select {
- padding: 0px;
- border:1px solid #ddd;
- font-family: verdana, sans-serif;
- font-size: 8pt;
-}
-checkbox {
- padding: 4px;
- border:1px solid #eee;
-}
-h1, h2, h3 {
- font: bold 1em Arial, Sans-serif;
- text-transform: uppercase;
- color: #A00;
- padding-bottom: 5px;
- padding-top: 7px;
-}
-h1 {
- font-size: 16px;
-}
-h2 {
- font-size: 15px;
-}
-h3 {
- font-size: 14px;
-}
-h4 {
- margin-bottom: 2px;
- padding-bottom: 0px;
- padding-top: 5px;
- font-size: 13px;
-}
-a {
- color: #d81616;
- text-decoration: none;
-}
-a:hover {
- color: #003a3a;
- text-decoration: underline;
-}
-a.white_bold {
- color: #eee;
- text-decoration: none;
- font-weight: bold;
-}
-a.white_grey_bold {
- color: #999;
- text-decoration: none;
- font-weight: bold;
-}
-
-a.white {
- color: #eee;
- text-decoration: none;
-}
-p.center {
- text-align: center;
-}
-h1#log {
- font-size: 18px;
- margin-bottom: 0px;
- color: #000;
-}
-h1#log_f {
- color: #f00;
- border-bottom: 1px solid #f00;
- padding-bottom: 3px;
-}
-div#login {
- margin: 0 auto;
- margin-top: 200px;
- width: 460px;
- border-left: solid 1px #000;
- border-top: solid 1px #000;
- border-bottom: solid 2px #000;
- border-right: solid 2px #000
-}
-div#login_in, #login_f {
- margin: 0 auto;
- width: 400px;
-}
-div#login_f {
- margin-top: 10px;
- margin-bottom: 25px;
-}
-div#noaccess {
- width: 350px;
- padding-left: 40px;
-}
-div#activity{
- padding-top: 18px;
- padding-bottom: 18px;
-}
-div#noa {
- float: right;
- padding-right: 50px;
- margin-top: 25px;
-}
-div#db_f {
- text-align: justify;
- margin: auto;
- padding: 0.5em;
- width: 55em;
- margin-top: 3em;
-}
-div#db_ftxt {
- float: right;
- padding-top: 10px;
-}
-div#container {
- margin: 0 auto;
- width: 960px;
- text-align: left;
- border-left: solid 2px #000;
- border-right: solid 2px #000;
- border-top: solid 2px #000;
- margin-top: 5px;
-}
-div#page {
- width: 960px;
- background: #fff;
- clear: both;
- border-bottom: solid 5px #D44;
- border-top: solid 5px #D44;
-}
-div#main {
- width: 780px;
- min-height: 500px;
- float: right;
- padding-left: 0px;
- padding-top: 0px;
- padding-bottom: 20px;
- margin-bottom: 25px;
- background-color: #fefefe;
- background-image: url(../../images/backgrounds/background_red.png);
- margin-top: 0px;
- margin-left: 0px;
- margin-right: 0px;
-}
-div#menu {
- width: 155px;
- float: left;
-}
-div#page>div#menu {
- width: 157px;
-}
-div#head {
- font-size: 8pt;
- width: 960px;
- height: 60px;
- background: url(../../images/header_red.jpg);
-}
-div#foot {
- font-size: 7pt;
- margin-top: solid 2px #000;
- padding-top: 5px;
- padding-bottom: 5px;
- text-align: center;
- background: #960003;
- width: 960px;
- clear: both;
-}
-#ver {
- margin-bottom: 25px;
-}
-#ip {
- margin-top: 10px;
- margin-bottom: 5px;
-}
-label {
- display: block;
- float: left;
- padding-top: 4px;
-}
-
-
-th > label {
- padding-top: 7px;
-}
-input:hover {
- background-color: #d4dccd;
-}
-input.chk {margin-right: 0px;
- border: 0px none;
- height: 14px;
-}
-input.datos {
- background-color: #f5f5f5;
-}
-input.datos_readonly {
- background-color: #050505;
-}
-input.login {
- border-color: #D44;
- background-color: #f5f5f5;
- margin: 2px 0 8px;
- width: 90px;
-}
-input.sub {
- font-weight: bold;
- border-bottom-color: #708090;
- border-right-color: #708090;
- -moz-border-radius: 5%;
- font-size: 8pt;
-}
-input.next {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/go.png) no-repeat right 2px;
-}
-input.upd {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/upd.png) no-repeat right 3px;
-}
-input.wand {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/wand.png) no-repeat right 3px;
-}
-input.delete {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/cross.png) no-repeat right 3px;
-}
-input.search {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px;
-}
-input.copy {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/copy.png) no-repeat right 3px;
-}
-input.ok {
- padding-right: 21px;
- background: #e5e5e5 url(../../images/ok.png) no-repeat right 3px;
-}
-table, img {
- border: 0px;
-}
-th, td.lb, td.lb_view {
- color: #fff;
- background-color: #D44;
-}
-td.datos, td.datost, td.datosb , td.datos_id, td.datosf9 {
- background-color: #fff0f0;
-}
-td.datos2, td.datos2t, td.datos2b, td.datos2_id , td.datos2f9 {
- background-color: #efefef;
-}
-td.datos3 {
- background-color: #d4ddc6;
-}
-td.datos_id {
- color: #1a313a;
-}
-td.datos_jus, td.datos2_jus {
- text-align: justify;
-}
-
-tr.rowPair {
- background-color: #fff;
-}
-
-tr.rowOdd {
- background-color: #F08080;
-}
-
-tr.rowPair:hover {
- background-color: #FFBFBF;
-}
-
-tr.rowOdd:hover {
- background-color: #F8D0D0;
-}
-
-.bg { /* op menu */
- background-color: #D44;
-}
-.bg2 { /* main page */
- background-color: #d84437;
-}
-.bg3 { /* godmode */
- background-color: #d84437;
-}
-.bg4 { /* links */
- background-color: #5385bf;
-}
-.bg, .bg2, .bg3, .bg4 {
- position: relative;
- height: 20px;
- width: 100%;
-}
-.f10, #ip {
- font-size: 7pt;
- text-align: center;
-}
-.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9 {
- font-size: 6.5pt;
-}
-.f9i, .redi {
- font-style: italic;
-}
-.jus {
- text-align: justify;
- width: 700px;
-}
-.tit {
- padding-top: 3px;
-}
-.tit, .titb {
- font-weight: bold;
- color: #fff;
- text-align: center;
-}
-.suc {
- color: #5a8629;
- background: url(../../images/suc.png) no-repeat 1px;
- padding: 4px 1px 6px 30px;
-}
-.error {
- background: url(../../images/err.png) no-repeat;
- padding: 4px 1px 6px 30px;
-}
-.red , .redb, .redi, .error {
- color: #f00;
-}
-.sep {
- margin-left: 30px;
- border-bottom: 1px solid #708090;
- width: 100%;
-}
-.suc {
- color: #5a8629;
- background: url(../../images/suc.png) no-repeat 1px;
- padding: 4px 1px 6px 30px;
-}
-.green {
- color: #5a8629;
-}
-.yellow {
- color: #F3C500;
-}
-.greenb {
- color: #00aa00;
-}
-.grey {
- color: #808080;
- font-weight: bold;
-}
-.redb, .greenb, td.datos_id, td.datos2_id, f9b {
- font-weight: bold;
-}
-.p10 {
- padding-top: 1px;
- padding-bottom: 0px;
-}
-.p21 {
- padding-top: 2px;
- padding-bottom: 1px;
-}
-.w120 {
- width: 120px;
-}
-.w130, #table-agent-configuration select {
- width: 130px;
-}
-.w135 {
- width: 135px;
-}
-.w155, #table_layout_data select {
- width: 155px;
-}
-.top, .top_red, .bgt, td.datost, td.datos2t {
- vertical-align: top;
-}
-.top_red {
- background: #ff0000;
-}
-.bot, .titb, td.datosb {
- vertical-align: bottom;
-}
-.msg {
- margin-top: 15px;
- text-align: justify;
-}
-ul.mn {
- list-style: none;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- line-height: 24px;
-}
-.gr {
- font-size: 10pt;
- font-weight: bold;
-}
-a.mn, .gr {
- font-family: Arial, Verdana, sans-serif, Helvetica;
-}
-div.nf {
- background: url(../../images/info.png) no-repeat;
- color: #ac4444;
- margin-left: 7px;
- padding: 2px 1px 6px 25px;
-}
-div.title_line {
- background-color: #4e682c;
- height: 5px;
- width: 762px;
-}
-#menu_tab_frame {
- background: #D84437;
- width: 805px;
- min-height: 22px;
- padding-left: 0x;
- margin-left: -25px;
- float:left;
- border-bottom: 1px solid #778866;
-}
-#menu_tab_frame_view {
- background: #66AA44;
- width: 805px;
- min-height: 22px;
- padding-left: 0x;
- margin-left: -25px;
- float:left;
- border-bottom: 1px solid #778866;
-}
-
-
-#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
- padding: 0px;
- list-style: none;
- margin: 0px;
-}
-#menu_tab .mn li {
- float: right;
- position: relative;
-}
-#menu_tab li a, #menu_tab li.nomn a {
- background: #d4ddc6;
- padding: 2px 10px 2px 10px;
- color: #333;
- border-left: 1px solid #fff;
- font-weight: bold;
- line-height: 18px;
-}
-#menu_tab li.nomn_high a {
- background: #799E48;
- color: #fff;
- padding: 2px 10px 2px 10px;
- border-left: 2px solid #778866;
- /* 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 {
- background: #cde0ad;
-}
-#menu_tab li:hover a {
- background: #b2b08a url("../images/arrow.png") no-repeat right 3px;
-}
-#menu_tab li:hover ul a, #menu_tab .mn ul {
- background: #db6351;
- border-top: none;
-}
-/* TAB TITLE */
-#menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul {
- padding: 0px 0px 0px 0px;
- list-style: none;
- margin: 0px 0px 0px -20px;
-}
-#menu_tab_left .mn li {
- float: left;
- position: relative;
-}
-#menu_tab_left li a {
- background: #d84437;
- padding: 2px 10px 2px 10px;
- color: #fff;
-/* font-weight: bold; */
- line-height: 18px;
-}
-#menu_tab_left .mn li a {
- display: block;
- text-decoration: none;
-}
-#menu_tab_left li.view a {
- background: #6a4;
- padding: 2px 10px 2px 10px;
- color: #fff;
- font-weight: bold;
- line-height: 18px;
-}
-span.users {
- background: url(../../images/group.png) no-repeat;
-}
-span.agents {
- background: url(../../images/bricks.png) no-repeat;
-}
-span.data {
- background: url(../../images/data.png) no-repeat;
-}
-span.alerts {
- background: url(../../images/bell.png) no-repeat;
-}
-span.time {
- background: url(../../images/hourglass.png) no-repeat;
-}
-span.net {
- background: url(../../images/network.png) no-repeat;
-}
-span.master {
- background: url(../../images/master.png) no-repeat;
-}
-span.wmi {
- background: url(../../images/wmi.png) no-repeat;
-}
-span.prediction {
- background: url(../../images/chart_bar.png) no-repeat;
-}
-span.plugin {
- background: url(../../images/plugin.png) no-repeat;
-}
-span.export {
- background: url(../../images/database_refresh.png) no-repeat;
-}
-span.snmp {
- background: url(../../images/snmp.png) no-repeat;
-}
-span.binary {
- background: url(../../images/binary.png) no-repeat;
-}
-span.recon {
- background: url(../../images/recon.png) no-repeat;
-}
-span.rmess {
- background: url(../../images/email_open.png) no-repeat;
-}
-span.nrmess {
- background: url(../../images/email.png) no-repeat;
-}
-
-/* This kind of span do not have any sense, should be replaced on PHP code
-by a real img in code. They are not useful because insert too much margin around
-(for example, not valid to use in the table of server view */
-
-span.users, span.agents, span.data, span.alerts, span.time, span.net,
-span.master, span.snmp, span.binary, span.recon {
- margin-left: 4px;
- margin-top: 10px;
- padding: 4px 8px 12px 30px;
- display: block;
-}
-span.rmess, span.nrmess {
- margin-left: 14px;
- padding: 1px 0px 10px 30px;
- display: block;
-}
-/* New styles for data box */
-.databox, .databox_color, .databox_frame {
- margin-bottom: 15px;
- margin-top: 5px;
- margin-left: 0px;
- border: 1px solid #f2f2f2;
-}
-.databox {
- background-color: #fafafa;
-}
-.databox_color {
- border-left: 4px solid #D44;
-}
-#head_l {
- float: left;
- margin: 0;
- padding: 0;
-}
-#head_r {
- float: right;
- text-align: right;
- margin-right: 10px;
- padding-top: 0px;
-}
-#head_m {
- position: absolute;
- padding-top: 7px;
- padding-left: 210px;
-
-}
-span#logo_text1 {
- font: bolder 3em Arial, Sans-serif;
- letter-spacing: -2px;
- color: #eee;
-}
-span#logo_text2 {
- font: 3em Arial, Sans-serif;
- letter-spacing: -2px;
- color: #aaa;
-}
-div#logo_text3 {
- text-align: right;
- font: 2em Arial, Sans-serif;
- letter-spacing: 6px;
- color: #aaa;
- font-weight: bold;
- margin-top: 0px;
- margin-left: 4px;
- padding-top: 0px:
-}
-.bb0 {
- border-bottom: 0px;
-}
-.bt0 {
- border-top: 0px;
-}
-
-.action-buttons {
- text-align: right;
-}
-
-#table-add-item select, #table-add-sla select {
- width: 180px;
-}
-
-/* classes for event priorities. Sits now in functions.php */
-.datos_green, .datos_greenf9 {
- background-color: #BBFFA4;
-}
-
-.datos_red, .datos_redf9 {
- background-color: #FFC0B5;
-}
-
-.datos_yellow, .datos_yellowf9 {
- background-color: #F4FFBF;
-}
-
-.datos_blue, .datos_bluef9 {
- background-color: #CDE2EA;
-}
-
-.datos_grey, .datos_greyf9 {
- background-color: #E4E4E4;
-}
-
-.datos_greyf9, .datos_bluef9, .datos_greenf9, .datos_redf9, .datos_yellowf9 {
- font-size: 6.5pt;
-}
-
-td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
- padding: 5px 5px 5px 5px;
-}
-/* end of classes for event priorities */
-
-div#main_pure {
- background-color: #fefefe;
- text-align: left;
- margin-bottom: 25px;
- margin-top: 10px;
- margin-left: 10px;
- margin-right: 10px;
-}
-
-div#pandora_logo_header {
- background: url(../../images/pandora_logo_head.png);
- background-position: 0% 0%;
- width: 139px;
- height: 60px;
- float: left;
-}
-
-.disabled_module {
- color: #d88c8c;
-}
\ No newline at end of file
diff --git a/pandora_console/include/styles/pandora_width.css b/pandora_console/include/styles/pandora_width.css
deleted file mode 100644
index 44fe0ca439..0000000000
--- a/pandora_console/include/styles/pandora_width.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-
-Author: The Pandora FMS team
-Name: Panoramic theme
-Description: A theme with a variable width layout
-
-// Pandora FMS - the Flexible Monitoring System
-// =============================================
-// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
-
-// 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
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-@import url(pandora.css);
-
-div#container {
- width: 95%;
-}
-div#page {
- width: auto;
-}
-div#main {
- width: auto;
- float: none;
- padding-left: 0px;
- padding-top: 0px;
- padding-bottom: 20px;
- margin-left: 175px;
- margin-right: 20px;
-}
-div#head {
- width: auto;
-}
-div#foot {
- width: auto;
-}
-ol.steps {
- margin-bottom: 70px;
-}
-div#steps_clean {
- display:none;
-}
-#menu_tab_frame, #menu_tab_frame_view {
- width: 100%;
- padding-right: 28px;
- margin-left: -8px;
-}
-div#events_list {
- float: left;
- width: 100%;
-}
-span#logo_text1 {
- font: bolder 3em Arial, Sans-serif;
- letter-spacing: -2px;
- color: #eee;
-}
-span#logo_text2 {
- font: 3em Arial, Sans-serif;
- letter-spacing: -2px;
- color: #aaa;
-}
-div#logo_text3 {
- text-align: right;
- font: 2em Arial, Sans-serif;
- letter-spacing: 6px;
- color: #aaa;
- font-weight: bold;
- margin-top: 0px;
- margin-left: 4px;
- padding-top: 0px;
-}
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index f65eb37e31..1073a1c0f7 100644
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -322,7 +322,7 @@ else
$table->head[6] = __('Last fired');
$table->head[7] = __('Status');
$table->head[8] = __('Validate');
-
+
$table->align[7] = 'center';
$table->align[8] = 'center';
}
@@ -347,7 +347,7 @@ else
$table->head[5] = __('Last fired');
$table->head[6] = __('Status');
$table->head[7] = __('Validate');
-
+
$table->align[6] = 'center';
$table->align[7] = 'center';
}
@@ -371,7 +371,7 @@ foreach ($alerts['alerts_simple'] as $alert) {
$table->rowclass[$iterator] = 'rowOdd';
$rowPair = !$rowPair;
- array_push ($table->data, ui_format_alert_row ($alert, false, $print_agent, $url));
+ array_push ($table->data, ui_format_alert_row ($alert, false, $print_agent, $url, 'font-size: 7pt;'));
}
echo '<form method="post" action="'.$url.'">';
@@ -404,7 +404,7 @@ else
$table->data = array ();
foreach ($alerts['alerts_combined'] as $alert) {
- array_push ($table->data, format_alert_row ($alert, true, $print_agent));
+ array_push ($table->data, ui_format_alert_row ($alert, true, $print_agent));
}
if (!empty ($table->data)) {
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 7c4c17285a..e5e2226317 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -348,14 +348,25 @@ foreach ($agents as $agent) {
$data = array ();
- $data[0] = '';
+ $data[0] = '';
+ $data[0] .= '<span class="left">';
+ $data[0] .= ui_print_agent_name($agent["id_agente"], true, 60, 'font-size:6.5pt !important;', true);
+ $data[0] .= '</span>';
+ $data[0] .= '<div class="left actions" style="visibility: hidden; clear: left">';
+ $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>';
+ $data[0] .= ' | ';
+ $data[0] .= '<a href="index.php?sec=gagente&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'&tab=data">'.__('Data').'</a>';
if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {
+ $data[0] .= ' | ';
+ $data[0] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>';
+ }
+ $data[0] .= '</div>';
+
+ /*if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {
$data[0] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$agent["id_agente"].'">';
$data[0] .= html_print_image ("images/setup.png", true, array ("border" => 0, "width" => 16));
$data[0] .= '</a> ';
- }
-
- $data[0] .= ui_print_agent_name($agent["id_agente"], true, 40, 'none', true);
+ }*/
$data[1] = ui_print_os_icon ($agent["id_os"], false, true);
@@ -432,6 +443,13 @@ if (check_acl ($config['id_user'], 0, "LM") || check_acl ($config['id_user'], 0,
<script type="text/javascript">
$(document).ready (function () {
+ $("table#table1 tr").hover (function () {
+ $(".actions", this).css ("visibility", "");
+ },
+ function () {
+ $(".actions", this).css ("visibility", "hidden");
+ });
+
$("#group_id").click (
function () {
$(this).css ("width", "auto");
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 55caf74aa4..2fc542e823 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -67,10 +67,10 @@ echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="w
//Agent name
echo '<tr><td class="datos"><b>'.__('Agent name').'</b></td>';
if ($agent['disabled']) {
- $cellName = "<em>" . ui_print_agent_name ($agent["id_agente"], true, 35, "upper", true) . ui_print_help_tip(__('Disabled'), true) . "</em>";
+ $cellName = "<em>" . ui_print_agent_name ($agent["id_agente"], true, 500, "upper", true) . ui_print_help_tip(__('Disabled'), true) . "</em>";
}
else {
- $cellName = ui_print_agent_name ($agent["id_agente"], true, 35, "upper", true);
+ $cellName = ui_print_agent_name ($agent["id_agente"], true, 500, "upper", true);
}
echo '<td class="datos"><b>'.$cellName.'</b></td>';
echo '<td class="datos" width="40"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a> ';
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 67850e2b2a..ff22704ca4 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -229,7 +229,7 @@ $table->head[9] = __('Last contact') . ' ' .
'<a href="' . $url . '&sort_field=last_contact&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
'<a href="' . $url . '&sort_field=last_contact&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
-$table->align = array("left","left","left","left","left","center");
+$table->align = array("left","left","center","left","left","center");
$last_modulegroup = 0;
$rowIndex = 0;
@@ -312,7 +312,7 @@ foreach ($modules as $module) {
}
}
- $data[2] = servers_show_type ($module['id_modulo']);
+ $data[2] = servers_show_type ($module['id_modulo']) . ' ';
if (check_acl ($config['id_user'], $id_grupo, "AW"))
$data[2] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&id_agent_module='.$module["id_agente_modulo"].'&edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
@@ -414,7 +414,7 @@ foreach ($modules as $module) {
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($module["nombre"])."&refresh=600','day_".$win_handle."')";
// if ($nombre_tipo_modulo != "log4x")
- $data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a>';
+ $data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> ';
$data[8] .= " <a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente&tab=data_view&period=86400&id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => '0', "alt" => "")) . "</a>";
}
diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php
index 018419abaa..8ac5fce03f 100644
--- a/pandora_console/operation/agentes/estado_ultimopaquete.php
+++ b/pandora_console/operation/agentes/estado_ultimopaquete.php
@@ -57,10 +57,6 @@ switch ($config["dbtype"]) {
$label_group = 0;
$last_label = "";
-// Title
-echo "<h4>".__('Display of last data modules received by agent');
-echo " <a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente&tab=data'>" . html_print_image('images/refresh.png', true, array("alt" => '')) . "</a>";
-echo "</h4>";
$sortField = get_parameter('sort_field');
$sort = get_parameter('sort', 'none');
@@ -315,12 +311,12 @@ foreach ($modules as $module) {
$last_label = $nombre_grupomodulo;
$texto = $texto. "
<td class='$tdcolor' align='center' colspan='7'>
- <b>".$nombre_grupomodulo."</b></td>";
+ <b><span style='font-size: 7.5pt'>".$nombre_grupomodulo."</span></b></td>";
}
}
$nombre_tipo_modulo = modules_get_moduletype_name ($module["id_tipo_modulo"]);
echo "<td class='".$tdcolor."_id' title='".io_safe_output($module["nombre"])."'>";
- ui_print_string_substr ($module["nombre"]);
+ ui_print_string_substr ($module["nombre"], 35, false, 10);
echo "</td><td class='".$tdcolor."'> ";
ui_print_moduletype_icon ($module["id_tipo_modulo"]);
diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php
index 2a0e88cadb..3ed6893f3b 100644
--- a/pandora_console/operation/agentes/gis_view.php
+++ b/pandora_console/operation/agentes/gis_view.php
@@ -96,7 +96,7 @@ echo __(" seconds.") . " ";
html_print_submit_button(__('Refresh path'), 'refresh', false, 'class = "sub upd"');
echo "</form>";
-echo "<h3>" . __("Positional data from the last") . " " . human_time_description_raw ($period) ."</h3>";
+echo "<h4>" . __("Positional data from the last") . " " . human_time_description_raw ($period) ."</h4>";
/* Get the total number of Elements for the pagination */
$sqlCount = sprintf ("SELECT COUNT(*) FROM tgis_data_history WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d) ORDER BY end_timestamp DESC", $agentId, get_system_time () - $period);
$countData = db_get_value_sql($sqlCount);
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index 652c94ced6..32a63a4a52 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -52,7 +52,7 @@ if (!$filter) {
$table = null;
-$table->width = '90%';
+$table->width = '98%';
$table->size = array();
$table->size[0] = '20%';
@@ -124,7 +124,7 @@ else
$date = $utime;
foreach ($modulesChecked as $idModuleShowGraph => $value) {
- echo "<h3>" . $modules[$idModuleShowGraph] . '</h3>';
+ echo "<h4>" . $modules[$idModuleShowGraph] . '</h4>';
$unit = modules_get_unit ($idModuleShowGraph);
echo grafico_modulo_sparse2($idModuleShowGraph, $period, $draw_events, $width, $height,
$modules[$idModuleShowGraph], null, $draw_alerts, $avg_only, false, $date, $unit);
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index c7ea4e3a76..cda7eaedde 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -114,7 +114,7 @@ foreach ($groups as $id_group => $group_name) {
// Group name
echo "<td style='text-align:center;'>";
- echo ui_print_group_icon ($id_group, true);
+ echo ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt');
echo "</td>";
echo "<td style='font-weight: bold; font-size: 12px;'>";
echo "<a href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 006a686596..0ee3e6945d 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -416,7 +416,7 @@ foreach ($result as $row) {
}
$data[1] = '<strong><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$row["id_agent"].'">';
- $data[1] .= ui_print_truncate_text($row["agent_name"],30,false,true,false);
+ $data[1] .= ui_print_truncate_text($row["agent_name"], 40, false, true, false, '[…]', 'font-size:7.5pt;');
$data[1] .= '</a></strong>';
$data[2] = html_print_image("images/" . modules_show_icon_type ($row["module_type"]), true);
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 4d19113e2c..4eb8184966 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -14,7 +14,6 @@
// GNU General Public License for more details.
-
// Load global vars
global $config;
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index c5efac20fb..2b0b07a34f 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -429,12 +429,7 @@ foreach ($result as $event) {
// Event description
$data[1] = '<span title="'.$event["evento"].'" class="f9">';
$data[1] .= '<a href="'.$url.'&group_rep=0&offset=0&pure='.$config["pure"].'&search='.rawurlencode ($event["evento"]).'">';
- if (strlen ($event["evento"]) > 50) {
- $data[1] .= mb_substr (io_safe_output($event["evento"]), 0, 50)."...";
- }
- else {
- $data[1] .= io_safe_output($event["evento"]);
- }
+ $data[1] .= '<span style="font-size: 7.5pt;">' . io_safe_output($event["evento"]) . '</span>';
$data[1] .= '</a></span>';
if ($event["event_type"] == "system") {
@@ -533,13 +528,13 @@ foreach ($result as $event) {
array_push ($table->data, $data);
//Hiden row with extended description
- $string = '<table border="0" width="90%"><tr>';
- $string .= '<td align="left" valign="top" width="25%">';
- $string .= '<b>' . __('Event name') . ':</b></td><td align="left">';
+ $string = '<table width="90%" style="border:solid 1px #D3D3D3;" class="toggle"><tr>';
+ $string .= '<td align="left" valign="top" width="25%" border="solid 1px">';
+ $string .= '<b>' . __('Event name') . '</b></td><td align="left">';
$string .= io_safe_output($event["evento"]);
- $string .= '</td></tr><tr>';
+ $string .= '</td></tr><tr style="border-left: solid 1px; #D3D3D3;">';
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Severity') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Severity') . '</b></td><td align="left">';
$string .= html_print_image ($img_sev, true,
array ("class" => "image_status",
"width" => 12,
@@ -548,18 +543,18 @@ foreach ($result as $event) {
$string .= ' '.get_priority_name ($event["criticity"]);
$string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Type') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Type') . '</b></td><td align="left">';
$string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true);
$string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Agent name') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Agent name') . '</b></td><td align="left">';
$string .= ui_print_agent_name ($event["id_agente"], true);
$string .= '</td></tr><tr>';
if ($event["id_agentmodule"] != 0) {
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Agent module source') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Agent module source') . '</b></td><td align="left">';
$string .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$event["id_agente"].'&tab=data">';
$string .= db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $event["id_agentmodule"]);
$string .= '</a></td></tr><tr>';
@@ -567,7 +562,7 @@ foreach ($result as $event) {
if ($event["id_alert_am"] != 0) {
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Alert source') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Alert source') . '</b></td><td align="left">';
$string .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$event["id_agente"].'&tab=alert">';
$standby = db_get_value('standby', 'talert_template_modules', 'id', $event["id_alert_am"]);
if(!$standby) {
@@ -593,15 +588,14 @@ foreach ($result as $event) {
}
$string .= '<td align="left" valign="top" width="15%">';
- $string .= '<b>' . __('Group') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Group') . '</b></td><td align="left">';
$string .= ui_print_group_icon ($event["id_grupo"], true);
- $string .= ' '. groups_get_name ($event["id_grupo"], true);
$string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">';
if ($group_rep == 0) {
- $string .= '<b>' . __('User ID') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('User ID') . '</b></td><td align="left">';
} else {
- $string .= '<b>' . __('Count') . ':</b></td><td align="left">';
+ $string .= '<b>' . __('Count') . '</b></td><td align="left">';
}
if ($group_rep == 1) {
@@ -621,14 +615,14 @@ foreach ($result as $event) {
}
}
$string .= '</td></tr>';
- $string .= '<tr><td align="left" valign="top">' . '<b>' . __('Comments') . ':</td><td align="left">';
+ $string .= '<tr><td align="left" valign="top">' . '<b>' . __('Comments') . '</td><td align="left">';
if($event["user_comment"] != '') {
$string .= $event["user_comment"];
} else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
}
$string .= '</td></tr>';
- $string .= '<tr><td align="left" valign="top">' . '<b>' . __('Tags') . ':</td><td align="left">';
+ $string .= '<tr><td align="left" valign="top">' . '<b>' . __('Tags') . '</td><td align="left">';
if ($event["tags"] != '') {
$string .= $event["tags"];
}
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index e9fd037be5..b85d157a3a 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -159,7 +159,7 @@ if (isset ($_GET["new_msg"])) { //create message
html_print_input_hidden ("subject", urlencode ($new_subj));
html_print_input_hidden ("message", urlencode ($new_msg));
- echo '<div style="text-align:right; width:600px;">';
+ echo '<div style="text-align:right; width:98%;">';
html_print_submit_button (__('Reply'), "reply_btn", false, 'class="sub next"');
echo '</div></form>';
return;
@@ -244,7 +244,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
html_print_table ($table);
echo '</form>';
}
- echo '<div class="action-buttons" style="width:90%">';
+ echo '<div class="action-buttons" style="width:98%">';
echo '<form method="post" action="index.php?sec=messages&sec2=operation/messages/message&new_msg=1">';
html_print_submit_button (__('New message'), "send_mes", false, 'class="sub next"');
echo '</form></div>';
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index cbe344766d..ad4942c218 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -118,13 +118,13 @@ if ($view_graph) {
// Header
ui_print_page_header (__('Reporting'). " » ". __('Combined image render'), "images/reporting.png", false, "", false, $options);
- echo "<table class='databox_frame' cellpadding='0' cellspacing='0'>";
+ echo "<table class='databox_frame' cellpadding='0' cellspacing='0' width='98%'>";
echo "<tr><td>";
custom_graphs_print ($id_graph, $height, $width, $period, $stacked, false, $unixdate);
echo "</td></tr></table>";
$period_label = human_time_description_raw ($period);
echo "<form method='POST' action='index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id=$id_graph'>";
- echo "<table class='databox_frame' cellpadding='4' cellspacing='4'>";
+ echo "<table class='databox_frame' cellpadding='4' cellspacing='4' style='width: 98%'>";
echo "<tr>";
echo "<td>";
echo "<b>".__('Date')."</b>"." ";
@@ -204,7 +204,7 @@ ui_print_page_header (__('Reporting'). " » ".__('Custom graph viewer'), "
$graphs = custom_graphs_get_user ();
if (! empty ($graphs)) {
- $table->width = '500px';
+ $table->width = '98%';
$tale->class = 'databox_frame';
$table->align = array ();
$table->align[2] = 'center';
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 8aabaf082e..d2928f50c6 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -189,6 +189,8 @@ $table->style[0] = 'font-weight: bold';
$table->style[1] = 'font-weight: bold';
$table->head[0] = __('Profile name');
$table->head[1] = __('Group');
+$table->align = array();
+$table->align[1] = 'center';
$table->data = array ();
@@ -199,7 +201,7 @@ if ($result === false) {
foreach ($result as $profile) {
$data[0] = '<b>'.profile_get_name ($profile["id_perfil"]).'</b>';
- $data[1] = ui_print_group_icon ($profile["id_grupo"], true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">'.groups_get_name ($profile["id_grupo"], true).'</a>';
+ $data[1] = ui_print_group_icon ($profile["id_grupo"], true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'"></a>';
array_push ($table->data, $data);
}
diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php
index e928bda32a..15d054d901 100644
--- a/pandora_console/operation/visual_console/index.php
+++ b/pandora_console/operation/visual_console/index.php
@@ -54,7 +54,6 @@ foreach ($layouts as $layout) {
$data[0] = '<a href="index.php?sec=visualc&sec2=operation/visual_console/render_view&id='.
$layout['id'].'">'.$layout['name'].'</a> ';
$data[1] = ui_print_group_icon ($layout["id_group"], true);
- $data[1] .= " ".groups_get_name ($layout["id_group"], true);
$data[2] = db_get_value ('COUNT(*)', 'tlayout_data', 'id_layout', $layout['id']);
array_push ($table->data, $data);
diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql
index 87c43bf095..2abeb31a6a 100644
--- a/pandora_console/pandoradb.data.oracle.sql
+++ b/pandora_console/pandoradb.data.oracle.sql
@@ -573,3 +573,12 @@ treport_custom_sql_insert(4, 'Group view','= tagente_modulo.id_agente_
treport_custom_sql_insert(4, 'Group view','< (select count(t2.id_agente) from tagente t2 where t1.id_grupo = t2.id_grupo)',1);
COMMIT;
END;;
+
+--
+-- Dumping data for table `tskin`
+--
+BEGIN
+LOCK TABLE tskin IN EXCLUSIVE MODE;
+INSERT INTO tskin VALUES (1,'skin default', 'skin_default', 'Default skin for Pandora FMS web console', 1);
+COMMIT;
+END;;
diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql
index 11cb2bc7a4..ecccd0808e 100644
--- a/pandora_console/pandoradb.data.postgreSQL.sql
+++ b/pandora_console/pandoradb.data.postgreSQL.sql
@@ -410,3 +410,9 @@ INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (2, 'Monitoring&#x
INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (3, 'Monitoring Report Alerts', 'select t1.nombre as agent_name, t2.nombre as module_name, (select talert_templates.name from talert_templates where talert_templates.id = t3.id_alert_template) as template, (select group_concat(t02.name) from talert_template_module_actions as t01 inner join talert_actions as t02 on t01.id_alert_action = t02.id where t01.id_alert_template_module = t3.id group by t01.id_alert_template_module) as actions from tagente as t1 inner join tagente_modulo as t2 on t1.id_agente = t2.id_agente inner join talert_template_modules as t3 on t2.id_agente_modulo = t3.id_agent_module order by agent_name, module_name;');
INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (4, 'Group view', 'select t1.nombre, (select count(t3.id_agente) from tagente as t3 where t1.id_grupo = t3.id_grupo) as agents, (SELECT COUNT(t4.id_agente) FROM tagente as t4 WHERE t4.id_grupo = t1.id_grupo AND t4.disabled = 0 AND t4.ultimo_contacto < NOW() - (intervalo / (1/2))) as agent_unknown, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND utimestamp > 0 AND tagente_modulo.id_tipo_modulo NOT IN(21,22,23,24,100) AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) >= (tagente_estado.current_interval / (1/2))) as monitor_unknow, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,24) AND utimestamp = 0) as monitor_no_init, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 0 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND (utimestamp > 0 OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24)))) as monitor_ok, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 1 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND utimestamp > 0) as monitor_critical, (SELECT COUNT(talert_template_modules.id) FROM talert_template_modules, tagente_modulo, tagente_estado, tagente WHERE tagente.id_grupo = t1.id_grupo AND tagente_modulo.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente.disabled = 0 AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo AND times_fired > 0) as monitor_alert_fired from tgrupo as t1 where 0 < (select count(t2.id_agente) from tagente as t2 where t1.id_grupo = t2.id_grupo)');
SELECT setval('treport_custom_sql_id_seq', (SELECT (SELECT MAX(id) FROM treport_custom_sql)));
+
+--
+-- Dumping data for table `tskin`
+--
+INSERT INTO "tskin" VALUES (1,'skin default', 'skin_default', 'Default skin for Pandora FMS web console', 1);
+SELECT setval('tskin_id_seq', (SELECT (SELECT MAX(id) FROM tskin)));