Se agregan los nuevos estilos de Tabla (y un nuevo test).

diff --git a/lib/MECON/HTML/Tabla/estilo_servicio.php b/lib/MECON/HTML/Tabla/estilo_claro.php
similarity index 80%
rename from lib/MECON/HTML/Tabla/estilo_servicio.php
rename to lib/MECON/HTML/Tabla/estilo_claro.php
index c8714bd1dc09894ad84c1af4a30ce697bee583fa..c69f3bd8bfde53d4a879696889106eb3ac87ed50 100644 (file)
--- a/lib/MECON/HTML/Tabla/estilo_servicio.php
+++ b/lib/MECON/HTML/Tabla/estilo_claro.php
@@ -26,40 +26,33 @@ $Id$
 
 // Opciones para la tabla {{{
 return array (
 
 // Opciones para la tabla {{{
 return array (

-    'css' => '/MECON/css/html/tabla/servicios',
+    'css' => '/MECON/css/html/tabla/claro',

     'atributos' =>  array ( // {{{
     'atributos' =>  array ( // {{{

-        'tabla_comun' => array( // {{{
+        'tabla_contenedora' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 2,
-            'cellspacing' => 2,
+            'cellpadding' => 0,
+            'cellspacing' => 0,

             'border'      => 0,
             'border'      => 0,

-            'bgcolor'     => '#336699',
+            'bgcolor'     => '#003366',

         ), // }}}
         ), // }}}

-        'tabla_contenedora' => array( // {{{
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+        'tabla_comun' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 0,
-            'cellspacing' => 0,
+            'cellpadding' => 2,
+            'cellspacing' => 2,

             'border'      => 0,
             'border'      => 0,

-            'bgcolor'     => '#336699',

         ), // }}}
         'celda_cabecera' => array( // {{{
         ), // }}}
         'celda_cabecera' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#FFFFFF',
-            'class'   => 'mecon_html_tabla_servicios_titulo_form',
-        ), // }}}
-        'celda_comun' => array( // {{{
-            'align'   => 'center',
-            'bgcolor' => '#FFFFFF',
-            'class'   => 'mecon_html_tabla_servicios_txt1',
+            'class'   => 'mecon_html_tabla_claro_cabecera',

         ), // }}}
         'celda_titulo' => array( // {{{
         ), // }}}
         'celda_titulo' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#FFFFFF',
-            'class'   => 'mecon_html_tabla_servicios_txt1',
+            'class'   => 'mecon_html_tabla_claro_titulo',

         ), // }}}
         ), // }}}

-        'celda_contenedora' => array( // {{{
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_claro_comun',

         ), // }}}
     ), // }}}
 );
         ), // }}}
     ), // }}}
 );

diff --git a/lib/MECON/HTML/Tabla/estilo_comun.php b/lib/MECON/HTML/Tabla/estilo_comun.php
index 014a498a4c9d9eceb73e741c33dc0fa13fe5a0d0..8129a7a370caccc2182b7e06fbfd51a9e1894015 100644 (file)
--- a/lib/MECON/HTML/Tabla/estilo_comun.php
+++ b/lib/MECON/HTML/Tabla/estilo_comun.php
@@ -28,38 +28,32 @@ $Id$
 return array (
     'css' => '/MECON/css/html/tabla/comun',
     'atributos' =>  array ( // {{{
 return array (
     'css' => '/MECON/css/html/tabla/comun',
     'atributos' =>  array ( // {{{

-        'tabla_comun' => array( // {{{
+        'tabla_contenedora' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 2,
-            'cellspacing' => 2,
+            'cellpadding' => 0,
+            'cellspacing' => 0,

             'border'      => 0,
             'bgcolor'     => '#336699',
         ), // }}}
             'border'      => 0,
             'bgcolor'     => '#336699',
         ), // }}}

-        'tabla_contenedora' => array( // {{{
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+        'tabla_comun' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 0,
-            'cellspacing' => 0,
+            'cellpadding' => 2,
+            'cellspacing' => 2,

             'border'      => 0,
             'bgcolor'     => '#336699',
         ), // }}}
         'celda_cabecera' => array( // {{{
             'border'      => 0,
             'bgcolor'     => '#336699',
         ), // }}}
         'celda_cabecera' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#336699',
-            'class'   => 'mecon_html_tabla_comun_texto11_blanco',
-        ), // }}}
-        'celda_comun' => array( // {{{
-            'align'   => 'center',
-            'bgcolor' => '#FFFFFF',
-            'class'   => 'mecon_html_tabla_comun_texto11_negro',
+            'class'   => 'mecon_html_tabla_comun_cabecera',

         ), // }}}
         'celda_titulo' => array( // {{{
         ), // }}}
         'celda_titulo' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#DDEEFF',
-            'class'   => 'mecon_html_tabla_comun_texto11_negro',
+            'class'   => 'mecon_html_tabla_comun_titulo',

         ), // }}}
         ), // }}}

