From 318f392097e743be116d29d7c6646c37aeaf9f32 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 28 Feb 2013 16:36:34 +0000 Subject: [PATCH] 2013-02-28 Miguel de Dios * include/functions_events.php, images/status_sets/default/severity_informational.png, images/status_sets/default/severity_maintenance_pixel.png, images/status_sets/default/severity_maintenance.png, images/status_sets/default/severity_informational_pixel.png: fixed the colors for maintenance and informational events. Fixes: #3606227 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7757 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 +++++++++++ .../modules/manage_network_components_form.php | 6 +++--- .../reporting/graph_builder.graph_editor.php | 2 +- .../reporting/visual_console_builder.editor.js | 2 +- .../reporting/visual_console_builder.wizard.php | 4 ++-- pandora_console/godmode/setup/links.php | 2 +- .../default/severity_informational.png | Bin 360 -> 354 bytes .../default/severity_informational_pixel.png | Bin 190 -> 190 bytes .../default/severity_maintenance.png | Bin 354 -> 360 bytes .../default/severity_maintenance_pixel.png | Bin 190 -> 190 bytes pandora_console/include/functions_events.php | 1 + 11 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cb0610c8c1..7411b77dbe 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-02-28 Miguel de Dios + + * include/functions_events.php, + images/status_sets/default/severity_informational.png, + images/status_sets/default/severity_maintenance_pixel.png, + images/status_sets/default/severity_maintenance.png, + images/status_sets/default/severity_informational_pixel.png: fixed + the colors for maintenance and informational events. + + Fixes: #3606227 + 2013-02-28 Miguel de Dios * godmode/admin_access_logs.php: cleaned source code style. diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index 69ff72e370..4799c70e8b 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -329,14 +329,14 @@ function type_change () { document.component.snmp_oid.style.background="#ddd"; document.component.snmp_oid.disabled=true; document.component.snmp_community.style.background="#ddd"; - document.component.snmp_community.disabled=true; + document.component.snmp_community.disabled=true; document.component.tcp_send.style.background="#fff"; document.component.tcp_send.disabled=false; document.component.tcp_rcv.style.background="#fff"; document.component.tcp_rcv.disabled=false; document.component.tcp_port.style.background="#fff"; document.component.tcp_port.disabled=false; - + document.component.snmp_version.style.background="#ddd"; document.component.snmp_version.disabled=true; document.component.snmp3_auth_user.style.background="#ddd"; @@ -364,7 +364,7 @@ function type_change () { document.component.tcp_rcv.disabled=false; document.component.tcp_port.style.background="#fff"; document.component.tcp_port.disabled=false; - + document.component.snmp_version.style.background="#ddd"; document.component.snmp_version.disabled=true; document.component.snmp3_auth_user.style.background="#ddd"; diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index 3c8567c5c6..e22a702fb2 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -137,7 +137,7 @@ echo ""; $connection_names = array(); $agents_tmp = array(); - $agents = array(); + $agents = array(); foreach ($connection_names as $connection) { $connection_data = enterprise_hook('metaconsole_get_connection', array($connection)); diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 65385951d7..7f8ffe1d17 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -531,7 +531,7 @@ function loadFieldsFromDB(item) { enterprise_loadFieldsFromDB(data); } } - }); + }); } function setAspectRatioBackground(side) { diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php index 5ab340dbe8..2e7224137e 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php +++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php @@ -360,7 +360,7 @@ function item_per_agent_change(itemPerAgent) { $('#module').empty(); $('#module').append ($('').html ().attr("value", -1)); $('#module').attr('disabled', true); - $('#label_type').empty(); + $('#label_type').empty(); $('#label_type').append ($('').html ().attr('value', 'agent').attr('selected', true)); $('#label_type').append ($('').html ().attr('value', 'none')); @@ -369,7 +369,7 @@ function item_per_agent_change(itemPerAgent) { else { $('#module').removeAttr('disabled'); $('#hidden-item_per_agent_test').val(0); - $('#label_type').empty(); + $('#label_type').empty(); $('#label_type').append ($('').html ().attr('value', 'agent')); $('#label_type').append ($('').html ().attr('value', 'agent_module').attr('selected', true)); $('#label_type').append ($('').html ().attr('value', 'module')); diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 5da1034333..18f7097369 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -107,7 +107,7 @@ if ((isset($_GET["form_add"])) or (isset($_GET["form_edit"]))) { '.__('Link').' '; - echo ''; + echo ''; echo ""; echo ""; echo "
"; diff --git a/pandora_console/images/status_sets/default/severity_informational.png b/pandora_console/images/status_sets/default/severity_informational.png index 841319de1d48dac5b4e9f4162dbd224c8c0cf97d..f0b9b3c123107fc84a5ec83c4f0a1d517e02dc53 100755 GIT binary patch delta 264 zcmV+j0r&ps0^$OYV}BoMnMHO00081iL_t(2&y|reYQs?R`Abq2iIyY)uLS`}YJY(GC9YA~Ci1k&?gjxW zAPK-}tMeGqjQ0Q>qPiZjcTR`EKM`Vdch6`0NV)~!vN=By-g=)w(in5b_Ae)|xZlF| z6tbjPfU~4#i!~1J|GOP-3H{iTr{xUPwvUpoz;}FC+ee_z({diBjvx4fdTI@lg9`uv O002ovPDHLkU;%Ts3rv;%ZX%58R<8>vorf=)eL9aGNBpH&$i!yHIOmm z2y7+o+cKHz{)7PP{`3NT0J$V=^9Lia>8kXisQe`rnfPd$L03?k-@f6p{Z4-G~ zWN!uma^N)p>!r?pL^Iw4kVSRfW8XMsfqx>z=&qiR_K|c9z;z>% diff --git a/pandora_console/images/status_sets/default/severity_informational_pixel.png b/pandora_console/images/status_sets/default/severity_informational_pixel.png index 985ea828c343d4548e4b1506571c22c71f0b5698..f6f29456318fac7e37a07559de731a7aed30d69a 100755 GIT binary patch delta 51 zcmdnTxQ}r{5}P8!bS;s*i5VtJcea*GGv^&R(jeXwlF6`o29u-Kf~HUgAn4R_vAnTs3rv;%ZX%58R<8>vorf=)eL9aGNBpH&$i!yHIOmm z2y7+o+cKHz{)7PP{`3NT0J$V=^9Lia>8kXisQe`rnfPd$L03?k-@f6p{Z4-G~ zWN!uma^N)p>!r?pL^Iw4kVSRfW8XMsfqx>z=&qiR_K|c9z;z>% delta 264 zcmV+j0r&ps0^$OYV}BoMnMHO00081iL_t(2&y|reYQs?R`Abq2iIyY)uLS`}YJY(GC9YA~Ci1k&?gjxW zAPK-}tMeGqjQ0Q>qPiZjcTR`EKM`Vdch6`0NV)~!vN=By-g=)w(in5b_Ae)|xZlF| z6tbjPfU~4#i!~1J|GOP-3H{iTr{xUPwvUpoz;}FC+ee_z({diBjvx4fdTI@lg9`uv O002ovPDHLkU;%4R_vAn "image_status", "width" => 12,