Merge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle

saifulomar · Dec 22, 2014 · a62de06 · a62de06
2 parents 1de86bf + c58891f
commit a62de06
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/theme/clean/lang/en/theme_clean.php b/theme/clean/lang/en/theme_clean.php
@@ -59,7 +59,7 @@
 $string['logo'] = 'Logo';
 $string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header.<br>
 If the height of your logo is more than 75px add the following CSS rule to the Custom CSS box below.<br>
-a.logo {height: 100px;} or whatever height in pixels the logo is.';
+div.logo {height: 100px;} or whatever height in pixels the logo is.';
 
 $string['pluginname'] = 'Clean';
 

diff --git a/theme/clean/lib.php b/theme/clean/lib.php
@@ -140,7 +140,7 @@ function theme_clean_get_html_for_settings(renderer_base $output, moodle_page $p
     }
 
     if (!empty($page->theme->settings->logo)) {
-        $return->heading = html_writer::link($CFG->wwwroot, '', array('title' => get_string('home'), 'class' => 'logo'));
+        $return->heading = html_writer::tag('div', '', array('class' => 'logo'));
     } else {
         $return->heading = $output->page_heading();
     }

diff --git a/theme/clean/style/custom.css b/theme/clean/style/custom.css
@@ -1,6 +1,6 @@
 /* Custom CSS
 -------------------------*/
-a.logo {
+div.logo {
     background: url([[setting:logo]]) no-repeat 0 0;
     display: block;
     float: left;
@@ -10,7 +10,7 @@ a.logo {
     width: 100%;
 }
 
-.dir-rtl a.logo {
+.dir-rtl div.logo {
     background: url([[setting:logo]]) no-repeat 100% 0;
     display: block;
     float: right;

diff --git a/theme/more/lang/en/theme_more.php b/theme/more/lang/en/theme_more.php
@@ -66,7 +66,7 @@
 $string['logo'] = 'Logo';
 $string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header.<br>
 If the height of your logo is more than 75px add the following CSS rule to the Custom CSS box below.<br>
-a.logo {height: 100px;} or whatever height in pixels the logo is.';
+div.logo {height: 100px;} or whatever height in pixels the logo is.';
 
 $string['pluginname'] = 'More';
 

diff --git a/theme/more/style/custom.css b/theme/more/style/custom.css
@@ -1,6 +1,6 @@
 /* Custom CSS
 -------------------------*/
-a.logo {
+div.logo {
     background: url([[setting:logo]]) no-repeat 0 0;
     display: block;
     float: left;
@@ -10,7 +10,7 @@ a.logo {
     width: 100%;
 }
 
-.dir-rtl a.logo {
+.dir-rtl div.logo {
     background: url([[setting:logo]]) no-repeat 100% 0;
     display: block;
     float: right;

diff --git a/theme/upgrade.txt b/theme/upgrade.txt
@@ -1,7 +1,12 @@
 This files describes API changes in /theme/* themes,
 information provided here is intended especially for theme designer.
 
+=== 2.9 ===
+
+* Themes Clean amd More page header background logo, if loaded, no longer links to the home page.
+
 === 2.8 ===
+
 * Themes Base and Canvas layout/embedded.php has changed.
   The div id="content" has been changed to id="page-content" - see MDL-47915.
 * All mod_assign CSS selectors have been qualified with ".path-mod-assign". This means any custom CSS