Эх сурвалжийг харах

[home2] Polished UI and added initial support for floatlabels.js

Enrico Berti 9 жил өмнө
parent
commit
1c86462

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
desktop/core/src/desktop/static/desktop/ext/js/jquery/plugins/floatlabels.min.js


+ 1 - 1
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -179,7 +179,7 @@
           }
           self.loading(false);
           self.loaded(true);
-          if (callback) {
+          if (callback && typeof callback === 'function') {
             callback();
           }
         },

+ 6 - 0
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -2943,4 +2943,10 @@
     }
   };
 
+  ko.bindingHandlers.floatlabel = {
+    init: function (element, valueAccessor, allBindings) {
+      $(element).floatlabel();
+    }
+  };
+
 }));

+ 2 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -188,6 +188,7 @@ from django.utils.translation import ugettext as _
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery.total-storage.min.js') }"></script>
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery.placeholder.min.js') }"></script>
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js') }"></script>
+  <script src="${ static('desktop/ext/js/jquery/plugins/floatlabels.min.js') }"></script>
   <script src="${ static('desktop/js/jquery.datatables.sorting.js') }"></script>
   <script src="${ static('desktop/ext/js/bootstrap.min.js') }"></script>
   <script src="${ static('desktop/ext/js/bootstrap-better-typeahead.min.js') }"></script>
@@ -407,7 +408,7 @@ from django.utils.translation import ugettext as _
     <a class="brand nav-tooltip pull-left" title="${_('About Hue')}" rel="navigator-tooltip" href="/about"><img src="${ static('desktop/art/hue-logo-mini-white.png') }" data-orig="${ static('desktop/art/hue-logo-mini-white.png') }" data-hover="${ static('desktop/art/hue-logo-mini-white-hover.png') }" /></a>
     % if user.is_authenticated() and section != 'login':
      <ul class="nav nav-pills pull-left">
-       <li><a title="${_('My documents')}" rel="navigator-tooltip" href="${ url('desktop.views.home') }" style="padding-bottom:2px!important"><i class="fa fa-home" style="font-size: 19px"></i></a></li>
+       <li><a title="${_('My documents')}" rel="navigator-tooltip" href="${ url('desktop.views.home2') }" style="padding-bottom:2px!important"><i class="fa fa-home" style="font-size: 19px"></i></a></li>
        <%
          query_apps = count_apps(apps, ['beeswax', 'impala', 'rdbms', 'pig', 'jobsub', 'spark']);
        %>

+ 7 - 8
desktop/core/src/desktop/templates/file_browser.mako

@@ -232,6 +232,10 @@ from desktop.views import _ko
     .divider {
       color: #CCC;
     }
+
+    .large-as-modal {
+      width: 542px;
+    }
   </style>
 
   <script type="text/html" id="fb-template">
@@ -348,16 +352,11 @@ from desktop.views import _ko
     <div id="createDirectoryModal" class="modal hide fade">
       <!-- ko with: activeEntry -->
       <div class="modal-body form-horizontal">
-        <div class="control-group">
-          <label class="control-label" for="newDirectoryName">${ _('Name') }</label>
-          <div class="controls">
-            <input id="newDirectoryName" type="text" /></label>
-          </div>
-        </div>
+        <input id="newDirectoryName" class="input large-as-modal" type="text" placeholder="${ _('Directory name') }" data-bind="floatlabel" />
       </div>
       <div class="modal-footer">
         <input type="button" class="btn" data-dismiss="modal" value="${ _('Cancel') }">
-        <input type="button" class="btn" value="${ _('Create') }" data-bind="click: function () { $data.createDirectory($('#newDirectoryName').val()); $('#createDirectoryModal').modal('hide'); }"/>
+        <input type="button" class="btn btn-primary disable-feedback" value="${ _('Create') }" data-bind="click: function () { $data.createDirectory($('#newDirectoryName').val()); $('#createDirectoryModal').modal('hide'); }"/>
       </div>
       <!-- /ko -->
     </div>
@@ -369,7 +368,7 @@ from desktop.views import _ko
         <h3>${ _('Do you really want to delete') }
           <!-- ko if: entriesToDelete().length == 1 --> <span data-bind="text: entriesToDelete()[0].name"></span><!-- /ko -->
           <!-- ko if: entriesToDelete().length > 1 --> <span data-bind="text: entriesToDelete().length"></span> ${ _('entries') }<!-- /ko -->
-        </h3>
+        ?</h3>
       </div>
       <div class="modal-footer">
         <input type="button" class="btn" data-dismiss="modal" value="${ _('Cancel') }">

+ 0 - 4
desktop/core/src/desktop/templates/home2.mako

@@ -134,10 +134,6 @@ ${ fileBrowser.fileBrowser() }
   .home-container {
     height: 100%;
   }
-  .file-browser {
-    position: ;
-  }
-
 </style>
 
 <div class="navbar navbar-inverse navbar-fixed-top nokids">

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно