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

Allow duplicate inclusion of module if it's in a different column type

Browse Source 
A module can now be added once in the side columns and once in
the center columns, if the module itself allows that
This commit is contained in:
Marc Alexander
2012-01-02 20:41:24 +01:00
parent 92e1a4ca8c
commit c0e0191945
19 changed files with 322 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
root/portal/modules/portal_announcements.php
View File

@@ -63,7 +63,7 @@ class portal_announcements_module
// Any announcements present? If not terminate it here.
if (sizeof($fetch_news) == 0)
{
$template->assign_block_vars('announcements_row', array(
$template->assign_block_vars('announcements_center_row', array(
'S_NO_TOPICS' => true,
'S_NOT_LAST' => false
));
@@ -220,7 +220,7 @@ class portal_announcements_module
// Grab icons
$icons = $cache->obtain_icons();
$template->assign_block_vars('announcements_row', array(
$template->assign_block_vars('announcements_center_row', array(
'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
'FORUM_NAME' => ($forum_id) ? $fetch_news[$i]['forum_name'] : '',
'TITLE' => $fetch_news[$i]['topic_title'],
@@ -261,7 +261,7 @@ class portal_announcements_module
{
foreach ($fetch_news[$i]['attachments'] as $attachment)
{
$template->assign_block_vars('announcements_row.attachment', array(
$template->assign_block_vars('announcements_center_row.attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
@@ -296,7 +296,7 @@ class portal_announcements_module
$pagination = generate_portal_pagination(append_sid("{$phpbb_root_path}portal.$phpEx"), $total_announcements, $config['board3_number_of_announcements_' . $module_id], $start, 'announcements');
}
$template->assign_block_vars('announcements_row', array(
$template->assign_block_vars('announcements_center_row', array(
'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
'FORUM_NAME' => ($forum_id) ? $fetch_news[$i]['forum_name'] : '',
'TITLE' => $fetch_news[$i]['topic_title'],
@@ -325,7 +325,7 @@ class portal_announcements_module
{
foreach ($fetch_news[$i]['attachments'] as $attachment)
{
$template->assign_block_vars('announcements_row.attachment', array(
$template->assign_block_vars('announcements_center_row.attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
@@ -358,11 +358,11 @@ class portal_announcements_module
if ($config['board3_announcements_style_' . $module_id])
{
return 'announcements_compact.html';
return 'announcements_center_compact.html';
}
else
{
return 'announcements.html';
return 'announcements_center.html';
}
}

4
root/portal/modules/portal_donation.php
View File

@@ -51,7 +51,7 @@ class portal_donation_module
{
global $config, $template;
$template->assign_var('PAY_ACC', $config['board3_pay_acc_' . $module_id]);
$template->assign_var('PAY_ACC_CENTER', $config['board3_pay_acc_' . $module_id]);
return 'donation_center.html';
}
@@ -60,7 +60,7 @@ class portal_donation_module
{
global $config, $template;
$template->assign_var('PAY_ACC', $config['board3_pay_acc_' . $module_id]);
$template->assign_var('PAY_ACC_SIDE', $config['board3_pay_acc_' . $module_id]);
return 'donation_side.html';
}