Fix bootstrap3 div changes.

main/inc/lib/formvalidator/FormValidator.class.php

@@ -120,11 +120,11 @@ EOT;
     {
         return '
             <div class="form-group {error_class}">
-                <label {label-for}>
+                <label {label-for} class="col-sm-2 control-label" >
                     <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                     {label}
                 </label>
-                <div class="controls">
+                <div class="col-sm-10">
                     {element}
 
                     <!-- BEGIN label_3 -->

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

@@ -35,15 +35,13 @@
 class HTML_QuickForm_button extends HTML_QuickForm_input
 {
     /**
-     * Class constructor
-     *
-     * @param     string $elementName (optional)Input field name attribute
-     * @param     string $value (optional)Input field value
-     * @param     mixed $attributes (optional)Either a typical HTML attribute string
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
+     * @param string $elementName
+     * @param string $value
+     * @param string $icon
+     * @param string $style
+     * @param string $size
+     * @param string $class
+     * @param array  $attributes
      */
     public function HTML_QuickForm_button(
         $elementName = null,
@@ -54,6 +52,11 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
         $class = 'btn',
         $attributes = array()
     ) {
+        $icon = !empty($icon) ? $icon : 'check';
+        $style = !empty($style) ? $style : 'default';
+        $size = !empty($size) ? $size : 'default';
+        $class = !empty($class) ? $class : 'btn';
+
         $attributes['icon'] = $icon;
         $attributes['style'] = $style;
         $attributes['size'] = $size;

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

@@ -181,10 +181,7 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
             }
         }
         return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ exportValue()
+    }
 
    /**
     * We don't need values from button-type elements (except submit) and files
@@ -198,7 +195,4 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
             return parent::exportValue($submitValues, $assoc);
         }
     }
-
-    // }}}
-} // end class HTML_QuickForm_element
-?>
+}

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

@@ -115,9 +115,9 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
         } elseif ($this->_flagFrozen) {
             $label = $this->_text;
         } else {
-            $label = '<label class="radio '.$this->getAttribute('label-class').'">' .
+            $label = '<div class="radio"><label '.$this->getAttribute('label-class').'">' .
                 HTML_QuickForm_input::toHtml().$this->_text .
-                '</label>';
+                '</label></div>';
 
             return  $label;
         }

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

@@ -45,10 +45,16 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
      * @access    public
      * @return    void
      */
-    function HTML_QuickForm_text($elementName=null, $elementLabel=null, $attributes=null)
-    {
+    public function HTML_QuickForm_text(
+        $elementName = null,
+        $elementLabel = null,
+        $attributes = null
+    ) {
+        $attributes['class'] = 'form-control';
+
         HTML_QuickForm_input::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
+
         $this->setType('text');
     }