Arreglos varios de las noticias

[mecon/intranet.git] / sistema / local_lib / HTML_Noticia.php

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index 52b472d7ee543a8652be24147ea811f1e9ca0a11..9730ac4740698d6bad692cd212b3adfa606a423a 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -31,6 +31,7 @@
 
 // +X2C includes
 require_once 'HTML/Table.php';
+require_once 'MECON/HTML/Link.php';
 // ~X2C
 
 // +X2C Class 162 :HTML_Noticia
@@ -73,6 +74,17 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array($this->noticia->getTitulo()), array('class' => 'noticias_textoazul'));
             $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'noticias_titulo_vinculos'));
             $this->addRow(array($this->noticia->getTexto()), array('class' => 'noticias_titulo_noticia'));
+            foreach($this->noticia->getLinks() as $l)
+              $this->addRow(array(new MECON_HTML_Link('una_noticia',$l['texto'],$l)));
+            foreach($this->noticia->getArchivos() as $a)
+            {
+              //Cuando se cambie la herramienta hay que usar este otro script
+              //para obtener los archivos
+              //$this->addRow(array(new MECON_HTML_Link('attach.php',$a['texto'],$a)));
+              $this->addRow(array(new MECON_HTML_Link('http://intranet.mecon.ar/get_file.epl',
+                        $a['texto'],
+                        array('NEWS.FilesForArticle.file_for_article_id' =>$a['numero']))));
+            }
             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('Fecha de publicación: %d/%m/%Y')),
                          array('class' => 'noticias_ver_mas'));
@@ -83,10 +95,6 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array("<a href='$this->volver' class='noticias_ver_mas'>".$tmp->toHTML().
                                                               'volver</a>'),
                          array('class' => 'noticias_ver_mas'));
-            foreach($this->noticia->getLinks() as $l)
-              $this->addRow(array($l));
-            foreach($this->noticia->getArchivos() as $a)
-              $this->addRow(array($a['caption']));
         return parent::toHTML();    
        }
        else