From 03341e35a29ceb5c90d7913be4e7e48b37293eb9 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Tue, 28 Jun 2022 13:00:17 +0200 Subject: [PATCH] related to #1679 Good title for Updates tabs called in different parts of admin --- admin/languages.php | 7 +++++-- admin/plugins.php | 7 +++++-- admin/themes.php | 7 +++++-- admin/themes/default/template/updates_ext.tpl | 4 ---- admin/updates_ext.php | 1 + 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/admin/languages.php b/admin/languages.php index 91af4aaed..d275f4987 100644 --- a/admin/languages.php +++ b/admin/languages.php @@ -30,9 +30,12 @@ $tabsheet->set_id('languages'); $tabsheet->select($page['tab']); $tabsheet->assign(); -if ($page['tab'] == 'update') +if ($page['tab'] == 'update') { include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); + $template->assign('ADMIN_PAGE_TITLE', l10n('Languages')); +} else +{ include(PHPWG_ROOT_PATH.'admin/languages_'.$page['tab'].'.php'); - +} ?> \ No newline at end of file diff --git a/admin/plugins.php b/admin/plugins.php index 3d2bb1a16..41517b920 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -25,9 +25,12 @@ $tabsheet->set_id('plugins'); $tabsheet->select($page['tab']); $tabsheet->assign(); -if ($page['tab'] == 'update') +if ($page['tab'] == 'update') { include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); + $template->assign('ADMIN_PAGE_TITLE', l10n('Plugins')); +} else +{ include(PHPWG_ROOT_PATH.'admin/plugins_'.$page['tab'].'.php'); - +} ?> \ No newline at end of file diff --git a/admin/themes.php b/admin/themes.php index 7d3a6cd29..4beeb6a9d 100644 --- a/admin/themes.php +++ b/admin/themes.php @@ -25,9 +25,12 @@ $tabsheet->set_id('themes'); $tabsheet->select($page['tab']); $tabsheet->assign(); -if ($page['tab'] == 'update') +if ($page['tab'] == 'update') { include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); + $template->assign('ADMIN_PAGE_TITLE', l10n('Themes')); +} else +{ include(PHPWG_ROOT_PATH.'admin/themes_'.$page['tab'].'.php'); - +} ?> \ No newline at end of file diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl index dd2a18566..5c1b8dc32 100644 --- a/admin/themes/default/template/updates_ext.tpl +++ b/admin/themes/default/template/updates_ext.tpl @@ -158,10 +158,6 @@ $("#update_all").click(function() { }) {/footer_script} -
-

{'Updates'|@translate}

-
- {if $isWebmaster == 1}
diff --git a/admin/updates_ext.php b/admin/updates_ext.php index 9062581e4..b773acd66 100644 --- a/admin/updates_ext.php +++ b/admin/updates_ext.php @@ -84,5 +84,6 @@ $template->assign('EXT_TYPE', $page['page'] == 'updates' ? 'extensions' : $page[ $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0); $template->set_filename('plugin_admin_content', 'updates_ext.tpl'); $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); +$template->assign('ADMIN_PAGE_TITLE', l10n('Updates')); ?> \ No newline at end of file