Skip to content
Snippets Groups Projects
Commit 6d0c8ea7 authored by Robin Appelman's avatar Robin Appelman
Browse files

use proper file icons for image and audio files

parent dbcebba8
No related branches found
No related tags found
No related merge requests found
File moved
...@@ -96,7 +96,8 @@ FileList={ ...@@ -96,7 +96,8 @@ FileList={
}, },
loadingDone:function(name){ loadingDone:function(name){
$('tr[data-file="'+name+'"]').data('loading',false); $('tr[data-file="'+name+'"]').data('loading',false);
$('tr[data-file="'+name+'"] td.filename a').attr('style','background-image:url(img/file.png'); var mime=$('tr[data-file="'+name+'"]').data('mime');
$('tr[data-file="'+name+'"] td.filename a').attr('style','background-image:url('+getMimeIcon(mime)+')');
$('tr[data-file="'+name+'"] td.filename').draggable(dragOptions); $('tr[data-file="'+name+'"] td.filename').draggable(dragOptions);
}, },
isLoading:function(name){ isLoading:function(name){
......
...@@ -437,3 +437,12 @@ function relative_modified_date(timestamp) { ...@@ -437,3 +437,12 @@ function relative_modified_date(timestamp) {
else if(timediff < 63113852) { return 'last year'; } else if(timediff < 63113852) { return 'last year'; }
else { return diffyears+' years ago'; } else { return diffyears+' years ago'; }
} }
function getMimeIcon(mime){
mime=mime.substr(0,mime.indexOf('/'));
var knownMimes=['image','audio'];
if(knownMimes.indexOf(mime)==-1){
mime='file';
}
return OC.imagePath('core','mimetypes/'+mime+'.png');
}
\ No newline at end of file
...@@ -110,6 +110,11 @@ class OC_HELPER { ...@@ -110,6 +110,11 @@ class OC_HELPER {
if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){ if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
return "$WEBROOT/core/img/mimetypes/$mimetype.png"; return "$WEBROOT/core/img/mimetypes/$mimetype.png";
} }
//try only the first part of the mimetype
$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
return "$WEBROOT/core/img/mimetypes/$mimetype.png";
}
else{ else{
return "$WEBROOT/core/img/mimetypes/file.png"; return "$WEBROOT/core/img/mimetypes/file.png";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment