- Ya casi esta....

  Faltan solucionar algunos errores.

diff --git a/marco/doc/uml/Marco.xmi b/marco/doc/uml/Marco.xmi
index 55830c51e5b93b2ed3f22ddebe8aef0f886e527f..110a1d11d72cd0f152b622fd069c587afb24f7e9 100644 (file)
--- a/marco/doc/uml/Marco.xmi
+++ b/marco/doc/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="4" documentation="" uniqueid="146" />
+  <docsettings viewid="4" documentation="" uniqueid="200" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="3" abstract="0" documentation="Clase que se encarga del manejo del marco en general en los sistemas de intranet.
 Trabaja de forma general, llamando a los demas objetos para la realizacion del marco." name="Marco" static="0" scope="200" >
@@ -104,9 +104,12 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Datos del componente de menu a agregar" name="componente" static="0" scope="200" />
     </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:Attribute stereotype="" package="" xmi.id="55" value="" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema;." name="directorio" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="133" value="" 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" />
+    <UML:Attribute stereotype="" package="" xmi.id="147" value="" type="string" abstract="0" documentation="Variable que contiene el titulo de la seccion seleccionada" name="titulo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="200" value="" type="array" abstract="0" documentation="Array con los objetos seccion." name="secciones" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="15" abstract="0" documentation="Clase para el manejo de las paginas. " name="Pagina" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="66" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo pagina." name="Pagina" static="0" scope="200" >
@@ -130,14 +133,18 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="127" type="void" abstract="0" documentation="Funcion que se encarga de desserializar el array asociativo paginas-secciones." name="desSerializarArraySecciones" static="0" scope="201" />
     <UML:Operation stereotype="" package="" xmi.id="129" type="int" abstract="0" documentation="Funcion que se encarga de verificar si la pagina a la cual se quiere acceder pertenece a la seccion que estoy dibujando. Se utiliza como agregado en toHtml.
-Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSeleccionada" static="0" scope="201" >
+Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSeleccionada" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la pagina a la cual se quiere acceder." name="link_sel" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="150" type="void" abstract="0" documentation="Carga el array con los objetos subhijos de la seccion" name="cargarSubHijos" static="0" scope="201" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Array con los nombres de los links que componen a este hijo" name="subhijos" static="0" scope="200" />
+    </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="60" value="" type="string" abstract="0" documentation="Nombre de la seccion." name="nombre" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="61" value="" type="Imagen" abstract="0" documentation="Este es el nombre de la imagen" name="imagen" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="62" value="" type="Menu" abstract="0" documentation="Hijos (menu) de la seccion." name="hijos" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="string" abstract="0" documentation="Valor string del tipo de menu de la seccion" name="tipoMenu" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="130" value="" type="string" abstract="0" documentation="Lugar en donde esta el sistema." name="directorio" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="149" value="" type="string" abstract="0" documentation="" name="menuHtml" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="17" abstract="0" documentation="Clase para el manejo de la animacion de las imagenes. Utilizada principalmente en la barra de secciones" name="ImagenAnimada" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="70" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo que contiene la imagen." name="ImagenAnimada" static="0" scope="200" >
@@ -168,6 +175,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="139" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Body para agregar a la pagina" name="body" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="103" abstract="0" documentation="" name="MenuVertical" static="0" scope="200" >
@@ -176,6 +184,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="141" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Cuerpo del mensaje para agregar a la pagina" name="body" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="136" abstract="0" documentation="" name="MenuOculto" static="0" scope="200" >
@@ -184,62 +193,75 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="140" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="String con el cuerpo a agregar a la pagina" name="body" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
+    </UML:Operation>
+   </UML:Class>
+   <UML:Class stereotype="" package="" xmi.id="170" abstract="0" documentation="x2c:extern" name="PAGINA" static="0" scope="200" />
+   <UML:Class stereotype="" package="" xmi.id="182" abstract="0" documentation="x2c:extern" name="HTML::Table" static="0" scope="200" />
+   <UML:Class stereotype="" package="" xmi.id="193" abstract="0" documentation="Clase que se encarga del manejo de los menues principales. Este menu es el de secciones general del sistema." name="MenuPrincipal" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="195" type="void" abstract="0" documentation="" name="menuPrincipal" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Path en donde se encuentra el sistema." name="directorio" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="199" type="void" abstract="0" documentation="Funcion que se encarga de agregar el body a la seccion seleccionada" name="addBody" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="" name="body" static="0" scope="200" />
     </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="197" value="" type="Seccion" abstract="0" documentation="Contiene el objeto seccion que se encuentra seleccionada. Se utiliza para mostrar el menu." name="seccionSeleccionada" static="0" scope="201" />
    </UML:Class>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco" localid="30000" showstereotype="0" showscope="1" font="helvetica,6,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="164" showattsigs="601" usesdiagramusefillcolour="0" x="347" linecolour="#ff0000" y="89" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="198" 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="164" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="198" 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="139" showattsigs="601" usesdiagramusefillcolour="0" x="179" linecolour="#ff0000" y="894" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="436" showattsigs="601" usesdiagramusefillcolour="0" x="19" linecolour="#ff0000" y="704" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" 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="302" linecolour="#ff0000" y="346" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="132" 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="210" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" 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="210" showattsigs="601" usesdiagramusefillcolour="0" x="24" linecolour="#ff0000" y="351" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" 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="210" 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" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="153" 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="637" linecolour="#ff0000" y="114" 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" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="181" showattsigs="601" usesdiagramusefillcolour="0" x="485" linecolour="#ff0000" y="708" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" 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="171" showattsigs="601" usesdiagramusefillcolour="0" x="540" linecolour="#ff0000" y="378" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="166" showattsigs="601" usesdiagramusefillcolour="0" x="529" linecolour="#ff0000" y="530" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" 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="190" showattsigs="601" usesdiagramusefillcolour="0" x="459" linecolour="#ff0000" y="598" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" 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="190" showattsigs="601" usesdiagramusefillcolour="0" x="577" linecolour="#ff0000" y="229" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="624" linecolour="#ff0000" y="413" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" 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="174" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" 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" />
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="3" widgetaid="9" documentation="" type="501" >
       <linepath>
        <startpoint startx="150" starty="46" />
-       <endpoint endx="347" endy="221" />
+       <endpoint endx="362" endy="249" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="3" widgetaid="10" documentation="" type="501" >
       <linepath>
        <startpoint startx="311" starty="72" />
-       <endpoint endx="347" endy="155" />
+       <endpoint endx="362" endy="183" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="13" documentation="" type="501" >
       <linepath>
        <startpoint startx="541" starty="48" />
-       <endpoint endx="429" endy="89" />
+       <endpoint endx="444" endy="117" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="407" starty="346" />
-       <endpoint endx="429" endy="287" />
+       <startpoint startx="432" starty="381" />
+       <endpoint endx="444" endy="315" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >
       <linepath>
-       <startpoint startx="129" starty="351" />
+       <startpoint startx="126" starty="365" />
        <endpoint endx="129" endy="226" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
       <linepath>
        <startpoint startx="164" starty="704" />
-       <endpoint endx="129" endy="472" />
+       <endpoint endx="126" endy="508" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="18" widgetaid="17" documentation="" type="500" >
@@ -250,53 +272,100 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
       <linepath>
-       <startpoint startx="511" starty="188" />
+       <startpoint startx="526" starty="216" />
        <endpoint endx="637" endy="124" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="14" widgetaid="100" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="100" documentation="" type="500" >
       <linepath>
-       <startpoint startx="575" starty="708" />
-       <endpoint endx="407" endy="478" />
+       <startpoint startx="554" starty="598" />
+       <endpoint endx="467" endy="546" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
       <linepath>
