Merge pull request #2130 from heper/patch-4

4 files changed, 13 insertions, 13 deletions

diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 0f0140d..fb7125d 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -82,7 +82,7 @@ if(is_subsystem_dirty('packagelock')) {
 
 $pkg_info = get_pkg_info();
 
-$pgtitle = array(gettext("System"),gettext("Package Manager"));
+$pgtitle = array(gettext("System"),gettext("Package Manager"),gettext("Available Packages"));
 
 include("head.inc");
 
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 04213de..9f7af99 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -247,23 +247,23 @@ if ($_POST) {
 if($_GET && $_GET['id'] == "firmware") {
 	$firmwareupdate = true;
 	$firmwareversion = get_system_pkg_version();
+	$headline = gettext("System update") ;
 }
 
-$pgtitle = array(gettext("System"),gettext("Package Manager"), $headline);
-include("head.inc");
-
 $tab_array = array();
-$tab_array[] = array(gettext("Available packages"), false, "pkg_mgr.php");
-$tab_array[] = array(gettext("Installed packages"), false, "pkg_mgr_installed.php");
+
 if($firmwareupdate) {
-	$tab_array[] = array(gettext("System update"), true, "");
+	$pgtitle = array(gettext("System"),gettext("Update"), $headline);
+	$tab_array[] = array(gettext("System Update"), true, "");
+	$tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
 } else {
+	$pgtitle = array(gettext("System"),gettext("Package Manager"), $headline);
+	$tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php");
+	$tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php");
 	$tab_array[] = array(gettext("Package Installer"), true, "");
 }
-if($firmwareupdate) {
-	$tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
-}
 
+include("head.inc");
 display_top_tabs($tab_array);
 
 if ($input_errors)
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index bf22439..1ca5d5a 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -77,7 +77,7 @@ if (is_subsystem_dirty('packagelock')) {
 
 $closehead = false;
 
-$pgtitle = array(gettext("System"), gettext("Package Manager"));
+$pgtitle = array(gettext("System"), gettext("Package Manager"),gettext("Installed Packages"));
 
 include("head.inc");
 
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index f6d8d52..93d0f56 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -107,7 +107,7 @@ if ($_POST) {
 $curcfg = $config['system']['firmware'];
 $gitcfg = $config['system']['gitsync'];
 
-$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Settings"));
+$pgtitle = array(gettext("System"), gettext("Update"), gettext("Update Settings"));
 $closehead = false;
 
 exec("/usr/bin/fetch -q -o {$g['tmp_path']}/manifest \"{$g['update_manifest']}\"");
@@ -125,7 +125,7 @@ if ($savemsg)
 
 $tab_array = array();
 $tab_array[] = array(gettext("Update Settings"), true, "system_update_settings.php");
-$tab_array[] = array(gettext("System update"), false, "pkg_mgr_install.php?id=firmware");
+$tab_array[] = array(gettext("System Update"), false, "pkg_mgr_install.php?id=firmware");
 display_top_tabs($tab_array);
 
 $form = new Form();