Просмотр исходного кода

feat(playlist): make default timespan placeholder

bergquist 10 лет назад
Родитель
Сommit
c93a3ce227

+ 4 - 4
public/app/features/playlist/partials/playlist.html

@@ -2,7 +2,7 @@
 
 
 <div class="page-container" ng-form="playlistEditForm">
 <div class="page-container" ng-form="playlistEditForm">
   <div class="page">
   <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 class="row" style="margin-bottom: 10px;">
       <div>
       <div>
         <div class="tight-form">
         <div class="tight-form">
@@ -11,18 +11,18 @@
               <strong>Title</strong>
               <strong>Title</strong>
             </li>
             </li>
             <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>
             </li>
           </ul>
           </ul>
           <div class="clearfix"></div>
           <div class="clearfix"></div>
         </div>
         </div>
-        <div class="tight-form">
+        <div class="tight-form last">
           <ul class="tight-form-list">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 100px">
             <li class="tight-form-item" style="width: 100px">
               <strong>Timespan</strong>
               <strong>Timespan</strong>
             </li>
             </li>
             <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>
             </li>
           </ul>
           </ul>
           <div class="clearfix"></div>
           <div class="clearfix"></div>

+ 1 - 3
public/app/features/playlist/playlistRoutes.js

@@ -24,9 +24,7 @@ function (angular, config, _) {
         controller : 'PlaylistEditCtrl',
         controller : 'PlaylistEditCtrl',
         resolve: {
         resolve: {
           playlist: function() {
           playlist: function() {
-            return {
-              timespan: '1m'
-            };
+            return {};
           },
           },
           dashboards: function() {
           dashboards: function() {
             return [];
             return [];