- Cambios funcionales

diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php
index e8290e1f4a09f22df9b4e991287df57edef1122d..aaa603ae6ffff9ea12b1345f88d41eaaa9a7e494 100644 (file)
--- 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 4d28b4f209a01265f07c7ad30ff9611b0d4a067e..557fdd80566a9e4729998b870aad1d5e8163f826 100644 (file)
--- 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.='<img src="/www/images/carpeta0" border="0">&nbsp;<font face="Arial, Helvetica, sans-serif" size="3" color="#000000"><b>'.$titulo.'</b></font><BR>';
+        $TABLA = new HTML_Table('width=160 align="left" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0" height="1"');             $menu ='<img src="/www/images/carpeta0" border="0">&nbsp;<font face="Arial, Helvetica, sans-serif" size="2" color="#000000"><b>Submenu</b></font>';
+        $row = array ($menu);
+        $TABLA->addRow($row,'align="left" bgcolor="#FFFFFF" height="1"');        
+        $TABLA->updateCellAttributes(0,0,'colspan="2"');
+       
         foreach ($this->_componentesVertical as $comp) {
-//            $menu.='&nbsp;&nbsp;<img src="/www/images/carp.gif" border="0"><BR>';
-            $menu.=$comp.'<br>';
+            $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 = '<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$titulo.'</b></font>';
         $row = array ($tit);
-
         $this->_tabla->setCellContents  (0,1,$row);
         $this->_tabla->setCellAttributes(0,1,'align="left" bgcolor="#336699"');
-                        
-        $tmp='';
+       
+        $tmp='<BR>';
         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 815dedf8c426a87af021654ab3bd35966f857024..713cc1d0eb88fdb53ddf38cbce6352265f38721f 100644 (file)
--- 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 = "&nbsp;&nbsp;<a style=\"".$style."\" href=\"".$this->_link."\"><img style=\"".$style."\" src=\"/www/images/carp2_f3\" border=\"0\">".$this->_nombre."</a>";
+                $sec[] = '<a href="'.$this->_link.'"><img src="/www/images/carp2_f3" border="0"></a>';
             }
             else {
-                $sec = "&nbsp;&nbsp;<a style=\"".$style."\" href=\"".$this->_link."\"><img style=\"".$style."\" src=\"/www/images/carp1_f3\" border=\"0\">".$this->_nombre."</a>";
+                $sec[] = '<a href="'.$this->_link.'"><img src="/www/images/carp1_f3" border="0"></a>';
             }
         }
         else {
             if ($ultimo) {
-                $sec = "&nbsp;&nbsp;<a style=\"".$style."\" href=\"".$this->_link."\"><img style=\"".$style."\" src=\"/www/images/carp2_f2\" border=\"0\">".$this->_nombre."</a>";
+                $sec[] = '<a href="'.$this->_link.'"><img src="/www/images/carp2_f2" border="0"></a>';
             }
             else {
-                $sec = "&nbsp;&nbsp;<a style=\"".$style."\" href=\"".$this->_link."\"><img style=\"".$style."\" src=\"/www/images/carp1_f2\" border=\"0\">".$this->_nombre."</a>";
+                $sec[] = '<a href="'.$this->_link.'"><img src="/www/images/carp1_f2" border="0"></a>';
             }
         }
-        return $sec;    
+        
+        $sec[] = '<font face="Arial, Helvetica, sans-serif" size="1" color=""><b><a href="'.$this->_link.'" style="'.$style.'">&nbsp;&nbsp;'.$this->_nombre.'</a></b></font>';
+        return $sec;
     }
     // -X2C
 

diff --git a/marco/test/prueba/conf/confSecciones.php b/marco/test/prueba/conf/confSecciones.php
index 0c34f4084ca6161c379f8ab6541442545c321669..5f1976857908b3efa56a6aeabc88ea9ca2f5af1c 100644 (file)
--- 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 (file)
index 72110ac..0000000
Binary files a/marco/test/prueba/www/images/carp1_f2.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/carp1_f3.gif b/marco/test/prueba/www/images/carp1_f3.gif
deleted file mode 100644 (file)
index 1bce912..0000000
Binary files a/marco/test/prueba/www/images/carp1_f3.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/carp2_f2.gif b/marco/test/prueba/www/images/carp2_f2.gif
deleted file mode 100644 (file)
index e008763..0000000
Binary files a/marco/test/prueba/www/images/carp2_f2.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/carp2_f3.gif b/marco/test/prueba/www/images/carp2_f3.gif
deleted file mode 100644 (file)
index 7170970..0000000
Binary files a/marco/test/prueba/www/images/carp2_f3.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/carpeta0.gif b/marco/test/prueba/www/images/carpeta0.gif
deleted file mode 100644 (file)
index d17ba3a..0000000
Binary files a/marco/test/prueba/www/images/carpeta0.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/usuario.gif b/marco/test/prueba/www/images/usuario.gif
deleted file mode 100644 (file)
index 37f155d..0000000
Binary files a/marco/test/prueba/www/images/usuario.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/usuario_f2.gif b/marco/test/prueba/www/images/usuario_f2.gif
deleted file mode 100644 (file)
index 9448f6c..0000000
Binary files a/marco/test/prueba/www/images/usuario_f2.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/usuario_f3.gif b/marco/test/prueba/www/images/usuario_f3.gif
deleted file mode 100644 (file)
index 7dbabbe..0000000
Binary files a/marco/test/prueba/www/images/usuario_f3.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/usuarios-abm_f2.gif b/marco/test/prueba/www/images/usuarios-abm_f2.gif
deleted file mode 100644 (file)
index 59ea44d..0000000
Binary files a/marco/test/prueba/www/images/usuarios-abm_f2.gif and /dev/null differ

diff --git a/marco/test/prueba/www/images/usuarios-filtrar_f2.gif b/marco/test/prueba/www/images/usuarios-filtrar_f2.gif
deleted file mode 100644 (file)
index 8d3780f..0000000
Binary files a/marco/test/prueba/www/images/usuarios-filtrar_f2.gif and /dev/null differ