use proper file icons for image and audio files

diff --git a/core/img/mimetypes/audio.png b/core/img/mimetypes/audio.png
new file mode 100644 (file)
index 0000000..6333b94
Binary files /dev/null and b/core/img/mimetypes/audio.png differ

diff --git a/core/img/mimetypes/music.png b/core/img/mimetypes/music.png
deleted file mode 100644 (file)
index 6333b94..0000000
Binary files a/core/img/mimetypes/music.png and /dev/null differ

diff --git a/files/js/filelist.js b/files/js/filelist.js
index 252a9c95807106a1d00a463f713560fa8d85b9d2..a53ad672e420ae67d51b2930caf8e795abe75336 100644 (file)
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -96,7 +96,8 @@ FileList={
        },
        loadingDone:function(name){
                $('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);
        },
        isLoading:function(name){

diff --git a/files/js/files.js b/files/js/files.js
index 60f2b2aec8729c769a79c7b55c3e6071ddc0cbc7..193c740b6c5921807c6aaaaf2729fdaf1d3918cb 100644 (file)
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -437,3 +437,12 @@ function relative_modified_date(timestamp) {
        else if(timediff < 63113852) { return 'last year'; }
        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

diff --git a/lib/helper.php b/lib/helper.php
index 1fbcc589d101fe602590db82e1f38ccb25fb2dfa..ffb25877433fe9c2580a0211cac5cfc7bd47336f 100755 (executable)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -110,6 +110,11 @@ class OC_HELPER {
                if( file_exists( "$SERVERROOT/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{
                        return "$WEBROOT/core/img/mimetypes/file.png";
                }