Merge "When editing site skin, disable skin background images (Bug 1305308)"

htdocs/lang/en.utf8/skin.php

@@ -34,6 +34,7 @@ $string['exportspecific'] = 'Export "%s"';
 $string['exportskins'] = 'Export skin(s)';
 $string['createskin'] = 'Create skin';
 $string['editthisskin'] = 'Edit this skin';
+$string['editsiteskin?'] = 'This is a site skin. Do you want to edit it?';
 $string['editskin'] = 'Edit skin';
 $string['skinsaved'] = 'Skin saved successfully';
 $string['skinimported'] = 'Skin imported successfully';

htdocs/skin/design.php

@@ -72,7 +72,8 @@ else {
 }
 
 // Set the Skin access options (for creating or editing form)...
-if ($designsiteskin or (isset($skindata) and $skinobj->get('type') == 'site')) {
+$designsiteskin = $designsiteskin || (isset($skinobj) && $skinobj->get('type') == 'site');
+if ($designsiteskin) {
     $accessoptions = array(
             'site' => get_string('siteskinaccess', 'skin')
     );

htdocs/theme/raw/templates/skin/index.tpl

@@ -20,7 +20,8 @@
             <div class="skinthumb">
                 <div class="skin-controls">
                     {if $skin.editable}
-                        <a href="{$WWWROOT}skin/design.php?id={$skin.id}{if $siteskins}&site=1{/if}" class="btn-big-edit" title="{str tag='editthisskin' section='skin'}">
+                        <a href="{$WWWROOT}skin/design.php?id={$skin.id}{if $skin.type == 'site'}&site=1{/if}" class="btn-big-edit" title="{str tag='editthisskin' section='skin'}"
+                            {if $skin.type == 'site'}onclick="return confirm('{str tag='editsiteskin?' section='skin'}');"{/if}>
                             {str tag=editspecific arg1=$skin.title}
                         </a>
                     {/if}
@@ -33,7 +34,7 @@
                         <a href="{$WWWROOT}skin/export.php?id={$skin.id}" class="btn-big-export"  title="{str tag='exportthisskin' section='skin'}">
                             {str tag=exportspecific section=skin arg1=$skin.title}
                         </a>
-                        <a href="{$WWWROOT}skin/delete.php?id={$skin.id}{if $siteskins}&site=1{/if}" class="btn-big-del" title="{str tag='deletethisskin' section='skin'}">
+                        <a href="{$WWWROOT}skin/delete.php?id={$skin.id}{if $skin.type == 'site'}&site=1{/if}" class="btn-big-del" title="{str tag='deletethisskin' section='skin'}">
                             {str tag=deletespecific arg1=$skin.title}
                         </a>
                     {else}