From b5366aa9129e3dc9c54748331a7fe5f91c2f83e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mart=C3=ADn=20Marrese?= Date: Mon, 19 May 2003 19:12:59 +0000 Subject: [PATCH] - Cambios funcionales --- marco/php/marco/Menu.php | 2 +- marco/php/marco/MenuVertical.php | 27 +++++++++++------- marco/php/marco/Seccion.php | 17 ++++++----- marco/test/prueba/conf/confSecciones.php | 2 +- marco/test/prueba/www/images/carp1_f2.gif | Bin 179 -> 0 bytes marco/test/prueba/www/images/carp1_f3.gif | Bin 191 -> 0 bytes marco/test/prueba/www/images/carp2_f2.gif | Bin 172 -> 0 bytes marco/test/prueba/www/images/carp2_f3.gif | Bin 182 -> 0 bytes marco/test/prueba/www/images/carpeta0.gif | Bin 164 -> 0 bytes marco/test/prueba/www/images/usuario.gif | Bin 1145 -> 0 bytes marco/test/prueba/www/images/usuario_f2.gif | Bin 1049 -> 0 bytes marco/test/prueba/www/images/usuario_f3.gif | Bin 1499 -> 0 bytes .../prueba/www/images/usuarios-abm_f2.gif | Bin 918 -> 0 bytes .../prueba/www/images/usuarios-filtrar_f2.gif | Bin 892 -> 0 bytes 14 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 marco/test/prueba/www/images/carp1_f2.gif delete mode 100644 marco/test/prueba/www/images/carp1_f3.gif delete mode 100644 marco/test/prueba/www/images/carp2_f2.gif delete mode 100644 marco/test/prueba/www/images/carp2_f3.gif delete mode 100644 marco/test/prueba/www/images/carpeta0.gif delete mode 100644 marco/test/prueba/www/images/usuario.gif delete mode 100644 marco/test/prueba/www/images/usuario_f2.gif delete mode 100644 marco/test/prueba/www/images/usuario_f3.gif delete mode 100644 marco/test/prueba/www/images/usuarios-abm_f2.gif delete mode 100644 marco/test/prueba/www/images/usuarios-filtrar_f2.gif diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php index e8290e1..aaa603a 100644 --- a/marco/php/marco/Menu.php +++ b/marco/php/marco/Menu.php @@ -282,4 +282,4 @@ class Menu { } // -X2C Class :Menu -?> \ No newline at end of file +?> diff --git a/marco/php/marco/MenuVertical.php b/marco/php/marco/MenuVertical.php index 4d28b4f..557fdd8 100644 --- a/marco/php/marco/MenuVertical.php +++ b/marco/php/marco/MenuVertical.php @@ -69,29 +69,32 @@ class MenuVertical extends Menu { */ function addBody($body, $titulo) // ~X2C { - $menu = ''; $c= count($this->_componentes); $tmp = $this->_componentes; $this->_componentes = array (); $this->_armarArraySecciones($tmp); - $menu.=' '.$titulo.'
'; + $TABLA = new HTML_Table('width=160 align="left" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0" height="1"'); $menu =' Submenu'; + $row = array ($menu); + $TABLA->addRow($row,'align="left" bgcolor="#FFFFFF" height="1"'); + $TABLA->updateCellAttributes(0,0,'colspan="2"'); + foreach ($this->_componentesVertical as $comp) { -// $menu.='  
'; - $menu.=$comp.'
'; + $TABLA->addRow($comp,'align="left" bgcolor="#FFFFFF" height="1"'); + $TABLA->updateColAttributes(0,'align="right" width="34"'); + $TABLA->updateColAttributes(1,'align="left"'); } - - $row = array ($menu); - $this->_tabla->addRow($row,'width=160 align="left" bgcolor="#FFFFFF" rowspan="2" valign="top"'); - + $TABLA->updateCellAttributes(0,0,'align="left"'); + $row = array ($TABLA->toHtml()); + $this->_tabla->addRow($row,'width=160 align="left" bgcolor="#FFFFFF" valign="top" rowspan="2"'); + $tit = ''.$titulo.''; $row = array ($tit); - $this->_tabla->setCellContents (0,1,$row); $this->_tabla->setCellAttributes(0,1,'align="left" bgcolor="#336699"'); - - $tmp=''; + + $tmp='
'; foreach ($body as $bod) { if (is_object($bod)) { if (method_exists($bod,'toHtml')) { @@ -108,6 +111,8 @@ class MenuVertical extends Menu { $row = array ($tmp); $this->_tabla->setCellContents (1,1,$row); $this->_tabla->setCellAttributes(1,1,'align="center" bgcolor="#FFFFFF"'); + + $this->_tabla->updateColAttributes (1,'width="600"'); } // -X2C diff --git a/marco/php/marco/Seccion.php b/marco/php/marco/Seccion.php index 815dedf..713cc1d 100644 --- a/marco/php/marco/Seccion.php +++ b/marco/php/marco/Seccion.php @@ -243,24 +243,27 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0. */ function toHtmlVertical($link_sel, $ultimo = false) // ~X2C { - $style = "text-decoration:none;margin:0px;padding:0px;font-size:smaller"; - if ($this->verifSeccionSeleccionada($link_sel)) { + $style = "text-decoration:none"; + $sec = array (); + if ($this->verifSeccionSeleccionada($link_sel)) { if ($ultimo) { - $sec = "  _link."\">".$this->_nombre.""; + $sec[] = ''; } else { - $sec = "  _link."\">".$this->_nombre.""; + $sec[] = ''; } } else { if ($ultimo) { - $sec = "  _link."\">".$this->_nombre.""; + $sec[] = ''; } else { - $sec = "  _link."\">".$this->_nombre.""; + $sec[] = ''; } } - return $sec; + + $sec[] = '  '.$this->_nombre.''; + return $sec; } // -X2C diff --git a/marco/test/prueba/conf/confSecciones.php b/marco/test/prueba/conf/confSecciones.php index 0c34f40..5f19768 100644 --- a/marco/test/prueba/conf/confSecciones.php +++ b/marco/test/prueba/conf/confSecciones.php @@ -79,7 +79,7 @@ 'imagenMouseOn' => '', // 'imagenSelect' => '', // 'link' => '/www/sistemas/prueba/www/perfiles', //LINK DE LA SECCION - 'tipoMenu' => 'oculto', //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto) + 'tipoMenu' => 'vertical', //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto) 'hijos' => array ( //HIJOS PARA EL MENU array ( 'nombre' => 'Perfiles - Hijo', //NOMBRE DEL HIJO 1 'imagenComun' => 'perfiles-nionio', //IMAGEN COMUN diff --git a/marco/test/prueba/www/images/carp1_f2.gif b/marco/test/prueba/www/images/carp1_f2.gif deleted file mode 100644 index 72110acfe630000cf6ab083b6ea8471d49b9f8b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmZ?wbhEHblwuHI*v!E2|NsB*zyH4Y^y}W+?-!na*?ar_rps^k@83W9(39?ck7AZw zXJBCX$H)XEAwcmb3#$kN4}%Vf3o?U&B|+eX=kr}VPAz^Nl(3^@Nr|e*tR$WAy3W8e zUvgBEIS;TI{&6^z`%vj4M^l55g21B^YgZo02?ldr7}8f?m79F+nZU2uxb~yx1SMo% cS8SE~r5k!P^t^fYet+lx4FPqHQi2TD09QRtj{pDw diff --git a/marco/test/prueba/www/images/carp1_f3.gif b/marco/test/prueba/www/images/carp1_f3.gif deleted file mode 100644 index 1bce912a010ae70af226595b1b31dcc30f65911e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmZ?wbhEHblwuHI*v!E2|NsAM4_;rseEGz+$Mg5!U%cyL>*7PT^Y+!(*GD$3F;1Jw zV9dav$N&WY7@2^i;!hS<5e7a69gq;n3)n?N68XZ0S&DLi33yP zwc68zy*92{eD?N62cJ`H!Ww-iQksuv?wTj>`Y2&V6u&pq#3KnD%UT^33^ZiKc(=U& qZrgJFsk72v)mWC0?9je$`jEyLzPr8LR=-&r9V1 diff --git a/marco/test/prueba/www/images/carp2_f2.gif b/marco/test/prueba/www/images/carp2_f2.gif deleted file mode 100644 index e0087637b3f6cb16af34b0ca18a418a5c66f4fd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ?wbhEHblw#mz*v!E2|NsB*zyH4Y^y}W+?-!na*?ar_rps^k@83W9(39?ck7AZw zXJBCX$H)XEAwcmb3#$kN4}%Vf3o?U&B~svo=kr}VPAz^Nl(3^@Nr|e*tR$WAy3W8e zUvgBEIS;TI{&6^z`%vj4M^l55g21B^YgZo02?ldr7}8f?m79F+nZU2uxZ}H&4La&P VQ%$38YlPkmJ#Uh|zn_7@8UQMvN#y_l diff --git a/marco/test/prueba/www/images/carp2_f3.gif b/marco/test/prueba/www/images/carp2_f3.gif deleted file mode 100644 index 717097021e3e01cb0e9e6f95630dfe62723942ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmZ?wbhEHblw#mz*v!E2|NsAM4_;rseEGz+$Mg5!U%cyL>*7PT^Y+!(*GD$3F;1Jw zV9dav$N&WY7@2^i;!hS<5e7a69gq;n3)n?N68XZ0S&DLi33yP zwc68zy*92{eD?N62cJ`H!Ww-iQksuv?wTj>`Y2&V6u&pq#3KnD%UT^33^ZiKc)##| iVC+8m%%#eE7srZguM``XU2k^at+Q`xZEF)`um%7yR!Eir diff --git a/marco/test/prueba/www/images/carpeta0.gif b/marco/test/prueba/www/images/carpeta0.gif deleted file mode 100644 index d17ba3acf3b7520af8029fa04cf76999d8eac94c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmZ?wbhEHb6ky*7PT^Y%qHtuaoU$zaUD zpvV9O{}`D-6p;6mg;fNoRR_cYnZdvkDB$6`a*xD{gF8=Mck6i^5PI2R-P}_dueAEl zWQM2Ms?@wU-r~ztXduzguF$wKf~SMkQ9(gNM&!VCHm#*mf{|yJRhY;L+?bwb7Q9^Y L!;U$Ej11NQi6}iH diff --git a/marco/test/prueba/www/images/usuario.gif b/marco/test/prueba/www/images/usuario.gif deleted file mode 100644 index 37f155dd806ba363b686148ddbb26a5572f80678..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmcJK`!m}I0KmVAZzLntluGAul%$_SG~HuvADVR=i1uZ!oq?|r5YO>8yp;z$z+|Kol>b( zEEboRmI?#{7>0Q~9*4tWv)Q4cp?-dTE-o(i_Vz>~(Zs|Ai^T!}@D71|@Bahn5Ja5@ ztN`+d_=hJz_t-T%?h@HFUs?C}9Fv02-e5gqItb@l5=UPr7X>yYF=VOFH#+E}1tFDM zs>8^&dCi+|Ge%Bk{RPLRu{WrQC?bAT@jp6TqmXl z{#2495aj0}kx_P%Jx zWhClV`ydv*lQBLEnZLzC6p(yMR9Z#AUA-*CYY->!z;#V zu82yWie!W0U4eQ8e0utmm$K zI%N?dA&?u$C}YO995ofLb!+Rp0w~a*)qkr{raC-I*0(A{{!7~?YjT~ diff --git a/marco/test/prueba/www/images/usuario_f2.gif b/marco/test/prueba/www/images/usuario_f2.gif deleted file mode 100644 index 9448f6c3964a2293b23216a27ced5d1f82d2d293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1049 zcmV+!1m^okNk%w1VT%AZ0K@|-rnBU*4E6-%*DmUy}iA)wY9FU zuB4=-nVFf4jEsbYgnfN|a&mHJW@cGgSxih!KtMn~K%)g`99mEYg6$gL28_wSvZ|bUH&SGa06KiKKeJQ;K+;8Jo}N9eB;I?I?nHJR_jX z@A!JR&F_;6aB*T~WoTz}2S9#{Y(Rkm6aX2L0F{=P02CPmS&3?lpi)VXk&}~{n1h|3 zP@%3wN)!XLrIe_bk(y1Pue~-)va|si4X3vO0dSeCiN4M?z_SAs0mTismB{t?S_Bdpz*0d02TvMcmOuf^ zUJ4Yz{3xJ-(W6L{BHhU(=+9R{hswM|&t?FePl6m^=JaW(s2-<^fkZ7*HhdHSQMl67 zr&my5ff3C^59h&82M};|`*zU+pe6LggV$Fco{CTIJyAp#9n z=k3{h3GCo~jCKTA90ro)Vi1f`u%HtHqtN>-Xh55KkijmH1ZluJDEID4#xD-fM|vzZ z+Xy37**fTg|5<$J0DXNV-~a;*r6ofDOeeLX1b@u^*I5P#FyKG}1V+~Yf(jatpMD^2 zn1O}KWfz zfsvU?fWQP5&r`BSy(y|oj>#d@;=1cAcpGIteN(elF zfvW{4s%HZJiZHO#XUwi?_9j`nB1lEq4!OITcYq7%`XJA3h T2sDZTtu-gD^wLbH5CQ-@aSzPt diff --git a/marco/test/prueba/www/images/usuario_f3.gif b/marco/test/prueba/www/images/usuario_f3.gif deleted file mode 100644 index 7dbabbe3c5fe69d7f6101371571a19fda493af01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1499 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 S67