From: Gonzalo Merayo <merayo@gmail.com>
Date: Thu, 10 Jul 2003 19:45:07 +0000 (+0000)
Subject: saco el copete viejo
X-Git-Tag: svn_import~235
X-Git-Url: https://git.llucax.com/mecon/intranet.git/commitdiff_plain/54970ec49e9cc800d7d431b4ba5158bae780f629?ds=inline

saco el copete viejo
---

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index da4cc5b..d11cca2 100644
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -71,15 +71,15 @@ parent::HTML_Table(array('width'  => '760',
     foreach($anchos as $a)
       $fila[] = '<img src="images/blanco.gif" width="'.$a.'" height="1">';
     $this->addRow($fila);
-    $seccion = 'images/copete_'.$s.'.jpg';
-    $this->addRow(array('<img src="'.$seccion.'" width="760" height="66" border="0" usemap="#intranet">'), array('colspan' => '4'));
+    $img_seccion = 'images/copete_'.$seccion.'.jpg';
+    $this->addRow(array('<img src="'.$img_seccion.'" width="760" height="66" border="0" usemap="#intranet">'), array('colspan' => '4'));
     $fila = array();
     $fila[] = '<img src="images/copete_inicio.gif" height="30" border="0">';
     $fila[] = '<img src="images/copete_flecha_azul.gif" height="30" border="0">';
-    switch($s)
+    switch($seccion)
     {
       case 'noticias': $fila[] = 'Enlaces &uacute;tiles: <a href="http://www.mecon.gov.ar/" target="_blank"><span class="TextBlue">Ministerio 
-      de Economía y Producción</span></a><span class="TextBlue"> - <a href="http://boletinoficial.mecon.ar/" target="_blank">Bolet&iacute;n 
+      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>';
              break;
@@ -94,4 +94,4 @@ parent::HTML_Table(array('width'  => '760',
     // -X2C
 
 } // -X2C Class :HTML_Copete
-?>
\ No newline at end of file
+?>
diff --git a/sistema/local_lib/HTML_DietMarco.php b/sistema/local_lib/HTML_DietMarco.php
index a0ec461..25f16b3 100644
--- a/sistema/local_lib/HTML_DietMarco.php
+++ b/sistema/local_lib/HTML_DietMarco.php
@@ -38,50 +38,9 @@ require_once 'HTML/Page.php';
  * @access public
  */
 class HTML_DietMarco extends HTML_Page {
-    /**
-     * @var    int $body
-     * @access public
-     */
-    var $body;
-
-    /**
-     * @var    int $title
-     * @access public
-     */
-    var $title;
-
-    /**
-     * @var    int $copete
-     * @access public
-     */
-    var $copete;
-
     // ~X2C
 
-    // +X2C Operation 155
-    /**
-     * @return void
-     * @access public
-     */
-    function toHTML() // ~X2C
-    {
-        $html =& $this->copete->toHTML();
-	return $html;
-    }
-    // -X2C
 
-    // +X2C Operation 156
-    /**
-     * @param  int $body 
-     *
-     * @return void
-     * @access public
-     */
-    function addBody($body) // ~X2C
-    {
-        $this->body[] = $body
-    }
-    // -X2C
 
     // +X2C Operation 157
     /**
@@ -92,7 +51,7 @@ class HTML_DietMarco extends HTML_Page {
      */
     function addTitle($title) // ~X2C
     {
-        trigger_error('Not implemented!', E_USER_WARNING);
+        $this->_title .= ' - '.$title;
     }
     // -X2C
 
@@ -105,11 +64,16 @@ class HTML_DietMarco extends HTML_Page {
      */
     function HTML_DietMarco($seccion) // ~X2C
     {
-        $this->title = 'Intranet bla bla..';
-	$this->copete = new HTML_Copete($seccion);
-        $this->body = array();
+        parent::HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
+                                 'charset'  => 'iso-8859-1',
+                                 'lineend'  => 'unix',
+                                 'language' => 'es',
+                                 'cache'    => 'false',
+                                 'simple'   => 'true'));
+        $this->_title = 'Intranet bla bla..';
+	$this->addBodyContent(new HTML_Copete($seccion));
     }
     // -X2C
 
 } // -X2C Class :HTML_DietMarco
-?>
\ No newline at end of file
+?>
diff --git a/sistema/local_lib/copete.php b/sistema/local_lib/copete.php
deleted file mode 100644
index bc8b4da..0000000
--- a/sistema/local_lib/copete.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?
-
-
-require_once 'HTML/Table.php';
-
-
-class Copete extends HTML_Table
-{
-  function Copete($s)
-  {
-    echo '<link rel="stylesheet" href="css/copete.css">';
-    echo '<map name="intranet">
-            <area shape="rect" coords="14,0,209,54" href="#" alt="Intranet" title="Intranet" > 
-            <area shape="rect" coords="605,17,629,41" href="#" alt="Mapa de Intranet" title="Mapa de Intranet" > 
-            <area shape="rect" coords="645,17,669,41" href="#" 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" href="#" alt="E-mail" title="E-mail" > 
-            <area shape="poly" coords="473,19,473,43,475,45,561,45,563,43,563,19,561,17,475,17,473,19,473,19" href="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" href="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" href="noticias.php" alt="Noticias" title="Noticias" > 
-         </map>';
-
-
-parent::HTML_Table(array('width'  => '760',
-                             'border' => '0',
-  	 	             'cellspacing' => '0',
-  			     'cellpadding' => '0'));
-    $anchos = array('12', '25', '712', '11');
-    $fila = array();
-    foreach($anchos as $a)
-      $fila[] = '<img src="images/blanco.gif" width="'.$a.'" height="1">';
-    $this->addRow($fila);
-    $seccion = 'images/copete_'.$s.'.jpg';
-    $this->addRow(array('<img src="'.$seccion.'" width="760" height="66" border="0" usemap="#intranet">'), array('colspan' => '4'));
-    $fila = array();
-    $fila[] = '<img src="images/copete_inicio.gif" height="30" border="0">';
-    $fila[] = '<img src="images/copete_flecha_azul.gif" height="30" border="0">';
-    switch($s)
-    {
-      case 'noticias': $fila[] = 'Enlaces &uacute;tiles: <a href="http://www.mecon.gov.ar/" target="_blank"><span class="TextBlue">Ministerio 
-      de Economía y Producció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>';
-             break;
-     case 'servicios': $fila[] = '<span class="titulo_uno">Servicios</span>';
-             break;
-     case 'sistemas': $fila[] = '<span class="titulo_uno">Sistemas</span>';
-             break;
-    }
-    $fila[] = '<img src="images/copete_fin.gif" height="30" border="0">';
-    $this->addRow($fila, array('class' => 'titulo_vinculos'));
-  }
-}
-?>
diff --git a/sistema/www/noticias.php b/sistema/www/noticias.php
index 81c9931..0ebba56 100644
--- a/sistema/www/noticias.php
+++ b/sistema/www/noticias.php
@@ -1,12 +1,14 @@
-<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/HTML_Titulares.php';
+
+  $m = new HTML_DietMarco('noticias');
+  $m->addTitle('Noticias');
+  
+  $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
+  //Esto va a cambiar...
   $db = IntranetDB::connect();
   $dbdata = array(
 	        'db' => $db,
@@ -17,11 +19,11 @@
 	        'prepend_link' => 'noticias.php?grupo=');
   $arbol = new HTML_ArbolDB($dbdata, '/MECON/images/arbol_noticias.gif');
 
-  require_once '../local_lib/HTML_Titulares.php';
-  $titulares = new HTML_Titulares(null, 7);
+  $titulares = new HTML_Titulares($_GET['grupo'], 7);
   $noticias->addRow(array($arbol,$titulares));
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
   $noticias->updateCellAttributes(0, 1, array('width'=>'600'));
-  $noticias->display();
+
+  $m->addBodyContent($noticias);
+  $m->display();
 ?>
-</body>