Commit 1a97f79d by Torkel Ödegaard

changed playlist modal to edit pane

parent 9fc6c488
......@@ -9,7 +9,7 @@ function (angular, app, _, $) {
var module = angular.module('grafana.controllers');
module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv, $timeout) {
module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv) {
var annotationDefaults = {
name: '',
datasource: null,
......
<div ng-controller="PlaylistCtrl" ng-init="init()">
<div class="modal-header">
<h3>Start dashboard playlist</h3>
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-play"></i>
Start dashboard playlist
</div>
<div class="modal-body">
</div>
<div class="dashboard-editor-body">
<div class="editor-row">
<div class="section">
<div class="editor-option">
......@@ -47,9 +52,10 @@
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-success" ng-click="start();dismiss();"><i class="icon-play"></i> Start</button>
<button type="button" class="btn btn-primary" ng-click="dismiss();"><i class="icon-ban-circle"></i> Cancel</button>
</div>
<div class="dashboard-editor-footer">
<button class="btn btn-success" ng-click="start();dismiss();"><i class="icon-play"></i> Start</button>
<button type="button" class="btn btn-success pull-right" ng-click="dismiss();"><i class="icon-ban-circle"></i> Close</button>
</div>
</div>
......@@ -20,7 +20,7 @@
<li ng-if="!showImport">
<div class="grafana-search-panel">
<div class="search-field-wrapper">
<button class="btn btn-success pull-right" config-modal="app/partials/playlist.html">
<button class="btn btn-success pull-right" dash-editor-link="app/partials/playlist.html">
<i class="icon-play"></i>
Playlist
</button>
......
......@@ -363,7 +363,7 @@ div.subnav {
background-image: none;
.box-shadow(none);
border: none;
.border-radius(0);
.border-radius(2px);
text-shadow: none;
&.disabled {
......
......@@ -41,7 +41,7 @@
width: 100%;
}
button {
margin: 0 2px 0 0;
margin: 0 4px 0 0;
}
> span {
display: block;
......@@ -104,7 +104,7 @@
.search-tagview-switch {
position: absolute;
top: 15px;
right: 266px;
right: 272px;
color: darken(@linkColor, 30%);
&.active {
color: @linkColor;
......
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