diff --git a/admin/plugins_update.php b/admin/plugins_update.php
index 24622125a..432cf76b1 100644
--- a/admin/plugins_update.php
+++ b/admin/plugins_update.php
@@ -119,59 +119,32 @@ if ($plugins->get_server_plugins())
{
$plugin_info = $plugins->server_plugins[$fs_plugin['extension']];
- list($date, ) = explode(' ', $plugin_info['revision_date']);
-
- $ext_desc = ''.l10n('Downloads').': '.$plugin_info['extension_nb_downloads']."\r\n"
- ."\r\n"
- .$plugin_info['extension_description'];
-
- $rev_desc = ''.l10n('Version').': '.$plugin_info['revision_name']."\r\n"
- .''.l10n('Released on').': '.$date."\r\n"
- .''.l10n('Downloads').': '.$plugin_info['revision_nb_downloads']."\r\n"
- ."\r\n"
- .$plugin_info['revision_description'];
-
- if ($plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name']))
+ if (!$plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name']))
{
- // Plugin is up to date
- $template->append('plugins_uptodate', array(
- 'URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'],
- 'NAME' => $fs_plugin['name'],
- 'EXT_DESC' => $ext_desc,
- 'VERSION' => $fs_plugin['version'],
- 'VER_DESC' => $rev_desc));
- }
- else
- {
- // Plugin need upgrade
$url_auto_update = $base_url
. '&revision=' . $plugin_info['revision_id']
. '&plugin=' . $plugin_id
. '&pwg_token='.get_pwg_token()
;
- $template->append('plugins_not_uptodate', array(
+ $template->append('plugins', array(
+ 'ID' => $plugin_info['extension_id'],
'EXT_NAME' => $fs_plugin['name'],
'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'],
- 'EXT_DESC' => $ext_desc,
- 'VERSION' => $fs_plugin['version'],
- 'NEW_VERSION' => $plugin_info['revision_name'],
- 'NEW_VER_DESC' => $rev_desc,
+ 'EXT_DESC' => trim($plugin_info['extension_description'], " \n\r"),
+ 'REV_DESC' => trim($plugin_info['revision_description'], " \n\r"),
+ 'VERSION' => $plugin_info['revision_name'],
+ 'AUTHOR' => $plugin_info['author_name'],
+ 'DOWNLOADS' => $plugin_info['extension_nb_downloads'],
'URL_UPDATE' => $url_auto_update,
'URL_DOWNLOAD' => $plugin_info['download_url'] . '&origin=piwigo_download'));
}
}
- else
- {
- // Can't check plugin
- $template->append('plugins_cant_check', array(
- 'NAME' => $fs_plugin['name'],
- 'VERSION' => $fs_plugin['version']));
- }
}
}
else
{
+ $template->assign('SERVER_ERROR', true);
array_push($page['errors'], l10n('Can\'t connect to server.'));
}
diff --git a/admin/themes/default/template/plugins_update.tpl b/admin/themes/default/template/plugins_update.tpl
index 2304db112..11b97c829 100644
--- a/admin/themes/default/template/plugins_update.tpl
+++ b/admin/themes/default/template/plugins_update.tpl
@@ -1,3 +1,4 @@
+{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}
@@ -12,66 +13,36 @@ jQuery().ready(function(){ldelim}
{'Plugins'|@translate}
-{if isset($plugins_not_uptodate)}
-
-{'Plugins which need upgrade'|@translate}
-
-{/if}
-
-
-{if isset($plugins_uptodate)}
-
-{'Plugins up to date'|@translate}
-
-
-
- | {'Name'|@translate} |
- {'Version'|@translate} |
-
-
-{foreach from=$plugins_uptodate item=plugin name=plugins_loop}
-
- | {$plugin.NAME} |
- {$plugin.VERSION} |
-
-{/foreach}
-
-{/if}
-
-
-{if isset($plugins_cant_check)}
-
-{'Plugin versions can\'t be checked'|@translate}
-
-
-
- | {'Name'|@translate} |
- {'Version'|@translate} |
-
-
-{foreach from=$plugins_cant_check item=plugin name=plugins_loop}
-
- | {$plugin.NAME} |
- {$plugin.VERSION} |
-
-{/foreach}
-
+
+
+{elseif not isset($SERVER_ERROR)}
+{'All plugins are up to date.'|@translate}
{/if}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 578ffe5cf..aeb9cdb8e 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -520,8 +520,6 @@ $lang['Please wait...'] = 'Please wait...';
$lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.';
$lang['Plugin has been successfully copied'] = "The plugin has been successfully copied";
$lang['Plugin list'] = "Plugins list";
-$lang['Plugin versions can\'t be checked'] = "Plugin which version cannot be checked";
-$lang['Plugins up to date'] = "Plugins up-to-date";
$lang['Plugins which need upgrade'] = "Plugins to be upgraded";
$lang['Plugins'] = "Plugins";
$lang['Position'] = "Position";
@@ -776,6 +774,6 @@ $lang['[%s] Visit album %s'] = "[%s] Visit album %s";
$lang['[NBM] Problems or questions'] = "[NBM] Problems or questions";
$lang['[Simulation]'] = "[Simulation]";
$lang['Themes which need upgrade'] = 'Themes which need upgrade';
-$lang['Themes up to date'] = 'Themes up to date';
-$lang['Theme versions can\'t be checked'] = 'Theme versions can\'t be checked';
+$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.';
?>
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index f55b35f1c..ef142edf2 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -787,6 +787,6 @@ $lang['Delete orphan tags'] = 'Supprimer les tags orphelins';
$lang['delete photo'] = 'supprimer la photo';
$lang['Remove from caddie'] = 'Retirer du panier';
$lang['Themes which need upgrade'] = 'Thèmes à mettre à jour';
-$lang['Themes up to date'] = 'Thèmes à jour';
-$lang['Theme versions can\'t be checked'] = 'Impossible de vérifier les thèmes suivants';
+$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.';
?>