diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-27 02:31:52 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-27 02:31:52 -0800 |
| commit | 58b06c5c9a8b49b1db9c696b2f46595f229bb729 (patch) | |
| tree | eb3c1f1f277bc94f5b331841ee5e8e2d4e07c929 | |
| parent | f36d92bbc19a1eeb071fe992ae1973691760d8fd (diff) | |
| parent | 07e9f8d0d3d128c28c6fd06890d7152be76a905f (diff) | |
| download | nextcloud-server-58b06c5c9a8b49b1db9c696b2f46595f229bb729.tar.gz nextcloud-server-58b06c5c9a8b49b1db9c696b2f46595f229bb729.zip | |
Merge pull request #1905 from owncloud/fix-share-icons
Fix adding share icons to share action
| -rw-r--r-- | apps/files/css/files.css | 6 | ||||
| -rw-r--r-- | core/js/share.js | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 3cd809038b9..cd339ad26a5 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; } diff --git a/core/js/share.js b/core/js/share.js index dc62dd2e04c..328d57928ec 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) { |