From 2fcd11c28e5d58c1b5a0351fc8bf792abb0a5da4 Mon Sep 17 00:00:00 2001 From: patdenice Date: Thu, 3 Mar 2011 11:54:46 +0000 Subject: Improve display for plugins and themes update page. git-svn-id: http://piwigo.org/svn/trunk@9493 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/plugins_update.php | 3 +- admin/themes/default/template/plugins_update.tpl | 40 +++++--- admin/themes/default/template/themes_update.tpl | 121 ++++++++++------------- admin/themes_update.php | 48 +++------ language/en_UK/admin.lang.php | 2 + language/fr_FR/admin.lang.php | 2 + 6 files changed, 98 insertions(+), 118 deletions(-) diff --git a/admin/plugins_update.php b/admin/plugins_update.php index 432cf76b1..1ed176daa 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -133,7 +133,8 @@ if ($plugins->get_server_plugins()) 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], 'EXT_DESC' => trim($plugin_info['extension_description'], " \n\r"), 'REV_DESC' => trim($plugin_info['revision_description'], " \n\r"), - 'VERSION' => $plugin_info['revision_name'], + 'CURRENT_VERSION' => $fs_plugin['version'], + 'NEW_VERSION' => $plugin_info['revision_name'], 'AUTHOR' => $plugin_info['author_name'], 'DOWNLOADS' => $plugin_info['extension_nb_downloads'], 'URL_UPDATE' => $url_auto_update, diff --git a/admin/themes/default/template/plugins_update.tpl b/admin/themes/default/template/plugins_update.tpl index 11b97c829..4a88169cc 100644 --- a/admin/themes/default/template/plugins_update.tpl +++ b/admin/themes/default/template/plugins_update.tpl @@ -1,10 +1,14 @@ {combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/jquery.ui.min.js' } -{combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} -{footer_script require='jquery.cluetip'} -jQuery().ready(function(){ldelim} - jQuery('.cluetip').cluetip({ldelim} - width: 300, - splitTitle: '|' +{combine_script id='jquery.ui.effects' load='async' require='jquery.ui' path='themes/default/js/ui/minified/jquery.effects.core.min.js' } +{combine_script id='jquery.ui.effects.blind' load='async' require='jquery.ui.effects' path='themes/default/js/ui/minified/jquery.effects.blind.min.js' } + +{footer_script require='jquery.ui.effects.blind'} +jQuery(document).ready(function(){ldelim} + jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() {ldelim} + id = this.id.split('_'); + jQuery("#revdesc_"+id[1]).toggle('blind'); + jQuery(".button_"+id[1]).toggle(); + return false; }); }); {/footer_script} @@ -18,24 +22,34 @@ jQuery().ready(function(){ldelim}
{'Plugins which need upgrade'|@translate} {foreach from=$plugins item=plugin name=plugins_loop} -
+
- + + + +
- {$plugin.EXT_NAME} + {$plugin.EXT_NAME} - {'Automatic upgrade'|@translate} - | {'Download file'|@translate} + {'Install'|@translate} + | {'Download'|@translate} + | {'Visit plugin site'|@translate}
- {'Version'|@translate} {$plugin.VERSION} + {'Version'|@translate} {$plugin.CURRENT_VERSION} + {'Downloads'|@translate}: {$plugin.DOWNLOADS} - {'By %s'|@translate|@sprintf:$plugin.AUTHOR} + + + {'New Version'|@translate} : {$plugin.NEW_VERSION} + | {'By %s'|@translate|@sprintf:$plugin.AUTHOR} +
+
diff --git a/admin/themes/default/template/themes_update.tpl b/admin/themes/default/template/themes_update.tpl index f83c09ce3..84491f117 100644 --- a/admin/themes/default/template/themes_update.tpl +++ b/admin/themes/default/template/themes_update.tpl @@ -1,77 +1,62 @@ -{combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} -{footer_script require='jquery.cluetip'} -jQuery().ready(function(){ldelim} - jQuery('.cluetip').cluetip({ldelim} - width: 300, - splitTitle: '|' +{combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/jquery.ui.min.js' } +{combine_script id='jquery.ui.effects' load='async' require='jquery.ui' path='themes/default/js/ui/minified/jquery.effects.core.min.js' } +{combine_script id='jquery.ui.effects.blind' load='async' require='jquery.ui.effects' path='themes/default/js/ui/minified/jquery.effects.blind.min.js' } + +{footer_script require='jquery.ui.effects.blind'} +jQuery(document).ready(function(){ldelim} + jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() {ldelim} + id = this.id.split('_'); + jQuery("#revdesc_"+id[1]).toggle('blind'); + jQuery(".button_"+id[1]).toggle(); + return false; }); }); {/footer_script}
-

{'Check for updates'|@translate}

+

{'Themes'|@translate}

-{if isset($themes_not_uptodate)} -
-{'Themes which need upgrade'|@translate} - - - - - - - - - -{foreach from=$themes_not_uptodate item=theme name=themes_loop} - - - - - - -{/foreach} -
{'Name'|@translate}{'Current
version'|@translate}		{'Available
version'|@translate}		{'Actions'|@translate}
{$theme.EXT_NAME}{$theme.VERSION}{$theme.NEW_VERSION}{'Automatic upgrade'|@translate} - / {'Download file'|@translate}
-{/if} - - -{if isset($themes_uptodate)} -
-{'Themes up to date'|@translate} - - - - - - - -{foreach from=$themes_uptodate item=theme name=themes_loop} - - - - -{/foreach} -
{'Name'|@translate}{'Version'|@translate}
{$theme.NAME}{$theme.VERSION}
-{/if} - - -{if isset($themes_cant_check)} -
-{'Theme versions can\'t be checked'|@translate} - - - - - - - -{foreach from=$themes_cant_check item=theme name=themes_loop} - - - - +{if not empty($update_themes)} +
+
+{'Themes which need upgrade'|@translate} +{foreach from=$update_themes item=theme name=themes_loop} +
+
{'Name'|@translate}{'Version'|@translate}
{$theme.NAME}{$theme.VERSION}
+ + + + + + + + + + + + +
+ {$theme.EXT_NAME} + + {'Install'|@translate} + | {'Download'|@translate} + | {'Visit theme site'|@translate} +
+ {'Version'|@translate} {$theme.CURRENT_VERSION} + + {'Downloads'|@translate}: {$theme.DOWNLOADS} + + + {'New Version'|@translate} : {$theme.NEW_VERSION} + | {'By %s'|@translate|@sprintf:$theme.AUTHOR} +
+ +
+
{/foreach} - +
+ +{elseif not isset($SERVER_ERROR)} +

{'All themes are up to date.'|@translate}

{/if} diff --git a/admin/themes_update.php b/admin/themes_update.php index c68068737..8cb2fa004 100644 --- a/admin/themes_update.php +++ b/admin/themes_update.php @@ -97,59 +97,35 @@ if ($themes->get_server_themes()) { $theme_info = $themes->server_themes[$fs_theme['extension']]; - list($date, ) = explode(' ', $theme_info['revision_date']); - - $ext_desc = ''.l10n('Downloads').': '.$theme_info['extension_nb_downloads']."\r\n" - ."\r\n" - .$theme_info['extension_description']; - - $rev_desc = ''.l10n('Version').': '.$theme_info['revision_name']."\r\n" - .''.l10n('Released on').': '.$date."\r\n" - .''.l10n('Downloads').': '.$theme_info['revision_nb_downloads']."\r\n" - ."\r\n" - .$theme_info['revision_description']; - - if ($themes->theme_version_compare($fs_theme['version'], $theme_info['revision_name'])) - { - // Plugin is up to date - $template->append('themes_uptodate', array( - 'URL' => PEM_URL.'/extension_view.php?eid='.$theme_info['extension_id'], - 'NAME' => $fs_theme['name'], - 'EXT_DESC' => $ext_desc, - 'VERSION' => $fs_theme['version'], - 'VER_DESC' => $rev_desc)); - } - else + if (!$themes->theme_version_compare($fs_theme['version'], $theme_info['revision_name'])) { - // Plugin need upgrade $url_auto_update = $base_url . '&revision=' . $theme_info['revision_id'] . '&theme=' . $theme_id . '&pwg_token='.get_pwg_token() ; - $template->append('themes_not_uptodate', array( + $template->append('update_themes', array( + 'ID' => $theme_info['extension_id'], 'EXT_NAME' => $fs_theme['name'], 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$theme_info['extension_id'], - 'EXT_DESC' => $ext_desc, - 'VERSION' => $fs_theme['version'], + 'EXT_DESC' => trim($theme_info['extension_description'], " \n\r"), + 'REV_DESC' => trim($theme_info['revision_description'], " \n\r"), + 'CURRENT_VERSION' => $fs_theme['version'], 'NEW_VERSION' => $theme_info['revision_name'], - 'NEW_VER_DESC' => $rev_desc, + 'AUTHOR' => $theme_info['author_name'], + 'DOWNLOADS' => $theme_info['extension_nb_downloads'], 'URL_UPDATE' => $url_auto_update, - 'URL_DOWNLOAD' => $theme_info['download_url'] . '&origin=piwigo_download')); + 'URL_DOWNLOAD' => $theme_info['download_url'] . '&origin=piwigo_download' + ) + ); } } - else - { - // Can't check theme - $template->append('themes_cant_check', array( - 'NAME' => $fs_theme['name'], - 'VERSION' => $fs_theme['version'])); - } } } else { + $template->assign('SERVER_ERROR', true); array_push($page['errors'], l10n('Can\'t connect to server.')); } diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index aeb9cdb8e..f77a0a3be 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -776,4 +776,6 @@ $lang['[Simulation]'] = "[Simulation]"; $lang['Themes which need upgrade'] = 'Themes which need upgrade'; $lang['All themes are up to date.'] = 'All themes are up to date.'; $lang['All plugins are up to date.'] = 'All plugins are up to date.'; +$lang['Visit theme site'] = 'Visit theme site'; +$lang['New Version'] = 'New Version'; ?> \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index ef142edf2..a03a3f180 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -789,4 +789,6 @@ $lang['Remove from caddie'] = 'Retirer du panier'; $lang['Themes which need upgrade'] = 'Thèmes à mettre à jour'; $lang['All themes are up to date.'] = 'Tous les thèmes sont à jour.'; $lang['All plugins are up to date.'] = 'Tous les plugins sont à jour.'; +$lang['Visit theme site'] = 'Visitez le site du thème'; +$lang['New Version'] = 'Nouvelle version'; ?> -- cgit v1.2.3