Corrijo los estilos que se pisaban entre si

diff --git a/doc/noticias.xmi b/doc/noticias.xmi
index f1e9d466bfcf3172975892114053abea614b234c..00ce042d066a9c3e8a89d62866d8d2427c3e2df2 100644 (file)
--- a/doc/noticias.xmi
+++ b/doc/noticias.xmi
@@ -10,7 +10,7 @@
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="

-" uniqueid="191" />
+" uniqueid="194" />

   <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" >


@@ -35,6 +35,15 @@
     <UML:Operation stereotype="" package="" xmi.id="176" type="void" abstract="0" documentation="" name="setNuevo" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="bool" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="176" type="void" abstract="0" documentation="" name="setNuevo" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="bool" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
     </UML:Operation>

+    <UML:Operation stereotype="" package="" xmi.id="192" type="void" abstract="0" documentation="" name="setLink" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="193" type="void" abstract="0" documentation="" name="setVerMas" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="194" type="void" abstract="0" documentation="" name="setVolver" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
+    </UML:Operation>

     <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="noticia" abstract="0" documentation="" name="noticia" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="bool" abstract="0" documentation="" name="completa" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="noticia" abstract="0" documentation="" name="noticia" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="bool" abstract="0" documentation="" name="completa" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="" name="nuevo" static="0" scope="200" />


@@ -65,28 +74,28 @@ x2c:include:HTML/Table.php
    <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" >
     <widgets>
      <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="243" 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" />
    <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" >
     <widgets>
      <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="243" 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="225" linecolour="#ff0000" y="197" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" 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="220" showattsigs="601" usesdiagramusefillcolour="0" x="216" linecolour="#ff0000" y="189" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" 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="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="65" linecolour="#ff0000" y="62" 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="267" linecolour="#ff0000" y="363" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" 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: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="64" 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" />

     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
       <linepath>
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
       <linepath>

-       <startpoint startx="335" starty="197" />
+       <startpoint startx="326" starty="189" />

        <endpoint endx="503" endy="79" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>
        <startpoint startx="95" starty="243" />
        <endpoint endx="503" endy="79" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>
        <startpoint startx="95" starty="243" />

-       <endpoint endx="225" endy="261" />
+       <endpoint endx="216" endy="277" />

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="164" widgetaid="187" documentation="" type="500" >
       <linepath>
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="164" widgetaid="187" documentation="" type="500" >
       <linepath>

-       <startpoint startx="475" starty="363" />
+       <startpoint startx="473" starty="400" />

        <endpoint endx="530" endy="79" />
       </linepath>
      </UML:AssocWidget>
        <endpoint endx="530" endy="79" />
       </linepath>
      </UML:AssocWidget>


@@ -102,7 +111,10 @@ x2c:include:HTML/Table.php
       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />
       <listitem open="0" type="815" id="175" label="setCompleta" />
       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />
       <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="176" label="setNuevo" />

+      <listitem open="0" type="815" id="193" label="setVerMas" />
+      <listitem open="0" type="815" id="194" label="setVolver" />

       <listitem open="0" type="815" id="166" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
       <listitem open="0" type="815" id="166" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />

diff --git a/lib/noticia.php b/lib/noticia.php
index e1a38fb8bbc9451d8f9faccccf6110620b3f4129..0b37c92ecc67368862d8c1f45fe89f83e92abfc4 100644 (file)
--- a/lib/noticia.php
+++ b/lib/noticia.php
@@ -138,4 +138,4 @@ class noticia {
     // -X2C
 
 } // -X2C Class :noticia
     // -X2C
 
 } // -X2C Class :noticia

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

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index 7d275254a6adf58d53c9edd136b724878f2e9406..15b8a315605726e96eae823e90bc4a7b1808e992 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -80,7 +80,8 @@ class HTML_Noticia extends HTML_Table {
                          array('height'=>'15', 'width'=>'1', 'border'=>'0'))),
                          array('class' => 'ver_mas'));
             $tmp = new HTML_Image('images/noticia_anterior.gif');
                          array('height'=>'15', 'width'=>'1', 'border'=>'0'))),
                          array('class' => 'ver_mas'));
             $tmp = new HTML_Image('images/noticia_anterior.gif');

-            $this->addRow(array($tmp->toHTML().'volver'),
+            $this->addRow(array("<a href='$this->volver' class='ver_mas'>".$tmp->toHTML().
+                                                              'volver</a>'),

                          array('class' => 'ver_mas'));
        }
        else
                          array('class' => 'ver_mas'));
        }
        else


