Changeset 5259

Timestamp:

Mar 22, 2010, 4:03:43 PM (14 years ago)

Author:

plg

Message:

ture 1514: improvement, impossible to activate a theme is a parent is missing
(a parent includes grand father and his own father, and his own father, and so
on... until the root theme is "default" or has no parent declared)

Location:

trunk/admin

Files:

• include/themes.class.php (modified) (2 diffs)
• themes/default/template/themes_installed.tpl (modified) (2 diffs)
• themes_installed.php (modified) (2 diffs)

trunk/admin/include/themes.class.php

@@ -81 +81 @@
           break;
         }
+
+        $missing_parent = $this->missing_parent_theme($theme_id);
+        if (isset($missing_parent))
+        {
+          array_push(
+            $errors, 
+            sprintf(
+              l10n('Impossible to activate this theme, the parent theme is missing: %s'),
+              $missing_parent
+              )
+            );
+          
+          break;
+        }
         
         $query = "
@@ -167 +181 @@
     }
     return $errors;
+  }
+
+  function missing_parent_theme($theme_id)
+  {
+    if (!isset($this->fs_themes[$theme_id]['parent']))
+    {
+      return null;
+    }
+    
+    $parent = $this->fs_themes[$theme_id]['parent'];
+      
+    if ('default' == $parent)
+    {
+      return null;
+    }
+      
+    if (!isset($this->fs_themes[$parent]))
+    {
+      return $parent;
+    }
+
+    return $this->missing_parent_theme($parent);
   }
 

trunk/admin/themes/default/template/themes_installed.tpl

@@ -34 +34 @@
     <div class="themeShot"><img src="{$theme.screenshot}"></div>
     <div class="themeActions">
+
+  {if $theme.activable}
       <a href="{$activate_baseurl}{$theme.id}" title="{'Make this theme available to users'|@translate}">{'Activate'|@translate}</a>
+  {else}
+      <span title="{$theme.activate_tooltip}">{'Activate'|@translate}</span>
+  {/if}
+
       |
+
   {if $theme.deletable}
       <a href="{$delete_baseurl}{$theme.id}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');" title="{'Delete this theme'|@translate}">{'Delete'|@translate}</a>
@@ -41 +48 @@
       <span title="{$theme.delete_tooltip}">{'Delete'|@translate}</span>
   {/if}
+
     </div>
     

trunk/admin/themes_installed.php

@@ -90 +90 @@
   else
   {
+    // is the theme "activable" ?
+    $fs_theme['activable'] = true;
+    
+    $missing_parent = $themes->missing_parent_theme($theme_id);
+    if (isset($missing_parent))
+    {
+      $fs_theme['activable'] = false;
+      
+      $fs_theme['activate_tooltip'] = sprintf(
+        l10n('Impossible to activate this theme, the parent theme is missing: %s'),
+        $missing_parent
+        );
+    }
+
+    // is the theme "deletable" ?
     $children = $themes->get_children_themes($theme_id);
+
+    $fs_theme['deletable'] = true;
     
     if (count($children) > 0)
@@ -100 +117 @@
         implode(', ', $children)
         );
-    }
-    else
-    {
-      $fs_theme['deletable'] = true;
     }