浏览代码

HUE-4491 [fb] Enable creating buckets on S3

Enrico Berti 9 年之前
父节点
当前提交
63731ae

+ 3 - 3
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -129,13 +129,13 @@ ${ fb_components.menubar() }
           </div>
           % endif
           <div class="btn-group" style="vertical-align: middle">
-            <a href="#" data-toggle="dropdown" class="btn dropdown-toggle" data-bind="visible: !inTrash(), css: {'disabled': isS3() && isS3Root()}">
+            <a href="#" data-toggle="dropdown" class="btn dropdown-toggle" data-bind="visible: !inTrash()">
               <i class="fa fa-plus-circle"></i> ${_('New')}
               <span class="caret"></span>
             </a>
             <ul class="dropdown-menu pull-right" style="top: auto">
-              <li><a href="#" class="create-file-link" title="${_('File')}"><i class="fa fa-file-o"></i> ${_('File')}</a></li>
-              <li><a href="#" class="create-directory-link" title="${_('Directory')}"><i class="fa fa-folder"></i> ${_('Directory')}</a></li>
+              <li data-bind="visible: !isS3() || isS3() && !isS3Root()"><a href="#" class="create-file-link" title="${_('File')}"><i class="fa fa-file-o"></i> ${_('File')}</a></li>
+              <li><a href="#" class="create-directory-link" title="${_('Directory')}"><i class="fa fa-folder"></i> <span data-bind="visible: !isS3() || isS3() && !isS3Root()">${_('Directory')}</span><span data-bind="visible: isS3() && isS3Root()">${_('Bucket')}</span></a></li>
             </ul>
           </div>
         </div>

+ 13 - 1
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -359,10 +359,22 @@ from django.utils.translation import ugettext as _
     <div id="createDirectoryModal" class="modal hide fade">
       <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
+        <!-- ko if: !isS3() || (isS3() && !isS3Root()) -->
         <h3>${_('Create Directory')}</h3>
+        <!-- /ko -->
+        <!-- ko if: isS3() && isS3Root() -->
+        <h3>${_('Create Bucket')}</h3>
+        <!-- /ko -->
       </div>
       <div class="modal-body">
-        <label>${_('Directory Name')} <input id="newDirectoryNameInput" name="name" value="" type="text" class="input-xlarge"/></label>
+        <label>
+          <!-- ko if: !isS3() || (isS3() && !isS3Root()) -->
+          ${_('Directory Name')}
+          <!-- /ko -->
+          <!-- ko if: isS3() && isS3Root() -->
+          ${_('Bucket Name')}
+          <!-- /ko -->
+          <input id="newDirectoryNameInput" name="name" value="" type="text" class="input-xlarge"/></label>
         <input type="hidden" name="path" type="text" data-bind="value: currentPath"/>
       </div>
       <div class="modal-footer">