Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Panel and Partials fixes to make HTML valid #1445

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/panels/dashcontrol/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h5>Allow saving to</h5>
<label class="small">Defaults</label><input type="checkbox" ng-model="panel.save.default" ng-checked="panel.save.default">
</div>
<div class="span2">
<label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github<tip></label><input type="checkbox" ng-model="panel.save.gist" ng-checked="panel.save.gist">
<label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github</tip></label><input type="checkbox" ng-model="panel.save.gist" ng-checked="panel.save.gist">
</div>
<div class="span2">
<label class="small">Elasticsearch</label><input type="checkbox" ng-model="panel.save.elasticsearch" ng-checked="panel.save.elasticsearch">
Expand Down
9 changes: 5 additions & 4 deletions src/app/panels/fields/editor.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<div class="row-fluid">
<div class="span3"><h6>Popup Position</h6>
<select class="input-small" ng-model="panel.micropanel_position" ng-options="f for f in ['top','right','bottom','left']" ng-change="reload_list();"></select></span>
<select class="input-small" ng-model="panel.micropanel_position" ng-options="f for f in ['top','right','bottom','left']" ng-change="reload_list();"></select>
</div>
<div class="span3"><h6>List Arrangement</h6>
<select class="input-small" ng-model="panel.arrange" ng-options="f for f in ['horizontal','vertical']"></select></span>
<select class="input-small" ng-model="panel.arrange" ng-options="f for f in ['horizontal','vertical']"></select>
</div>
<div class="span3"><h6>Font Size</h6>
<select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
</div>
<select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/panels/goal/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h5>View Options</h5>
</div>
<div class="editor-option">
<label class="small">Legend</label>
<select class="input-small" ng-model="panel.legend" ng-options="f for f in ['above','below','none']"></select></span>
<select class="input-small" ng-model="panel.legend" ng-options="f for f in ['above','below','none']"></select>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/app/panels/goal/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
.goal-label { pointer-events: none }
</style>
<div ng-show="panel.legend == 'above'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
<span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
<span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span>
</div>
<div style="clear:both"></div>

<div goal params="{{panel}}" style="position:relative"></div>

<div ng-show="panel.legend == 'below'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
<span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
<span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span>
</div>
</div>
6 changes: 3 additions & 3 deletions src/app/panels/histogram/styleEditor.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h5>Multiple Series</h5>

<div class="editor-row">
<div class="section">
<h5>Header<h5>
<h5>Header</h5>
<div class="editor-option">
<label class="small">Zoom</label><input type="checkbox" ng-model="panel.zoomlinks" ng-checked="panel.zoomlinks" />
</div>
Expand All @@ -61,7 +61,7 @@ <h5>Header<h5>
</div>
</div>
<div class="section">
<h5>Legend<h5>
<h5>Legend</h5>
<div class="editor-option">
<label class="small">Legend</label><input type="checkbox" ng-model="panel.legend" ng-checked="panel.legend">
</div>
Expand All @@ -74,7 +74,7 @@ <h5>Legend<h5>
</div>

