Merge remote-tracking branch 'origin/10612_table-date-format'

public/app/plugins/panel/table/column_options.html

@@ -1,4 +1,3 @@
-
 <div class="edit-tab-with-sidemenu">
   <aside class="edit-sidemenu-aside">
     <ul class="edit-sidemenu">
@@ -20,7 +19,9 @@
       <div class="gf-form-inline">
         <div class="gf-form">
           <label class="gf-form-label width-13">Apply to columns named</label>
-          <input type="text" placeholder="Name or regex" class="gf-form-input width-13" ng-model="style.pattern" bs-tooltip="'Specify regex using /my.*regex/ syntax'" bs-typeahead="editor.getColumnNames" ng-blur="editor.render()" data-min-length=0 data-items=100 ng-model-onblur data-placement="right">
+          <input type="text" placeholder="Name or regex" class="gf-form-input width-13" ng-model="style.pattern" bs-tooltip="'Specify regex using /my.*regex/ syntax'"
+            bs-typeahead="editor.getColumnNames" ng-blur="editor.render()" data-min-length=0 data-items=100 ng-model-onblur
+            data-placement="right">
         </div>
       </div>
       <div class="gf-form" ng-if="style.type !== 'hidden'">
@@ -41,16 +42,18 @@
       </div>
       <div class="gf-form" ng-if="style.type === 'date'">
         <label class="gf-form-label width-11">Date Format</label>
-        <div class="gf-form-select-wrapper width-16">
+        <gf-form-dropdown model="style.dateFormat" css-class="gf-form-input width-16" lookup-text="true" get-options="editor.dateFormats"
-          <select class="gf-form-input" ng-model="style.dateFormat" ng-options="c.value as c.text for c in editor.dateFormats" ng-change="editor.render()"></select>
+          on-change="editor.render()">
-        </div>
+        </gf-form-dropdown>
       </div>
 
       <div ng-if="style.type === 'string'">
-        <gf-form-switch class="gf-form" label-class="width-11" ng-if="style.type === 'string'" label="Sanitize HTML" checked="style.sanitize" change="editor.render()"></gf-form-switch>
+        <gf-form-switch class="gf-form" label-class="width-11" ng-if="style.type === 'string'" label="Sanitize HTML" checked="style.sanitize"
+          change="editor.render()"></gf-form-switch>
       </div>
       <div ng-if="style.type === 'string'">
-        <gf-form-switch class="gf-form" label-class="width-11" ng-if="style.type === 'string'" label="Preserve Formatting" checked="style.preserveFormat" change="editor.render()"></gf-form-switch>
+        <gf-form-switch class="gf-form" label-class="width-11" ng-if="style.type === 'string'" label="Preserve Formatting" checked="style.preserveFormat"
+          change="editor.render()"></gf-form-switch>
       </div>
 
       <div ng-if="style.type === 'number'">
@@ -60,7 +63,8 @@
         </div>
         <div class="gf-form">
           <label class="gf-form-label width-11">Decimals</label>
-          <input type="number" class="gf-form-input width-4" data-placement="right" ng-model="style.decimals" ng-change="editor.render()" ng-model-onblur>
+          <input type="number" class="gf-form-input width-4" data-placement="right" ng-model="style.decimals" ng-change="editor.render()"
+            ng-model-onblur>
         </div>
       </div>
     </div>
@@ -68,8 +72,11 @@
     <div class="section gf-form-group" ng-if="style.type === 'number'">
       <h5 class="section-heading">Thresholds</h5>
       <div class="gf-form">
-        <label class="gf-form-label width-8">Thresholds<tip>Comma separated values</tip></label>
+        <label class="gf-form-label width-8">Thresholds
-        <input type="text" class="gf-form-input width-10" ng-model="style.thresholds" placeholder="50,80" ng-blur="editor.render()" array-join>
+          <tip>Comma separated values</tip>
+        </label>
+        <input type="text" class="gf-form-input width-10" ng-model="style.thresholds" placeholder="50,80" ng-blur="editor.render()"
+          array-join>
       </div>
       <div class="gf-form">
         <label class="gf-form-label width-8">Color Mode</label>
@@ -102,8 +109,10 @@
         <info-popover mode="right-absolute">
           <p>Specify an URL (relative or absolute)</p>
           <span>
-            Use special variables to specify cell values: <br>
+            Use special variables to specify cell values:
-            <em>$__cell</em> refers to current cell value <br>
+            <br>
+            <em>$__cell</em> refers to current cell value
+            <br>
             <em>$__cell_n</em> refers to Nth column value in current row. Column indexes are started from 0. For instance,
             <em>$__cell_1</em> refers to second column's value.
           </span>
@@ -111,12 +120,12 @@
       </div>
       <div class="gf-form">
         <label class="gf-form-label width-9">Tooltip</label>
-        <input type="text" class="gf-form-input width-29" ng-model="style.linkTooltip" ng-blur="editor.render()" ng-model-onblur data-placement="right">
+        <input type="text" class="gf-form-input width-29" ng-model="style.linkTooltip" ng-blur="editor.render()" ng-model-onblur
+          data-placement="right">
         <info-popover mode="right-absolute">
           <p>Specify text for link tooltip.</p>
           <span>
-            This title appears when user hovers pointer over the cell with link.
+            This title appears when user hovers pointer over the cell with link. Use the same variables as for URL.
-            Use the same variables as for URL.
           </span>
         </info-popover>
       </div>