diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-23 14:40:56 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-23 14:40:56 +0100 |
| commit | 5130eca3e3b76efe48332e6d6d063bd728a62d69 (patch) | |
| tree | 02a57b6cb4135916c7bc1cfb444365d434cd0e41 /core | |
| parent | a9b4f0d8429dbeb612e80b168b6146890bb7843e (diff) | |
| download | nextcloud-server-5130eca3e3b76efe48332e6d6d063bd728a62d69.tar.gz nextcloud-server-5130eca3e3b76efe48332e6d6d063bd728a62d69.zip | |
combine labels with inputs in sharing dialog, fix #14796
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/share.css | 1 | ||||
| -rw-r--r-- | core/js/share.js | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/css/share.css b/core/css/share.css index a0b041741f3..94811100fcf 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -65,7 +65,6 @@ #shareWithList label input[type=checkbox]{ margin-left: 0; - top: 3px; position: relative; } #shareWithList .username{ diff --git a/core/js/share.js b/core/js/share.js index 8804db12a08..2d3b36ae63d 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -674,23 +674,23 @@ OC.Share={ html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> '; } if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) { - html += '<input id="canShare-'+escapeHTML(shareWith)+'" type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" /><label for="canShare-'+escapeHTML(shareWith)+'">'+t('core', 'can share')+'</label>'; + html += '<label><input id="canShare-'+escapeHTML(shareWith)+'" 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 += '<input id="canEdit-'+escapeHTML(shareWith)+'" type="checkbox" name="edit" class="permissions" '+editChecked+' /><label for="canEdit-'+escapeHTML(shareWith)+'">'+t('core', 'can edit')+'</label>'; + html += '<label><input id="canEdit-'+escapeHTML(shareWith)+'" type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>'; } if (shareType !== OC.Share.SHARE_TYPE_REMOTE) { showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; } html += '<div class="cruds" style="display:none;">'; if (possiblePermissions & OC.PERMISSION_CREATE) { - html += '<input id="canCreate-' + escapeHTML(shareWith) + '" type="checkbox" name="create" class="permissions" ' + createChecked + ' data-permissions="' + OC.PERMISSION_CREATE + '"/><label for="canCreate-' + escapeHTML(shareWith) + '">' + t('core', 'create') + '</label>'; + html += '<label><input id="canCreate-' + escapeHTML(shareWith) + '" type="checkbox" name="create" class="permissions" ' + createChecked + ' data-permissions="' + OC.PERMISSION_CREATE + '"/>' + t('core', 'create') + '</label>'; } if (possiblePermissions & OC.PERMISSION_UPDATE) { - html += '<input id="canUpdate-' + escapeHTML(shareWith) + '" type="checkbox" name="update" class="permissions" ' + updateChecked + ' data-permissions="' + OC.PERMISSION_UPDATE + '"/><label for="canUpdate-' + escapeHTML(shareWith) + '">' + t('core', 'change') + '</label>'; + html += '<label><input id="canUpdate-' + escapeHTML(shareWith) + '" type="checkbox" name="update" class="permissions" ' + updateChecked + ' data-permissions="' + OC.PERMISSION_UPDATE + '"/>' + t('core', 'change') + '</label>'; } if (possiblePermissions & OC.PERMISSION_DELETE) { - html += '<input id="canDelete-' + escapeHTML(shareWith) + '" type="checkbox" name="delete" class="permissions" ' + deleteChecked + ' data-permissions="' + OC.PERMISSION_DELETE + '"/><label for="canDelete-' + escapeHTML(shareWith) + '">' + t('core', 'delete') + '</label>'; + html += '<label><input id="canDelete-' + escapeHTML(shareWith) + '" type="checkbox" name="delete" class="permissions" ' + deleteChecked + ' data-permissions="' + OC.PERMISSION_DELETE + '"/>' + t('core', 'delete') + '</label>'; } html += '</div>'; html += '</li>'; |