Merge in changes from serverstats

Bringing in some updates

diff --git a/views/ui/f6/checkbox.html b/views/ui/f6/checkbox.html
index ff3db27..af36c45 100644 (file)
--- a/views/ui/f6/checkbox.html
+++ b/views/ui/f6/checkbox.html
@@ -8,9 +8,8 @@
         '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,
+        'dataError'     => string               Error from data Abstract Class, or other supplied error string
         'tip'           => string               Tool Tip text
-        'dataError'     => string   Error from data Abstract Class
     ]}
 *}
 

diff --git a/views/ui/f6/image.html b/views/ui/f6/image.html
index 59bf9c9..0c5ab71 100644 (file)
--- a/views/ui/f6/image.html
+++ b/views/ui/f6/image.html
@@ -14,7 +14,7 @@
         'button'        => string   Text for the Button
         'required'      => boolean  True if required,
         'helpText'      => string   Help text for this input,
-        'errortext'     => string   Error text that appears when the field doesn't validate,
+        'errorText'     => string   Error text that appears when the field doesn't validate,
         'dataError'     => string   Error from data Abstract Class
     ]}
 *}
@@ -36,14 +36,14 @@
         {/if}
         <div class="cell small-12">
             <b>New {$ui.label}</b>
-            <label for="{$ui.field}_button" class="button primary">{if isset($ui.button)}{$ui.button}{else}Browse{/if}</label>
+            <label for="{$ui.field}_button" class="button primary">{if !empty($ui.button)}{$ui.button}{else}Browse{/if}</label>
             <input type="file" class="show-for-sr" id="{$ui.field}_button" name="{$ui.field}_new">
         </div>
         <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$ui.field}"></div>
     </div>
     <div class="cell small-12">
         {if $ui.dataError}<span class="form-error is-visible">{$ui.dataError}</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}
+        {if !empty($ui.helpText)}<p class="help-text" id="{$ui.field}_HelpText">{$ui.helpText}</p>{/if}
+        {if !empty($ui.errorText)}<span id="{$ui.field}_ErrorText" class="form-error">{$ui.errorText}</span>{/if}
     </div>
 </div>

diff --git a/views/ui/f6/multicheckboxes.html b/views/ui/f6/multicheckboxes.html
index e5b2803..06caf16 100644 (file)
--- a/views/ui/f6/multicheckboxes.html
+++ b/views/ui/f6/multicheckboxes.html
@@ -14,7 +14,7 @@
         'list'          => array    Array of list key=value pairs value=>label
         'required'      => boolean  True if required,
         'helpText'      => string   Help text for this input,
-        'errortext'     => string   Error text that appears when the field doesn't validate,
+        'errorText'     => string   Error text that appears when the field doesn't validate,
         'dataError'     => string   Error from data Abstract Class
     ]}
 *}
@@ -32,7 +32,6 @@
             </label>
         {/foreach}
     {/if}
-
     {if !empty($ui.dataError)}<span class="form-error is-visible">{$ui.dataError}</span>{/if}
     {if !empty($ui.helpText)}<p class="help-text" id="{$ui.field}_HelpText">{$ui.helpText}</p>{/if}
     {if !empty($ui.errorText)}<span id="{$ui.field}_ErrorText" class="form-error">{$ui.errorText}</span>{/if}

diff --git a/views/ui/f6/multiselect.html b/views/ui/f6/multiselect.html
index 7b45efa..a38d0e6 100644 (file)
--- a/views/ui/f6/multiselect.html
+++ b/views/ui/f6/multiselect.html
@@ -17,7 +17,7 @@
         'l_size'        => integer select size,
         'required'      => boolean True if required,
         'helpText'      => string  Help text for this input,
-        'errortext'     => string  Error text that appears when the field doesn't validate,
+        'errorText'     => string  Error text that appears when the field doesn't validate,
         'dataError'     => string  Error from data Abstract Class
     ]}
 *}

