Merge branch 'editable_false' of github.com:grafana/grafana into editable_false

This commit is contained in:
Torkel Ödegaard 2015-04-27 10:10:01 +02:00
commit ad45b63e79

View File

@ -24,7 +24,7 @@
<div class="row-text pointer" ng-click="toggle_row(row)" ng-bind="row.title"></div>
</div>
<div class="row-open" ng-show="!row.collapse">
<div class='row-tab bgSuccess dropdown' ng-show="row.editable">
<div class='row-tab bgSuccess dropdown' ng-show="dashboardMeta.canEdit">
<span class="row-tab-button dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bars"></i>
</span>
@ -99,7 +99,7 @@
</div>
</div>
<div ng-show='dashboard.editable' class="row-fluid add-row-panel-hint">
<div ng-show='dashboardMeta.canEdit' class="row-fluid add-row-panel-hint">
<div class="span12" style="text-align:right;">
<span style="margin-right: 10px;" ng-click="add_row_default()" class="pointer btn btn-info btn-small">
<span><i class="fa fa-plus"></i> ADD ROW</span>