-       <startpoint startx="540" starty="397" />
-       <endpoint endx="512" endy="412" />
+       <startpoint startx="672" starty="267" />
+       <endpoint endx="537" endy="436" />
+       <point x="697" y="324" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
-       <startpoint startx="234" starty="431" />
-       <endpoint endx="302" endy="390" />
+       <startpoint startx="231" starty="412" />
+       <endpoint endx="327" endy="436" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" widgetbid="16" widgetaid="14" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="302" starty="434" />
-       <endpoint endx="234" endy="391" />
+       <startpoint startx="327" starty="491" />
+       <endpoint endx="231" endy="460" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="4" indexb="1" widgetbid="14" widgetaid="17" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" widgetbid="14" widgetaid="17" documentation="" type="501" >
       <linepath>
        <startpoint startx="309" starty="704" />
-       <endpoint endx="354" endy="478" />
+       <endpoint endx="397" endy="546" />
+       <point x="344" y="616" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="14" widgetaid="136" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="136" documentation="" type="500" >
       <linepath>
-       <startpoint startx="612" starty="530" />
-       <endpoint endx="459" endy="478" />
+       <startpoint startx="624" starty="432" />
+       <endpoint endx="537" endy="491" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="100" widgetaid="193" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="595" starty="693" />
+       <endpoint endx="554" endy="636" />
       </linepath>
      </UML:AssocWidget>
     </associations>
    </diagram>
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="403" showops="1" showpackage="0" name="Marco - Contructores" localid="29994" showstereotype="0" showscope="1" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" >
+    <widgets>
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="57" usesdiagramusefillcolour="1" x="204" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="513" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="173" usesdiagramusefillcolour="0" x="393" linecolour="#ff0000" y="54" instancename="PRINCIPAL" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="513" xmi.id="100" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="67" usesdiagramusefillcolour="1" x="773" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="506" xmi.id="16" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="169" usesdiagramusefillcolour="0" x="1116" linecolour="#ff0000" y="54" instancename="SUBMENU" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="498" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="0" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="514" xmi.id="170" decon="0" localid="29994" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+    </widgets>
+    <messages>
+     <UML:MessageWidget usesdiagramfillcolour="1" width="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="114" operation="MenuHorizontal(directorio : string) : void" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="153" xmi.id="154" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="480" linecolour="none" y="135" operation="Seccion(seccion : array, directorio : string) : void" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="155" xmi.id="156" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="177" operation="MenuHorizontal(directorio : string) : void" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="157" xmi.id="158" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="262" operation="agregarComponente" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="159" xmi.id="160" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="217" operation="return" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="163" xmi.id="164" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="480" linecolour="none" y="282" operation="return" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="165" xmi.id="166" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="313" operation="return" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="167" xmi.id="168" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="102" operation="Marco(directorio : string) : void" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="171" xmi.id="172" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="353" operation="return" widgetbid="29994" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="173" xmi.id="174" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="386" operation="addBody(body : Mixed) : void" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="175" xmi.id="176" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="424" operation="display() : string" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="177" xmi.id="178" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="452" operation="addBody(body : string) : void" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="179" xmi.id="180" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+    </messages>
+    <associations/>
+   </diagram>
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="181" documentation="" type="403" showops="1" showpackage="0" name="Marco::addBody" localid="29996" showstereotype="0" showscope="1" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" >
+    <widgets>
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="57" usesdiagramusefillcolour="1" x="209" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="545" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="172" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="54" instancename="marco->_tabla" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="537" xmi.id="182" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="13" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="545" xmi.id="170" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="109" usesdiagramusefillcolour="1" x="382" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="536" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+    </widgets>
+    <messages>
+     <UML:MessageWidget usesdiagramfillcolour="1" width="188" usesdiagramusefillcolour="1" x="48" linecolour="none" y="101" operation="display() : string" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="183" xmi.id="184" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="197" usesdiagramusefillcolour="1" x="238" linecolour="none" y="129" operation="addBody(body : string) : void" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="187" xmi.id="188" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="167" usesdiagramusefillcolour="1" x="437" linecolour="none" y="164" operation="addRow(Componentes)" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="189" xmi.id="190" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="167" usesdiagramusefillcolour="1" x="437" linecolour="none" y="195" operation="addRow(titulo)" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="191" xmi.id="192" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+    </messages>
+    <associations/>
+   </diagram>
   </diagrams>
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
-     <listitem open="0" type="803" id="-1" label="Marco" >
+     <listitem open="1" type="803" id="-1" label="Marco" >
       <listitem open="0" type="813" id="9" label="Copete" >
        <listitem open="0" type="815" id="34" label="Copete" />
        <listitem open="0" type="815" id="94" label="darCopete" />
