Commit 17ef60df authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1656934: Adding new logo in built-in themes."

parents 0041c510 6be6375e
htdocs/favicon.ico

1.12 KB | W: | H:

htdocs/favicon.ico

14.7 KB | W: | H:

htdocs/favicon.ico
htdocs/favicon.ico
htdocs/favicon.ico
htdocs/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
......@@ -4856,5 +4856,10 @@ function xmldb_core_upgrade($oldversion=0) {
WHERE (institution IS NULL OR institution = '') AND deleted = 0", array());
}
if ($oldversion < 2017011800) {
log_debug('Bump cache version to fetch new favicon');
bump_cache_version();
}
return $status;
}
......@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2016122300;
$config->version = 2017011800;
$config->series = '17.04';
$config->release = '17.04dev';
$config->minupgradefrom = 2012080604;
......
htdocs/theme/default/images/site-logo.png

3.47 KB | W: | H:

htdocs/theme/default/images/site-logo.png

2.31 KB | W: | H:

htdocs/theme/default/images/site-logo.png
htdocs/theme/default/images/site-logo.png
htdocs/theme/default/images/site-logo.png
htdocs/theme/default/images/site-logo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -27,7 +27,7 @@
<div class="footer-inner container">
<div id="powered-by" class="pull-left mahara-logo">
<a href="https://mahara.org/">
<img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">
<img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" alt="Powered by Mahara">
</a>
</div>
<!-- This site is powered by Mahara, an Open Source
......
htdocs/theme/modern/images/powered_by_mahara.png

3.38 KB | W: | H:

htdocs/theme/modern/images/powered_by_mahara.png

1.64 KB | W: | H:

htdocs/theme/modern/images/powered_by_mahara.png
htdocs/theme/modern/images/powered_by_mahara.png
htdocs/theme/modern/images/powered_by_mahara.png
htdocs/theme/modern/images/powered_by_mahara.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/modern/images/site-logo.png

3.74 KB | W: | H:

htdocs/theme/modern/images/site-logo.png

1.94 KB | W: | H:

htdocs/theme/modern/images/site-logo.png
htdocs/theme/modern/images/site-logo.png
htdocs/theme/modern/images/site-logo.png
htdocs/theme/modern/images/site-logo.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/ocean/images/site-logo.png

3.74 KB | W: | H:

htdocs/theme/ocean/images/site-logo.png

1.94 KB | W: | H:

htdocs/theme/ocean/images/site-logo.png
htdocs/theme/ocean/images/site-logo.png
htdocs/theme/ocean/images/site-logo.png
htdocs/theme/ocean/images/site-logo.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/primaryschool/images/site-logo.png

3.71 KB | W: | H:

htdocs/theme/primaryschool/images/site-logo.png

1.94 KB | W: | H:

htdocs/theme/primaryschool/images/site-logo.png
htdocs/theme/primaryschool/images/site-logo.png
htdocs/theme/primaryschool/images/site-logo.png
htdocs/theme/primaryschool/images/site-logo.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/raw/images/site-logo.png

5.39 KB | W: | H:

htdocs/theme/raw/images/site-logo.png

2.31 KB | W: | H:

htdocs/theme/raw/images/site-logo.png
htdocs/theme/raw/images/site-logo.png
htdocs/theme/raw/images/site-logo.png
htdocs/theme/raw/images/site-logo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -4,7 +4,7 @@
</div>
<div id="footer-wrap">
<div class="cb"></div>
<div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt=""></a></div>
<div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" border="0" alt=""></a></div>
<div id="release"><a href="https://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, {str tag='copyright' section='admin'}</div>
<div class="cb"></div>
</div>
......
......@@ -26,7 +26,7 @@
<div class="footer-inner container">
<div id="powered-by" class="pull-left mahara-logo">
<a href="https://mahara.org/">
<img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">
<img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" alt="Powered by Mahara">
</a>
</div>
<!-- This site is powered by Mahara, an Open Source
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment