From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 19 Jun 2019 20:45:21 +0000 (-0400)
Subject: Updating UI for foundation 6 elements.
X-Git-Tag: v2.12.4~1^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d1a2a7e5b206c55334d17890a78d8d7112dc7334;p=WP-Plugins%2Fglm-member-db.git

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 f27e8370..0a671ed5 100644
--- 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 4684a5f1..455cb1d5 100644
--- 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>