ソースを参照

HUE-5949 [responsive] Wire in dropzone on the left menu

Enrico Berti 8 年 前
コミット
35876d4

+ 5 - 2
desktop/core/src/desktop/templates/responsive.mako

@@ -320,8 +320,8 @@ ${ hueIcons.symbols() }
         <li><a href="javascript: void(0);">Custom App 2</a></li>
       </ul>
       <div class="left-nav-drop">
-        <div data-bind="click: function () { onePageViewModel.currentApp('importer') }" class="pointer" title="${ _('Import data wizard') }">
-          <i class="fa fa-fw fa-cloud-upload"></i> ${ _('Drop files or click') }
+        <div data-bind="dropzone: { url: '/filebrowser/upload/file?dest=' + DropzoneGlobals.homeDir, params: {dest: DropzoneGlobals.homeDir}, paramName: 'hdfs_file', onComplete: function(path){ onePageViewModel.currentApp('importer'); onePageViewModel.getActiveAppViewModel(function (vm) { vm.createWizard.source.path(path); })  } }" class="pointer" title="${ _('Import data wizard') }">
+          <div class="dz-message" data-dz-message><i class="fa fa-fw fa-cloud-upload"></i> ${ _('Drop files here') }</div>
         </div>
       </div>
     </div>
@@ -869,6 +869,9 @@ ${ assist.assistPanel() }
         var self = this;
         self.onePageViewModel = onePageViewModel;
         self.leftNavVisible = ko.observable(false);
+        self.leftNavVisible.subscribe(function (val) {
+          huePubSub.publish('responsive.left.nav.toggle', val);
+        });
 
         self.onePageViewModel.currentApp.subscribe(function () {
           self.leftNavVisible(false);

+ 1 - 0
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -256,6 +256,7 @@ ${ assist.assistPanel() }
 </style>
 
 <span id="importerComponents" class="notebook" data-bind="dropzone: { url: '/filebrowser/upload/file?dest=' + DropzoneGlobals.homeDir, params: {dest: DropzoneGlobals.homeDir}, paramName: 'hdfs_file', onComplete: function(path){ createWizard.source.path(path); } }">
+<div class="dz-message" data-dz-message></div>
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container-fluid">

+ 6 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -2003,12 +2003,17 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
     });
   }
 
+  var isLeftNavOpen = false;
+  huePubSub.subscribe('responsive.left.nav.toggle', function(val) {
+    isLeftNavOpen = val;
+  });
+
   var showHoverMsg = function (e) {
     var dt = null;
     if (e) {
       dt = e.dataTransfer;
     }
-    if (!dt || (dt.types && (dt.types.indexOf ? dt.types.indexOf('Files') != -1 : dt.types.contains('Files')))) {
+    if (!isLeftNavOpen && (!dt || (dt.types && (dt.types.indexOf ? dt.types.indexOf('Files') != -1 : dt.types.contains('Files'))))) {
       $(".hoverMsg").removeClass("hide");
     }
   };