From f5bb9e4a3922979bb0ba82236d530e1f622271f8 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 26 Nov 2014 16:03:40 +0100 Subject: [PATCH] The last work for the new elements into the visualmap. Ticket #1478 --- .../visual_console_builder.elements.php | 38 +++++++++++++++--- pandora_console/images/box_item.disabled.png | Bin 282 -> 1253 bytes pandora_console/images/box_item.png | Bin 284 -> 1255 bytes pandora_console/images/line_item.disabled.png | Bin 343 -> 1411 bytes pandora_console/images/line_item.png | Bin 331 -> 1479 bytes 5 files changed, 32 insertions(+), 6 deletions(-) mode change 100755 => 100644 pandora_console/images/box_item.disabled.png mode change 100755 => 100644 pandora_console/images/box_item.png mode change 100755 => 100644 pandora_console/images/line_item.disabled.png mode change 100755 => 100644 pandora_console/images/line_item.png diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 78ca646a47..822432dbc9 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -147,6 +147,11 @@ foreach ($layoutDatas as $layoutData) { $table->data[$i + 1]['icon'] = html_print_image('images/box_item.png', true, array('title' => __('Box'))); break; + case LINE_ITEM: + $table->data[$i + 1]['icon'] = + html_print_image('images/line_item.png', true, + array('title' => __('Line'))); + break; default: if (enterprise_installed()) { $table->data[$i + 1]['icon'] = @@ -166,6 +171,7 @@ foreach ($layoutDatas as $layoutData) { switch ($layoutData['type']) { case ICON: case BOX_ITEM: + case LINE_ITEM: // hasn't the label. $table->data[$i + 1][0] = ''; break; @@ -196,18 +202,35 @@ foreach ($layoutDatas as $layoutData) { //Width and height - $table->data[$i + 1][2] = html_print_input_text('width_' . $idLayoutData, $layoutData['width'], '', 2, 5, true) . - 'x' . - html_print_input_text('height_' . $idLayoutData, $layoutData['height'], '', 2, 5, true); + switch ($layoutData['type']) { + case LINE_ITEM: + // hasn't the width and height. + $table->data[$i + 1][2] = ''; + break; + default: + $table->data[$i + 1][2] = html_print_input_text('width_' . $idLayoutData, $layoutData['width'], '', 2, 5, true) . + 'x' . + html_print_input_text('height_' . $idLayoutData, $layoutData['height'], '', 2, 5, true); + break; + } //Position - $table->data[$i + 1][3] = '(' . html_print_input_text('left_' . $idLayoutData, $layoutData['pos_x'], '', 2, 5, true) . - ',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 2, 5, true) . - ')'; + switch ($layoutData['type']) { + case LINE_ITEM: + // hasn't the width and height. + $table->data[$i + 1][3] = ''; + break; + default: + $table->data[$i + 1][3] = '(' . html_print_input_text('left_' . $idLayoutData, $layoutData['pos_x'], '', 2, 5, true) . + ',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 2, 5, true) . + ')'; + break; + } //Parent switch ($layoutData['type']) { case BOX_ITEM: + case LINE_ITEM: $table->data[$i + 1][4] = ""; break; default: @@ -238,6 +261,7 @@ foreach ($layoutDatas as $layoutData) { case BOX_ITEM: case ICON: case LABEL: + case LINE_ITEM: $table->data[$i + 2][0] = ''; break; default: @@ -288,6 +312,7 @@ foreach ($layoutDatas as $layoutData) { case ICON: case LABEL: case BOX_ITEM: + case LINE_ITEM: $table->data[$i + 2][1] = ''; break; default: @@ -349,6 +374,7 @@ foreach ($layoutDatas as $layoutData) { //Map linked switch ($layoutData['type']) { + case LINE_ITEM: case BOX_ITEM: $table->data[$i + 2][4] = ""; break; diff --git a/pandora_console/images/box_item.disabled.png b/pandora_console/images/box_item.disabled.png old mode 100755 new mode 100644 index 4701027fe3cd973882c1dd5f9da7ccd038e7178b..85271da99ef88cfe7b1b7637dfb3dff1852b58fc GIT binary patch literal 1253 zcmaJ>ZD<>19KSTP_Qk9jLhMS}9*uL${b>H)_1r4HZ>xMMc-=zytm{3tX)366+z488lo6%>d< z3_ToV306(QvUq4xgF}zlu5hU1pP%D}y3{yEK zy%o!{VrbbgR0_u{l?qnzV~RF{laWXSCw#ci=d}=CeL^-k(<|#;H3bIhye6uKsK~%p zk#H!PNF~Fmcrug@F{v7tQTTBQ%0`VVJm7}wa_wc1 zR4XzAHSs7E(wZWH&7vu>elCH!dRttfelEefT--_qw@3T0QP*77{@BOu#kGv>)rYdR z@0zvPM}9lK*ScGWGfX^hep6cC*cfoO&>rN{nf4n<>vC@uDXkLDC+Vjf-E`5JeWTyy zi7(E*J+@=l;^N}TwPUA+*iyEAFQ}^2@$Wx7$M(`E4y2d=63lDO(ProEJC6Cw z4X1K+_QUe8jfHvQ`hLd~H)qd&HMjcb?NfKJJ${{jz4Q9gQs;#0xq2-<~jv*e$-%i`e$)YIWy8n3FwG{7UO|vB7sD{!G3CS58 z#Run|-gr=L_36SN&J!!o{BK^Ikap%8H~))zh5Fk+9kOe!Rg!yl>~V0Zad$Z~y=-dG zvm2pajy-}~!&(H|L`u&wGE51wcJb<*A{3Q<*!sl=-ws>lG`Dk-*KSo_e!5paYDaV_ z%l+H460b7;T;_N3$sIXC-mO`-6SzNpu>1LD%0hvSc0%^-mCPxzmG{rTtuO+*nZeW5 K&t;ucLK6TrIBB~8 diff --git a/pandora_console/images/box_item.png b/pandora_console/images/box_item.png old mode 100755 new mode 100644 index b3bdbefe9b49810e7c252e56b42311309014796c..50b9615f8adc23085d5c74d59c728cc586429dc6 GIT binary patch literal 1255 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%#=yY1`Q6s9AWn&EL`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6H#24v4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&vzGto0N zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX) z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal z@=Hr>m4GgVcp+top^2{qPNz6-5^>ndS0-B+hnVDi`VPI)#U}R`uW@%|*Xy|HU>1Jl(XyE2( zX=Z3@;biOx)9aF-T$-DjR|3NYTMMS8k8hE&{2`t$$4Ju{bs7{kVy5*HY_cWE^+Bpoqe)^-SF6L1h<4zp?L zP`G#^%&h4oN2QyHo!wjp#+J*PIz8I*f7_)Q8NWHaX*hn+U^8duL0gWgM>jApU(LYO zabiO90U>9F)nPU{2UZKH@bgNDt(c%JV6Twyk5PhIjDLYckixZ61K+PKPU2|=wl^6W z1sqhela#Kq6|8U!=2KEUbcsRgfBg;_<*Y|X!w6f8)uEc9{$;5|xqD=X`0O#5S?n&S@W`?xxot zPrP?O-~ZrCR}QC81j7;TjUuAl6S~=TKD9dNFdX^lFsH$EhlHf$N;w~c%`+ulFhp!v zVt!?Vn&^UKvdVXBjP^Wcnb@NIL|);f_JYu~7oXT7CK;Tw@N5uU!)bBk`{N1kk1L*Y cn4ZMSaDnmCwWZN&nxLY`)78&qol`;+03v9gTmS$7 delta 265 zcmV+k0rvjq37i6u9De}B>4jqe000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U z69E94oEQKA00(qQO+^RZ3l$4G9LWkSlmGw#sYygZR7l6|mOBo@Fc3uFkTewBfxA$` zQMg_zL@tm+q(ew_p`bu`DTpJ2J7Px&c}iQ_r=1;tWM-t+f`1wGKaet5k){vHOrw&) zJ{VKNAfb=CBfDJJrm@R)Eu0Q;J7dj0Z0!p@j#~hVP4$9kwZ@7i+^^9)@UT)+KPy9* z2B^}d%hkK6nf6u P0000eM}p57{0bE?LZieC?Ae-xw5fD=-u^`Ug+re+PPxWHjV{{y|xD}aJ_oHj=}<# zO<)Z(DJGgBphbxp84?FG0YBL?5^#&iOg5v55i*S$gU&#vn+aZlGXG#+a=G98=6#;` zc|YzKvsE9-OfO6a03g$1HrUy3LGl%*0RU%m<-@h4!5C{82UX9s;4}efy_A~(EhOGR z*a_U*`qDg62>`qjzq5v^u^z)b6e-4&G2#drWYGXnSrrN5o+g3;-9&>wpoV_`_;U#K zd)3f!xfQVn^@PuFZleiDTeZ{E*5pxnp{m1RWdvghNP@w^2-zG6VG%X7!Hcoyq#K67 zjS!|u4Q-05vD!dAMH8T0jFfv21qv!;VpN8xWU4Yyf}jYDN?=4;jv|;`i6JPs^+0Sk z+FOs=4W_MJtfhv03=_m)xTU2<+#(fIbOVg4R4N#ez!FJ08&Mu=4KR45JP;D47z{+n zL;Hh_p9+9UM%+z>88yTz-7J9&Zqo)rTWw++21oE9jEa$DNvS}q_5VXjayvT2*ojAa zcO(uuTZ05_Cqh)1_OOGi7bQ~#F+EM-3`ILBsyWp~n~!3skdF$2dWT$$f>zw)4l>0`0UWgvrWW&=U{PZ3@dO_AV6(U^Y+Ehd@KC}*dyFjN?K*0PE9?x1B0 z%hvH2EX<05lcW95s8cR>f0D=T#bu4{)h7b%zSHbtn~f04{#$DngVq`O*8R`=dKFLN z;^s7bIoP@|Hz&;L9Ia@7uzEUsAm?O;1{fA1oV7yW-pf-RiO<&azW})BIQ={aCs%N3 z*EDA?Pc!lJ*;p(F)(ruiSC$k{Jd9$6@!1RU^Q!1rCqMRS@kL;z_Jb^k!x6u~Pdm26#73*_qe*bB*)q!YBZp$jzO9-ZjbjwSza-*!Nn2d9h

g_m@SAugDGYzlPq_8XZ<#n6V_xF#ucGfn679DDAu?evJMqh&+Ky{!nnnJN z<0BV(mveoeJgs@Q&UU3eS~w1j+!oE=E4*=(1X6&#Ty57Zy>nk zIYFYkMAy#jcfN{`z(?)rho+)a#lA)EMWWj_+5s((71tJ;c8gs<@w-j~Pu}`E&6T$2 zdO@izZ}$vTG`(u-eTH+lLVu@6S)I7|C+BVH@av^z`3w5Vk9gvC!;f{oy(>qS7X;J$ i8~Z_f_^??bdY`>YE6z!VzC)wQYtdq?HjL|BXZ{7k2;v6- delta 324 zcmV-K0lWT#3)cdW9De}B>4jqe000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U z69E94oEQKA00(qQO+^RZ3l$77JCmSi@Bjb+5AP`0W02i{6&V$*Q ziHEYM^H4BbXa)V9NfQa65 ztHOIiSK zk<;0>EkX!u7Cr6KT2r&C*eAaLo^uNSACR`v4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&vzGto0N zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX) z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal z@=Hr>m4GgVcp+top^2{qPNz6-5^>ndS0-B+hnVDkcVqtFV;^b;-=4@bYXy|I<8Iua(|ZvxVTlbLf2IMkUNs*a-B)QA%jU- z+^rna&t#AxwjipLC14Kwrplv-nckR91bVU~#n&f=)zpgNCvykyhE=YobQJvGx%)49 zAvIy{7lt``4L92@>|IW1Go5r%u=BT=^5(7M!@K;#JktfzBYr+o-F3?;LB+3O3PU@e zZ^JVVca1a+z7>fU3!evaJe6-)bx_tTVZQ^@BO5*c#Y`TBjGL}DEUH*gdx?R=;L|3( zosn}TPB$cOl<(m7Fcm+l{vb$x5({g?4<-XQI|tryhM?CIlhO{Z3SBMSdDiBJP9cNQ zcjs2S24PWyUk6*YLS!-+l{GD=aC%o+F&yc+P@}|fPWyn+?~Pq+8FvOYC30>kGGcgC zx4@Nq!8FOHBmLg5z6qDu2FQEZ|GSc!&(HOpA&0F&Yq^S|hi|j0^WtXS13Ypa)_w|l zLJVnd_+KnFxAAMLvU6w_l1qQ_>%(!*B_%%_uFsut>axHoYkpl9nSz(fTHl=}7uXBc p+uisoaGGV|(Oc~YCrf6sGI)fy%$|EdE*Vs`db;|#taD0e0suOX1wjA+ delta 312 zcmV-80muHw3(EqK9De}B>4jqe000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U z69E94oEQKA00(qQO+^RZ3l$779@wO_w*UYD*hxe|R7l6|RzVVjAPn41^0OZM-X8lO z|6qk4MC%CR#5$HkGm{HSHk%Cr!f7!^?-mFyunZ&u)l^Bg$$!L3iyZ(>A1Bw8k&JZq zgxd!}*8!@4*~e7@kYg%erNj8@d#(kih+{Vc@cxT%{rrk`@!AB1jB@ zhczIxpmNrHYB6sL|3TWkPjGT~S@tj>vrEVQ*!V@c7{AQA8R6euoh;o2z0C0d0000< KMNUMnLSTXl&4IrF