From 7cf48db1bacc7cd822e0053ab01326d9f03bee7a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 11 Jan 2011 23:09:14 +0000 Subject: [PATCH] Added jumpbox back -- should be fixed now --- root/includes/acp/acp_portal.php | 3 ++- root/install/index.php | 1 + root/language/de/mods/info_acp_portal.php | 2 ++ root/language/en/mods/info_acp_portal.php | 2 ++ root/portal.php | 13 +++++++------ .../prosilver/template/portal/portal_body.html | 2 +- .../subsilver2/template/portal/portal_body.html | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index c80b4183..37e182a1 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -64,7 +64,8 @@ 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_phpbb_menu' => array('lang' => 'PORTAL_PHPBB_MENU', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'board3_phpbb_menu' => array('lang' => 'PORTAL_PHPBB_MENU', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'board3_display_jumpbox' => array('lang' => 'PORTAL_DISPLAY_JUMPBOX', '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 cd77c7dc..daf52481 100644 --- a/root/install/index.php +++ b/root/install/index.php @@ -112,6 +112,7 @@ $versions = array( array('board3_left_column_width', 180, 0), array('board3_right_column_width', 180, 0), array('board3_phpbb_menu', 0, 0), + array('board3_display_jumpbox', 1, 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 d65c870f..5c09c662 100644 --- a/root/language/de/mods/info_acp_portal.php +++ b/root/language/de/mods/info_acp_portal.php @@ -85,6 +85,8 @@ $lang = array_merge($lang, array( '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.', + 'PORTAL_DISPLAY_JUMPBOX' => 'Zeige Jumpbox', + 'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Die Jumpbox auf dem Portal anzeigen', 'LINK_ADDED' => 'Der Link wurde erfolgreich eingetragen', 'LINK_UPDATED' => 'Der Link wurde erfolgreich geändert', diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index 0f52a6ef..2a0ee2f2 100644 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -77,6 +77,8 @@ $lang = array_merge($lang, array( 'PORTAL_VERSION_CHECK' => 'Versioncheck on Portal', 'PORTAL_PHPBB_MENU' => 'phpBB menu', 'PORTAL_PHPBB_MENU_EXP' => 'Display the phpBB Header on the portal.', + 'PORTAL_DISPLAY_JUMPBOX' => 'Display jumpbox', + 'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Display the jumpbox 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 d790912a..87a17be1 100644 --- a/root/portal.php +++ b/root/portal.php @@ -151,12 +151,13 @@ $template->assign_vars(array( 'S_SMALL_BLOCK' => true, 'S_PORTAL_LEFT_COLUMN' => $config['board3_left_column_width'], 'S_PORTAL_RIGHT_COLUMN' => $config['board3_right_column_width'], - 'S_LEFT_COLUMN' => ($module_count['left'] > 0) ? true : false, - 'S_CENTER_COLUMN' => ($module_count['center'] > 0) ? true : false, - '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_LEFT_COLUMN' => ($module_count['left'] > 0) ? true : false, + 'S_CENTER_COLUMN' => ($module_count['center'] > 0) ? true : false, + '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'], + 'S_DISPLAY_JUMPBOX' => $config['board3_display_jumpbox'], )); // Output page @@ -166,7 +167,7 @@ $template->set_filenames(array( 'body' => 'portal/portal_body.html') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum . $phpEx")); +make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html index c11dea3e..9035ad67 100644 --- a/root/styles/prosilver/template/portal/portal_body.html +++ b/root/styles/prosilver/template/portal/portal_body.html @@ -55,7 +55,7 @@ - +
diff --git a/root/styles/subsilver2/template/portal/portal_body.html b/root/styles/subsilver2/template/portal/portal_body.html index bd77ea14..8c9edbc3 100644 --- a/root/styles/subsilver2/template/portal/portal_body.html +++ b/root/styles/subsilver2/template/portal/portal_body.html @@ -60,7 +60,7 @@ - +