Skip to content

Commit cb7424c

Browse files
torkelotorkelo
committed
fix(playlist ui): minor polish / fix to playlist ui, fixes grafana#2831, other minor css / markup fixes
1 parent a567939 commit cb7424c

File tree

4 files changed

+28
-59
lines changed

4 files changed

+28
-59
lines changed

‎public/app/panels/graph/axisEditor.html

Lines changed: 18 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="tight-form">
55
<ul class="tight-form-list">
66
<li class="tight-form-item" style="width: 80px">
7-
<strong>Left Y</strong>
7+
Left Y
88
</li>
99
<li class="tight-form-item">
1010
Unit
@@ -46,10 +46,10 @@
4646
</ul>
4747
<div class="clearfix"></div>
4848
</div>
49-
<div class="tight-form">
49+
<div class="tight-form last">
5050
<ul class="tight-form-list">
5151
<li class="tight-form-item" style="width: 80px">
52-
<strong>Right Y</strong>
52+
Right Y
5353
</li>
5454
<li class="tight-form-item">
5555
Unit
@@ -97,7 +97,7 @@
9797
<div class="tight-form">
9898
<ul class="tight-form-list">
9999
<li class="tight-form-item" style="width: 80px">
100-
<strong>Show Axis</strong>
100+
Show Axis
101101
</li>
102102
<li class="tight-form-item">
103103
X-Axis&nbsp;
@@ -114,10 +114,10 @@
114114
</ul>
115115
<div class="clearfix"></div>
116116
</div>
117-
<div class="tight-form">
117+
<div class="tight-form last">
118118
<ul class="tight-form-list">
119119
<li class="tight-form-item" style="width: 80px">
120-
<strong>Thresholds</strong>
120+
Thresholds
121121
</li>
122122
<li class="tight-form-item">
123123
Level 1
@@ -140,11 +140,7 @@
140140
<spectrum-picker ng-model="panel.grid.threshold2Color" ng-change="render()" ></spectrum-picker>
141141
</li>
142142
<li class="tight-form-item last">
143-
Line mode&nbsp;
144-
<input class="cr1" id="panel.grid.thresholdLine" type="checkbox"
145-
ng-model="panel.grid.thresholdLine" ng-checked="panel.grid.thresholdLine" ng-change="render()">
146-
<label for="panel.grid.thresholdLine" class="cr1"></label>
147-
143+
<editor-checkbox text="Line mode" model="panel.grid.thresholdLine" change="render()"></editor-checkbox>
148144
</li>
149145
</ul>
150146
<div class="clearfix"></div>
@@ -157,31 +153,19 @@
157153
<div class="tight-form last">
158154
<ul class="tight-form-list">
159155
<li class="tight-form-item" style="width: 110px">
160-
<strong>Legend</strong>
156+
Legend
161157
</li>
162158
<li class="tight-form-item">
163-
Show&nbsp;
164-
<input class="cr1" id="panel.legend.show" type="checkbox"
165-
ng-model="panel.legend.show" ng-checked="panel.legend.show" ng-change="get_data()">
166-
<label for="panel.legend.show" class="cr1"></label>
159+
<editor-checkbox text="Show" model="panel.legend.show" change="get_data()"></editor-checkbox>
167160
</li>
168161
<li class="tight-form-item">
169-
Table&nbsp;
170-
<input class="cr1" id="panel.legend.alignAsTable" type="checkbox"
171-
ng-model="panel.legend.alignAsTable" ng-checked="panel.legend.alignAsTable" ng-change="render()">
172-
<label for="panel.legend.alignAsTable" class="cr1"></label>
162+
<editor-checkbox text="Table" model="panel.legend.alignAsTable" change="render()"></editor-checkbox>
173163
</li>
174164
<li class="tight-form-item">
175-
Right side&nbsp;
176-
<input class="cr1" id="panel.legend.rightSide" type="checkbox"
177-
ng-model="panel.legend.rightSide" ng-checked="panel.legend.rightSide" ng-change="render()">
178-
<label for="panel.legend.rightSide" class="cr1"></label>
165+
<editor-checkbox text="Right side" model="panel.legend.rightSide" change="render()"></editor-checkbox>
179166
</li>
180167
<li class="tight-form-item last">
181-
<span bs-tooltip="'Hides series with only null values'">Hide empty&nbsp;<span>
182-
<input class="cr1" id="panel.legend.hideEmpty" type="checkbox"
183-
ng-model="panel.legend.hideEmpty" ng-checked="panel.legend.hideEmpty" ng-change="render()">
184-
<label for="panel.legend.hideEmpty" class="cr1"></label>
168+
<editor-checkbox text="Hide empty" model="panel.legend.hideEmpty" change="render()"></editor-checkbox>
185169
</li>
186170
</ul>
187171
<div class="clearfix"></div>
@@ -191,37 +175,22 @@
191175
<div class="tight-form">
192176
<ul class="tight-form-list">
193177
<li class="tight-form-item" style="width: 105px">
194-
<strong>Legend values</strong>
178+
Legend values
195179
</li>
196180
<li class="tight-form-item">
197-
Min&nbsp;
198-
<input class="cr1" id="panel.legend.min" type="checkbox"
199-
ng-model="panel.legend.min" ng-checked="panel.legend.min" ng-change="legendValuesOptionChanged()">
200-
<label for="panel.legend.min" class="cr1"></label>
181+
<editor-checkbox text="Min" model="panel.legend.min" change="legendValuesOptionChanged()"></editor-checkbox>
201182
</li>
202183
<li class="tight-form-item">
203-
Max&nbsp;
204-
<input class="cr1" id="panel.legend.max" type="checkbox"
205-
ng-model="panel.legend.max" ng-checked="panel.legend.max" ng-change="legendValuesOptionChanged()">
206-
<label for="panel.legend.max" class="cr1"></label>
184+
<editor-checkbox text="Max" model="panel.legend.max" change="legendValuesOptionChanged()"></editor-checkbox>
207185
</li>
208186
<li class="tight-form-item">
209-
Avg&nbsp;
210-
<input class="cr1" id="panel.legend.avg" type="checkbox"
211-
ng-model="panel.legend.avg" ng-checked="panel.legend.avg" ng-change="legendValuesOptionChanged()">
212-
<label for="panel.legend.avg" class="cr1"></label>
187+
<editor-checkbox text="Avg" model="panel.legend.avg" change="legendValuesOptionChanged()"></editor-checkbox>
213188
</li>
214189
<li class="tight-form-item">
215-
Current&nbsp;
216-
<input class="cr1" id="panel.legend.current" type="checkbox"
217-
ng-model="panel.legend.current" ng-checked="panel.legend.current" ng-change="legendValuesOptionChanged()">
218-
<label for="panel.legend.current" class="cr1"></label>
190+
<editor-checkbox text="Current" model="panel.legend.current" change="legendValuesOptionChanged()"></editor-checkbox>
219191
</li>
220192
<li class="tight-form-item last">
221-
Total&nbsp;
222-
<input class="cr1" id="panel.legend.total" type="checkbox"
223-
ng-model="panel.legend.total" ng-checked="panel.legend.total" ng-change="legendValuesOptionChanged()">
224-
<label for="panel.legend.total" class="cr1"></label>
193+
<editor-checkbox text="Total" model="panel.legend.total" change="legendValuesOptionChanged()"></editor-checkbox>
225194
</li>
226195
</ul>
227196
<div class="clearfix"></div>

