Ver Fonte

[fb] Change archive to zip and add download button

Change 'Archives' to 'Zip' when uploading an archive.
Added 'download' button when browsing file system.
abec há 13 anos atrás
pai
commit
6e2227f

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

@@ -40,6 +40,8 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
                 <button class="btn fileToolbarBtn" title="${_('Change Owner / Group')}" data-bind="click: changeOwner, enable: selectedFiles().length > 0"><i class="icon-user"></i> ${_('Change Owner / Group')}</button>
             %endif
             <button class="btn fileToolbarBtn" title="${_('Change Permissions')}" data-bind="click: changePermissions, enable: selectedFiles().length > 0"><i class="icon-list-alt"></i> ${_('Change Permissions')}</button>
+            <button class="btn fileToolbarBtn" title="${_('Download')}" data-bind="click: downloadFile, enable: selectedFiles().length == 1 && selectedFile().type == 'file'"><i class="icon-file"></i> ${_('Download')}</button>
+            &nbsp;&nbsp;
             <button class="btn fileToolbarBtn" title="${_('Delete')}" data-bind="click: deleteSelected, enable: selectedFiles().length > 0"><i class="icon-trash"></i> ${_('Delete')}</button>
         </%def>
 
@@ -51,7 +53,7 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
               </a>
               <ul class="dropdown-menu">
                 <li><a href="#" class="upload-link" title="${_('Files')}" data-bind="click: uploadFile"><i class="icon-file"></i> ${_('Files')}</a></li>
-                <li><a href="#" class="upload-link" title="${_('Archive')}" data-bind="click: uploadArchive"><i class="icon-gift"></i> ${_('Archives')}</a></li>
+                <li><a href="#" class="upload-link" title="${_('Archive')}" data-bind="click: uploadArchive"><i class="icon-gift"></i> ${_('Zip file')}</a></li>
               </ul>
             </div>
 	        <div class="btn-group" style="display: inline-block;">

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

@@ -970,7 +970,7 @@ from django.utils.translation import ugettext as _
                     action: "/filebrowser/upload/archive",
                     template: '<div class="qq-uploader">' +
                             '<div class="qq-upload-drop-area"><span>${_('Drop files here to upload')}</span></div>' +
-                            '<div class="qq-upload-button">${_('Upload an archive')}</div>' +
+                            '<div class="qq-upload-button">${_('Upload a zip file')}</div>' +
                             '<ul class="qq-upload-list"></ul>' +
                             '</div>',
                     fileTemplate: '<li>' +