diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-26 16:23:39 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-26 16:23:39 +0200 |
| commit | 1dc6e1767cd2522592603496104415d9fc41b4d7 (patch) | |
| tree | c3b25ba96c2b80a1f00f50bc444d292c2187fd17 /core | |
| parent | b7d79a90b0bb03e4f74d162b016de850de9bb9b8 (diff) | |
| parent | 3da90034260e067557f36d836381ab8062bec2b5 (diff) | |
| download | nextcloud-server-1dc6e1767cd2522592603496104415d9fc41b4d7.tar.gz nextcloud-server-1dc6e1767cd2522592603496104415d9fc41b4d7.zip | |
Merge pull request #9211 from owncloud/fix-hidden-share-button
Fix hidden share button and checkbox layout
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/share.css | 2 | ||||
| -rw-r--r-- | core/js/share.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/css/share.css b/core/css/share.css index 0859c195858..314c6140d78 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -35,6 +35,8 @@ #shareWithList label input[type=checkbox]{ margin-left: 0; + top: 3px; + position: relative; } #shareWithList .username{ padding-right: 8px; diff --git a/core/js/share.js b/core/js/share.js index e164602d0ab..1c59524939c 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -569,6 +569,9 @@ OC.Share={ } html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> '; } + if (possiblePermissions & OC.PERMISSION_SHARE) { + html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'can share')+'</label>'; + } if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> '; } @@ -583,9 +586,6 @@ OC.Share={ if (possiblePermissions & OC.PERMISSION_DELETE) { html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />'+t('core', 'delete')+'</label>'; } - if (possiblePermissions & OC.PERMISSION_SHARE) { - html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'share')+'</label>'; - } html += '</div>'; html += '</li>'; html = $(html).appendTo('#shareWithList'); |