From: Gonzalo Merayo Date: Tue, 8 Jul 2003 18:53:37 +0000 (+0000) Subject: Corrijo los estilos que se pisaban entre si X-Git-Tag: svn_import~238 X-Git-Url: https://git.llucax.com/mecon/intranet.git/commitdiff_plain/5c4a90780e6b44a93909ce459cfb8814d66c3a23?ds=sidebyside Corrijo los estilos que se pisaban entre si --- diff --git a/doc/noticias.xmi b/doc/noticias.xmi index f1e9d46..00ce042 100644 --- a/doc/noticias.xmi +++ b/doc/noticias.xmi @@ -10,7 +10,7 @@ +" uniqueid="194" /> @@ -35,6 +35,15 @@ + + + + + + + + + @@ -65,28 +74,28 @@ x2c:include:HTML/Table.php - + - - + + - + - + - + @@ -102,7 +111,10 @@ x2c:include:HTML/Table.php + + + diff --git a/lib/noticia.php b/lib/noticia.php index e1a38fb..0b37c92 100644 --- a/lib/noticia.php +++ b/lib/noticia.php @@ -138,4 +138,4 @@ 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 7d27525..15b8a31 100644 --- 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'); - $this->addRow(array($tmp->toHTML().'volver'), + $this->addRow(array("".$tmp->toHTML(). + 'volver'), 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(); } - $this->addRow(array($this->noticia->getTitulo().$img_str), array('class' => 'titulo_noticia')); + $this->addRow(array("".$this->noticia->getTitulo().$img_str.''), 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'); - $this->addRow(array($mas->toHTML().'ver más'), + $this->addRow(array("".$mas->toHTML().'ver más'), 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 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 ?> diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php index 03d2b1d..dfef139 100644 --- 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); + $not->setLink("una_noticia.php?numero=$row[0]"); + $not->setVerMas("noticias?grupo=TODO"); if($row[1] == 'NUEVA') $not->setNuevo(true); if($impar) @@ -112,4 +114,4 @@ class HTML_Titulares extends HTML_Table { // -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 22d10a1..377791d 100644 --- 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 } .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 } .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} -.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} -.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} -.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 } -.textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal } -.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( )} -.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 } -.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 } -.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)} diff --git a/sistema/www/css/noticias.css b/sistema/www/css/noticias.css index 6b3c4f1..0dce035 100644 --- a/sistema/www/css/noticias.css +++ b/sistema/www/css/noticias.css @@ -1,11 +1,13 @@ BODY { - FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: 10pt; TEXT-ALIGN: left + FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; TEXT-ALIGN: left +; font-style: normal; line-height: 10pt; font-weight: normal } UL { - FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal + FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal } P { - FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal + FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt +; font-style: normal; line-height: normal; font-weight: normal } .PagNegro { COLOR: #000000; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none @@ -14,44 +16,20 @@ P { COLOR: #006699; FONT-FAMILY: Verdana, Tahoma; FONT-SIZE: 8pt; TEXT-DECORATION: none } .TextBlue { - COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal -} -.titulo_vinculos { - 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 -} -.menu { - 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 -} -.menu_activo { - 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 -} -.titulo_uno { - 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 -} -.subtitulo { - 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 -} -.titulo_noticia { - 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 -} -.fecha_noticia { - 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 -} -.ver_mas { - 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 -} -.textoazul { - COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal -} -.menu1 { - 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 -} -.menu_activo1 { - 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 -} -.menu_activo2 { - 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 -} -.menu2 { - 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 -} + COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal +} +.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 } +.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 } +.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 } +.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 } +.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} +.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} +.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} +.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 } +.textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal } +.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( )} +.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 } +.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 } +.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)} +.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} +.textorojo { COLOR: #FF6600; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: bold} diff --git a/sistema/www/noticias.php b/sistema/www/noticias.php index 8a6c0b2..81c9931 100644 --- a/sistema/www/noticias.php +++ b/sistema/www/noticias.php @@ -1,3 +1,4 @@ + setVolver('noticias.php'); $noticia->setCompleta(true); $noticias->addRow(array($arbol,$noticia)); $noticias->updateCellAttributes(0, 0, array('valign'=>'top'));