3 files changed, 11 insertions, 8 deletions
diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl
index c7480a9e7..5741365d5 100644
--- a/admin/themes/default/template/plugins_installed.tpl
+++ b/admin/themes/default/template/plugins_installed.tpl
@@ -11,9 +11,10 @@ var confirmMsg  = '{'Are you sure?'|@translate|@escape:'javascript'}';
 {literal}
 var queuedManager = jQuery.manageAjax.create('queued', { 
   queue: true,  
-  maxRequests: 1,
-  complete: function() { location.reload(); }
+  maxRequests: 1
 });
+var nb_plugins = jQuery('div.active').size();
+var done = 0;
 
 jQuery(document).ready(function() {
   /* group action */
@@ -31,9 +32,9 @@ jQuery(document).ready(function() {
       url: 'ws.php',
       data: { method: 'pwg.plugins.performAction', action: 'deactivate', plugin: id, pwg_token: pwg_token, format: 'json' },
       success: function(data) {
-        if (data['stat'] == 'ok') {
-          jQuery("#"+id).removeClass('active').addClass('inactive');
-        }
+        if (data['stat'] == 'ok') jQuery("#"+id).removeClass('active').addClass('inactive');
+        done++;
+        if (done == nb_plugins) location.reload();
       }
     });
   };
@@ -106,7 +107,7 @@ jQuery(document).ready(function() {
     
 {if $field_name != $plugin.STATE}
   {if $field_name != 'null'}
-    {if $field_name == 'active'}<div class="deactivate_all"><a>{'Deactivate'|@translate} {'all'|@translate}</a></div>{/if}
+    {if $field_name == 'active'}<div class="deactivate_all"><a>{'Deactivate all'|@translate}</a></div>{/if}
   </fieldset>
   {/if}
   
@@ -134,7 +135,7 @@ jQuery(document).ready(function() {
   {/if}
    
   {if $plugin_display == 'complete'}
-    <div id="{$plugin.ID}" class="pluginBox">
+    <div id="{$plugin.ID}" class="pluginBox {$plugin.STATE}">
       <table>
         <tr>
           <td class="pluginBoxNameCell">
@@ -181,7 +182,7 @@ jQuery(document).ready(function() {
       {assign var='version' value=$plugin.VERSION}
     {/if}
           
-    <div id="{$plugin.ID}" class="pluginMiniBox">
+    <div id="{$plugin.ID}" class="pluginMiniBox {$plugin.STATE}">
       <div class="pluginMiniBoxNameCell">
         {$plugin.NAME}
         <a class="showInfo" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}">i</a>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 700baa844..4457cdecb 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -207,6 +207,7 @@ $lang['Database'] = "Database";
 $lang['Date'] = "Date";
 $lang['Day'] = "Day";
 $lang['Deactivate'] = "Deactivate";
+$lang['Deactivate all'] = "Deactivate all";
 $lang['Default display'] = "Default display";
 $lang['Default user cannot be deleted'] = "Default user cannot be deleted";
 $lang['Default user does not exist'] = "The default user does not exist";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 16f9bec32..edc122917 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -70,6 +70,7 @@ $lang['Comments for all'] = "Commentaires pour tous";
 $lang['Current name'] = "Nom courant";
 $lang['Database'] = "Base de données";
 $lang['Deactivate'] = "Désactiver";
+$lang['Deactivate all'] = "Désactiver tout";
 $lang['Delete Representant'] = "Supprimer le représentant";
 $lang['Delete selected tags'] = "Supprimer les tags sélectionnés";
 $lang['Delete selected users'] = "Supprimer les utilisateurs sélectionnés";