From c457e15b201632bec5f0ad0030f7e0259485b0e0 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 5 Dec 2012 14:17:21 +0100
Subject: some more usability improvements:

merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
---
 core/js/share.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/js/share.js b/core/js/share.js
index 984fce047b8..c218c2c1233 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -161,9 +161,9 @@ OC.Share={
 			if (link) {
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
@@ -347,9 +347,12 @@ OC.Share={
 		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
+		$('#linkText').css('display','block');
 		$('#showPassword').show();
+		$('#showPassword+label').show();
 		if (password != null) {
 			$('#linkPass').show('blind');
+			$('#showPassword').attr('checked', true);
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
@@ -359,6 +362,7 @@ OC.Share={
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
+		$('#showPassword+label').hide();
 		$('#linkPass').hide();
         $('#emailPrivateLink #email').hide();
         $('#emailPrivateLink #emailButton').hide();
@@ -518,6 +522,11 @@ $(document).ready(function() {
 
 	$('#showPassword').live('click', function() {
 		$('#linkPass').toggle('blind');
+		if (!$('#showPassword').is(':checked') ) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+		}
 	});
 
 	$('#linkPassText').live('focusout keyup', function(event) {
-- 
cgit v1.2.3