Se agregan las caritas.

[mecon/meconlib.git] / lib / MECON / HTML / Tabla.php

diff --git a/lib/MECON/HTML/Tabla.php b/lib/MECON/HTML/Tabla.php
index df56c442506edca397045490cf618ec9354ce32d..d67711ce3bbb9fb23a072c980d0d0e0f9b2726e7 100644 (file)
--- a/lib/MECON/HTML/Tabla.php
+++ b/lib/MECON/HTML/Tabla.php
@@ -1,22 +1,28 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +--------------------------------------------------------------------+
-// |                          HTML - TABLE                              |
-// +--------------------------------------------------------------------+
-// |   Libreria para la estandarizacion de los elementos html de los    |
-// |                         de la Intranet                             |
-// |                      Ministerio de Economía                        |
-// +--------------------------------------------------------------------+
-// | Creado: fri mar 21 ART 2003                                        |
-// | Autor:  Martin Marrese <mmarre@mecon.gov.ar>                       |
-// +--------------------------------------------------------------------+
-// 
-// $Id$
-// 
-// $URL$
-// $Rev$
-// $Date$
-// $Author$
+<?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: fri mar 21 ART 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/

 
 require_once 'HTML/Table.php';
 
 
 require_once 'HTML/Table.php';
 


@@ -59,7 +65,7 @@ class Tabla extends HTML_Table {
      */
     function Tabla($attrs = null) 
     {
      */
     function Tabla($attrs = null) 
     {

-        $this->_conf = include 'Tabla/conf_Tabla.php'; // Obtengo los valores particulares de configuracion
+        $this->_conf = include 'MECON/HTML/Tabla/conf_Tabla.php'; // Obtengo los valores particulares de configuracion

         // Seteo los atributos para la tabla
         $this->_attrs = $this->_conf['atributos']['tabla_comun'];
         //Genero el objeto HTML_Table
         // Seteo los atributos para la tabla
         $this->_attrs = $this->_conf['atributos']['tabla_comun'];
         //Genero el objeto HTML_Table


@@ -258,16 +264,16 @@ class Tabla extends HTML_Table {
     function toHtml($simple = 0)
     {
         // Agregar la tabla de fondo.
     function toHtml($simple = 0)
     {
         // Agregar la tabla de fondo.

-        if ($simple == 0) {
-            $tmp = $this->_parseAttributes($this->_conf['atributos']['tabla_contenedora']);
-            $tmp['width'] = $this->_attrs['width'];
-            $tabla_externa =  new HTML_Table($tmp);
-            $tabla_externa->setCellContents(0, 0, parent::toHtml());
-            $tabla_externa->setCellAttributes(0, 0, $this->_conf['atributos']['celda_comun']);
-            $result = $tabla_externa->toHtml();    
-        }
-        else {
+        if ($simple) {

             $result = parent::toHtml();
             $result = parent::toHtml();

+        } else {
+            $contenedora = $this->_conf['atributos']['tabla_contenedora'];
+            $contenedora['width'] = $this->getAttribute('width');
+            $this->updateAttributes(array('width' => '100%'));
+            $tabla_externa =  new HTML_Table($contenedora);
+            $tabla_externa->addRow(array(parent::toHtml()),
+                $this->_conf['atributos']['celda_contenedora']);
+            $result = $tabla_externa->toHtml();    

         }
 
         return $result;
         }
 
         return $result;


@@ -370,13 +376,13 @@ class Tabla extends HTML_Table {
                 case 'border':
                 case 'cellspacing':
                 case 'cellpadding':
                 case 'border':
                 case 'cellspacing':
                 case 'cellpadding':

+                case 'nowrap':

                     $rta[$attr] = $val;
                     break;
                 case 'spacing':
                 case 'padding':
                     $rta["cell$attr"] = $val;
                     break;
                     $rta[$attr] = $val;
                     break;
                 case 'spacing':
                 case 'padding':
                     $rta["cell$attr"] = $val;
                     break;

-                case 'nowrap':

                 case 'th':
                     $rta[$attr] = '';
                     break;
                 case 'th':
                     $rta[$attr] = '';
                     break;