From 937a25593b1e342bca2878eb6f45158bee9edd7c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 19 Feb 2014 16:27:38 +0100 Subject: [PATCH 1/4] fix lots of file type icons for archives, js, flash, ics, fonts, code, ... --- ...ascript.png => application-javascript.png} | Bin ...ascript.svg => application-javascript.svg} | 0 ....png => application-x-shockwave-flash.png} | Bin ....svg => application-x-shockwave-flash.svg} | 0 .../{calendar.png => text-calendar.png} | Bin .../{calendar.svg => text-calendar.svg} | 0 lib/private/helper.php | 26 +++++++++++++++++- lib/private/mimetypes.list.php | 12 +++++++- 8 files changed, 36 insertions(+), 2 deletions(-) rename core/img/filetypes/{text-x-javascript.png => application-javascript.png} (100%) rename core/img/filetypes/{text-x-javascript.svg => application-javascript.svg} (100%) rename core/img/filetypes/{flash.png => application-x-shockwave-flash.png} (100%) rename core/img/filetypes/{flash.svg => application-x-shockwave-flash.svg} (100%) rename core/img/filetypes/{calendar.png => text-calendar.png} (100%) rename core/img/filetypes/{calendar.svg => text-calendar.svg} (100%) diff --git a/core/img/filetypes/text-x-javascript.png b/core/img/filetypes/application-javascript.png similarity index 100% rename from core/img/filetypes/text-x-javascript.png rename to core/img/filetypes/application-javascript.png diff --git a/core/img/filetypes/text-x-javascript.svg b/core/img/filetypes/application-javascript.svg similarity index 100% rename from core/img/filetypes/text-x-javascript.svg rename to core/img/filetypes/application-javascript.svg diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/application-x-shockwave-flash.png similarity index 100% rename from core/img/filetypes/flash.png rename to core/img/filetypes/application-x-shockwave-flash.png diff --git a/core/img/filetypes/flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg similarity index 100% rename from core/img/filetypes/flash.svg rename to core/img/filetypes/application-x-shockwave-flash.svg diff --git a/core/img/filetypes/calendar.png b/core/img/filetypes/text-calendar.png similarity index 100% rename from core/img/filetypes/calendar.png rename to core/img/filetypes/text-calendar.png diff --git a/core/img/filetypes/calendar.svg b/core/img/filetypes/text-calendar.svg similarity index 100% rename from core/img/filetypes/calendar.svg rename to core/img/filetypes/text-calendar.svg diff --git a/lib/private/helper.php b/lib/private/helper.php index e5d1fa9b513..9b5bf0652ae 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -152,7 +152,28 @@ class OC_Helper { public static function mimetypeIcon($mimetype) { $alias = array( 'application/octet-stream' => 'file', // use file icon as fallback - 'application/xml' => 'code/xml', + + 'application/illustrator' => 'image', + 'application/coreldraw' => 'image', + 'application/x-gimp' => 'image', + 'application/x-photoshop' => 'image', + + 'application/x-font-ttf' => 'font', + 'application/font-woff' => 'font', + 'application/vnd.ms-fontobject' => 'font', + + 'application/json' => 'text/code', + 'application/x-php' => 'text/code', + 'application/xml' => 'text/html', + 'text/css' => 'text/code', + + 'application/x-compressed' => 'package/x-generic', + 'application/x-7z-compressed' => 'package/x-generic', + 'application/x-deb' => 'package/x-generic', + 'application/x-rar-compressed' => 'package/x-generic', + 'application/x-tar' => 'package/x-generic', + 'application/zip' => 'package/x-generic', + 'application/msword' => 'x-office/document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document', @@ -162,6 +183,7 @@ class OC_Helper { 'application/vnd.oasis.opendocument.text-template' => 'x-office/document', 'application/vnd.oasis.opendocument.text-web' => 'x-office/document', 'application/vnd.oasis.opendocument.text-master' => 'x-office/document', + 'application/mspowerpoint' => 'x-office/presentation', 'application/vnd.ms-powerpoint' => 'x-office/presentation', 'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation', @@ -173,6 +195,7 @@ class OC_Helper { 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation', 'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation', 'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation', + 'application/msexcel' => 'x-office/spreadsheet', 'application/vnd.ms-excel' => 'x-office/spreadsheet', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet', @@ -183,6 +206,7 @@ class OC_Helper { 'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet', + 'application/msaccess' => 'database', ); diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 174877d623b..7bf061172c9 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -24,11 +24,13 @@ * Array mapping file extensions to mimetypes (in alphabetical order). */ return array( + '7z' => 'application/x-7z-compressed', 'accdb'=>'application/msaccess', 'ai' => 'application/illustrator', 'avi'=>'video/x-msvideo', 'bash' => 'text/x-shellscript', 'blend'=>'application/x-blender', + 'bin' => 'application/x-bin', 'cb7' => 'application/x-cbr', 'cba' => 'application/x-cbr', 'cbr' => 'application/x-cbr', @@ -42,11 +44,13 @@ return array( 'cvbdl' => 'application/x-cbr', 'c' => 'text/x-c', 'c++' => 'text/x-c++src', + 'deb' => 'application/x-deb', 'doc'=>'application/msword', 'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'dot'=>'application/msword', 'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'dv'=>'video/dv', + 'eot' => 'application/vnd.ms-fontobject', 'epub' => 'application/epub+zip', 'exe'=>'application/x-ms-dos-executable', 'flac'=>'audio/flac', @@ -61,6 +65,7 @@ return array( 'jpeg'=>'image/jpeg', 'jpg'=>'image/jpeg', 'js'=>'application/javascript', + 'json' => 'application/json', 'keynote'=>'application/x-iwork-keynote-sffkey', 'kra'=>'application/x-krita', 'm2t'=>'video/mp2t', @@ -85,6 +90,7 @@ return array( 'oga'=>'audio/ogg', 'ogg'=>'audio/ogg', 'ogv'=>'video/ogg', + 'otf'=>'font/opentype', 'pages'=>'application/x-iwork-pages-sffpages', 'pdf'=>'application/pdf', 'php'=>'application/x-php', @@ -93,22 +99,26 @@ return array( 'ppt'=>'application/mspowerpoint', 'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'psd'=>'application/x-photoshop', - 'py'=>'text/x-script.python', + 'py'=>'text/x-python', + 'rar' => 'application/x-rar-compressed', 'reveal' => 'text/reveal', 'sgf' => 'application/sgf', 'sh-lib' => 'text/x-shellscript', 'sh' => 'text/x-shellscript', 'svg'=>'image/svg+xml', + 'swf' => 'application/x-shockwave-flash', 'tar'=>'application/x-tar', 'tar.gz'=>'application/x-compressed', 'tgz'=>'application/x-compressed', 'tiff'=>'image/tiff', 'tif'=>'image/tiff', + 'ttf'=>'application/x-font-ttf', 'txt'=>'text/plain', 'vcard' => 'text/vcard', 'vcf' => 'text/vcard', 'wav'=>'audio/wav', 'webm'=>'video/webm', + 'woff' => 'application/font-woff', 'wmv'=>'video/x-ms-asf', 'xcf'=>'application/x-gimp', 'xls'=>'application/msexcel', From cac4652c10763715fa5cdf46a71b2b8714b865d4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 19 Feb 2014 16:28:29 +0100 Subject: [PATCH 2/4] coding style: spaces around => --- lib/private/mimetypes.list.php | 132 ++++++++++++++++----------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 7bf061172c9..ff2a7ecc48d 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -25,11 +25,11 @@ */ return array( '7z' => 'application/x-7z-compressed', - 'accdb'=>'application/msaccess', + 'accdb' => 'application/msaccess', 'ai' => 'application/illustrator', - 'avi'=>'video/x-msvideo', + 'avi' => 'video/x-msvideo', 'bash' => 'text/x-shellscript', - 'blend'=>'application/x-blender', + 'blend' => 'application/x-blender', 'bin' => 'application/x-bin', 'cb7' => 'application/x-cbr', 'cba' => 'application/x-cbr', @@ -40,89 +40,89 @@ return array( 'cc' => 'text/x-c', 'cdr' => 'application/coreldraw', 'cpp' => 'text/x-c++src', - 'css'=>'text/css', + 'css' => 'text/css', 'cvbdl' => 'application/x-cbr', 'c' => 'text/x-c', 'c++' => 'text/x-c++src', 'deb' => 'application/x-deb', - 'doc'=>'application/msword', - 'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'dot'=>'application/msword', - 'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - 'dv'=>'video/dv', + 'doc' => 'application/msword', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'dot' => 'application/msword', + 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'dv' => 'video/dv', 'eot' => 'application/vnd.ms-fontobject', 'epub' => 'application/epub+zip', - 'exe'=>'application/x-ms-dos-executable', - 'flac'=>'audio/flac', - 'gif'=>'image/gif', - 'gz'=>'application/x-gzip', - 'gzip'=>'application/x-gzip', - 'html'=>'text/html', - 'htm'=>'text/html', - 'ical'=>'text/calendar', - 'ics'=>'text/calendar', + 'exe' => 'application/x-ms-dos-executable', + 'flac' => 'audio/flac', + 'gif' => 'image/gif', + 'gz' => 'application/x-gzip', + 'gzip' => 'application/x-gzip', + 'html' => 'text/html', + 'htm' => 'text/html', + 'ical' => 'text/calendar', + 'ics' => 'text/calendar', 'impress' => 'text/impress', - 'jpeg'=>'image/jpeg', - 'jpg'=>'image/jpeg', - 'js'=>'application/javascript', + 'jpeg' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'js' => 'application/javascript', 'json' => 'application/json', - 'keynote'=>'application/x-iwork-keynote-sffkey', - 'kra'=>'application/x-krita', - 'm2t'=>'video/mp2t', - 'm4v'=>'video/mp4', + 'keynote' => 'application/x-iwork-keynote-sffkey', + 'kra' => 'application/x-krita', + 'm2t' => 'video/mp2t', + 'm4v' => 'video/mp4', 'markdown' => 'text/markdown', 'mdown' => 'text/markdown', 'md' => 'text/markdown', - 'mdb'=>'application/msaccess', + 'mdb' => 'application/msaccess', 'mdwn' => 'text/markdown', 'mobi' => 'application/x-mobipocket-ebook', - 'mov'=>'video/quicktime', - 'mp3'=>'audio/mpeg', - 'mp4'=>'video/mp4', - 'mpeg'=>'video/mpeg', - 'mpg'=>'video/mpeg', - 'msi'=>'application/x-msi', - 'numbers'=>'application/x-iwork-numbers-sffnumbers', - 'odg'=>'application/vnd.oasis.opendocument.graphics', - 'odp'=>'application/vnd.oasis.opendocument.presentation', - 'ods'=>'application/vnd.oasis.opendocument.spreadsheet', - 'odt'=>'application/vnd.oasis.opendocument.text', - 'oga'=>'audio/ogg', - 'ogg'=>'audio/ogg', - 'ogv'=>'video/ogg', - 'otf'=>'font/opentype', - 'pages'=>'application/x-iwork-pages-sffpages', - 'pdf'=>'application/pdf', - 'php'=>'application/x-php', - 'pl'=>'application/x-pearl', - 'png'=>'image/png', - 'ppt'=>'application/mspowerpoint', - 'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation', - 'psd'=>'application/x-photoshop', - 'py'=>'text/x-python', + 'mov' => 'video/quicktime', + 'mp3' => 'audio/mpeg', + 'mp4' => 'video/mp4', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'msi' => 'application/x-msi', + 'numbers' => 'application/x-iwork-numbers-sffnumbers', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'oga' => 'audio/ogg', + 'ogg' => 'audio/ogg', + 'ogv' => 'video/ogg', + 'otf' => 'font/opentype', + 'pages' => 'application/x-iwork-pages-sffpages', + 'pdf' => 'application/pdf', + 'php' => 'application/x-php', + 'pl' => 'application/x-pearl', + 'png' => 'image/png', + 'ppt' => 'application/mspowerpoint', + 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'psd' => 'application/x-photoshop', + 'py' => 'text/x-python', 'rar' => 'application/x-rar-compressed', 'reveal' => 'text/reveal', 'sgf' => 'application/sgf', 'sh-lib' => 'text/x-shellscript', 'sh' => 'text/x-shellscript', - 'svg'=>'image/svg+xml', + 'svg' => 'image/svg+xml', 'swf' => 'application/x-shockwave-flash', - 'tar'=>'application/x-tar', - 'tar.gz'=>'application/x-compressed', - 'tgz'=>'application/x-compressed', - 'tiff'=>'image/tiff', - 'tif'=>'image/tiff', - 'ttf'=>'application/x-font-ttf', - 'txt'=>'text/plain', + 'tar' => 'application/x-tar', + 'tar.gz' => 'application/x-compressed', + 'tgz' => 'application/x-compressed', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'ttf' => 'application/x-font-ttf', + 'txt' => 'text/plain', 'vcard' => 'text/vcard', 'vcf' => 'text/vcard', - 'wav'=>'audio/wav', - 'webm'=>'video/webm', + 'wav' => 'audio/wav', + 'webm' => 'video/webm', 'woff' => 'application/font-woff', - 'wmv'=>'video/x-ms-asf', - 'xcf'=>'application/x-gimp', - 'xls'=>'application/msexcel', - 'xlsx'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'xml'=>'application/xml', - 'zip'=>'application/zip', + 'wmv' => 'video/x-ms-asf', + 'xcf' => 'application/x-gimp', + 'xls' => 'application/msexcel', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'xml' => 'application/xml', + 'zip' => 'application/zip', ); From 16cbfd03834b844019f79d1e5cbdd2756b21aacf Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 19 Feb 2014 16:44:08 +0100 Subject: [PATCH 3/4] Optimize images --- core/img/filetypes/application-javascript.png | Bin 1340 -> 1243 bytes core/img/filetypes/application-javascript.svg | 91 ++++++++-------- .../application-x-shockwave-flash.png | Bin 954 -> 880 bytes .../application-x-shockwave-flash.svg | 38 +++---- core/img/filetypes/text-calendar.png | Bin 1333 -> 1226 bytes core/img/filetypes/text-calendar.svg | 101 +++++++++--------- 6 files changed, 108 insertions(+), 122 deletions(-) diff --git a/core/img/filetypes/application-javascript.png b/core/img/filetypes/application-javascript.png index 24d09ce978181c4b08b67c879553a75fc3c1e97a..1e1d3140f63cf6bde1b015abd154e351da0d16d7 100644 GIT binary patch delta 1224 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 g(j5tR0sO!92~YZ|W + - + - - - + + + - + - - - + + + - + - + - - - + + + - + - + - - - - + + + + - - - - - + + + + + - + - - + + - + - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/core/img/filetypes/application-x-shockwave-flash.png b/core/img/filetypes/application-x-shockwave-flash.png index bcde641da3ca196a8212a5b6d91a62013f1430ab..75424f81d68477d9b2744b14a3b36d05d6787538 100644 GIT binary patch delta 10 RcmdnR{()_R^2S_WW&juN1K9uo delta 83 zcmeyswu^m&vIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6!0GXnsmnHaAC diff --git a/core/img/filetypes/application-x-shockwave-flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg index cb823703d9b..b373fd6512d 100644 --- a/core/img/filetypes/application-x-shockwave-flash.svg +++ b/core/img/filetypes/application-x-shockwave-flash.svg @@ -5,56 +5,52 @@ - + - + - - - + + + - + - + - + - + - - - - - - - - - + + + + + - - - + + + diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png index d85b1db651c258b22d7707dbdf57a19bc92f832a..d5c666a7695a0fa157806dff11aa3113bc0e1f13 100644 GIT binary patch delta 1217 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 diff --git a/core/img/filetypes/text-calendar.svg b/core/img/filetypes/text-calendar.svg index 0016749b936..7d62bb8fa12 100644 --- a/core/img/filetypes/text-calendar.svg +++ b/core/img/filetypes/text-calendar.svg @@ -1,94 +1,89 @@ - + - + - + - + - - - + + + - + - - - + + + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - - - - image/svg+xml - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + From a6fb6abbe015b6c2fa643da94884fc1ec2fdb336 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 20 Feb 2014 10:34:40 +0100 Subject: [PATCH 4/4] fix filetype icons for gzip, tex, perl, csv, sh --- lib/private/helper.php | 5 +++++ lib/private/mimetypes.list.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/private/helper.php b/lib/private/helper.php index 9b5bf0652ae..1aab2f296e1 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -163,13 +163,17 @@ class OC_Helper { 'application/vnd.ms-fontobject' => 'font', 'application/json' => 'text/code', + 'application/x-perl' => 'text/code', 'application/x-php' => 'text/code', + 'text/x-shellscript' => 'text/code', 'application/xml' => 'text/html', 'text/css' => 'text/code', + 'application/x-tex' => 'text', 'application/x-compressed' => 'package/x-generic', 'application/x-7z-compressed' => 'package/x-generic', 'application/x-deb' => 'package/x-generic', + 'application/x-gzip' => 'package/x-generic', 'application/x-rar-compressed' => 'package/x-generic', 'application/x-tar' => 'package/x-generic', 'application/zip' => 'package/x-generic', @@ -206,6 +210,7 @@ class OC_Helper { 'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet', + 'text/csv' => 'x-office/spreadsheet', 'application/msaccess' => 'database', ); diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index ff2a7ecc48d..9bd07b89023 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -41,6 +41,7 @@ return array( 'cdr' => 'application/coreldraw', 'cpp' => 'text/x-c++src', 'css' => 'text/css', + 'csv' => 'text/csv', 'cvbdl' => 'application/x-cbr', 'c' => 'text/x-c', 'c++' => 'text/x-c++src', @@ -94,7 +95,7 @@ return array( 'pages' => 'application/x-iwork-pages-sffpages', 'pdf' => 'application/pdf', 'php' => 'application/x-php', - 'pl' => 'application/x-pearl', + 'pl' => 'application/x-perl', 'png' => 'image/png', 'ppt' => 'application/mspowerpoint', 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', @@ -109,6 +110,7 @@ return array( 'swf' => 'application/x-shockwave-flash', 'tar' => 'application/x-tar', 'tar.gz' => 'application/x-compressed', + 'tex' => 'application/x-tex', 'tgz' => 'application/x-compressed', 'tiff' => 'image/tiff', 'tif' => 'image/tiff',