From 8a21b9d769b4ddc74af42cd6134c0760fffaa97b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mart=C3=ADn=20Marrese?= <marrese@gmail.com>
Date: Tue, 5 Aug 2003 14:33:18 +0000
Subject: [PATCH] BugFix en Marco

---
 doc/Marco/uml/Marco.xmi                  |  23 +++++++++++++---------
 lib/MECON/Marco/Menu.php                 |  18 +++++++++++++++++
 lib/MECON/Marco/MenuHorizontal.php       |   7 ++++---
 lib/MECON/Marco/MenuOculto.php           |   9 +++++----
 lib/MECON/Marco/MenuPrincipal.php        |  24 +++++++++++++++--------
 test/Marco/prueba/conf/confSecciones.php |   6 +++---
 www/images/general_sistemas.gif          | Bin 886 -> 892 bytes
 www/images/general_sistemas_f2.gif       | Bin 854 -> 907 bytes
 www/images/general_sistemas_f3.gif       | Bin 1599 -> 1382 bytes
 9 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/doc/Marco/uml/Marco.xmi b/doc/Marco/uml/Marco.xmi
index bdc1fff..b105df1 100644
--- a/doc/Marco/uml/Marco.xmi
+++ b/doc/Marco/uml/Marco.xmi
@@ -9,7 +9,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="216" documentation="" uniqueid="221" />
+  <docsettings viewid="216" documentation="" uniqueid="222" />
   <umlobjects>
    <UML:Class stereotype="" package="MECON" xmi.id="3" abstract="0" documentation="Clase encargada del manejo del Marco de los sistemas." name="MECON_Marco" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="26" type="void" abstract="0" documentation="Constructor. Recibe como parametro el path del archivo de configuracion" name="MECON_Marco" static="0" scope="200" >
@@ -82,6 +82,10 @@ Si es un objeto debe tener un metodo toHtml y opcionalmente puede tener un getCS
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="143" type="string" abstract="0" documentation="Funcion que se encarga de devolver lo que se debe mostrar en pantalla" name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="151" type="string" abstract="0" documentation="Devuelve el html del menu que hay que mostrar en pantalla" name="menuToHtml" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="222" type="string" abstract="0" documentation="Devuelve un string con el encabezado de la seccion
+" name="armarEncabezado" static="0" scope="201" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Titulo de la seccion" name="titulo" static="0" scope="200" />
+    </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="55" value="array()" type="array" abstract="0" documentation="Array con la configuracion de las secciones del sistema;." name="configuracion" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="133" value="array()" type="array" abstract="0" documentation="Array de array con los componentes del menu" name="componentes" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="142" value="" type="table" abstract="0" documentation="Variable que contiene la tabla general de menues que se va a mostrar en pantalla" name="tabla" static="0" scope="201" />
@@ -200,7 +204,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="213" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="144" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="711" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="243" showattsigs="601" usesdiagramusefillcolour="0" x="371" linecolour="#ff0000" y="302" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="243" showattsigs="601" usesdiagramusefillcolour="0" x="371" linecolour="#ff0000" y="302" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="289" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="123" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="689" linecolour="#ff0000" y="69" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
@@ -250,37 +254,37 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="100" documentation="" type="500" >
       <linepath>
        <startpoint startx="667" starty="542" />
-       <endpoint endx="533" endy="478" />
+       <endpoint endx="533" endy="489" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
       <linepath>
        <startpoint startx="781" starty="388" />
-       <endpoint endx="614" endy="360" />
+       <endpoint endx="614" endy="364" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
        <startpoint startx="117" starty="365" />
-       <endpoint endx="371" endy="360" />
+       <endpoint endx="371" endy="364" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="371" starty="419" />
+       <startpoint startx="371" starty="426" />
        <endpoint endx="213" endy="365" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" widgetbid="14" widgetaid="17" documentation="" type="501" >
       <linepath>
        <startpoint startx="505" starty="773" />
-       <endpoint endx="452" endy="478" />
+       <endpoint endx="452" endy="489" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="136" documentation="" type="500" >
       <linepath>
        <startpoint startx="784" starty="469" />
