From 0a7bbe4846427639f91c5f907fd43e7279ffb859 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 27 May 2013 15:16:54 +0000 Subject: [PATCH] 2013-05-27 Sergio Martin * godmode/agentes/module_manager_editor_common.php: Fixed creation of data modules for bug #2240 * godmode/servers/plugin.php include/javascript/pandora_modules.js godmode/agentes/module_manager_editor_plugin.php: Fixed the tips of the macros help and change the input of macro help from input to a textarea * include/functions_html.php include/styles/dialog.css include/styles/menu.css include/styles/jquery-ui-1.10.0.custom.css include/styles/pandora.css include/javascript/pandora_events.js operation/users/user_edit.php operation/agentes/stat_win.php images/event_responses.png images/filter_mc.png images/sort_down.png images/tick.png images/pandora.ico images/tick_off.png images/pandora.ico.gif images/star.png images/sort_up.png godmode/setup/setup_general.php: A lot of visual improvements git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 31 +++++++++++++++++ .../agentes/module_manager_editor_common.php | 2 +- .../agentes/module_manager_editor_plugin.php | 2 +- pandora_console/godmode/servers/plugin.php | 8 +++-- .../godmode/setup/setup_general.php | 4 +-- pandora_console/images/event_responses.png | Bin 1370 -> 1384 bytes pandora_console/images/filter_mc.png | Bin 1294 -> 1321 bytes pandora_console/images/pandora.ico | Bin 1150 -> 318 bytes pandora_console/images/pandora.ico.gif | Bin 372 -> 1236 bytes pandora_console/images/sort_down.png | Bin 187 -> 1021 bytes pandora_console/images/sort_up.png | Bin 187 -> 1017 bytes pandora_console/images/star.png | Bin 611 -> 265 bytes pandora_console/images/tick.png | Bin 537 -> 294 bytes pandora_console/images/tick_off.png | Bin 387 -> 301 bytes pandora_console/include/functions_html.php | 2 +- .../include/javascript/pandora_events.js | 2 +- .../include/javascript/pandora_modules.js | 12 ++++++- pandora_console/include/styles/dialog.css | 11 +++--- .../styles/jquery-ui-1.10.0.custom.css | 2 +- pandora_console/include/styles/menu.css | 2 +- pandora_console/include/styles/pandora.css | 32 ++++++++---------- .../operation/agentes/stat_win.php | 8 +++-- pandora_console/operation/users/user_edit.php | 4 +-- 23 files changed, 82 insertions(+), 40 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 465744b9dc..4c5697fcf7 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,34 @@ +2013-05-27 Sergio Martin + + * godmode/agentes/module_manager_editor_common.php: Fixed + creation of data modules for bug #2240 + + * godmode/servers/plugin.php + include/javascript/pandora_modules.js + godmode/agentes/module_manager_editor_plugin.php: Fixed + the tips of the macros help and change the input of macro + help from input to a textarea + + * include/functions_html.php + include/styles/dialog.css + include/styles/menu.css + include/styles/jquery-ui-1.10.0.custom.css + include/styles/pandora.css + include/javascript/pandora_events.js + operation/users/user_edit.php + operation/agentes/stat_win.php + images/event_responses.png + images/filter_mc.png + images/sort_down.png + images/tick.png + images/pandora.ico + images/tick_off.png + images/pandora.ico.gif + images/star.png + images/sort_up.png + godmode/setup/setup_general.php: A lot of visual + improvements + 2013-05-27 Miguel de Dios * operation/search_main.php: change the label to show when the list diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 621a60b7b6..7b791ea539 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -129,7 +129,7 @@ $table_simple->colspan[6][1] = 3; $table_simple->data[0][0] = __('Name'); $table_simple->data[0][1] = html_print_input_text_extended ('name', - io_safe_output($name), 'text-'.$name, '', 45, 100, $disabledBecauseInPolicy, '', 'autocomplete="off"', true); + io_safe_output($name), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', 'autocomplete="off"', true); //$table_simple->data[0][1] = html_print_input_text ('name', // io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy); diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php index 789865a293..551076d504 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php +++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php @@ -102,10 +102,10 @@ function changePluginSelect() { }, function (data, status) { $("#plugin_description").html(data); - forced_title_callback(); } ); load_plugin_macros_fields('simple-macro'); + forced_title_callback(); } diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index bac3f086d1..09921c9d9e 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -117,6 +117,7 @@ if (($create != "") OR ($view != "")) { $fields[1]= __("Nagios"); $data[1] = html_print_select ($fields, "form_plugin_type", $form_plugin_type, '', '', 0, true); $table->data['plugin_type'] = $data; + $table->colspan['plugin_type'][1] = 3; $data[0] = __('Max. timeout').ui_print_help_tip (__('This value only will be applied if is minor than the server general configuration plugin timeout').'.

