IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-26 10:49:09 +02:00
parent d0d0e8349f
commit 08d2492839
3 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/panels/graph/module.html
View File

@ -21,14 +21,23 @@
<div class="clearfix"></div>
<div class="panel-full-edit-tabs" ng-if="editMode">
<div style="margin-top: 30px" ng-if="editMode">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-bar-chart"></i>
Chart settings
</div>
<div ng-model="editor.index" bs-tabs>
<div ng-repeat="tab in editorTabs" data-title="{{tab}}">
</div>
</div>
</div>
<div class="tab-content" ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="editorTabs[editor.index] == tab.title">
<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>

20
src/app/partials/dasheditor.html
View File

@ -59,22 +59,6 @@
</tr>
</table>
</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>
@ -107,8 +91,8 @@
</div>
<div class="dashboard-editor-footer">
<div class="pull-left grafana-version-footer" ng-if="editor.index == 0">
<span class="editor-option small">
<div class="pull-left" ng-if="editor.index == 0">
<span class="editor-option small" style="line-height: 20px;">
Grafana version: {{grafanaVersion}}
</span>
<span> | <a ng-click="toggleConsole()" ng-show="!consoleEnabled">enable console</a> <a ng-click="toggleConsole()" ng-show="consoleEnabled">disable console</a></span>

7
src/css/less/grafana.less
View File

@ -522,12 +522,6 @@ select.grafana-target-segment-input {
padding: 10px;
}
.grafana-version-footer {
padding-top: 15px;
text-align: left;
}
.metrics-editor-help:hover {
.hide {
display: block;
@ -562,7 +556,6 @@ select.grafana-target-segment-input {
.dashboard-editor-body {
padding: 20px 10px;
min-height: 100px;
overflow: hidden;
}
.dashboard-editor-footer {