@@ -93,12 +94,12 @@ class HTML_Noticia extends HTML_Table {
                $nuevo = new HTML_Image('images/noticia_nuevo.gif');
                $img_str = $nuevo->toHTML();
            }
                $nuevo = new HTML_Image('images/noticia_nuevo.gif');
                $img_str = $nuevo->toHTML();
            }

-            $this->addRow(array($this->noticia->getTitulo().$img_str), array('class' => 'titulo_noticia'));
+            $this->addRow(array("<a href='$this->link' class='titulo_noticia'>".$this->noticia->getTitulo().$img_str.'<a>'), array('class' => 'titulo_noticia'));

             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'fecha_noticia'));
            $mas = new HTML_Image('images/noticia_mas.gif');
             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'fecha_noticia'));
            $mas = new HTML_Image('images/noticia_mas.gif');

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

                          array('class' => 'ver_mas'));
             $this->addRow(array(new HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'ver_mas'));
                          array('class' => 'ver_mas'));
             $this->addRow(array(new HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'ver_mas'));


@@ -151,5 +152,44 @@ class HTML_Noticia extends HTML_Table {
     }
     // -X2C
 
     }
     // -X2C
 

+    // +X2C Operation 192
+    /**
+     * @param  string $link 
+     *
+     * @return void
+     * @access public
+     */
+    function setLink($link) // ~X2C
+    {
+        $this->link = $link;
+    }
+    // -X2C
+
+    // +X2C Operation 193
+    /**
+     * @param  string $link 
+     *
+     * @return void
+     * @access public
+     */
+    function setVerMas($link) // ~X2C
+    {
+        $this->vermas = $link;
+    }
+    // -X2C
+
+    // +X2C Operation 194
+    /**
+     * @param  string $link 
+     *
+     * @return void
+     * @access public
+     */
+    function setVolver($link) // ~X2C
+    {
+        $this->volver = $link;
+    }
+    // -X2C
+

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

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 03d2b1d66abba71b706934eb0380fa7a189491e3..dfef13974f6aa20bc09154ff2172be29c84e8e36 100644 (file)
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -91,6 +91,8 @@ class HTML_Titulares extends HTML_Table {
       {
           $n = new noticia($row[0]);
           $not = new HTML_Noticia($n);
       {
           $n = new noticia($row[0]);
           $not = new HTML_Noticia($n);

+         $not->setLink("una_noticia.php?numero=$row[0]");
+         $not->setVerMas("noticias?grupo=TODO");

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


@@ -112,4 +114,4 @@ class HTML_Titulares extends HTML_Table {
     // -X2C
 
 } // -X2C Class :HTML_Titulares
     // -X2C
 
 } // -X2C Class :HTML_Titulares

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

diff --git a/sistema/www/css/copete.css b/sistema/www/css/copete.css
index 22d10a12c16771f95d5a8eee18ae7f28bae5814d..377791de45123748a624b6a226f8a87ad0b69c5b 100644 (file)
--- a/sistema/www/css/copete.css
+++ b/sistema/www/css/copete.css
@@ -23,11 +23,3 @@ P {
 .menu_activo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
 .titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
 .subtitulo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold}\r
 .menu_activo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
 .titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
 .subtitulo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold}\r

-.titulo_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: justify; vertical-align: top; font-weight: normal}\r
-.fecha_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: left bottom; text-align: left; vertical-align: bottom; font-weight: normal}\r
-.ver_mas { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: right bottom; text-align: right; vertical-align: middle ; font-weight: normal }\r
-.textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r
-.menu1 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; font-style: normal; line-height: normal; background-color: #FFFFFF; background-position: left centre; text-align: left; vertical-align: middle ; margin-left: 10px; clip:   rect(   )}\r
-.menu_activo1 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
-.menu_activo2 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
-.menu2 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-color: #FFFFFF; background-position: left centre; text-align: left; vertical-align: middle ; clip:  rect(   15px)}\r