'.__('If you set a 0 seconds timeout, the server plugin timeout will be used'), true); $data[1] = html_print_extended_select_for_time ('form_max_timeout', $form_max_timeout, '', '', '0', false, true); @@ -131,7 +132,7 @@ if (($create != "") OR ($view != "")) { $table->data['plugin_desc'] = $data; echo '
'; - echo '
'; + echo '
'; echo '
'.__('General').''; html_print_table($table); @@ -243,7 +244,8 @@ if (($create != "") OR ($view != "")) { $datam = array (); $datam[0] = __('Help')." ($macro_name)


"; - $datam[1] = html_print_input_text_extended ($macro_help_name, $macro_help_value, 'text-'.$macro_help_name, '', 100, 255, $locked, '', "class='command_advanced_conf'", true); + $datam[1] = html_print_textarea ($macro_help_name, 6, 100, $macro_help_value, 'class="command_advanced_conf" style="width: 97%;"' . $locked ? ' disabled' : '', true); + if($locked) { $datam[1] .= html_print_image('images/lock.png', true, array('class' => 'command_advanced_conf')); } @@ -263,7 +265,7 @@ if (($create != "") OR ($view != "")) { if($i <= 2) { $delete_macro_style = 'display:none;'; } - $datam[2] = ''; + $datam[2] = ''; $table->colspan['plugin_action'][0] = 2; $table->rowstyle['plugin_action'] = 'text-align:center'; diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 63eda0be80..0c5d273452 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -161,8 +161,8 @@ if ($config["integria_enabled"]) { } $table->data[19][0] = __('Enable Netflow'); -$table->data[19][1] = __('Yes').' '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'  '; -$table->data[19][1] .= __('No').' '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true); +$table->data[19][1] = __('Yes').'   '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'  '; +$table->data[19][1] .= __('No').'   '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true); $zone_name = array('Africa' => __('Africa'), 'America' => __('America'), 'Antarctica' => __('Antarctica'), 'Arctic' => __('Arctic'), 'Asia' => __('Asia'), 'Atlantic' => __('Atlantic'), 'Australia' => __('Australia'), 'Europe' => __('Europe'), 'Indian' => __('Indian'), 'Pacific' => __('Pacific'), 'UTC' => __('UTC')); diff --git a/pandora_console/images/event_responses.png b/pandora_console/images/event_responses.png index 720839d809f59aa4540601c2ad33795211340962..8588183959478907288d5e30ef18ad2ef923d2a6 100755 GIT binary patch delta 555 zcmcb`^@3|d6qACXg{i5NrK_c*o1vMZp{tRjv#XU_GSr{5xIGVXwn3|ZIxtN<6IvX2JwqUNSU$i2MkAZ=4nx~6n zNX4zBKmY&RGxHcUa=5v<34EQ;7|Ev4ATiOhfI%pQN$7Lq4n`FQ0SBHJr~WxJ97$0* z__rq@`+-%%76yU+?VXG)0%g(@WjRe189NMh|MNdx5W)9^MM3&#(~=;84(5e9ZZl*R zxSuI+lw@GySiZV|X#!hJ{Va!nu4Ni-9t$z;I&!9})*vDY%C zK(4pnUaNqyfk7#fS(v%Afi+LmL~^0JRm75mF-|?a{2g5u0a5L3eN3CIc7(q0b1LI2 zGD zlmAvU&k5n4FzIG}#M;L5Og$kjA%7bViL|_3Xkzw(v4fxCqpJY#m1>5=6JMA$y^`9} z6w0uQZ|{Y_{b6esJV~76*rM9~&a|Dan_=1m4hJobj?E0d##KRo`j^&3^uJ+fDs;$o bDCTB(d&=rwrY%P(0}yz+`njxgN@xNApJT*w delta 515 zcmaFCb&G356qACZp{0|frJ19JiLoljiKGTB z{hxU1K@bDuk%nVzjcjX#49vJE9bi|;Yw=`a5m?rHgTcqNBk9o64o=Ul%oD5_w##S~ z$a~l`B(W-#wMZT3D7NM}!~W=RfElv`gW-cB(MfH;H5wgT*jOi-EU52XSS76y(6CP6 ziAsQtLoNTsR#(9@i@7{z1=#XVa^d1l321nu(!ijk_pXD{rBX__>f>@o6NgP~)f#&n zRlYB_=1pfv{A|#+eBs9pa=J|aogb?)P8Vi!IOp()Tj8jY&9cOo>9#r^3zvOMHWWBh z**{I>o3rrkDxF6+g0+M!`sdZlGcffuUfIIpd-B5_jw5UqS0?5$o-oi^chBFKdjqRC zgQ>1V|BT-iS0<$%td41AJ}TxAY{#XrU|t3Hg3emISw9y%5K_3sw1WHj;#A!yUwY+i zZd^Hdpjw1`gUbG|KbqKVE0a!s{(n*TK-jML$HTWMNy;&NeOO;3)^KRY{D$qEjq0B- p)GTr+QE}cY*C1xD!6w+1!r&JB;BDqy=S&75@O1TaS?83{1OS0$!b1Q6 diff --git a/pandora_console/images/filter_mc.png b/pandora_console/images/filter_mc.png index 06a74722fdf9c5a5a432309e5b2c3645992a1a09..ba11f531b8edd042e9c33ffccf5a2a6040c37551 100755 GIT binary patch delta 491 zcmeCv!qU>s(amIX6_X51kuy$3 z+nAE&jVufd4b4pq%#94pEDQ}T9L-!TOij$qT+B@josEqqTQJwv+uIZ+FfcHNd%8G= zRNPAX^Z&m+GtUNx%npuCJPr(oO2so8e%OXc#%Ru96mT#|<=E;GB_Yws;Q5AWMt{zS zdKEqghJ`mecp^5;LZNxhEOPBFWaIy-=FeEX5QSd$>n91t!N6vOq;;d(jHRJe$dqSB*KG=kOtj!T@*NrfD zdf6J%&3;Rbw}C-9l6hqVYm`-k(;3DSEQz%WVhwI<7zER58q`<>Y6VL>_!-VxGn89& zG>U{?VS2vsnUWCugfIqGDJ_Y64NnTzxcV^6WK%z|iSf$D9o;H2H<{!k_)TvxSc*T` z%CPc)O~3ja)`V9ZQjMF$6g2Y=h@E5k@?ia>6|5O~jAx6D&ek$8R4%DJ^1?sPg#idW MUHx3vIVCg!0I30|&Hw-a delta 438 zcmZ3<)yK6Vib=u3$;HIN+|ks+#M#x*(ACJ&%+So)(aqV?!pY6i)zxWo6_X51kqJ&k z+nACWEhj55DNMFvuBks_!=Avvz-Z&?;uunKE9uYw|Mtv022CCRPbfKTW9VSxP;g6e z6q~@pY}D|QkwZZu{eOK(zyTJsmWdZ9GK$t5$mDTgSa_p@$H7h1A(r9r??$)gt^3_K zOB@Y7p}=@JX-0TqH4g^^6UXw^1&kB2&oAC7CU1AX<8+qJ0>KXRgwlFrDFKE@413%X zTf}F{doVFDx`b&=T;s^t@%tmo`^pu2n9g`E+0iMO(yTbKOL$`Q#fSEF6B-0Bc{II9 zu=i1Id)>(N`JzbkkJl5QY&`ab+15l=Q8JM3mM>r;m^Cj*Pb$;{4YdP>Ke{;G&D zE_v{GgMv_lS_P|?l}w0*c2kC0RKmw!j2)s2D<3h7^0YBB#vBbiRR4*=V?N^+Esp~; zg+HVyFVb;5Z^^j?u8 Nc)I$ztaD0e0s!c9qnQ8z diff --git a/pandora_console/images/pandora.ico b/pandora_console/images/pandora.ico index ef9fc97bd29dcd475279a8dae8826d752868b251..2d8994329cd60d9bb59acdfe1a91abbf5d967313 100644 GIT binary patch literal 318 zcmZQzU<5(|0RbS%!l1#(z#zuJz@P!d0zj+)#2|4HXaJKC0wf2*r(WM=xc~Vj!-{){ z7+!tr8_4Sw+d*S>c^@DONlgWOy0ogfpz M0A??em&jrQ0PTp8Jpcdz literal 1150 zcmZuwTS${(7=E{!l7^TULIk0b(1qJPZ??^879BJ!gtUWrmr^!&a7Pc}0kxbYL`Znm zMcpWP-_^o!|4Dzhc_NxbVFq1DiIril=b!t-i*0=W_x|tuyx;pg@B95k3j8xO3C|pA zJ4%#IL}#(!g6F`GE$OdD=usMZPo0i)j+uq75iMiwt>S(8Nx?~+!cLU*tg}`#XNeWe zJ&Z5B4<~`rjZjiI894W;V#dbG`6Y~9l=CkLJ-K?$S$}1rFGcnx+mYi{2M;)Cf|lJ& z^L^$L#x|)9c7%%<+g?-HpOq}nB>3)EaP9{N&NWmRv~EZoaL!*N@12g@&{e^?Mz1dp z9XXuevNRrll{ptP_62BIQv;9u{Zhuk7X@t_de+r_RqRV`jyzS>iGykr?=8F?_Gjk3 zYgOEh_({$OXVh`N!TwVX4&eQzWqJI}wZ*}71MhJ{-!je%fujgLpV5;E1Lw(xEog(* z8TenF7rL9lA)L^#jlMoYJs+^G!yl*9Wd04}NEY}`l`xK(Qq~c8{dM-39IKx1u9EsF zaX`(b%M1M)Id(JrL^dfFiz&5C$9G`&${5GU{{Rg1>v@91emU!CI~+S~7c$l@38x8m z?C4l$yBuo@kEWt_NQyz*wvqD|O0kB}V=@cAI1Ije)c%F_BXP#Qj_Y(oZ+y@tmdK!1E^q^=^FA?uX?~knJo@`i&$$AaPgIJ5(9`{x!lsdLE?;PiDC}SOym}3OkUFeU&-U1g9^Bu#zdWPJW;O7FLe9PJ-fxCPR z4XjU5CGSl^JPoyvBR>OoDg)nm`mKmxg_sI8QfkG1rIaMbh-MS(6VwDGMR-@dB|5Q3 aKx8lS1SC8Ib-F17;rRV!69E;s_ZNiLG+3kn? z58Yp}@La`@-(Ua#|6jMyUhzM7gl~X?OJYePkhZa}C`e4sPAySLN=?tqvsHS(d%u!G zW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@&oOZb5EpNuokUZcbjYRfVlm zVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v&`mZlGgL4$(K9qLur#sMQ7|$v zG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$Ca=mh6z5Jqd zeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2OG|8(fG&l2 zA-4c-Y+kV**gJa3`MLTPi3R$GdIlgb!4&%X;#ZoR3s+rS5|oN?FIIz#Ln;eW^@CE2 z^Gl18Q-R8rK~@!5ITxiSmgE)x^cr(9FQx z6{goEKe;qFHLnDwHwB^B1*cw6V#qB3+U$~Alv$RV;#QQOs{r=2RVHq?IN~%9sy79< zTbyv})dxC89~8AnQ4JFUrXLU!o^XL2c+yYJ1E%*PV8Ukn|L^ag-@ktT`2Owdm(QO* zet7@x?VH!HUcPw#?CF!oj~+g_fA8*{+qZ7sxPI;GmCKhdUO0d5?3vT2PM$b^?C6oh zhYlXtzi;oJ-Me<~*uHJ+md%?sZdku=?V8oAR<2mSZ0VB4ixw`JKX2}w*|TQOm_BXl zl*yAOPU!FJ?dk67>}YRmZE0?5Y^blRt*Nf6tSB!lEh#Q4EXdEx&B@Nn%t%j5O-W8l zOo)$*jfswmj0g`44G9hk4Dk2!_3`%d^l*1`b#Zobbg;LxwXwFcv@ka_H8C~Iq+Ji|5D4c_Jap!7zhY6 zX;?^p&|(kZNq= MmuMDd5@fIj0Cp0_5dZ)H literal 372 zcmZ?wbhEHb6krfwSgOL1drT+ym~I{j>E#{Q%{#7_4?_9{AY@Q@+%W%ye!&TYf)j>? zAY@c{!no*!Q4xqVDL!Fb3?fa7Pnr~;G%Y=8QF_X}^c0Y^EIVaU1|qG?Pgz%qL>U5_TjTELqNFZ}uv)N>uXIUIB zae^dC9G~T~*$hQwqBWnGamJ4(x(X_a?9dH}i+z|VnigIq3PYXlx8MamSwHGr6TL7l zHUmyz`J|;T&@lcF^}HTBB2{$Y_n*R1Z7o1t6-9V8wCUg$Cz4WuTnUj$a9G25rF)C> z4NP#vC0WuX@NQU9NM$o$kv`mca{XWfg_)HRMc(*n{n+Ww*bVN?*MW*Xi#? z?aSq;87>*^U!(4(=>8#1OEA VIhcQ8l`T*ugQu&X%Q~loCIBP^ET;ef diff --git a/pandora_console/images/sort_up.png b/pandora_console/images/sort_up.png index 9402a19d5a11790fb122a30b6e475a67e99ff0ff..5c928238089010df957aeeab81128d0165420bde 100644 GIT binary patch literal 1017 zcmaJ=&ui0A9DnP^41>w^v?{tsDjtSSUb=QQVR37l&Q+E%x`Mq3OOw|%bjgd!o6Y8> z?52o+!wxb8VV4~}h!;Wd;7LR;9t1A~@h0q0U%IyQU=2L-zF$6{&-dqhvc7hAa^lJa z0ARATqLta7iw-vqz{oN8{2DXjv{PlH#?!{u3$~P$W6j5xoT0(11ApVvp z$+9e>l$c5-86p|%y3`1hZjk6JXgDx^+oLvdVWeo($PQI`mg!jujyI5XgI=3h!^F_= zL`gtVNqwNM{~zi&19U*k_&nc#3I~;44~u0SkR9J-gR3W^P@Yoou|bJnA!NJX#q|cE zBxn#17B(`11a-r--N@5r=(*yGz8nWlzg#}O=q-RKCj7=R7}ZQI+v3( z#k7`@=25oT=W4{{9 zp~bp9w6lf9+AZi4BWyX%*Zfnjs#GU zy~NYkmHjq5n*b~K)u-OJKp{C#7sn8e>&XcY3~uZS2hA8gJaid_BDEV`GBhSJF*x@z V2dhs`EeEP(@O1TaS?83{1OP%2E6)G` diff --git a/pandora_console/images/star.png b/pandora_console/images/star.png index 883e4decc0d4d3ac2e6e2179c2763c6cf67caef1..a84bf8676ddeee1e7a1e0a0f43ce6cf148262026 100644 GIT binary patch delta 236 zcmaFN(#fRQ8Q|y6%O%Cdz`(%k>ERLtq=i6i4mKdU#LrH0qM~{|!)i|#$B>F!NeK(Y ze^k$OWau~_e0Twy!ax2aoIkD@3Kj8A*u{TD;TOYZy=G;-tv)O=Aq=K0EHVvj)&ftJ zCYU!&u@%sEFw`qx=#Xdl=(s>zJi+(`gU4IGpcw4Qz%&(tl4FvUN>$$nZI+6Qp2f`knb>T?y}k iE4)X(Z(OS0z`)F)QSV@p;VcaD0E4HipUXO@geCx2Y)oPR delta 585 zcmV-P0=E5$0^be2Afk&ceOHI8_{2VH?G=>i0DWx5tL4_!*VubvSch-XFaDqQ}5+v!>N|gd=T3fBz8GvG#OO zI}dx^(QAntJnh&b>o9BI9-nbnpPbcOV{2`!ttG4PkBq{OkFJ>!AFuM)+YJ6^{1IRP XG5-R&Z+(uf00000NkvXXu0mjfypRnv diff --git a/pandora_console/images/tick.png b/pandora_console/images/tick.png index a9925a06ab02db30c1e7ead9c701c15bc63145cb..1bb8eb32e3dd8d3a3049845576ac97ecca748877 100644 GIT binary patch delta 265 zcmV+k0rvix1f~KZiBL{Q4GJ0x0000DNk~Le0000I0000D2nGNE0HjVn8Idt3e*nly zL_t(|+G1d!0Mzeu6aZlmn~4HL9Dvk)Af6B6Gm>dY0g&oP5^7{5)hkdJ1fa_?kzj}c zklK&MkPko{$Vj9i0Z^9+ph;Z-;>1R${TG;!6+``wZU`tW)?+bb0T4Ta41otWP_Y7# zIuBL60b~nQF~|T1ERHM$8ZZG_Uw{!BfFQpcpg9>Nu7D*x;I2RhEI5M20E^fKs39M) zX<$T(R!~?Z;4pXs(11dG5yD6yp?!dc#{xnz%ZMZCuZN`%Y~g_o00bBSxotvHB-cNj P00000NkvXXu0mjfM88;g delta 510 zcmVz@+$TtOw>5(BPe*vpWL_t(I%e|A?E<<4yg?r~X?_zG%7*j&3hEyl&=qW`hjT@?` ztyZf;N({%P7;28h6qFzmms-_^XAm!;y8M-B!i5+T7ysSA*53QuYYPAf{_+I>ZlGRk z;#-#Loxd_rtv2$eV?Fv0SV;IP?neg7U;{sR)P>o5H@r7if9STqj-Bh8>RhTHU=Tm8j{pZ@+-cb9aFU(;& zHV(~}EJ0umf5{dlQ-(bTzNj7ETMiu?3Y3nE5@K5(^1DJd8z#F#0 zc%*~rM30HE1@2o5m~}ZyoWhqv>ql{V1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG! zm-;eD1Qsn@kf3|F9qz~|95=&g3(7!XB}JAT>RU;aM9f#ybu*QuWd+nL%^gx&;D@&L7Fj_?K&Z1-_!GJW>h+NB{r;07*qoM6N<$g62Hs A&;S4c diff --git a/pandora_console/images/tick_off.png b/pandora_console/images/tick_off.png index 3557609be707da964e982353bad57754d3ba6caf..56e0a8bb8bb804ff15e8a6dd41248426b2c59424 100644 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^LLfE=8<1S$XD11yBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%o%eKc45_%4l(2vyW_Ot{V+X54jv5yaCqvNl#vSrU(p4@` zU{eU~SDA9cV-cf5{u=fq_7Y1qAs)kqD%QIb_#NJya9N_r>5yeFpuNB|mLbViS9dLQ zPezwyLlgG}o|*hhgf`6B&#=Nw@K~Ztk=Y41#u-cjSDX$XX6O#*x~QAd!uFujBt5?2 z6YB+@N`@ni4$gWDtovEJlh}0DF*GsysA6i`(yyU#^CAd=d#Wzp$PzXvS3{R literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD^Hf1MR^RD?c|&WG=bgI#W6(V{M?Bf zy^c7DxSrREO5w>X5EU`6Pg?q5{*8`fqPZ*w^Chx33LYslkKk-tpz)i17o)KE?-NJP zr0A#!scQU)tJL4~`isS86}) zTW8G4-m~N^^REaYqjV`F({}F6PjYQ%BrPwTUB2I9j>q)umdKI;Vst0N<;Yx&QzG diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index ce1c0496e1..5296b99939 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -1354,7 +1354,7 @@ function html_print_table (&$table, $return = false) { $tableid = empty ($table->id) ? 'table'.$table_count : $table->id; if (!empty($table->width)) { - $output .= 'tablealign; + $output .= '
tablealign; } else { $output .= '
tablealign; diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 890b788f70..281726439e 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -46,7 +46,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) { opacity: 0.5, background: "black" }, - width: 620, + width: 700, height: 500 }) .show (); diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index 94f8f7f4e4..37c11496d6 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -565,7 +565,8 @@ function new_macro(prefix) { function add_macro_field(macro, row_model_id) { var macro_desc = macro['desc']; - var macro_help = macro['help']; + // Change the carriage returns by html returns
in help + var macro_help = macro['help'].replace(/ /g,"
"); var macro_macro = macro['macro']; var macro_value = macro['value']; @@ -597,6 +598,15 @@ function add_macro_field(macro, row_model_id) { var field_desc = $('#'+row_id).children().eq(0).html(); field_desc = field_desc.replace('macro_desc',macro_desc); field_desc = field_desc.replace('macro_help',macro_help); + + // Get the cloned forced title id and replace for a uniq id + regex = /forced_title_(\w+)/; + var forced_title_id = field_desc.match(regex)[1]; + var uniq_id = 'id' + (new Date()).getTime(); + + field_desc = field_desc.replace(forced_title_id, uniq_id); + field_desc = field_desc.replace(forced_title_id, uniq_id); + $('#'+row_id).children().eq(0).html(field_desc); } diff --git a/pandora_console/include/styles/dialog.css b/pandora_console/include/styles/dialog.css index f92c6fef06..63a17d0b67 100644 --- a/pandora_console/include/styles/dialog.css +++ b/pandora_console/include/styles/dialog.css @@ -22,9 +22,8 @@ } .ui-dialog .ui-dialog-titlebar { - background-color: #f3f3f3; - height: 14px !important; - #_height: 16px !important; + background-color: #ECECEC; + height: 24px !important; padding: 0.3em 1em !important; position:relative; margin: 0px auto 0 auto !important; @@ -113,7 +112,7 @@ } .ui-tabs-panel { - background: #F3F3F3 !important; + background: #ECECEC !important; -moz-border-radius: 8px !important; -webkit-border-radius: 8px !important; border-radius: 8px !important; @@ -135,7 +134,7 @@ .ui-state-default { background: #fff !important; - border: 2px solid #f3f3f3 !important; + border: 2px solid #ECECEC !important; -moz-border-top-left-radius: 10px !important; -webkit-top-left-border-radius: 10px !important; border-top-left-radius: 10px !important; @@ -145,7 +144,7 @@ margin-left: 2px !important; } .ui-state-active { - background: #f3f3f3 !important; + background: #ECECEC !important; } .ui-dialog-content { diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css index 668eac3d11..de188dbfed 100644 --- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css +++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css @@ -1179,7 +1179,7 @@ body .ui-tooltip { } .ui-widget-header { - background: #B1B1B1 !important; + background: #B1B1B1; color: #ffffff !important; } diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 1d3fe2eedc..4025e6e4cf 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 4px; + background-position: 4px center; background-repeat: no-repeat; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b4b2b08bb5..fd5a0d8d9a 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -362,7 +362,7 @@ div#login_in, #login_f { padding: 3px; border-radius: 11px; width: 250px !important; - margin: 50px auto; + margin: 100px auto; background: transparent; } div#error_login { @@ -428,12 +428,6 @@ input.login { height: 18px; font-weight: bold; } -/* FF hack for login inputs */ -@-moz-document url-prefix() { - input.login{ - margin: -2px 0 8px 20px !important; - } -} input.login_user { /* Browser without multibackground support */ @@ -2069,7 +2063,7 @@ div#main { div#head { width: auto; height: auto; - background-color: #000; + background-color: #333; background-image: url(../../images/header_blackout.png); height: 47px; min-width: 882px; @@ -2308,39 +2302,43 @@ tr.group_view_data, .group_view_data { } /* classes for event priorities. Sits now in functions.php */ -.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a { +.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a, .datos_green * { background-color: #6EB432; color: #fff; } -.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a{ +.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a, .datos_red *{ background-color: #FF4040; color: #fff !important; } -.datos_yellow, .datos_yellowf9 { +.datos_yellow, .datos_yellowf9, .datos_yellow * { background-color: #F2D400; color: #111; } -a.datos_blue, .datos_bluef9, .datos_blue { +a.datos_blue, .datos_bluef9, .datos_blue, .datos_blue * { background-color: #4CA8E0; color: #111; } -.datos_grey, .datos_greyf9 { +.datos_grey, .datos_greyf9, .datos_grey * { background-color: #999999; + color: #111; } -.datos_pink, .datos_pinkf9 { +.datos_pink, .datos_pinkf9, .datos_pink * { background-color: #F099A2; + color: #111; } -.datos_brown, .datos_brownf9 { +.datos_brown, .datos_brownf9, .datos_brown * { background-color: #A67C52; + color: #fff; } -.datos_orange, .datos_orangef9 { +.datos_orange, .datos_orangef9, .datos_orange * { background-color: #F7931E; + color: #111; } td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9, td.datos_pinkf9, td.datos_brownf9 ,td.datos_orangef9 { @@ -2570,7 +2568,7 @@ input.search_input { color: #999; } -td input, td select { +.vertical_fields td input, .vertical_fields td select { margin-top: 8px !important; } diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 25ff857773..5ddba9c16a 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -205,7 +205,7 @@ $label = base64_decode(get_parameter('label', '')); /////////////////////////// $params = array(); // TOP TEXT - $params['top_text'] = "
" . html_print_image('images/config_mc.png', true) . ' ' . __('Pandora FMS Graph configuration menu') . "
"; + $params['top_text'] = "
" . html_print_image('images/config_mc.png', true, array('width' => '16px')) . ' ' . __('Pandora FMS Graph configuration menu') . "
"; $params['body_text'] = "
"; $params['body_text'] .=__('Please, make your changes and apply with the Reload button'); @@ -235,7 +235,9 @@ $label = base64_decode(get_parameter('label', '')); $table->id = 'stat_win_form_div'; $table->style[0] = 'text-align:left; padding: 7px;'; $table->style[1] = 'text-align:left;'; - $table->size[0] = '50%'; + //$table->size[0] = '50%'; + $table->styleTable = 'border-spacing: 4px;'; + $table->class = 'alternate'; $data = array(); $data[0] = __('Refresh time'); @@ -346,7 +348,7 @@ $label = base64_decode(get_parameter('label', '')); $table->rowclass[] = ''; $data = array(); - $data[0] = '
' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "
"; + $data[0] = '
' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub upd"', true) . "
"; $table->data[] = $data; $table->rowclass[] = ''; diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 1ac8fb2835..b0d8a4b96a 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -181,7 +181,7 @@ $table->id = 'user_form'; $table->width = '98%'; $table->cellspacing = 4; $table->cellpadding = 4; -$table->class = ''; +$table->class = 'vertical_fields'; $table->style[2] = 'width: 175px;'; $data = array(); @@ -212,7 +212,7 @@ $data = array(); $data[0] = __('E-mail'); $data[0] .= '
' . html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"', true); $data[1] = __('Phone number'); -$data[1] .= html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true); +$data[1] .= '
' . html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true); $table->rowclass[] = ''; $table->rowstyle[] = 'font-weight: bold;'; $table->data[] = $data;