From 1ea8f55789a0a38e7916de61221f37a8aedeacef Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Tue, 1 Jul 2003 19:37:07 +0000
Subject: [PATCH] Se arregla el uso de links.

---
 doc/Marco/uml/Marco.xmi           | 13 +++++++------
 lib/MECON/Marco/ImagenAnimada.php |  4 +++-
 lib/MECON/Marco/Seccion.php       |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/doc/Marco/uml/Marco.xmi b/doc/Marco/uml/Marco.xmi
index d202ed8..e5f73fe 100644
--- a/doc/Marco/uml/Marco.xmi
+++ b/doc/Marco/uml/Marco.xmi
@@ -5,7 +5,7 @@
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>
-  <XMI.model xmi.name="Marco" href="/home/martin/public_html/meconlib/tronco/doc/Marco/uml/Marco.xmi" />
+  <XMI.model xmi.name="Marco" href="/home/luca/public_html/meconlib/tronco/doc/Marco/uml/Marco.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
@@ -139,6 +139,7 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSe
      <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Imagen alterna cuando esta seleccionada la seccion" name="imagenSelect" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="4" value="''" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="5" value="''" type="string" abstract="0" documentation="Nombre de la imagen animada." name="nombre" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="6" value="''" type="string" abstract="0" documentation="Link." name="link" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="71" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="209" type="string" abstract="0" documentation="" name="calcularImagen" static="0" scope="202" >
@@ -207,7 +208,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="198" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="209" 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="147" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" 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="583" 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="645" 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="210" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" 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="136" showattsigs="601" usesdiagramusefillcolour="0" x="61" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="253" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="143" 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" />
@@ -252,7 +253,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
       <linepath>
-       <startpoint startx="225" starty="773" />
+       <startpoint startx="246" starty="773" />
        <endpoint endx="147" endy="508" />
       </linepath>
      </UML:AssocWidget>
@@ -288,7 +289,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="4" indexb="3" widgetbid="14" widgetaid="17" documentation="" type="501" >
       <linepath>
-       <startpoint startx="419" starty="773" />
+       <startpoint startx="461" starty="773" />
        <endpoint endx="327" endy="513" />
       </linepath>
      </UML:AssocWidget>
@@ -369,6 +370,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="210" label="seleccionada" />
        <listitem open="0" type="815" id="71" label="toHtml" />
       </listitem>
+      <listitem open="1" type="807" id="4" label="Marco" />
       <listitem open="0" type="813" id="3" label="Marco" >
        <listitem open="0" type="815" id="97" label="addBody" />
        <listitem open="0" type="815" id="124" label="addTitle" />
@@ -389,7 +391,6 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="20" label="titulo" />
        <listitem open="0" type="814" id="125" label="titulo2" />
       </listitem>
-      <listitem open="1" type="807" id="4" label="Marco" />
       <listitem open="0" type="813" id="14" label="Menu" >
        <listitem open="0" type="815" id="134" label="agregarComponente" />
        <listitem open="0" type="815" id="82" label="armarArraySecciones" />
@@ -420,8 +421,8 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="110" label="MenuVertical" />
       </listitem>
       <listitem open="0" type="813" id="15" label="Pagina" >
-       <listitem open="0" type="814" id="65" label="link" />
        <listitem open="0" type="815" id="67" label="link" />
+       <listitem open="0" type="814" id="65" label="link" />
        <listitem open="0" type="815" id="66" label="Pagina" />
        <listitem open="0" type="814" id="81" label="permisos" />
        <listitem open="0" type="814" id="80" label="titulo" />
diff --git a/lib/MECON/Marco/ImagenAnimada.php b/lib/MECON/Marco/ImagenAnimada.php
index c144919..86369c6 100644
--- a/lib/MECON/Marco/ImagenAnimada.php
+++ b/lib/MECON/Marco/ImagenAnimada.php
@@ -192,11 +192,12 @@ class ImagenAnimada {
      * @param  string $imagenSelect Imagen alterna cuando esta seleccionada la seccion
      * @param  string $directorio Directorio en donde se encuentran las imagenes
      * @param  string $nombre Nombre de la imagen animada.
+     * @param  string $link Link.
      *
      * @return void
      * @access public
      */
-    function ImagenAnimada($imagenComun, $imagenMouseOn = '', $imagenSelect = '', $directorio = '', $nombre = '')// ~X2C
+    function ImagenAnimada($imagenComun, $imagenMouseOn = '', $imagenSelect = '', $directorio = '', $nombre = '', $link = '')// ~X2C
     {
         if ($imagenComun !== '') {
             $this->_imgComun = $this->_calcularImagen($imagenComun, $directorio);
@@ -214,6 +215,7 @@ class ImagenAnimada {
             }
         }
         $this->_nombre = $nombre;
+        $this->_link   = $link;
     }
     // -X2C
 
diff --git a/lib/MECON/Marco/Seccion.php b/lib/MECON/Marco/Seccion.php
index ff6742e..cb3e04d 100644
--- a/lib/MECON/Marco/Seccion.php
+++ b/lib/MECON/Marco/Seccion.php
@@ -122,7 +122,10 @@ class Seccion extends Pagina {
             $imgSelect = $seccion['imagenSelect'];
         else
             unset($imgSelect);
-        $this->_imagen = new ImagenAnimada($imgComun, $imgMouseOn, $imgSelect, $configuracion['directorios']['imagenes'], $this->_nombre);
+        if (array_key_exists('link', $seccion)) {
+            parent::Pagina($seccion['link']);
+        }        
+        $this->_imagen = new ImagenAnimada($imgComun, $imgMouseOn, $imgSelect, $configuracion['directorios']['imagenes'], $this->_nombre, $this->_link);
         
         if (array_key_exists('tipoMenu', $seccion)) {
             $this->_tipoMenu = $seccion['tipoMenu'];
@@ -130,9 +133,6 @@ class Seccion extends Pagina {
         if (!is_null($configuracion)) {
             $this->_configuracion = $configuracion;
         }
-        if (array_key_exists('link', $seccion)) {
-            parent::Pagina($seccion['link']);
-        }        
         if (array_key_exists('hijos', $seccion)) {
             $this->_cargarHijos($seccion['hijos']);
         }
-- 
2.43.0