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 = ''.l10n('Downloads').': '.$plugin['extension_nb_downloads']."\r\n" - ."\r\n" - .$plugin['extension_description']; - - $rev_desc = ''.l10n('Version').': '.$plugin['revision_name']."\r\n" - .''.l10n('Released on').': '.$date."\r\n" - .''.l10n('Downloads').': '.$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) . '&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'] . '&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 Binary files /dev/null and b/admin/themes/clear/icon/minus.gif differ diff --git a/admin/themes/clear/icon/plus.gif b/admin/themes/clear/icon/plus.gif new file mode 100644 index 000000000..93d2ade3d Binary files /dev/null and b/admin/themes/clear/icon/plus.gif differ 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 Binary files /dev/null and b/admin/themes/default/icon/minus.gif differ diff --git a/admin/themes/default/icon/plus.gif b/admin/themes/default/icon/plus.gif new file mode 100644 index 000000000..93d2ade3d Binary files /dev/null and b/admin/themes/default/icon/plus.gif differ 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" } @@ -20,28 +29,36 @@ jQuery().ready(function(){ldelim}

{'Plugins'|@translate}

-{if isset($plugins)} -
- - - - - - - - - - {foreach from=$plugins item=plugin name=plugins_loop} - - - - - - - -{/foreach} -
{'Name'|@translate}{'Version'|@translate}{'Date'|@translate}{'Author'|@translate}{'Actions'|@translate}
{$plugin.EXT_NAME}{$plugin.VERSION}{$plugin.DATE}{$plugin.AUTHOR}{'Automatic installation'|@translate} - / {'Download file'|@translate} -
+
+ + + +{if $plugin.BIG_DESC != $plugin.SMALL_DESC} + +{else} + {/if} + + + + + +
{$plugin.EXT_NAME} + + {$plugin.SMALL_DESC}... + + + {$plugin.BIG_DESC|@nl2br}
+ {'Install'|@translate} + | {'Download'|@translate} + + {'Version'|@translate} {$plugin.VERSION} + | {'By %s'|@translate|@sprintf:$plugin.AUTHOR} + | {'Visit plugin site'|@translate} + {'Downloads'|@translate}: {$plugin.DOWNLOADS} +
+
+{/foreach} \ No newline at end of file