diff --git a/sistema/www/css/noticias.css b/sistema/www/css/noticias.css
index 6b3c4f135279c7beae57979ea38cb20698a154e1..0dce0357c0a558c5f25a8d1cea077fd051a882a6 100644 (file)
--- a/sistema/www/css/noticias.css
+++ b/sistema/www/css/noticias.css
@@ -1,11 +1,13 @@
 BODY {\r
 BODY {\r

-       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: 10pt; TEXT-ALIGN: left\r
+       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; TEXT-ALIGN: left\r
+; font-style: normal; line-height: 10pt; font-weight: normal\r

 }\r
 UL {\r
 }\r
 UL {\r

-       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal\r
+       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal\r

 }\r
 P {\r
 }\r
 P {\r

-       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal\r
+       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt\r
+; font-style: normal; line-height: normal; font-weight: normal\r

 }\r
 .PagNegro {\r
        COLOR: #000000; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none\r
 }\r
 .PagNegro {\r
        COLOR: #000000; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none\r


@@ -14,44 +16,20 @@ P {
        COLOR: #006699; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none\r
 }\r
 .TextBlue {\r
        COLOR: #006699; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none\r
 }\r
 .TextBlue {\r

-       COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal\r
-}\r
-.titulo_vinculos {\r
-       BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left\r
-}\r
-.menu {\r
-       BACKGROUND-COLOR: #ffffff; BACKGROUND-POSITION: left 50%; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.menu_activo {\r
-       BACKGROUND-COLOR: #ffcc99; BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.titulo_uno {\r
-       BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.subtitulo {\r
-       BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.titulo_noticia {\r
-       BACKGROUND-POSITION-X: left; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal; TEXT-ALIGN: justify; VERTICAL-ALIGN: top\r
-}\r
-.fecha_noticia {\r
-       BACKGROUND-POSITION: left bottom; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: bottom\r
-}\r
-.ver_mas {\r
-       BACKGROUND-POSITION: right bottom; 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
-.textoazul {\r
-       COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal\r
-}\r
-.menu1 {\r
-       BACKGROUND-COLOR: #ffffff; BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; FONT-STYLE: normal; LINE-HEIGHT: normal; MARGIN-LEFT: 10px; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.menu_activo1 {\r
-       BACKGROUND-COLOR: #ffcc99; BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; FONT-STYLE: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.menu_activo2 {\r
-       BACKGROUND-COLOR: #ffcc99; BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
-.menu2 {\r
-       BACKGROUND-COLOR: #ffffff; BACKGROUND-POSITION-X: left; CLIP: rect(15px 15px 15px 15px); COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; FONT-STYLE: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
-}\r
+       COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal\r
+}\r
+.titulo_vinculos { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-WEIGHT: bold ; font-style: normal; line-height: normal; background-position: left centre; text-align: left }\r
+.menu { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-color: #FFFFFF; background-position: left; text-align: left; vertical-align: middle }\r
+.menu_activo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
+.titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
+.subtitulo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold}\r
+.titulo_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: top; font-weight: normal}\r
+.fecha_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: left bottom; text-align: left; vertical-align: bottom; font-weight: normal}\r
+.ver_mas { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: right bottom; text-align: right; vertical-align: middle ; font-weight: normal }\r
+.textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r
+.menu1 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; font-style: normal; line-height: normal; background-color: #FFFFFF; background-position: left centre; text-align: left; vertical-align: middle ; margin-left: 10px; clip:   rect(   )}\r
+.menu_activo1 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
+.menu_activo2 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-color: #FFCC99; background-position: left centre; text-align: left; vertical-align: middle }\r
+.menu2 { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-color: #FFFFFF; background-position: left centre; text-align: left; vertical-align: middle ; clip:  rect(   15px)}\r
+.titulo_form { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 11pt; font-style: normal; line-height: normal; background-position: centre centre; text-align: centre; vertical-align: middle ; font-weight: normal}\r
+.textorojo { COLOR: #FF6600; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: bold}\r

diff --git a/sistema/www/noticias.php b/sistema/www/noticias.php
index 8a6c0b26013ca19c4814d5a4f30486c435368bd2..81c9931fd59c85a141ccbf7d5c7c3f7c043f7e55 100644 (file)
--- a/sistema/www/noticias.php
+++ b/sistema/www/noticias.php
@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="css/noticias.css">

 <body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
   require_once '../local_lib/copete.php';
 <body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
   require_once '../local_lib/copete.php';

diff --git a/sistema/www/una_noticia.php b/sistema/www/una_noticia.php
index 30346bec66a8d05968c8b30f668cb95deb25a6ef..23c3a9f604562d25cf93eeea49180ca928fd554b 100644 (file)
--- a/sistema/www/una_noticia.php
+++ b/sistema/www/una_noticia.php
@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="css/noticias.css">

 <body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
   require_once '../local_lib/copete.php';
 <body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
   require_once '../local_lib/copete.php';


@@ -19,6 +20,7 @@
   require_once '../../lib/noticia.php';
   require_once '../local_lib/HTML_Noticia.php';
   $noticia = new HTML_Noticia(new noticia($_GET['numero']));
   require_once '../../lib/noticia.php';
   require_once '../local_lib/HTML_Noticia.php';
   $noticia = new HTML_Noticia(new noticia($_GET['numero']));

+  $noticia->setVolver('noticias.php');

   $noticia->setCompleta(true);
   $noticias->addRow(array($arbol,$noticia));
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top'));
   $noticia->setCompleta(true);
   $noticias->addRow(array($arbol,$noticia));
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top'));