summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-25 16:32:24 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-25 16:32:24 +0200
commit3da90034260e067557f36d836381ab8062bec2b5 (patch)
tree38889de0f7b66c2308dba1c611a7e4347b9ee66a /core
parentb1116880f861cf5b72d45a9edfabfdd7d48a9887 (diff)
downloadnextcloud-server-3da90034260e067557f36d836381ab8062bec2b5.tar.gz
nextcloud-server-3da90034260e067557f36d836381ab8062bec2b5.zip
Fix hidden share button and checkbox layout
fixes #9101
Diffstat (limited to 'core')
-rw-r--r--core/css/share.css2
-rw-r--r--core/js/share.js6
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');