14 files changed, 79 insertions, 27 deletions
diff --git a/admin/template/goto/default-layout.css b/admin/template/goto/default-layout.css
index 74d3790df..52b8befae 100644
--- a/admin/template/goto/default-layout.css
+++ b/admin/template/goto/default-layout.css
@@ -40,20 +40,31 @@ TABLE#detailedStats {
 }
 
 /* Plugins tables */
-TABLE.table2 TR TD.pluginState {
-  padding-left: 16px;
-}
+TABLE.plugins a { border: 0; }
+TABLE.plugins TR TD { padding: 4px 10px; }
+TABLE.plugins TR TD.pluginState { padding: 4px 16px; }
 
-TABLE.table2 TR TD.active {
+TABLE.plugins TR TD.active {
   background: url(icon/plugin_active.gif) no-repeat center left;
   background-color: inherit; /* IE need it */
 }
 
-TABLE.table2 TR TD.inactive {
+TABLE.plugins TR TD.inactive {
   background: url(icon/plugin_inactive.gif) no-repeat center left;
   background-color: inherit; /* IE need it */
 }
 
+TABLE.plugins ul.pluginsActions {
+  float: left;
+  padding: 0;
+  margin: 0;
+  width: 60px;
+  list-style: none;
+  text-align: center;
+}
+
+TABLE.plugins ul.pluginsActions li { display: inline; }
+
 /* categoryOrdering */
 SELECT.categoryList {
   width: 100%;
diff --git a/admin/template/goto/icon/plug_activate.png b/admin/template/goto/icon/plug_activate.png
new file mode 100644
index 000000000..feb97a1c9
--- /dev/null
+++ b/admin/template/goto/icon/plug_activate.png
diff --git a/admin/template/goto/icon/plug_activate_grey.png b/admin/template/goto/icon/plug_activate_grey.png
new file mode 100644
index 000000000..bf2a9be53
--- /dev/null
+++ b/admin/template/goto/icon/plug_activate_grey.png
diff --git a/admin/template/goto/icon/plug_deactivate.png b/admin/template/goto/icon/plug_deactivate.png
new file mode 100644
index 000000000..8401ad8b9
--- /dev/null
+++ b/admin/template/goto/icon/plug_deactivate.png
diff --git a/admin/template/goto/icon/plug_deactivate_grey.png b/admin/template/goto/icon/plug_deactivate_grey.png
new file mode 100644
index 000000000..a7e55e669
--- /dev/null
+++ b/admin/template/goto/icon/plug_deactivate_grey.png
diff --git a/admin/template/goto/icon/plug_delete.png b/admin/template/goto/icon/plug_delete.png
new file mode 100644
index 000000000..285e53e19
--- /dev/null
+++ b/admin/template/goto/icon/plug_delete.png
diff --git a/admin/template/goto/icon/plug_delete_grey.png b/admin/template/goto/icon/plug_delete_grey.png
new file mode 100644
index 000000000..d3d070bfc
--- /dev/null
+++ b/admin/template/goto/icon/plug_delete_grey.png
diff --git a/admin/template/goto/icon/plug_install.png b/admin/template/goto/icon/plug_install.png
new file mode 100644
index 000000000..bef78e171
--- /dev/null
+++ b/admin/template/goto/icon/plug_install.png
diff --git a/admin/template/goto/icon/plug_install_grey.png b/admin/template/goto/icon/plug_install_grey.png
new file mode 100644
index 000000000..3bd56be3c
--- /dev/null
+++ b/admin/template/goto/icon/plug_install_grey.png
diff --git a/admin/template/goto/icon/plug_uninstall.png b/admin/template/goto/icon/plug_uninstall.png
new file mode 100644
index 000000000..9fd420ad7
--- /dev/null
+++ b/admin/template/goto/icon/plug_uninstall.png
diff --git a/admin/template/goto/icon/plug_uninstall_grey.png b/admin/template/goto/icon/plug_uninstall_grey.png
new file mode 100644
index 000000000..4d6291cee
--- /dev/null
+++ b/admin/template/goto/icon/plug_uninstall_grey.png
diff --git a/admin/template/goto/plugins_list.tpl b/admin/template/goto/plugins_list.tpl
index 0f2cc43e4..2b0f9bb06 100644
--- a/admin/template/goto/plugins_list.tpl
+++ b/admin/template/goto/plugins_list.tpl
@@ -10,30 +10,70 @@
 
 
 {if isset($plugins)}
-<table class="table2">
+<table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>
+    <td>{'Actions'|@translate}</td>
     <td>{'Version'|@translate}</td>
     <td>{'Description'|@translate}</td>
-    <td>{'Actions'|@translate}</td>
   </tr>
 </thead>
 
 {foreach from=$plugins item=plugin name=plugins_loop}
-	<tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
-	<td class="pluginState{if not empty($plugin.STATE)} {$plugin.STATE}{/if}">
-		{$plugin.NAME}
-	</td>
-	<td>{$plugin.VERSION}</td>
-	<td>{$plugin.DESCRIPTION}</td>
-	<td>
-	{foreach from=$plugin.actions item=action}
-		<a href="{$action.U_ACTION}"
-		{if isset($action.CONFIRM)} onclick="return confirm('{$action.CONFIRM|@escape:'javascript'}');"{/if}
-		{$TAG_INPUT_ENABLED}>{$action.L_ACTION}</a>
-	{/foreach}
-	</td>
+  <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
+  <td class="pluginState{if $plugin.STATE != 'uninstalled'} {$plugin.STATE}{/if}">
+    {$plugin.NAME}
+  </td>
+  <td>
+    <ul class="pluginsActions">
+    {if $plugin.STATE == 'active'}
+      <li>
+        <a href="{$plugin.U_ACTION}&amp;action=deactivate">
+          <img src="{$themeconf.admin_icon_dir}/plug_deactivate.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}" />
+        </a>
+      </li>
+      <li>
+          <img src="{$themeconf.admin_icon_dir}/plug_uninstall_grey.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" />
+      </li>
+    {/if}
+    {if $plugin.STATE == 'inactive'}
+      <li>
+        <a href="{$plugin.U_ACTION}&amp;action=activate">
+          <img src="{$themeconf.admin_icon_dir}/plug_activate.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}" />
+        </a>
+      </li>
+    {/if}
+    {if $plugin.STATE == 'inactive' or $plugin.STATE == 'missing'}
+      <li>
+        <a href="{$plugin.U_ACTION}&amp;action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">
+          <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" />
+        </a>
+      </li>
+    {/if}
+    {if $plugin.STATE == 'uninstalled'}
+      <li>
+          <img src="{$themeconf.admin_icon_dir}/plug_activate_grey.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}" />
+      </li>
+      <li>
+        <a href="{$plugin.U_ACTION}&amp;action=install" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">
+          <img src="{$themeconf.admin_icon_dir}/plug_install.png" alt="{'Install'|@translate}" title="{'Install'|@translate}"/>
+        </a>
+      </li>
+      <li>
+        <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'plugins_confirm_delete'|@translate|@escape:'javascript'}');">
+          <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
+        </a>
+      </li>
+    {elseif $plugin.STATE != 'missing'}
+      <li>
+        <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}" />
+      </li>
+    {/if}
+    </ul>
+  </td>
+  <td style="text-align:center;">{$plugin.VERSION}</td>
+  <td>{$plugin.DESCRIPTION}</td>
   </tr>
 {/foreach}
 </table>
diff --git a/admin/template/goto/plugins_new.tpl b/admin/template/goto/plugins_new.tpl
index b1827190c..0d3f4e1ba 100644
--- a/admin/template/goto/plugins_new.tpl
+++ b/admin/template/goto/plugins_new.tpl
@@ -12,17 +12,18 @@ jQuery().ready(function(){ldelim}
 </script>
 
 <div class="titrePage">
-  <h2>{'Plugins'|@translate}</h2>
-</div>
-
+<span class="sort">
 {'Sort order'|@translate} : 
   <select onchange="document.location = this.options[this.selectedIndex].value;" style="width:150px">
         {html_options options=$order_options selected=$order_selected}
   </select>
+</span>
+  <h2>{'Plugins'|@translate}</h2>
+</div>
 
 {if isset($plugins)}
 <br>
-<table class="table2">
+<table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>
diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl
index fbfe04afb..c21e01e18 100644
--- a/admin/template/goto/plugins_update.tpl
+++ b/admin/template/goto/plugins_update.tpl
@@ -18,7 +18,7 @@ jQuery().ready(function(){ldelim}
 {if isset($plugins_not_uptodate)}
 <br>
 <b>{'plugins_need_update'|@translate}</b>
-<table class="table2">
+<table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>
@@ -43,7 +43,7 @@ jQuery().ready(function(){ldelim}
 {if isset($plugins_uptodate)}
 <br>
 <b>{'plugins_dontneed_update'|@translate}</b>
-<table class="table2">
+<table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>
@@ -63,7 +63,7 @@ jQuery().ready(function(){ldelim}
 {if isset($plugins_cant_check)}
 <br>
 <b>{'plugins_cant_check'|@translate}</b>
-<table class="table2">
+<table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>