Cambios Intranet por todos Lados

diff --git a/doc/intranet.xmi b/doc/intranet.xmi
index 0ffbba5d99e80778b3c41712b43a614ba8d384f3..699d09f7893d5ed83441f2898185b43798003cd8 100644 (file)
--- a/doc/intranet.xmi
+++ b/doc/intranet.xmi
@@ -3,13 +3,14 @@
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>

-   <XMI.exporterVersion>1.1</XMI.exporterVersion>
+   <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
+   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>

   </XMI.documentation>
   <XMI.model xmi.name="intranet" href="/home/gmeray/747/public_html/intranet/doc/intranet.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   </XMI.documentation>
   <XMI.model xmi.name="intranet" href="/home/gmeray/747/public_html/intranet/doc/intranet.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>

-  <docsettings viewid="152" documentation="" uniqueid="174" />
+  <docsettings viewid="152" documentation="" uniqueid="179" />

   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Page.php
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Page.php


@@ -24,12 +25,21 @@ x2c:include:HTML/Page.php
     <UML:Operation stereotype="" package="" xmi.id="168" type="void" abstract="0" documentation="" name="addBodyContent" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="content" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="168" type="void" abstract="0" documentation="" name="addBodyContent" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="content" static="0" scope="200" />
     </UML:Operation>

+    <UML:Operation stereotype="" package="" xmi.id="179" type="void" abstract="0" documentation="" name="setTituloCopete" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="titulo" static="0" scope="201" />
+    </UML:Operation>

    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="163" type="void" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="163" type="void" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />

+    <UML:Operation stereotype="" package="" xmi.id="175" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="176" type="void" abstract="0" documentation="" name="setTitulo" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="contenido" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="177" value="" type="int" abstract="0" documentation="" name="titulo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="178" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="201" />

    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="164" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Table.php
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="164" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Table.php


@@ -46,41 +56,57 @@ x2c:include:HTML/Table.php
     <UML:Operation stereotype="" package="" xmi.id="173" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="174" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
    </UML:Class>
     <UML:Operation stereotype="" package="" xmi.id="173" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="174" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
    </UML:Class>

+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="154" roleb="153" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="162" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="165" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="171" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

   </umlobjects>
   <diagrams>
   </umlobjects>
   <diagrams>

-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="730" snapy="10" showatts="1" xmi.id="152" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,4,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="653" >

     <widgets>
     <widgets>

-     <UML:ConceptWidget usesdiagramfillcolour="0" width="77" showattsigs="601" usesdiagramusefillcolour="0" x="108" linecolour="#ff0000" y="23" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="120" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="79" linecolour="#ff0000" y="277" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="56" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="1" width="80" showattsigs="601" usesdiagramusefillcolour="1" x="352" linecolour="none" y="75" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="208" showattsigs="601" usesdiagramusefillcolour="0" x="294" linecolour="#ff0000" y="258" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="165" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="132" showattsigs="601" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="259" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="171" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="70" showattsigs="601" usesdiagramusefillcolour="0" x="108" linecolour="#ff0000" y="23" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="207" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="109" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="178" showattsigs="601" usesdiagramusefillcolour="0" x="79" linecolour="#ff0000" y="277" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="98" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="73" showattsigs="601" usesdiagramusefillcolour="1" x="352" linecolour="none" y="75" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="181" showattsigs="601" usesdiagramusefillcolour="0" x="294" linecolour="#ff0000" y="258" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="63" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="165" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="115" showattsigs="601" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="259" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="63" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="171" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />

     </widgets>
     <messages/>
     <associations>
     </widgets>
     <messages/>
     <associations>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="153" widgetaid="154" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="153" roleBdoc="" widgetaid="154" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="7" linecolour="none" y="-11" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="133" starty="120" />
-       <endpoint endx="146" endy="55" />
+       <startpoint startx="125" starty="109" />
+       <endpoint endx="143" endy="51" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="1" widgetbid="164" roleBdoc="" widgetaid="162" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="181" starty="277" />
-       <endpoint endx="372" endy="107" />
+       <startpoint startx="168" starty="277" />
+       <endpoint endx="370" endy="103" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="164" widgetaid="165" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="2" widgetbid="164" roleBdoc="" widgetaid="165" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="398" starty="258" />
-       <endpoint endx="392" endy="107" />
+       <startpoint startx="384" starty="258" />
+       <endpoint endx="388" endy="103" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="164" widgetaid="171" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="3" widgetbid="164" roleBdoc="" widgetaid="171" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="585" starty="259" />
-       <endpoint endx="412" endy="107" />
+       <startpoint startx="576" starty="259" />
+       <endpoint endx="406" endy="103" />

       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>


@@ -89,14 +115,20 @@ x2c:include:HTML/Table.php
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >

+     <listitem open="0" type="807" id="152" label="class diagram" />

      <listitem open="1" type="813" id="162" label="HTML_Copete" >
      <listitem open="1" type="813" id="162" label="HTML_Copete" >

+      <listitem open="0" type="814" id="178" label="seccion" />
+      <listitem open="0" type="814" id="177" label="titulo" />

       <listitem open="0" type="815" id="163" label="HTML_Copete" />
       <listitem open="0" type="815" id="169" label="getCSS" />
       <listitem open="0" type="815" id="163" label="HTML_Copete" />
       <listitem open="0" type="815" id="169" label="getCSS" />

+      <listitem open="0" type="815" id="176" label="setTitulo" />
+      <listitem open="0" type="815" id="175" label="toHTML" />

      </listitem>
      <listitem open="1" type="813" id="154" label="HTML_DietMarco" >
       <listitem open="0" type="815" id="158" label="HTML_DietMarco" />
       <listitem open="0" type="815" id="168" label="addBodyContent" />
       <listitem open="0" type="815" id="157" label="addTitle" />
      </listitem>
      <listitem open="1" type="813" id="154" label="HTML_DietMarco" >
       <listitem open="0" type="815" id="158" label="HTML_DietMarco" />
       <listitem open="0" type="815" id="168" label="addBodyContent" />
       <listitem open="0" type="815" id="157" label="addTitle" />

