fixes for the mimetype icons

diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
new file mode 100644 (file)
index 0000000..8f8095e
Binary files /dev/null and b/core/img/filetypes/application-pdf.png differ

diff --git a/core/img/filetypes/application-rss+xml.png b/core/img/filetypes/application-rss+xml.png
new file mode 100644 (file)
index 0000000..315c4f4
Binary files /dev/null and b/core/img/filetypes/application-rss+xml.png differ

diff --git a/core/img/filetypes/c.png b/core/img/filetypes/c.png
deleted file mode 100644 (file)
index 34a05cc..0000000
Binary files a/core/img/filetypes/c.png and /dev/null differ

diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/cplusplus.png
deleted file mode 100644 (file)
index a87cf84..0000000
Binary files a/core/img/filetypes/cplusplus.png and /dev/null differ

diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/csharp.png
deleted file mode 100644 (file)
index ffb8fc9..0000000
Binary files a/core/img/filetypes/csharp.png and /dev/null differ

diff --git a/core/img/filetypes/css.png b/core/img/filetypes/css.png
deleted file mode 100644 (file)
index 23f3101..0000000
Binary files a/core/img/filetypes/css.png and /dev/null differ

diff --git a/core/img/filetypes/h.png b/core/img/filetypes/h.png
deleted file mode 100644 (file)
index e902abb..0000000
Binary files a/core/img/filetypes/h.png and /dev/null differ

diff --git a/core/img/filetypes/html.png b/core/img/filetypes/html.png
deleted file mode 100644 (file)
index 55d1072..0000000
Binary files a/core/img/filetypes/html.png and /dev/null differ

diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/ical.png
deleted file mode 100644 (file)
index 6589138..0000000
Binary files a/core/img/filetypes/ical.png and /dev/null differ

diff --git a/core/img/filetypes/image-svg+xml.png b/core/img/filetypes/image-svg+xml.png
new file mode 100644 (file)
index 0000000..a1291c2
Binary files /dev/null and b/core/img/filetypes/image-svg+xml.png differ

diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png
deleted file mode 100644 (file)
index 813f712..0000000
Binary files a/core/img/filetypes/msword.png and /dev/null differ

diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/pdf.png
deleted file mode 100644 (file)
index 8f8095e..0000000
Binary files a/core/img/filetypes/pdf.png and /dev/null differ

diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/rss.png
deleted file mode 100644 (file)
index 315c4f4..0000000
Binary files a/core/img/filetypes/rss.png and /dev/null differ

diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/svg.png
deleted file mode 100644 (file)
index a1291c2..0000000
Binary files a/core/img/filetypes/svg.png and /dev/null differ

diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
new file mode 100644 (file)
index 0000000..6589138
Binary files /dev/null and b/core/img/filetypes/text-calendar.png differ

diff --git a/core/img/filetypes/text-css.png b/core/img/filetypes/text-css.png
new file mode 100644 (file)
index 0000000..23f3101
Binary files /dev/null and b/core/img/filetypes/text-css.png differ

diff --git a/core/img/filetypes/text-html.png b/core/img/filetypes/text-html.png
new file mode 100644 (file)
index 0000000..55d1072
Binary files /dev/null and b/core/img/filetypes/text-html.png differ

diff --git a/core/img/filetypes/text-x-c++.png b/core/img/filetypes/text-x-c++.png
new file mode 100644 (file)
index 0000000..a87cf84
Binary files /dev/null and b/core/img/filetypes/text-x-c++.png differ

diff --git a/core/img/filetypes/text-x-c.png b/core/img/filetypes/text-x-c.png
new file mode 100644 (file)
index 0000000..34a05cc
Binary files /dev/null and b/core/img/filetypes/text-x-c.png differ

diff --git a/core/img/filetypes/text-x-csharp.png b/core/img/filetypes/text-x-csharp.png
new file mode 100644 (file)
index 0000000..ffb8fc9
Binary files /dev/null and b/core/img/filetypes/text-x-csharp.png differ

diff --git a/core/img/filetypes/text-x-h.png b/core/img/filetypes/text-x-h.png
new file mode 100644 (file)
index 0000000..e902abb
Binary files /dev/null and b/core/img/filetypes/text-x-h.png differ

diff --git a/files/js/filelist.js b/files/js/filelist.js
index 66092220795ded8776b7173d7513e751dc49932a..84762bb561d4f2ba4c45a9ac5b54b0e6c1fae7bf 100644 (file)
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -3,7 +3,7 @@ FileList={
                $('#fileList').empty().html(fileListHtml);
        },
        addFile:function(name,size,lastModified,loading){
-               var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file');
+               var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
                var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
                if(name.indexOf('.')!=-1){
                        var basename=name.substr(0,name.lastIndexOf('.'));

diff --git a/lib/helper.php b/lib/helper.php
index 9c2b5fc33ce463dc925a0a12b2074165aad4d5a0..c2a81ba3306f2df604b368506d7e3d54561ce3b0 100644 (file)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -101,20 +101,20 @@ class OC_Helper {
 
                // Is it a dir?
                if( $mimetype == "dir" ){
-                       return OC::$WEBROOT."/core/img/places/folder.svg";
+                       return OC::$WEBROOT."/core/img/filetypes/folder.png";
                }
 
                // Icon exists?
-               if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-                       return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+               if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+                       return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
                }
                //try only the first part of the filetype
                $mimetype=substr($mimetype,0,strpos($mimetype,'-'));
-               if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-                       return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+               if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+                       return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
                }
                else{
-                       return OC::$WEBROOT."/core/img/filetypes/file.svg";
+                       return OC::$WEBROOT."/core/img/filetypes/file.png";
                }
        }