‎public/app/partials/playlist.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</div>
1313

1414
<div class="gf-box-body">
15-
<div class="row" style="margin-bottom: 10px;">
16-
<div class="span6">
15+
<div class="row-fluid" style="margin-bottom: 10px;">
16+
<div class="span12">
1717
<div style="display: inline-block">
18-
<div class="tight-form">
18+
<div class="tight-form last">
1919
<ul class="tight-form-list">
2020
<li class="tight-form-item">
2121
Search
@@ -28,13 +28,11 @@
2828
</div>
2929
</div>
3030
</div>
31-
<div class="span6">
32-
<h5>Playlist dashboards</h5>
33-
</div>
3431
</div>
3532

36-
<div class="row">
33+
<div class="row-fluid">
3734
<div class="span6">
35+
<h5>Search result</h5>
3836
<table class="grafana-options-table">
3937
<tr ng-repeat="dashboard in filteredHits">
4038
<td style="white-space: nowrap;">
@@ -55,6 +53,8 @@ <h5>Playlist dashboards</h5>
5553
</table>
5654
</div>
5755
<div class="span6">
56+
<h5>Playlist dashboards</h5>
57+
5858
<table class="grafana-options-table">
5959
<tr ng-repeat="dashboard in playlist">
6060
<td style="white-space: nowrap;">
@@ -78,7 +78,7 @@ <h5>Playlist dashboards</h5>
7878
<br>
7979
<br>
8080
<div class="pull-left">
81-
<div class="tight-form">
81+
<div class="tight-form last">
8282
<ul class="tight-form-list">
8383
<li class="tight-form-item">
8484
Timespan between dashboard change

‎public/less/variables.dark.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
@altFontFamily: @serifFontFamily;
6969

7070
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
71-
@headingsFontWeight: normal; // instead of browser default, bold
71+
@headingsFontWeight: bold; // instead of browser default, bold
7272
@headingsColor: darken(@white,11%); // empty to use BS default, @textColor
7373
@inputText: @black;
7474

‎public/less/variables.light.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
@altFontFamily: @serifFontFamily;
8181

8282
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
83-
@headingsFontWeight: normal; // instead of browser default, bold
83+
@headingsFontWeight: bold; // instead of browser default, bold
8484
@headingsColor: @textColor; // empty to use BS default, @textColor
8585

8686

0 commit comments

Comments
 (0)