-        'celda_contenedora' => array( // {{{
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_comun_comun',

         ), // }}}
     ), // }}}
 );
         ), // }}}
     ), // }}}
 );

diff --git a/lib/MECON/HTML/Tabla/estilo_impresion.php b/lib/MECON/HTML/Tabla/estilo_impresion.php
index 0cb0bfe41428ee08bda9513a1e0bf31aa59696e7..9c35230bffcfd20afa4bac589df24723b0afe018 100644 (file)
--- a/lib/MECON/HTML/Tabla/estilo_impresion.php
+++ b/lib/MECON/HTML/Tabla/estilo_impresion.php
@@ -26,40 +26,34 @@ $Id$
 
 // Opciones para la tabla {{{
 return array (
 
 // Opciones para la tabla {{{
 return array (

-    'css' => '/MECON/css/html/tabla/comun',
+    'css' => '/MECON/css/html/tabla/impresion',

     'atributos' =>  array ( // {{{
     'atributos' =>  array ( // {{{

-        'tabla_comun' => array( // {{{
+        'tabla_contenedora' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 2,
-            'cellspacing' => 2,
+            'cellpadding' => 0,
+            'cellspacing' => 0,

             'border'      => 0,
             'bgcolor'     => '#666666',
         ), // }}}
             'border'      => 0,
             'bgcolor'     => '#666666',
         ), // }}}

-        'tabla_contenedora' => array( // {{{
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+        'tabla_comun' => array( // {{{

             'width'       => '100%',
             'align'       => 'center',
             'width'       => '100%',
             'align'       => 'center',

-            'cellpadding' => 0,
-            'cellspacing' => 0,
+            'cellpadding' => 2,
+            'cellspacing' => 2,

             'border'      => 0,
             'bgcolor'     => '#666666',
         ), // }}}
         'celda_cabecera' => array( // {{{
             'border'      => 0,
             'bgcolor'     => '#666666',
         ), // }}}
         'celda_cabecera' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#666666',
-            'class'   => 'mecon_html_tabla_comun_texto11_blanco',
-        ), // }}}
-        'celda_comun' => array( // {{{
-            'align'   => 'center',
-            'bgcolor' => '#FFFFFF',
-            'class'   => 'mecon_html_tabla_comun_texto11_negro',
+            'class'   => 'mecon_html_tabla_impresion_cabecera',

         ), // }}}
         'celda_titulo' => array( // {{{
         ), // }}}
         'celda_titulo' => array( // {{{

-            'align'   => 'center',
-            'bgcolor' => '#CCCCCC',
-            'class'   => 'mecon_html_tabla_comun_texto11_negro',
+            'class'   => 'mecon_html_tabla_impresion_titulo',

         ), // }}}
         ), // }}}

-        'celda_contenedora' => array( // {{{
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_impresion_comun',

         ), // }}}
     ), // }}}
 );
         ), // }}}
     ), // }}}
 );

