Updating UI for foundation 6 elements.

Select should only have required if field is required.
Make the field class a variable.

diff --git a/views/admin/ui/f6-select.html b/views/admin/ui/f6-select.html
index f27e837..0a671ed 100644 (file)
--- a/views/admin/ui/f6-select.html
+++ b/views/admin/ui/f6-select.html
@@ -2,15 +2,18 @@
 {* setup $data *}
 {* setup $field *}
 {* setup $fieldLabel *}
+{* Optional: set $fieldClass *}
+{if !isset($fieldClass) || $fieldClass == ''}{$fieldClass = 'small-12'}{/if}
+
 <div class="grid-x grid-margin-x">
-    <div class="cell small-12">
+    <div class="cell {$fieldClass}">
         <label for="{$field}" class="{if $data.fieldRequired.$field} glm-required{/if}">{$fieldLabel}</label>
-        <select id="{$field}" name="{$field}" required>
-            <option value=""></option>
+        <select id="{$field}" name="{$field}" {if $data.fieldRequired.$field}required{/if}>
             {foreach from=$data.fieldData.$field.list item=v}
                 <option value="{$v.value}"{if isset($v.default) && $v.default} selected="selected"{/if}>{$v.name}</option>
             {/foreach}
         </select>
         {if $data.fieldFail.$field}<span class="form-error is-visible">{$data.fieldFail.$field}</span>{/if}
+        <span class="form-error">{$fieldLabel} is required!</span>
     </div>
 </div>

diff --git a/views/admin/ui/f6-text.html b/views/admin/ui/f6-text.html
index 4684a5f..455cb1d 100644 (file)
--- a/views/admin/ui/f6-text.html
+++ b/views/admin/ui/f6-text.html
@@ -2,10 +2,13 @@
 {* setup $data *}
 {* setup $field *}
 {* setup $fieldLabel *}
+{* Optional: set $fieldClass *}
+{if !isset($fieldClass)}{$fieldClass = 'small-12'}{/if}
 <div class="grid-x grid-margin-x">
-    <div class="cell small-12">
+    <div class="cell {$fieldClass}">
         <label for="{$field}" class="{if $data.fieldRequired.$field} glm-required{/if}">{$fieldLabel}</label>
         <input type="text" id="{$field}" name="{$field}" value="{$data.fieldData.$field|escape}" {if $data.fieldRequired.$field}required{/if} />
         {if $data.fieldFail.$field}<span class="form-error is-visible">{$data.fieldFail.$field}</span>{/if}
+        <span class="form-error">{$fieldLabel} is required!</span>
     </div>
 </div>