-       <endpoint endx="614" endy="419" />
+       <endpoint endx="614" endy="426" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="100" widgetaid="193" documentation="" type="500" >
@@ -335,7 +339,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="213" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="10" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="711" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="530" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="355" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="143" usefillcolor="1" showattributes="1" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="243" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="170" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="243" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="170" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="268" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="270" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="268" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="310" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="254" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="170" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
@@ -388,6 +392,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="133" label="componentes" />
        <listitem open="0" type="814" id="203" label="componentesVertical" />
        <listitem open="0" type="814" id="55" label="configuracion" />
+       <listitem open="0" type="815" id="222" label="armarEncabezado" />
        <listitem open="0" type="815" id="57" label="generarArchivo" />
        <listitem open="0" type="815" id="56" label="MECON_Marco_Menu" />
        <listitem open="0" type="815" id="151" label="menuToHtml" />
diff --git a/lib/MECON/Marco/Menu.php b/lib/MECON/Marco/Menu.php
index 116922a..4ffe458 100644
--- a/lib/MECON/Marco/Menu.php
+++ b/lib/MECON/Marco/Menu.php
@@ -106,6 +106,9 @@ class MECON_Marco_Menu {
                                         cellspacing="0" 
                                         cellpadding="0" 
                                         border="0"');
+        $this->_tabla->setLineEnd('');
+        $this->_tabla->setTab('');
+        
         $this->_configuracion = $configuracion;
     }
     // -X2C
@@ -280,6 +283,21 @@ class MECON_Marco_Menu {
     }
     // -X2C
 
+    // +X2C Operation 222
+    /**
+     * Devuelve un string con el encabezado de la seccion
+     *
+     * @param  string $titulo Titulo de la seccion
+     *
+     * @return string
+     * @access private
+     */
+    function _armarEncabezado($titulo) // ~X2C
+    {
+        return '<font face="Arial, Helvetica, sans-serif" size="3" color="#336699"><b>'.$titulo.'</b></font>';
+    }
+    // -X2C
+
 } // -X2C Class :MECON_Marco_Menu
 
 ?>
