Merge "Alter view theme dropdown to enable no theme selection"

htdocs/lib/mahara.php

@@ -595,6 +595,7 @@ function get_user_accessible_themes() {
         }
 
     }
+    $themes = array_merge(array('sitedefault' => '- ' . get_string('sitedefault', 'admin') . ' (' . $themes[get_config('theme')] . ') -'), $themes);
     return $themes;
 }
 

htdocs/lib/view.php

@@ -1799,6 +1799,9 @@ class View {
         if ($theme = $values['theme']) {
             $themes = get_user_accessible_themes();
             if (isset($themes[$theme])) {
+                if($theme == 'sitedefault') {
+                    $theme = null;
+                }
                 $this->set('theme', $theme);
                 $this->commit();
             }

htdocs/theme/raw/templates/view/blocks.tpl

@@ -33,7 +33,6 @@
             <div id="middle-pane" class="center">
                     <label for="viewtheme-select">{str tag=theme}: </label>
                     <select id="viewtheme-select" name="viewtheme">
-                        <option value="">{str tag=choosetheme}</option>
 {foreach from=$viewthemes key=themeid item=themename}
                         <option value="{$themeid}"{if $themeid == $viewtheme} selected="selected" style="font-weight: bold;"{/if}>{$themename}</option>
 {/foreach}

htdocs/theme/raw/templates/view/changetheme.tpl

@@ -8,7 +8,6 @@
         <input type="hidden" name="sesskey" value="{$SESSKEY}">
         <label for="viewtheme-select">{str tag=theme}: </label>
         <select id="viewtheme-select" name="viewtheme">
-            <option value="">{str tag=choosetheme}</option>
 {foreach from=$viewthemes key=themeid item=themename}
             <option value="{$themeid}"{if $themeid == $viewtheme} selected="selected" style="font-weight: bold;"{/if}>{$themename}</option>
 {/foreach}