bring back permissions for mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 1983d51809c6d8232271fbedfc5378d2fa7a1786..96b883bbc62c8a66d77d8234924cdaf69f2d302f 100644 (file)
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -547,6 +547,7 @@ html.ie8 #fileList tr.selected td.filename>.selectCheckBox {
 .bubble,
 #app-navigation .app-navigation-entry-menu {
        border-top-right-radius: 3px;
+       min-width: 100px;
 }
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 96bbf94fa1cb17710e8e1d261367138c185103dc..89368955a38d094acf842f134dbb5312b51af917 100644 (file)
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -34,7 +34,6 @@
                                                '</span>' +
                                                '{{/unless}}' +
                                                '{{/if}}' +
-                                               '{{#unless isMailShare}}' +
                                                '<a href="#"><span class="icon icon-more"></span></a>' +
                                                '<div class="popovermenu bubble hidden menu">' +
                                                        '<ul>' +
@@ -47,37 +46,36 @@
                                                                '</li>' +
                                                                '{{/unless}} {{/if}} {{/if}}' +
                                                                '{{#if isFolder}}' +
-                                                                       '{{#if createPermissionPossible}}' +
+                                                                       '{{#if createPermissionPossible}}{{#unless isMailShare}}' +
                                                                        '<li>' +
                                                                                '<span class="shareOption">' +
                                                                                        '<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
                                                                                        '<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
                                                                                '</span>' +
                                                                        '</li>' +
-                                                                       '{{/if}}' +
-                                                                       '{{#if updatePermissionPossible}}' +
+                                                                       '{{/unless}}{{/if}}' +
+                                                                       '{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
                                                                        '<li>' +
                                                                                '<span class="shareOption">' +
                                                                                        '<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
                                                                                        '<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
                                                                                '</span>' +
                                                                        '</li>' +
-                                                                       '{{/if}}' +
-                                                                       '{{#if deletePermissionPossible}}' +
+                                                                       '{{/unless}}{{/if}}' +
+                                                                       '{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
                                                                        '<li>' +
                                                                                '<span class="shareOption">' +
                                                                                        '<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
                                                                                        '<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
                                                                                '</span>' +
                                                                        '</li>' +
-                                                                       '{{/if}}' +
+                                                                       '{{/unless}}{{/if}}' +
                                                                '{{/if}}' +
                                                                '<li>' +
                                                                        '<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>' +
                                                                '</li>' +
                                                        '</ul>' +
                                                '</div>' +
-                                               '{{/unless}}' +
                                        '</span>' +
                                '</li>' +
                        '{{/each}}' +