From e33578d89b4900d0b4d34405bad7dadf004c42a7 Mon Sep 17 00:00:00 2001
From: Clayton Daley <clayton.daley@gmail.com>
Date: Sat, 31 Jan 2015 17:43:49 -0500
Subject: [PATCH 1/2]  - Single form render strategy that works for all
 elements and retains table structure (which `form()` or `formCollection()`
 does not do)

---
 view/zfc-user-admin/user-admin/_form.phtml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/view/zfc-user-admin/user-admin/_form.phtml b/view/zfc-user-admin/user-admin/_form.phtml
index 38055ed..ce52249 100644
--- a/view/zfc-user-admin/user-admin/_form.phtml
+++ b/view/zfc-user-admin/user-admin/_form.phtml
@@ -1,22 +1,10 @@
 <?php echo $this->form()->openTag($form) ?>
     <dl class="zend_form">
         <?php foreach ($form as $element): ?>
-            <?php $isButton = $element instanceof Zend\Form\Element\Button; ?>
-            <?php $isCheckbox = $element instanceof Zend\Form\Element\Checkbox || $element->getAttribute('type') == 'checkbox'; ?>
             <?php if ($element->getLabel() != null && !$isButton): ?>
                 <dt><?php echo $this->formLabel($element) ?></dt>
             <?php endif ?>
-            <?php if ($isButton): ?>
-                <dd><?php echo $this->formButton($element) ?></dd>
-            <?php elseif ($element instanceof Zend\Form\Element\Select): ?>
-                <dd><?php echo $this->formSelect($element) . $this->formElementErrors($element) ?></dd>
-            <?php elseif ($element instanceof Zend\Form\Element\MultiCheckbox): ?>
-                <dd><?php echo $this->formMultiCheckbox($element) . $this->formElementErrors($element) ?></dd>
-            <?php elseif ($isCheckbox): ?>
-                <dd><?php echo $this->formCheckbox($element) ?></dd>
-            <?php else: ?>
-                <dd><?php echo $this->formInput($element) . $this->formElementErrors($element) ?></dd>
-            <?php endif ?>
+            <dd><?php echo $this->formElement($element) . $this->formElementErrors($element) ?></dd>
         <?php endforeach ?>
     </dl>
 <?php if ($this->redirect): ?>

From 6371395ebb429d2c6ed2e3a7bb96089b8d0b7a62 Mon Sep 17 00:00:00 2001
From: Clayton Daley <clayton.daley@gmail.com>
Date: Sun, 1 Feb 2015 15:29:22 -0500
Subject: [PATCH 2/2]  - bug: button labels weren't being filtered out

---
 view/zfc-user-admin/user-admin/_form.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/zfc-user-admin/user-admin/_form.phtml b/view/zfc-user-admin/user-admin/_form.phtml
index ce52249..0f64c70 100644
--- a/view/zfc-user-admin/user-admin/_form.phtml
+++ b/view/zfc-user-admin/user-admin/_form.phtml
@@ -1,7 +1,7 @@
 <?php echo $this->form()->openTag($form) ?>
     <dl class="zend_form">
         <?php foreach ($form as $element): ?>
-            <?php if ($element->getLabel() != null && !$isButton): ?>
+            <?php if ($element->getLabel() != null && !$element instanceof Zend\Form\Element\Button): ?>
                 <dt><?php echo $this->formLabel($element) ?></dt>
             <?php endif ?>
             <dd><?php echo $this->formElement($element) . $this->formElementErrors($element) ?></dd>