@@ -351,13 +420,16 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="55" label="directorio" />
        <listitem open="0" type="815" id="57" label="generarArchivo" />
        <listitem open="0" type="815" id="56" label="Menu" />
+       <listitem open="0" type="815" id="151" label="menuToHtml" />
        <listitem open="0" type="815" id="58" label="obtenerArchivo" />
        <listitem open="0" type="815" id="76" label="obtenerConfSecciones" />
+       <listitem open="0" type="814" id="200" label="secciones" />
        <listitem open="0" type="815" id="126" label="serializarArraySecciones" />
        <listitem open="0" type="814" id="142" label="tabla" />
+       <listitem open="0" type="814" id="147" label="titulo" />
        <listitem open="0" type="815" id="143" label="toHtml" />
       </listitem>
-      <listitem open="1" type="813" id="100" label="MenuHorizontal" >
+      <listitem open="0" type="813" id="100" label="MenuHorizontal" >
        <listitem open="0" type="815" id="139" label="addBody" />
        <listitem open="0" type="815" id="111" label="MenuHorizontal" />
       </listitem>
@@ -391,10 +463,12 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
       </listitem>
       <listitem open="0" type="813" id="16" label="Seccion" >
        <listitem open="0" type="815" id="84" label="cargarHijos" />
+       <listitem open="0" type="815" id="150" label="cargarSubHijos" />
        <listitem open="0" type="815" id="127" label="desSerializarArraySecciones" />
        <listitem open="0" type="814" id="130" label="directorio" />
        <listitem open="0" type="814" id="62" label="hijos" />
        <listitem open="0" type="814" id="61" label="imagen" />
+       <listitem open="0" type="814" id="149" label="menuHtml" />
        <listitem open="0" type="814" id="60" label="nombre" />
        <listitem open="0" type="815" id="63" label="Seccion" />
        <listitem open="0" type="814" id="118" label="tipoMenu" />
@@ -408,6 +482,17 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="53" label="toHtml" />
       </listitem>
      </listitem>
+     <listitem open="1" type="810" id="181" label="Marco::addBody" />
+     <listitem open="1" type="810" id="152" label="Marco - Contructores" />
+     <listitem open="1" type="813" id="193" label="MenuPrincipal" >
+      <listitem open="0" type="815" id="199" label="addBody" />
+      <listitem open="0" type="815" id="195" label="menuPrincipal" />
+      <listitem open="0" type="814" id="197" label="seccionSeleccionada" />
+     </listitem>
+     <listitem open="1" type="803" id="-1" label="Secuencia" >
+      <listitem open="1" type="813" id="182" label="HTML::Table" />
+      <listitem open="1" type="813" id="170" label="PAGINA" />
+     </listitem>
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
    </listitem>

diff --git a/marco/php/marco/Marco.php b/marco/php/marco/Marco.php
index 74d226fa7f10418efdede986d00873bc364e420c..e018eaec53335e6fa0c163b53d4ff17ac88bb00d 100644 (file)
--- a/marco/php/marco/Marco.php
+++ b/marco/php/marco/Marco.php
@@ -29,6 +29,7 @@ require_once 'include/lib/marco/Copete.php';
 require_once 'include/lib/marco/Titulo.php';
 require_once 'include/lib/marco/Pie.php';
 require_once 'include/lib/marco/Menu.php';
+require_once 'include/lib/marco/MenuPrincipal.php';
 
 //Agregado para el uso de HTML_Page (Uso la version Original de Pear)
 require_once 'include/lib/HTML/Page.php';
