From: Gonzalo Merayo <merayo@gmail.com>
Date: Thu, 10 Jul 2003 21:13:01 +0000 (+0000)
Subject: Correcciones en los style sheets
X-Git-Tag: svn_import~234
X-Git-Url: https://git.llucax.com/mecon/intranet.git/commitdiff_plain/1713650def781c16aadfd73bd9d085a1f50138c3?ds=inline;hp=54970ec49e9cc800d7d431b4ba5158bae780f629

Correcciones en los style sheets
---

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index d11cca2..a460240 100644
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -78,10 +78,22 @@ parent::HTML_Table(array('width'  => '760',
     $fila[] = '<img src="images/copete_flecha_azul.gif" height="30" border="0">';
     switch($seccion)
     {
-      case 'noticias': $fila[] = 'Enlaces &uacute;tiles: <a href="http://www.mecon.gov.ar/" target="_blank"><span class="TextBlue">Ministerio 
-      de Econom&iacute;a y Producci&oacute;n</span></a><span class="TextBlue"> - <a href="http://boletinoficial.mecon.ar/" target="_blank">Bolet&iacute;n 
-      Oficial</a> - <a href="http://infoleg.mecon.gov.ar/" target="_blank">INFOLEG</a> 
-      - <a href="http://cdi.mecon.gov.ar/" target="_blank">CDI</a></span>';
+      case 'noticias': $fila[] = 'Enlaces &uacute;tiles:
+         <a href="http://www.mecon.gov.ar/" target="_blank" class="TextBlue">
+	   Ministerio de Econom&iacute;a y Producci&oacute;n
+	 </a>
+	 -
+         <a href="http://boletinoficial.mecon.ar/" target="_blank" class="TextBlue">
+	   Bolet&iacute;n Oficial
+	 </a>
+	 -
+	 <a href="http://infoleg.mecon.gov.ar/" target="_blank" class="TextBlue">
+	   INFOLEG
+	 </a> 
+	 -
+	 <a href="http://cdi.mecon.gov.ar/" target="_blank" class="TextBlue">
+           CDI
+	 </a>';
              break;
      case 'servicios': $fila[] = '<span class="titulo_uno">Servicios</span>';
              break;
diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index 345fa51..901a5ac 100644
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -121,6 +121,7 @@ class HTML_Noticia extends HTML_Table {
 	$params = array('width'      => '280',
 	                'border'     =>'0',
 			'cellPadding'=>'0');
+        echo '<link rel="stylesheet" href="css/noticias.css">';
 	parent::HTML_Table($params);
     }
     // -X2C
diff --git a/sistema/www/css/copete.css b/sistema/www/css/copete.css
index 377791d..92ea307 100644
--- a/sistema/www/css/copete.css
+++ b/sistema/www/css/copete.css
@@ -1,25 +1,3 @@
-BODY {
-	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; line-height: normal; font-weight: normal
-}
-P {
-	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
-}
-.PagRojo {
-	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; line-height: normal; font-weight: normal
-}
+.TextBlue { 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}
diff --git a/sistema/www/css/noticias.css b/sistema/www/css/noticias.css
index 0dce035..c81c796 100644
--- a/sistema/www/css/noticias.css
+++ b/sistema/www/css/noticias.css
@@ -1,35 +1,7 @@
-BODY {
-	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; line-height: normal; font-weight: normal
-}
-P {
-	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
-}
-.PagRojo {
-	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; 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/servicios.php b/sistema/www/servicios.php
index e1ba91d..bd80c91 100644
--- a/sistema/www/servicios.php
+++ b/sistema/www/servicios.php
@@ -1,11 +1,10 @@
-<body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
-  require_once '../local_lib/copete.php';
-  $c = new Copete('servicios');
-  echo $c->toHTML();
-
+  require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/intranetdb.php';
   require_once 'MECON/HTML/Arbol/ArbolDB.php';
+  $m = new HTML_DietMarco('servicios');
+  $m->addTitle('Servicios');
+
   $db = IntranetDB::connect();
   $dbdata = array(
        'db' => $db,
@@ -15,6 +14,7 @@
        'id_padre' => 'servicio_padre',
        'link' => 'link');
   $arbol = new HTML_ArbolDB($dbdata, '/MECON/images/arbol_noticias.gif');
-  echo $arbol->toHTML();
+  
+  $m->addBodyContent($arbol);
+  $m->display();
 ?>
-</body>
diff --git a/sistema/www/sistemas.php b/sistema/www/sistemas.php
index 30bb291..2ec1d8a 100644
--- a/sistema/www/sistemas.php
+++ b/sistema/www/sistemas.php
@@ -1,11 +1,10 @@
-<body bgcolor="#FFFFFF" class="subtitulo" link="#003366" vlink="#660066" alink="#0066FF" topmargin="0">
 <?
-  require_once '../local_lib/copete.php';
-  $c = new Copete('sistemas');
-  echo $c->toHTML();
-  
+  require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/intranetdb.php';
   require_once 'MECON/HTML/Arbol/ArbolDB.php';
+  $m = new HTML_DietMarco('sistemas');
+  $m->addTitle('Sistemas');
+  
   $db = IntranetDB::connect();
   $dbdata = array(
        'db' => $db,
@@ -14,6 +13,7 @@
        'nombre' => 'sistema',
        'link' => 'link');
   $arbol = new HTML_ArbolDB($dbdata, '/MECON/images/arbol_noticias.gif');
-  echo $arbol->toHTML();
+  
+  $m->addBodyContent($arbol);
+  $m->display();
 ?>
-</body>
diff --git a/sistema/www/una_noticia.php b/sistema/www/una_noticia.php
index 23c3a9f..ab21da4 100644
--- a/sistema/www/una_noticia.php
+++ b/sistema/www/una_noticia.php
@@ -1,12 +1,13 @@
-<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';
-  $c = new Copete('noticias');
-  $c->display();
-  $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
+  require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/intranetdb.php';
   require_once 'MECON/HTML/Arbol/ArbolDB.php';
+  require_once '../../lib/noticia.php';
+  require_once '../local_lib/HTML_Noticia.php';
+  
+  $m = new HTML_DietMarco('noticias');
+  $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
+  
   $db = IntranetDB::connect();
   $dbdata = array(
 	        'db' => $db,
@@ -17,14 +18,13 @@
 	        'prepend_link' => 'noticias.php?grupo=');
   $arbol = new HTML_ArbolDB($dbdata, '/MECON/images/arbol_noticias.gif');
 
-  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'));
   $noticias->updateCellAttributes(0, 1, array('valign'=>'top'));
-  $noticias->display();
+  $m->addBodyContent($noticias);
+  $m->display();
 ?>
 </body>