sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1324 from owncloud/permanent-share-icons 

Permanently display shared status icons
remotes/origin/stable5
Michael Gapczynski 2013-01-28 20:17:40 +07:00
parent 8c4931a645 ed2ee8c411
commit 5143660cd3
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/css/files.css
Unescape Escape View File

@ -104,7 +104,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
}
#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */
#fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */
background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
}
#fileList .fileactions a.action img { position:relative; top:.2em; }

4
core/css/styles.css
Unescape Escape View File

@ -195,8 +195,8 @@ fieldset.warning legend { color:#b94a48 !important; }
#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
tr .action { width:16px; height:16px; }
.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }

23
core/js/share.js
Unescape Escape View File

@ -23,7 +23,10 @@ OC.Share={
} else {
var file = $('tr').filterAttr('data-file', OC.basename(item));
if (file.length > 0) {
$(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img').attr('src', image);
var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
action.find('img').attr('src', image);
action.addClass('permanent');
action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
}
var dir = $('#dir').val();
if (dir.length > 1) {
@ -32,9 +35,12 @@ OC.Share={
// Search for possible parent folders that are shared
while (path != last) {
if (path == item) {
var img = $('.fileactions .action').filterAttr('data-action', 'Share').find('img');
var action = $('.fileactions .action').filterAttr('data-action', 'Share');
var img = action.find('img');
if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
img.attr('src', image);
action.addClass('permanent');
action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
}
}
last = path;
@ -48,7 +54,8 @@ OC.Share={
},
updateIcon:function(itemType, itemSource) {
if (itemType == 'file' || itemType == 'folder') {
var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
var file = $('tr').filterAttr('data-id', String(itemSource));
var filename = file.data('file');
if ($('#dir').val() == '/') {
itemSource = $('#dir').val() + filename;
} else {
@ -75,6 +82,16 @@ OC.Share={
});
if (itemType != 'file' && itemType != 'folder') {
$('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);
if (shares) {
action.addClass('permanent');
action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
} else {
action.removeClass('permanent');
action.html(action.html().replace(t('core', 'Shared'), t('core', 'Share')));
}
}
if (shares) {
OC.Share.statuses[itemSource] = link;