<div class="section">
<h5>Grid<h5>
<h5>Grid</h5>
<div class="editor-option">
<label class="small">Min / <a href='' ng-click="panel.grid.min = _.toggle(panel.grid.min,null,0)">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.min)"></i></a></label>
<input type="number" class="input-small" ng-model="panel.grid.min"/>
Expand Down
8 changes: 4 additions & 4 deletions src/app/panels/hits/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<div class="section">
<div class="editor-option">
<label class="small">Style</label>
<select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','list','total']"></select></span>
<select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','list','total']"></select>
</div>
<div class="editor-option" ng-show="panel.chart == 'total' || panel.chart == 'list'">
<label class="small">Font Size</label>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
<div class="editor-option" ng-show="panel.chart == 'bar' || panel.chart == 'pie'">
<label class="small">Legend</label>
<select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select></span>
<select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select>
</div>
<div class="editor-option" ng-show="panel.chart != 'total' && panel.counter_pos != 'none'">
<label class="small" >List Format</label>
<select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select></span>
<select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select>
</div>
<div class="editor-option" ng-show="panel.chart == 'pie'">
<label class="small">Donut</label><input type="checkbox" ng-model="panel.donut" ng-checked="panel.donut">
Expand Down
2 changes: 1 addition & 1 deletion src/app/panels/hits/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<!-- horizontal legend -->
<div class="small" ng-show="panel.arrangement == 'horizontal'" ng-repeat="query in data" style="float:left;padding-left: 10px;">
<span><i class="icon-circle" ng-style="{color:query.info.color}"></i></span> {{query.info.alias}} ({{query.data[0][1]}}) </span>
<span><i class="icon-circle" ng-style="{color:query.info.color}"></i> {{query.info.alias}} ({{query.data[0][1]}}) </span>
</div><br>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/panels/query/meta.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
<div class="pull-right">
<a class="btn btn-mini" ng-click="dashboard.current.services.query.list[id].enable=false;dashboard.refresh();dismiss();" class="pointer">Deactivate</a>
<a class="btn btn-mini" ng-class="{active:dashboard.current.services.query.list[id].pin}" ng-click="toggle_pin(id);dismiss();" class="pointer">Pin <i class="icon-pushpin"></i></a>
<input class="btn btn-mini" ng-click="dashboard.refresh();dismiss();" type="submit"/ value="Close">
<input class="btn btn-mini" ng-click="dashboard.refresh();dismiss();" type="submit" value="Close">
</div>
</div>
6 changes: 3 additions & 3 deletions src/app/panels/stats/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ <h5>Columns</h5>
<label class="small">{{stat}}</label><input type="checkbox" ng-model="panel.show[stat]" ng-checked="panel.show[stat]">
</div>

<h5>Formating</h5>
<h5>Formatting</h5>
<div class="editor-option">
<label class="small">Format</label>
<select ng-change="set_refresh(true)" class="input-small" ng-model="panel.format" ng-options="f for f in ['number','float','money','bytes']"></select>
</div>
<div class="editor-option">
<label class="small">Font Size</label>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
<div class="editor-option">
<label class="small">Display Breakdowns</label>
<select class="input-mini" ng-model="panel.display_breakdown" ng-options="f for f in ['yes', 'no']"></select></span>
<select class="input-mini" ng-model="panel.display_breakdown" ng-options="f for f in ['yes', 'no']"></select>
</div>
<div class="editor-option">
<label class="small">Query column name</label>
Expand Down
4 changes: 2 additions & 2 deletions src/app/panels/table/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ <h5>Options</h5>
</div>
<div class="editor-option" style="white-space:nowrap" ng-show='panel.sortable'>
<label class="small">Sort</label>
<input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text"></input>
<input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text">
<i ng-click="set_sort(panel.sort[0])" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
</div>
<div class="editor-option"><label class="small">Font Size</label>
<select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
<select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
<div class="editor-option">
<label class="small">Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></label>
Expand Down
2 changes: 1 addition & 1 deletion src/app/panels/table/pagination.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h6>Per Page</h6>
</div>
<div class="editor-option">
<h6>&nbsp;</h6>
<center><i class='icon-remove'></i><center>
<center><i class='icon-remove'></i></center>
</div>
<div class="editor-option">
<h6>Page limit</h6>
Expand Down
10 changes: 5 additions & 5 deletions src/app/panels/terms/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5>Parameters</h5>
</div>
<div class="editor-option" ng-show="panel.tmode == 'terms'">
<label class="small">Exclude Terms(s) (comma separated)</label>
<input array-join type="text" ng-model='panel.exclude'></input>
<input array-join type="text" ng-model='panel.exclude'>
</div>
</div>
</div>
Expand All @@ -37,19 +37,19 @@ <h5>Parameters</h5>
<h5>View Options</h5>
<div class="editor-option">
<label class="small">Style</label>
<select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','table']"></select></span>
<select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','table']"></select>
</div>
<div class="editor-option" ng-show="panel.chart == 'table'">
<label class="small">Font Size</label>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
<select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
<div class="editor-option" ng-show="panel.chart == 'bar' || panel.chart == 'pie'">
<label class="small">Legend</label>
<select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select></span>
<select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select>
</div>
<div class="editor-option" ng-show="panel.chart != 'table' && panel.counter_pos != 'none'">
<label class="small" >Legend Format</label>
<select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select></span>
<select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select>
</div>
<div class="editor-option">
<label class="small">Missing</label><input type="checkbox" ng-model="panel.missing" ng-checked="panel.missing">
Expand Down
36 changes: 18 additions & 18 deletions src/app/panels/terms/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<!-- vertical legend below -->
<table class="small" ng-show="panel.arrangement == 'vertical'">
<tr ng-repeat="term in legend">
<td><i class="icon-circle" ng-style="{color:term.color}"></i></i></td>
<td><i class="icon-circle" ng-style="{color:term.color}"></i></td>
<td class="terms-legend-term" style="padding-right:10px;padding-left:10px;">{{term.label}}</td>
<td>{{term.data[0][1]}}</td>
</tr>
Expand All @@ -88,21 +88,21 @@
<!-- END Pie or Bar chart -->


