[#427] Fixed graph styles in multiview.

This commit is contained in:
Sol Villar
2015-03-05 03:40:11 -03:00
parent 6fdd1fbe32
commit 79141e94a9
2 changed files with 38 additions and 27 deletions

View File

@@ -35,6 +35,11 @@
float: left; float: left;
} }
.recline-data-explorer .data-view-sidebar > div {
margin-top: 5px;
margin-bottom: 10px;
}
/********************************************************** /**********************************************************
* Query Editor * Query Editor
*********************************************************/ *********************************************************/

View File

@@ -367,9 +367,10 @@ my.FlotControls = Backbone.View.extend({
<div class="editor"> \ <div class="editor"> \
<form class="form-stacked"> \ <form class="form-stacked"> \
<div class="clearfix"> \ <div class="clearfix"> \
<div class="form-group"> \
<label>Graph Type</label> \ <label>Graph Type</label> \
<div class="input editor-type"> \ <div class="input editor-type"> \
<select> \ <select class="form-control"> \
<option value="lines-and-points">Lines and Points</option> \ <option value="lines-and-points">Lines and Points</option> \
<option value="lines">Lines</option> \ <option value="lines">Lines</option> \
<option value="points">Points</option> \ <option value="points">Points</option> \
@@ -377,20 +378,23 @@ my.FlotControls = Backbone.View.extend({
<option value="columns">Columns</option> \ <option value="columns">Columns</option> \
</select> \ </select> \
</div> \ </div> \
</div> \
<div class="form-group"> \
<label>Group Column (Axis 1)</label> \ <label>Group Column (Axis 1)</label> \
<div class="input editor-group"> \ <div class="input editor-group"> \
<select> \ <select class="form-control"> \
<option value="">Please choose ...</option> \ <option value="">Please choose ...</option> \
{{#fields}} \ {{#fields}} \
<option value="{{id}}">{{label}}</option> \ <option value="{{id}}">{{label}}</option> \
{{/fields}} \ {{/fields}} \
</select> \ </select> \
</div> \ </div> \
</div> \
<div class="editor-series-group"> \ <div class="editor-series-group"> \
</div> \ </div> \
</div> \ </div> \
<div class="editor-buttons"> \ <div class="editor-buttons"> \
<button class="btn editor-add">Add Series</button> \ <button class="btn btn-default editor-add">Add Series</button> \
</div> \ </div> \
<div class="editor-buttons editor-submit" comment="hidden temporarily" style="display: none;"> \ <div class="editor-buttons editor-submit" comment="hidden temporarily" style="display: none;"> \
<button class="editor-save">Save</button> \ <button class="editor-save">Save</button> \
@@ -401,17 +405,19 @@ my.FlotControls = Backbone.View.extend({
', ',
templateSeriesEditor: ' \ templateSeriesEditor: ' \
<div class="editor-series js-series-{{seriesIndex}}"> \ <div class="editor-series js-series-{{seriesIndex}}"> \
<div class="form-group"> \
<label>Series <span>{{seriesName}} (Axis 2)</span> \ <label>Series <span>{{seriesName}} (Axis 2)</span> \
[<a href="#remove" class="action-remove-series">Remove</a>] \ [<a href="#remove" class="action-remove-series">Remove</a>] \
</label> \ </label> \
<div class="input"> \ <div class="input"> \
<select> \ <select class="form-control"> \
{{#fields}} \ {{#fields}} \
<option value="{{id}}">{{label}}</option> \ <option value="{{id}}">{{label}}</option> \
{{/fields}} \ {{/fields}} \
</select> \ </select> \
</div> \ </div> \
</div> \ </div> \
</div> \
', ',
events: { events: {
'change form select': 'onEditorSubmit', 'change form select': 'onEditorSubmit',