Display improvements

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 9c51eb7305c46db953fbdd2c3a61c612b59ac35f..16fe6b949cbb09cedf9e100d607b53f7d73a9f0f 100644 (file)
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -815,13 +815,13 @@
           var htmlVal = element.html();
           if (!htmlVal) {
             htmlVal = scope.defaultValue;
-            element.html(htmlVal);
+            element.text(htmlVal);
           }
           ngModel.$setViewValue(htmlVal);
         }
 
         ngModel.$render = function() {
-          element.html(ngModel.$viewValue || scope.defaultValue);
+          element.text(ngModel.$viewValue || scope.defaultValue);
         };
 
         // Special handling for enter and escape keys

diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
index 32ce51104b34b930d0cf05f7409c0cf054986b71..a3d88733eb8ecf9cf22dcacd55fa818a54c68273 100644 (file)
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
@@ -1,5 +1,5 @@
 <div class="form-inline">
-  <input autocomplete="off" class="form-control crm-form-date crm-placeholder-icon" placeholder="&#xF073" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <input autocomplete="off" class="form-control crm-form-date crm-placeholder-icon" placeholder="&#xF073" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />
   <span class="addon fa fa-calendar"></span>
-  <input autocomplete="off" ng-if="getProp('input_attrs.time')" placeholder="&#xF017" class="form-control crm-form-time crm-placeholder-icon" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <input autocomplete="off" ng-if="getProp('input_attrs.time')" placeholder="&#xF017" class="form-control crm-form-time crm-placeholder-icon" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />
 </div>

diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
index 812d08dae821142ccef19b46bf684c64d851573c..91c12c3a3b1d65f539cd3edc328766ab111cc4aa 100644 (file)
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
@@ -1 +1 @@
-<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />

diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
index 6d06d3357189e6f09c3ede9a81573ca46ac629e1..afebdae5704942c7e4ef6694f3ea3c4f5e35b0f1 100644 (file)
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
@@ -1,6 +1,6 @@
 <div class="form-inline">
   <div class="input-group">
-    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" title="{{ ts('Click to add placeholder text') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
     <div class="input-group-btn" af-gui-menu>
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="crm-i fa-caret-down"></i></button>
       <ul class="dropdown-menu" ng-if="menu.open">

diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
index 812d08dae821142ccef19b46bf684c64d851573c..91c12c3a3b1d65f539cd3edc328766ab111cc4aa 100644 (file)
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
@@ -1 +1 @@
-<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />