- Resolví un conflicto en este archivo.

[mecon/meconlib.git] / lib / MECON / HTML / QuickForm / Renderer / Tabla.php

diff --git a/lib/MECON/HTML/QuickForm/Renderer/Tabla.php b/lib/MECON/HTML/QuickForm/Renderer/Tabla.php
index 6b96831b32759427b2571230ed082a7630d69bd4..4ef1fade5b5ee88c15e5f05f402bdf285bde8ca0 100644 (file)
--- a/lib/MECON/HTML/QuickForm/Renderer/Tabla.php
+++ b/lib/MECON/HTML/QuickForm/Renderer/Tabla.php
@@ -40,7 +40,7 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     * @var      object Tabla
     * @access   private
     */
     * @var      object Tabla
     * @access   private
     */

-    var $_tabla;
+    var $tabla;

 
    /**
     * HTML con los scripts para poner antes del formulario (tipicamente
 
    /**
     * HTML con los scripts para poner antes del formulario (tipicamente


@@ -100,7 +100,7 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
             $this->setTable($param);
         }
         else {
             $this->setTable($param);
         }
         else {

-            $this->_tabla =& new MECON_HTML_Tabla($param);
+            $this->tabla =& new MECON_HTML_Tabla($param);

         }
     } // end constructor
 
         }
     } // end constructor
 


@@ -113,7 +113,7 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     function toHtml()
     {
         return  $this->_script . $this->_prepend .
     function toHtml()
     {
         return  $this->_script . $this->_prepend .

-                $this->_tabla->toHtml() .
+                $this->tabla->toHtml() .

                 $this->_append;
     } // end func toHtml
     
                 $this->_append;
     } // end func toHtml
     


@@ -128,8 +128,10 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     {
         # FIXME - deberia sacarlo del QuickForm
         #$this->_prepend = $form->getFormStart();
     {
         # FIXME - deberia sacarlo del QuickForm
         #$this->_prepend = $form->getFormStart();

-        $attrs = $form->getAttributesString();
+#        $attrs = $form->getAttributesString();
+        $attrs = $form->getAttributes(true);

         $this->_prepend = "\n<form$attrs>\n";
         $this->_prepend = "\n<form$attrs>\n";

+

     } // end func startForm
 
    /**
     } // end func startForm
 
    /**


@@ -144,11 +146,11 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     {
         // add a required note, if one is needed
         if (!empty($form->_required) && !$form->_freezeAll) {
     {
         // add a required note, if one is needed
         if (!empty($form->_required) && !$form->_freezeAll) {

-            $id = $this->_tabla->addRow(
-                array($form->getRequiredNote()),
-                array('colspan' => 2, 'align' => 'center', 'cabecera' => true)
+            $id = $this->tabla->addRow(
+                array('<font size="-2">'.$form->getRequiredNote().'</font>'),
+                array('colspan' => 2, 'cabecera' => true)

             );
             );

-            //$this->_tabla->updateCellAttributes($id, array('colspan' => 2));
+            //$this->tabla->updateCellAttributes($id, array('colspan' => 2));

         }
         // add form attributes and content
         //$this->_html = str_replace('{content}', $this->_html, $html);
         }
         // add form attributes and content
         //$this->_html = str_replace('{content}', $this->_html, $html);


@@ -169,9 +171,9 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     function renderHeader(&$header)
     {
         $name = $header->getName();
     function renderHeader(&$header)
     {
         $name = $header->getName();

-        $this->_tabla->addRow(
+        $this->tabla->addRow(

             array($header->toHtml()),
             array($header->toHtml()),

-            array('colspan' => 2, $name => true, 'align' => 'center')
+            array('colspan' => 2, $name => true)

         );
     } // end func renderHeader
 
         );
     } // end func renderHeader
 


@@ -188,14 +190,14 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     function renderElement(&$element, $required, $error)
     {
         if (!$this->_inGroup) {
     function renderElement(&$element, $required, $error)
     {
         if (!$this->_inGroup) {

-            $id = $this->_tabla->addRow(
+            $id = $this->tabla->addRow(

                 array(
                     $element->getLabel() . ($required ? '<font color="red">*</FONT>' : ''),
                     $element->toHtml() . ($error ? "<br><font color=\"red\">$error</FONT>" : ''),
                 )
             );
                 array(
                     $element->getLabel() . ($required ? '<font color="red">*</FONT>' : ''),
                     $element->toHtml() . ($error ? "<br><font color=\"red\">$error</FONT>" : ''),
                 )
             );

-            $this->_tabla->updateCellAttributes($id, 0, array('titulo' => true, 'align' => 'left'));
-            $this->_tabla->updateCellAttributes($id, 1, array('align' => 'left'));
+            $this->tabla->updateCellAttributes($id, 0, array('titulo' => true, 'align' => 'left'));
+            $this->tabla->updateCellAttributes($id, 1, array('align' => 'left'));

         } else {
             $this->_groupElements[] = ($element->getLabel() ? ($element->getLabel().'&nbsp;') : '') . $element->toHtml();
         }
         } else {
             $this->_groupElements[] = ($element->getLabel() ? ($element->getLabel().'&nbsp;') : '') . $element->toHtml();
         }


@@ -223,7 +225,7 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
     */
     function renderHtml(&$data)
     {
     */
     function renderHtml(&$data)
     {

-        $this->_tabla->addRow(
+        $this->tabla->addRow(

             array($header->toHtml()),
             array('colspan' => 2)
         );
             array($header->toHtml()),
             array('colspan' => 2)
         );


@@ -257,59 +259,68 @@ class MECON_HTML_QuickForm_Renderer_Tabla extends HTML_QuickForm_Renderer {
         $name = $group->getName();
         $sep = $group->_separator;
         if (strtolower($name) == 'botones') {
         $name = $group->getName();
         $sep = $group->_separator;
         if (strtolower($name) == 'botones') {

-            $id = $this->_tabla->addRow(
+            $id = $this->tabla->addRow(

                 array(join('', $this->_groupElements))
             );
                 array(join('', $this->_groupElements))
             );

-            $this->_tabla->updateCellAttributes($id, 0, array('valign' => 'middle', 'align' => 'center', 'colspan' => 2));
+            $this->tabla->updateCellAttributes($id, 0, array('valign' => 'middle', 'align' => 'center', 'colspan' => 2));

         } else {
         } else {

-            $id = $this->_tabla->addRow(
+            $id = $this->tabla->addRow(

                 array($group->getLabel(), join($sep, $this->_groupElements)),
                 array('valign' => 'middle', 'align' => 'left')
             );
                 array($group->getLabel(), join($sep, $this->_groupElements)),
                 array('valign' => 'middle', 'align' => 'left')
             );

-            $this->_tabla->updateCellAttributes($id, 0, array('titulo' => true, 'align' => 'left'));
+            $this->tabla->updateCellAttributes($id, 0, array('titulo' => true, 'align' => 'left'));

         }
         $this->_inGroup = false;
     } // end func finishGroup
     
    /**
         }
         $this->_inGroup = false;
     } // end func finishGroup
     
    /**

-    *
+    * Actualiza atributos de la tabla interna.

     *
     * @param    mixed   $attrs Html attributes
     * @access   public
     * @return   void
     *
     * @param    mixed   $attrs Html attributes
     * @access   public
     * @return   void

+    * @deprecated Usar $renderer->tabla->updateAttributes().

     */
     function updateAttributes($attrs) {
     */
     function updateAttributes($attrs) {

-        $this->_tabla->updateAttributes($attrs);
+        $this->tabla->updateAttributes($attrs);

     }
    /**
     }
    /**

-    *
+    * Setea atributos.

     *
     * @param    mixed   $attrs Html attributes
     * @access   public
     * @return   void
     *
     * @param    mixed   $attrs Html attributes
     * @access   public
     * @return   void

+    * @deprecated Usar $renderer->tabla->setAttributes().

     */
     function setAttributes($attrs) {
     */
     function setAttributes($attrs) {

-        $this->_tabla->setAttributes($attrs);
+        $this->tabla->setAttributes($attrs);

     }
    /**
     }
    /**

-    *
+    * Obtiene atributos.

     *
     * @access   public
     * @return   mixed
     *
     * @access   public
     * @return   mixed

+    * @deprecated Usar $renderer->tabla->getAttributes().

     */
     function getAttributes() {
     */
     function getAttributes() {

-        return $this->_tabla->getAttributes();
+        return $this->tabla->getAttributes();

     }
 
    /**
     }
 
    /**

-    *
+    * Setea la tabla que utilizará el renderer.

     *
     * @param Tabla $param Objeto tabla alternativo para utilizar
     *
     * @access   public
     *
     * @param Tabla $param Objeto tabla alternativo para utilizar
     *
     * @access   public

+    *
+    * @deprecated Usar $renderer->tabla.

     */
     */

-    function setTable($param) {
-        $this->_tabla =& $param;
+    function setTable(&$param) {
+        $this->tabla =& $param;
+    }
+
+    function getCSS() {
+        return $this->tabla->getCSS();

     }
 
 } // end class HTML_QuickForm_Renderer_Default
     }
 
 } // end class HTML_QuickForm_Renderer_Default