Nuevo menu vertical para marco (redisenio de Vero)

diff --git a/lib/MECON/Marco/Menu.php b/lib/MECON/Marco/Menu.php
index 60f5bec24c742a092cde4d014d95429625fc5b11..05c3c8787d849ec092d94108550f2bf77e306e8a 100644 (file)
--- a/lib/MECON/Marco/Menu.php
+++ b/lib/MECON/Marco/Menu.php
@@ -102,10 +102,10 @@ class MECON_Marco_Menu {
     {
         $this->_tabla = new HTML_Table('width=760 
                                         align="center" 
     {
         $this->_tabla = new HTML_Table('width=760 
                                         align="center" 

-                                        bgcolor="#FFFFFF" 

                                         cellspacing="0" 
                                         cellpadding="0" 
                                         cellspacing="0" 
                                         cellpadding="0" 

-                                        border="0"');
+                                        border="0"
+                                        background="/MECON/images/general_fondo_gris"');

         $this->_tabla->setLineEnd('');
         $this->_tabla->setTab('');
         
         $this->_tabla->setLineEnd('');
         $this->_tabla->setTab('');
         

diff --git a/lib/MECON/Marco/MenuVertical.php b/lib/MECON/Marco/MenuVertical.php
index c415511bad4c36356525a7a2c023d5895aea102d..bfd5e21082311460cff21be915b94252b45906b0 100644 (file)
--- a/lib/MECON/Marco/MenuVertical.php
+++ b/lib/MECON/Marco/MenuVertical.php
@@ -57,27 +57,35 @@ class MECON_Marco_MenuVertical extends MECON_Marco_Menu {
         $this->_componentes = array ();
         $this->_armarArraySecciones($tmp);
         
         $this->_componentes = array ();
         $this->_armarArraySecciones($tmp);
         

-        $TABLA = new HTML_Table('width=160 align="left" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0" height="1"');             
+        $TABLA = new HTML_Table('width=152 align="left" cellspacing="0"
+                                 cellpadding="0" border="0" height="1"
+                                 background="/MECON/images/general_titulo_menu.gif"');

         
         

-        $menutmp ='<img src="/MECON/images/general_carpeta0" border="0">&nbsp;<font face="Arial, Helvetica, sans-serif" size="2" color="#000000"><b>'.$titulo.'</b></font>';
+        $menutmp ='<font face="Arial, Helvetica, sans-serif" size="3"
+            color="#000000"><p>&nbsp;'.$titulo.'</p></font>';

         $row = array ($menutmp);
         $row = array ($menutmp);

-        $TABLA->addRow($row,'align="left" bgcolor="#FFFFFF" height="1"');        
+        $TABLA->addRow($row,'align="left"');        

         $TABLA->updateCellAttributes(0,0,'colspan="2"');
         $TABLA->updateCellAttributes(0,0,'colspan="2"');

+        
+        $SEP = array('<IMG height="3" src="/MECON/images/general_linea_relieve.gif" width=36>',
+                     '<IMG height="3" src="/MECON/images/general_linea_relieve.gif" width=118>'
+                    );
+        $TABLA->addRow($SEP);

        
         foreach ($this->_componentesVertical as $comp) {
        
         foreach ($this->_componentesVertical as $comp) {

-            $row = array ('<img src="/MECON/images/general_carp" border="0">',' ');
-            $TABLA->addRow($row);        
-            $TABLA->addRow($comp,'align="left" bgcolor="#FFFFFF" height="1"');
-            $TABLA->updateColAttributes(0,'align="right" width="34"');
-            $TABLA->updateColAttributes(1,'align="left"');
+            $TABLA->addRow($comp,'align="left"  height="3"
+                    background="/MECON/images/general_fondo_gris"');
+            $TABLA->updateColAttributes(0,'align="right" width="34" height="3"');
+            $TABLA->updateColAttributes(1,'align="left"  width="118"');
+            $TABLA->addRow($SEP);

         }
         $TABLA->updateCellAttributes(0,0,'align="left"');
         $row = array ($TABLA->toHtml());
         
         }
         $TABLA->updateCellAttributes(0,0,'align="left"');
         $row = array ($TABLA->toHtml());
         

-        $this->_tabla->addRow($row,'width=160 align="left" bgcolor="#FFFFFF" valign="top"');
+        $this->_tabla->addRow($row,'width=152 align="left" bgcolor="#FFFFFF" valign="top"');

         
 //AGREGO EL CUERPO
         
 //AGREGO EL CUERPO

-        $TABLA2 = new HTML_Table('align="center" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0"');
+        $TABLA2 = new HTML_Table('width="600"align="right" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0"');

         $row = array();
         $tmp = '';
         //AGREGO EL MENU VERTICAL
         $row = array();
         $tmp = '';
         //AGREGO EL MENU VERTICAL


@@ -124,10 +132,11 @@ class MECON_Marco_MenuVertical extends MECON_Marco_Menu {
         $row[] = $tmp;
         $TABLA2->addRow($row, 'valign="top"');
         $row = array ($TABLA2->toHtml());
         $row[] = $tmp;
         $TABLA2->addRow($row, 'valign="top"');
         $row = array ($TABLA2->toHtml());

-        $this->_tabla->setCellContents  (0,1,$row);
-        $this->_tabla->setCellAttributes(0,1,'align="center" bgcolor="#FFFFFF" valign="top"');
+        $this->_tabla->setCellContents  (0,2,$row);
+        $this->_tabla->setCellAttributes(0,2,'align="center" bgcolor="#FFFFFF" valign="top"');

 
 

-        $this->_tabla->updateColAttributes (1,'width="600"');
+        $this->_tabla->updateColAttributes (1,'width="8" bgcolor="#FFFFFF"');
+        $this->_tabla->updateColAttributes (2,'width="600"');

 //
     }
     // -X2C
 //
     }
     // -X2C

diff --git a/lib/MECON/Marco/Seccion.php b/lib/MECON/Marco/Seccion.php
index 009263ed4413a22c230909bbaa3905185f96433b..8a2433c3d2659770f344a3281a23181e54e9b880 100644 (file)
--- a/lib/MECON/Marco/Seccion.php
+++ b/lib/MECON/Marco/Seccion.php
@@ -255,25 +255,15 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0.
         
         $sec = array ();
         if ($this->verifSeccionSeleccionada($link_sel)) {
         
         $sec = array ();
         if ($this->verifSeccionSeleccionada($link_sel)) {

-            if ($ultimo) {
-                $sec[] = $link_start.'<img src="/MECON/images/general_carp2_f3" border="0">'.$link_end;
-            }
-            else {
-                $sec[] = $link_start.'<img src="/MECON/images/general_carp1_f3" border="0">'.$link_end;
-            }
+            $sec[] = $link_start.'<img src="/MECON/images/general_carpeta_f3" border="0">'.$link_end;

         }
         else {
         }
         else {

-            if ($ultimo) {
-                $sec[] = $link_start.'<img src="/MECON/images/general_carp2_f2" border="0">'.$link_end;
-            }
-            else {
-                $sec[] = $link_start.'<img src="/MECON/images/general_carp1_f2" border="0">'.$link_end;
-            }
+            $sec[] = $link_start.'<img src="/MECON/images/general_carpeta" border="0">'.$link_end;

         }
         
         $nombre = strstr($this->_nombre, '-');
         $nombre = substr($nombre, 1);
         }
         
         $nombre = strstr($this->_nombre, '-');
         $nombre = substr($nombre, 1);

-        $sec[] = '<font face="Arial, Helvetica, sans-serif" size="1" color=""><b>'.$link_start.'&nbsp;&nbsp;'.$nombre.$link_end.'</b></font>';
+        $sec[] = '<font face="Arial, Helvetica, sans-serif" size="1"><p>&nbsp;&nbsp;'.$nombre.'</p></font>';

         return $sec;
     }
     // -X2C
         return $sec;
     }
     // -X2C

diff --git a/test/Marco/prueba/www/usuarios-filtrar.php b/test/Marco/prueba/www/usuarios-filtrar.php
index 7d6012f39f305254714034ab6add9c160128abc9..e884081561d454fdfbc59df15ecab87f628117b2 100644 (file)
--- a/test/Marco/prueba/www/usuarios-filtrar.php
+++ b/test/Marco/prueba/www/usuarios-filtrar.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-    $MARCO->habilitarLinks(false);
+//    $MARCO->habilitarLinks(false);

     $MARCO->addTitle('USUARIOS - FILTRAR');
     $MARCO->addBody('<BR>ESTO ES UNA PRUEBA PARA LOS HIJOS DE LAS SECCIONES<BR><B>USUARIO - FILTRAR</B><BR>');
     $MARCO->addBody('<BR><B><a href="sarasa1">sarasa1</a></B><BR>');
     $MARCO->addTitle('USUARIOS - FILTRAR');
     $MARCO->addBody('<BR>ESTO ES UNA PRUEBA PARA LOS HIJOS DE LAS SECCIONES<BR><B>USUARIO - FILTRAR</B><BR>');
     $MARCO->addBody('<BR><B><a href="sarasa1">sarasa1</a></B><BR>');