7 files changed, 55 insertions, 43 deletions
diff --git a/admin/plugins_new.php b/admin/plugins_new.php
index 8fa3e0ac9..8f19104b6 100644
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@@ -105,17 +105,8 @@ if ($plugins->get_server_plugins(true))
 
   foreach($plugins->server_plugins as $plugin)
   {
-    list($date, ) = explode(' ', $plugin['revision_date']);
-
-    $ext_desc = '<i>'.l10n('Downloads').':</i> '.$plugin['extension_nb_downloads']."\r\n"
-      ."\r\n"
-      .$plugin['extension_description'];
-
-    $rev_desc = '<i>'.l10n('Version').':</i> '.$plugin['revision_name']."\r\n"
-      .'<i>'.l10n('Released on').':</i> '.$date."\r\n"
-      .'<i>'.l10n('Downloads').':</i> '.$plugin['revision_nb_downloads']."\r\n"
-      ."\r\n"
-      .$plugin['revision_description'];
+    $ext_desc = trim($plugin['extension_description'], " \n\r");
+    list($small_desc) = explode("\n", wordwrap($ext_desc, 200));
 
     $url_auto_install = htmlentities($base_url)
       . '&amp;revision=' . $plugin['revision_id']
@@ -124,13 +115,14 @@ if ($plugins->get_server_plugins(true))
     ;
 
     $template->append('plugins', array(
+      'ID' => $plugin['extension_id'],
       'EXT_NAME' => $plugin['extension_name'],
       'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin['extension_id'],
-      'EXT_DESC' => $ext_desc,
+      'SMALL_DESC' => trim($small_desc, " \r\n"),
+      'BIG_DESC' => $ext_desc,
       'VERSION' => $plugin['revision_name'],
-      'DATE' => $date,
-      'VER_DESC' => $rev_desc,
       'AUTHOR' => $plugin['author_name'],
+      'DOWNLOADS' => $plugin['revision_nb_downloads'],
       'URL_INSTALL' => $url_auto_install,
       'URL_DOWNLOAD' => $plugin['download_url'] . '&amp;origin=piwigo_download'));
   }
diff --git a/admin/themes/clear/icon/minus.gif b/admin/themes/clear/icon/minus.gif
new file mode 100644
index 000000000..154e45a5e
--- /dev/null
+++ b/admin/themes/clear/icon/minus.gif
diff --git a/admin/themes/clear/icon/plus.gif b/admin/themes/clear/icon/plus.gif
new file mode 100644
index 000000000..93d2ade3d
--- /dev/null
+++ b/admin/themes/clear/icon/plus.gif
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 638269d37..b5a565e8e 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -17,7 +17,7 @@ TABLE.table2 TR {
 TABLE.table2 THEAD TD { padding:7px 10px 3px 10px; }
 TABLE.table2 TR.throw { text-align: center; }
 TABLE.table2 { margin:0pt auto; }
-.sort { display:block; padding:8px 5px 0px 1px; clear: right; text-align:left; }
+.sort { display:block; padding:8px 5px 0px 1px; clear: right; float:left; }
 
 
 .hour {
@@ -807,6 +807,9 @@ h2:lang(en) { text-transform:capitalize; }
 .pluginBox {margin-bottom:10px;-moz-border-radius:5px;}
 .pluginBox table {width:99%}
 .pluginBox td {text-align:left;}
+.pluginBox td.pluginDesc {cursor:pointer;}
+.pluginBox td.pluginDesc img{vertical-align:middle;}
+.pluginBox td em{float:right;}
 .pluginBoxNameCell {width:150px; vertical-align:top;}
 
 .languageBoxes {min-height:0;text-align:left;}
diff --git a/admin/themes/default/icon/minus.gif b/admin/themes/default/icon/minus.gif
new file mode 100644
index 000000000..154e45a5e
--- /dev/null
+++ b/admin/themes/default/icon/minus.gif
diff --git a/admin/themes/default/icon/plus.gif b/admin/themes/default/icon/plus.gif
new file mode 100644
index 000000000..93d2ade3d
--- /dev/null
+++ b/admin/themes/default/icon/plus.gif
diff --git a/admin/themes/default/template/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index c8eb94a34..ca82a79de 100644
--- a/admin/themes/default/template/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -1,11 +1,20 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
+{known_script id="jquery.ui.effects" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/effects.core.packed.js" }
+{known_script id="jquery.ui.blind" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/effects.blind.packed.js" }
 
 <script type="text/javascript">
 jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
-    width: 300,
-    splitTitle: '|'
+  jQuery("td[id^='desc_']").click(function() {ldelim}
+    id = this.id.split('_');
+    if ($(this).hasClass('bigdesc')) {ldelim}
+      $("#bigdesc_"+id[1]).toggle('blind', 1);
+      $(this).removeClass('bigdesc');
+    } else {ldelim}
+      $("#bigdesc_"+id[1]).toggle('blind', 50);
+      $(this).addClass('bigdesc');
+    }
+    $("#smalldesc_"+id[1]).toggle('blind', 1);
+    return false;
   });
 });
 </script>
@@ -20,28 +29,36 @@ jQuery().ready(function(){ldelim}
   <h2>{'Plugins'|@translate}</h2>
 </div>
 
-{if isset($plugins)}
-<br>
-<table class="table2 plugins">
-<thead>
-  <tr class="throw">
-    <td>{'Name'|@translate}</td>
-    <td>{'Version'|@translate}</td>
-    <td>{'Date'|@translate}</td>
-    <td>{'Author'|@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><a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
-    <td style="text-align:center;"><a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
-    <td>{$plugin.DATE}</td>
-    <td>{$plugin.AUTHOR}</td>
-    <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'Are you sure you want to install this plugin?'|@translate|@escape:javascript}');">{'Automatic installation'|@translate}</a>
-      / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a>
-    </td>
-  </tr>
-{/foreach}
-</table>
+<div class="pluginBox" id="plugin_{$plugin.ID}"}>
+  <table>
+    <tr>
+      <td class="pluginBoxNameCell">{$plugin.EXT_NAME}</td>
+{if $plugin.BIG_DESC != $plugin.SMALL_DESC}
+      <td id="desc_{$plugin.ID}" class="pluginDesc">
+        <span id="smalldesc_{$plugin.ID}">
+          <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plus.gif">{$plugin.SMALL_DESC}...
+        </span>
+        <span id="bigdesc_{$plugin.ID}" style="display:none;">
+          <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif">{$plugin.BIG_DESC|@nl2br}<br>&nbsp;
+        </span>
+      </td>
+{else}
+      <td>{$plugin.BIG_DESC|@nl2br}</td>
 {/if}
+    </tr>
+    <tr>
+      <td>
+        <a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'Are you sure you want to install this plugin?'|@translate|@escape:javascript}');">{'Install'|@translate}</a>
+        |  <a href="{$plugin.URL_DOWNLOAD}">{'Download'|@translate}</a>
+      </td>
+      <td>
+        {'Version'|@translate} {$plugin.VERSION}
+        | {'By %s'|@translate|@sprintf:$plugin.AUTHOR}
+        | <a class="externalLink" href="{$plugin.EXT_URL}">{'Visit plugin site'|@translate}</a>
+        <em>{'Downloads'|@translate}: {$plugin.DOWNLOADS}</em>
+      </td>
+    </tr>
+  </table>
+</div>
+{/foreach}
+\ No newline at end of file