\ No newline at end of file
diff --git a/lib/MECON/Marco/MenuHorizontal.php b/lib/MECON/Marco/MenuHorizontal.php
index 3e54f9e..334770e 100644
--- a/lib/MECON/Marco/MenuHorizontal.php
+++ b/lib/MECON/Marco/MenuHorizontal.php
@@ -56,9 +56,10 @@ class MECON_Marco_MenuHorizontal extends MECON_Marco_Menu {
     {
         $c = count($this->_componentes); 
         //Agrego el titulo
-        $tit = '<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$titulo.'</b></font>';
-        $row = array ($tit);
-        $this->_tabla->addRow($row,'align="left" bgcolor="#336699" colspan="'.$c.'"');
+        $row = array ($this->_armarEncabezado($titulo));
+        $this->_tabla->addRow($row,'align="left" bgcolor="#FFFFFF" colspan="'.$c.'"');
+        $imagen = new HTML_Image('/MECON/images/general_linea2.gif', 'boder="0" align="center"');
+        $this->_tabla->addRow(array ($imagen->toHtml()), 'align="center" colspan="'.$c.'"');
         //
         $tmp = $this->_componentes;
         $this->_componentes = array ();
diff --git a/lib/MECON/Marco/MenuOculto.php b/lib/MECON/Marco/MenuOculto.php
index 6d77588..c960e22 100644
--- a/lib/MECON/Marco/MenuOculto.php
+++ b/lib/MECON/Marco/MenuOculto.php
@@ -59,10 +59,11 @@ class MECON_Marco_MenuOculto extends MECON_Marco_Menu {
         }
         
         //Agrego el titulo
-        $tit = '<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$titulo.'</b></font>';
-        $row = array ($tit);
-        $this->_tabla->addRow($row,'align="left" bgcolor="#336699" colspan="'.$colspan.'"');
-        
+        $row = array ($this->_armarEncabezado($titulo));
+        $this->_tabla->addRow($row,'align="left" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
+        $imagen = new HTML_Image('/MECON/images/general_linea2.gif', 'boder="0" align="center"');
+        $this->_tabla->addRow(array ($imagen->toHtml()), 'align="center" colspan="'.$colspan.'"');
+ 
         //Agrego si corresponde el espacio al inicio
         if ($this->_configuracion['espacios']) {
             $row = array ('&nbsp;');
diff --git a/lib/MECON/Marco/MenuPrincipal.php b/lib/MECON/Marco/MenuPrincipal.php
index ce7cbeb..6bccb5c 100644
--- a/lib/MECON/Marco/MenuPrincipal.php
+++ b/lib/MECON/Marco/MenuPrincipal.php
@@ -1,4 +1,4 @@
-<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 textwidth=80:
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4:
 -------------------------------------------------------------------------------
                              Ministerio de Economía
                                     meconlib
@@ -25,6 +25,7 @@ $Id$
 -----------------------------------------------------------------------------*/
 
 require_once 'HTML/Table.php';
+require_once 'HTML/Image.php';
 
 // +X2C includes
 require_once 'MECON/Marco/MenuHorizontal.php';
@@ -92,13 +93,16 @@ class MECON_Marco_MenuPrincipal extends MECON_Marco_MenuHorizontal {
         
         //Agrego las secciones    
         $this->_tabla->addRow($this->_componentes,'align="center" bgcolor="#CCCCCC"');
-        $colcount = $this->_tabla->getColCount();
-        $width = 100 / $colcount;
+        $width = intval (100 / $colspan);
 
-        for ($col=0; $col < $colcount; $col++) {
-            $this->_tabla->updateColAttributes($col,'width="'.$width.'%"');
-        }        
+        for ($col=0; $col < $colspan; $col++) {
+            $this->_tabla->updateCellAttributes(1,$col,'width="'.$width.'%"');
+        }
 
+        $imagen = new HTML_Image('/MECON/images/general_linea.gif');
+        $i = $this->_tabla->addRow(array ($imagen->toHtml()), 'align="center" colspan="'.$colspan.'"');
+        $this->_tabla->updateRowAttributes($i, 'height="1"');
+        
         foreach ($this->_secciones as $sec) {
             if ($sec->verifSeccionSeleccionada($_SERVER['PHP_SELF'])) {
                 $this->_seccionSeleccionada = $sec;
@@ -111,8 +115,12 @@ class MECON_Marco_MenuPrincipal extends MECON_Marco_MenuHorizontal {
             $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
         }
         else {
-            $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 ($this->_seccionSeleccionada) {
+                $row = array ($this->_armarEncabezado($this->_seccionSeleccionada->_nombre));
+                $this->_tabla->addRow($row,'align="left" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
+                $imagen = new HTML_Image('/MECON/images/general_linea2.gif', 'boder="0" align="center"');
+                $this->_tabla->addRow(array ($imagen->toHtml()), 'align="center" colspan="'.$colspan.'"');
+            }
  
             //Agrego si corresponde el espacio al inicio
             if ($this->_configuracion['espacios']) {
diff --git a/test/Marco/prueba/conf/confSecciones.php b/test/Marco/prueba/conf/confSecciones.php
index 62d16f9..c418382 100644
--- a/test/Marco/prueba/conf/confSecciones.php
+++ b/test/Marco/prueba/conf/confSecciones.php
@@ -60,7 +60,7 @@
                     'imagenMouseOn' => '',              //
                     'imagenSelect'  => '',              //
                     'link'          => 'usuarios',      //LINK DE LA SECCION
-                    'tipoMenu'      => 'vertical',      //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto)
+                    'tipoMenu'      => 'horizontal',      //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto)
                     'hijos'         =>  array (         //HIJOS PARA EL MENU
                                             array ( 'nombre'        => 'Filtrar Usuario',   //NOMBRE DEL HIJO 1
                                                     'imagenComun'   => 'usuarios-filtrar.gif',   //IMAGEN COMUN
@@ -93,7 +93,7 @@
                     'imagenSelect'  => '',              //
                     'link'          => 'perfiles',      //LINK DE LA SECCION
                     'tipoMenu'      => 'vertical',      //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto)
-/*                    'hijos'         =>  array (         //HIJOS PARA EL MENU
+                    'hijos'         =>  array (         //HIJOS PARA EL MENU
                                             array ( 'nombre'        => 'Perfiles - Hijo',   //NOMBRE DEL HIJO 1
                                                     'imagenComun'   => 'perfiles-nionio.gif',   //IMAGEN COMUN
                                                     'imagenMouseOn' => '',                  //
@@ -101,7 +101,7 @@
                                                     'link'          => 'perfiles-hijo',     //LINK DEL HIJO
                                             ),
                                         ),
-*/
+
                 ),
                 // }}} FIN SECCION 2 
         ),
diff --git a/www/images/general_sistemas.gif b/www/images/general_sistemas.gif
index 2eb7ec95531e4c53498f8c22430d5d5432770a25..15f40cac41d16265d852d9df69af855f4a351225 100644
GIT binary patch
delta 816
zcmV-01JC^S2K)veM@dFFIbl2iJOIQ10PXGV=H}+!-rm;M*38Vz!^6XoA6tJs06YKy
z1^*x+j$~<`XsWJk>%MR-&+Z@y0iXjxAPlr%3AZa6eL$g1u<PBP(40=7d<}X|s8)+j
zR#P~vcuekPoL^M9%pRYy>7hGQc}ymcN@maBo7VwxB7kNV5e;_@5g8VJegPRzXlYku
z6%G~+4h{{55{_??H(hC1k^z4Y4XP9rstpgIf2V;}VNn5h4itM74tKGTTRv4;r@6Zs
zy}ypKw@Nm`sH(cXst*>houOM#Lfm1OnVX#v5t$R663tuQ+=YjUiwq17m#^zu?a_O6
zcX@jgc2StH?VA@F(6~SXwI@{`hxnizT(XZLopb3T-k3;Hp~XGeGH8F(NJWXeHYi2^
zu`?MBr5HZJxYcUul8nlHK?)Gy_Oa)lZ$b(b_@>2`QCCEv2&G}bfWn$68*FLH^uW+r
zP}xXTdcZ)Crnj;J+xmoRkOK$8LLI9Gtq=oNv1TPhRzQKSN)8~9J6BbYx(E<dDS#j?
zp}Atn>eX3AZ`z}fBS(L};W&<7r%5wIF;G|#fxwtGCpC~juxG*v42$M=pfqF81X>?R
zxcUZy)UZpmR)BzZ(g6q*C^(SYM1cef7V!4{1bFfV30@a3LHhZE>)5j^NZ@t)irv<g
zZzt}(y!rFG3DQX*LKO<!=n3>{kHM?k6BHE0Cy;?e1LDGo@W6jS>?v?T1jHQ>0r>?F
zboYP)cNj3>10yUDPy`MVm;x*Rk?;V84OF0j0~ZirAc6*5@Zf?XWDo&_Dk@Mx114gi
z+yoI25aNg>qF_J-7tpbQfE4P&9(nocn4<_65SIaf6%ZMlemYV>fRVAWaKHl?==UK3
z1`wp82uZ@yhkk$knP?>eU;e1a1y+Wc!I&o`u%rkOP}pWu4Pd}tk`6#H0(ogFu;!QL
z6c{I;exiT@jbKtRB%(Q{_~(!ZbXlWUg&s=b1P;VjftBTec>#NMUN9;Kg0e}W0lQ!j
u>Xjl9ut1O(49TAehDw<Lt`L+6YX-8efE;=IC9CYR%r*$??6U-f002Aqz+jI6

delta 810
zcmV+_1J(Te2KELYM@dFFIbk&bHvq%{0PgPY=H}+!-rm;M*38Vz#l^*uA6tJl05<>t
z1^*x+j$~;Lf)D^K5Cp<t&U9U?ZLY(z?f-%nEJZA?Sc0GO^cohQ&t`84bTzNoY#{SW
zQf)!4ILqyRX~EPhlc_u=lShS3r>~#qQuvy&L>h1n5q))RcSHbQc>`T)0Tm7w4Gs<s
zeiDUc8Abt9UyY6r4WkqkqYZx#nTL)6c`8n?a1In~6b^8zTTm%yppLS%8Me5Et9Vq5
zu&<(%rIn}_sg|0%F;vwrkdl;^5fPFTmJ-ItO4wU|fZ>A-3=WW}<VDxJYi)0Fa~Tt~
z6cg0d=s~fUDT63E2jvm*WCO*(Ed|?v6Q|Ick^v5*K#UkI!?cPRFJ^z_G-k}ET_Jz}
zV60aXi=C5DQu<i=u%#B5Ph{FCFp@~bpLMDYD4@gufoe}qDLsXBp3xr%3TU)hvH_F=
z2b4seN>z;2d03YikV>R0K|2Ay5-IRhs{xW!bE!>XAgfrTWzBkZ+ExjIx2*K0ZSZ2Q
z0R(62k`=5)E!MtE{z`vcO1X076l@XaA#h-8)6YfN+TBb*GHB3PHIpWA_yFM3yXyX3
zO#*>y*ih<@rac0I@7Jdf`{q5vK!W25fagYl95Qhd2NWEaj=Z`8=?Zo~uYuq?_377D
zZy!&-{E`Fz+9VJ$ibewM<ZZFXV6-z03JT1R$Uve&*6SiX;Lm@03S1CDRtH2t!Se%8
zJ)i&_1_=1T2n+BNL4yN|P>O#fJTPGc6)51q1q2j$paB;+sGtZLMDSpW3RKWQi5M*K
zU<3q!C?bihMQ}kI3j{dfEbG~YUyeA6a6wiX{8xdHoaL7z1q2YuSqTR`fI)s9vi47k
z8gf}ke*Be4B>{h38W6!87f@-ymlGzCqzDj9n5F>+G=RZ+M>+t(2zHgJz?ofoL!g^@
z>bV{UGqOfOkcHxiBA-DXuqBN~2}<aM6F9(G1yp*&+6C(+Z~>?o{E6m-2GD|mr&W4H
ozyd#B5F`PbLTPFS7eGK_s~NmXLIT<8XY8@aCaY`-ApimZJLRxh$N&HU

diff --git a/www/images/general_sistemas_f2.gif b/www/images/general_sistemas_f2.gif
index afef99dc355cd52f24555e675c4d3ef99309eec3..c3b1668a8d5339aaf4341d8f44a5701405f9ac24 100644
GIT binary patch
delta 868
zcmV-q1DpKT28#zVM@dFFIbl2iJOIQ10OjT7%*@Qi#l^k7y|uNqt*x!3q@<adnT(8#
zg@uKDe0+0rbCEYTe*gdg0000X`2+<N02cr(00000JODfZ00sYGAdX~do@lDBZ0o*o
zEYGkY4ESKv{CVfVpsq*z5ekQ-a#<kY1Vk9&xU5<aO+u74AOODLuvlzq4z{RnVa#S*
zuugPIefU}|5(Wgqklg=&c1dP(B6M{C784E%dkPMUfOmp}e{phDNna8R6AB9p3X2bt
z7L<bpmq<!q3<|Ch5v~dhq^74^1FEY4dkYbF5es{@iB<(?L<R;`U%kH;!NZcaNy<b7
z%gg|+p0J>^6SSeF#a0GdJjzy@oSvYI4xJF857gBLJOWpUij0nst`=;XWv?2P83gv(
z!J~(d9}5tEe?@>m?#(`QGP12pMCwkfJ|7EKqj3Pim4zK8|Hz{!G6@X?CO3Bc6VAdo
zkuYDz)YhhFIV(A5z&z=b%p{9I5$GgZ)Xl!2GD=>VNfppjr85pB*jGiCS6N(_Y^7m9
z0nesA&346yP{Gz+Xwz0npa7!`x=Z4s3<N-}61P1LfA~cdm)Kyz2YL)}3s>)$!E}-F
zIIy6xV^?1WFTmPEfU8W7+4yyJkVpYgg1@R>tvZP(RA?w44ollp;z9^e)86fgvm61r
zXYXFpyL6!dvWH)>ecXhB1q>=HryQMa^Af-rXy42gy7mOdug}Tdpn>-D=gV)lD?SAQ
z1fI}?e?q{%z5V<6OAw%lhpj6V=j1m+Fd`^W!5LGa5W)X#0$M;qUC7<Wz(n{QK!F2V
z5a2)r3?Re60ecKEAp;{I5Rn5OQkViP5RRZ-018Mz83o8)=mZ5HZYY8U4uFW`0TL*H
zTm>dU-~fy=E<j@%4p4vxRxkR34>}9Nc%%pve`sNW7C?&dVnPK*5P*~c)Mo+#3{;TV
zivv)EqX<>fVpRYRA}3}5Y&zfv1!A^o!J8)-aHR<5;Ynf+2I5oY0u79SPMrtb`Jw|3
zRM;mDiK0+}kO2%3fl`wmIRFKUDn)>rL!JStq$EPHK$#MVNol8~0!Tru6*OvSr@vJ2
uD(aXv1%QB)6kxTgmn0fMYy&iUYJsmSEMumC)K+Wl2({Q|t1Sy5002AdPh{c%

delta 814
zcmV+}1JV482i68RM@dFFIbk&bHvq%{0OjT7-rnBU*4E6-%*DmUyu7@%wY9CSt)-=<
znVFf4jEsbYgnN5?a&mH!F*bi8`2+<N02u%*00000H2^mN00sZxAdX~d4nm-=t8l(>
zT&8Tz3a+fjbdbNj-)@M)33bLJ5hwsSpU`L&V_foZ(rgw}R9d?OCk8`tNF)x*c)b>j
zs^1Y@T!Apo3<##e9=qQ-abO}&6b%&&4Gj!+5q%hcfL=&KP7Vy16BB=!3=WTxfM0<m
zPG=1hV-pQ$p8#BfB%>px5~r!F60NVWFqW97s+bNHo{W&LyfKA`iHmg*h!Ttupvfh4
zc6fRV3k`;y)z-7FWM*h;7!s%xx#3m>1SevTW0z_6?gQ{U1qJft^e9A|maiW_e<tS9
z+f$5BL4-04Ce%Xl;lY1@6`{1*RYGD!h@>)V;Yh+`3<CyE|14a|<^{?fFLiL5$q8mk
z9R?6w6Pb~Li32wyA_y9WXGNbRa)OL;;6O;Dt&omD;B?3V1n~$N1=t3FRDD#56bP$z
zYnHE9m&!PhAgfs@n4Cx@kf16Nx>$?8je?W_g0^1_B*03uuwj40U=t8s!q#rG#=QO>
z$SQ~cTb;c84yOF>Z(eJcIS<k7*qUGkpLNhxprEuky4(~1KCznHY;h(EBv62fn{VHk
zWUIw(Lh$b23uG@Q&b+yEm$}Gb#`I$7a}laUFu33^rilp&t`FeIAZ3E^101l^nZN>s
zlm;M7aDdQ3f-`>w)H@iVKplko>tVMEQ4Z|K00jv&V8PP>?Y&ok1@_4&0tOJ=2Vnvf
z_>{l}vPl5J00$<x-~a_cU;!Blh*01Fr|5JOcp!c#f(0pIU>*f3?kAXb6R<deizOJ~
zzy;y0SU@fiVpn7z;k}YTkLm4Kq8b+Tcq9f%A|Rs(5A1GdWIx;K1Y-jajBt~aP_768
z1ngM}<^?)kfK&k!q^RbH4~m(h0Yoy$-FPBAnd1Pp3}65SJ+4Wj1v(*M0iqX_86}CR
sT+o0B4PfAt0w-FKBA^VWxu2t0KCmF27+6ZeU(1Q->Z`EEDozLhJM-IEfB*mh

diff --git a/www/images/general_sistemas_f3.gif b/www/images/general_sistemas_f3.gif
index b80f3fa8fe3b660c05d89f68a952052e77945c63..f122f06ed9862cef89bd88b71c2487f9057866ff 100644
GIT binary patch
delta 1369
zcma*j`8(Tp0KoB&B*-LnjB4xKk~oW?U9``bxy8}Y)HPA9qZ&u>C5{=MeuIc0j-u1h
zM$)>bJWbTqQ6v<Vs#M!iX4Te1ho`Oec-CXfw*O$S-`~HyNAc@gh_658Yo}Nj-~!eG
zP^s?zYhp?vlgni?`RM5AploJvWI{5c=)XDKH!#@U*VocF*(Dti_DnTNZr65As05&`
ztqrIcm2D$GiaM*V3|tVl7hjQ;32zjOZV3c}g3Gs_a6xv%&)^9?^TL3e+?CJgr`Go8
zRf_T|#Yj?B?_2>$E$@i0kb=1onA3<LNObA-tir03oNh1{7+KgJhIA(9^WzKZ!`Pjt
z^DkEapiL`iXR%nZ*<~?VrGdFEwCqNDW`%!F3xy>VFu*am&L>02U@$!4rqIL!XXa&>
zq=xEnKxPO)jWeir`ZkVBr_&uy@!h@Y8SFrSPyt|*0YWB4lpGGrI~tN<8^)$msn#I{
z>0ZEr#)7?o)$tswz${`wrnxWE&CSh>k_=)jiJoUnT%+nz)QAZ9--sVD>INVkkp3(F
zI}bEfY_+0dP6@Y^S5{uZudJ%BIbT~>jn&cJFW9fEjjeCy;*A<x8uzy2MfEzy#soXx
zfSwyYzIFtGPG_|S!OTI5^vZkt2?ULy3Ij_pdv8vugdHpm?(h^2_m`Jp--o{}a1=*;
zXJI(ODmd6G;l=CM8v(vY9z82s>)A;5(A(B48a|<~v*JR3FSj7qpcY+0f^$ciQtZV!
z=dU&5<oC))EB;RKG`6kfaT)gDP?pEOryNSv+ii;ntLfq7oC8R|XnDSH<rsjuw`hL;
zpvpwv=u=jknNZs5R;=}@&<k|nUAO{oL7ml%J~MP!AYqs(V*}D7z;1L>Fz-v1b>#N<
zXJ$Fp@eN~_-kD9dqutqw>PxSh>)Eg;_0O91am?=gv%A$;>|m~G;#}*=g_kRkP5f^)
z;<)fl36Y6diQQ}Wbx^WwEXVxN&okobel*(VPRl!HR?>DbQL)zFWn3?OYy25HwJ1GX
zX?uL+v)#Z}!u_D;mf<7s6aJv$mhFG~wEAjAX+t#e_sfo)eSS4W<&Cv~!XDzz$VNwz
zzj{Ms(H0glu?O-Nq=)c^=CpaX;fKc@LXMV3hYx~oc8nEq^#2ZhN{Vn)o6(9?ekEq?
zIKB~+BD+8UN|%)z=V%))_Ca+jS4;ThphJb_y}2Ia_UMQcasK4AH)54xIKGCee!Bj}
zllsu`$0ilgp#<$+(J9!~2Ew_+=B}<;Uszs@D0qr?EyB~*&nH}IEoltuvBow;PdM@S
zAf8L~Y4s?M^s4YQUv^vloRKG6`>f;U?R>ex(hF^jc{vY7j*8{(tIS#Yz3scZB6cg^
zakWT~maA2wXCLFYc}+4IIgN@FjdL+YuS<Ct+_VkW$Z2hpqNYYtZV?kxR+#|Sm3v-?
z4njaLkyp5-ks5!03q==sV5ASy5CV6vI_=m5!IW1>F<cF1rkW;-c1T3;O9~VOttlyB
zG5MrB<ej4ICcyDT`!Pr&Lye~K2x*3Dzc#%Z;ThEUj6<-5SVVZIQG+%bG;T_n(8bMD
zuEXvMjj0WLf*md~7tfONN$wnICMU|h8>kvHJ!Xz7;JXimOyn>G_v*d5=ii*q!&u;+
zP26<eLj$<9RcDrV5T4bggmhOj4Czrry^kWE=kXw%CJh)t)w^~^BjI6i53i5wU)(6y
z+eW2KQ2UotJ5qU=RLo1tg3nOpB$S5P+JSHt><kDZ+xjh%G}*cHLEE2>uGLzZ$~30z
UuYKIabq&1yxFyll#e#4C0k&04<p2Nx

literal 1599
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

-- 
2.43.0