Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Rework Grid display w/ more space for thumbnails
Browse files Browse the repository at this point in the history 
Display overlay icons in tree, that way we can enable some actions on root node (inc. watch on workspaces).
(cherry picked from commit 9e0df5b)
(cherry picked from commit 399c6f4)
  • Loading branch information
@cdujeu
cdujeu committed Jul 11, 2016
1 parent cf0ba6f commit a43daf4
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 33 deletions.
69 changes: 37 additions & 32 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
View file
Expand Up @@ -1785,40 +1785,45 @@ Class.create("FilesList", SelectableElements, {
className :'text_label'+fullview
}).update(metaData.get('text'));

var backgroundPosition = this.options.iconBgPosition || '4px 2px';
var backgroundImage = 'url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
if(metaData.get('overlay_class') && ajaxplorer.currentThemeUsesIconFonts){
metaData.get('overlay_class').split(',').each(function(c){
textLabel.insert(new Element('span', {className:c+' overlay-class-span'}));
});
}else if(metaData.get('overlay_icon') && Modernizr.multiplebgs){
var ovIcs = metaData.get('overlay_icon').split(',');
switch(ovIcs.length){
case 1:
backgroundPosition = '14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 2:
backgroundPosition = '2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 3:
backgroundPosition = '14px 2px, 2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[2], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 4:
default:
backgroundPosition = '2px 2px, 14px 2px, 2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[2], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[3], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
if(metaData.get('fonticon') && pydio.currentThemeUsesIconFonts){
textLabel.insert({top: new Element('span', {className: 'mimefont mdi mdi-' + metaData.get('fonticon')})});
if(metaData.get('overlay_class')){
metaData.get('overlay_class').split(',').each(function(c){
textLabel.insert(new Element('span', {className:c+' overlay-class-span'}));
});
}
}else{
var backgroundPosition = this.options.iconBgPosition || '4px 2px';
var backgroundImage = 'url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
if(metaData.get('overlay_icon') && Modernizr.multiplebgs){
var ovIcs = metaData.get('overlay_icon').split(',');
switch(ovIcs.length){
case 1:
backgroundPosition = '14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 2:
backgroundPosition = '2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 3:
backgroundPosition = '14px 2px, 2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[2], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
case 4:
default:
backgroundPosition = '2px 2px, 14px 2px, 2px 11px, 14px 11px, ' + backgroundPosition;
backgroundImage = 'url("'+resolveImageSource(ovIcs[0], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[1], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[2], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(ovIcs[3], "/images/overlays/ICON_SIZE", 8)+'"), url("'+resolveImageSource(metaData.get('icon'), "/images/mimes/ICON_SIZE", 16)+'")';
break;
}
}
textLabel.setStyle({
paddingLeft:'24px',
backgroundRepeat:'no-repeat',
backgroundPosition:backgroundPosition,
backgroundImage:backgroundImage
});
}
textLabel.setStyle({
paddingLeft:'24px',
backgroundRepeat:'no-repeat',
backgroundPosition:backgroundPosition,
backgroundImage:backgroundImage
});

var innerSpan = new Element("span", {
className:"list_selectable_span",
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js
View file
Expand Up @@ -152,7 +152,7 @@ Class.create("PreviewFactory", {
var thumbSize = this._thumbSize;
var defaultMargin = 5;
var tW, tH, mT, mB;
if(element.resizePreviewElement && element.getAttribute("data-is_loaded") == "true")
if(element.resizePreviewElement /*&& element.getAttribute("data-is_loaded") == "true"*/)
{
element.resizePreviewElement({width:thumbSize, height:thumbSize, margin:defaultMargin});
}
Expand Down

0 comments on commit a43daf4

Please sign in to comment.