Se usan las nuevas constantes de orden predefinido de AI_Servicio para

[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 c1b6d2c888e872bb16fd12bca5d34e3a05803910..1cb5b72b712580b1e27b0110fce9794552ca12e0 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -83,11 +83,14 @@ 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'));
             $this->addRow(array("<a href='$this->volver' class='noticias_ver_mas'>".$tmp->toHTML().
                                                               'volver</a>'),
                          array('class' => 'noticias_ver_mas'));

+        return parent::toHTML();    

        }
        else
        {
        }
        else
        {

-            $this->addRow(array($this->noticia->getSeccion()),
-                       array('class' => 'noticias_subtitulo'));
+            $seccion = $this->noticia->getSeccion();
+           if(!is_null($seccion))
+              $this->addRow(array($seccion),
+                         array('class' => 'noticias_subtitulo'));

            $img_str = null;
            if($this->nuevo)
            {
            $img_str = null;
            if($this->nuevo)
            {


@@ -99,14 +102,50 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'noticias_fecha_noticia'));
            $mas = new MECON_HTML_Image('images/noticia_mas.gif');
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
                          array('class' => 'noticias_fecha_noticia'));
            $mas = new MECON_HTML_Image('images/noticia_mas.gif');

-            $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),
+           if(isset($this->vermas))
+           {
+              $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),

                          array('class' => 'noticias_ver_mas'));
                          array('class' => 'noticias_ver_mas'));

+           }

             $this->addRow(array(new MECON_HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'noticias_ver_mas'));
             $this->addRow(array(new MECON_HTML_Image('images/noticia_linea_puntos.gif')),
                          array('class' => 'noticias_ver_mas'));

+        return @ $this->toHTML_no_tabla();    

        }
        }

-        return parent::toHTML();    

     }
     // -X2C
     }
     // -X2C

+    function toHTML_no_tabla()
+    {
+        for ($i = 0 ; $i < $this->_rows ; $i++) {
+          $strHtml .= $tabs ."\t<TR>\n";
+          for ($j = 0 ; $j < $this->_cols ; $j++) {
+            if ($this->_structure[$i][$j] == "SPANNED") {
+              $strHtml .= $tabs ."\t\t<!-- span -->\n";
+              continue;
+            }
+            $type = ($this->_structure[$i][$j]["type"] == "TH" ? "TH" : "TD");
+            $attr = $this->_structure[$i][$j]["attr"];
+            $contents = $this->_structure[$i][$j]["contents"];
+            $strHtml .= $tabs . "\t\t<$type" . $this->_getAttrString($attr) . ">";                if (is_object($contents)) {
+              if (is_subclass_of($contents, "html_common")) {
+                 $contents->setTabOffset($this->_tabOffset + 3);
+                 $contents->_nestLevel = $this->_nestLevel + 1;
+              }
+              if (method_exists($contents, "toHtml")) {
+                 $contents = $contents->toHtml();
+              } elseif (method_exists($contents, "toString")) {
+                 $contents = $contents->toString();
+              }
+            }
+            if (is_array($contents)) $contents = implode(", ",$contents);
+      if (isset($this->_autoFill) && $contents == "") $contents = $this->_autoFill;
+      $strHtml .= $contents;
+      $strHtml .= "</$type>\n";
+    }
+    $strHtml .= $tabs ."\t</TR>\n";
+  }
+  return $strHtml;
+}
+

 
     // +X2C Operation 167
     /**
 
     // +X2C Operation 167
     /**