Se corrigen definitivamente los bullets.

[mecon/meconlib.git] / lib / MECON / Marco / MenuPrincipal.php

diff --git a/lib/MECON/Marco/MenuPrincipal.php b/lib/MECON/Marco/MenuPrincipal.php
index eedc3c3ace1e4d27439453014a834d6b9a78dae4..146757f5f5eb8db8f8150a3d56fc9445f168f5a8 100644 (file)
--- a/lib/MECON/Marco/MenuPrincipal.php
+++ b/lib/MECON/Marco/MenuPrincipal.php
@@ -1,30 +1,29 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Created: Thu May 15 18:36:01 2003
-// | Author:  Martin Marrese <mmarre@mecon.gov.ar>
-// +----------------------------------------------------------------------+
-//
-// $Id$
-// $Author$
-// $URL$
-// $Date$
-// $Rev$
-//
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 textwidth=80:
+-------------------------------------------------------------------------------
+                             Ministerio de Economía
+                                    meconlib
+-------------------------------------------------------------------------------
+This file is part of meconlib.
+
+meconlib is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+meconlib is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License; if not,
+write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA  02111-1307  USA
+-------------------------------------------------------------------------------
+Creado: Thu May 15 18:36:01 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/

 
 

-#require_once 'PEAR.php';

 require_once 'HTML/Table.php';
 
 // +X2C includes
 require_once 'HTML/Table.php';
 
 // +X2C includes


@@ -113,14 +112,6 @@ class MenuPrincipal extends MenuHorizontal {
             $row = array ('<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$this->_seccionSeleccionada->_nombre.'</b></font>');
             $this->_tabla->addRow($row,'align="left" bgcolor="#336699" colspan="'.$colspan.'"');
  
             $row = array ('<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$this->_seccionSeleccionada->_nombre.'</b></font>');
             $this->_tabla->addRow($row,'align="left" bgcolor="#336699" colspan="'.$colspan.'"');
  

-            if ($body['menuVertical']) {
-                $cols = 2;
-            }
-            else {
-                $cols = 1;
-            }
-
-            $tabla = new HTML_Table (array('width' => '100%', 'border' => 0, 'celspacing' => 0, 'celpadding' => 0));

             //Agrego si corresponde el espacio al inicio
             if ($body['espacios']) {
                 $espacio = '&nbsp;<BR>';
             //Agrego si corresponde el espacio al inicio
             if ($body['espacios']) {
                 $espacio = '&nbsp;<BR>';


@@ -129,18 +120,18 @@ class MenuPrincipal extends MenuHorizontal {
                 $espacio = '';
             }
             // 
                 $espacio = '';
             }
             // 

+
+//SI HAY MENU ARMO UNA TABLA, SINO TIRO DIRECTAMENTE            

             $row = array();
             $tmp = '';
             if ($body['menuVertical']) {
                 if (is_object($body['menuVertical'])) {
                     if (method_exists($body['menuVertical'],'toHtml')) {
                         $tmp.=$body['menuVertical']->toHtml();
             $row = array();
             $tmp = '';
             if ($body['menuVertical']) {
                 if (is_object($body['menuVertical'])) {
                     if (method_exists($body['menuVertical'],'toHtml')) {
                         $tmp.=$body['menuVertical']->toHtml();

-                    }
-                    else {
+                    } else {

                         trigger_error('El metodo no existe!', E_USER_WARNING);
                     }                
                         trigger_error('El metodo no existe!', E_USER_WARNING);
                     }                

-                }
-                else {
+                } else {

                     $tmp.=$body['menuVertical'];
                 }
                 $row[] = $tmp;
                     $tmp.=$body['menuVertical'];
                 }
                 $row[] = $tmp;


@@ -153,24 +144,29 @@ class MenuPrincipal extends MenuHorizontal {
                     if (is_object($bod)) {
                         if (method_exists($bod,'toHtml')) {
                             $tmp.=$bod->toHtml();
                     if (is_object($bod)) {
                         if (method_exists($bod,'toHtml')) {
                             $tmp.=$bod->toHtml();

-                        }
-                        else {
+                        } else {

                         trigger_error('El metodo no existe! - '.get_class($bod).'::toHtml()', E_USER_WARNING);
                         }
                         trigger_error('El metodo no existe! - '.get_class($bod).'::toHtml()', E_USER_WARNING);
                         }

-                    }
-                    else {
+                    } else {

                         $tmp.=$bod;
                     }
                 }
                 $tmp.= $espacio;
                 $row[] = $tmp;
                         $tmp.=$bod;
                     }
                 }
                 $tmp.= $espacio;
                 $row[] = $tmp;

-            }
-            else {
+            } else {

                 $row[] = $body['body'];
             }
                 $row[] = $body['body'];
             }

-            $tt = $tabla->addRow($row,'align="center" bgcolor="#FFFFFF" colspan="');
-            $tabla->updateCellAttributes($tt, 0, 'valign="top" width="1%"');
-            $this->_tabla->addRow(array($tabla->toHtml()),'align="center" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
+
+            if ($body['menuVertical']) {
+                $tabla = new HTML_Table (array('width' => '760', 'border' => 0, 'celspacing' => 0, 'celpadding' => 0));
+                $tt = $tabla->addRow($row,'align="center" bgcolor="#FFFFFF"');
+                $tabla->updateCellAttributes($tt, 0, 'valign="top" width="1%"');
+                $contenido[] = $tabla;
+            } else {
+                $contenido = $row;
+            }
+//
+            $this->_tabla->addRow($contenido,'align="center" bgcolor="#FFFFFF" colspan="'.$colspan.'"');

             
         }
         $row = array ($body['pie']);
             
         }
         $row = array ($body['pie']);