From: Robin Appelman Date: Fri, 7 Oct 2011 16:09:49 +0000 (+0200) Subject: fixes for the mimetype icons X-Git-Tag: v3.0~99^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f562a2e83f106a637e402afae1697cf2936295a;p=nextcloud-server.git 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 index 00000000000..8f8095e46fa 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 index 00000000000..315c4f4fa62 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 index 34a05cccf06..00000000000 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 index a87cf847cb7..00000000000 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 index ffb8fc932f3..00000000000 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 index 23f3101811f..00000000000 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 index e902abb0767..00000000000 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 index 55d1072eafd..00000000000 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 index 658913852d6..00000000000 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 index 00000000000..a1291c2dfad 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 index 813f712f726..00000000000 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 index 8f8095e46fa..00000000000 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 index 315c4f4fa62..00000000000 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 index a1291c2dfad..00000000000 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 index 00000000000..658913852d6 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 index 00000000000..23f3101811f 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 index 00000000000..55d1072eafd 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 index 00000000000..a87cf847cb7 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 index 00000000000..34a05cccf06 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 index 00000000000..ffb8fc932f3 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 index 00000000000..e902abb0767 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 66092220795..84762bb561d 100644 --- 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=''; if(name.indexOf('.')!=-1){ var basename=name.substr(0,name.lastIndexOf('.')); diff --git a/lib/helper.php b/lib/helper.php index 9c2b5fc33ce..c2a81ba3306 100644 --- 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"; } }