Commit fa06040e by Torkel Ödegaard

ux(): updated playlist, other other minor fixes

parent eae4bb74
......@@ -2,51 +2,28 @@
</navbar>
<div class="page-container" ng-form="playlistEditForm">
<div class="page">
<h1 ng-show="ctrl.isNew()">New Playlist</h1>
<h1 ng-show="!ctrl.isNew()">Edit Playlist</h1>
<h3>Name and interval</h3>
<div style="margin-bottom: 10px;">
<div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Name
</li>
<li>
<input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge norm-form-input">
</li>
</ul>
<div class="clearfix"></div>
<div class="gf-form-group">
<div class="gf-form">
<span class="gf-form-label gf-size-s">Name</span>
<input type="text" required ng-model="ctrl.playlist.name" class="gf-form-input gf-form-size-xl">
</div>
<div class="norm-form last">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Interval
</li>
<li>
<input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge norm-form-input">
</li>
</ul>
<div class="clearfix"></div>
<div class="gf-form">
<span class="gf-form-label gf-size-s">Interval</span>
<input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="gf-form-input gf-form-s">
</div>
</div>
<br>
</div>
</div>
<div class="row">
<div class="span5 pull-left">
<div class="row" style="max-width: 400px">
<h5>Add dashboards</h5>
<div style="">
<playlist-search class="playlist-search-container" search-started="ctrl.searchStarted(promise)"></playlist-search>
</div>
</div>
</div>
<div class="row">
<div class="span5 pull-left" ng-if="ctrl.filteredDashboards.length > 0">
......
......@@ -182,7 +182,7 @@ form input.ng-invalid {
.row-open {
margin-top: 5px;
left:-34px;
left:-28px;
position: absolute;
z-index: 100;
transition: .10s left;
......
......@@ -14,9 +14,9 @@
}
.playlist-search-switches {
position: relative;
top: -39px;
left: 260px;
position: absolute;
top: 8px;
right: 11px;
}
.playlist-search-field-wrapper {
......
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