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

merge with master, conflicts fixed

Browse Source
This commit is contained in:
Nick Christus
2015-12-03 20:34:05 -06:00
parent c9bd45ba13 3d178c8eb6
commit 91139672cc
1080 changed files with 40208 additions and 13999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/partials/graphiteImport.html
View File

@@ -25,7 +25,7 @@
<td>
<button class="btn btn-inverse pull-right" ng-click="import(dash.name)">
Load
</a>
</button>
</td>
</tr>
</table>

46
public/app/features/dashboard/partials/settings.html
View File

@@ -77,28 +77,30 @@
<div class="editor-row">
<div class="tight-form-section">
<h5>Rows settings</h5>
<div class="tight-form" ng-repeat="row in dashboard.rows">
<ul class="tight-form-list">
<li class="tight-form-item">
Title
</li>
<li>
<input type="text" class="input tight-form-input" style="width: 400px;" ng-model='row.title'></input>
</li>
<li class="tight-form-item">
<editor-checkbox text="Show title" model="row.showTitle"></editor-checkbox>
</li>
<li class="tight-form-item last">
<i ng-click="_.move(dashboard.rows,$index,$index-1)" ng-class="{'invisible': $first}" class="pointer fa fa-arrow-up"></i>
</li>
<li class="tight-form-item last">
<i ng-click="_.move(dashboard.rows,$index,$index+1)" ng-class="{'invisible': $last}" class="pointer fa fa-fw fa-arrow-down"></i>
</li>
<li class="tight-form-item last">
<i ng-click="dashboard.rows = _.without(dashboard.rows,row)" class="pointer fa fa-remove"></i>
</li>
</ul>
<div class="clearfix"></div>
<div class="tight-form-container">
<div class="tight-form" ng-repeat="row in dashboard.rows">
<ul class="tight-form-list">
<li class="tight-form-item">
Title
</li>
<li>
<input type="text" class="input tight-form-input" style="width: 400px;" ng-model='row.title'></input>
</li>
<li class="tight-form-item">
<editor-checkbox text="Show title" model="row.showTitle"></editor-checkbox>
</li>
<li class="tight-form-item last">
<i ng-click="_.move(dashboard.rows,$index,$index-1)" ng-class="{'invisible': $first}" class="pointer fa fa-arrow-up"></i>
</li>
<li class="tight-form-item last">
<i ng-click="_.move(dashboard.rows,$index,$index+1)" ng-class="{'invisible': $last}" class="pointer fa fa-fw fa-arrow-down"></i>
</li>
<li class="tight-form-item last">
<i ng-click="dashboard.rows = _.without(dashboard.rows,row)" class="pointer fa fa-remove"></i>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>