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

HUE-5371 [core] Add the region to the filepicker breadcrumbs for S3

Enrico Berti 9 жил өмнө
parent
commit
83062d2

+ 1 - 1
apps/filebrowser/src/filebrowser/views.py

@@ -351,7 +351,7 @@ def listdir(request, path, chooser):
         'superuser': request.fs.superuser,
         'show_upload': (request.REQUEST.get('show_upload') == 'false' and (False,) or (True,))[0],
         'show_download_button': SHOW_DOWNLOAD_BUTTON.get(),
-        'show_upload_button': SHOW_UPLOAD_BUTTON.get()
+        'show_upload_button': SHOW_UPLOAD_BUTTON.get(),
     }
 
     stats = request.fs.listdir_stats(path)

+ 5 - 1
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -931,7 +931,7 @@ div.box {
 }
 
 .filechooser-tree .editable-breadcrumb-input {
-  margin-left: 30px;
+  margin-left: 12px;
   margin-bottom: 0;
   border-radius: 2px;
   border: 1px solid #EEE;
@@ -946,6 +946,10 @@ div.box {
   padding-left: 4px!important;
 }
 
+.filechooser-tree .hueBreadcrumb > li:last-child > a {
+  color: #666;
+}
+
 /*
  * jHueSelector
  */

+ 11 - 6
desktop/core/src/desktop/static/desktop/js/jquery.filechooser.js

@@ -259,10 +259,9 @@
           'padding': '0',
           'marginLeft': '10px',
           'marginBottom': '0',
-          'paddingLeft': '10px',
           'paddingRight': '10px',
           'float': 'left',
-          'width': '350px',
+          'width': '300px',
           'overflow-x': 'scroll',
           'overflow-y': 'hidden',
           'white-space': 'nowrap'
@@ -272,12 +271,17 @@
         var _homelink = $("<a>").addClass("nounderline").html('<i class="fa fa-home"></i> ' + _parent.options.labels.HOME).css("cursor", "pointer").click(function () {
           _parent.navigateTo("/?default_to_home");
         });
+
+        if (_parent.options.fsSelected === 's3a') {
+          _homelink = $("<a>").addClass("nounderline muted").html('<i class="fa fa-cubes"></i> ').css("cursor", "pointer").click(function () {
+            _parent.navigateTo("S3A://");
+          });
+        }
+
         _homelink.appendTo(_home);
 
         $("<span>").addClass("divider").css("margin-right", "20px").appendTo(_home);
-        if (_parent.options.fsSelected !== 's3a') {
-          _home.appendTo($homeBreadcrumb);
-        }
+        _home.appendTo($homeBreadcrumb);
 
         if (_parent.options.showExtraHome) {
           var _extraHome = $("<li>");
@@ -298,7 +302,7 @@
           }
         });
 
-        var $editBreadcrumbs = $("<li>").css('marginRight', '10px');
+        var $editBreadcrumbs = $("<li>").css('marginRight', '2px');
         var $crumbLink = $("<span>").addClass('spacer');
         $crumbLink.html('&nbsp;').appendTo($editBreadcrumbs);
         $editBreadcrumbs.appendTo($scrollingBreadcrumbs);
@@ -327,6 +331,7 @@
         }
         $homeBreadcrumb.appendTo($(_parent.element).find('.filechooser-tree'));
         $scrollingBreadcrumbs.appendTo($(_parent.element).find('.filechooser-tree'));
+        $scrollingBreadcrumbs.width($(_parent.element).find('.filechooser-tree').width() - $homeBreadcrumb.width() - 50);
         $scrollingBreadcrumbs.animate({
           'scrollLeft': $scrollingBreadcrumbs.width()
         });