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

changed playlist modal to edit pane

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-26 09:46:15 +02:00
parent 9fc6c4888f
commit 1a97f79d54
5 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/controllers/annotationsEditorCtrl.js
View File

@ -9,7 +9,7 @@ function (angular, app, _, $) {
var module = angular.module('grafana.controllers'); var module = angular.module('grafana.controllers');
module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv, $timeout) { module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv) {
var annotationDefaults = { var annotationDefaults = {
name: '', name: '',
datasource: null, datasource: null,

18
src/app/partials/playlist.html
View File

@ -1,8 +1,13 @@
<div ng-controller="PlaylistCtrl" ng-init="init()"> <div ng-controller="PlaylistCtrl" ng-init="init()">
<div class="modal-header"> <div class="dashboard-editor-header">
<h3>Start dashboard playlist</h3> <div class="dashboard-editor-title">
<i class="icon icon-play"></i>
Start dashboard playlist
</div> </div>
<div class="modal-body"> </div>
<div class="dashboard-editor-body">
<div class="editor-row"> <div class="editor-row">
<div class="section"> <div class="section">
<div class="editor-option"> <div class="editor-option">
@ -47,9 +52,10 @@
</div> </div>
</div> </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>
<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>
</div> </div>

2
src/app/partials/search.html
View File

@ -20,7 +20,7 @@
<li ng-if="!showImport"> <li ng-if="!showImport">
<div class="grafana-search-panel"> <div class="grafana-search-panel">
<div class="search-field-wrapper"> <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> <i class="icon-play"></i>
Playlist Playlist
</button> </button>

2
src/css/less/bootswatch.dark.less
View File

@ -363,7 +363,7 @@ div.subnav {
background-image: none; background-image: none;
.box-shadow(none); .box-shadow(none);
border: none; border: none;
.border-radius(0); .border-radius(2px);
text-shadow: none; text-shadow: none;
&.disabled { &.disabled {

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

@ -41,7 +41,7 @@
width: 100%; width: 100%;
} }
button { button {
margin: 0 2px 0 0; margin: 0 4px 0 0;
} }
> span { > span {
display: block; display: block;
@ -104,7 +104,7 @@
.search-tagview-switch { .search-tagview-switch {
position: absolute; position: absolute;
top: 15px; top: 15px;
right: 266px; right: 272px;
color: darken(@linkColor, 30%); color: darken(@linkColor, 30%);
&.active { &.active {
color: @linkColor; color: @linkColor;