Changeset 5382

Timestamp:

Mar 26, 2010, 3:16:54 PM (14 years ago)

Author:

plg

Message:

feature 1514: make the "deactivate" action inactive if there is no active
theme left.

bug fixed: when setting the default theme, make sure at least one user will
be updated.

Location:

trunk

Files:

• admin/include/themes.class.php (modified) (3 diffs)
• admin/themes/default/template/themes_installed.tpl (modified) (1 diff)
• admin/themes_installed.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/include/themes.class.php

@@ -118 +118 @@
         }
 
+        // you can't deactivate the last theme
+        if (count($this->db_themes_by_id) <= 1)
+        {
+          array_push(
+            $errors,
+            l10n('Impossible to deactivate this theme, you need at least one theme.')
+            );
+          break;
+        }
+
         if ($theme_id == get_default_theme())
         {
@@ -228 +238 @@
   function set_default_theme($theme_id)
   {
+    global $conf;
+    
     // first we need to know which users are using the current default theme
     $default_theme = get_default_theme();
@@ -237 +249 @@
   WHERE theme = "'.$default_theme.'"
 ;';
-    $user_ids = array_from_query($query, 'user_id');
+    $user_ids = array_unique(
+      array_merge(
+        array_from_query($query, 'user_id'),
+        array($conf['guest_id'], $conf['default_user_id'])
+        )
+      );
 
     // $user_ids can't be empty, at least the default user has the default

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

@@ -14 +14 @@
     <div class="themeShot"><img src="{$theme.screenshot}"></div>
     <div class="themeActions">
+
+{if $theme.deactivable}
       <a href="{$deactivate_baseurl}{$theme.id}" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a>
+{else}
+      <span title="{$theme.deactivate_tooltip}">{'Deactivate'|@translate}</span>
+{/if}
+      
 {if not $theme.is_default}
       | <a href="{$set_default_baseurl}{$theme.id}" title="{'Set as default theme for unregistered and new users'|@translate}">{'Default'|@translate}</a>

trunk/admin/themes_installed.php

@@ -78 +78 @@
   if (in_array($theme_id, $db_theme_ids))
   {
+    $fs_theme['deactivable'] = true;
+    
+    if (count($db_theme_ids) <= 1)
+    {
+      $fs_theme['deactivable'] = false;
+      $fs_theme['deactivate_tooltip'] = l10n('Impossible to deactivate this theme, you need at least one theme.');
+    }
+    
     if ($theme_id == $default_theme)
     {

trunk/language/en_UK/admin.lang.php

@@ -759 +759 @@
 $lang['None'] = 'None';
 $lang['Invert'] = 'Invert';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Impossible to deactivate this theme, you need at least one theme.';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -764 +764 @@
 $lang['None'] = 'Rien';
 $lang['Invert'] = 'Inverser';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Impossible de désactiver ce thème, il doit rester au moins un thème activé.';
 ?>