Allowing the $attribute array for static and label elements.

main/inc/lib/pear/HTML/QuickForm/element.php

@@ -42,8 +42,6 @@ require_once 'HTML/Common.php';
  */
 class HTML_QuickForm_element extends HTML_Common
 {
-    // {{{ properties
-
     /**
      * Label of the field
      * @var       string
@@ -76,9 +74,6 @@ class HTML_QuickForm_element extends HTML_Common
      */
     var $_persistantFreeze = false;
 
-    // }}}
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -89,7 +84,7 @@ class HTML_QuickForm_element extends HTML_Common
      * @access    public
      * @return    void
      */
-    function HTML_QuickForm_element($elementName=null, $elementLabel=null, $attributes=null)
+    function HTML_QuickForm_element($elementName = null, $elementLabel = null, $attributes = null)
     {
         $array = array(
             'text',
@@ -427,8 +422,6 @@ class HTML_QuickForm_element extends HTML_Common
         return true;
     } // end func onQuickFormEvent
 
-    // }}}
-    // {{{ accept()
 
    /**
     * Accepts a renderer
@@ -442,10 +435,7 @@ class HTML_QuickForm_element extends HTML_Common
     function accept(&$renderer, $required=false, $error=null)
     {
         $renderer->renderElement($this, $required, $error);
-    } // end func accept
-
-    // }}}
-    // {{{ _generateId()
+    }
 
    /**
     * Automatically generates and assigns an 'id' attribute for the element.
@@ -463,10 +453,7 @@ class HTML_QuickForm_element extends HTML_Common
         if (!$this->getAttribute('id')) {
             $this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6)));
         }
-    } // end func _generateId
-
-    // }}}
-    // {{{ exportValue()
+    }
 
    /**
     * Returns a 'safe' element's value
@@ -485,8 +472,6 @@ class HTML_QuickForm_element extends HTML_Common
         return $this->_prepareValue($value, $assoc);
     }
 
-    // }}}
-    // {{{ _prepareValue()
 
    /**
     * Used by exportValue() to prepare the value for returning
@@ -517,6 +502,4 @@ class HTML_QuickForm_element extends HTML_Common
             }
         }
     }
-
-    // }}}
-} // end class HTML_QuickForm_element
+}

main/inc/lib/pear/HTML/QuickForm/label.php

@@ -29,9 +29,9 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
      * @access public
      * @return void
      */
-    function HTML_QuickForm_label($label = null, $text = null)
+    function HTML_QuickForm_label($label = null, $text = null, $attributes = null)
     {
-        $this->HTML_QuickForm_static(null, $label, $text);
+        $this->HTML_QuickForm_static(null, $label, $text, $attributes);
         $this->_type = 'html';
     }
 
@@ -52,7 +52,12 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
 
     function toHtml()
     {
-        return '<div class="form-group">
+        $id = $this->getAttribute('id');
+        $idCondition = null;
+        if (!empty($id)) {
+            $idCondition = 'id="'.$id.'"';
+        }
+        return '<div class="form-group" '.$idCondition.' >
                     <label class="col-sm-2 control-label">'.$this->getLabel().'</label>
                     <div class="col-sm-10">
                         '.HTML_QuickForm_static::toHtml().'

main/inc/lib/pear/HTML/QuickForm/static.php

@@ -35,9 +35,8 @@ require_once 'HTML/QuickForm/element.php';
  * @version     Release: 3.2.11
  * @since       2.7
  */
-class HTML_QuickForm_static extends HTML_QuickForm_element {
-
-    // {{{ properties
+class HTML_QuickForm_static extends HTML_QuickForm_element
+{
 
     /**
      * Display text
@@ -46,9 +45,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
      */
     var $_text = null;
 
-    // }}}
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -57,17 +53,14 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
      * @access    public
      * @return    void
      */
-    function HTML_QuickForm_static($elementName=null, $elementLabel=null, $text=null)
+    function HTML_QuickForm_static($elementName = null, $elementLabel = null, $text = null, $attributes = null)
     {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel);
+        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = false;
         $this->_type = 'static';
         $this->_text = $text;
     } //end constructor
 
-    // }}}
-    // {{{ setName()
-
     /**
      * Sets the element name
      *
@@ -80,9 +73,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         $this->updateAttributes(array('name'=>$name));
     } //end func setName
 
-    // }}}
-    // {{{ getName()
-
     /**
      * Returns the element name
      *
@@ -94,8 +84,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         return $this->getAttribute('name');
     } //end func getName
 
-    // }}}
-    // {{{ setText()
 
     /**
      * Sets the text
@@ -109,9 +97,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         $this->_text = $text;
     } // end func setText
 
-    // }}}
-    // {{{ setValue()
-
     /**
      * Sets the text (uses the standard setValue call to emulate a form element.
      *
@@ -124,9 +109,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         $this->setText($text);
     } // end func setValue
 
-    // }}}
-    // {{{ toHtml()
-
     /**
      * Returns the static text element in HTML
      *
@@ -138,9 +120,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         return $this->_getTabs() . $this->_text;
     } //end func toHtml
 
-    // }}}
-    // {{{ getFrozenHtml()
-
     /**
      * Returns the value of field without HTML tags
      *
@@ -152,9 +131,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         return $this->toHtml();
     } //end func getFrozenHtml
 
-    // }}}
-    // {{{ onQuickFormEvent()
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
@@ -183,10 +159,7 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
                 parent::onQuickFormEvent($event, $arg, $caller);
         }
         return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ exportValue()
+    }
 
    /**
     * We override this here because we don't want any values from static elements
@@ -195,7 +168,4 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
     {
         return null;
     }
-
-    // }}}
-} //end class HTML_QuickForm_static
-?>
+}