+      <listitem open="0" type="815" id="179" label="setTituloCopete" />

      </listitem>
      <listitem open="1" type="813" id="171" label="HTML_Login" >
       <listitem open="0" type="815" id="172" label="HTML_Login" />
      </listitem>
      <listitem open="1" type="813" id="171" label="HTML_Login" >
       <listitem open="0" type="815" id="172" label="HTML_Login" />


@@ -110,9 +142,11 @@ x2c:include:HTML/Table.php
       <listitem open="0" type="815" id="167" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
       <listitem open="0" type="815" id="167" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />

-     <listitem open="0" type="807" id="152" label="class diagram" />

     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />

+    <listitem open="1" type="821" id="-1" label="Component View" />
+    <listitem open="0" type="823" id="-1" label="Diagrams" />
+    <listitem open="1" type="827" id="-1" label="Deployment View" />

    </listitem>
   </listview>
  </XMI.content>
    </listitem>
   </listview>
  </XMI.content>

diff --git a/doc/noticias.xmi b/doc/noticias.xmi
index f3056817e76c49624b3af5ba04368ccb6ef2dbc1..e7dca799713c5bff753fa9cfc75ce0829e530054 100644 (file)
--- a/doc/noticias.xmi
+++ b/doc/noticias.xmi
@@ -3,14 +3,15 @@
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>

-   <XMI.exporterVersion>1.1</XMI.exporterVersion>
+   <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
+   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>

   </XMI.documentation>
   <XMI.model xmi.name="noticias" href="/home/gmeray/747/public_html/intranet/doc/noticias.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
   </XMI.documentation>
   <XMI.model xmi.name="noticias" href="/home/gmeray/747/public_html/intranet/doc/noticias.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="

-" uniqueid="196" />
+" uniqueid="197" />

   <umlobjects>
    <UML:Class stereotype="" package="lib" xmi.id="161" abstract="0" documentation="" name="noticia" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="noticia" static="0" scope="200" >
   <umlobjects>
    <UML:Class stereotype="" package="lib" xmi.id="161" abstract="0" documentation="" name="noticia" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="noticia" static="0" scope="200" >


@@ -22,6 +23,7 @@
     <UML:Operation stereotype="" package="" xmi.id="182" type="string" abstract="0" documentation="" name="getSintesis" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="186" type="string" abstract="0" documentation="" name="getFecha" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="191" type="void" abstract="0" documentation="" name="getSeccion" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="182" type="string" abstract="0" documentation="" name="getSintesis" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="186" type="string" abstract="0" documentation="" name="getFecha" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="191" type="void" abstract="0" documentation="" name="getSeccion" static="0" scope="200" />

+    <UML:Operation stereotype="" package="" xmi.id="197" type="void" abstract="0" documentation="" name="getidSeccion" static="0" scope="200" />

     <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="int" abstract="0" documentation="" name="Noticia" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Noticia" static="0" scope="200" >
     <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="int" abstract="0" documentation="" name="Noticia" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Noticia" static="0" scope="200" >


@@ -71,34 +73,50 @@ x2c:include:HTML/Table.php
     <UML:Attribute stereotype="" package="" xmi.id="188" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
    </UML:Class>
     <UML:Attribute stereotype="" package="" xmi.id="188" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
    </UML:Class>

+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="162" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="510" rolea="161" roleb="162" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="187" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

   </umlobjects>
   <diagrams>
   </umlobjects>
   <diagrams>

-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="742" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,4,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="653" >

     <widgets>
     <widgets>

-     <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="337" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="144" usefillcolor="1" showattributes="1" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="220" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="163" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="192" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="80" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="54" linecolour="#ff0000" y="38" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="88" usefillcolor="1" showattributes="1" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="416" showattsigs="601" usesdiagramusefillcolour="0" x="265" linecolour="#ff0000" y="400" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="80" usefillcolor="1" showattributes="1" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="337" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="140" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="163" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="168" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="73" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="233" showattsigs="601" usesdiagramusefillcolour="0" x="54" linecolour="#ff0000" y="38" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="353" showattsigs="601" usesdiagramusefillcolour="0" x="265" linecolour="#ff0000" y="400" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />

     </widgets>
     <messages/>
     <associations>
     </widgets>
     <messages/>
     <associations>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="164" roleBdoc="" widgetaid="162" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="330" starty="163" />
-       <endpoint endx="477" endy="63" />
+       <startpoint startx="315" starty="163" />
+       <endpoint endx="477" endy="61" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="162" roleBdoc="" widgetaid="161" roleAdoc="" documentation="" type="510" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="102" starty="337" />
-       <endpoint endx="220" endy="259" />
+       <startpoint startx="90" starty="337" />
+       <endpoint endx="220" endy="247" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="187" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="164" roleBdoc="" widgetaid="187" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

       <linepath>
       <linepath>

-       <startpoint startx="473" starty="400" />
-       <endpoint endx="517" endy="79" />
+       <startpoint startx="441" starty="400" />
+       <endpoint endx="513" endy="75" />

       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>


@@ -107,12 +125,13 @@ x2c:include:HTML/Table.php
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >

+     <listitem open="0" type="807" id="160" label="class diagram" />

      <listitem open="1" type="813" id="162" label="HTML_Noticia" >
      <listitem open="1" type="813" id="162" label="HTML_Noticia" >

-      <listitem open="0" type="815" id="167" label="HTML_Noticia" />

       <listitem open="0" type="814" id="184" label="completa" />
       <listitem open="0" type="814" id="184" label="completa" />

-      <listitem open="0" type="815" id="195" label="getCSS" />

       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />
       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />

+      <listitem open="0" type="815" id="167" label="HTML_Noticia" />
+      <listitem open="0" type="815" id="195" label="getCSS" />

       <listitem open="0" type="815" id="175" label="setCompleta" />
       <listitem open="0" type="815" id="192" label="setLink" />
       <listitem open="0" type="815" id="176" label="setNuevo" />
       <listitem open="0" type="815" id="175" label="setCompleta" />
       <listitem open="0" type="815" id="192" label="setLink" />
       <listitem open="0" type="815" id="176" label="setNuevo" />


