Add checkbox

working on more field types

diff --git a/views/ui/f6/checkbox.html b/views/ui/f6/checkbox.html
index b5635f8..8d8e16c 100644 (file)
--- a/views/ui/f6/checkbox.html
+++ b/views/ui/f6/checkbox.html
@@ -4,50 +4,29 @@
     Only 0ne of $data or $field may be used.
     Do not list fields if they're false. (We're not checking for false)
 
-    {$fieldData = [
-        'data'          => array    Data from data abstract if using that,
+    {$ui = [
+        'value'         => string   Value of the element
         'field'         => string   Name of field that holds the data if not using data abstract,
         'label'         => string   Label text for this field,
+        'required'      => boolean  True if required,
         'helpText'      => string   Help text for this input,
+        'errortext'     => string   Error text that appears when the field doesn't validate,
+        'dataError'     => string   Error from data Abstract Class
     ]}
 *}
 
-{if (!isset($fieldData.data) && !isset($fieldData.field)) || !isset($fieldData.label)}
-    <div class="grid-x grid-margin-x">
-        <div class="cell small-12">
-            <span class="glm-required">Field Error: Required field information not supplied!</span>
-        </div>
+<div class="grid-x grid-margin-x">
+    <div class="cell small-12">
+        <input
+            {if $ui.required}required{/if}
+            type="checkbox"
+            id="{$ui.field}"
+            name="{$ui.field}"{if $ui.value} checked{/if}>
+        <label for="{$ui.field}">{$ui.label}</label>
+
+        {if $ui.dataError}<span class="form-error is-visible">{$ui.dataErrror}</span>{/if}
+        {if isset($ui.helpText)}<p class="help-text" id="{$ui.field}_HelpText">{$ui.helpText}</p>{/if}
+        {if isset($ui.errorText)}<span id="{$ui.field}_ErrorText" class="form-error">{$ui.errorText}</span>{/if}
     </div>
-{else}
-    {if isset($fieldData.data)} {* If using data abstract *}
-        {$field = $fieldData.field}
-        <div class="grid-x grid-margin-x">
-            <div class="cell small-12 medium-3">
-                <input
-                    type="checkbox"
-                    id="{$fieldData.field}"
-                    name="{$fieldData.field}"{if $data.fieldData.$field.value}
-                    checked{/if}>
-                <label for="{$fieldData.field}">{$fieldLabel}</label>
+</div>
 
-                {if $fieldData.data.fieldFail.$field}<span class="form-error is-visible">{$fieldData.data.fieldFail.$field}</span>{/if}
-                {if isset($fieldData.helpText)}<p class="help-text" id="{$fieldData.field}_HelpText">{$fieldData.helpText}</p>{/if}
-                {if isset($fieldData.errorText)}<span id="{$fieldData.field}_ErrorText" class="form-error">{$fieldData.errorText}</span>{/if}
-            </div>
-        </div>
-    {else}
-            <div class="small-12 columns">
-                <label for="{$fieldData.field}_FieldID" class="{if $fieldData['required']} glm-required{/if}">
-                    <input
-                        id="{$fieldData.field}_FieldID"
-                        type="checkbox"
-                        name="{$fieldData.field}"
-                        value="{${$fieldData.field}}"
-                        {if isset($fieldData.helpText)}aria-describedby="{$fieldData.field}_HelpText"{/if}
-                    >
-                    {$fieldData.label}:
-                    {if isset($fieldData.helpText)}<p class="help-text" id="{$fieldData.field}_HelpText">{$fieldData.helpText}</p>{/if}
-                </label>
-            </div>
-    {/if}
-{/if}