[Pkg-owncloud-commits] [owncloud] 50/273: Fix hidden share button and checkbox layout

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 3da90034260e067557f36d836381ab8062bec2b5
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 25 16:32:24 2014 +0200

    Fix hidden share button and checkbox layout
    
    fixes #9101
---
 core/css/share.css | 2 ++
 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 0859c19..314c614 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 e164602..1c59524 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');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git