@@ -122,12 +141,11 @@ x2c:include:HTML/Table.php
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
      <listitem open="1" type="813" id="187" label="HTML_Titulares" >
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
      <listitem open="1" type="813" id="187" label="HTML_Titulares" >

-      <listitem open="0" type="815" id="190" label="HTML_Titulares" />

       <listitem open="0" type="814" id="188" label="antiguedad" />
       <listitem open="0" type="814" id="188" label="antiguedad" />

-      <listitem open="0" type="815" id="196" label="getCSS" />

       <listitem open="0" type="814" id="189" label="grupo_secciones" />
       <listitem open="0" type="814" id="189" label="grupo_secciones" />

+      <listitem open="0" type="815" id="190" label="HTML_Titulares" />
+      <listitem open="0" type="815" id="196" label="getCSS" />

      </listitem>
      </listitem>

-     <listitem open="0" type="807" id="160" label="class diagram" />

      <listitem open="1" type="813" id="161" label="noticia" >
       <listitem open="0" type="814" id="168" label="Noticia" />
       <listitem open="0" type="815" id="186" label="getFecha" />
      <listitem open="1" type="813" id="161" label="noticia" >
       <listitem open="0" type="814" id="168" label="Noticia" />
       <listitem open="0" type="815" id="186" label="getFecha" />


@@ -136,6 +154,7 @@ x2c:include:HTML/Table.php
       <listitem open="0" type="815" id="181" label="getTexto" />
       <listitem open="0" type="815" id="180" label="getTitulo" />
       <listitem open="0" type="815" id="183" label="getTitulo2" />
       <listitem open="0" type="815" id="181" label="getTexto" />
       <listitem open="0" type="815" id="180" label="getTitulo" />
       <listitem open="0" type="815" id="183" label="getTitulo2" />

+      <listitem open="0" type="815" id="197" label="getidSeccion" />

       <listitem open="0" type="815" id="169" label="noticia" />
      </listitem>
      <listitem open="1" type="813" id="170" label="seccion" >
       <listitem open="0" type="815" id="169" label="noticia" />
      </listitem>
      <listitem open="1" type="813" id="170" label="seccion" >


@@ -146,6 +165,9 @@ x2c:include:HTML/Table.php
      </listitem>
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
      </listitem>
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />

+    <listitem open="1" type="821" id="-1" label="Component View" />
+    <listitem open="0" type="823" id="-1" label="Diagrams" />
+    <listitem open="1" type="827" id="-1" label="Deployment View" />

    </listitem>
   </listview>
  </XMI.content>
    </listitem>
   </listview>
  </XMI.content>

diff --git a/lib/noticia.php b/lib/noticia.php
index 0b37c92ecc67368862d8c1f45fe89f83e92abfc4..bd92c7b5d54ff4f7f16d3f7d0f6f0cc4ff29a736 100644 (file)
--- a/lib/noticia.php
+++ b/lib/noticia.php
@@ -56,7 +56,7 @@ class noticia {
         $this->noticia = $noticia;
         $db = MEconDAVDB::Connect();
        $query = "SELECT A.headline, A.title, A.abstract, A.article,
         $this->noticia = $noticia;
         $db = MEconDAVDB::Connect();
        $query = "SELECT A.headline, A.title, A.abstract, A.article,

-                        A.publication_date, S.description
+                        A.publication_date, S.description, S.section_id

                  FROM Articles A, Sections S
                  WHERE Article_id = $noticia
                  AND A.section_id = S.section_id";
                  FROM Articles A, Sections S
                  WHERE Article_id = $noticia
                  AND A.section_id = S.section_id";


@@ -68,6 +68,7 @@ class noticia {
        $this->texto = $row[3];
        $this->fecha = new Date($row[4]);
        $this->seccion = $row[5];
        $this->texto = $row[3];
        $this->fecha = new Date($row[4]);
        $this->seccion = $row[5];

+       $this->id_seccion = $row[6];

     }
     // -X2C
 
     }
     // -X2C
 


@@ -137,5 +138,16 @@ class noticia {
     }
     // -X2C
 
     }
     // -X2C
 

+    // +X2C Operation 197
+    /**
+     * @return void
+     * @access public
+     */
+    function getIdSeccion() // ~X2C
+    {
+        return $this->id_seccion;
+    }
+    // -X2C
+

 } // -X2C Class :noticia
 } // -X2C Class :noticia

