4 files changed, 18 insertions, 17 deletions

diff --git a/admin/plugins_list.php b/admin/plugins_list.php
index 18ee8b8ac..524a34afa 100644
--- a/admin/plugins_list.php
+++ b/admin/plugins_list.php
@@ -33,7 +33,7 @@ include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
 $template->set_filenames(array('plugins' => 'admin/plugins_list.tpl'));
 
 $order = isset($_GET['order']) ? $_GET['order'] : 'name';
-$base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order;
+$base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order;
 
 $plugins = new plugins();
 
@@ -93,10 +93,11 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
           'VERSION' => $fs_plugin['version'],
           'DESCRIPTION' => $desc);
 
-  $action_url = htmlentities($base_url).'&plugin='.$plugin_id;
+  $action_url = $base_url.'&plugin='.$plugin_id;
 
   if (isset($plugins->db_plugins_by_id[$plugin_id]))
-  { 
+  {
+    $tpl_plugin['STATE'] = $plugins->db_plugins_by_id[$plugin_id]['state'];
     switch ($plugins->db_plugins_by_id[$plugin_id]['state'])
     {
       case 'active':
@@ -136,7 +137,7 @@ $missing_plugin_ids = array_diff(
 
 foreach($missing_plugin_ids as $plugin_id)
 {
-  $action_url = htmlentities($base_url).'&plugin='.$plugin_id;
+  $action_url = $base_url.'&plugin='.$plugin_id;
 
   $template->append( 'plugins',
       array(
diff --git a/template/yoga/admin/plugins_list.tpl b/template/yoga/admin/plugins_list.tpl
index 767a0924e..8276cd359 100644
--- a/template/yoga/admin/plugins_list.tpl
+++ b/template/yoga/admin/plugins_list.tpl
@@ -19,19 +19,19 @@
   </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>{$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 style="padding-left:16px; {if not empty($plugin.STATE)}background: url({$ROOT_URL}{$themeconf.admin_icon_dir}/plugin_{$plugin.STATE}.gif) no-repeat center left{/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>
 {/foreach}
 </table>
diff --git a/template/yoga/icon/admin/plugin_active.gif b/template/yoga/icon/admin/plugin_active.gif
new file mode 100644
index 000000000..fe49227da
--- /dev/null
+++ b/template/yoga/icon/admin/plugin_active.gif
diff --git a/template/yoga/icon/admin/plugin_inactive.gif b/template/yoga/icon/admin/plugin_inactive.gif
new file mode 100644
index 000000000..19d551865
--- /dev/null
+++ b/template/yoga/icon/admin/plugin_inactive.gif