Skip to content

Commit aa6f209

Browse files
matschaffermatschaffer
committed
Let help window use full editor panel width
1 parent c61bbeb commit aa6f209

File tree

1 file changed

+77
-82
lines changed

1 file changed

+77
-82
lines changed

‎src/partials/editor.html‎

Lines changed: 77 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -186,92 +186,87 @@ <h5>Filtering</h5>
186186
</div>
187187

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

277272
<script type="text/ng-template" id="help_metric_field">

0 commit comments

Comments
 (0)