diff --git a/lib/MECON/HTML/Tabla/estilo_llamativo.php b/lib/MECON/HTML/Tabla/estilo_llamativo.php
new file mode 100644 (file)
index 0000000..3b83697
--- /dev/null
+++ b/lib/MECON/HTML/Tabla/estilo_llamativo.php
@@ -0,0 +1,61 @@
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 tw=80 fdm=marker:
+-------------------------------------------------------------------------------
+                             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: mar ago 19 13:41:38 ART 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/
+
+// Opciones para la tabla {{{
+return array (
+    'css' => '/MECON/css/html/tabla/llamativo',
+    'atributos' =>  array ( // {{{
+        'tabla_contenedora' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 0,
+            'cellspacing' => 0,
+            'border'      => 0,
+            'bgcolor'     => '#FF9900',
+        ), // }}}
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+        'tabla_comun' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 2,
+            'cellspacing' => 2,
+            'border'      => 0,
+        ), // }}}
+        'celda_cabecera' => array( // {{{
+            'class'   => 'mecon_html_tabla_llamativo_cabecera',
+        ), // }}}
+        'celda_titulo' => array( // {{{
+            'class'   => 'mecon_html_tabla_llamativo_titulo',
+        ), // }}}
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_llamativo_comun',
+        ), // }}}
+    ), // }}}
+);
+// }}}
+
+?>
\ No newline at end of file

diff --git a/lib/MECON/HTML/Tabla/estilo_medio.php b/lib/MECON/HTML/Tabla/estilo_medio.php
new file mode 100644 (file)
index 0000000..a2bec25
--- /dev/null
+++ b/lib/MECON/HTML/Tabla/estilo_medio.php
@@ -0,0 +1,61 @@
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 tw=80 fdm=marker:
+-------------------------------------------------------------------------------
+                             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: mar ago 19 13:41:38 ART 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/
+
+// Opciones para la tabla {{{
+return array (
+    'css' => '/MECON/css/html/tabla/medio',
+    'atributos' =>  array ( // {{{
+        'tabla_comun' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 2,
+            'cellspacing' => 2,
+            'border'      => 0,
+        ), // }}}
+        'tabla_contenedora' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 0,
+            'cellspacing' => 0,
+            'border'      => 0,
+            'bgcolor'     => '#003366',
+        ), // }}}
+        'celda_cabecera' => array( // {{{
+            'class'   => 'mecon_html_tabla_medio_cabecera',
+        ), // }}}
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_medio_comun',
+        ), // }}}
+        'celda_titulo' => array( // {{{
+            'class'   => 'mecon_html_tabla_medio_titulo',
+        ), // }}}
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+    ), // }}}
+);
+// }}}
+
+?>
\ No newline at end of file

diff --git a/lib/MECON/HTML/Tabla/estilo_oscuro.php b/lib/MECON/HTML/Tabla/estilo_oscuro.php
new file mode 100644 (file)
index 0000000..a1a108f
--- /dev/null
+++ b/lib/MECON/HTML/Tabla/estilo_oscuro.php
@@ -0,0 +1,61 @@
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 tw=80 fdm=marker:
+-------------------------------------------------------------------------------
+                             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: mar ago 19 13:41:38 ART 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/
+
+// Opciones para la tabla {{{
+return array (
+    'css' => '/MECON/css/html/tabla/oscuro',
+    'atributos' =>  array ( // {{{
+        'tabla_comun' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 2,
+            'cellspacing' => 2,
+            'border'      => 0,
+        ), // }}}
+        'tabla_contenedora' => array( // {{{
+            'width'       => '100%',
+            'align'       => 'center',
+            'cellpadding' => 0,
+            'cellspacing' => 0,
+            'border'      => 0,
+            'bgcolor'     => '#003366',
+        ), // }}}
+        'celda_cabecera' => array( // {{{
+            'class'   => 'mecon_html_tabla_oscuro_cabecera',
+        ), // }}}
+        'celda_comun' => array( // {{{
+            'class'   => 'mecon_html_tabla_oscuro_comun',
+        ), // }}}
+        'celda_titulo' => array( // {{{
+            'class'   => 'mecon_html_tabla_oscuro_titulo',
+        ), // }}}
+        'celda_contenedora' => array( // {{{
+        ), // }}}
+    ), // }}}
+);
+// }}}
+
+?>
\ No newline at end of file

diff --git a/test/HTML/prueba_tabla.php b/test/HTML/prueba_tabla.php
index a176d5826f0113e17c04ed7ceabed78f7c5c431d..1b0367ee41faaf6d3e05c059212bb8b65bd25532 100644 (file)
--- a/test/HTML/prueba_tabla.php
+++ b/test/HTML/prueba_tabla.php
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>

+Prueba de Tabla.

 </title>
 </title>

-<link rel="StyleSheet" href="./../php/Tabla/tabla_estilos.css">

 </head>
 <body bgcolor="#FFFFFF" color="#000000" align="center">
 <table width="760" align="center">
 </head>
 <body bgcolor="#FFFFFF" color="#000000" align="center">
 <table width="760" align="center">


@@ -12,9 +12,9 @@
 
 <?php
 
 
 <?php
 

-    $tmp = ini_get('include_path');
-    ini_set('include_path', "/home/mmarrese/public_html/HTML/php:$tmp");
-    require_once 'Tabla.php';
+    //$tmp = ini_get('include_path');
+    //ini_set('include_path', "/home/mmarrese/public_html/HTML/php:$tmp");
+    require_once '../../lib/MECON/HTML/Tabla.php';

     $TABLA2 = new MECON_HTML_Tabla ('width="500" align="right"');
     $row =  array ('R0C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
     $TABLA2->addRow($row,'cabecera'); 
     $TABLA2 = new MECON_HTML_Tabla ('width="500" align="right"');
     $row =  array ('R0C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
     $TABLA2->addRow($row,'cabecera'); 


@@ -52,7 +52,7 @@
     print $tohtml."<BR><BR><BR>";
 ///////////////////////////////////////////////////////////////////////////////////////////    
     echo 'PRECATED<BR>';
     print $tohtml."<BR><BR><BR>";
 ///////////////////////////////////////////////////////////////////////////////////////////    
     echo 'PRECATED<BR>';

-    $TABLA2 = new MECON_HTML_Tabla ('width="500" align="right"');
+    $TABLA2 = new MECON_HTML_Tabla ('width="500" align="right"', 'claro');

     $row =  array ('R0C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
     $TABLA2->addRow($row,'cabecera colspan=10'); 
     $row =  array ('R1C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');    
     $row =  array ('R0C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
     $TABLA2->addRow($row,'cabecera colspan=10'); 
     $row =  array ('R1C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');    

diff --git a/test/HTML/tabla_estilos.php b/test/HTML/tabla_estilos.php
new file mode 100644 (file)
index 0000000..1668d30
--- /dev/null
+++ b/test/HTML/tabla_estilos.php
@@ -0,0 +1,61 @@
+<?
+
+require_once '../../lib/MECON/HTML/Tabla.php';
+$tablas = array();
+$estilos = array();
+$dir = dir('../../lib/MECON/HTML/Tabla');
+while (($f = $dir->read()) !== false) {
+       if (preg_match('/^estilo_(.*)\.php$/', $f, $m)) {
+               $tablas[] = new MECON_HTML_Tabla(array(), $m[1]);
+               $estilos[] = $m[1];
+       }
+}
+
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>
+Prueba de Tabla.
+</title>
+<? for ($i = 0; $i < count($tablas); $i++) echo '<link rel="StyleSheet" href="' . str_replace('/MECON/css/html/tabla/', '/~llucar/meconlib/www/css/html/tabla/', $tablas[$i]->getCSS()) . '"/>' ?>
+</head>
+<body bgcolor="#FFFFFF" color="#000000" align="center">
+<table width="760" align="center">
+<tr>
+<td>
+<?php
+
+for ($i = 0; $i < count($tablas); $i++) {
+
+    echo '<h3>' . $estilos[$i] . '</h3>';
+
+    $row =  array ('R0C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
+    $tablas[$i]->addRow($row,'cabecera colspan=10'); 
+    $row =  array ('R1C0','R1C1','R1C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');    
+    $tablas[$i]->addRow($row);
+    $row =  array ('R2C0','R2C1','R2C2','R2C3','R2C4','R2C5','R2C6','R2C7','R2C8','R2C9');
+    $tablas[$i]->addRow($row);
+    $row =  array ('R3C0','R3C1','R3C2','R3C3','R3C4','R3C5','R3C6','R3C7','R3C8','R3C9');
+    $tablas[$i]->addRow($row);
+
+    $tablas[$i]->updateCellAttributes(1, 0, 'rowspan=3');
+    $tablas[$i]->updateCellAttributes(1, 1, 'rowspan=3');    
+    $tablas[$i]->updateCellAttributes(1, 2, 'colspan=8');
+    $tablas[$i]->updateCellAttributes(2, 2, 'colspan=2');
+    $tablas[$i]->updateCellAttributes(2, 4, 'colspan=2');
+    $tablas[$i]->updateCellAttributes(2, 6, array ('colspan'=>2));
+    $tablas[$i]->updateCellAttributes(2, 8, 'colspan=2');
+    $tablas[$i]->updateColAttributes(2, 'titulo');    
+
+    echo $tablas[$i]->toHtml() . '<br>';
+}
+
+?>
+</td>
+</tr>
+</table>
+</body>
+</html>
+
+

diff --git a/www/css/html/tabla/claro.css b/www/css/html/tabla/claro.css
new file mode 100644 (file)
index 0000000..1ec9a5e
--- /dev/null
+++ b/www/css/html/tabla/claro.css
@@ -0,0 +1,37 @@
+
+.mecon_html_tabla_claro_cabecera {
+       color: #003366;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       vertical-align: middle ;
+       font-weight: bold;
+       text-align: left;
+}
+
+.mecon_html_tabla_claro_titulo {
+       color: #003366;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       text-align: left;
+       vertical-align: top;
+       font-weight: normal;
+}
+
+.mecon_html_tabla_claro_comun {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 8pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       text-align: left;
+       vertical-align: top;
+       font-weight: normal;
+}
+

diff --git a/www/css/html/tabla/comun.css b/www/css/html/tabla/comun.css
index fbdb36ee858aa754b07ed0f2e99a358ac1e7641e..288dc33df96b999b4e4e6a148e7121af50d61944 100644 (file)
--- a/www/css/html/tabla/comun.css
+++ b/www/css/html/tabla/comun.css
@@ -1,38 +1,37 @@
-/* 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$
-*/

 
 

-.mecon_html_tabla_comun_texto11_blanco
-{
-    FONT-FAMILY: Arial, Helvetica, sans-serif;
-    FONT-SIZE: 11px;
-    FONT-STYLE: bold;
-    COLOR: #FFFFFF;
-    FONT-WEIGHT: normal;
-    TEXT-DECORATION: none;
+.mecon_html_tabla_comun_cabecera {
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: bold;
+       color: #FFFFFF;
+       background-color: #336699;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;

 }
 }

-.mecon_html_tabla_comun_texto11_negro
-{
-    FONT-FAMILY: Arial, Helvetica, sans-serif;
-    FONT-SIZE: 11px;
-    FONT-STYLE: normal;
-    COLOR: #000000;
-    FONT-WEIGHT: normal;
-    TEXT-DECORATION: none;
+
+.mecon_html_tabla_comun_titulo {
+       font-family: arial, helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       color: #000000;
+       background-color: #DDEEFF;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;
+}
+
+.mecon_html_tabla_comun_comun {
+       font-family: arial, helvetica, sans-serif;
+       font-size: 8pt;
+       font-style: normal;
+       color: #000000;
+       background-color: #FFFFFF;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;

 }
 }

+

diff --git a/www/css/html/tabla/impresion.css b/www/css/html/tabla/impresion.css
new file mode 100644 (file)
index 0000000..9c33e5d
--- /dev/null
+++ b/www/css/html/tabla/impresion.css
@@ -0,0 +1,37 @@
+
+.mecon_html_tabla_impresion_cabecera {
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: bold;
+       color: #FFFFFF;
+       background-color: #666666;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;
+}
+
+.mecon_html_tabla_impresion_titulo {
+       font-family: arial, helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       color: #000000;
+       background-color: #CCCCCC;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;
+}
+
+.mecon_html_tabla_impresion_comun {
+       font-family: arial, helvetica, sans-serif;
+       font-size: 8pt;
+       font-style: normal;
+       color: #000000;
+       background-color: #FFFFFF;
+       font-weight: normal;
+       text-decoration: none;
+       text-align: center;
+       vertical-align: middle;
+}
+

diff --git a/www/css/html/tabla/llamativo.css b/www/css/html/tabla/llamativo.css
new file mode 100644 (file)
index 0000000..06eb268
--- /dev/null
+++ b/www/css/html/tabla/llamativo.css
@@ -0,0 +1,37 @@
+
+.mecon_html_tabla_llamativo_cabecera {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       vertical-align: middle ;
+       font-weight: bold;
+       text-align: left;
+}
+
+.mecon_html_tabla_llamativo_titulo {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFCC99;
+       text-align: left;
+       vertical-align: top;
+       font-weight: bold;
+}
+
+.mecon_html_tabla_llamativo_comun {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 8pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       text-align: left;
+       vertical-align: top;
+       font-weight: normal;
+}
+

diff --git a/www/css/html/tabla/medio.css b/www/css/html/tabla/medio.css
new file mode 100644 (file)
index 0000000..28114ac
--- /dev/null
+++ b/www/css/html/tabla/medio.css
@@ -0,0 +1,37 @@
+
+.mecon_html_tabla_medio_cabecera {
+       color: #003366;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       vertical-align: middle ;
+       font-weight: normal;
+       text-align: left;
+}
+
+.mecon_html_tabla_medio_titulo {
+       color: #FFFFFF;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #6285A4;
+       text-align: left;
+       vertical-align: top;
+       font-weight: bold;
+}
+
+.mecon_html_tabla_medio_comun {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 8pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       text-align: left;
+       vertical-align: top;
+       font-weight: normal;
+}
+

diff --git a/www/css/html/tabla/oscuro.css b/www/css/html/tabla/oscuro.css
new file mode 100644 (file)
index 0000000..65a5657
--- /dev/null
+++ b/www/css/html/tabla/oscuro.css
@@ -0,0 +1,37 @@
+
+.mecon_html_tabla_oscuro_cabecera {
+       color: #FFFFFF;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 11pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #003366;
+       vertical-align: middle ;
+       font-weight: bold;
+       text-align: left;
+}
+
+.mecon_html_tabla_oscuro_titulo {
+       color: #FFFFFF;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #6285A4;
+       text-align: left;
+       vertical-align: top;
+       font-weight: bold;
+}
+
+.mecon_html_tabla_oscuro_comun {
+       color: #000000;
+       font-family: Arial, Helvetica, sans-serif;
+       font-size: 9pt;
+       font-style: normal;
+       line-height: normal;
+       background-color: #FFFFFF;
+       text-align: left;
+       vertical-align: top;
+       font-weight: normal;
+}
+

diff --git a/www/css/html/tabla/servicios.css b/www/css/html/tabla/servicios.css
deleted file mode 100644 (file)
index c76213f..0000000
--- a/www/css/html/tabla/servicios.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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$
-*/
-
-.mecon_html_tabla_texto11_blanco
-{
-    FONT-FAMILY: Arial, Helvetica, sans-serif;
-    FONT-SIZE: 11px;
-    FONT-STYLE: bold;
-    COLOR: #FFFFFF;
-    FONT-WEIGHT: normal;
-    TEXT-DECORATION: none;
-}
-.mecon_html_tabla_texto11_negro
-{
-    FONT-FAMILY: Arial, Helvetica, sans-serif;
-    FONT-SIZE: 11px;
-    FONT-STYLE: normal;
-    COLOR: #000000;
-    FONT-WEIGHT: normal;
-    TEXT-DECORATION: none;
-}