From 513dd70c69d7dfc5e5939ddd19ed17e504c558cc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 5 Jan 2011 12:39:12 +0000 Subject: [PATCH] Added missing feature to show phpBB menu on portal --- root/includes/acp/acp_portal.php | 2 +- root/install/index.php | 1 + root/language/de/mods/info_acp_portal.php | 2 ++ root/language/en/mods/info_acp_portal.php | 4 ++-- root/portal.php | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index 9069ffec..26cb9c29 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -64,7 +64,7 @@ class acp_portal 'board3_left_column' => array('lang' => 'PORTAL_LEFT_COLUMN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'board3_right_column' => array('lang' => 'PORTAL_RIGHT_COLUMN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'board3_version_check' => array('lang' => 'PORTAL_VERSION_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'board3_forum_index' => array('lang' => 'PORTAL_FORUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'board3_phpbb_menu' => array('lang' => 'PORTAL_PHPBB_MENU', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'legend2' => 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS', 'board3_left_column_width' => array('lang' => 'PORTAL_LEFT_COLUMN_WIDTH', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), diff --git a/root/install/index.php b/root/install/index.php index 74504926..cd77c7dc 100644 --- a/root/install/index.php +++ b/root/install/index.php @@ -111,6 +111,7 @@ $versions = array( array('board3_forum_index', 1, 0), array('board3_left_column_width', 180, 0), array('board3_right_column_width', 180, 0), + array('board3_phpbb_menu', 0, 0), ), 'module_add' => array( diff --git a/root/language/de/mods/info_acp_portal.php b/root/language/de/mods/info_acp_portal.php index e39bc1e3..2ea0efdf 100644 --- a/root/language/de/mods/info_acp_portal.php +++ b/root/language/de/mods/info_acp_portal.php @@ -79,6 +79,8 @@ $lang = array_merge($lang, array( 'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180', 'PORTAL_RIGHT_COLUMN_WIDTH' => 'Breite der rechten Spalte', 'PORTAL_RIGHT_COLUMN_WIDTH_EXP' => 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180', + 'PORTAL_PHPBB_MENU' => 'phpBB-Menü', + 'PORTAL_PHPBB_MENU_EXP' => 'Den phpBB Header auf dem Portal anzeigen.', 'LINK_ADDED' => 'Der Link wurde erfolgreich eingetragen', 'LOG_PORTAL_LINK_ADDED' => 'Portal-Einstellungen geändert
» Link hinzu gefügt: %s ', diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index ba20ab55..fcf6788d 100644 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -71,8 +71,8 @@ $lang = array_merge($lang, array( 'PORTAL_RIGHT_COLUMN' => 'Enable right column', 'PORTAL_RIGHT_COLUMN_EXP' => 'Switch to no if you wish to turn off the right column', 'PORTAL_VERSION_CHECK' => 'Versioncheck on Portal', - 'PORTAL_FORUM_INDEX' => 'Forum Index (Forum list)', - 'PORTAL_FORUM_INDEX_EXP' => 'Display this block on the portal.', + 'PORTAL_PHPBB_MENU' => 'phpBB menu', + 'PORTAL_PHPBB_MENU_EXP' => 'Display the phpBB Header on the portal.', 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS' => 'Left and right column width settings', 'PORTAL_LEFT_COLUMN_WIDTH' => 'Width of the left column', 'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Change the width of the left column in pixels; recommended value is 180', diff --git a/root/portal.php b/root/portal.php index d47f35f6..d790912a 100644 --- a/root/portal.php +++ b/root/portal.php @@ -156,6 +156,7 @@ $template->assign_vars(array( 'S_RIGHT_COLUMN' => ($module_count['right'] > 0) ? true : false, 'S_TOP_COLUMN' => ($module_count['top'] > 0) ? true : false, 'S_BOTTOM_COLUMN' => ($module_count['bottom'] > 0) ? true : false, + 'S_DISPLAY_PHPBB_MENU' => $config['board3_phpbb_menu'], )); // Output page