Merge "Stopping the 'skins' tab showing for dashboard (Bug #1419959)"

htdocs/lib/db/upgrade.php

@@ -3897,5 +3897,10 @@ function xmldb_core_upgrade($oldversion=0) {
         add_field($table, $field);
     }
 
+    if ($oldversion < 2015021000) {
+        // Need to update any dashboard pages to not have skins
+        execute_Sql("UPDATE {view} SET skin = NULL WHERE id IN ( SELECT id FROM {view} WHERE type = 'dashboard' AND skin IS NOT NULL)");
+    }
+
     return $status;
 }

htdocs/lib/version.php

@@ -16,7 +16,7 @@ $config = new stdClass();
 // See https://wiki.mahara.org/index.php/Developer_Area/Version_Numbering_Policy
 // For upgrades on stable branches, increment the version by one.  On master, use the date.
 
-$config->version = 2015020200;
+$config->version = 2015021000;
 $config->series = '15.04';
 $config->release = '15.04dev';
 $config->minupgradefrom = 2009022600;

htdocs/theme/default/templates/view/editviewtabs.tpl

@@ -19,7 +19,7 @@
             </a>
         </li>
         {if !$issitetemplate}
-            {if can_use_skins(null, false, $issiteview)}
+            {if can_use_skins(null, false, $issiteview) && $viewtype != 'dashboard'}
                 <li {if $selected == 'skin'} class="current-tab"{/if}>
                     <a{if $selected == 'skin'} class="current-tab"{/if} href="{$WWWROOT}view/skin.php?id={$viewid}{if $new}&new=1{/if}">
                         {str tag=chooseskin section=skin}<span class="accessible-hidden">({str tag=tab}{if $selected == 'skin'} {str tag=selected}{/if})</span>

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

@@ -4,7 +4,7 @@
   <li {if $selected == 'layout'} class="current-tab"{/if}><a{if $selected == 'layout'} class="current-tab"{/if} href="{$WWWROOT}view/layout.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editlayout section=view}<span class="accessible-hidden">({str tag=tab}{if $selected == 'layout'} {str tag=selected}{/if})</span></a></li>
   <li {if $selected == 'content'} class="current-tab"{/if}><a{if $selected == 'content'} class="current-tab"{/if} href="{$WWWROOT}view/blocks.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editcontent section=view}<span class="accessible-hidden">({str tag=tab}{if $selected == 'content'} {str tag=selected}{/if})</span></a></li>
   {if !$issitetemplate}
-    {if can_use_skins(null, false, $issiteview)}<li {if $selected == 'skin'} class="current-tab"{/if}><a{if $selected == 'skin'} class="current-tab"{/if} href="{$WWWROOT}view/skin.php?id={$viewid}{if $new}&new=1{/if}">{str tag=chooseskin section=skin}<span class="accessible-hidden">({str tag=tab}{if $selected == 'skin'} {str tag=selected}{/if})</span></a></li>{/if}
+    {if can_use_skins(null, false, $issiteview) && $viewtype != 'dashboard'}<li {if $selected == 'skin'} class="current-tab"{/if}><a{if $selected == 'skin'} class="current-tab"{/if} href="{$WWWROOT}view/skin.php?id={$viewid}{if $new}&new=1{/if}">{str tag=chooseskin section=skin}<span class="accessible-hidden">({str tag=tab}{if $selected == 'skin'} {str tag=selected}{/if})</span></a></li>{/if}
     <li class="displaypage"><a href="{$displaylink}">{str tag=displayview section=view} &raquo;</a></li>
     {if $edittitle || $viewtype == 'profile'}<li class="sharepage"><a href="{$WWWROOT}view/access.php?id={$viewid}{if $new}&new=1{/if}">{str tag=shareview section=view} &raquo;</a></li>{/if}
   {/if}