Se realizan correcciones varias derivadas del primer testing.

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

diff --git a/sistema/local_lib/HTML_DietMarco.php b/sistema/local_lib/HTML_DietMarco.php
index d70dde3d73bf1b3fd8954404d3297f6a91d0e9bb..56f88104cd58089d091afdd0b84f1b44da0f39e2 100644 (file)
--- a/sistema/local_lib/HTML_DietMarco.php
+++ b/sistema/local_lib/HTML_DietMarco.php
@@ -27,39 +27,31 @@
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 

-session_start();//FIXME esto va en algun otro lado...
-

 define('PATH_RAIZ','/sistemas/intranet/');
 
 require_once 'HTML_Copete.php';
 define('PATH_RAIZ','/sistemas/intranet/');
 
 require_once 'HTML_Copete.php';

-
-// +X2C includes

 require_once 'HTML/Page.php';
 require_once 'HTML/Page.php';

-// ~X2C

 
 

-// +X2C Class 154 :HTML_DietMarco

 /**
  * @access public
  */
 class HTML_DietMarco extends HTML_Page {
 /**
  * @access public
  */
 class HTML_DietMarco extends HTML_Page {

-    // ~X2C
-

 
 

+    var $_copete_seccion;
+    var $_copete_titulo;
+    var $_cuerpo = array();

 
 

-    // +X2C Operation 157

     /**
      * @param  int $title 
      *
      * @return void
      * @access public
      */
     /**
      * @param  int $title 
      *
      * @return void
      * @access public
      */

-    function addTitle($title) // ~X2C
+    function addTitle($title)

     {
     {

-        $this->_title .= ' - '.$title;
+        $this->setTitle($this->getTitle() . ' - ' . $title);

     }
     }

-    // -X2C

 
 

-    // +X2C Operation 158

     /**
      * @param  string $seccion 
      * @param  string $titulo 
     /**
      * @param  string $seccion 
      * @param  string $titulo 


@@ -67,7 +59,7 @@ class HTML_DietMarco extends HTML_Page {
      * @return void
      * @access public
      */
      * @return void
      * @access public
      */

-    function HTML_DietMarco($seccion, $titulo) // ~X2C
+    function HTML_DietMarco($seccion, $titulo)

     {
         parent::HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
                                  'charset'  => 'iso-8859-1',
     {
         parent::HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
                                  'charset'  => 'iso-8859-1',


@@ -75,41 +67,68 @@ class HTML_DietMarco extends HTML_Page {
                                  'language' => 'es',
                                  'cache'    => 'false',
                                  'simple'   => 'true'));
                                  'language' => 'es',
                                  'cache'    => 'false',
                                  'simple'   => 'true'));

-        $this->_title = 'Intranet XP';
-           $copete =& new HTML_Copete($seccion);
-        $copete->setTitulo($titulo);
-        $this->addStyleSheet('css/dietmarco.css');
-           $this->addBodyContent($copete);
-        
+        $this->setTitle('Intranet');
+       $this->_copete_titulo = $titulo;
+        $this->_copete_seccion = $seccion;
+        $this->addStyleSheet(PATH_RAIZ.'css/dietmarco');

     }
     }

-    // -X2C

 
 

-    // +X2C Operation 168

     /**
      * @param  int $content 
      *
      * @return void
      * @access public
      */
     /**
      * @param  int $content 
      *
      * @return void
      * @access public
      */

-    function addBodyContent($content) // ~X2C
+    function addBodyContent($content)

     {
         if(method_exists($content, 'getcss'))
            $this->addStyleSheet($content->getCSS());
     {
         if(method_exists($content, 'getcss'))
            $this->addStyleSheet($content->getCSS());

-        parent::addBodyContent($content);
+       $this->_cuerpo[] = $content;

     }
     }

-    // -X2C

 
 

-    // +X2C Operation 179
-    /**
-     * @param  int $titulo 
-     *
-     * @return void
-     * @access public
-     */
-    function setTituloCopete($titulo) // ~X2C
+    function toHtml()
+    {
+        $table = new HTML_Table(array('border' => 0, 'cellspacing' => 0, 'cellpadding' => 0));
+        $copete =& new HTML_Copete($this->_copete_seccion);
+        $copete->setTitulo($this->_copete_titulo);
+        $this->addStyleSheet($copete->getCSS());
+        $table->addRow(array($copete));
+        $table->addRow(array(' '));
+        $table->addRow(array($this->_arrayToHtml($this->_cuerpo)));
+        parent::addBodyContent($table);
+        return parent::toHtml();
+    }
+
+    function _arrayToHtml(&$array)

     {
     {

+        // Robado de HTML_Page.
+        $lnEnd = $this->_getLineEnd();
+        $tab = $this->_getTab();
+        $strHtml = '';
+        foreach ($array as $element) {
+            if (is_object($element)) {
+                if (is_subclass_of($element, 'html_common')) {
+                    $element->setTabOffset(1);
+                    $element->setTab($tab);
+                    $element->setLineEnd($lnEnd);
+                }
+                if (is_object($element)) {
+                    if (method_exists($element, 'toHtml')) {
+                        $strHtml .= $element->toHtml() . $lnEnd;
+                    } elseif (method_exists($element, 'toString')) {
+                        $strHtml .= $element->toString() . $lnEnd;
+                    }
+                } else {
+                    $strHtml .= $tab . $element . $lnEnd;
+                }
+            } elseif (is_array($element)) {
+                $strHtml .= $this->_arrayToHtml($element);
+            } else {
+                $strHtml .= $tab . $element . $lnEnd;
+            }
+        }
+        return $strHtml;

     }
     }

-    // -X2C

 
 

-} // -X2C Class :HTML_DietMarco
+}

 ?>
 ?>