From c82d7320a7dad97f6bcefef50ee2abb2f3f97f68 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 3 Jul 2010 14:40:33 +0000 Subject: [PATCH] MDL-22983 fixed incorrect repo icon locations - the /pix/ subfolder is the only way now --- repository/alfresco/{ => pix}/icon.png | Bin repository/boxnet/{ => pix}/icon.png | Bin repository/dropbox/{ => pix}/icon.png | Bin repository/filesystem/{ => pix}/icon.png | Bin repository/flickr/{ => pix}/icon.png | Bin repository/flickr_public/{ => pix}/icon.png | Bin repository/googledocs/{ => pix}/icon.png | Bin repository/lib.php | 4 ++-- repository/local/{ => pix}/icon.png | Bin repository/merlot/{ => pix}/icon.png | Bin repository/picasa/{ => pix}/icon.png | Bin repository/recent/{ => pix}/icon.png | Bin repository/s3/{ => pix}/icon.png | Bin repository/upload/{ => pix}/icon.png | Bin repository/url/{ => pix}/icon.png | Bin repository/user/{ => pix}/icon.png | Bin repository/webdav/{ => pix}/icon.png | Bin repository/wikimedia/{ => pix}/icon.png | Bin repository/youtube/{ => pix}/icon.png | Bin 19 files changed, 2 insertions(+), 2 deletions(-) rename repository/alfresco/{ => pix}/icon.png (100%) rename repository/boxnet/{ => pix}/icon.png (100%) rename repository/dropbox/{ => pix}/icon.png (100%) rename repository/filesystem/{ => pix}/icon.png (100%) rename repository/flickr/{ => pix}/icon.png (100%) rename repository/flickr_public/{ => pix}/icon.png (100%) rename repository/googledocs/{ => pix}/icon.png (100%) rename repository/local/{ => pix}/icon.png (100%) rename repository/merlot/{ => pix}/icon.png (100%) rename repository/picasa/{ => pix}/icon.png (100%) rename repository/recent/{ => pix}/icon.png (100%) rename repository/s3/{ => pix}/icon.png (100%) rename repository/upload/{ => pix}/icon.png (100%) rename repository/url/{ => pix}/icon.png (100%) rename repository/user/{ => pix}/icon.png (100%) rename repository/webdav/{ => pix}/icon.png (100%) rename repository/wikimedia/{ => pix}/icon.png (100%) rename repository/youtube/{ => pix}/icon.png (100%) diff --git a/repository/alfresco/icon.png b/repository/alfresco/pix/icon.png similarity index 100% rename from repository/alfresco/icon.png rename to repository/alfresco/pix/icon.png diff --git a/repository/boxnet/icon.png b/repository/boxnet/pix/icon.png similarity index 100% rename from repository/boxnet/icon.png rename to repository/boxnet/pix/icon.png diff --git a/repository/dropbox/icon.png b/repository/dropbox/pix/icon.png similarity index 100% rename from repository/dropbox/icon.png rename to repository/dropbox/pix/icon.png diff --git a/repository/filesystem/icon.png b/repository/filesystem/pix/icon.png similarity index 100% rename from repository/filesystem/icon.png rename to repository/filesystem/pix/icon.png diff --git a/repository/flickr/icon.png b/repository/flickr/pix/icon.png similarity index 100% rename from repository/flickr/icon.png rename to repository/flickr/pix/icon.png diff --git a/repository/flickr_public/icon.png b/repository/flickr_public/pix/icon.png similarity index 100% rename from repository/flickr_public/icon.png rename to repository/flickr_public/pix/icon.png diff --git a/repository/googledocs/icon.png b/repository/googledocs/pix/icon.png similarity index 100% rename from repository/googledocs/icon.png rename to repository/googledocs/pix/icon.png diff --git a/repository/lib.php b/repository/lib.php index 22ff35fd514..2c407c2f7fd 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1191,13 +1191,13 @@ abstract class repository { * @return object */ final public function get_meta() { - global $CFG; + global $CFG, $OUTPUT; $ft = new filetype_parser; $meta = new stdclass; $meta->id = $this->id; $meta->name = $this->get_name(); $meta->type = $this->options['type']; - $meta->icon = $CFG->httpswwwroot.'/repository/'.$meta->type.'/icon.png'; + $meta->icon = $OUTPUT->pix_url('icon', 'repository_'.$meta->type)->out(false); $meta->supported_types = $ft->get_extensions($this->supported_filetypes()); $meta->return_types = $this->supported_returntypes(); return $meta; diff --git a/repository/local/icon.png b/repository/local/pix/icon.png similarity index 100% rename from repository/local/icon.png rename to repository/local/pix/icon.png diff --git a/repository/merlot/icon.png b/repository/merlot/pix/icon.png similarity index 100% rename from repository/merlot/icon.png rename to repository/merlot/pix/icon.png diff --git a/repository/picasa/icon.png b/repository/picasa/pix/icon.png similarity index 100% rename from repository/picasa/icon.png rename to repository/picasa/pix/icon.png diff --git a/repository/recent/icon.png b/repository/recent/pix/icon.png similarity index 100% rename from repository/recent/icon.png rename to repository/recent/pix/icon.png diff --git a/repository/s3/icon.png b/repository/s3/pix/icon.png similarity index 100% rename from repository/s3/icon.png rename to repository/s3/pix/icon.png diff --git a/repository/upload/icon.png b/repository/upload/pix/icon.png similarity index 100% rename from repository/upload/icon.png rename to repository/upload/pix/icon.png diff --git a/repository/url/icon.png b/repository/url/pix/icon.png similarity index 100% rename from repository/url/icon.png rename to repository/url/pix/icon.png diff --git a/repository/user/icon.png b/repository/user/pix/icon.png similarity index 100% rename from repository/user/icon.png rename to repository/user/pix/icon.png diff --git a/repository/webdav/icon.png b/repository/webdav/pix/icon.png similarity index 100% rename from repository/webdav/icon.png rename to repository/webdav/pix/icon.png diff --git a/repository/wikimedia/icon.png b/repository/wikimedia/pix/icon.png similarity index 100% rename from repository/wikimedia/icon.png rename to repository/wikimedia/pix/icon.png diff --git a/repository/youtube/icon.png b/repository/youtube/pix/icon.png similarity index 100% rename from repository/youtube/icon.png rename to repository/youtube/pix/icon.png