Correcciones en los style sheets

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index d11cca245acc0f3c41e1b38c0e12777ae93dabe9..a46024070ff3901ad7cb655bbb335d3b0fb05ea8 100644 (file)
--- 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)
     {
     $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;
              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 345fa517ab6d3ad115a395cab513ec48b8dc5c52..901a5accc655d6a1f0ac1658effe9b76fd7a7979 100644 (file)
--- 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');
        $params = array('width'      => '280',
                        'border'     =>'0',
                        'cellPadding'=>'0');

+        echo '<link rel="stylesheet" href="css/noticias.css">';

        parent::HTML_Table($params);
     }
     // -X2C
        parent::HTML_Table($params);
     }
     // -X2C

diff --git a/sistema/www/css/copete.css b/sistema/www/css/copete.css
index 377791de45123748a624b6a226f8a87ad0b69c5b..92ea30722d96904f5e98a8573429f6fdffa4424a 100644 (file)
--- a/sistema/www/css/copete.css
+++ b/sistema/www/css/copete.css
@@ -1,25 +1,3 @@
-BODY {\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
-       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal\r
-}\r
-P {\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
-.PagRojo {\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; line-height: normal; font-weight: normal\r
-}\r
+.TextBlue { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\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
 .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
 .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

diff --git a/sistema/www/css/noticias.css b/sistema/www/css/noticias.css
index 0dce0357c0a558c5f25a8d1cea077fd051a882a6..c81c796c76f3a05cf143f6febfbf70535ac18b76 100644 (file)
--- a/sistema/www/css/noticias.css
+++ b/sistema/www/css/noticias.css
@@ -1,35 +1,7 @@
-BODY {\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
-       FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal\r
-}\r
-P {\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
-.PagRojo {\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; 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
 .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
 .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/servicios.php b/sistema/www/servicios.php
index e1ba91dffec069de8eee1bf4394bb7168b10ee6b..bd80c91e7464ca77abe7a5ec0fd19275f86ecf47 100644 (file)
--- 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';
   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,
   $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');
        '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 30bb291bf8e23fadae207d9f8d9a3f31dba02094..2ec1d8abae8bed95660013e576473c65fec8e8e0 100644 (file)
--- 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';
   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,
   $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');
        '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 23c3a9f604562d25cf93eeea49180ca928fd554b..ab21da4d9c463d30e9fd13b562fc78b8b802e582 100644 (file)
--- 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 '../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,
   $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');
 
                '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'));
   $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>
 ?>
 </body>