- MENU HORIZONTAL TERMINADO......

  MENU OCULTO     TERMINADO......
  MENU VERTICAL ->Falta la funcionalidad, pero me baso en menu horizontal......
                  Tengo que agregarle a seccion una funcion que me devuelva el html
                  del menu vertial......

diff --git a/marco/doc/uml/Marco.xmi b/marco/doc/uml/Marco.xmi
index 110a1d11d72cd0f152b622fd069c587afb24f7e9..789eeb6c56bbe9a37b7384a198895a6d5fcd68eb 100644 (file)
--- a/marco/doc/uml/Marco.xmi
+++ b/marco/doc/uml/Marco.xmi
@@ -171,7 +171,7 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSe
 x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    <UML:Class stereotype="" package="" xmi.id="100" abstract="0" documentation="Clase que se encarga del manejo de los menues horizontales" name="MenuHorizontal" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="111" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuHorizontal" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="5" value="" type="string" abstract="0" documentation="Directorio en donde se encuentra la aplicacion" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="5" value="null" type="string" abstract="0" documentation="Directorio en donde se encuentra la aplicacion" name="directorio" 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" />
@@ -180,7 +180,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="103" abstract="0" documentation="" name="MenuVertical" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="110" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuVertical" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="5" value="" type="string" abstract="0" documentation="Directorio en donde se encuentra el sistema" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="5" value="null" type="string" abstract="0" documentation="Directorio en donde se encuentra el sistema" name="directorio" 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" />
@@ -189,7 +189,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="136" abstract="0" documentation="" name="MenuOculto" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="138" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuOculto" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Directorio en donde se encuentra el sistema" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Directorio en donde se encuentra el sistema" name="directorio" 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" />
@@ -211,113 +211,111 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
   <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="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="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="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="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" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="123" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="126" 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="110" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" 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="108" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" 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="105" showattsigs="601" usesdiagramusefillcolour="0" x="179" linecolour="#ff0000" y="894" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="42" 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="320" showattsigs="601" usesdiagramusefillcolour="0" x="19" linecolour="#ff0000" y="704" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" 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="161" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="105" 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="103" showattsigs="601" usesdiagramusefillcolour="0" x="61" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="42" 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="155" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="91" 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="115" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" 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="52" showattsigs="601" usesdiagramusefillcolour="0" x="637" linecolour="#ff0000" y="114" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="13" 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="151" showattsigs="601" usesdiagramusefillcolour="0" x="459" linecolour="#ff0000" y="598" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="24" 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="143" showattsigs="601" usesdiagramusefillcolour="0" x="577" linecolour="#ff0000" y="229" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="24" 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="141" showattsigs="601" usesdiagramusefillcolour="0" x="624" linecolour="#ff0000" y="413" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="24" 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="129" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="28" 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="362" endy="249" />
+       <startpoint startx="113" starty="36" />
+       <endpoint endx="362" endy="201" />
       </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="362" endy="183" />
+       <startpoint startx="293" starty="52" />
+       <endpoint endx="362" endy="159" />
       </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="444" endy="117" />
+       <startpoint startx="598" starty="56" />
+       <endpoint endx="423" endy="117" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="432" starty="381" />
-       <endpoint endx="444" endy="315" />
+       <startpoint startx="380" starty="381" />
+       <endpoint endx="423" endy="243" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >
       <linepath>
-       <startpoint startx="126" starty="365" />
-       <endpoint endx="129" endy="226" />
+       <startpoint startx="98" starty="365" />
+       <endpoint endx="112" endy="202" />
       </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="126" endy="508" />
+       <startpoint startx="125" starty="704" />
+       <endpoint endx="98" endy="456" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="18" widgetaid="17" documentation="" type="500" >
       <linepath>
-       <startpoint startx="237" starty="759" />
-       <endpoint endx="248" endy="894" />
+       <startpoint startx="179" starty="739" />
+       <endpoint endx="231" endy="894" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
       <linepath>
-       <startpoint startx="526" starty="216" />
-       <endpoint endx="637" endy="124" />
+       <startpoint startx="485" starty="180" />
+       <endpoint endx="637" endy="120" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="100" documentation="" type="500" >
       <linepath>
-       <startpoint startx="554" starty="598" />
-       <endpoint endx="467" endy="546" />
+       <startpoint startx="534" starty="598" />
+       <endpoint endx="434" endy="486" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="103" documentation="" type="500" >
       <linepath>
-       <startpoint startx="672" starty="267" />
-       <endpoint endx="537" endy="436" />
-       <point x="697" y="324" />
+       <startpoint startx="648" starty="253" />
+       <endpoint endx="434" endy="381" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
-       <startpoint startx="231" starty="412" />
-       <endpoint endx="327" endy="436" />
+       <startpoint startx="176" starty="395" />
+       <endpoint endx="327" endy="451" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="327" starty="491" />
-       <endpoint endx="231" endy="460" />
+       <startpoint startx="327" starty="416" />
+       <endpoint endx="176" endy="425" />
       </linepath>
      </UML:AssocWidget>
      <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="397" endy="546" />
