Bug 1501078: Allow the setting of 'no theme'

In user account settings page

behatnotneeded

Change-Id: I9eb8f345054ece362635cf93f6455a0dc55dbe63
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 6c757ae3)

htdocs/account/index.php

@@ -239,6 +239,10 @@ function accountprefs_submit(Pieform $form, $values) {
         }
     }
 
+    if ($values['theme'] == 'sitedefault') {
+        $USER->set_account_preference('theme', '');
+    }
+
     $returndata = array();
     if (isset($values['username']) && $values['username'] != $USER->get('username')) {
         $USER->username = $values['username'];

htdocs/auth/user.php

@@ -927,10 +927,14 @@ class User {
             else if (!empty($list[0]) && get_config('sitethemeprefs')) {
                 return (object) array('basename' => $list[0]);
             }
+            // Or the current preferred theme is not available
+            // The system will pick one
+            return $this->institutiontheme;
+        }
+        if ($this->institutiontheme) {
+            // No theme set so use 'sitedefault'
+            $this->institutiontheme->altname = 'sitedefault';
         }
-        // The current user has not picked a preferred theme yet
-        // or his current preferred theme is not available for him
-        // The system will pick one for him
         return $this->institutiontheme;
     }
 

htdocs/lang/en.utf8/view.php

@@ -361,7 +361,7 @@ $string['access'] = 'Access';
 $string['noaccesstoview'] = 'You do not have permission to access this page.';
 
 $string['changeviewtheme'] = 'The theme you have chosen for this page is no longer available to you. Please select a different theme.';
-$string['nothemeselected'] = 'No theme selected';
+$string['nothemeselected1'] = 'Use institution theme';
 
 // Templates
 $string['Template'] = 'Template';

htdocs/lib/mahara.php

@@ -724,7 +724,7 @@ function get_user_accessible_themes() {
         }
 
     }
-    $themes = array_merge(array('sitedefault' => get_string('nothemeselected', 'view')), $themes);
+    $themes = array_merge(array('sitedefault' => get_string('nothemeselected1', 'view')), $themes);
     unset($themes['custom']);
 
     return $themes;

htdocs/lib/user.php

@@ -290,11 +290,8 @@ function general_account_prefs_form_elements($prefs) {
     // Get all available standard site themes
     if (get_config('sitethemeprefs') && !in_admin_section()) {
         // get_user_accessible_themes() returns 'sitedefault' to mean fall back to the site or
-        // institution theme.  This won't work for account prefs, where 'sitedefault' is just
-        // a theme that doesn't exist.  So change the 'sitedefault' key to '', and the empty
-        // preference will be interpreted as "No theme selected".
+        // institution theme. On save it sets user_account_preference to '' to allow the use of higher up theme.
         $sitethemes = array_reverse(get_user_accessible_themes());
-        unset($sitethemes['sitedefault']);
         $sitethemes = array_reverse($sitethemes);
     }
     // Get all user's institution themes
@@ -313,7 +310,7 @@ function general_account_prefs_form_elements($prefs) {
     $themes = array_merge($sitethemes, $institutionthemes);
     natcasesort($themes);
     $currenttheme = $USER->get_themedata();
-    if (!isset($currenttheme->basename)) {
+    if (!isset($currenttheme->basename) || (isset($currenttheme->altname) && $currenttheme->altname == 'sitedefault')) {
         $defaulttheme = 'sitedefault';
     }
     else {