-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index 80becd7026401983f303366eeb5796a8f96d3c2f..42eddbeeda5d50a104e7bd3e2c8f079a4c8644a6 100644 (file)
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -38,6 +38,18 @@ require_once 'HTML/Table.php';
  * @access public
  */
 class HTML_Copete extends HTML_Table {
  * @access public
  */
 class HTML_Copete extends HTML_Table {

+    /**
+     * @var    int $titulo
+     * @access private
+     */
+    var $titulo;
+
+    /**
+     * @var    int $seccion
+     * @access private
+     */
+    var $seccion;
+

     // ~X2C
 
     // +X2C Operation 163
     // ~X2C
 
     // +X2C Operation 163


@@ -48,47 +60,79 @@ class HTML_Copete extends HTML_Table {
      * @access public
      */
     function HTML_Copete($seccion) // ~X2C
      * @access public
      */
     function HTML_Copete($seccion) // ~X2C

+    {
+      $this->seccion = $seccion;
+    }
+    // -X2C
+
+    // +X2C Operation 169
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return PATH_RAIZ."css/copete.css";
+    }
+    // -X2C
+
+    // +X2C Operation 175
+    /**
+     * @return void
+     * @access public
+     */
+    function toHTML() // ~X2C

     {
     $mapa = '<map name="intranet"
     {
     $mapa = '<map name="intranet"

-               ><area shape="rect" coords="14,0,209,54"
-                     href="#" alt="Intranet" title="Intranet"
-              ><area shape="rect" coords="605,17,629,41"
+              ><area shape="rect" coords="686,17,710,41"

                      alt="E-mail" title="E-mail"
                      href="mailto:intranet2@mecon.gov.ar"
               ><area shape="rect" coords="645,17,669,41"
                      href="https://ldapmaster.mecon.ar/bbng/servlet/ServletDispatcher?hans=gui.FormPassUsr"
                      alt="E-mail" title="E-mail"
                      href="mailto:intranet2@mecon.gov.ar"
               ><area shape="rect" coords="645,17,669,41"
                      href="https://ldapmaster.mecon.ar/bbng/servlet/ServletDispatcher?hans=gui.FormPassUsr"

-                     alt="Cambio de Clave" title="Cambio de Clave"
-              ><area shape="rect" coords="685,17,709,41" href="#"
-                     alt="Ayuda" title="Ayuda"
-              ><area shape="rect" coords="726,17,750,41" alt="Logout"
-                     title="Logout" href="'.PATH_RAIZ.'logout.php"
-              ><area shape="poly" coords="473,19,473,43,475,45,561,45,563,43,563,19,561,17,475,17,473,19,473,19"
+                     alt="Cambio de Clave" title="Cambio de Clave"';
+    if(isset($_SESSION['usuario']))
+      $mapa .=   '><area shape="rect" coords="726,17,750,41" alt="Logout"
+                       title="Logout" href="'.PATH_RAIZ.'logout.php"';
+    $mapa .=   '><area shape="rect" coords="472,17,562,44"

                      href="'.PATH_RAIZ.'sistemas.php" alt="Sistemas"
                      title="Sistemas" 
                      href="'.PATH_RAIZ.'sistemas.php" alt="Sistemas"
                      title="Sistemas" 

-              ><area shape="poly" coords="366,19,366,43,368,45,454,45,456,43,456,19,454,17,368,17,366,19,366,19"
+              ><area shape="rect" coords="366,17,456,44"

                      href="'.PATH_RAIZ.'servicios.php" alt="Servicios"
                      title="Servicios"
                      href="'.PATH_RAIZ.'servicios.php" alt="Servicios"
                      title="Servicios"

-              ><area shape="poly" coords="258,20,258,44,260,46,346,46,348,44,348,20,346,18,260,18,258,20,258,20"
+              ><area shape="rect" coords="258,17,348,44"

                      href="'.PATH_RAIZ.'noticias.php"
                      alt="Noticias" title="Noticias"
             ></map>';
 
 
                      href="'.PATH_RAIZ.'noticias.php"
                      alt="Noticias" title="Noticias"
             ></map>';
 
 

-parent::HTML_Table(array('width'  => '760',
+    parent::HTML_Table(array('width'  => '760',

                              'border' => '0',
                             'cellspacing' => '0',
                             'cellpadding' => '0'));
                              'border' => '0',
                             'cellspacing' => '0',
                             'cellpadding' => '0'));

+    

     $anchos = array('12', '25', '712', '11');
     $fila = array();
     foreach($anchos as $a)
       $fila[] = '<img src="'.PATH_RAIZ.'images/blanco.gif" width="'.$a.'" height="1">';
     $this->addRow($fila);
     $anchos = array('12', '25', '712', '11');
     $fila = array();
     foreach($anchos as $a)
       $fila[] = '<img src="'.PATH_RAIZ.'images/blanco.gif" width="'.$a.'" height="1">';
     $this->addRow($fila);

-    $img_seccion = 'images/copete_'.$seccion.'.jpg';
+    
+    if(isset($_SESSION['usuario']))
+      $img_seccion = 'images/copete_'.$this->seccion.'_logout.jpg';
+    else
+      $img_seccion = 'images/copete_'.$this->seccion.'.jpg';

     $this->addRow(array('<img src="'.PATH_RAIZ.$img_seccion.'" width="760" height="66" border="0" usemap="#intranet">'.$mapa), array('colspan' => '4'));
     $this->addRow(array('<img src="'.PATH_RAIZ.$img_seccion.'" width="760" height="66" border="0" usemap="#intranet">'.$mapa), array('colspan' => '4'));

+    

     $fila = array();
     $fila = array();

-    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_inicio.gif" height="30" border="0">';
-    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_flecha_azul.gif" height="30" border="0">';
-    switch($seccion)
+      $fila[] = new MECON_HTML_Image(PATH_RAIZ.'images/copete_inicio.gif',
+                                     null, 
+                                     array('height' => '30',
+                                           'border' => '0'));
+      $fila[] = new MECON_HTML_Image(PATH_RAIZ.'images/copete_flecha_azul.gif',
+                                     null, 
+                                     array('height' => '30',
+                                           'border' => '0'));
+/*
+    switch($this->seccion)

     {
       case 'noticias': $fila[] = 'Enlaces &uacute;tiles:
          <a href="http://www.mecon.gov.ar/" target="_blank" class="copete_TextBlue">
     {
       case 'noticias': $fila[] = 'Enlaces &uacute;tiles:
          <a href="http://www.mecon.gov.ar/" target="_blank" class="copete_TextBlue">


@@ -112,23 +156,30 @@ parent::HTML_Table(array('width'  => '760',
      case 'sistemas': $fila[] = '<span class="copete_titulo_uno">Sistemas</span>';
              break;
     }
      case 'sistemas': $fila[] = '<span class="copete_titulo_uno">Sistemas</span>';
              break;
     }

-    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_fin.gif" height="30" border="0">';
-    $this->addRow($fila, array('class' => 'copete_titulo_vinculos'));
-    {
+    */
+      $fila[] = $this->titulo;
+      $fila[] = new MECON_HTML_Image(PATH_RAIZ.'images/copete_fin.gif',
+                                     null, 
+                                     array('height' => '30',
+                                           'border' => '0'));
+      $this->addRow($fila, array('class' => 'copete_titulo_vinculos'));
+    

       for($n = 0; $n < 4; $n++)
         $this->updateCellAttributes(1, $n, array('width'=>$anchos[$n]));
       for($n = 0; $n < 4; $n++)
         $this->updateCellAttributes(1, $n, array('width'=>$anchos[$n]));

-    }
+      return parent::toHTML();

     }
     // -X2C
 
     }
     // -X2C
 

-    // +X2C Operation 169
+    // +X2C Operation 176

     /**
     /**

+     * @param  int $contenido 
+     *

      * @return void
      * @access public
      */
      * @return void
      * @access public
      */

-    function getCSS() // ~X2C
+    function setTitulo($contenido) // ~X2C

     {
     {

-        return PATH_RAIZ."css/copete.css";
+      $this->titulo = $contenido;

     }
     // -X2C
 
     }
     // -X2C
 

diff --git a/sistema/local_lib/HTML_DietMarco.php b/sistema/local_lib/HTML_DietMarco.php
index 52940577847fb78913870f7315a02a856e116cbc..e76d275bc7eef7711ee2ea393029d38ecef90779 100644 (file)
--- a/sistema/local_lib/HTML_DietMarco.php
+++ b/sistema/local_lib/HTML_DietMarco.php
@@ -66,7 +66,7 @@ class HTML_DietMarco extends HTML_Page {
      * @return void
      * @access public
      */
      * @return void
      * @access public
      */

-    function HTML_DietMarco($seccion) // ~X2C
+    function HTML_DietMarco($seccion, $titulo) // ~X2C

     {
         parent::HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
                                  'charset'  => 'iso-8859-1',
     {
         parent::HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
                                  'charset'  => 'iso-8859-1',


@@ -74,8 +74,10 @@ class HTML_DietMarco extends HTML_Page {
                                  'language' => 'es',
                                  'cache'    => 'false',
                                  'simple'   => 'true'));
                                  'language' => 'es',
                                  'cache'    => 'false',
                                  'simple'   => 'true'));

-        $this->_title = 'Intranet bla bla..';
-       $this->addBodyContent(new HTML_Copete($seccion));
+        $this->_title = 'Intranet XP';
+       $copete =& new HTML_Copete($seccion);
+        $copete->setTitulo($titulo);
+       $this->addBodyContent($copete);

     }
     // -X2C
 
     }
     // -X2C
 