-       <point x="344" y="616" />
+       <startpoint startx="232" starty="704" />
+       <endpoint endx="380" endy="486" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="136" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="14" widgetaid="136" documentation="" type="500" >
       <linepath>
-       <startpoint startx="624" starty="432" />
-       <endpoint endx="537" endy="491" />
+       <startpoint startx="624" starty="425" />
+       <endpoint endx="488" endy="433" />
       </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" />
+       <startpoint startx="572" starty="693" />
+       <endpoint endx="534" endy="622" />
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -442,8 +440,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="815" id="67" label="link" />
        <listitem open="0" type="814" id="65" label="link" />
+       <listitem open="0" type="815" id="67" 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/marco/php/marco/ImagenAnimada.php b/marco/php/marco/ImagenAnimada.php
index 4a1f7307ffe263a3ee983529666f472c87fac65c..0ed1e29d339cf50cdd40d530052edbba392e6e92 100644 (file)
--- a/marco/php/marco/ImagenAnimada.php
+++ b/marco/php/marco/ImagenAnimada.php
@@ -73,17 +73,23 @@ class ImagenAnimada extends Imagen {
     function ImagenAnimada($imagenComun, $imagenMouseOn = null, $imagenSelect = null) // ~X2C
     {
         parent::Imagen($imagenComun);
-        if (is_null($imagenMouseOn)) {
+        if (!is_null($imagenMouseOn)) {
+            $this->_imgMouseOn = $imagenMouseOn;
+        }
+        elseif (file_exists('images/'.$imagenComun.'_f2.gif')) {
             $this->_imgMouseOn = $imagenComun.'_f2';
         }
         else {
-            $this->_imgMouseOn = $imagenMouseOn;
+            $this->_imgMouseOn = $imagenComun;
         }
-        if (is_null($imagenSelect)) {
+        if (!is_null($imagenSelect)) {
+            $this->_imgSelect = $imagenSelect;
+        }
+        elseif (file_exists('images/'.$imagenComun.'_f3.gif')) {
             $this->_imgSelect = $imagenComun.'_f3';
         }
         else {
-            $this->_imgSelect = $imagenSelect;
+            $this->_imgSelect = $imagenComun;
         }
     }
     // -X2C
@@ -104,4 +110,4 @@ class ImagenAnimada extends Imagen {
 
 } // -X2C Class :ImagenAnimada
 
-?>
\ No newline at end of file
+?>

diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php
index e5561f92f90b97a6c8a0d521152721f6aaf7138e..195431eb48717f849990b498f760e8558e7fca1e 100644 (file)
--- a/marco/php/marco/Menu.php
+++ b/marco/php/marco/Menu.php
@@ -102,23 +102,8 @@ class Menu {
     {
         $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
-//           $this = $this->_obtenerArchivo($directorio); 
-//        }
-//        else {
-         //NO ESTA SERIALIZADO EL OBJETO
-            $this->_directorio = $directorio;
-            $this->_armarArraySecciones($this->_obtenerConfSecciones());
-            
-            //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"');            
+        $this->_tabla = new HTML_Table('width=760 align="center" bgcolor="#FFFFFF" cellspacing="0" cellpadding="0" border="0"');
+        $this->_directorio = $directorio;
     }
     // -X2C
 
@@ -185,6 +170,7 @@ class Menu {
     function _armarArraySecciones($confSec) // ~X2C
     {
         $linksel = $_SERVER['PHP_SELF'];
+
         foreach ($confSec as $sec) {
             $tmp = new Seccion ($sec, $this->_directorio);         
             array_push($this->_componentes,$tmp->toHtml($linksel));
@@ -205,20 +191,25 @@ class Menu {
     function _serializarArraySecciones() // ~X2C
     {
         $secciones = include SISTEMA_CONF_SECCIONES;
-        $tmp = array();
-        foreach ($secciones as $sec) {
-            $tmp[$sec['link']] = $sec['nombre'];
+        $tmp  = array();
+        $tmp2 = array();
+        
+        foreach ($secciones as $sec) { //Chequeo las secciones
+            $tmp[$sec['nombre']] = array ($sec['link']);
             if (array_key_exists('hijos',$sec)) {
-                foreach ($sec['hijos'] as $hijo) {
-                    $tmp[$hijo['link']] = $sec['nombre'];                
+                foreach ($sec['hijos'] as $hijo) { //Chequeo las subsecciones            
+                    array_push($tmp[$sec['nombre']],$hijo['link']);
+                    $tmp2[$hijo['nombre']] = array ($hijo['link']);
                     if (array_key_exists('subhijos',$hijo)) {
-                        foreach ($hijo['subhijos'] as $nieto) {
-                            $tmp[$nieto] = $hijo['link'];
+                        foreach ($hijo['subhijos'] as $subhijo) { //Chequeo las subsubsecciones
+                            array_push($tmp[$sec['nombre']],$subhijo);
+                            array_push($tmp2[$hijo['nombre']],$subhijo);
                         }
                     }
                 }
-            }            
+            }
         }
+        $tmp = array_merge($tmp,$tmp2);
         $s = serialize($tmp);
         $fp = fopen(PRE_DIR.$this->_directorio.POST_DIR.ARRAYSECCIONES_SERIALIZADO,'w');
         fputs($fp, $s);

diff --git a/marco/php/marco/MenuHorizontal.php b/marco/php/marco/MenuHorizontal.php
index a4f9bc03d727553c3814cb96ab7567d65b3ba0a5..0273a6be1764d8a221658d19f17cad2229e1278c 100644 (file)
--- a/marco/php/marco/MenuHorizontal.php
+++ b/marco/php/marco/MenuHorizontal.php
@@ -51,7 +51,7 @@ class MenuHorizontal extends Menu {
      *
      * @access public
      */
-    function MenuHorizontal($directorio) // ~X2C
+    function MenuHorizontal($directorio = null) // ~X2C
     {
         parent::Menu($directorio);
     }
@@ -79,7 +79,14 @@ class MenuHorizontal extends Menu {
         $tmp = $this->_componentes;
         $this->_componentes = array ();
         $this->_armarArraySecciones($tmp);
-        $this->_tabla->addRow($this->_componentes,'align="center" bgcolor="#CCCCCC"');
+        $this->_tabla->addRow($this->_componentes,'align="center" bgcolor="#FFFFFF"');
+        
+
+        $colcount = $this->_tabla->getColCount();
+        $width = 100 / $colcount;
+        for ($col=0; $col < $colcount; $col++) {
+            $this->_tabla->updateColAttributes($col,'width="'.$width.'%"');
+        }        
         
         $tmp='';
         foreach ($body as $bod) {

diff --git a/marco/php/marco/MenuOculto.php b/marco/php/marco/MenuOculto.php
index 1930ba7f0d57f92e61d1de1bc20f4fa846ac2bc2..e0bf4205919f319cd23df12f76bd24a7651fd56e 100644 (file)
--- a/marco/php/marco/MenuOculto.php
+++ b/marco/php/marco/MenuOculto.php
@@ -50,7 +50,7 @@ class MenuOculto extends Menu {
      *
      * @access public
      */
-    function MenuOculto($directorio) // ~X2C
+    function MenuOculto($directorio = null) // ~X2C
     {
         parent::Menu($directorio);
     }
@@ -94,4 +94,4 @@ class MenuOculto extends Menu {
 
 } // -X2C Class :MenuOculto
 
-?>
+?>
\ No newline at end of file

diff --git a/marco/php/marco/MenuVertical.php b/marco/php/marco/MenuVertical.php
index feaeb2b9a5dde3110f4a61de682f15a9cc812f82..4f77488dab373be160545a0d58b4aa31323372db 100644 (file)
--- a/marco/php/marco/MenuVertical.php
+++ b/marco/php/marco/MenuVertical.php
@@ -50,7 +50,7 @@ class MenuVertical extends Menu {
      *
      * @access public
      */
-    function MenuVertical($directorio) // ~X2C
+    function MenuVertical($directorio = null) // ~X2C
     {
         parent::Menu($directorio);
     }
@@ -103,4 +103,4 @@ class MenuVertical extends Menu {
 
 } // -X2C Class :MenuVertical
 
-?>
+?>
\ No newline at end of file

diff --git a/marco/php/marco/Seccion.php b/marco/php/marco/Seccion.php
index 96692a75387b4b74f1c31daecbfffea330c670ea..d4dd1f8498907f24ebf62ea227927b016179537f 100644 (file)
--- a/marco/php/marco/Seccion.php
+++ b/marco/php/marco/Seccion.php
@@ -115,16 +115,26 @@ class Seccion extends Pagina {
      */
     function Seccion($seccion, $directorio) // ~X2C
     {
-        $this->_nombre   = $seccion['nombre'];
-        $this->_imagen   = new ImagenAnimada($seccion['imagenComun']);
-        $this->_tipoMenu = $seccion['tipoMenu'];
-        $this->_directorio = $directorio;
-        parent::Pagina($seccion['link']);
+        if (array_key_exists('nombre',$seccion)) { 
+            $this->_nombre   = $seccion['nombre'];
+        }
+        if (array_key_exists('imagenComun',$seccion)) {
+            $this->_imagen   = new ImagenAnimada($seccion['imagenComun']);
+        }
+        if (array_key_exists('tipoMenu',$seccion)) {
+            $this->_tipoMenu = $seccion['tipoMenu'];
+        }
+        if (!is_null($directorio)) {
+            $this->_directorio = $directorio;
+        }
+        if (array_key_exists('link',$seccion)) {
+            parent::Pagina($seccion['link']);
+        }        
         if (array_key_exists('hijos',$seccion)) {
             $this->_cargarHijos($seccion['hijos']);
         }
         elseif (array_key_exists('subhijos',$seccion)) {
-            $this->_cargarSubHijos($seccion['subhijos']);
+            //$this->_cargarSubHijos($seccion['subhijos']);
         }
 
     }
@@ -145,7 +155,6 @@ class Seccion extends Pagina {
         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 {
@@ -171,13 +180,13 @@ class Seccion extends Pagina {
     function _cargarHijos($hijos) // ~X2C
     {
         if ($this->_tipoMenu == 'vertical'){
-            $tmp = new MenuVertical(null);
+            $tmp = new MenuVertical($this->_directorio);
         }
         elseif ($this->_tipoMenu == 'horizontal') {
-            $tmp = new MenuHorizontal(null);
+            $tmp = new MenuHorizontal($this->_directorio);
         }
         else {
-            $tmp = new MenuOculto(null);
+            $tmp = new MenuOculto($this->_directorio);
         }
         foreach ($hijos as $hijo) {
             $tmp->agregarComponente($hijo);
@@ -216,10 +225,15 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0.
     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]]))) {
-            return 1;
+        $retorno = 0;
+        if (isset($tmp) && array_key_exists($this->_nombre,$tmp)) {
+            foreach ($tmp[$this->_nombre] as $t) {
+                if ($link_sel == $t) {
+                    $retorno = 1;
+                }
+            }
         }
-        return 0;
+        return $retorno;
     }
     // -X2C
 
@@ -236,7 +250,6 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0.
      */
     function _cargarSubHijos($subhijos) // ~X2C
     {
-        echo 'LLegue aca estos en _cargarSubHijos Seccion.php';
     }
     // -X2C
 

diff --git a/marco/test/prueba/www/images/usuarios-abm.gif b/marco/test/prueba/www/images/usuarios-abm.gif
index 15e37eba0f1e8af6aa502d4a90c36be722fe99c6..09e3846758c09e6196893c064c93d175945563c7 100644 (file)
Binary files a/marco/test/prueba/www/images/usuarios-abm.gif and b/marco/test/prueba/www/images/usuarios-abm.gif differ

diff --git a/marco/test/prueba/www/images/usuarios-abm_f3.gif b/marco/test/prueba/www/images/usuarios-abm_f3.gif
index 79ecfd5b6dc1e76c07fc43c9d351abf0e0b8b33a..71cd53115b0bfcc41d99c51eabc52b7bb6c93a95 100644 (file)
Binary files a/marco/test/prueba/www/images/usuarios-abm_f3.gif and b/marco/test/prueba/www/images/usuarios-abm_f3.gif differ

diff --git a/marco/test/prueba/www/images/usuarios-filtrar.gif b/marco/test/prueba/www/images/usuarios-filtrar.gif
index b242e7153647fcaa36ef18c048147df91796cb14..09e3846758c09e6196893c064c93d175945563c7 100644 (file)
Binary files a/marco/test/prueba/www/images/usuarios-filtrar.gif and b/marco/test/prueba/www/images/usuarios-filtrar.gif differ

diff --git a/marco/test/prueba/www/images/usuarios-filtrar_f3.gif b/marco/test/prueba/www/images/usuarios-filtrar_f3.gif
index eb08d2e7fad8b08bab2cf75fe40bee1ef6eeea15..71cd53115b0bfcc41d99c51eabc52b7bb6c93a95 100644 (file)
Binary files a/marco/test/prueba/www/images/usuarios-filtrar_f3.gif and b/marco/test/prueba/www/images/usuarios-filtrar_f3.gif differ

diff --git a/marco/test/prueba/www/include/prepend.php b/marco/test/prueba/www/include/prepend.php
index 2adb851cb02c0474a5530ea7066308615331b81c..d9efa7b00a5fd6d2861736794a610db9300eabb1 100644 (file)
--- a/marco/test/prueba/www/include/prepend.php
+++ b/marco/test/prueba/www/include/prepend.php
@@ -4,7 +4,7 @@
 //ARCHIVO DE PRUEBA DEL OBJETO MARCO
 require_once 'include/lib/marco/Marco.php';
 
-session_start();
+//session_start();
 
 $MARCO = new Marco ('prueba');