From aa2ea9e3de6002a8b58adf122a4562ed478c2a81 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 25 Feb 2013 20:20:29 -0500 Subject: [PATCH 1/3] Fix adding share icons to share action --- core/js/share.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 6d1c395404..faa64103b7 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -24,9 +24,9 @@ OC.Share={ var file = $('tr').filterAttr('data-file', OC.basename(item)); if (file.length > 0) { var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); - action.find('img').attr('src', image); + var img = action.find('img').attr('src', image); action.addClass('permanent'); - action.html(t('core', 'Shared')); + action.html(t('core', ' Shared')).prepend(img); } var dir = $('#dir').val(); if (dir.length > 1) { @@ -40,7 +40,7 @@ OC.Share={ if (img.attr('src') != OC.imagePath('core', 'actions/public')) { img.attr('src', image); action.addClass('permanent'); - action.html(t('core', 'Shared')); + action.html(t('core', ' Shared')).prepend(img); } } last = path; @@ -84,13 +84,13 @@ OC.Share={ $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center'); } else { var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); - action.find('img').attr('src', image); + var img = action.find('img').attr('src', image); if (shares) { action.addClass('permanent'); - action.html(t('core', 'Shared')); + action.html(t('core', ' Shared')).prepend(img); } else { action.removeClass('permanent'); - action.html(t('core', 'Share')); + action.html(t('core', ' Share')).prepend(img); } } if (shares) { From 5b732ac1eab641c02a376ec15ce7ada1aeb3e6b0 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 25 Feb 2013 20:52:01 -0500 Subject: [PATCH 2/3] Move space --- core/js/share.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index faa64103b7..f8a8e0ee35 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -26,7 +26,7 @@ OC.Share={ var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); var img = action.find('img').attr('src', image); action.addClass('permanent'); - action.html(t('core', ' Shared')).prepend(img); + action.html(' '+t('core', 'Shared')).prepend(img); } var dir = $('#dir').val(); if (dir.length > 1) { @@ -40,7 +40,7 @@ OC.Share={ if (img.attr('src') != OC.imagePath('core', 'actions/public')) { img.attr('src', image); action.addClass('permanent'); - action.html(t('core', ' Shared')).prepend(img); + action.html(' '+t('core', 'Shared')).prepend(img); } } last = path; @@ -87,10 +87,10 @@ OC.Share={ var img = action.find('img').attr('src', image); if (shares) { action.addClass('permanent'); - action.html(t('core', ' Shared')).prepend(img); + action.html(' '+t('core', 'Shared')).prepend(img); } else { action.removeClass('permanent'); - action.html(t('core', ' Share')).prepend(img); + action.html(' '+t('core', 'Share')).prepend(img); } } if (shares) { From 07e9f8d0d3d128c28c6fd06890d7152be76a905f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 26 Feb 2013 18:49:20 +0100 Subject: [PATCH 3/3] remove general CSS from IE specific rules, displays Shared state permanently again --- apps/files/css/files.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 3cd809038b..cd339ad26a 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -124,22 +124,16 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions a img { position:relative; top:.3em; } #fileList a.action { - display:none; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); - opacity: 0; } #fileList tr:hover a.action { - display:inline; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)"; filter: alpha(opacity=.5); - opacity: .5; } #fileList tr:hover a.action:hover { - display:inline; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; filter: alpha(opacity=1); - opacity: 1; } #scanning-message{ top:40%; left:40%; position:absolute; display:none; }