<!-- TABLE -->
<table ng-style="panel.style" class="table table-striped table-condensed" ng-show="panel.chart == 'table'">
<thead>
<th>Term</th> <th>{{ panel.tmode == 'terms_stats' ? panel.tstat : 'Count' }}</th> <th>Action</th>
</thead>
<tr ng-repeat="term in data" ng-show="showMeta(term)">
<td class="terms-legend-term">{{term.label}}</td>
<td>{{term.data[0][1]}}</td>
<td>
<span ng-hide="term.meta == 'other'">
<i class='icon-search pointer' ng-click="build_search(term)"></i>
<i class='icon-ban-circle pointer' ng-click="build_search(term,true)"></i>
</span>
</td>
</tr>
</table>

<!-- TABLE -->
<table ng-style="panel.style" class="table table-striped table-condensed" ng-show="panel.chart == 'table'">
<thead>
<th>Term</th> <th>{{ panel.tmode == 'terms_stats' ? panel.tstat : 'Count' }}</th> <th>Action</th>
</thead>
<tr ng-repeat="term in data" ng-show="showMeta(term)">
<td class="terms-legend-term">{{term.label}}</td>
<td>{{term.data[0][1]}}</td>
<td>
<span ng-hide="term.meta == 'other'">
<i class='icon-search pointer' ng-click="build_search(term)"></i>
<i class='icon-ban-circle pointer' ng-click="build_search(term,true)"></i>
</span>
</td>
</tr>
</table>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/partials/dasheditor.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h5>Save to</h5>
<label class="small">Browser</label><input type="checkbox" ng-model="dashboard.current.loader.save_default" ng-checked="dashboard.current.loader.save_default">
</div>
<div class="editor-option">
<label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github<tip></label><input type="checkbox" ng-model="dashboard.current.loader.save_gist" ng-checked="dashboard.current.loader.save_gist">
<label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github</tip></label><input type="checkbox" ng-model="dashboard.current.loader.save_gist" ng-checked="dashboard.current.loader.save_gist">
</div>
<div class="editor-option">
<label class="small">Elasticsearch</label><input type="checkbox" ng-model="dashboard.current.loader.save_elasticsearch" ng-checked="dashboard.current.loader.save_elasticsearch">
Expand Down
8 changes: 4 additions & 4 deletions src/app/partials/roweditor.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

<div class="editor-row" ng-if="editor.index == 0">
<div class="editor-option">
<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'>
</div>
<div class="editor-option">
<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'>
</div>
<div class="editor-option">
<label class="small"> Editable </label><input type="checkbox" ng-model="row.editable" ng-checked="row.editable" />
<label class="small"> Editable </label><input type="checkbox" ng-model="row.editable" ng-checked="row.editable">
</div>
<div class="editor-option">
<label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable" />
<label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable">
</div>
</div>
<div class="row-fluid" ng-if="editor.index == 1">
Expand Down