diff --git a/views/ui/f6/number.html b/views/ui/f6/number.html
index e5aca69..9377d22 100644 (file)
--- a/views/ui/f6/number.html
+++ b/views/ui/f6/number.html
@@ -15,6 +15,7 @@
         'message'       => string               Message string to display between label and input,
         'helpText'      => string               Help text for this input,
         'errorText'     => string               Error text that appears when the field doesn't validate
+        'tip'           => string               String to display when hover over question mark on right
     ]}
 *}
 {if empty($ui.width)}
@@ -45,6 +46,9 @@
                 >
             </div>
             <div class="cell auto glm-f6-ui-label-container-right">
+                {if isset($ui.tip)}
+                    <span style="float:right;" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" title="{$ui.tip}">?</span>
+                {/if}
                 <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if} glm-f6-ui-field-label">{$ui.label}</label>
             </div>
             <div class="cell small-12 glm-f6-ui-field-messages">

diff --git a/views/ui/f6/select.html b/views/ui/f6/select.html
index 26b2dc0..8ebdfec 100644 (file)
--- a/views/ui/f6/select.html
+++ b/views/ui/f6/select.html
@@ -16,7 +16,7 @@
         'l_blank'       => string  Add empty option
         'required'      => boolean True if required,
         'helpText'      => string  Help text for this input,
-        'errortext'     => string  Error text that appears when the field doesn't validate,
+        'errorText'     => string  Error text that appears when the field doesn't validate,
         'dataError'     => string  Error from data Abstract Class
         'class'         => string  Additional Classes for the main cell div
         'inputClass'    => string  Additional Classes for the input
@@ -41,8 +41,8 @@
         {/foreach}
     </select>
 
-    {if isset($ui.dataError) && $ui.dataError}<span class="form-error is-visible">{$ui.dataError}</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}
+    {if !empty($ui.dataError)}<span class="form-error is-visible">{$ui.dataError}</span>{/if}
+    {if !empty($ui.helpText)}<p class="help-text" id="{$ui.field}_HelpText">{$ui.helpText}</p>{/if}
+    {if !empty($ui.errorText)}<span id="{$ui.field}_ErrorText" class="form-error">{$ui.errorText}</span>{/if}
 
 </div>

diff --git a/views/ui/f6/submit.html b/views/ui/f6/submit.html
index 6925d1b..ce778c6 100644 (file)
--- a/views/ui/f6/submit.html
+++ b/views/ui/f6/submit.html
@@ -13,15 +13,16 @@
         'label'     => string   Required    Label text for this field,
         'submit'    => boolean              True if this is a submit button
         'id'        => string               Optional ID for this button
+        'small'     => boolean              True to select a small button
         'cancel'    => string               Optional URL for cancel button
     ]}
 *}
 
-<div class="cell small-12 lm-f6-ui-field">
+<div class="cell small-12 glm-f6-ui-field">
     <button
         {if !empty($ui.id)}id="{$ui.id}"{/if}
         {if !empty($ui.submit)}type="submit"{/if}
-        class="button {$ui.class|default:'primary'}"
+        class="button {$ui.class|default:'primary'}{if !empty($ui.small)} button-small{/if}"
         >
         {$ui.label}
     </button>

diff --git a/views/ui/f6/text.html b/views/ui/f6/text.html
index 4b3543c..5d4eb59 100644 (file)
--- a/views/ui/f6/text.html
+++ b/views/ui/f6/text.html
@@ -1,5 +1,5 @@
 {*
-    Foundation 6 - Text Input Field
+    Foundation 6 UI - Text Input Field
 
     Do not list parameters if they're false. (We're not checking for false).
 
@@ -11,7 +11,7 @@
         'placeholder' => string             Placeholder string,
         'required'    => boolean            True if required,
         'maxWidth'    => string             Size of input field using standard style notation ('900px', '15rem', ...),
-        'maxlength'   => integer            Maximum number of characters that may be entered,
+        'maxLength'   => integer            Maximum number of characters that may be entered,
         '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