Skip to content

Commit bb76310

Browse files
amotlamotl
authored
Merge pull request #72 from matschaffer/basicfixes
Basic Editor UI fixes
2 parents 501ca01 + aa6f209 commit bb76310

File tree

1 file changed

+77
-91
lines changed

1 file changed

+77
-91
lines changed

‎src/partials/editor.html‎

Lines changed: 77 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -194,92 +194,87 @@ <h5>Formatting</h5>
194194
</div>
195195

196196
<!-- Help -->
197-
<div class="section editor-column">
198-
199-
<div ng-show="ctrl.panel.locationData == null">
200-
<h5>Mapping data</h5>
201-
<p class="grafana-info-box">
202-
These options control how location information is derived from data.
203-
</div>
204-
<div ng-show="ctrl.panel.locationData === 'countries'">
205-
<h5>Mapping time series data</h5>
206-
<p class="grafana-info-box">
207-
The query should be formatted as <b>time series data</b>.
208-
The time series (group by) name should be a 2-letter country code.
209-
For example "US" for United States or "FR" for France.</p>
210-
</div>
211-
<div ng-show="ctrl.panel.locationData === 'countries_3letter'">
212-
<h5>Mapping time series data</h5>
213-
<p class="grafana-info-box">
214-
The query should be formatted as <b>time series data</b>.
215-
The time series (group by) name should be a 3-letter country code.
216-
For example "USA" for United States or "FRA" for France.</p>
217-
</div>
218-
<div ng-show="ctrl.panel.locationData === 'states'">
219-
<h5>Mapping time series data</h5>
220-
<p class="grafana-info-box">
221-
The query should be formatted as <b>time series data</b>.
222-
The time series (group by) name should be a 2-letter US state code.
223-
For example "CA" for California.</p>
224-
</div>
225-
<div ng-show="ctrl.panel.locationData === 'probes'">
226-
<h5>Mapping time series data</h5>
227-
<p class="grafana-info-box">
228-
The query should be formatted as <b>time series data</b>.
229-
The time series (group by) name should be a valid key in "probes.json".</p>
230-
</div>
231-
<div ng-show="ctrl.panel.locationData === 'json result'">
232-
<h5>Mapping JSON data from datasource</h5>
233-
<p class="grafana-info-box">
234-
This supports any datasource capable of generating a JSON response
235-
with a custom list of locations (the same format that for the JSON endpoint).
236-
Example: Warp 10
237-
</div>
238-
239-
<div ng-show="ctrl.panel.locationData === 'geohash'">
240-
<h5>Mapping geohashes</h5>
241-
<div class="grafana-info-box">
242-
<p>
243-
This supports <b>Elasticsearch</b> Geo-points using the GeoHash grid Aggregation feature
244-
as well as <b>Prometheus</b> and <b>InfluxDB</b> data sources that return geohashes.</p>
245-
<ul>
246-
<li>
247-
<b>geo_point/geohash field</b>: Enter the name of the geo_point/geohash column. This is used to calculate where the
248-
circle should be drawn.</li>
249-
<ng-template ng-include="'help_metric_field'"></ng-template>
250-
<ng-template ng-include="'help_location_fields'"></ng-template>
251-
</ul>
252-
</div>
197+
<div ng-show="ctrl.panel.locationData == null">
198+
<h5>Mapping data</h5>
199+
<p class="grafana-info-box">
200+
These options control how location information is derived from data.
201+
</div>
202+
<div ng-show="ctrl.panel.locationData === 'countries'">
203+
<h5>Mapping time series data</h5>
204+
<p class="grafana-info-box">
205+
The query should be formatted as <b>time series data</b>.
206+
The time series (group by) name should be a 2-letter country code.
207+
For example "US" for United States or "FR" for France.</p>
208+
</div>
209+
<div ng-show="ctrl.panel.locationData === 'countries_3letter'">
210+
<h5>Mapping time series data</h5>
211+
<p class="grafana-info-box">
212+
The query should be formatted as <b>time series data</b>.
213+
The time series (group by) name should be a 3-letter country code.
214+
For example "USA" for United States or "FRA" for France.</p>
215+
</div>
216+
<div ng-show="ctrl.panel.locationData === 'states'">
217+
<h5>Mapping time series data</h5>
218+
<p class="grafana-info-box">
219+
The query should be formatted as <b>time series data</b>.
220+
The time series (group by) name should be a 2-letter US state code.
221+
For example "CA" for California.</p>
222+
</div>
223+
<div ng-show="ctrl.panel.locationData === 'probes'">
224+
<h5>Mapping time series data</h5>
225+
<p class="grafana-info-box">
226+
The query should be formatted as <b>time series data</b>.
227+
The time series (group by) name should be a valid key in "probes.json".</p>
228+
</div>
229+
<div ng-show="ctrl.panel.locationData === 'json result'">
230+
<h5>Mapping JSON data from datasource</h5>
231+
<p class="grafana-info-box">
232+
This supports any datasource capable of generating a JSON response
233+
with a custom list of locations (the same format that for the JSON endpoint).
234+
Example: Warp 10
235+
</div>
236+
<div ng-show="ctrl.panel.locationData === 'geohash'">
237+
<h5>Mapping geohashes</h5>
238+
<div class="grafana-info-box">
239+
<p>
240+
This supports <b>Elasticsearch</b> Geo-points using the GeoHash grid Aggregation feature
241+
as well as <b>Prometheus</b> and <b>InfluxDB</b> data sources that return geohashes.</p>
242+
<ul>
243+
<li>
244+
<b>geo_point/geohash field</b>: Enter the name of the geo_point/geohash column. This is used to calculate where the
245+
circle should be drawn.</li>
246+
<ng-template ng-include="'help_metric_field'"></ng-template>
247+
<ng-template ng-include="'help_location_fields'"></ng-template>
248+
</ul>
253249
</div>
254-
<div ng-show="ctrl.showTableGeohashOptions()">
255-
<h5>Mapping table data</h5>
256-
<div class="grafana-info-box">
257-
<p>The query should be formatted as <b>table data</b> and contain an obligatory <b>geohash</b> column
258-
as well as optional data like a <b>metric</b> column.</p>
259-
<ul>
260-
<li>
261-
<b>Geohash field</b>: Enter the name of the geohash column. This is used to calculate where the circle should be drawn.</li>
262-
<ng-template ng-include="'help_metric_field'"></ng-template>
263-
<ng-template ng-include="'help_location_fields'"></ng-template>
264-
</ul>
265-
</div>
250+
</div>
251+
<div ng-show="ctrl.showTableGeohashOptions()">
252+
<h5>Mapping table data</h5>
253+
<div class="grafana-info-box">
254+
<p>The query should be formatted as <b>table data</b> and contain an obligatory <b>geohash</b> column
255+
as well as optional data like a <b>metric</b> column.</p>
256+
<ul>
257+
<li>
258+
<b>Geohash field</b>: Enter the name of the geohash column. This is used to calculate where the circle should be drawn.</li>
259+
<ng-template ng-include="'help_metric_field'"></ng-template>
260+
<ng-template ng-include="'help_location_fields'"></ng-template>
261+
</ul>
266262
</div>
267-
<div ng-show="ctrl.showTableCoordinateOptions()">
268-
<h5>Mapping table data</h5>
269-
<div class="grafana-info-box">
270-
<p>The query should be formatted as <b>table data</b> and contain obligatory <b>latitude, longitude</b> columns
271-
as well as optional data like a <b>metric</b> column.</p>
272-
<ul>
273-
<li>
274-
<b>Latitude/Longitude fields</b>: Enter the name of the latitude and longitude columns. These are used to calculate
275-
where the circle should be drawn.</li>
276-
<ng-template ng-include="'help_metric_field'"></ng-template>
277-
<ng-template ng-include="'help_location_fields'"></ng-template>
278-
</ul>
279-
</div>
263+
</div>
264+
<div ng-show="ctrl.showTableCoordinateOptions()">
265+
<h5>Mapping table data</h5>
266+
<div class="grafana-info-box">
267+
<p>The query should be formatted as <b>table data</b> and contain obligatory <b>latitude, longitude</b> columns
268+
as well as optional data like a <b>metric</b> column.</p>
269+
<ul>
270+
<li>
271+
<b>Latitude/Longitude fields</b>: Enter the name of the latitude and longitude columns. These are used to calculate
272+
where the circle should be drawn.</li>
273+
<ng-template ng-include="'help_metric_field'"></ng-template>
274+
<ng-template ng-include="'help_location_fields'"></ng-template>
275+
</ul>
280276
</div>
281277
</div>
282-
283278
</div>
284279

285280
<script type="text/ng-template" id="help_metric_field">
@@ -401,9 +396,6 @@ <h5>Global options</h5>
401396

402397
</div>
403398

404-
<!-- 2nd column -->
405-
<div class="section editor-column">
406-
407399
<div class="gf-form-group">
408400
<h5>Circle parameters</h5>
409401
<div class="gf-form">
@@ -472,10 +464,6 @@ <h5>Map data to colors</h5>
472464
</div>
473465
</div>
474466

475-
</div>
476-
477-
<!-- 3rd column -->
478-
<div class="section editor-column">
479467

480468
<div class="gf-form-group">
481469
<h5>Popup labels</h5>
@@ -518,6 +506,4 @@ <h5>Clickthrough links</h5>
518506
</div>
519507
</div>
520508

521-
</div>
522-
523509
</div>

0 commit comments

Comments
 (0)