@@ -94,5 +96,17 @@ class HTML_DietMarco extends HTML_Page {
     }
     // -X2C
 
     }
     // -X2C
 

+    // +X2C Operation 179
+    /**
+     * @param  int $titulo 
+     *
+     * @return void
+     * @access public
+     */
+    function setTituloCopete($titulo) // ~X2C
+    {
+    }
+    // -X2C
+

 } // -X2C Class :HTML_DietMarco
 ?>
 } // -X2C Class :HTML_DietMarco
 ?>

diff --git a/sistema/local_lib/HTML_Login.php b/sistema/local_lib/HTML_Login.php
index 4f4db5e53adce89c168592ddceaf26c09a1d6ea9..24fd8363c2d76d6688e4977d4cfa21110b875ad3 100644 (file)
--- a/sistema/local_lib/HTML_Login.php
+++ b/sistema/local_lib/HTML_Login.php
@@ -85,14 +85,19 @@ class HTML_Login extends HTML_Table {
                         '<INPUT maxLength=50 name=usuario size=10>',
                         $img->toHTML().'Contraseña:',
                         '<INPUT maxLength=50 name=password size=10 type=password>'.
                         '<INPUT maxLength=50 name=usuario size=10>',
                         $img->toHTML().'Contraseña:',
                         '<INPUT maxLength=50 name=password size=10 type=password>'.

-                        '<INPUT value="'.$_GET['redirect'].'" name=redirect type=hidden>',
+                        '<INPUT value="'.@$_GET['redirect'].@$_POST['redirect'].'" name=redirect type=hidden>',

                         '<INPUT name = Submit type=submit value=Enviar>'));
       $int->updateColAttributes(0, array('class'   => 'titulo_tabla',
                                          'bgColor' => '#003366'));
       $int->updateColAttributes(1, array('class'   => 'titulo'));
       $int->updateColAttributes(3, array('class'   => 'titulo'));
                         '<INPUT name = Submit type=submit value=Enviar>'));
       $int->updateColAttributes(0, array('class'   => 'titulo_tabla',
                                          'bgColor' => '#003366'));
       $int->updateColAttributes(1, array('class'   => 'titulo'));
       $int->updateColAttributes(3, array('class'   => 'titulo'));

+      if(isset($this->login_incorrecto) && $this->login_incorrecto == true)
+      {
+        $login_incorrecto = new MECON_HTML_Image('images/login_incorrecto.gif');
+        $login_incorrecto = '<div align=left>'.$login_incorrecto->toHTML().'</div>';
+      }else $login_incorrecto='';

       $this->addRow(array($int));
       $this->addRow(array($int));

-      return '<FORM ACTION = "login.php" METHOD = "POST">'.parent::toHTML().'</FORM>';
+      return $login_incorrecto.'<FORM ACTION = "login.php" METHOD = "POST">'.parent::toHTML().'</FORM>';

     }
     // -X2C
 
     }
     // -X2C
 

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index c1b6d2c888e872bb16fd12bca5d34e3a05803910..5aceb02cbf34712657bec44821ab2395cfa7dfdf 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -86,8 +86,10 @@ class HTML_Noticia extends HTML_Table {
        }
        else
        {
        }
        else
        {

-            $this->addRow(array($this->noticia->getSeccion()),
-                       array('class' => 'noticias_subtitulo'));
+            $seccion = $this->noticia->getSeccion();
+           if(!is_null($seccion))
+              $this->addRow(array($seccion),
+                         array('class' => 'noticias_subtitulo'));

            $img_str = null;
            if($this->nuevo)
            {
            $img_str = null;
            if($this->nuevo)
            {


@@ -99,8 +101,11 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'noticias_fecha_noticia'));
            $mas = new MECON_HTML_Image('images/noticia_mas.gif');
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'noticias_fecha_noticia'));
            $mas = new MECON_HTML_Image('images/noticia_mas.gif');

-            $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),
+           if(isset($this->vermas))
+           {
+              $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),

                          array('class' => 'noticias_ver_mas'));
                          array('class' => 'noticias_ver_mas'));

+           }

             $this->addRow(array(new MECON_HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'noticias_ver_mas'));
        }
             $this->addRow(array(new MECON_HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'noticias_ver_mas'));
        }

diff --git a/sistema/local_lib/HTML_Servicio.php b/sistema/local_lib/HTML_Servicio.php
index 1386fe48772e7e617449d0d7d833ba03ac2c49b9..c6420180db662c2b31b896f6363f8572001284dd 100644 (file)
--- a/sistema/local_lib/HTML_Servicio.php
+++ b/sistema/local_lib/HTML_Servicio.php
@@ -80,7 +80,8 @@ class HTML_Servicio extends HTML_Table {
             $this->servicio->link = 'login.php?redirect='.$this->servicio->servicio;
        $l = new MECON_HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
                             array('class' => 'servicio_titulo_tabla'));
             $this->servicio->link = 'login.php?redirect='.$this->servicio->servicio;
        $l = new MECON_HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
                             array('class' => 'servicio_titulo_tabla'));

-        $this->addRow(array('   '.$l->toHTML()),
+        //$this->addRow(array('   '.$l->toHTML()),//Volvera...
+        $this->addRow(array('   '.$this->servicio->nombre),

                          array('align' => 'center',
                                'class' => 'arboltitulo',
                                'background'=>'images/servicio_cabecera.gif',
                          array('align' => 'center',
                                'class' => 'arboltitulo',
                                'background'=>'images/servicio_cabecera.gif',


@@ -154,4 +155,4 @@ class HTML_Servicio extends HTML_Table {
     // -X2C
 
 } // -X2C Class :HTML_Servicio
     // -X2C
 
 } // -X2C Class :HTML_Servicio

-?>
+?>
\ No newline at end of file

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 9e4597bad002e1547d63e739e52db88df518cf37..03d53a0b68c3bcdbf372d67e1dfaeb79a856a5b0 100644 (file)
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -91,6 +91,7 @@ class HTML_Titulares extends HTML_Table {
       }
       $query .=  "ORDER BY Articles.publication_date desc";
       $result = $db->query($query);
       }
       $query .=  "ORDER BY Articles.publication_date desc";
       $result = $db->query($query);

+      $this->numero_noticias = $result->numRows();//FIXME no documentado

       if(DB::isError($result))
          die($result->getMessage("query mal hecho"));
       $ht1 = new HTML_Table(array('width'=>'300', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
       if(DB::isError($result))
          die($result->getMessage("query mal hecho"));
       $ht1 = new HTML_Table(array('width'=>'300', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));


@@ -99,9 +100,15 @@ class HTML_Titulares extends HTML_Table {
       while($row = $result->fetchRow())
       {
           $n = new noticia($row[0]);
       while($row = $result->fetchRow())
       {
           $n = new noticia($row[0]);

+         if(!isset($this->primera_noticia)) $this->primera_noticia = $n;
+         if(!is_null($grupo_secciones)) $n->seccion = null;

           $not = new HTML_Noticia($n);
          $not->setLink("una_noticia.php?numero=$row[0]");
           $not = new HTML_Noticia($n);
          $not->setLink("una_noticia.php?numero=$row[0]");

-         $not->setVerMas("noticias?grupo=TODO");
+         if(is_null($grupo_secciones))
+         {
+         //$n->getIdSeccion();
+           $not->setVerMas("noticias?grupo=TODO");//TODO
+         }

           if($row[1] == 'NUEVA')
               $not->setNuevo(true);
           if($impar)
           if($row[1] == 'NUEVA')
               $not->setNuevo(true);
           if($impar)

diff --git a/sistema/www/css/servicios_bandas.css b/sistema/www/css/servicios_bandas.css
index d2c18a3fec344635a8629bae32b894151ed7575f..e750b3bf576afba02bff8bcbd00514fee648b6b5 100644 (file)
--- a/sistema/www/css/servicios_bandas.css
+++ b/sistema/www/css/servicios_bandas.css
@@ -22,7 +22,7 @@
 .aclarar {\r
        BACKGROUND-POSITION: left bottom; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
 }\r
 .aclarar {\r
        BACKGROUND-POSITION: left bottom; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
 }\r

-.imprimir {\r
+.imprimir_bandas {\r

        BACKGROUND-POSITION-X: right; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal; TEXT-ALIGN: right; VERTICAL-ALIGN: middle\r
 }\r
 .titulo_dos {\r
        BACKGROUND-POSITION-X: right; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal; TEXT-ALIGN: right; VERTICAL-ALIGN: middle\r
 }\r
 .titulo_dos {\r

diff --git a/sistema/www/images/copete_noticias.jpg b/sistema/www/images/copete_noticias.jpg
index 0655aae996f1755e8e37a1b157a14abb1c0bcafe..c71889a6142c11bbafe05a140407e9a2d7a8fffb 100644 (file)
Binary files a/sistema/www/images/copete_noticias.jpg and b/sistema/www/images/copete_noticias.jpg differ

diff --git a/sistema/www/images/copete_noticias_logout.jpg b/sistema/www/images/copete_noticias_logout.jpg
new file mode 100644 (file)
index 0000000..ba86ad8
Binary files /dev/null and b/sistema/www/images/copete_noticias_logout.jpg differ

diff --git a/sistema/www/images/copete_servicios.jpg b/sistema/www/images/copete_servicios.jpg
index 942cb90f928dba58ff1a12fa4a4fab1faea1da7d..4eb9dc92ff1161079fc6c3fad95da94da4dfc3ee 100644 (file)
Binary files a/sistema/www/images/copete_servicios.jpg and b/sistema/www/images/copete_servicios.jpg differ

diff --git a/sistema/www/images/copete_servicios_logout.jpg b/sistema/www/images/copete_servicios_logout.jpg
new file mode 100644 (file)
index 0000000..552bb72
Binary files /dev/null and b/sistema/www/images/copete_servicios_logout.jpg differ

diff --git a/sistema/www/images/copete_sistemas.jpg b/sistema/www/images/copete_sistemas.jpg
index 75ce545fdeac021a6e8200be38eaf8c950083f8b..5fc9e945692f3b94085f783fcea7b86c371760aa 100644 (file)
Binary files a/sistema/www/images/copete_sistemas.jpg and b/sistema/www/images/copete_sistemas.jpg differ

diff --git a/sistema/www/images/copete_sistemas_logout.jpg b/sistema/www/images/copete_sistemas_logout.jpg
new file mode 100644 (file)
index 0000000..8188d40
Binary files /dev/null and b/sistema/www/images/copete_sistemas_logout.jpg differ

diff --git a/sistema/www/images/login_incorrecto.gif b/sistema/www/images/login_incorrecto.gif
new file mode 100644 (file)
index 0000000..d64064b
Binary files /dev/null and b/sistema/www/images/login_incorrecto.gif differ

diff --git a/sistema/www/login.php b/sistema/www/login.php
index e15ebb083acb4d0f26d2f35e356f762c2606d4ad..ca3c860d6e54975c332bfdfb09c1e548d6a2970c 100644 (file)
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -25,7 +25,7 @@
 
     if (!isset($sr)) {
     //error reading / authenticating  - return false
 
     if (!isset($sr)) {
     //error reading / authenticating  - return false

-      echo "Error leyendo!\n";
+      $error = true;

     }
     else
     {
     }
     else
     {


@@ -41,22 +41,25 @@
       // Fin Agregado MANAZAR
       
     }
       // Fin Agregado MANAZAR
       
     }

-  }else{
+  }
+  {

     if(!isset($_SESSION['usuario']))
     {
       if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
          (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
       {
     if(!isset($_SESSION['usuario']))
     {
       if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
          (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
       {

-           $m = new HTML_DietMarco('sistemas');
+           $m = new HTML_DietMarco('sistemas', 'Sistemas');

            $m->addTitle('Sistemas');
       }
       else
       {
            $m->addTitle('Sistemas');
       }
       else
       {

-           $m = new HTML_DietMarco('servicios');
+           $m = new HTML_DietMarco('servicios', 'Servicios');

            $m->addTitle('Servicios');
       }
     
       $login = new HTML_Login();
            $m->addTitle('Servicios');
       }
     
       $login = new HTML_Login();

+      if(isset($error) && $error == 1)
+      $login->login_incorrecto = true;//FIXME terminar de prgramar cuando haya ldap

       $t = new HTML_Table(array('width'       => 760,
                                 'align'       => 'center',
                                'cellspacing' => 0,
       $t = new HTML_Table(array('width'       => 760,
                                 'align'       => 'center',
                                'cellspacing' => 0,

diff --git a/sistema/www/noticias.php b/sistema/www/noticias.php
index de4e37c8fd70157f5fe711f4d4e6021ebc5ee447..809b7a97d158fc389e247ffecf81eba3afe492eb 100644 (file)
--- a/sistema/www/noticias.php
+++ b/sistema/www/noticias.php
@@ -4,7 +4,7 @@
   require_once 'MECON/HTML/ArbolDB.php';
   require_once '../local_lib/HTML_Titulares.php';
 
   require_once 'MECON/HTML/ArbolDB.php';
   require_once '../local_lib/HTML_Titulares.php';
 

-  $m = new HTML_DietMarco('noticias');
+  $m = new HTML_DietMarco('noticias', 'Noticias');

   $m->addTitle('Noticias');
   
   $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
   $m->addTitle('Noticias');
   
   $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));


@@ -27,15 +27,25 @@
                'id_activo' => $grupo,
                'nombre' => 'nombre',
                'id_padre' => 'grupo_padre',
                'id_activo' => $grupo,
                'nombre' => 'nombre',
                'id_padre' => 'grupo_padre',

+               'order' => '',

                'prepend_link' => 'noticias.php?grupo=');
   $arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');
                'prepend_link' => 'noticias.php?grupo=');
   $arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');

-

   $titulares = new HTML_Titulares($grupo, $dias);
   $titulares = new HTML_Titulares($grupo, $dias);

-  $noticias->addRow(array($arbol,$titulares));
+  if($titulares->numero_noticias != 1)//FIXME aca va > en cuanto este la pagina para cuando no hay ninguna noticia
+  {
+    $noticias->addRow(array($arbol,$titulares));
+  }elseif($titulares->numero_noticias == 1){
+    $noticia = new HTML_Noticia($titulares->primera_noticia);
+    $noticia->setVolver('noticias.php');
+    $noticia->setCompleta(true);
+    $noticias->addRow(array($arbol,$noticia));
+  }
+

   $m->addStyleSheet($arbol->getCSS());
   $m->addStyleSheet($titulares->getCSS());
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
   $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));
   $m->addStyleSheet($arbol->getCSS());
   $m->addStyleSheet($titulares->getCSS());
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
   $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));

+  

 
   $m->addBodyContent($noticias);
   $m->display();
 
   $m->addBodyContent($noticias);
   $m->display();

diff --git a/sistema/www/servicios.php b/sistema/www/servicios.php
index 3268be91f2156c08406fa3cebb7095b06b991bef..caf3d85b5f56ff370f1fd9d432ec48ac7b12aef3 100644 (file)
--- a/sistema/www/servicios.php
+++ b/sistema/www/servicios.php
@@ -4,7 +4,7 @@
   require_once 'AI/Servicio.php';
 //  require_once 'AI/DB.php';
   require_once 'DB.php';
   require_once 'AI/Servicio.php';
 //  require_once 'AI/DB.php';
   require_once 'DB.php';

-  $m = new HTML_DietMarco('servicios');
+  $m = new HTML_DietMarco('servicios', 'Servicios');

   $m->addTitle('Servicios');
  
   $n_serv = 0;
   $m->addTitle('Servicios');
  
   $n_serv = 0;

diff --git a/sistema/www/servicios/agenda/agenda1.php b/sistema/www/servicios/agenda/agenda1.php
index d4701a53789ec65e02c988bdf620f253f4e6e428..832ec3ac42c194e218f1720fbb4b4b5a5eb13868 100644 (file)
--- a/sistema/www/servicios/agenda/agenda1.php
+++ b/sistema/www/servicios/agenda/agenda1.php
@@ -42,7 +42,7 @@ if (DB::isError($DB)) {
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{
 $TABLAFORM = new MECON_HTML_Tabla ('width="500"', 'servicio');
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{
 $TABLAFORM = new MECON_HTML_Tabla ('width="500"', 'servicio');

-$MARCO     = new HTML_DietMarco('servicios');
+$MARCO     = new HTML_DietMarco('servicios', 'Servicios');

 $FORM      = new MECON_HTML_QuickForm('agenda', 'post', 'agenda2', '', array ('onSubmit' => "return validar(this)", 'action' => ''));
 $FORM->renderer->setTable($TABLAFORM);
 $TABLA     = new HTML_Table('width="760" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"');
 $FORM      = new MECON_HTML_QuickForm('agenda', 'post', 'agenda2', '', array ('onSubmit' => "return validar(this)", 'action' => ''));
 $FORM->renderer->setTable($TABLAFORM);
 $TABLA     = new HTML_Table('width="760" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"');

diff --git a/sistema/www/servicios/agenda/agenda2.php b/sistema/www/servicios/agenda/agenda2.php
index c61aa32b93f94699a36f92dffcfc22a3ce34a83f..60c60d911b1e3bfa6490d8e083da8647c7db1f29 100644 (file)
--- a/sistema/www/servicios/agenda/agenda2.php
+++ b/sistema/www/servicios/agenda/agenda2.php
@@ -38,7 +38,7 @@ if (DB::isError($DB)) {
 }
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{
 }
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{

-$MARCO     = new HTML_DietMarco('servicios');
+$MARCO     = new HTML_DietMarco('servicios', 'Servicios');

 $AGENDA    = new Servicios_Agenda ($DB);
 $TABLA     = new HTML_Table('width="760" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"');
 $LUPA      = new MECON_HTML_Image('../../images/servicios_agenda_lupa.gif');
 $AGENDA    = new Servicios_Agenda ($DB);
 $TABLA     = new HTML_Table('width="760" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"');
 $LUPA      = new MECON_HTML_Image('../../images/servicios_agenda_lupa.gif');

diff --git a/sistema/www/servicios/legajos/legajo.php b/sistema/www/servicios/legajos/legajo.php
index d583e1f19740c60c420f577d255b2f0c75fa6445..6a0b516c6edf7117311263bf7b91417413c68534 100755 (executable)
--- a/sistema/www/servicios/legajos/legajo.php
+++ b/sistema/www/servicios/legajos/legajo.php
@@ -17,7 +17,7 @@ if(!isset($_SESSION['documento']))
 }
 $nrodoc = $_SESSION['documento'];
 
 }
 $nrodoc = $_SESSION['documento'];
 

-$m = new HTML_DietMarco('servicios');
+$m = new HTML_DietMarco('servicios', 'Servicios');

 $m->addTitle('Legajo de Personal');
 $m->addStyleSheet('../../css/servicios_agenda.css');
 
 $m->addTitle('Legajo de Personal');
 $m->addStyleSheet('../../css/servicios_agenda.css');
 

diff --git a/sistema/www/sistemas.php b/sistema/www/sistemas.php
index 51b89fe8d6eca4bcae35f15367de41ec16f864ab..98512a82308b0a6fa9d77b8b28a0bf0da766a5f4 100644 (file)
--- a/sistema/www/sistemas.php
+++ b/sistema/www/sistemas.php
@@ -64,7 +64,6 @@ while ($sistema) {
                     "/sistemas/intranet/images/$sistema->icono",
                     $sistema->nombre,
                     array(
                     "/sistemas/intranet/images/$sistema->icono",
                     $sistema->nombre,
                     array(

-                        'title'  => $sistema->descripcion,

                         'border' => 0,
                         'width'  => '46',
                         'height' => '46',
                         'border' => 0,
                         'width'  => '46',
                         'height' => '46',


@@ -76,12 +75,11 @@ while ($sistema) {
                 $sistema->nombre,
                                array(),
                        array(
                 $sistema->nombre,
                                array(),
                        array(

-                                   'title'  => $sistema->descripcion,

                                    'target' => '_blank',
                     'class' => 'intranet_sistemas_txt',
                                )
                    );
                                    'target' => '_blank',
                     'class' => 'intranet_sistemas_txt',
                                )
                    );

-            $html = $link->toHtml();
+            $html = $link->toHtml() . ': ' . $sistema->descripcion;

                if ($sistema->link_ayuda) {
                 $html .= ' ';
                 $img = new MECON_HTML_Image(
                if ($sistema->link_ayuda) {
                 $html .= ' ';
                 $img = new MECON_HTML_Image(


@@ -111,7 +109,7 @@ while ($sistema) {
         }
     }
     $t->addRow(array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '));
         }
     }
     $t->addRow(array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '));

-    $t->addRow($row);
+    $t->addRow($row, array('class' => 'intranet_sistemas_txt'));

 }
 
 $m = new HTML_DietMarco('sistemas', 'Sistemas');
 }
 
 $m = new HTML_DietMarco('sistemas', 'Sistemas');


@@ -128,6 +126,9 @@ $m->addStyleDeclaration('
         text-align: left;
         vertical-align: middle;
         text-decoration: none;
         text-align: left;
         vertical-align: middle;
         text-decoration: none;

+    }
+    A.intranet_sistemas_txt {
+        font-weight: bold;

     }'
 );
 $m->addBodyContent($t);
     }'
 );
 $m->addBodyContent($t);

diff --git a/sistema/www/una_noticia.php b/sistema/www/una_noticia.php
index 4dadf4a02c4f522410e04ebe2e985f22b2498fa2..cc073610939776c6da18d189b839c1a156b8e768 100644 (file)
--- a/sistema/www/una_noticia.php
+++ b/sistema/www/una_noticia.php
@@ -5,7 +5,7 @@
   require_once '../../lib/noticia.php';
   require_once '../local_lib/HTML_Noticia.php';
   
   require_once '../../lib/noticia.php';
   require_once '../local_lib/HTML_Noticia.php';
   

-  $m = new HTML_DietMarco('noticias');
+  $m = new HTML_DietMarco('noticias', 'Noticias');

   $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
   
   $db = IntranetDB::connect();
   $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
   
   $db = IntranetDB::connect();


@@ -15,6 +15,7 @@
                'id' => 'grupo',
                'nombre' => 'nombre',
                'id_padre' => 'grupo_padre',
                'id' => 'grupo',
                'nombre' => 'nombre',
                'id_padre' => 'grupo_padre',

+               'order' => '',

                'prepend_link' => 'noticias.php?grupo=');
   $arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');
 
                'prepend_link' => 'noticias.php?grupo=');
   $arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');