diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-30 14:04:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-30 14:04:30 -0700 |
| commit | da9b6690e565452a9a9d69084a07ac48005d7e60 (patch) | |
| tree | d09bc96d4f78df033b76513242bbb80ff57240bd /include | |
| parent | 4ce8f965aab8cfb09fc9f102f771cf67a7ee84fa (diff) | |
| parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
| download | volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.tar.gz volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.tar.bz2 volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 1 | ||||
| -rw-r--r-- | include/text.php | 33 |
2 files changed, 18 insertions, 16 deletions
diff --git a/include/attach.php b/include/attach.php index b3ddfee88..7123d59fe 100644 --- a/include/attach.php +++ b/include/attach.php @@ -74,6 +74,7 @@ function z_mime_content_type($filename) { // 'webm' => 'audio/webm', 'mp4' => 'video/mp4', // 'mp4' => 'audio/mp4', + 'mkv' => 'video/x-matroska', // adobe 'pdf' => 'application/pdf', diff --git a/include/text.php b/include/text.php index dd7d9eaa8..1eec2ba0a 100644 --- a/include/text.php +++ b/include/text.php @@ -2608,32 +2608,33 @@ function getIconFromType($type) { 'application/octet-stream' => 'fa-file-o', //Text 'text/plain' => 'fa-file-text-o', - 'application/msword' => 'fa-file-text-o', - 'application/pdf' => 'fa-file-text-o', - 'application/vnd.oasis.opendocument.text' => 'fa-file-text-o', + 'application/msword' => 'fa-file-word-o', + 'application/pdf' => 'fa-file-pdf-o', + 'application/vnd.oasis.opendocument.text' => 'fa-file-word-o', 'application/epub+zip' => 'fa-book', //Spreadsheet - 'application/vnd.oasis.opendocument.spreadsheet' => 'fa-table', - 'application/vnd.ms-excel' => 'fa-table', + 'application/vnd.oasis.opendocument.spreadsheet' => 'fa-file-excel-o', + 'application/vnd.ms-excel' => 'fa-file-excel-o', //Image 'image/jpeg' => 'fa-picture-o', 'image/png' => 'fa-picture-o', 'image/gif' => 'fa-picture-o', 'image/svg+xml' => 'fa-picture-o', //Archive - 'application/zip' => 'fa-archive', - 'application/x-rar-compressed' => 'fa-archive', + 'application/zip' => 'fa-file-archive-o', + 'application/x-rar-compressed' => 'fa-file-archive-o', //Audio - 'audio/mpeg' => 'fa-music', - 'audio/wav' => 'fa-music', - 'application/ogg' => 'fa-music', - 'audio/ogg' => 'fa-music', - 'audio/webm' => 'fa-music', - 'audio/mp4' => 'fa-music', + 'audio/mpeg' => 'fa-file-audio-o', + 'audio/wav' => 'fa-file-audio-o', + 'application/ogg' => 'fa-file-audio-o', + 'audio/ogg' => 'fa-file-audio-o', + 'audio/webm' => 'fa-file-audio-o', + 'audio/mp4' => 'fa-file-audio-o', //Video - 'video/quicktime' => 'fa-film', - 'video/webm' => 'fa-film', - 'video/mp4' => 'fa-film' + 'video/quicktime' => 'fa-file-video-o', + 'video/webm' => 'fa-file-video-o', + 'video/mp4' => 'fa-file-video-o', + 'video/x-matroska' => 'fa-file-video-o' ); $iconFromType = 'fa-file-o'; |