@@ -147,7 +148,7 @@ class Marco extends HTML_Page {
         $this->_obtenerConfiguracion();
         $this->_titulo        = new Titulo          ($this->_configuracion);
         $this->_copete        = new Copete          ($this->_directorio);
-        $this->_menu          = new MenuHorizontal  ($this->_directorio,null);
+        $this->_menu          = new MenuPrincipal   ($this->_directorio);
         $this->_pie           = new Pie             ($this->_configuracion);
         $this->_contenido     = array ();
 
@@ -301,4 +302,4 @@ class Marco extends HTML_Page {
 
 } // -X2C Class :Marco
 
-?>
+?>
\ No newline at end of file

diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php
index 3e2ebeafc831b349164c12505e8a9ebadb88518b..e5561f92f90b97a6c8a0d521152721f6aaf7138e 100644 (file)
--- a/marco/php/marco/Menu.php
+++ b/marco/php/marco/Menu.php
@@ -68,6 +68,24 @@ class Menu {
      */
     var $_tabla;
 
+    /**
+     * Variable que contiene el titulo de la seccion seleccionada
+     *
+     * @var    string $titulo
+     *
+     * @access private
+     */
+    var $_titulo;
+
+    /**
+     * Array con los objetos seccion.
+     *
+     * @var    array $secciones
+     *
+     * @access private
+     */
+    var $_secciones;
+
     // ~X2C
 
     // +X2C Operation 56
@@ -83,6 +101,7 @@ class Menu {
     function Menu($directorio = null) // ~X2C
     {
         $this->_componentes = array (); //Inicializo vacio el array de componentes del menu
+        $this->_secciones   = array (); //Inicializo vacio el array de los objetos secciones
         if (!is_null($directorio)) {
 //        if (file_exists(PRE_DIR.$directorio.POST_DIR.MENU_SERIALIZADO)) {
           //ESTA SERIALIZADO EL OBJETO
@@ -93,14 +112,13 @@ class Menu {
             $this->_directorio = $directorio;
             $this->_armarArraySecciones($this->_obtenerConfSecciones());
             
-            $this->_tabla = new HTML_Table('width=760 align="center" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0"');            
-            
             //Serializo el array asociativo de paginas-secciones
 //            if (!file_exists(PRE_DIR.$directorio.POST_DIR.ARRAYSECCIONES_SERIALIZADO)) {
                 $this->_serializarArraySecciones();                
 //            }
 //            $this->_generarArchivo(); NO ESTOY USANDO LA SERIALIZACION GRANDE AHORA
         }
+        $this->_tabla = new HTML_Table('width=760 align="center" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0"');            
     }
     // -X2C
 
@@ -168,8 +186,9 @@ class Menu {
     {
         $linksel = $_SERVER['PHP_SELF'];
         foreach ($confSec as $sec) {
-            $tmp = new Seccion ($sec, $this->_directorio);            
+            $tmp = new Seccion ($sec, $this->_directorio);         
             array_push($this->_componentes,$tmp->toHtml($linksel));
+            array_push($this->_secciones,$tmp);
         }
     }
     // -X2C
@@ -192,8 +211,8 @@ class Menu {
             if (array_key_exists('hijos',$sec)) {
                 foreach ($sec['hijos'] as $hijo) {
                     $tmp[$hijo['link']] = $sec['nombre'];                
-                    if (array_key_exists('hijos',$hijo)) {
-                        foreach ($hijo['hijos'] as $nieto) {
+                    if (array_key_exists('subhijos',$hijo)) {
+                        foreach ($hijo['subhijos'] as $nieto) {
                             $tmp[$nieto] = $hijo['link'];
                         }
                     }
@@ -235,12 +254,25 @@ class Menu {
      */
     function toHtml() // ~X2C
     {   
-        $tmp = $this->_tabla->toHtml();
-        return $tmp;
+        return $this->_tabla->toHtml();
     }
     // -X2C
 
 
+    // +X2C Operation 151
+    /**
+     * Devuelve el html del menu que hay que mostrar en pantalla
+     *
+     * @return string
+     *
+     * @access public
+     */
+    function menuToHtml() // ~X2C
+    {
+        return $this->_menuHtml;
+    }
+    // -X2C
+
 } // -X2C Class :Menu
 
 ?>

diff --git a/marco/php/marco/MenuHorizontal.php b/marco/php/marco/MenuHorizontal.php
index d1a5d1b4622eb8a6257e5a807a889cc08b7227ee..a4f9bc03d727553c3814cb96ab7567d65b3ba0a5 100644 (file)
--- a/marco/php/marco/MenuHorizontal.php
+++ b/marco/php/marco/MenuHorizontal.php
@@ -62,20 +62,25 @@ class MenuHorizontal extends Menu {
      * Funcion para agregar el cuerpo de la pagina a la pagina
      *
      * @param  string $body Body para agregar a la pagina
+     * @param  string $titulo Titulo de la seccion seleccionada
      *
      * @return void
      *
      * @access public
      */
-    function addBody($body) // ~X2C
+    function addBody($body, $titulo) // ~X2C
     {
-        $tmp = array ();
-        foreach ($this->_componentes as $comp) {
-            array_push($tmp,$comp);
-        }
-        $c = count($tmp);
-        $this->_tabla->addRow($tmp,'align="center" bgcolor="#CCCCCC"');
-    
+        $c = count($this->_componentes); 
+        
+        $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.'"');
+        
+        $tmp = $this->_componentes;
+        $this->_componentes = array ();
+        $this->_armarArraySecciones($tmp);
+        $this->_tabla->addRow($this->_componentes,'align="center" bgcolor="#CCCCCC"');
+        
         $tmp='';
         foreach ($body as $bod) {
             if (is_object($bod)) {
@@ -83,7 +88,7 @@ class MenuHorizontal extends Menu {
                     $tmp.=$bod->toHtml();
                 }
                 else {
-                    trigger_error('El metodo no existe!', E_USER_WARNING);
+                    trigger_error('El metodo no existe! - '.get_class($bod).'::toHtml()', E_USER_WARNING);
                 }                
             }
             else {

diff --git a/marco/php/marco/MenuOculto.php b/marco/php/marco/MenuOculto.php
index 0425d52ffa214c479a17ea321a1170df447a5cfd..1930ba7f0d57f92e61d1de1bc20f4fa846ac2bc2 100644 (file)
--- a/marco/php/marco/MenuOculto.php
+++ b/marco/php/marco/MenuOculto.php
@@ -61,18 +61,37 @@ class MenuOculto extends Menu {
      * Funcion para agregar el cuerpo de la pagina a la pagina
      *
      * @param  string $body String con el cuerpo a agregar a la pagina
+     * @param  string $titulo Titulo de la seccion seleccionada
      *
      * @return void
      *
      * @access public
      */
-    function addBody($body) // ~X2C
+    function addBody($body, $titulo) // ~X2C
     {
-        $row = array ($body);
-        $this->_tabla->addRow($body,'align="center" bgcolor="#FFFFFF"');
+        $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"');
+
+        $tmp='';
+        foreach ($body as $bod) {
+            if (is_object($bod)) {
+                if (method_exists($bod,'toHtml')) {
+                    $tmp.=$bod->toHtml();
+                }
+                else {
+                    trigger_error('El metodo no existe!', E_USER_WARNING);
+                }                
+            }
+            else {
+                $tmp.=$bod;
+            }
+        }
+        $row = array ($tmp);
+        $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF"');
     }
     // -X2C
 
 } // -X2C Class :MenuOculto
 
-?>
\ No newline at end of file
+?>

diff --git a/marco/php/marco/MenuVertical.php b/marco/php/marco/MenuVertical.php
index aa30c67ebc8ed21cc3ea45f33f96b3063e8771d5..feaeb2b9a5dde3110f4a61de682f15a9cc812f82 100644 (file)
--- a/marco/php/marco/MenuVertical.php
+++ b/marco/php/marco/MenuVertical.php
@@ -61,15 +61,42 @@ class MenuVertical extends Menu {
      * Funcion para agregar el cuerpo de la pagina a la pagina
      *
      * @param  string $body Cuerpo del mensaje para agregar a la pagina
+     * @param  string $titulo Titulo de la seccion seleccionada
      *
      * @return void
      *
      * @access public
      */
-    function addBody($body) // ~X2C
+    function addBody($body, $titulo) // ~X2C
     {
-        $row = array ($body);
-        $this->_tabla->setCellContents(1,1,$body);
+
+        //TODO
+        //Aca agregar el menu vertical
+        $row = array ('menuvertical');
+        $this->_tabla->addRow($row,'width=160 align="center" bgcolor="#FFFFFF" rowspan="2"');
+
+        $tit = '<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$titulo.'</b></font>';
+        $row = array ($tit);
+
+        $this->_tabla->setCellContents  (0,1,$row);
+        $this->_tabla->setCellAttributes(0,1,'align="left" bgcolor="#336699"');
+                        
+        $tmp='';
+        foreach ($body as $bod) {
+            if (is_object($bod)) {
+                if (method_exists($bod,'toHtml')) {
+                    $tmp.=$bod->toHtml();
+                }
+                else {
+                    trigger_error('El metodo no existe! - '.get_class($bod).'::toHtml()', E_USER_WARNING);
+                }                
+            }
+            else {
+                $tmp.=$bod;
+            }
+        }        
+        $row = array ($tmp);
+        $this->_tabla->setCellContents  (1,1,$body);
         $this->_tabla->setCellAttributes(1,1,'align="center" bgcolor="#FFFFFF"');
     }
     // -X2C

diff --git a/marco/php/marco/Seccion.php b/marco/php/marco/Seccion.php
index 337652cc88a5a90d6a116ad88b70e0398a420444..96692a75387b4b74f1c31daecbfffea330c670ea 100644 (file)
--- a/marco/php/marco/Seccion.php
+++ b/marco/php/marco/Seccion.php
@@ -91,6 +91,14 @@ class Seccion extends Pagina {
      */
     var $_directorio;
 
+    /**
+     *
+     * @var    string $menuHtml
+     *
+     * @access private
+     */
+    var $_menuHtml;
+
     // ~X2C
 
     // +X2C Operation 63
@@ -112,7 +120,13 @@ class Seccion extends Pagina {
         $this->_tipoMenu = $seccion['tipoMenu'];
         $this->_directorio = $directorio;
         parent::Pagina($seccion['link']);
-        $this->_cargarHijos($seccion['hijos']);
+        if (array_key_exists('hijos',$seccion)) {
+            $this->_cargarHijos($seccion['hijos']);
+        }
+        elseif (array_key_exists('subhijos',$seccion)) {
+            $this->_cargarSubHijos($seccion['subhijos']);
+        }
+
     }
     // -X2C
 
@@ -128,12 +142,18 @@ class Seccion extends Pagina {
      */
     function toHtml($link_sel) // ~X2C
     {
-        if ($this->_verifSeccionSeleccionada($link_sel)) {
-            $tmp = "<a href=\"".$this->_link."\"><img name=\"".$this->_nombre."\" src=\"images/".$this->_imagen->_imgSelect."\" border=\"0\" alt=\"".$this->_imagen->_alt."\"></a>";
+        if ($this->verifSeccionSeleccionada($link_sel)) {
+            $sec    = "<a href=\"".$this->_link."\"><img name=\"".$this->_nombre."\" src=\"images/".$this->_imagen->_imgSelect."\" border=\"0\" alt=\"".$this->_imagen->_alt."\"></a>";
+            
+            $titulo = '<font face="Arial, Helvetica, sans-serif" size="3" color="#FFFFFF"><b>'.$this->_nombre.'</b></font>';
+            return $sec;
         }
         else {
-            $tmp = "<a href=\"".$this->_link."\" onMouseOut=\"MM_swapImgRestore()\" onMouseOver=\"MM_displayStatusMsg('".$this->_nombre."'); MM_swapImage('".$this->_nombre."','','images/".$this->_imagen->_imgMouseOn."',1); return document.MM_returnValue\" MM_swapImage('".$this->_nombre."','','images/".$this->_imagen->_imgMouseOn."',1)><img name=\"".$this->_nombre."\" src=\"images/".$this->_imagen->_imgComun."\" border=\"0\" alt=\"".$this->_imagen->_alt."\"></a>";
+            $sec = "<a href=\"".$this->_link."\" onMouseOut=\"MM_swapImgRestore()\" onMouseOver=\"MM_displayStatusMsg('".$this->_nombre."'); MM_swapImage('".$this->_nombre."','','images/".$this->_imagen->_imgMouseOn."',1); return document.MM_returnValue\" MM_swapImage('".$this->_nombre."','','images/".$this->_imagen->_imgMouseOn."',1)><img name=\"".$this->_nombre."\" src=\"images/".$this->_imagen->_imgComun."\" border=\"0\" alt=\"".$this->_imagen->_alt."\"></a>";
+
+            return $sec;
         }
+        
         return $tmp;
     }
     // -X2C
@@ -159,12 +179,10 @@ class Seccion extends Pagina {
         else {
             $tmp = new MenuOculto(null);
         }
-        
         foreach ($hijos as $hijo) {
             $tmp->agregarComponente($hijo);
         }
-        $this->_hijos = array ();
-        array_push($this->_hijos, $tmp);
+        $this->_hijos = $tmp;
     }
     // -X2C
 
@@ -193,9 +211,9 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0.
      *
      * @return int
      *
-     * @access private
+     * @access public
      */
-    function _verifSeccionSeleccionada($link_sel) // ~X2C
+    function verifSeccionSeleccionada($link_sel) // ~X2C
     {
         $tmp = $this->_desSerializarArraySecciones();
         if (isset($tmp) && array_key_exists($link_sel,$tmp) && ($tmp[$link_sel] == $this->_nombre || (array_key_exists($tmp[$link_sel],$tmp) && $this->_nombre == $tmp[$tmp[$link_sel]]))) {
@@ -206,6 +224,22 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0.
     // -X2C
 
 
+    // +X2C Operation 150
+    /**
+     * Carga el array con los objetos subhijos de la seccion
+     *
+     * @param  array $subhijos Array con los nombres de los links que componen a este hijo
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _cargarSubHijos($subhijos) // ~X2C
+    {
+        echo 'LLegue aca estos en _cargarSubHijos Seccion.php';
+    }
+    // -X2C
+
 } // -X2C Class :Seccion
 
 ?>

diff --git a/marco/test/prueba/conf/confSecciones.php b/marco/test/prueba/conf/confSecciones.php
index 9101eb5e17c916ce1a57b517c031b1aa24a7115d..757d2cf73d25e9ce1f272cf5f3b3531d92fcdd3c 100644 (file)
--- a/marco/test/prueba/conf/confSecciones.php
+++ b/marco/test/prueba/conf/confSecciones.php
@@ -55,7 +55,7 @@
                                             'imagenSelect'  => '',                  //
                                             'link'          => '/www/sistemas/prueba/www/usuarios-filtrar',  //LINK DEL HIJO
                                             'mostrar'       => true,
-                                            'hijos'         => array (  '/www/sistemas/prueba/www/sarasa1',
+                                            'subhijos'      => array (  '/www/sistemas/prueba/www/sarasa1',
                                                                         '/www/sistemas/prueba/www/sarasa2',
                                                                         '/www/sistemas/prueba/www/sarasa3',
                                                                         '/www/sistemas/prueba/www/sarasa4',
@@ -79,7 +79,7 @@
             'imagenMouseOn' => '',              //
             'imagenSelect'  => '',              //
             'link'          => '/www/sistemas/prueba/www/perfiles',      //LINK DE LA SECCION
-            'tipoMenu'      => 'horizontal',      //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto)
+            'tipoMenu'      => 'oculto',      //TIPO DEL MENU DE HIJOS (vertical, horizontal, oculto)
             'hijos'         =>  array (         //HIJOS PARA EL MENU
                                     array ( 'nombre'        => 'Perfiles - Hijo',   //NOMBRE DEL HIJO 1
                                             'imagenComun'   => 'perfiles-nionio',   //IMAGEN COMUN