Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34 from marc1706/master

Browse Source 
Jumpbox doesn't care if it is enabled in the ACP
This commit is contained in:
Marc Alexander
2011-07-31 04:27:57 -07:00
parent 507caa128f 204af4c8be
commit 24410b2ba8
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/language/de/mods/info_acp_portal.php
View File

@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
'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',
'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Die Jumpbox auf dem Portal anzeigen. Die Jumpbox wird nur angezeigt, wenn sie gleichzeitig in den Board-Funktionalitäten aktiviert ist.',
'LINK_ADDED' => 'Der Link wurde erfolgreich eingetragen',
'LINK_UPDATED' => 'Der Link wurde erfolgreich geändert',

2
root/language/en/mods/info_acp_portal.php
View File

@@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
'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',
'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Display the jumpbox on the portal. The jumpbox will only be displayed if it is also enabled in the board features.',
'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',

8
root/portal.php
View File

@@ -162,15 +162,15 @@ if($module_count['total'] < 1)
// Assign specific vars
$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_PORTAL_LEFT_COLUMN' => $config['board3_left_column_width'],
'S_PORTAL_RIGHT_COLUMN' => $config['board3_right_column_width'],
'S_LEFT_COLUMN' => ($module_count['left'] > 0 && $config['board3_left_column']) ? true : false,
'S_CENTER_COLUMN' => ($module_count['center'] > 0) ? true : false,
'S_RIGHT_COLUMN' => ($module_count['right'] > 0 && $config['board3_right_column']) ? 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'],
'S_DISPLAY_PHPBB_MENU' => $config['board3_phpbb_menu'],
'B3P_DISPLAY_JUMPBOX' => $config['board3_display_jumpbox'],
));
// Output page

2
root/styles/prosilver/template/portal/portal_body.html
View File

@@ -60,7 +60,7 @@
<!-- DEFINE $MODULE_ID = '{modules_center.MODULE_ID}' -->
<!-- INCLUDE {$TEMPLATE_FILE} -->
<!-- END modules_center -->
<!-- IF S_DISPLAY_JUMPBOX -->
<!-- IF S_DISPLAY_JUMPBOX and B3P_DISPLAY_JUMPBOX -->
<br />
<!-- INCLUDE portal/modules/jumpbox.html -->
<!-- ENDIF -->

2
root/styles/subsilver2/template/portal/portal_body.html
View File

@@ -66,7 +66,7 @@
<!-- DEFINE $MODULE_ID = '{modules_center.MODULE_ID}' -->
<!-- INCLUDE {$TEMPLATE_FILE} -->
<!-- END modules_center -->
<!-- IF S_DISPLAY_JUMPBOX -->
<!-- IF S_DISPLAY_JUMPBOX and B3P_DISPLAY_JUMPBOX -->
<br />
<!-- INCLUDE portal/modules/jumpbox.html -->
<!-- ENDIF -->