From bbe1c3c96f00daab48ef7446deb3414492169ff0 Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Thu, 30 May 2013 15:48:22 +0000
Subject: [PATCH] 2013-05-30 Sergio Martin <sergio.martin@artica.es>
* include/styles/menu.css
include/styles/cluetip.css
include/styles/pandora.css
include/functions.php
include/functions_events.php
include/graphs/functions_gd.php
include/functions_networkmap.php
include/javascript/jquery.cluetip.js
images/outof.png: Visual improvements
* include/functions_treeview.php
extensions/module_groups.php
operation/tree.php
operation/events/events.build_table.php
operation/events/events_list.php
operation/agentes/status_monitor.php : Add to the shared
views between normal and meta controls to access remote nodes
for certain users
* include/functions_visual_map.php
include/functions_ui.php: Little bugfixes and improvements
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8237 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 24 ++
pandora_console/extensions/module_groups.php | 2 +-
pandora_console/images/outof.png | Bin 315 -> 2069 bytes
pandora_console/include/functions.php | 7 +-
pandora_console/include/functions_events.php | 36 ++-
.../include/functions_networkmap.php | 42 ++-
.../include/functions_treeview.php | 285 +++++++++++------
pandora_console/include/functions_ui.php | 47 ++-
.../include/functions_visual_map.php | 20 +-
.../include/graphs/functions_gd.php | 13 +-
.../include/javascript/jquery.cluetip.js | 2 +-
pandora_console/include/styles/cluetip.css | 10 +-
pandora_console/include/styles/menu.css | 2 +-
pandora_console/include/styles/pandora.css | 299 +++++++++---------
.../operation/agentes/status_monitor.php | 14 +-
.../operation/events/events.build_table.php | 35 +-
.../operation/events/events_list.php | 4 +-
pandora_console/operation/tree.php | 4 +-
18 files changed, 537 insertions(+), 309 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 709a69f603..9612928f0c 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,27 @@
+2013-05-30 Sergio Martin <sergio.martin@artica.es>
+
+ * include/styles/menu.css
+ include/styles/cluetip.css
+ include/styles/pandora.css
+ include/functions.php
+ include/functions_events.php
+ include/graphs/functions_gd.php
+ include/functions_networkmap.php
+ include/javascript/jquery.cluetip.js
+ images/outof.png: Visual improvements
+
+ * include/functions_treeview.php
+ extensions/module_groups.php
+ operation/tree.php
+ operation/events/events.build_table.php
+ operation/events/events_list.php
+ operation/agentes/status_monitor.php : Add to the shared
+ views between normal and meta controls to access remote nodes
+ for certain users
+
+ * include/functions_visual_map.php
+ include/functions_ui.php: Little bugfixes and improvements
+
2013-05-30 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.php: fixed the string of button to
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index a5b514eed5..bdd55a0fab 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -332,6 +332,6 @@ function mainModuleGroups() {
<?php
}
-extensions_add_operation_menu_option(__("Modules groups"), 'estado', 'module_groups/brick.png', "v1r1");
+extensions_add_operation_menu_option(__("Module groups"), 'estado', 'module_groups/brick.png', "v1r1");
extensions_add_main_function('mainModuleGroups');
?>
diff --git a/pandora_console/images/outof.png b/pandora_console/images/outof.png
index e808a2f66d053b224181f389052368b53822f8d5..9daafbebc2c4885b9a5d5f94dbbf05cce926e943 100644
GIT binary patch
literal 2069
zcmaJ?c~DdL7QR5(BA_5Dh!1YUqF_jF0s#^eNJv;Bgd$LdDoRK$5XknD0AXJZ&?m0&
zgo1!P!RjdRpp0y#2^5q?MOv*|6s%gR1yL9+4@!NB727{b@64V1J7>P{JKy=8GjmHq
zLjp{ZTaf?&n6d(yVVZBY=Cv>~005om7N7WN0&BTnq&!?4Cr{-_VSvsP$HE{>$ccx;
zU=A<spF=PO0Q4OA5s~spb}*SM7GgPC3|1kOXxIQi@li-P+$2~I#=`M@5fwex{S_MI
z^Qh>3L^i~hFyI7!V7e3zPY;RUrYCVpJhYEDNKueA0zz2M0Tn`lNJdsr(eHH0nzJ^I
zLxb-i@+2zycT<t<P>>;(!XOa~xpE;7Jm}$$#k)f!cM=99KzIm;C*UAYS3E=}dXgbL
z`2Im_s!4fq<S?fH`&ycaicXNrC1e~fH8mBR>V_3d<8gQriG+g)I0C^{gK(9liR2uG
zt4L<Qs=$P0Tq$27=Zi(4R*@4cPL@;A8mGUvAe4NN70KRTljg#33XTMa$3ohcR)K8x
z-$RAM4``V@4F1FKUkb}2(j+i043>$LrCiP6;_S7hBxHsZ=E%j;2(ehOdW)e6V!2qB
zAeMlPa3U5DvN>G7NSk@bV6(|Akxb4JabXsdiq>dg`FtLkK!+f_udfFK^7O#t{Rnh_
zI-SIHb0-ko32t~geU-};bCZRzNWRMD{lWEIldD|@p+r-e2}}7YFwb8q7J~1ZCiB<!
z;=ZQddoFKnFT^#uIE@*ccC>#Q^=eA9KicDm#nl8KRv#8=_Fbx3>=(Vm-2i|nVln9v
ziu<v@+F9>VsZ=j(@`6=`XVdPH4V2fs5H{97S#zvZMsjsFI7@3<2k08{R5=FoY8@vN
zRE67$FDR%;ZP7E_9jyX3&=yTAx(oAABxPP5<y!g3mb1gGKs?l=@Q=X!U@+NhkI{`9
zCz|&e-WpCcG1<5*`B^{84B0o-_UaRz4Kzzblp}CuE=^(HJ8&XfU4lRypzIkqMJR5q
z)<1tl4C*nWyz`qc_p2n&wq5*;odkaI`3`j3gRYX}H=W~RD#nA9H$OT<v${KWL)DVA
z-q(!8l<0(J+H5s@=w)bBr_-KUr?WAt>v$V<#MI?bjI~}_@L169p#8;On1bAKdjfEw
z2zJ@feQ9&O;W@Lo&B1oX>s!||`$x}JO@EccXzBDqeNllxb078`jatlK2yt|<o4t2K
zB}wpUqy*x;+6;k(kKObbB9ue_#U$Uag)`t1Ev{fVY{SY=DD+goDe5Z#1eW3Ee8|M_
z5h&^k?0!>O7&1P<@|<M9)JN>u{tv_!bptYNPp1A#$ALudjytjH+BOH2&zGM38zg5T
z(c9|s{bNpM*yaamfkoZxP@OS5dq=D%HkRL6sLpGu6q6={6$l+;zq9z#I1g|MtW8<8
za+tZC^7%$%=lh}aeO|4oZ<D!4S-X{89$8&+jzj$&$Vi(sG&oyu_~v=c_x43CzoeHF
z+Ja0gjwK2_>rK9OX6-GfO`r72N_^$Q%I>_DcxBcz`X$Br6vL$irvD)5S;@uZra!Wt
zao;}lY`*Ho_Q4}csYMNrn@<}wNgsca+EBXvTE;nQ!AeL^@-~~tlf9l*zs(Ah&E|GN
zy~wee+l9VXez(GzQI)3bzQz5KfyT!FLZR;ncyx^5Yu}Xm<ANQ|GndL6=BwH*KgBc(
z%6OxRahokWufAUL&K!I)&3KHNzMk>Rml<>2bJfd^gdrAh#>rOwIA|oGkG1Z^!OT$m
z75w4@=hVhc{$YY`K}uEQR0i{I(;J_&6L$2BH2vY=YI4<?Xj*i^?egMOF^*Ha%yOEK
z4&3VMY`c=OQ?Gwmxp_J_aIxfq5#!!Hgn!|Jt!=Rid7(g8ry)<-k<pg>GdMPJ(ZuC}
zURjy$)qv(%sB+M${rl=?`b&<tTC-H@UW58pWJmYus^}+_$;rCWQts<gT2!ayfY9{e
zXwTk43G=E!5wAzLqjQr@=gGTms)55bBi>io%-|HW<0mgJ{}^?Dm&1u&PpkLQvQcB-
zoPV2aKGYP+3d(r+h5)f*${y{Xnmwn>+d0BAv2J-vB#QW^<07YTeyc&Yyf`S#8~Bf3
zHI3sh@jg89{L}Wm;p?VG!mCoo4klk;$f~UYi0!my#IFY|;H>MfZRSFzwmfP4C|FNj
zXP_#3Yi>M#NBNZE6yV=T6uF<I=EdeMDa+ND0xIp0S(LFuD-)H>WB#tftCOey-TpCs
z)11Y`cQVZBo=5RIBjzEGL)7)B<{N?o?EiblGO4sS|9@LKZ<tN}O@p`L1Bb%iW>39+
nmGqgF?engjeGW&J@uPMCDl*4wS5HcZ_D9X~3t=|-#^nDW6*e}y
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq003G5000sM0{{R3DUH-H0000XP)t-s|Ns90
z0093yOaD}1|IX6?=IH;OrT>MF|FygSY<T~Eh<qgB@c;k-)k#D_R49?n)4dLYFc1fD
zM^}9U{8ud93`qx91(a2d;)+IPZFDD%46K@vK7x;FVNsL%L0r70z2ukcwU;(pb)wP6
z_tE)56SsyYz8~v_RmlV_m*qw=v$h2Z^unuT3MQ+g2si74mIabj;<#{{y7qd%*o=x)
zW}!iEb@?lD4mRtab?rQ#^~G3mD%CsP6Ev>$(8f-2wsc=~qDt)uDjzh8$aqTx3M&pO
z9r2*4uuLyF&tiTGtr(t%yS9>OV$dKL;8M=$X-vc&nEL)0|D<dEh8vS6g-Y3|jw%2E
N002ovPDHLkV1m<GjY9wc
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 1eb1d79597..c430105316 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1795,6 +1795,11 @@ function is_array_empty($InputVariable)
return $Result;
}
+// This function is used to give or not access to nodes in
+// Metaconsole. Sometimes is used in common code between
+// Meta and normal console, so if Meta is not activated, it
+// will return 1 always
+
// Return 0 if the user hasnt access to node/detail 1 otherwise
function can_user_access_node () {
global $config;
@@ -1805,7 +1810,7 @@ function can_user_access_node () {
return $userinfo["is_admin"] == 1 ? 1 : $userinfo["metaconsole_access_node"];
}
else {
- return $userinfo["is_admin"];
+ return 1;
}
}
?>
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 4012f2ecfd..a77ae369eb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -17,6 +17,8 @@
include_once($config['homedir'] . "/include/functions_ui.php");
include_once($config['homedir'] . "/include/functions_tags.php");
enterprise_include_once ('meta/include/functions_events_meta.php');
+enterprise_include_once ('meta/include/functions_agents_meta.php');
+enterprise_include_once ('meta/include/functions_modules_meta.php');
@@ -1870,7 +1872,14 @@ function events_page_details ($event, $server = "") {
}
if ($event["id_agente"] != 0) {
- $agent = db_get_row('tagente','id_agente',$event["id_agente"]);
+ if (!empty($server)) {
+ $agent = agents_meta_get_agent(array('id_agent' => $event["id_agente"],
+ 'id_server' => $server['id'],
+ 'server_name' => $server['server_name']));
+ }
+ else {
+ $agent = db_get_row('tagente','id_agente',$event["id_agente"]);
+ }
}
else {
$agent = array();
@@ -1884,7 +1893,12 @@ function events_page_details ($event, $server = "") {
if (!empty($agent)) {
$data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Name').'</div>';
- $data[1] = ui_print_agent_name ($event["id_agente"], true, 'agent_medium', '', false, $serverstring, $hashstring);
+ if (can_user_access_node ()) {
+ $data[1] = ui_print_agent_name ($event["id_agente"], true, 'agent_medium', '', false, $serverstring, $hashstring, $agent['nombre']);
+ }
+ else {
+ $data[1] = ui_print_truncate_text($agent['nombre'], 'agent_medium', true, true, true);
+ }
$table_details->data[] = $data;
$data = array();
@@ -1914,7 +1928,12 @@ function events_page_details ($event, $server = "") {
}
if ($event["id_agentmodule"] != 0) {
- $module = db_get_row_filter('tagente_modulo',array('id_agente_modulo' => $event["id_agentmodule"], 'delete_pending' => 0));
+ if (!empty($server)) {
+ $module = meta_modules_get_agentmodule ($event["id_agentmodule"], $server['id']);
+ }
+ else {
+ $module = db_get_row_filter('tagente_modulo',array('id_agente_modulo' => $event["id_agentmodule"], 'delete_pending' => 0));
+ }
}
else {
$module = array();
@@ -1929,9 +1948,14 @@ function events_page_details ($event, $server = "") {
// Module name
$data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Name').'</div>';
- $data[1] = '<a href="' . $serverstring . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$event["id_agente"].'&tab=data'.$hashstring.'"><b>';
- $data[1] .= $module['nombre'];
- $data[1] .= '</b></a>';
+ if (can_user_access_node ()) {
+ $data[1] = '<b><a href="' . $serverstring . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$event["id_agente"].'&tab=data'.$hashstring.'">';
+ $data[1] .= $module['nombre'];
+ $data[1] .= '</b></a>';
+ }
+ else {
+ $data[1] = $module['nombre'];
+ }
$table_details->data[] = $data;
// Module group
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index e553115030..14db298a3a 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -521,6 +521,23 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
$status = agents_get_status_from_counts($agent);
+ if (defined('METACONSOLE')) {
+ $server_data = db_get_row('tmetaconsole_setup', 'id', $agent['id_server']);
+ }
+
+ if(empty($server_data)) {
+ $server_name = '';
+ $server_id = '';
+ $url_hash = '';
+ $console_url = '';
+ }
+ else {
+ $server_name = $server_data['server_name'];
+ $server_id = $server_data['id'];
+ $console_url = $server_data['server_url'] . '/';
+ $url_hash = metaconsole_get_servers_url_hash($server_data);
+ }
+
// Set node status
switch ($status) {
case 0:
@@ -564,8 +581,13 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
}
if (defined("METACONSOLE")) {
- $url = ui_meta_get_url_console_child($id_server,
- "estado", "operation/agentes/ver_agente&id_agente=" . $agent['id_agente']);
+ if (can_user_access_node ()) {
+ $url = ui_meta_get_url_console_child($id_server,
+ "estado", "operation/agentes/ver_agente&id_agente=" . $agent['id_agente']);
+ }
+ else {
+ $url = '';
+ }
$url_tooltip = '../../ajax.php?' .
'page=operation/agentes/ver_agente&' .
'get_agent_status_tooltip=1&' .
@@ -584,7 +606,21 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
tooltip="' . $url_tooltip . '"];' . "\n";
}
else {
- $node = $agent['id_node'] . ' [ color="' . $status_color . '", fontsize='.$font_size.', shape="doublecircle", URL="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'",style="filled", fixedsize=true, width=0.20, height=0.20, label="", tooltip="ajax.php?page=operation/agentes/ver_agente&get_agent_status_tooltip=1&id_agent='.$agent['id_agente'].'"];' . "\n";
+ $ajax_prefix = '';
+ $meta_params = '';
+
+ if (defined('METACONSOLE')) {
+ $ajax_prefix = '../../';
+ $meta_params = '&metaconsole=1&id_server=' . $id_server;
+ }
+
+ if (can_user_access_node ()) {
+ $url_node_link = ', URL="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $agent['id_agente'] . $url_hash . '"';
+ }
+ else {
+ $url_node_link = '';
+ }
+ $node = $agent['id_node'] . ' [ color="' . $status_color . '", fontsize=' . $font_size . ', shape="doublecircle"' . $url_node_link . ', style="filled", fixedsize=true, width=0.20, height=0.20, label="", tooltip="' . $ajax_prefix . 'ajax.php?page=operation/agentes/ver_agente&get_agent_status_tooltip=1&id_agent=' . $agent['id_agente'] . $meta_params . '"];' . "\n";
}
return $node;
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 1e9bddd8c2..afcf918a1d 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -55,9 +55,10 @@ function treeview_printModuleTable($id_module, $server_data = false) {
return;
}
- echo '<div id="id_div3" width="100%">';
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%">';
- //Agent name
+ echo '<div id="id_div3" width="450px">';
+ echo '<table cellspacing="4" cellpadding="4" border="0" class="databox alternate" style="width:90%; min-width: 300px;">';
+
+ //Module name
echo '<tr><td class="datos"><b>'.__('Module name').'</b></td>';
if ($module["disabled"])
@@ -67,7 +68,29 @@ function treeview_printModuleTable($id_module, $server_data = false) {
echo '<td class="datos"><b>'.$cellName.'</b></td>';
- // Parent
+ // Interval
+ echo '<tr><td class="datos"><b>' . __('Interval') . '</b></td>';
+ echo '<td class="datos" colspan="2">' . human_time_description_raw (modules_get_interval($module['id_agente_modulo']), true) . '</td></tr>';
+
+ // Warning Min/Max
+ echo '<tr><td class="datos"><b>' . __('Warning status') . '</b></td>';
+ if (modules_is_string_type($module['id_tipo_modulo'])) {
+ echo '<td class="datos" colspan="2">' . __('Str.') . ': ' . $module['str_warning'] . '</td></tr>';
+ }
+ else {
+ echo '<td class="datos" colspan="2">' . __('Min.') . ': ' . $module['min_warning'] . '<br>' . __('Max.') . ': ' . $module['max_warning'] . '</td></tr>';
+ }
+
+ // Critical Min/Max
+ echo '<tr><td class="datos"><b>' . __('Critical status') . '</b></td>';
+ if (modules_is_string_type($module['id_tipo_modulo'])) {
+ echo '<td class="datos" colspan="2">' . __('Str.') . ': ' . $module['str_warning'] . '</td></tr>';
+ }
+ else {
+ echo '<td class="datos" colspan="2">' . __('Min.') . ': ' . $module['min_critical'] . '<br>' . __('Max.') . ': ' . $module['max_critical'] . '</td></tr>';
+ }
+
+ // Module group
echo '<tr><td class="datos2"><b>'.__('Module group').'</b></td>';
echo '<td class="datos2" colspan="2">';
$module_group = modules_get_modulegroup_name($module['id_module_group']);
@@ -78,32 +101,79 @@ function treeview_printModuleTable($id_module, $server_data = false) {
echo __("$module_group");
echo '</td></tr>';
- echo '<tr><td class="datos2"><b>'.__('Module type').'</b></td>';
- echo '<td class="datos2" colspan="2">';
- echo servers_show_type ($module['id_modulo']);
- echo '</td></tr>';
-
- // Group icon
+ // Description
echo '<tr><td class="datos"><b>'.__('Description').'</b></td>';
- echo '<td class="datos" colspan="2">'. ui_print_truncate_text ($module['descripcion'], GENERIC_SIZE_TEXT, true, true, true, '[…]') .'</td></tr>';
+ echo '<td class="datos" colspan="2">'. ui_print_truncate_text ($module['descripcion'], 'description', true, true, true, '[…]') .'</td></tr>';
+ // Tags
+ $tags = tags_get_module_tags($module['id_agente_modulo']);
+
+ if(empty($tags)) {
+ $tags = array();
+ }
+
+ foreach($tags as $k => $v) {
+ $tag_name = tags_get_name($v);
+ if(empty($tag_name)) {
+ unset($tags[$k]);
+ }
+ else {
+ $tags[$k] = $tag_name;
+ }
+ }
+
+ if(empty($tags)) {
+ $tags = '<i>' . __('N/A') . '</i>';
+ }
+ else {
+ $tags = implode(', ' , $tags);
+ }
+
+ echo '<tr><td class="datos"><b>'.__('Tags').'</b></td>';
+ echo '<td class="datos" colspan="2">' . $tags . '</td></tr>';
+
+ // Data
+ $last_data = db_get_row_filter ('tagente_estado', array('id_agente_modulo' => $module['id_agente_modulo'], 'order' => array('field' => 'id_agente_estado', 'order' => 'DESC')));
+ if (is_numeric($last_data["datos"]))
+ $data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . format_numeric($last_data["datos"]) . "</span>";
+ else
+ $data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" . substr(io_safe_output($last_data['datos']),0,12) . "</span>";
+
+ echo '<tr><td class="datos"><b>'.__('Last data').'</b></td>';
+ echo '<td class="datos" colspan="2">';
+
+ if (!empty($last_data['utimestamp'])) {
+ echo $data;
+
+ if ($module['unit'] != '') {
+ echo " ";
+ echo '('.$module['unit'].')';
+ }
+
+ echo " ";
+ html_print_image('images/clock2.png', false, array('title' => $last_data["timestamp"], 'width' => '18px'));
+ }
+ else {
+ echo '<i>' . __('No data') . '</i>';
+ }
+
+ echo '</td></tr>';
+
//End of table
echo '</table></div>';
- echo "<br>";
$id_group = agents_get_agent_group($module['id_agente']);
$group_name = db_get_value('nombre', 'tgrupo', 'id_grupo', $id_group);
$agent_name = db_get_value('nombre', 'tagente', 'id_agente', $module['id_agente']);
- if (can_user_access_node ()) {
+ if (can_user_access_node () && check_acl ($config["id_user"], $id_group, 'AW')) {
// Actions table
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">';
- echo '<tr>';
- echo '<td><form id="module_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '&tab=data' . $url_hash . '">';
- html_print_submit_button (__('Go to modules detail'), 'upd_button', false, 'class="sub search"');
- echo '</form></td></tr>';
+ echo '<div style="width:90%; text-align: right; min-width: 300px;">';
+ echo '<form id="module_detail" method="post" action="' . $console_url . 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=' . $module['id_agente'] . '&tab=module&edit_module=1&id_agent_module=' . $module['id_agente_modulo'] . $url_hash . '">';
+ html_print_submit_button (__('Go to module edition'), 'upd_button', false, 'class="sub config"');
+ echo '</form>';
- echo '</table>';
+ echo '</div>';
}
//id_module and id_agent hidden
@@ -135,18 +205,19 @@ function treeview_printAlertsTable($id_module, $server_data = array()) {
$module_alerts = alerts_get_alerts_agent_module($id_module);
$module_name = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_module);
$agent_id = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $id_module);
-
+ $id_group = agents_get_agent_group($agent_id);
+
if ($module_alerts === false) {
ui_print_error_message(__('There was a problem loading alerts'));
return;
}
echo '<div id="id_div3" width="450px">';
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:90%">';
- echo '<tr><td colspan=3 class="datos"><center>' . html_print_image('images/bell.png', true) . ' ' . $module_name . '</center></td></tr>';
+ echo '<table cellspacing="4" cellpadding="4" border="0" class="databox alternate" style="width:90%; min-width: 300px;">';
+ echo '<tr><th colspan=2 class="datos"><center>' . $module_name . '</center></th></tr>';
- echo '<tr><th class="datos"><b>'.__('Template').'</b></th>';
- echo '<th class="datos"><b>'.__('Actions').'</b></th>';
+ echo '<tr><th class="datos" style="background: #B3B3B3;"><b>'.__('Template').'</b></th>';
+ echo '<th class="datos" style="background: #B3B3B3;"><b>'.__('Actions').'</b></th>';
foreach($module_alerts as $module_alert) {
//Template name
@@ -171,14 +242,13 @@ function treeview_printAlertsTable($id_module, $server_data = array()) {
}
echo '</table>';
- if(can_user_access_node ()) {
+ if(can_user_access_node () && check_acl ($config["id_user"], $id_group, 'LW')) {
// Actions table
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:90%; text-align: center;">';
- echo '<tr>';
- echo '<td><form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $agent_id . $url_hash . '&tab=alert" target="_blank">';
- html_print_submit_button (__('Go to alerts detail'), 'upd_button', false, 'class="sub search"');
- echo '</form></td></tr>';
- echo '</table>';
+ echo '<div style="width:90%; text-align: right; min-width: 300px;">';
+ echo '<form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&search=1&module_name=' . $module_name . '&id_agente=' . $agent_id . $url_hash . '" target="_blank">';
+ html_print_submit_button (__('Go to alerts edition'), 'upd_button', false, 'class="sub search"');
+ echo '</form>';
+ echo '</div>';
}
}
@@ -225,7 +295,7 @@ function treeview_printTable($id_agente, $server_data = array()) {
}
echo '<div id="id_div3" width="450px">';
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:90%">';
+ echo '<table cellspacing="4" cellpadding="4" border="0" class="databox alternate" style="width:90%; min-width: 300px;">';
//Agent name
echo '<tr><td class="datos"><b>'.__('Agent name').'</b></td>';
if ($agent['disabled']) {
@@ -262,43 +332,13 @@ function treeview_printTable($id_agente, $server_data = array()) {
echo '<td class="datos" colspan="2">'.human_time_description_raw ($agent["intervalo"]).'</td></tr>';
// Comments
- echo '<tr><td class="datos2"><b>'.__('Description').'</b></td>';
- echo '<td class="datos2" colspan="2">'.$agent["comentarios"].'</td></tr>';
+ echo '<tr><td class="datos2"><b>' . __('Description') . '</b></td>';
+ echo '<td class="datos2" colspan="2">' . $agent["comentarios"] . '</td></tr>';
- // Agent version
- echo '<tr><td class="datos2"><b>'.__('Agent Version'). '</b></td>';
- echo '<td class="datos2" colspan="2">'.$agent["agent_version"].'</td></tr>';
-
- // Position Information
- if ($config['activate_gis']) {
- $dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
-
- echo '<tr><td class="datos2"><b>'.__('Position (Long, Lat)'). '</b></td>';
- echo '<td class="datos2" colspan="2">';
-
- if ($dataPositionAgent === false) {
- echo __('There is no GIS data.');
- }
- else {
- echo '<a href="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">';
- if ($dataPositionAgent['description'] != "")
- echo $dataPositionAgent['description'];
- else
- echo $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
- echo "</a>";
- }
-
- echo '</td></tr>';
- }
-
- // If the url description is setted
- if ($agent['url_address'] != '') {
- echo '<tr><td class="datos"><b>'.__('Url address').'</b></td>';
- echo '<td class="datos2" colspan="2"><a href='.$agent["url_address"].'>' . $agent["url_address"] . '</a></td></tr>';
- }
// Last contact
- echo '<tr><td class="datos2"><b>'.__('Last contact')." / ".__('Remote').'</b></td><td class="datos2 f9" colspan="2">';
+ echo '<tr><td class="datos2"><b>' . __('Last contact') . " / " . __('Remote') . '</b></td><td class="datos2 f9" colspan="2">';
+
ui_print_timestamp ($agent["ultimo_contacto"]);
echo " / ";
@@ -307,20 +347,68 @@ function treeview_printTable($id_agente, $server_data = array()) {
echo __('Never');
}
else {
- echo $agent["ultimo_contacto_remoto"];
+ ui_print_timestamp ($agent["ultimo_contacto_remoto"]);
}
echo '</td></tr>';
- // Timezone Offset
- if ($agent['timezone_offset'] != 0) {
- echo '<tr><td class="datos2"><b>'.__('Timezone Offset'). '</b></td>';
- echo '<td class="datos2" colspan="2">'.$agent["timezone_offset"].'</td></tr>';
- }
// Next contact (agent)
$progress = agents_get_next_contact($id_agente);
echo '<tr><td class="datos"><b>'.__('Next agent contact').'</b></td>';
- echo '<td class="datos f9" colspan="2">' . progress_bar($progress, 200, 20) . '</td></tr>';
+ echo '<td class="datos f9" colspan="2">' . progress_bar($progress, 150, 20) . '</td></tr>';
+
+ //End of table
+ echo '</table></div>';
+
+ if (can_user_access_node () && check_acl ($config["id_user"], $agent["id_grupo"], "AW")) {
+ echo '<div style="width:90%; text-align: right; min-width: 300px;">';
+ echo '<form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.$url_hash.'">';
+ html_print_submit_button (__('Go to agent edition'), 'upd_button', false, 'class="sub config"');
+ echo '</form>';
+ echo '</div>';
+ }
+
+ // Advanced data
+ $advanced = '<div id="id_div3" width="450px">';
+ $advanced .= '<table cellspacing="4" cellpadding="4" border="0" class="databox alternate" style="width:90%;">';
+
+ // Agent version
+ $advanced .= '<tr><td class="datos2"><b>'.__('Agent Version'). '</b></td>';
+ $advanced .= '<td class="datos2" colspan="2">'.$agent["agent_version"].'</td></tr>';
+
+ // Position Information
+ if ($config['activate_gis']) {
+ $dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
+
+ $advanced .= '<tr><td class="datos2"><b>'.__('Position (Long, Lat)'). '</b></td>';
+ $advanced .= '<td class="datos2" colspan="2">';
+
+ if ($dataPositionAgent === false) {
+ $advanced .= __('There is no GIS data.');
+ }
+ else {
+ $advanced .= '<a href="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">';
+ if ($dataPositionAgent['description'] != "")
+ $advanced .= $dataPositionAgent['description'];
+ else
+ $advanced .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
+ $advanced .= "</a>";
+ }
+
+ $advanced .= '</td></tr>';
+ }
+
+ // If the url description is setted
+ if ($agent['url_address'] != '') {
+ $advanced .= '<tr><td class="datos"><b>'.__('Url address').'</b></td>';
+ $advanced .= '<td class="datos2" colspan="2"><a href='.$agent["url_address"].'>' . $agent["url_address"] . '</a></td></tr>';
+ }
+
+ // Timezone Offset
+ if ($agent['timezone_offset'] != 0) {
+ $advanced .= '<tr><td class="datos2"><b>'.__('Timezone Offset'). '</b></td>';
+ $advanced .= '<td class="datos2" colspan="2">'.$agent["timezone_offset"].'</td></tr>';
+ }
// Custom fields
$fields = db_get_all_rows_filter('tagent_custom_fields', array('display_on_front' => 1));
@@ -329,44 +417,39 @@ function treeview_printTable($id_agente, $server_data = array()) {
}
if ($fields) {
foreach ($fields as $field) {
- echo '<tr><td class="datos"><b>'.$field['name'] . ui_print_help_tip (__('Custom field'), true).'</b></td>';
+ $advanced .= '<tr><td class="datos"><b>'.$field['name'] . ui_print_help_tip (__('Custom field'), true).'</b></td>';
$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));
if ($custom_value === false || $custom_value == '') {
$custom_value = '<i>-'.__('empty').'-</i>';
}
- echo '<td class="datos f9" colspan="2">'.$custom_value.'</td></tr>';
+ $advanced .= '<td class="datos f9" colspan="2">'.$custom_value.'</td></tr>';
}
}
- //End of table
- echo '</table></div>';
+ //End of table advanced
+ $advanced .= '</table></div><br>';
+
+ ui_toggle($advanced, __('Advanced information'));
// Blank space below title, DONT remove this, this
// Breaks the layout when Flash charts are enabled :-o
- echo '<div id="id_div" style="height: 10px"> </div>';
-
- //Floating div
- echo '<div id="agent_access" width:35%; padding-top:11px;">';
-
+ //echo '<div id="id_div" style="height: 10px"> </div>';
+
if ($config["agentaccess"]) {
- echo '<b>'.__('Agent access rate (24h)').'</b><br />';
+ $access_graph = '<div style="width: 290px; margin-left: 30px;">';
+ $access_graph .= graphic_agentaccess($id_agente, 290, 110, 86400, true);
+ $access_graph .= '</div><br>';
+
+ ui_toggle($access_graph, __('Agent access rate (24h)'));
+ }
+
+ $events_graph = '<div style="width: 290px; height: 15px; margin-left: 30px; position: static;">';
+ $events_graph .= graph_graphic_agentevents ($id_agente, 290, 15, 86400, '', true);
+ $events_graph .= '</div><br><br>';
+
+ ui_toggle($events_graph, __('Events (24h)'));
- graphic_agentaccess($id_agente, 280, 110, 86400);
- }
-
echo '<br>';
- graph_graphic_agentevents ($id_agente, 290, 15, 86400, '');
-
- echo '</div>';
-
- if (can_user_access_node ()) {
- echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">';
- echo '<tr>';
- echo '<td><form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.$url_hash.'">';
- html_print_submit_button (__('Go to agent detail'), 'upd_button', false, 'class="sub search"');
- echo '</form></td></tr>';
- echo '</table>';
- }
return;
}
@@ -375,7 +458,7 @@ function treeview_printTree($type) {
global $config;
echo '<table class="databox" style="width:98%">';
- echo '<tr><td style="width:60%" valign="top">';
+ echo '<tr><td style="width:50%" valign="top">';
if (! defined ('METACONSOLE')) {
$list = treeview_getData ($type);
@@ -890,7 +973,7 @@ function treeview_getData ($type) {
$id = $item['id_grupo'];
$list[$key]['_id_'] = $id;
$list[$key]['_name_'] = $item['nombre'];
- $list[$key]['_iconImg_'] = html_print_image ("images/groups_small/" . groups_get_icon($item['id_grupo']).".png", true, array ("style" => 'vertical-align: middle; width: 16px; height: 16px;'));
+ $list[$key]['_iconImg_'] = html_print_image ("images/groups_small/" . groups_get_icon($item['id_grupo']).".png", true, array ("style" => 'vertical-align: middle;'));
$list[$key]['_num_ok_'] = groups_agent_ok($id);
$list[$key]['_num_critical_'] = groups_agent_critical($id);
$list[$key]['_num_warning_'] = groups_agent_warning($id);
@@ -932,7 +1015,7 @@ function treeview_getData ($type) {
$id = db_get_value('id_tag', 'ttag', 'name', $item['name']);
$list[$key]['_id_'] = $id;
$list[$key]['_name_'] = $item['name'];
- $list[$key]['_iconImg_'] = html_print_image ("images/tag_red.png", true, array ("style" => 'vertical-align: middle; width: 16px; height: 16px;'));
+ $list[$key]['_iconImg_'] = html_print_image ("images/tag_red.png", true, array ("style" => 'vertical-align: middle;'));
$list[$key]['_num_ok_'] = tags_agent_ok($id);
$list[$key]['_num_critical_'] = tags_agent_critical($id);
$list[$key]['_num_warning_'] = tags_agent_warning($id);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 35385192b6..aecb36c277 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -621,11 +621,18 @@ function ui_print_os_icon ($id_os, $name = true, $return = false, $apply_skin =
* @param string Style of name in css.
* @param string server url to concatenate at the begin of the link
* @param string extra parameters to concatenate in the link
+ * @param string name of the agent to avoid the query in some cases
*
* @return string HTML with agent name and link
*/
-function ui_print_agent_name ($id_agent, $return = false, $cutoff = 'agent_medium', $style = '', $cutname = false, $server_url = '', $extra_params = '') {
- $agent_name = (string) agents_get_name ($id_agent);
+function ui_print_agent_name ($id_agent, $return = false, $cutoff = 'agent_medium', $style = '', $cutname = false, $server_url = '', $extra_params = '', $known_agent_name = false) {
+ if($known_agent_name === false) {
+ $agent_name = (string) agents_get_name ($id_agent);
+ }
+ else {
+ $agent_name = $known_agent_name;
+ }
+
$agent_name_full = $agent_name;
if ($cutname) {
$agent_name = ui_print_truncate_text($agent_name, $cutoff, true, true, true, '[…]', $style);
@@ -659,9 +666,22 @@ function ui_print_agent_name ($id_agent, $return = false, $cutoff = 'agent_mediu
* @return array A formatted array with proper html for use in $table->data (6 columns)
*/
function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = false) {
-
global $config;
+ if(!isset($alert['server_data'])) {
+ $server_name = '';
+ $server_id = '';
+ $url_hash = '';
+ $console_url = '';
+ }
+ else {
+ $server_data = $alert['server_data'];
+ $server_name = $server_data['server_name'];
+ $server_id = $server_data['id'];
+ $console_url = $server_data['server_url'] . '/';
+ $url_hash = metaconsole_get_servers_url_hash($server_data);
+ }
+
$actionText = "";
require_once ($config['homedir'] . "/include/functions_alerts.php");
$isFunctionPolicies = enterprise_include_once ('include/functions_policies.php');
@@ -759,16 +779,21 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
}
else {
if (defined('METACONSOLE')) {
- $data[$index['agent_name']] .= $alert['agent_name'];
+ $agent_name = $alert['agent_name'];
+ $id_agent = $alert['id_agent'];
}
else {
- 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);
- }
+ $agent_name = false;
+ $id_agent = modules_get_agentmodule_agent ($alert["id_agent_module"]);
}
+
+ if ($agent_style !== false) {
+ $data[$index['agent_name']] .= ui_print_agent_name ($id_agent, true, 'agent_medium', $styleDisabled . " $agent_style", false, $console_url, $url_hash, $agent_name);
+ }
+ else {
+ $data[$index['agent_name']] .= ui_print_agent_name ($id_agent, true, 'agent_medium', $styleDisabled, false, $console_url, $url_hash);
+ }
+
$data[$index['module_name']] =
ui_print_truncate_text (isset($alert['agent_module_name']) ? $alert['agent_module_name'] : modules_get_agentmodule_name ($alert["id_agent_module"]), 'module_small', false, true, true, '[…]', 'font-size: 7.2pt');
}
@@ -778,7 +803,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
$data[$index['description']] = '';
if (defined('METACONSOLE')) {
- $data[$index['template']] .= '<a class="template_details" href="' . ui_get_full_url('/', false, false, false) . '/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template=' . $template['id'] . '&server_name=' . $alert['server_name'] . '">';
+ $data[$index['template']] .= '<a class="template_details" href="' . ui_get_full_url('/', false, false, false) . '/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template=' . $template['id'] . '&server_name=' . $alert['server_data']['server_name'] . '">';
}
else {
$data[$index['template']] .= '<a class="template_details" href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template=' . $template['id'] . '">';
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index ffe873b3db..fb91864a24 100644
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -961,17 +961,17 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
switch ($status_parent) {
default:
case VISUAL_MAP_STATUS_UNKNOW:
- $line["color"] = "#ccc"; // Gray
+ $line["color"] = COL_UNKNOWN; // Gray
break;
case VISUAL_MAP_STATUS_WARNING:
- $line["color"] = "#20f6f6"; // Yellow
+ $line["color"] = COL_WARNING; // Yellow
break;
case VISUAL_MAP_STATUS_NORMAL:
- $line["color"] = "#00ff00"; // Green
+ $line["color"] = COL_NORMAL; // Green
break;
case VISUAL_MAP_STATUS_CRITICAL_ALERT:
case VISUAL_MAP_STATUS_CRITICAL_BAD:
- $line["color"] = "#ff0000"; // Red
+ $line["color"] = COL_CRITICAL; // Red
break;
}
array_push ($lines, $line);
@@ -988,24 +988,24 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
switch ($status) {
case VISUAL_MAP_STATUS_CRITICAL_BAD:
//Critical (BAD)
- $colorStatus = "#ff0000";
+ $colorStatus = COL_CRITICAL;
break;
case VISUAL_MAP_STATUS_CRITICAL_ALERT:
//Critical (ALERT)
- $colorStatus = "#ff8800";
+ $colorStatus = COL_ALERTFIRED;
break;
case VISUAL_MAP_STATUS_NORMAL:
//Normal (OK)
- $colorStatus = "#00ff00";
+ $colorStatus = COL_NORMAL;
break;
case VISUAL_MAP_STATUS_WARNING:
//Warning
- $colorStatus = "#ffff00";
+ $colorStatus = COL_WARNING;
break;
case VISUAL_MAP_STATUS_UNKNOW:
default:
//Unknown
- $colorStatus = "#5A5AFF";
+ $colorStatus = COL_UNKNOWN;
// Default is Grey (Other)
break;
}
@@ -1660,7 +1660,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
// resulting fault image links :(
echo grafico_modulo_sparse ($layout_data['id_agente_modulo'], $layout_data['period'],
false, $layout_data['width'], $layout_data['height'],
- '', null, false, 1, false, 0, '', 0, 0, true, true, $home_url, 2);
+ '', null, false, 1, false, 0, '', 0, 0, true, true, $home_url, 1);
//Restore db connection
if ($layout_data['id_metaconsole'] != 0) {
diff --git a/pandora_console/include/graphs/functions_gd.php b/pandora_console/include/graphs/functions_gd.php
index c37ca76ba6..98fda86e70 100755
--- a/pandora_console/include/graphs/functions_gd.php
+++ b/pandora_console/include/graphs/functions_gd.php
@@ -162,7 +162,7 @@ function gd_histogram ($width, $height, $mode, $data, $max_value, $font, $title,
// ***************************************************************************
function gd_progress_bubble ($width, $height, $progress, $title, $font, $out_of_lim_str, $out_of_lim_image, $mode = 1, $fontsize=10, $value_text = '', $colorRGB = '') {
if($out_of_lim_str === false) {
- $out_of_lim_str = "Out of limits";
+ $out_of_lim_str = __("Out of limits");
}
if($out_of_lim_image === false) {
@@ -273,7 +273,7 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
function drawRating($rating, $width, $height, $font, $out_of_lim_str, $mode, $fontsize, $value_text, $color) {
global $config;
global $REMOTE_ADDR;
-
+
// Round corners defined in global setup
if ($config["round_corner"] != 0) {
$radius = ($height > 18) ? 8 : 0;
@@ -367,7 +367,7 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
if ($rating > 50)
if ($rating > 100)
- ImageTTFText($image, $fontsize, 0, ($width/4), ($height/2)+($height/5), $back, $font, $out_of_lim_str);
+ ImageTTFText($image, $fontsize + 2, 0, ($width/4), ($height/2)+($height/5), $back, $font, $out_of_lim_str);
else
ImageTTFText($image, $fontsize, 0, ($width/2)-($width/10), ($height/2)+($height/5), $back, $font, $value_text);
else
@@ -430,7 +430,8 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
drawRating($progress, $width, $height, $font, $out_of_lim_str, $mode, $fontsize, $value_text, $color);
break;
case 1:
- if ($progress > 100 || $progress < 0) {
+ /*
+ if (($progress > 100 || $progress < 0) && false) {
// HACK: This report a static image... will increase render in about 200% :-) useful for
// high number of realtime statusbar images creation (in main all agents view, for example
$imgPng = imageCreateFromPng($out_of_lim_image);
@@ -441,6 +442,10 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim
else {
drawRating($progress, $width, $height, $font, $out_of_lim_str, $mode, 6, $value_text, $color);
}
+ */
+
+ drawRating($progress, $width, $height, $font, $out_of_lim_str, $mode, 6, $value_text, $color);
+
break;
case 2:
if ($progress > 100 || $progress < 0) {
diff --git a/pandora_console/include/javascript/jquery.cluetip.js b/pandora_console/include/javascript/jquery.cluetip.js
index c8a18b4368..ffbfd32d07 100644
--- a/pandora_console/include/javascript/jquery.cluetip.js
+++ b/pandora_console/include/javascript/jquery.cluetip.js
@@ -24,7 +24,7 @@ var pY=posX<0?event.pageY+tOffset:event.pageY;$cluetip.css({left:(posX>0&&opts.p
wHeight=$(window).height();if(js){$cluetipInner.html(js);cluetipShow(pY);}
else if(tipParts){var tpl=tipParts.length;for(var i=0;i<tpl;i++){if(i==0){$cluetipInner.html(tipParts[i]);}else{$cluetipInner.append('<div class="split-body">'+tipParts[i]+'</div>');}};cluetipShow(pY);}
else if(!opts.local&&tipAttribute.indexOf('#')!=0){if(cluetipContents&&opts.ajaxCache){$cluetipInner.html(cluetipContents);cluetipShow(pY);}
-else{var ajaxSettings=opts.ajaxSettings;ajaxSettings.url=tipAttribute;ajaxSettings.beforeSend=function(){$cluetipOuter.children().empty();if(opts.waitImage){$('#cluetip-waitimage').css({top:mouseY+20,left:mouseX+20}).show();}};ajaxSettings.error=function(){if(isActive){$cluetipInner.html('<i>sorry, the contents could not be loaded</i>');}};ajaxSettings.success=function(data){cluetipContents=opts.ajaxProcess(data);if(isActive){$cluetipInner.html(cluetipContents);}};ajaxSettings.complete=function(){imgCount=$('#cluetip-inner img').length;if(imgCount&&!$.browser.opera){$('#cluetip-inner img').load(function(){imgCount--;if(imgCount<1){$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}});}else{$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}};$.ajax(ajaxSettings);}}else if(opts.local){var $localContent=$(tipAttribute+':first');var localCluetip=$.fn.wrapInner?$localContent.wrapInner('<div></div>').children().clone(true):$localContent.html();$.fn.wrapInner?$cluetipInner.empty().append(localCluetip):$cluetipInner.html(localCluetip);cluetipShow(pY);}};var cluetipShow=function(bpY){$cluetip.addClass('cluetip-'+ctClass);if(opts.truncate){var $truncloaded=$cluetipInner.text().slice(0,opts.truncate)+'...';$cluetipInner.html($truncloaded);}
+else{var ajaxSettings=opts.ajaxSettings;ajaxSettings.url=tipAttribute;ajaxSettings.beforeSend=function(){$cluetipOuter.children().empty();if(opts.waitImage){$('#cluetip-waitimage').css({top:mouseY+20,left:mouseX+20}).show();}};ajaxSettings.error=function(){if(isActive){$cluetipInner.html('<i>sorry, the contents could not be loaded</i>');}};ajaxSettings.success=function(data){cluetipContents=opts.ajaxProcess(data);if(isActive){$cluetipInner.html(cluetipContents);}};ajaxSettings.complete=function(){imgCount=$('#cluetip-inner img').length;$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);};$.ajax(ajaxSettings);}}else if(opts.local){var $localContent=$(tipAttribute+':first');var localCluetip=$.fn.wrapInner?$localContent.wrapInner('<div></div>').children().clone(true):$localContent.html();$.fn.wrapInner?$cluetipInner.empty().append(localCluetip):$cluetipInner.html(localCluetip);cluetipShow(pY);}};var cluetipShow=function(bpY){$cluetip.addClass('cluetip-'+ctClass);if(opts.truncate){var $truncloaded=$cluetipInner.text().slice(0,opts.truncate)+'...';$cluetipInner.html($truncloaded);}
function doNothing(){};tipTitle?$cluetipTitle.show().html(tipTitle):(opts.showTitle)?$cluetipTitle.show().html(' '):$cluetipTitle.hide();if(opts.sticky){var $closeLink=$('<div id="cluetip-close"><a href="#">'+opts.closeText+'</a></div>');(opts.closePosition=='bottom')?$closeLink.appendTo($cluetipInner):(opts.closePosition=='title')?$closeLink.prependTo($cluetipTitle):$closeLink.prependTo($cluetipInner);$closeLink.click(function(){cluetipClose();return false;});if(opts.mouseOutClose){if($.fn.hoverIntent&&opts.hoverIntent){$cluetip.hoverIntent({over:doNothing,timeout:opts.hoverIntent.timeout,out:function(){$closeLink.trigger('click');}});}else{$cluetip.hover(doNothing,function(){$closeLink.trigger('click');});}}else{$cluetip.unbind('mouseout');}}
var direction='';$cluetipOuter.css({overflow:defHeight=='auto'?'visible':'auto',height:defHeight});tipHeight=defHeight=='auto'?Math.max($cluetip.outerHeight(),$cluetip.height()):parseInt(defHeight,10);tipY=posY;baseline=sTop+wHeight;if(opts.positionBy=='fixed'){tipY=posY-opts.dropShadowSteps+tOffset;}else if((posX<mouseX&&Math.max(posX,0)+tipWidth>mouseX)||opts.positionBy=='bottomTop'){if(posY+tipHeight+tOffset>baseline&&mouseY-sTop>tipHeight+tOffset){tipY=mouseY-tipHeight-tOffset;direction='top';}else{tipY=mouseY+tOffset;direction='bottom';}}else if(posY+tipHeight+tOffset>baseline){tipY=(tipHeight>=wHeight)?sTop:baseline-tipHeight-tOffset;}else if($this.css('display')=='block'||$this[0].tagName.toLowerCase()=='area'||opts.positionBy=="mouse"){tipY=bpY-tOffset;}else{tipY=posY-opts.dropShadowSteps;}
if(direction==''){posX<linkLeft?direction='left':direction='right';}
diff --git a/pandora_console/include/styles/cluetip.css b/pandora_console/include/styles/cluetip.css
index 5c05ed5552..5a33cd38ef 100644
--- a/pandora_console/include/styles/cluetip.css
+++ b/pandora_console/include/styles/cluetip.css
@@ -33,29 +33,31 @@
-------------------------------------- */
.cluetip-default {
- background-color: #F5F5DC;
+ background-color: #FFF;
text-align: left;
}
.cluetip-default #cluetip-outer {
position: relative;
margin: 0;
- background-color: #F5F5DC;
+ background-color: #FFF;
}
.cluetip-default h3 {
margin: 0 0 5px;
padding: 8px 10px 4px;
font-size: 1.1em;
font-weight: bold;
- background-color: #E6E9CD;
+ background-color: #B1B1B1;
+ color: #fff;
}
.cluetip-default h3#cluetip-title {
display: none;
height: 0px;
margin: 0;
padding: 0;
+ color: #FFF;
}
.cluetip-default #cluetip-title a {
- color: #d9d9c2;
+ color: #FFF;
font-size: 0.95em;
}
.cluetip-default #cluetip-inner {
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 4025e6e4cf..1d3fe2eedc 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -136,7 +136,7 @@
.menu .menu_icon, .menu li.links {
background-color: #daedae;
- background-position: 4px center;
+ 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 fd5a0d8d9a..ac95cbdc4c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -537,122 +537,122 @@ input.next, input.next_login, input.upd, input.ok, input.wand, input.delete, inp
input.target, input.search, input.copy, input.add, input.graph,
input.percentile, input.binary, input.camera, input.config,
input.cancel, input.default, input.filter, input.pdf {
- padding-right: 30px;
+ padding-right: 26px;
}
input.next {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_go.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_go.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.next_login {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_go.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_go.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_go.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_go.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.upd {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_update.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_update.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_update.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_update.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_update.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_update.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_update.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_update.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_update.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.wand {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_wand.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_wand.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_wand.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.wand:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_wand.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_wand.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_wand.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_wand.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.search {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_zoom.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_zoom.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_zoom.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.search:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_zoom.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_zoom.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_zoom.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_zoom.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.ok {
/* Browser without multibackground support */
@@ -688,227 +688,227 @@ input.ok:disabled {
}
input.add {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_add.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_add.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_add.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_add.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_add.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_add.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_add.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_add.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.add:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_add.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_add.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_add.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_add.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.cancel {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_cross.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_cross.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_cross.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.cancel:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_cross.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_cross.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_cross.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cross.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.delete {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_delete.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_delete.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_delete.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.delete:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_delete.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_delete.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_delete.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_delete.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.cog {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_cog.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_cog.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_cog.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.cog:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_cog.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_cog.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_cog.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_cog.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.config {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_config.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_config.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_config.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_config.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_config.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_config.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_config.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_config.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.config:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_config.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_config.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_config.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_config.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.filter {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_filter.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_filter.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_filter.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.filter:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_filter.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_filter.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_filter.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_filter.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.pdf {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_pdf.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_pdf.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_pdf.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
input.pdf:disabled {
/* Browser without multibackground support */
- background: #efefef url(../../images/input_pdf.disabled.png) no-repeat 90% 3px !important;
+ background: #efefef url(../../images/input_pdf.disabled.png) no-repeat 96% 3px !important;
/* Safari 4-5, Chrome 1-9 */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important;
/* Safari 5.1+, Chrome 10+ */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Firefox 3.6+ */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important;
/* Opera 11.10+ */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important;
/* IE 10 */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important;
/* estándar */
- background: url(../../images/input_pdf.disabled.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
+ background: url(../../images/input_pdf.disabled.png) no-repeat 96% 3px, linear-background(top, #ffffff, #dfdfdf) !important;
}
#toolbox #auto_save {
padding-top: 5px;
@@ -996,6 +996,9 @@ input.service_min[disabled] {
div#cont {
position: fixed;
+ max-height: 320px;
+ overflow-y: auto;
+ overflow-x: hidden;
}
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 172c5f52c9..32d6fc14fa 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -62,7 +62,7 @@ echo '<form method="post" action="index.php?sec=estado&sec2=operation/agente
enterprise_hook('open_meta_frame');
-echo '<table cellspacing="4" cellpadding="4" width="98%" class="databox">
+echo '<table cellspacing="4" cellpadding="4" width="100%" class="databox">
<tr>';
// Get Groups and profiles from user
@@ -902,10 +902,16 @@ foreach ($result as $row) {
}
}
+ // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
if (defined('METACONSOLE')) {
- $data[1] = '<strong><a href="'. $row["server_url"] .'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='. $row["id_agent"] . '&loginhash=auto&loginhash_data=' . $row["hashdata"] . '&loginhash_user=' . $row["user"] . '">';
- $data[1] .= ui_print_truncate_text($row["agent_name"], 'agent_small', false, true, false, '[…]', 'font-size:7.5pt;');
- $data[1] .= '</a></strong>';
+ $agent_link = '<a href="'. $row["server_url"] .'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='. $row["id_agent"] . '&loginhash=auto&loginhash_data=' . $row["hashdata"] . '&loginhash_user=' . $row["user"] . '">';
+ $agent_name = ui_print_truncate_text($row["agent_name"], 'agent_small', false, true, false, '[…]', 'font-size:7.5pt;');
+ if (can_user_access_node ()) {
+ $data[1] = $agent_link . '<b>' . $agent_name . '</b></a>';
+ }
+ else {
+ $data[1] = $agent_name;
+ }
}
else {
$data[1] = '<strong><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$row["id_agent"].'">';
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index 0ad2288e18..90749b183c 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -14,7 +14,7 @@
// GNU General Public License for more details.
-$table->width = '98%';
+$table->width = '100%';
$table->id = "eventtable";
$table->cellpadding = 4;
$table->cellspacing = 4;
@@ -39,7 +39,7 @@ $table->align[$i] = 'center';
$i++;
if (in_array('server_name', $show_fields)) {
$table->head[$i] = __('Server');
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
$i++;
}
if (in_array('estado', $show_fields)) {
@@ -60,7 +60,7 @@ if (in_array('evento', $show_fields)) {
}
if (in_array('id_agente', $show_fields)) {
$table->head[$i] = __('Agent name');
- $table->align[$i] = 'center';
+ $table->align[$i] = 'left';
$table->style[$i] = 'max-width: 350px; word-break: break-all;';
$i++;
}
@@ -191,6 +191,7 @@ foreach ($result as $event) {
$i = 0;
$data[$i] = "#".$event["id_evento"];
+ $table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3; color: #111 !important;';
// Pass grouped values in hidden fields to use it from modal window
if ($group_rep) {
@@ -245,10 +246,9 @@ foreach ($result as $event) {
if (in_array('estado',$show_fields)) {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status",
- "width" => 16,
- "height" => 16,
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
+ $table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
$i++;
}
if (in_array('id_evento',$show_fields)) {
@@ -303,9 +303,13 @@ foreach ($result as $event) {
if ($event["id_agente"] > 0) {
// Agent name
if ($meta) {
- $data[$i] = '<b><a href="'.$event["server_url"].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
- $data[$i] .= $event["agent_name"];
- $data[$i] .= "</a></b>";
+ $agent_link = '<a href="'.$event["server_url"].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
+ if (can_user_access_node ()) {
+ $data[$i] = '<b>' . $agent_link . $event["agent_name"] . '</a></b>';
+ }
+ else {
+ $data[$i] = $event["agent_name"];
+ }
}
else {
$data[$i] .= ui_print_agent_name ($event["id_agente"], true);
@@ -377,9 +381,13 @@ foreach ($result as $event) {
if (in_array('id_agentmodule',$show_fields)) {
if ($meta) {
- $data[$i] = '<b><a href="'.$event["server_url"].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
- $data[$i] .= $event["module_name"];
- $data[$i] .= "</a></b>";
+ $module_link = '<a href="'.$event["server_url"].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
+ if (can_user_access_node ()) {
+ $data[$i] = '<b>' . $module_link . $event["module_name"] . '</a></b>';
+ }
+ else {
+ $data[$i] = $event["module_name"];
+ }
}
else {
$data[$i] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$event["id_agente"].'&tab=data">'
@@ -514,6 +522,9 @@ foreach ($result as $event) {
$data[$i] .= html_print_image ("images/eye.png", true,
array ("title" => __('Show more')));
$data[$i] .= '</a>';
+
+ $table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
+
$i++;
if (tags_check_acl ($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags']) == 1) {
@@ -528,6 +539,8 @@ foreach ($result as $event) {
else if (isset($table->header[$i]) || true) {
$data[$i] = '';
}
+
+ $table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
}
array_push ($table->data, $data);
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 1b7ffa54ea..64273f6eee 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -339,7 +339,7 @@ else{
}
$table_advanced->id = 'events_filter_form_advanced';
-$table_advanced->width = '99%';
+$table_advanced->width = '98%';
$table_advanced->cellspacing = 4;
$table_advanced->cellpadding = 4;
$table_advanced->class = 'transparent';
@@ -399,7 +399,7 @@ $table_advanced->data[] = $data;
$table_advanced->rowclass[] = '';
$table->id = 'events_filter_form';
-$table->width = '99%';
+$table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox';
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index d23d08435b..2f2de5c525 100644
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -447,7 +447,7 @@ if (is_ajax ())
echo " ";
}
- echo "<a onfocus='JavaScript: this.blur()' href='javascript: loadModuleTable(" . $row["id_agente_modulo"] . ", \"" . $server_name . "\")'>";
+ echo "<a style='vertical-align: middle;' onfocus='JavaScript: this.blur()' href='javascript: loadModuleTable(" . $row["id_agente_modulo"] . ", \"" . $server_name . "\")'>";
echo io_safe_output($row['nombre']);
echo "</a>";
if ($row['quiet']) {
@@ -455,6 +455,7 @@ if (is_ajax ())
html_print_image("images/dot_green.disabled.png", false, array("border" => '0', "title" => __('Quiet'), "alt" => ""));
}
+ /*
if (is_numeric($row["datos"]))
$data = format_numeric($row["datos"]);
else
@@ -470,6 +471,7 @@ if (is_ajax ())
echo " ";
echo '('.$row['unit'].')';
}
+ * */
echo "</span></li>";
}
echo "</ul>\n";