Updated to user forms 3

milkyway-multimedia · Oct 5, 2015 · de40bc5 · de40bc5
1 parent b137695
commit de40bc5
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 54 deletions.
diff --git a/js/mwm.zen-forms.js b/js/mwm.zen-forms.js
diff --git a/src/FormBootstrapper.php b/src/FormBootstrapper.php
@@ -19,44 +19,6 @@ class FormBootstrapper extends AbstractFormDecorator
         'RequestHandler',
     ];
 
-    public $template = 'Form_bootstrapped';
-
-    public static function reset_template_for(Decorator $item, $templateName)
-    {
-        $originalTemplates = $item->up()->getTemplate();
-        $originalItemClass = get_class($item->original());
-
-        if (is_array($originalTemplates)) {
-            $template = array_pop($originalTemplates);
-        } else {
-            $template = $originalTemplates;
-            $originalTemplates = [];
-        }
-
-        $templates = [];
-
-        if ($template && !in_array($template, [$originalItemClass, 'Form'])) {
-            $templates[] = $template;
-        }
-
-        if (is_string($templateName)) {
-            $templates[] = $templateName;
-        } else {
-            $templates = array_merge($templates, $templateName);
-        }
-
-        $templates = array_merge($templates, $originalTemplates);
-
-        $parentClass = $originalItemClass;
-
-        while ($parentClass && !in_array($parentClass, static::$disallowed_template_classes)) {
-            $templates[] = $parentClass;
-            $parentClass = get_parent_class($parentClass);
-        }
-
-        return array_filter(array_unique($templates));
-    }
-
     public static function get_attributes_from_tag($tag)
     {
         $attributes = [];
@@ -97,7 +59,7 @@ public static function requirements()
 
     public function getTemplate()
     {
-        return static::reset_template_for($this, $this->template);
+        return $this->suffixTemplates(array_merge((array)$this->up()->getTemplate(), ['Form']));
     }
 
     public function ajaxify()

diff --git a/src/FormFieldBootstrapper.php b/src/FormFieldBootstrapper.php
@@ -12,8 +12,6 @@
 
 class FormFieldBootstrapper extends AbstractFormFieldDecorator
 {
-    public $templateSuffix = '_bootstrapped';
-
     protected $holderAttributes = [];
     protected $holderClasses = [
         'form-group',
@@ -64,6 +62,7 @@ public function addExtraClassesAndAttributes()
 
         if ($this->isButton($field)) {
             $this->addExtraClass('btn');
+            $this->UseButtonTag = true;
 
             if (!$this->getAttribute('data-loading-text')) {
                 $this->setAttribute('data-loading-text', _t('LOADING...', 'Loading...'));
@@ -238,17 +237,6 @@ public function OptionAttributesHTML()
             ['disabled', 'checked', 'selected', 'value', 'type', 'name', 'id', 'class']);
     }
 
-    protected function suffixTemplates(array $templates)
-    {
-        $new = [];
-
-        foreach ($templates as $template) {
-            $new[] = str_replace('\\', '_', $template) . $this->templateSuffix;
-        }
-
-        return array_unique(array_merge($new, $templates));
-    }
-
     public function collateDataFields(&$list, $saveableOnly = false)
     {
         return $this->original()->collateDataFields($list, $saveableOnly);

diff --git a/src/Model/AbstractFormDecorator.php b/src/Model/AbstractFormDecorator.php
@@ -53,7 +53,6 @@ public function forTemplate()
             ['Form']
         ));
 
-
         // Now that we're rendered, clear message
         $this->clearMessage();
 

diff --git a/src/Traits/ViewableDataDecorator.php b/src/Traits/ViewableDataDecorator.php
@@ -11,6 +11,8 @@
 use ViewableData;
 
 trait ViewableDataDecorator {
+    public $templateSuffix = '_bootstrapped';
+
     public function obj($fieldName, $arguments = null, $forceReturnedObject = true, $cache = false, $cacheName = null) {
         $value = parent::obj($fieldName, $arguments, $forceReturnedObject, $cache, $cacheName);
 
@@ -36,4 +38,15 @@ public function __call($method, $arguments) {
 
         return $return;
     }
+
+    protected function suffixTemplates(array $templates)
+    {
+        $new = [];
+
+        foreach ($templates as $template) {
+            $new[] = str_replace('\\', '_', $template) . $this->templateSuffix;
+        }
+
+        return array_unique(array_merge($new, $templates));
+    }
 }
diff --git a/templates/UserForm_bootstrapped.ss b/templates/UserForm_bootstrapped.ss
@@ -0,0 +1,39 @@
+<% if $IncludeFormTag %>
+    <form $AttributesHTML>
+<% end_if %>
+
+    <% include UserFormProgress %>
+    <% include UserFormStepErrors %>
+
+    <% include FormMessage_bootstrapped %>
+
+    <fieldset>
+        <% if $Legend %><legend>$Legend</legend><% end_if %>
+        <% loop $Fields %>
+            $FieldHolder
+        <% end_loop %>
+    </fieldset>
+
+    <% include UserFormStepNav %>
+
+<% if $IncludeFormTag %>
+
+        <div id="<% if $FormModalID %>$FormModalID<% else %>{$FormName}-Modal<% end_if %>" class="<% if $FormModalClasses %>$FormModalClasses<% else %>modal fade<% end_if %>" data-modal="modal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                        <h4 id="{$FormModal}-Title" role="title"><% if $FormModalTitle %>$FormModalTitle<% else %>&nbsp;<% end_if %></h4>
+                    </div>
+                    <div class="modal-body" id="{$FormModal}-Content" role="content">
+                        <p>$OnCompleteMessage</p>
+                    </div>
+                    <div class="modal-footer">
+                        <a href="#" class="btn btn-link" data-dismiss="modal">Close</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </form>
+<% end_if %>
diff --git a/templates/UserFormsDropdownField_bootstrapped.ss b/templates/UserFormsDropdownField_bootstrapped.ss
@@ -0,0 +1,5 @@
+<select $AttributesHTML <% if $RightTitle %>aria-describedby="{$Name}_right_title"<% end_if %>>
+<% loop $Options %>
+	<option value="$Value.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
+<% end_loop %>
+</select>
diff --git a/templates/UserFormsField_bootstrapped.ss b/templates/UserFormsField_bootstrapped.ss
@@ -0,0 +1 @@
+<input $AttributesHTML<% if $RightTitle %>aria-describedby="{$Name}_right_title" <% end_if %>/>
diff --git a/templates/UserFormsField_holder_bootstrapped.ss b/templates/UserFormsField_holder_bootstrapped.ss
@@ -0,0 +1 @@
+<% include FormField_holder_bootstrapped %>
diff --git a/templates/UserFormsTextareaField_bootstrapped.ss b/templates/UserFormsTextareaField_bootstrapped.ss
@@ -0,0 +1 @@
+<textarea $AttributesHTML<% if $RightTitle %>aria-describedby="{$Name}_right_title" <% end_if %>>$Value</textarea>
diff --git a/templates/UserformsCheckboxField_bootstrapped.ss b/templates/UserformsCheckboxField_bootstrapped.ss
@@ -0,0 +1,2 @@
+<input $AttributesHTML<% if $RightTitle %>aria-describedby="{$Name}_right_title" <% end_if %>/>
+<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
diff --git a/templates/UserformsCheckboxField_holder_bootstrapped.ss b/templates/UserformsCheckboxField_holder_bootstrapped.ss
@@ -0,0 +1,7 @@
+<div id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>">
+	<div class="middleColumn">
+		$Field
+	</div>
+	<% if $RightTitle %><span id="{$Name}_right_title" class="right-title">$RightTitle</span><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
+</div>