From 3d37f531a5463f2a4ce0a02a1e6840bb7bce30b5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 11 Mar 2011 00:15:58 +0100
Subject: [PATCH] Fixed select for displaying events

---
 root/portal/modules/portal_calendar.php                   | 6 +++---
 .../prosilver/template/portal/modules/calendar_side.html  | 2 ++
 .../subsilver2/template/portal/modules/calendar_side.html | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/root/portal/modules/portal_calendar.php b/root/portal/modules/portal_calendar.php
index c6341c7b..1a98ec26 100644
--- a/root/portal/modules/portal_calendar.php
+++ b/root/portal/modules/portal_calendar.php
@@ -137,7 +137,6 @@ class portal_calendar_module
 		$next_month = '<a href="' . append_sid("{$phpbb_root_path}portal.$phpEx", "m=$up#minical") . '"><img src="' . $phpbb_root_path . 'styles/' . $user->theme['theme_path'] . '/theme/images/portal/cal_icon_right_arrow.png' . '" title="' . $user->lang['VIEW_NEXT_MONTH'] . '" height="16" width="16" alt="&gt;&gt;" /></a>';
 
 		$template->assign_vars(array(
-			'S_DISPLAY_MINICAL'	=> true,
 			'S_SUNDAY_FIRST'	=> ($config['board3_sunday_first_' . $module_id]) ? true : false,
 			'L_MINI_CAL_MONTH'	=> (($config['board3_long_month_' . $module_id]) ? $user->lang['mini_cal']['long_month'][$this->day[0][1]] : $user->lang['mini_cal']['month'][$this->day[0][1]]) . " " . $this->day[0][2],
 			'L_MINI_CAL_SUN'	=> '<span style="color: ' . $config['board3_calendar_sunday_color_' . $module_id] . ';">' . $user->lang['mini_cal']['day'][1] . '</span>', 
@@ -148,8 +147,9 @@ class portal_calendar_module
 			'L_MINI_CAL_FRI'	=> $user->lang['mini_cal']['day'][6], 
 			'L_MINI_CAL_SAT'	=> $user->lang['mini_cal']['day'][7], 
 			'U_PREV_MONTH'		=> $prev_month,
-			'U_NEXT_MONTH'		=> $next_month)
-		);
+			'U_NEXT_MONTH'		=> $next_month,
+			'S_DISPLAY_EVENTS'	=> ($config['board3_display_events_' . $module_id]) ? true : false,
+		));
 		
 		/* 
 		* Let's start displaying the events
diff --git a/root/styles/prosilver/template/portal/modules/calendar_side.html b/root/styles/prosilver/template/portal/modules/calendar_side.html
index 2c81ea07..71991742 100644
--- a/root/styles/prosilver/template/portal/modules/calendar_side.html
+++ b/root/styles/prosilver/template/portal/modules/calendar_side.html
@@ -28,6 +28,7 @@
 		</tr>
 		<!-- END mini_cal_row -->
 	</table>
+	<!-- IF S_DISPLAY_EVENTS -->
 	<hr class="dashed" />
 	<div class="menutitle" style="font: bold 12px 'Trebuchet MS','Lucida Grande',Arial,sans-serif; text-decoration: underline;">{L_CURRENT_EVENTS}:</div>
 	<ul>
@@ -72,4 +73,5 @@
 		<li><span style="float:left;" class="gensmall"><strong>{L_NO_UPCOMING_EVENTS}</strong></span><br /></li>
 		<!-- END upcoming_events -->
 	</ul>
+	<!-- ENDIF -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
diff --git a/root/styles/subsilver2/template/portal/modules/calendar_side.html b/root/styles/subsilver2/template/portal/modules/calendar_side.html
index fd0e60c2..3d0f45f7 100644
--- a/root/styles/subsilver2/template/portal/modules/calendar_side.html
+++ b/root/styles/subsilver2/template/portal/modules/calendar_side.html
@@ -33,12 +33,12 @@
 			</table>
 		</td>
 	</tr>
-	
+<!-- IF S_DISPLAY_EVENTS -->
 <tr class="row2">
 		<td>   
 			<table width="100%" cellspacing="1">
 				<tr>
-					<td colspan="3" align="left"><span class="genmed">{L_CURRENT_EVENTS}:</span></td>
+					<td colspan="3" align="left"><span class="genmed" style="font: bold 12px 'Trebuchet MS','Lucida Grande',Arial,sans-serif; text-decoration: underline;">{L_CURRENT_EVENTS}:</span></td>
 				</tr>	
 				
 				<tr>
@@ -61,7 +61,7 @@
 
 	<table width="100%" cellspacing="1">
 		<tr>
-			<td colspan="3" align="left"><span class="genmed">{L_UPCOMING_EVENTS}:</span></td>
+			<td colspan="3" align="left"><span class="genmed" style="font: bold 12px 'Trebuchet MS','Lucida Grande',Arial,sans-serif; text-decoration: underline;">{L_UPCOMING_EVENTS}:</span></td>
 		</tr>
 		<tr>
 			<!-- BEGIN upcoming_events -->
@@ -83,6 +83,6 @@
 	</td>
 	
 </tr>
-	
+<!-- ENDIF -->
 </table>
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file