Update tip location.

Place in the label and remove hard coded style attribute.

diff --git a/views/ui/f6/checkbox.html b/views/ui/f6/checkbox.html
index 28d050b..1ef462f 100644 (file)
--- a/views/ui/f6/checkbox.html
+++ b/views/ui/f6/checkbox.html
@@ -34,10 +34,11 @@
             </div>
         </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 .left" data-disable-hover="false" tabindex=1 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>
+            <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if} glm-f6-ui-field-label">{$ui.label}
+                {if isset($ui.tip)}
+                    <span data-tooltip aria-haspopup="true" class="has-tip .left" data-disable-hover="false" tabindex=1 title="{$ui.tip}">?</span>
+                {/if}
+            </label>
         </div>
         <div class="cell small-12 glm-f6-ui-field-messages">
             {if !empty($ui.helpText)}<span class="glm-f6-ui-field-help-text" id="{$ui.field}_HelpText">{$ui.helpText}</span]>{/if}

diff --git a/views/ui/f6/editor.html b/views/ui/f6/editor.html
index 559aa45..a6c1a8d 100644 (file)
--- a/views/ui/f6/editor.html
+++ b/views/ui/f6/editor.html
@@ -21,10 +21,11 @@
 *}
 
 <div class="cell small-12 glm-f6-ui-field">
-    {if isset($ui.tip)}
-        <span style="float:right;" data-tooltip aria-haspopup="true" class="has-tip .left" data-disable-hover="false" tabindex=1 title="{$ui.tip}">?</span>
-    {/if}
-    <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if}">{$ui.label}</label>
+    <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if}">{$ui.label}
+        {if isset($ui.tip)}
+            <span data-tooltip aria-haspopup="true" class="has-tip .left" data-disable-hover="false" tabindex=1 title="{$ui.tip}">?</span>
+        {/if}
+    </label>
     {if !empty($ui.value)}
             {$glm_ui_param_textAreaContent = $ui.value}
     {else}

diff --git a/views/ui/f6/number.html b/views/ui/f6/number.html
index 9b10d89..8c084ee 100644 (file)
--- a/views/ui/f6/number.html
+++ b/views/ui/f6/number.html
@@ -28,14 +28,14 @@
 {* If min or max values are supplied, add validator to check that *}
 {if isset($ui.min) || isset($ui.max)}
     {$usingNumberValidator = true}
-    <script> 
-        {* 
-            Note that we have to read the attribute since the $ui parameter 
+    <script>
+        {*
+            Note that we have to read the attribute since the $ui parameter
             has likely been changed by the time this runs.
         *}
         jQuery(document).ready(function($) {
             function glmUiF6NumberValidator($el, required, parent) {
-                var min = $el.attr('min');       
+                var min = $el.attr('min');
                 if (min !== 'undefined' && (Number($el.val()) < min)) {
                     return false;
                 }
@@ -75,10 +75,11 @@
                 >
             </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>
+                <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if} glm-f6-ui-field-label">{$ui.label}
+                    {if isset($ui.tip)}
+                        <span data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" title="{$ui.tip}">?</span>
+                    {/if}
+                </label>
             </div>
             <div class="cell small-12 glm-f6-ui-field-messages">
                 {if !empty($ui.errorText)}<span id="{$ui.field}_ErrorText" class="form-error glm-f6-ui-field-error-text" data-form-error-for="{$ui.field}">{$ui.errorText}</span>{/if}

diff --git a/views/ui/f6/text.html b/views/ui/f6/text.html
index 9179182..2ec38b7 100644 (file)
--- a/views/ui/f6/text.html
+++ b/views/ui/f6/text.html
@@ -33,13 +33,15 @@
     {else}
         <div class="grid-x grid-margin-x">
             <div class="cell small-12">
-                {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>
+                <label for="{$ui.field}" class="{if !empty($ui.required)} glm-required{/if} glm-f6-ui-field-label">{$ui.label}
+                    {if isset($ui.tip)}
+                        <span data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" title="{$ui.tip}">?</span>
+                    {/if}
+                </label>
             </div>
             <div class="cell small-12">
                 <input
+                    autocomplete="off"
                     class="glm-f6-ui-field-input {$ui.inputClass|default:''}"
                     type="{$ui.type|default:'text'}"
                     id="{$ui.field}"