Commit 08d24928 by Torkel Ödegaard

tweaks to edit & tabs look, removed add row from dasheditor

parent d0d0e834
...@@ -21,14 +21,23 @@ ...@@ -21,14 +21,23 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="panel-full-edit-tabs" ng-if="editMode"> <div style="margin-top: 30px" ng-if="editMode">
<div ng-model="editor.index" bs-tabs> <div class="dashboard-editor-header">
<div ng-repeat="tab in editorTabs" data-title="{{tab}}"> <div class="dashboard-editor-title">
</div> <i class="icon icon-bar-chart"></i>
</div> Chart settings
</div>
<div class="tab-content" ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="editorTabs[editor.index] == tab.title">
<div ng-include src="tab.src"></div> <div ng-model="editor.index" bs-tabs>
</div> <div ng-repeat="tab in editorTabs" data-title="{{tab}}">
</div> </div>
</div>
</div>
<div class="dashboard-editor-body">
<div ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="editorTabs[editor.index] == tab.title">
<div ng-include src="tab.src"></div>
</div>
</div>
</div>
</div> </div>
...@@ -59,22 +59,6 @@ ...@@ -59,22 +59,6 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="span4">
<div class="editor-row">
<div class="section">
<h5>Add Row</h5>
<div class="editor-option">
<label class="small">Title</label>
<input type="text" class="input-normal" ng-model='row.title' placeholder="New row"></input>
</div>
<div class="editor-option">
<label class="small">Height</label>
<input type="text" class="input-mini" ng-model='row.height'></input>
</div>
</div>
<button ng-click="add_row(dashboard,row); reset_row();" class="btn btn-success">Create Row</button>
</div>
</div>
</div> </div>
</div> </div>
...@@ -107,8 +91,8 @@ ...@@ -107,8 +91,8 @@
</div> </div>
<div class="dashboard-editor-footer"> <div class="dashboard-editor-footer">
<div class="pull-left grafana-version-footer" ng-if="editor.index == 0"> <div class="pull-left" ng-if="editor.index == 0">
<span class="editor-option small"> <span class="editor-option small" style="line-height: 20px;">
Grafana version: {{grafanaVersion}} Grafana version: {{grafanaVersion}}
</span> </span>
<span> | <a ng-click="toggleConsole()" ng-show="!consoleEnabled">enable console</a> <a ng-click="toggleConsole()" ng-show="consoleEnabled">disable console</a></span> <span> | <a ng-click="toggleConsole()" ng-show="!consoleEnabled">enable console</a> <a ng-click="toggleConsole()" ng-show="consoleEnabled">disable console</a></span>
......
...@@ -522,12 +522,6 @@ select.grafana-target-segment-input { ...@@ -522,12 +522,6 @@ select.grafana-target-segment-input {
padding: 10px; padding: 10px;
} }
.grafana-version-footer {
padding-top: 15px;
text-align: left;
}
.metrics-editor-help:hover { .metrics-editor-help:hover {
.hide { .hide {
display: block; display: block;
...@@ -562,7 +556,6 @@ select.grafana-target-segment-input { ...@@ -562,7 +556,6 @@ select.grafana-target-segment-input {
.dashboard-editor-body { .dashboard-editor-body {
padding: 20px 10px; padding: 20px 10px;
min-height: 100px; min-height: 100px;
overflow: hidden;
} }
.dashboard-editor-footer { .dashboard-editor-footer {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment