diff options
| -rw-r--r-- | core/img/filetypes/application-pdf.png (renamed from core/img/filetypes/pdf.png) | bin | 591 -> 591 bytes | |||
| -rw-r--r-- | core/img/filetypes/application-rss+xml.png (renamed from core/img/filetypes/rss.png) | bin | 691 -> 691 bytes | |||
| -rw-r--r-- | core/img/filetypes/image-svg+xml.png (renamed from core/img/filetypes/svg.png) | bin | 481 -> 481 bytes | |||
| -rw-r--r-- | core/img/filetypes/msword.png | bin | 342 -> 0 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-calendar.png (renamed from core/img/filetypes/ical.png) | bin | 675 -> 675 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-css.png (renamed from core/img/filetypes/css.png) | bin | 524 -> 524 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-html.png (renamed from core/img/filetypes/html.png) | bin | 578 -> 578 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-x-c++.png (renamed from core/img/filetypes/cplusplus.png) | bin | 621 -> 621 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-x-c.png (renamed from core/img/filetypes/c.png) | bin | 587 -> 587 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-x-csharp.png (renamed from core/img/filetypes/csharp.png) | bin | 700 -> 700 bytes | |||
| -rw-r--r-- | core/img/filetypes/text-x-h.png (renamed from core/img/filetypes/h.png) | bin | 603 -> 603 bytes | |||
| -rw-r--r-- | files/js/filelist.js | 2 | ||||
| -rw-r--r-- | lib/helper.php | 12 |
13 files changed, 7 insertions, 7 deletions
diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/application-pdf.png Binary files differindex 8f8095e46fa..8f8095e46fa 100644 --- a/core/img/filetypes/pdf.png +++ b/core/img/filetypes/application-pdf.png diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/application-rss+xml.png Binary files differindex 315c4f4fa62..315c4f4fa62 100644 --- a/core/img/filetypes/rss.png +++ b/core/img/filetypes/application-rss+xml.png diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/image-svg+xml.png Binary files differindex a1291c2dfad..a1291c2dfad 100644 --- a/core/img/filetypes/svg.png +++ b/core/img/filetypes/image-svg+xml.png diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png Binary files differdeleted file mode 100644 index 813f712f726..00000000000 --- a/core/img/filetypes/msword.png +++ /dev/null diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/text-calendar.png Binary files differindex 658913852d6..658913852d6 100644 --- a/core/img/filetypes/ical.png +++ b/core/img/filetypes/text-calendar.png diff --git a/core/img/filetypes/css.png b/core/img/filetypes/text-css.png Binary files differindex 23f3101811f..23f3101811f 100644 --- a/core/img/filetypes/css.png +++ b/core/img/filetypes/text-css.png diff --git a/core/img/filetypes/html.png b/core/img/filetypes/text-html.png Binary files differindex 55d1072eafd..55d1072eafd 100644 --- a/core/img/filetypes/html.png +++ b/core/img/filetypes/text-html.png diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/text-x-c++.png Binary files differindex a87cf847cb7..a87cf847cb7 100644 --- a/core/img/filetypes/cplusplus.png +++ b/core/img/filetypes/text-x-c++.png diff --git a/core/img/filetypes/c.png b/core/img/filetypes/text-x-c.png Binary files differindex 34a05cccf06..34a05cccf06 100644 --- a/core/img/filetypes/c.png +++ b/core/img/filetypes/text-x-c.png diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/text-x-csharp.png Binary files differindex ffb8fc932f3..ffb8fc932f3 100644 --- a/core/img/filetypes/csharp.png +++ b/core/img/filetypes/text-x-csharp.png diff --git a/core/img/filetypes/h.png b/core/img/filetypes/text-x-h.png Binary files differindex e902abb0767..e902abb0767 100644 --- a/core/img/filetypes/h.png +++ b/core/img/filetypes/text-x-h.png 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='<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 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"; } } |
