Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:10:39 +0000 (11:10 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:10:39 +0000 (11:10 +0800)
lib/installlib.php
lib/outputrenderers.php
lib/tests/other/pdflibtestpage.php
pix/moodlelogo-med.png [new file with mode: 0644]
pix/moodlelogo.png [new file with mode: 0644]
theme/base/pix/favicon.ico

index d4f12dc..e6f468f 100644 (file)
@@ -391,7 +391,7 @@ function install_print_footer($config, $reload=false) {
 
     $homelink  = '<div class="sitelink">'.
        '<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.
-       '<img style="width:100px;height:30px" src="pix/moodlelogo.gif" alt="moodlelogo" /></a></div>';
+       '<img src="pix/moodlelogo.png" alt="moodlelogo" /></a></div>';
 
     echo '</form></div>';
     echo '<div id="footer"><hr />'.$homelink.'</div>';
index 343d379..cf1aaa9 100644 (file)
@@ -698,13 +698,13 @@ class core_renderer extends renderer_base {
             // Special case for site home page - please do not remove
             return '<div class="sitelink">' .
                    '<a title="Moodle" href="http://moodle.org/">' .
-                   '<img style="width:100px;height:30px" src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
+                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
 
         } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) {
             // Special case for during install/upgrade.
             return '<div class="sitelink">'.
                    '<a title="Moodle" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">' .
-                   '<img style="width:100px;height:30px" src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
+                   '<img src="' . $this->pix_url('moodlelogo') . '" alt="moodlelogo" /></a></div>';
 
         } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) {
             return '<div class="homelink"><a href="' . $CFG->wwwroot . '/">' .
index b244938..8a0f875 100644 (file)
@@ -61,7 +61,7 @@ if ($getpdf) {
     $doc->setPrintHeader(true);
     $doc->setHeaderMargin(10);
     $doc->setHeaderFont(array($fontfamily, 'b', 10));
-    $doc->setHeaderData('pix/moodlelogo-med-white.gif', 40, $SITE->fullname, $CFG->wwwroot);
+    $doc->setHeaderData('pix/moodlelogo-med.png', 40, $SITE->fullname, $CFG->wwwroot);
 
     $doc->setPrintFooter(true);
     $doc->setFooterMargin(10);
diff --git a/pix/moodlelogo-med.png b/pix/moodlelogo-med.png
new file mode 100644 (file)
index 0000000..efed023
Binary files /dev/null and b/pix/moodlelogo-med.png differ
diff --git a/pix/moodlelogo.png b/pix/moodlelogo.png
new file mode 100644 (file)
index 0000000..8c3988c
Binary files /dev/null and b/pix/moodlelogo.png differ
index 5a7a36a..eea0248 100644 (file)
Binary files a/theme/base/pix/favicon.ico and b/theme/base/pix/favicon.ico differ