From c93a3ce22795d8138a6d3f37d82d840514cf40fd Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 4 Jan 2016 09:17:47 +0100
Subject: [PATCH] feat(playlist): make default timespan placeholder

---
 public/app/features/playlist/partials/playlist.html | 8 ++++----
 public/app/features/playlist/playlistRoutes.js      | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/public/app/features/playlist/partials/playlist.html b/public/app/features/playlist/partials/playlist.html
index 9d9bc0b2589..5ae196d94d7 100644
--- a/public/app/features/playlist/partials/playlist.html
+++ b/public/app/features/playlist/partials/playlist.html
@@ -2,7 +2,7 @@
 
 <div class="page-container" ng-form="playlistEditForm">
   <div class="page">
-    <h4>Creating new playlist</h4><br><br>
+    <h2>Create new playlist</h2><br><br>
     <div class="row" style="margin-bottom: 10px;">
       <div>
         <div class="tight-form">
@@ -11,18 +11,18 @@
               <strong>Title</strong>
             </li>
             <li>
-              <input type="text" required ng-model="playlist.title" class="input-xxlarge tight-form-input last">
+              <input type="text" required ng-model="playlist.title" class="input-xlarge tight-form-input">
             </li>
           </ul>
           <div class="clearfix"></div>
         </div>
-        <div class="tight-form">
+        <div class="tight-form last">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 100px">
               <strong>Timespan</strong>
             </li>
             <li>
-              <input type="text" required ng-model="playlist.timespan" class="input-xxlarge tight-form-input last">
+              <input type="text" required ng-model="playlist.timespan" placeholder="5m" class="input-xlarge tight-form-input">
             </li>
           </ul>
           <div class="clearfix"></div>
diff --git a/public/app/features/playlist/playlistRoutes.js b/public/app/features/playlist/playlistRoutes.js
index 2c2515200ae..0a40bfe2114 100644
--- a/public/app/features/playlist/playlistRoutes.js
+++ b/public/app/features/playlist/playlistRoutes.js
@@ -24,9 +24,7 @@ function (angular, config, _) {
         controller : 'PlaylistEditCtrl',
         resolve: {
           playlist: function() {
-            return {
-              timespan: '1m'
-            };
+            return {};
           },
           dashboards: function() {
             return [];