From: dongsheng Date: Wed, 14 Jan 2009 03:26:47 +0000 (+0000) Subject: "MDL-13766, use bigger icons for file picker" X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0ef98843651535bccb792a0cc055b935ba1834d4;p=moodle.git "MDL-13766, use bigger icons for file picker" --- diff --git a/lib/filelib.php b/lib/filelib.php index b2e9019d3c..24e01d9a59 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -668,13 +668,24 @@ function get_mimetypes_array() { * @return string Requested piece of information from array */ function mimeinfo($element, $filename) { + global $CFG; $mimeinfo = get_mimetypes_array(); if (eregi('\.([a-z0-9]+)$', $filename, $match)) { if (isset($mimeinfo[strtolower($match[1])][$element])) { return $mimeinfo[strtolower($match[1])][$element]; } else { - return $mimeinfo['xxx'][$element]; // By default + if ($element == 'icon32' and isset($mimeinfo[strtolower($match[1])]['icon'])) { + $filename = substr($mimeinfo[strtolower($match[1])]['icon'], 0, -4); + $filename .= '-32.png'; + if (file_exists($CFG->dirroot.'/pix/f/'.$filename)) { + return $filename; + } else { + return $CFG->pixpath.'/f/unknown-32.png'; // By default + } + } else { + return $mimeinfo['xxx'][$element]; // By default + } } } else { return $mimeinfo['xxx'][$element]; // By default diff --git a/pix/f/audio-32.png b/pix/f/audio-32.png new file mode 100644 index 0000000000..c60b595dac Binary files /dev/null and b/pix/f/audio-32.png differ diff --git a/pix/f/avi-32.png b/pix/f/avi-32.png new file mode 100644 index 0000000000..5d6c8d17a6 Binary files /dev/null and b/pix/f/avi-32.png differ diff --git a/pix/f/dmg-32.png b/pix/f/dmg-32.png new file mode 100644 index 0000000000..8a150b8471 Binary files /dev/null and b/pix/f/dmg-32.png differ diff --git a/pix/f/docm-32.png b/pix/f/docm-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/docm-32.png differ diff --git a/pix/f/docx-32.png b/pix/f/docx-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/docx-32.png differ diff --git a/pix/f/dotm-32.png b/pix/f/dotm-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/dotm-32.png differ diff --git a/pix/f/dotx-32.png b/pix/f/dotx-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/dotx-32.png differ diff --git a/pix/f/edit-32.png b/pix/f/edit-32.png new file mode 100644 index 0000000000..5594785d10 Binary files /dev/null and b/pix/f/edit-32.png differ diff --git a/pix/f/excel-32.png b/pix/f/excel-32.png new file mode 100644 index 0000000000..c0ccb7ab6f Binary files /dev/null and b/pix/f/excel-32.png differ diff --git a/pix/f/explore-32.png b/pix/f/explore-32.png new file mode 100644 index 0000000000..a29bd69f68 Binary files /dev/null and b/pix/f/explore-32.png differ diff --git a/pix/f/folder-32.png b/pix/f/folder-32.png new file mode 100644 index 0000000000..472484f112 Binary files /dev/null and b/pix/f/folder-32.png differ diff --git a/pix/f/help-32.png b/pix/f/help-32.png new file mode 100644 index 0000000000..d60425f7ec Binary files /dev/null and b/pix/f/help-32.png differ diff --git a/pix/f/html-32.png b/pix/f/html-32.png new file mode 100644 index 0000000000..a896697d78 Binary files /dev/null and b/pix/f/html-32.png differ diff --git a/pix/f/image-32.png b/pix/f/image-32.png new file mode 100644 index 0000000000..6f118cd087 Binary files /dev/null and b/pix/f/image-32.png differ diff --git a/pix/f/odp-32.png b/pix/f/odp-32.png new file mode 100644 index 0000000000..047355c7d0 Binary files /dev/null and b/pix/f/odp-32.png differ diff --git a/pix/f/odt-32.png b/pix/f/odt-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/odt-32.png differ diff --git a/pix/f/parent-32.png b/pix/f/parent-32.png new file mode 100644 index 0000000000..afb307b18c Binary files /dev/null and b/pix/f/parent-32.png differ diff --git a/pix/f/powerpoint-32.png b/pix/f/powerpoint-32.png new file mode 100644 index 0000000000..047355c7d0 Binary files /dev/null and b/pix/f/powerpoint-32.png differ diff --git a/pix/f/pps-32.png b/pix/f/pps-32.png new file mode 100644 index 0000000000..047355c7d0 Binary files /dev/null and b/pix/f/pps-32.png differ diff --git a/pix/f/ppsx-32.png b/pix/f/ppsx-32.png new file mode 100644 index 0000000000..047355c7d0 Binary files /dev/null and b/pix/f/ppsx-32.png differ diff --git a/pix/f/pptx-32.png b/pix/f/pptx-32.png new file mode 100644 index 0000000000..047355c7d0 Binary files /dev/null and b/pix/f/pptx-32.png differ diff --git a/pix/f/text-32.png b/pix/f/text-32.png new file mode 100644 index 0000000000..928a67995e Binary files /dev/null and b/pix/f/text-32.png differ diff --git a/pix/f/unknown-32.png b/pix/f/unknown-32.png new file mode 100644 index 0000000000..5b7e64910e Binary files /dev/null and b/pix/f/unknown-32.png differ diff --git a/pix/f/video-32.png b/pix/f/video-32.png new file mode 100644 index 0000000000..5d6c8d17a6 Binary files /dev/null and b/pix/f/video-32.png differ diff --git a/pix/f/web-32.png b/pix/f/web-32.png new file mode 100644 index 0000000000..a896697d78 Binary files /dev/null and b/pix/f/web-32.png differ diff --git a/pix/f/word-32.png b/pix/f/word-32.png new file mode 100644 index 0000000000..daf84b2860 Binary files /dev/null and b/pix/f/word-32.png differ diff --git a/pix/f/xml-32.png b/pix/f/xml-32.png new file mode 100644 index 0000000000..a896697d78 Binary files /dev/null and b/pix/f/xml-32.png differ diff --git a/pix/f/zip-32.png b/pix/f/zip-32.png new file mode 100644 index 0000000000..4b55b504af Binary files /dev/null and b/pix/f/zip-32.png differ diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php index cfe7bee2df..8df2f06b1e 100755 --- a/repository/alfresco/repository.class.php +++ b/repository/alfresco/repository.class.php @@ -117,7 +117,7 @@ class repository_alfresco extends repository { 'children'=>array()); } elseif ($child->child->type == $file_filter) { $ret['list'][] = array('title'=>$child->child->cm_name, - 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo("icon", $child->child->cm_name), + 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $child->child->cm_name), 'source'=>$child->child->id); } } diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php index e4ff381d0e..0c5c3b93ee 100755 --- a/repository/boxnet/repository.class.php +++ b/repository/boxnet/repository.class.php @@ -158,7 +158,7 @@ class repository_boxnet extends repository { 'date'=>$filedates[$n], 'source'=>'http://box.net/api/1.0/download/' .$this->options['auth_token'].'/'.$fileids[$n], - 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon', $v)); + 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $v)); } } } diff --git a/repository/lib.php b/repository/lib.php index 26112e615a..d5db5033a9 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -754,7 +754,7 @@ abstract class repository { return array('url'=>$ret->get_url(), 'id'=>$file->get_itemid(), 'file'=>$file->get_filename(), - 'icon'=>$CFG->pixpath.'/f/'.mimeinfo('icon', $path) + 'icon'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $path) ); } else { return null; @@ -964,7 +964,7 @@ abstract class repository { 'date' => $filedate, //'source' => $child->get_url(), 'source' => base64_encode($source), - 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo_from_type("icon", $filetype) + 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $filename) ); $filecount++; } diff --git a/repository/s3/repository.class.php b/repository/s3/repository.class.php index e36686d384..1a17c8abce 100644 --- a/repository/s3/repository.class.php +++ b/repository/s3/repository.class.php @@ -31,7 +31,7 @@ class repository_s3 extends repository { $folder = array( 'title' => $bucket, 'children' => array(), - 'thumbnail'=>$CFG->pixpath.'/f/folder.gif', + 'thumbnail'=>$CFG->pixpath.'/f/folder-32.png', 'path'=>$bucket ); $tree[] = $folder; @@ -45,7 +45,7 @@ class repository_s3 extends repository { 'size'=>$file['size'], 'date'=>userdate($file['time']), 'source'=>$path.'/'.$file['name'], - 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon', $file['name']) + 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $file['name']) ); } } diff --git a/repository/smb/repository.class.php b/repository/smb/repository.class.php index 8cc3a438b7..343c36bef7 100755 --- a/repository/smb/repository.class.php +++ b/repository/smb/repository.class.php @@ -69,7 +69,7 @@ class repository_smb extends repository { } else { $ret['list'][] = array( 'title'=>$file, - 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo("icon", $file), + 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $file), 'size'=>'', 'date'=>'', 'source'=>$path.$file); diff --git a/repository/webdav/repository.class.php b/repository/webdav/repository.class.php index 2ad86383da..b99f1f8b0d 100644 --- a/repository/webdav/repository.class.php +++ b/repository/webdav/repository.class.php @@ -95,7 +95,7 @@ class repository_webdav extends repository { $title = urldecode(substr($v['href'], strpos($v['href'], $path)+strlen($path))); $ret['list'][] = array( 'title'=>$title, - 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo("icon", $title), + 'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $title), 'size'=>$v['getcontentlength'], 'date'=>$filedate, 'source'=>$v['href'] diff --git a/repository/wikimedia/repository.class.php b/repository/wikimedia/repository.class.php index 6d44424069..f25938c222 100644 --- a/repository/wikimedia/repository.class.php +++ b/repository/wikimedia/repository.class.php @@ -14,8 +14,8 @@ class repository_wikimedia extends repository { $list['list'] = array(); foreach ($result as $title=>$url) { $list['list'][] = array( - 'title'=>$title, - 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon', 'xx.jpg'), + 'title'=>substr($title, 5), + 'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', 'xx.jpg'), // plugin-dependent unique path to the file (id, url, path, etc.) 'source'=>$url, // the accessible url of the file