MDL-22983 fixed incorrect repo icon locations - the /pix/ subfolder is the only way now

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 22ff35f..2c407c2 100644 (file)
--- 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