diff --git a/pandora_console/extensions/net_tools/nettool.png b/pandora_console/extensions/net_tools/nettool.png index 9161739c27..9a78741f1d 100644 Binary files a/pandora_console/extensions/net_tools/nettool.png and b/pandora_console/extensions/net_tools/nettool.png differ diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php index 1d2ddcab75..6f69e39886 100644 --- a/pandora_console/extensions/ssh_gateway.php +++ b/pandora_console/extensions/ssh_gateway.php @@ -57,7 +57,7 @@ function ssh_gateway () { echo "".__("Host address").""; //echo ""; echo "".__("User")."" . ui_print_help_tip(__('For security reasons the following characters are not allowed: %s', '< > | ` $ ; &'), true); - echo "   "; + echo "   "; echo ""; echo ""; echo "".__("Port (use 0 for default)").""; diff --git a/pandora_console/extensions/ssh_gateway/secure_console.png b/pandora_console/extensions/ssh_gateway/secure_console.png index b571eb7c86..f8d5f63e24 100644 Binary files a/pandora_console/extensions/ssh_gateway/secure_console.png and b/pandora_console/extensions/ssh_gateway/secure_console.png differ diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php index 655fe5071c..f10000c981 100644 --- a/pandora_console/extensions/vnc_view.php +++ b/pandora_console/extensions/vnc_view.php @@ -25,7 +25,7 @@ function vnc_view() { echo __("VNC Display (:0 by default)") . " "; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; $port = 5800 + $display; diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index 7ab1aa17a8..62f8703b91 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -46,10 +46,10 @@ if (!gis_get_agent_map($id_agente, "500px", "98%", false)) { } if ($agentData === false) { - echo "

" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "

"; + ui_print_info_message ( __("There is no GIS data for this agent, so it's positioned in default position of map.") ); } -echo "
" . - __("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "
"; +ui_print_warning_message ( + __("When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") ); $table->width = '100%'; $table->class = 'databox filters'; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 5aa6367e81..212563d1b1 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -141,7 +141,7 @@ if ($disk_conf_delete) { echo '
'; $table->width = '100%'; -$table->class = "databox_color"; +$table->class = "databox filters"; $table->head = array (); $table->style = array (); @@ -277,7 +277,7 @@ html_print_table ($table); unset($table); $table->width = '100%'; -$table->class = "databox_color"; +$table->class = "databox filters"; $table->head = array (); $table->style = array (); @@ -391,7 +391,7 @@ ui_toggle(html_print_table ($table, true), __('Advanced options')); unset($table); $table->width = '100%'; -$table->class = "databox_color"; +$table->class = "databox filters"; $table->head = array (); $table->style = array (); diff --git a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php index 3163a00d75..55ce924c89 100644 --- a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php +++ b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php @@ -247,10 +247,10 @@ if ($create_modules) { echo ''; echo ""; -$table->width = '98%'; - -$table->valign[0] = 'top'; -$table->valign[1] = 'top'; +$table->width = '100%'; +$table->cellpadding = 0; +$table->cellspacing = 0; +$table->class = 'databox filters'; $table->data[0][0] = '' . __('Target IP') . ''; $table->data[0][1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true); diff --git a/pandora_console/images/agent_critical.png b/pandora_console/images/agent_critical.png old mode 100755 new mode 100644 index cf9d190fee..2dc009ebe1 Binary files a/pandora_console/images/agent_critical.png and b/pandora_console/images/agent_critical.png differ diff --git a/pandora_console/images/agent_mc.png b/pandora_console/images/agent_mc.png old mode 100755 new mode 100644 index c4d7aa9d43..ca5a958831 Binary files a/pandora_console/images/agent_mc.png and b/pandora_console/images/agent_mc.png differ diff --git a/pandora_console/images/agent_notinit.png b/pandora_console/images/agent_notinit.png old mode 100755 new mode 100644 index 5f60679b31..aa2b49b44f Binary files a/pandora_console/images/agent_notinit.png and b/pandora_console/images/agent_notinit.png differ diff --git a/pandora_console/images/agent_ok.png b/pandora_console/images/agent_ok.png old mode 100755 new mode 100644 index 53fd3d33e6..0c29fa8e5d Binary files a/pandora_console/images/agent_ok.png and b/pandora_console/images/agent_ok.png differ diff --git a/pandora_console/images/agent_unknown.png b/pandora_console/images/agent_unknown.png old mode 100755 new mode 100644 index 74bfda385e..b99497e843 Binary files a/pandora_console/images/agent_unknown.png and b/pandora_console/images/agent_unknown.png differ diff --git a/pandora_console/images/agent_warning.png b/pandora_console/images/agent_warning.png old mode 100755 new mode 100644 index a63e0ac4fb..238f3067e0 Binary files a/pandora_console/images/agent_warning.png and b/pandora_console/images/agent_warning.png differ diff --git a/pandora_console/images/application_edit.png b/pandora_console/images/application_edit.png index bd34201d82..aa1053ba8f 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 61737f2f2a..e471c7fd48 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/applications.png b/pandora_console/images/applications.png index 0859571a78..ca69adc924 100644 Binary files a/pandora_console/images/applications.png and b/pandora_console/images/applications.png differ diff --git a/pandora_console/images/attachment.png b/pandora_console/images/attachment.png index a15132fea6..f827bc818a 100644 Binary files a/pandora_console/images/attachment.png and b/pandora_console/images/attachment.png differ diff --git a/pandora_console/images/html.png b/pandora_console/images/html.png index 89fe89e701..908b2e55a9 100644 Binary files a/pandora_console/images/html.png and b/pandora_console/images/html.png differ diff --git a/pandora_console/images/lightning_go.png b/pandora_console/images/lightning_go.png index 6a5450e12b..1cd8eaffc0 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 a15132fea6..f827bc818a 100644 Binary files a/pandora_console/images/link2.png and b/pandora_console/images/link2.png differ diff --git a/pandora_console/images/list.png b/pandora_console/images/list.png old mode 100755 new mode 100644 index 1a7e1e5e25..5983ff7758 Binary files a/pandora_console/images/list.png and b/pandora_console/images/list.png differ diff --git a/pandora_console/images/lock.png b/pandora_console/images/lock.png index b122b1396d..a10d4d5cab 100644 Binary files a/pandora_console/images/lock.png and b/pandora_console/images/lock.png differ diff --git a/pandora_console/images/max.png b/pandora_console/images/max.png index 87f2c12155..64fb5e04d5 100644 Binary files a/pandora_console/images/max.png and b/pandora_console/images/max.png differ diff --git a/pandora_console/images/min.png b/pandora_console/images/min.png index c1dd8d377f..eda5715cd0 100644 Binary files a/pandora_console/images/min.png and b/pandora_console/images/min.png differ diff --git a/pandora_console/images/module.png b/pandora_console/images/module.png old mode 100755 new mode 100644 index ae7d85245e..3dc1c4005f Binary files a/pandora_console/images/module.png and b/pandora_console/images/module.png differ diff --git a/pandora_console/images/module_critical.png b/pandora_console/images/module_critical.png old mode 100755 new mode 100644 index 0eb9405e03..4ec82bee30 Binary files a/pandora_console/images/module_critical.png and b/pandora_console/images/module_critical.png differ diff --git a/pandora_console/images/module_notinit.png b/pandora_console/images/module_notinit.png old mode 100755 new mode 100644 index 37fb1e7dc8..2b02f3319c Binary files a/pandora_console/images/module_notinit.png and b/pandora_console/images/module_notinit.png differ diff --git a/pandora_console/images/module_ok.png b/pandora_console/images/module_ok.png old mode 100755 new mode 100644 index da6f031a95..1b22594131 Binary files a/pandora_console/images/module_ok.png and b/pandora_console/images/module_ok.png differ diff --git a/pandora_console/images/module_unknown.png b/pandora_console/images/module_unknown.png old mode 100755 new mode 100644 index bb51239835..5deb84ae43 Binary files a/pandora_console/images/module_unknown.png and b/pandora_console/images/module_unknown.png differ diff --git a/pandora_console/images/module_warning.png b/pandora_console/images/module_warning.png old mode 100755 new mode 100644 index 1f8f3df1cc..bab28019b9 Binary files a/pandora_console/images/module_warning.png and b/pandora_console/images/module_warning.png differ diff --git a/pandora_console/images/mul.png b/pandora_console/images/mul.png index 4207857c11..6d76bcb529 100644 Binary files a/pandora_console/images/mul.png and b/pandora_console/images/mul.png differ diff --git a/pandora_console/images/nettool.png b/pandora_console/images/nettool.png new file mode 100644 index 0000000000..9a78741f1d Binary files /dev/null and b/pandora_console/images/nettool.png differ diff --git a/pandora_console/images/normalscreen.png b/pandora_console/images/normalscreen.png index 964e580274..da19183df1 100644 Binary files a/pandora_console/images/normalscreen.png and b/pandora_console/images/normalscreen.png differ diff --git a/pandora_console/images/page_white_text.png b/pandora_console/images/page_white_text.png index 4e0eeb5a09..de544f9ada 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/pen.png b/pandora_console/images/pen.png index 6da42b23c3..4a31ef547c 100644 Binary files a/pandora_console/images/pen.png and b/pandora_console/images/pen.png differ diff --git a/pandora_console/images/pencil.png b/pandora_console/images/pencil.png index ea3895ce94..4a31ef547c 100644 Binary files a/pandora_console/images/pencil.png and b/pandora_console/images/pencil.png differ diff --git a/pandora_console/images/photo.disabled.png b/pandora_console/images/photo.disabled.png index 2b06ebba3e..3776ea95d8 100644 Binary files a/pandora_console/images/photo.disabled.png and b/pandora_console/images/photo.disabled.png differ diff --git a/pandora_console/images/photo.png b/pandora_console/images/photo.png index 76a074d9cc..a52b3b4537 100644 Binary files a/pandora_console/images/photo.png and b/pandora_console/images/photo.png differ diff --git a/pandora_console/images/plugin.png b/pandora_console/images/plugin.png index 2647a53457..41f63ef952 100644 Binary files a/pandora_console/images/plugin.png and b/pandora_console/images/plugin.png differ diff --git a/pandora_console/images/plus.png b/pandora_console/images/plus.png index 19c0cf3a5a..02864d72da 100644 Binary files a/pandora_console/images/plus.png and b/pandora_console/images/plus.png differ diff --git a/pandora_console/images/recon.png b/pandora_console/images/recon.png old mode 100755 new mode 100644 index 9c11c5bf15..631665baf6 Binary files a/pandora_console/images/recon.png and b/pandora_console/images/recon.png differ diff --git a/pandora_console/images/secure_console.png b/pandora_console/images/secure_console.png new file mode 100644 index 0000000000..f8d5f63e24 Binary files /dev/null and b/pandora_console/images/secure_console.png differ diff --git a/pandora_console/images/service.png b/pandora_console/images/service.png index 6bae941ecd..c158264a1f 100644 Binary files a/pandora_console/images/service.png and b/pandora_console/images/service.png differ diff --git a/pandora_console/images/sub.png b/pandora_console/images/sub.png index 8875b77c47..75edccc928 100644 Binary files a/pandora_console/images/sub.png and b/pandora_console/images/sub.png differ diff --git a/pandora_console/images/tag_red.disabled.png b/pandora_console/images/tag_red.disabled.png index 38cc646a31..bab054cbb2 100644 Binary files a/pandora_console/images/tag_red.disabled.png and b/pandora_console/images/tag_red.disabled.png differ diff --git a/pandora_console/images/tag_red.png b/pandora_console/images/tag_red.png index c99a3434c1..874e46d9ed 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/tick.png b/pandora_console/images/tick.png index 1bb8eb32e3..9fce7dbfc1 100644 Binary files a/pandora_console/images/tick.png and b/pandora_console/images/tick.png differ diff --git a/pandora_console/images/tick_dark.png b/pandora_console/images/tick_dark.png index a90181c794..9fce7dbfc1 100644 Binary files a/pandora_console/images/tick_dark.png and b/pandora_console/images/tick_dark.png differ diff --git a/pandora_console/images/tick_off.png b/pandora_console/images/tick_off.png index 56e0a8bb8b..c6c24d6f29 100644 Binary files a/pandora_console/images/tick_off.png and b/pandora_console/images/tick_off.png differ diff --git a/pandora_console/images/tick_white.png b/pandora_console/images/tick_white.png index cd836bd779..9fce7dbfc1 100644 Binary files a/pandora_console/images/tick_white.png and b/pandora_console/images/tick_white.png differ diff --git a/pandora_console/images/tree.png b/pandora_console/images/tree.png index df648aa4b4..0c7064de7a 100644 Binary files a/pandora_console/images/tree.png and b/pandora_console/images/tree.png differ diff --git a/pandora_console/images/upload_file.png b/pandora_console/images/upload_file.png index 859839fc8e..e707b041a9 100644 Binary files a/pandora_console/images/upload_file.png and b/pandora_console/images/upload_file.png differ diff --git a/pandora_console/images/version.png b/pandora_console/images/version.png index 591403922b..174ae4b734 100644 Binary files a/pandora_console/images/version.png and b/pandora_console/images/version.png differ diff --git a/pandora_console/images/vnc.png b/pandora_console/images/vnc.png index e4d32af960..573530a4b3 100644 Binary files a/pandora_console/images/vnc.png and b/pandora_console/images/vnc.png differ diff --git a/pandora_console/images/warn.png b/pandora_console/images/warn.png old mode 100755 new mode 100644 index 11c98b8b67..1052157eeb Binary files a/pandora_console/images/warn.png and b/pandora_console/images/warn.png differ diff --git a/pandora_console/images/write_paper.png b/pandora_console/images/write_paper.png index cab84223f4..db996624cb 100644 Binary files a/pandora_console/images/write_paper.png and b/pandora_console/images/write_paper.png differ diff --git a/pandora_console/images/xml.disabled.png b/pandora_console/images/xml.disabled.png new file mode 100644 index 0000000000..187241132a Binary files /dev/null and b/pandora_console/images/xml.disabled.png differ diff --git a/pandora_console/images/xml.png b/pandora_console/images/xml.png old mode 100755 new mode 100644 index 7f1237324e..683b6331d9 Binary files a/pandora_console/images/xml.png and b/pandora_console/images/xml.png differ diff --git a/pandora_console/images/xml_disabled.png b/pandora_console/images/xml_disabled.png index 4a3d74667e..187241132a 100644 Binary files a/pandora_console/images/xml_disabled.png and b/pandora_console/images/xml_disabled.png differ diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index c05db832d7..bf3457ad2b 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -509,6 +509,6 @@ if ($table_events) { array_keys($groups), 'ER', 'event_condition', 'AND'); events_print_event_table ("estado <> 1 $tags_condition", 10, '100%', - false, $id_agente); + false, $id_agente,true); } ?> diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 95c7e6a401..c6379a45fe 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -128,7 +128,7 @@ if ($get_module_detail) { $formtable->data[0][1] = html_print_select ($periods, 'period', $period, '', '', 0, true, false, false); $formtable->data[0][2] = ''; $formtable->data[0][3] = "" . + "\", 0, -1,\"" . modules_get_agentmodule_name( $module_id ) . "\")'>" . html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; $formtable->rowspan[0][3] = 2; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index bba8d14fb0..1b7df5b6bd 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -849,11 +849,11 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret if ($result === false) { if ($return){ - $returned = '
' . __('No events') . '
'; + $returned = ui_print_info_message ( __('No events'),'',true ); return $returned; } else - echo '
' . __('No events') . '
'; + echo ui_print_info_message ( __('No events') ); } else { $table->id = 'latest_events_table'; @@ -871,7 +871,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret $table->cellclass = array (); $table->data = array (); $table->align = array (); - $table->style[0] = $table->style[1] = $table->style[2] = 'width:25px; background: #E8E8E8;'; + $table->style[0] = $table->style[1] = $table->style[2] = 'width:25px;'; if ($agent_id == 0) { $table->style[3] = 'word-break: break-all;'; } @@ -891,11 +891,13 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret if ($agent_id == 0) { $table->head[4] = __('Agent name'); + $table->size[4] = "15%"; } $table->head[5] = __('Timestamp'); $table->headclass[5] = "datos3 f9"; $table->align[5] = "left"; + $table->size[5] = "15%"; foreach ($result as $event) { if (! check_acl ($config["id_user"], $event["id_grupo"], "ER")) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 1becc0127b..8bcc173e51 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -231,6 +231,9 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa case 'suc': $text_title = __('Success'); break; + case 'warning': + $text_title = __('Warning'); + break; } } @@ -246,6 +249,9 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa case 'suc': $icon_image = 'images/suc.png'; break; + case 'warning': + $icon_image = 'images/warn.png'; + break; } $icon_image = $icon_image; @@ -370,6 +376,21 @@ function ui_print_result_message ($result, $good = '', $bad = '', $attributes = } } +/** + * Prints an warning message. + * + * @param mixed The string warning message or array ('title', 'message', 'icon', 'no_close') to be displayed + * @param string Any other attributes to be set for the tag. + * @param bool Whether to output the string or return it + * @param string What tag to use (you could specify something else than + * h3 like div or h2) + * + * @return string HTML code if return parameter is true. + */ +function ui_print_warning_message ($message, $attributes = '', $return = false, $tag = 'h3') { + return ui_print_message ($message, 'warning', $attributes, $return, $tag); +} + /** * Evaluates a unix timestamp and returns a span (or whatever tag specified) * with as title the correctly formatted full timestamp and a time comparation @@ -2400,7 +2421,7 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "", $buffer .= '' . ui_print_truncate_text($title, 38); if ($help != "") - $buffer .= "
" . + $buffer .= "
" . ui_print_help_icon ($help, true, '', 'images/help_w.png') . "
"; $buffer .= '
'; diff --git a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css index 77083f311d..023cd176b3 100644 --- a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css +++ b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css @@ -16,13 +16,13 @@ .defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0} /* Layout */ -.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC} +.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC; margin-bottom:10px;} .defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC} .defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC} .defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} .defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top} .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC} -.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px} +.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:10px;} .defaultSkin .mceStatusbar div {float:left; margin:2px} .defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0} .defaultSkin .mceStatusbar a:hover {text-decoration:underline} diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 542fd824fd..7a4963d6b4 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -195,6 +195,7 @@ li:hover ul { display: block; } } #icon_god-extensions { background: url(../../images/builder.menu.png) no-repeat 50% 50%; + } #menu_container { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9c8568b32a..76642c8c5b 100755 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -102,7 +102,7 @@ h1, h2, h3, h4 { font-size: 1em; font-family: Arial, Sans-serif; text-transform: uppercase; - color: #3f4e2f; + color: #3F3F3F; padding-bottom: 4px; padding-top: 7px; } @@ -116,9 +116,7 @@ h3 { font-size: 14px; } h4 { - margin-bottom: 2px; - padding-bottom: 0px; - padding-top: 5px; + margin-bottom: 10px; font-size: 13px; color: #3F3F3F; text-transform: none; @@ -969,6 +967,10 @@ tr.disabled_row_user * { color: #f85858; } +.warning *{ + color: #FAD403; +} + .help { background: url(../../images/help.png) no-repeat; } @@ -1176,7 +1178,7 @@ div.title_line { /* text-transform: uppercase; */ padding: 0px 0px 0px 0px; color: #fff; - font-size: 9pt; + font-size: 8.5pt; font-weight: bold; line-height: 18px; } @@ -1301,13 +1303,12 @@ span.rmess, span.nrmess { /* New styles for data box */ .databox, .databox_color, .databox_frame { margin-bottom: 5px; - margin-top: 5px; + margin-top: 0px; margin-left: 0px; border: 1px solid #e2e2e2; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; - padding-bottom: 5px; } .databox_color{ @@ -1336,6 +1337,9 @@ table.databox { color: #fff; padding-left: 10px; } +.databox td { + #border-bottom: 1px solid #E2E2E2; +} .databox th * { color: #fff; @@ -1488,7 +1492,6 @@ div#main_pure { } .img_help { cursor: help; - margin-top: -5px; } #loading { position:fixed; @@ -1881,7 +1884,7 @@ div#steps_clean { width: 100%; padding-right: 0px; margin-left: 0px !important; - margin-bottom: 15px; + margin-bottom: 20px; height: 31px; } div#events_list { @@ -1910,6 +1913,7 @@ div#logo_text3 { } .pagination { margin-top: 15px; + margin-bottom: 5px; } .pagination * { margin-left: 0px !important; @@ -2071,6 +2075,7 @@ div.cellBig { .info_box { background: #F9FAF9; margin-top: 10px !important; + margin-bottom: 10px !important; padding: 0px 5px 5px 10px; border-color: #E2E2E2; border-style: solid; @@ -2455,8 +2460,8 @@ input.search_input { margin-top: 8px !important; } -a>img, td>input, td>span { - vertical-align: middle; +a[id^='tgl_ctrl_']>img{ + vertical-align:middle; } .noshadow { @@ -2854,7 +2859,7 @@ table#policy_modules td * { .databox.data td{ padding-left: 10px; - border: 1px solid #EFEFEF; + border-bottom: 1px solid #E2E2E2; } .databox .search{ @@ -2937,9 +2942,22 @@ table#policy_modules td * { margin-top: 0px !important ; } +.databox.filters{ + margin-bottom: 17px; +} + .databox.filters td{ padding: 10px; + padding-left:20px; } + +.databox.filters td>img, .databox.filters td>div>a>img, +.databox.filters td>span>img, .databox.filters td>span>a>img, +.databox.filters td>a>img{ + vertical-align: middle; + margin-left: 5px; +} + .databox_color td{ padding-left: 10px; } diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css index 0e28a26f97..d97ad31d48 100644 --- a/pandora_console/include/styles/tree.css +++ b/pandora_console/include/styles/tree.css @@ -155,7 +155,7 @@ div.tree-table-cell.tree-table-cell-tree { div.tree-table-cell.tree-table-cell-detail { padding-left: 10px; - width: 550px; + width: 60%; } div.tree-element-detail-closed { diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index aa917a4dec..ab275c19a5 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -384,7 +384,10 @@ if ($print_agent) { $table->width = '100%'; $table->class = "databox data"; +$table->cellpadding = '0'; +$table->cellspacing = '0'; if(defined('METACONSOLE')){ + $table->class = "databox"; $table->cellpadding = '0'; $table->cellspacing = '0'; } diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 4c98e215b0..e920626f86 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -197,15 +197,6 @@ echo ' '; echo ''; -if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AM")) { - echo '
'; - echo '
'; - html_print_input_hidden ('new_agent', 1); - html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); - echo "
"; - echo '
'; -} - if ($search != "") { $filter = array ("string" => '%' . $search . '%'); } @@ -427,11 +418,11 @@ if (empty ($agents)) { // Prepare pagination ui_pagination ($total_agents, - ui_get_url_refresh (array ('group_id' => $group_id, 'recursion' => $recursion, 'search' => $search, 'sort_field' => $sortField, 'sort' => $sort, 'status' => $status))); +ui_get_url_refresh (array ('group_id' => $group_id, 'recursion' => $recursion, 'search' => $search, 'sort_field' => $sortField, 'sort' => $sort, 'status' => $status))); // Show data. -$table->cellpadding = 4; -$table->cellspacing = 4; +$table->cellpadding = 0; +$table->cellspacing = 0; $table->width = "100%"; $table->class = "databox data"; @@ -439,35 +430,52 @@ $table->head = array (); $table->head[0] = __('Agent'). ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . ''; +$table->size[0] = "10%"; + $table->head[1] = __('Description'); +$table->size[1] = "30%"; + $table->head[2] = __('OS'). ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up")) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . ''; +$table->size[2] = "4%"; + $table->head[3] = __('Interval'). ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . ''; +$table->size[3] = "10%"; + $table->head[4] = __('Group'). ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . ''; +$table->size[4] = "15%"; + $table->head[5] = __('Modules'); +$table->size[5] = "10%"; + $table->head[6] = __('Status'); +$table->size[6] = "4%"; + $table->head[7] = __('Alerts'); +$table->size[7] = "4%"; + $table->head[8] = __('Last contact'). ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . ''; +$table->size[8] = "15%"; $table->align = array (); $table->align[2] = "center"; -$table->align[3] = "center"; -$table->align[4] = "center"; -$table->align[5] = "center"; +$table->align[3] = "left"; +$table->align[4] = "left"; +$table->align[5] = "left"; $table->align[6] = "center"; $table->align[7] = "center"; -$table->align[8] = "right"; +$table->align[8] = "left"; $table->style = array(); -$table->style[0] = 'width: 15%'; +//$table->style[0] = 'width: 15%'; $table->data = array (); @@ -489,14 +497,14 @@ foreach ($agents as $agent) { $data = array (); - $data[0] = ''; - $data[0] .= ''; + $data[0] = '
'; + $data[0] .= ''; if ($agent['quiet']) { $data[0] .= html_print_image("images/dot_green.disabled.png", true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . " "; } $data[0] .= ui_print_agent_name($agent["id_agente"], true, 60, 'font-size:6.5pt !important;', true); $data[0] .= ''; - $data[0] .= '
'; $data[1] = ui_print_truncate_text(strip_tags(ui_bbcode_to_html($agent["description"])), 'description', false, true, true, '[…]', 'font-size: 6.5pt'); @@ -541,6 +549,14 @@ foreach ($agents as $agent) { if (!empty ($table->data)) { html_print_table ($table); + if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AM")) { + echo '
'; + echo '
'; + html_print_input_hidden ('new_agent', 1); + html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); + echo "
"; + echo '
'; + } ui_pagination ($total_agents, ui_get_url_refresh(array( 'group_id' => $group_id, @@ -550,20 +566,20 @@ if (!empty ($table->data)) { 'status' => $status)), 0, 0, false, 'offset', false); unset ($table); + } else { - echo '
'.__('There are no defined agents').'
'; + ui_print_info_message (__('There are no defined agents') ); } ?> diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 1fe7cf476f..b3480df599 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -60,9 +60,9 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR") && !$is_extra) { // START: TABLE AGENT BUILD $table_agent->id = 'agent_details_main'; -$table_agent->width = '450px'; -$table_agent->cellspacing = 4; -$table_agent->cellpadding = 4; +$table_agent->width = '82%'; +$table_agent->cellspacing = 0; +$table_agent->cellpadding = 0; $table_agent->class = 'databox'; $table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;'; $table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;'; @@ -184,8 +184,8 @@ $table_agent->rowclass[] = ''; // START: TABLE CONTACT BUILD $table_contact->id = 'agent_contact_main'; $table_contact->width = '100%'; -$table_contact->cellspacing = 4; -$table_contact->cellpadding = 4; +$table_contact->cellspacing = 0; +$table_contact->cellpadding = 0; $table_contact->class = 'databox data'; $table_contact->style[0] = 'width: 30%;'; $table_contact->style[1] = 'width: 70%;'; @@ -227,8 +227,8 @@ $table_contact->data[] = $data; // START: TABLE DATA BUILD $table_data->id = 'agent_data_main'; $table_data->width = '100%'; -$table_data->cellspacing = 4; -$table_data->cellpadding = 4; +$table_data->cellspacing = 0; +$table_data->cellpadding = 0; $table_data->class = 'databox data'; $table_data->style[0] = 'width: 30%;'; $table_data->style[1] = 'width: 70%;'; @@ -355,8 +355,8 @@ if ($last_incident != false) { $table_incident->id = 'agent_incident_main'; $table_incident->width = '100%'; - $table_incident->cellspacing = 4; - $table_incident->cellpadding = 4; + $table_incident->cellspacing = 0; + $table_incident->cellpadding = 0; $table_incident->class = 'databox'; $table_incident->style[0] = 'width: 30%;'; $table_incident->style[1] = 'width: 70%;'; @@ -484,8 +484,8 @@ if (!empty($network_interfaces)) { $table = null; $table->id = 'agent_details'; $table->width = '100%'; -$table->cellspacing = 4; -$table->cellpadding = 4; +$table->cellspacing = 0; +$table->cellpadding = 0; $table->class = 'agents'; $table->style = array_fill(0, 3, 'vertical-align: top;'); @@ -508,7 +508,7 @@ $access_agent = db_get_value_sql("SELECT COUNT(id_agent) if ($config["agentaccess"] && $access_agent > 0) { $data[0] .= - ' + '
' . diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 7ed66d8a0e..8034960405 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -450,7 +450,7 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1, } $table->data[0][5] = html_print_select ($rows_select,'status_module_group', $status_module_group, '', '',0, true); $table->data[0][6] = html_print_button(__('Filter'), 'filter', false, 'filter_modules();', 'class="sub search"', true); - $table->data[0][7] = ' ' . html_print_button(__('Reset'), 'filter', false, 'reset_filter_modules();', 'class="sub upd"', true); + $table->data[0][7] = ' ' . html_print_button(__('Reset'), 'filter', false, 'reset_filter_modules();', 'class="sub upd" style="margin-top:0px;"', true); $form_text .= html_print_table($table, true); $filter_hidden = false; @@ -459,6 +459,6 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1, $filter_hidden = true; } - ui_toggle($form_text, __('Form filter'), __('Form filter'), $filter_hidden); + echo $form_text; } ?> diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php index e96cc42f96..a0d3a2a043 100644 --- a/pandora_console/operation/agentes/gis_view.php +++ b/pandora_console/operation/agentes/gis_view.php @@ -52,7 +52,7 @@ echo "
"; echo "
"; if (!gis_get_agent_map($id_agente, "500px", "100%", true, true, $period)) { - ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map.")); + ui_print_error_message( __("There is no default map. Please go to the setup for to set a default map.") ); echo "
' . __('Agent access rate (24h)') . '