Merge pull request #56 from alejandro-fiore/master

Fix wrong class assigned to button of type "reset"
neilime · Feb 23, 2014 · eabfd43 · eabfd43
2 parents 9b9a4f1 + 4f5e2ac
commit eabfd43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/TwbBundle/Form/View/Helper/TwbBundleFormElement.php b/src/TwbBundle/Form/View/Helper/TwbBundleFormElement.php
@@ -42,7 +42,7 @@ public function render(\Zend\Form\ElementInterface $oElement)
         //Add form-controll class
         $sElementType = $oElement->getAttribute('type');
 
-        if (!in_array($sElementType, array('file', 'checkbox', 'radio', 'submit', 'multi_checkbox', 'static', 'button'))) {
+        if (!in_array($sElementType, array('file', 'checkbox', 'radio', 'submit', 'multi_checkbox', 'static', 'button', 'reset'))) {
             if ($sElementClass = $oElement->getAttribute('class')) {
                 if (!preg_match('/(\s|^)form-control(\s|$)/', $sElementClass)) $oElement->setAttribute('class', trim($sElementClass . ' form-control'));
             } else $oElement->setAttribute('class', 'form-control');
@@ -204,4 +204,4 @@ public function getTranslatorTextDomain()
     {
         return $this->translatorTextDomain;
     }
-}
+}
diff --git a/src/TwbBundle/Form/View/Helper/TwbBundleFormRow.php b/src/TwbBundle/Form/View/Helper/TwbBundleFormRow.php
@@ -87,7 +87,9 @@ public function render(\Zend\Form\ElementInterface $oElement)
         if (in_array($sElementType, array('checkbox')) && $sLayout !== \TwbBundle\Form\View\Helper\TwbBundleForm::LAYOUT_HORIZONTAL) {
             return $sElementContent . PHP_EOL;
         }
-        if ($sElementType === 'submit' && $sLayout === \TwbBundle\Form\View\Helper\TwbBundleForm::LAYOUT_INLINE) {
+        if (($sElementType === 'submit' || $sElementType === 'button' || $sElementType === 'reset')
+			&& $sLayout === \TwbBundle\Form\View\Helper\TwbBundleForm::LAYOUT_INLINE
+		) {
             return $sElementContent . PHP_EOL;
         }