Fixed SVN maybe.

git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@448 c5b2fb0a-d05d-0410-98c8-828840a80ff6

5 files changed, 63 insertions, 47 deletions

diff --git a/blocks/donations/index.php b/blocks/donations/index.php
index ff77657..1329f20 100644
--- a/blocks/donations/index.php
+++ b/blocks/donations/index.php
@@ -5,7 +5,7 @@
 <input type="hidden" name="cmd" value="_s-xclick" />
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----" />
 <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+<!-- <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" /> -->
 </form>
 </center>
 </td></tr>
diff --git a/blocks/mini_calendar/functions.php b/blocks/mini_calendar/functions.php
index 1133daa..ffc98a6 100644
--- a/blocks/mini_calendar/functions.php
+++ b/blocks/mini_calendar/functions.php
@@ -25,6 +25,15 @@
  /**
  * PrintCalendar() - prints the calendar with events 
  */
+ ?>
+<script type="text/javascript">
+function openEvent(date)
+{
+     myWindow = window.open('http://testbed.3rd-infantry-division.org/cms/blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300')
+     myWindow.focus();
+}
+</script>
+ <?php
  function PrintCalendar(){
  	
 		$date = time();
@@ -35,7 +44,6 @@
 		$month = date('m', $date);
 		$monthNum = date('n', $date);
 		$year = date('Y', $date);
- 
 		
 		/* Accounts for the last couple days from the previous months */
 			$first_day = mktime(0,0,0,$monthNum, 1, $year); 
@@ -76,7 +84,7 @@
 		?>		             
 		<center>
 			<table class="calendar" style="background-color:white;" cellspacing="1" cellpadding="0">	
-				<tr style="background-color:#999999; height:27px;">
+				<tr style="background-color:#999999; height:20px;">
 					<td colspan="50" style="vertical-align:middle; text-align:center;">
 		    			<!-- <a href="?op=calendar&month=<?php echo $previous_month.'&year='.$previous_year; ?>"><<</a> -->
 		    			<!-- Month Name and Year -->
@@ -105,7 +113,7 @@
 				$day_count++;
 			}
 			
-$sqlToday = $year.'-'.$monthNum.'-'.$today;
+$sqlToday = date("Y-m-d", mktime(0, 0, 0, $monthNum, $today, $year));
 $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$days_in_month}");
 		
 			//loop printing each day of the CURRENT month ONLY
@@ -117,7 +125,7 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
 				echo '<td class="cal_weekday">';  //weekdays
 			   }
 			   			        
-		       $sqlDate = $year.'-'.$monthNum.'-'.$day_num;  //old way NOT unix
+		       $sqlDate = date("Y-m-d", mktime(0, 0, 0, $monthNum, $day_num, $year));
 		       		      
 		  	 	//checks to see if the current day has events
 		       $isEvent=false;
@@ -129,23 +137,13 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
 		       			}
 		       		}
 		       		
-		       }
-
-			 /*	global $db;
-		  		$result = $db->Query("SELECT title,color,date,time FROM `bayonet_events` WHERE `date` = '$sqlDate' ORDER BY `date` DESC");
-		  		while(($row = $db->Fetch($result))!=false)
-		  		{
-		    		$isEvent = true;
-		    		if($day_num == $today){
-		    			$todaysEvents[] = $row; 		    		
-		    		}
-		  		}  */		  				
+		       }	  				
 				if($day_num == $today && $isEvent==true){
 					echo '<div class="eventtoday">'.$day_num.'</div>';				
 				}else if($day_num == $today && $isEvent==false){
 					echo '<div class="monthtoday">'.$day_num.'</div>'; 
 				}else if($day_num != $today && $isEvent==true){
-					echo '<div class="event" id="event'.$day_num.'" onmouseover="highlightEvent(this.id)" onmouseout="normEvent(this.id)">';
+					echo "<div class=\"event\" onclick=\"openEvent('{$sqlDate}')\">";
 						echo $day_num;
 					echo '</div>';                		               	
 				}else{
diff --git a/blocks/mini_calendar/style.css b/blocks/mini_calendar/style.css
index 72898ee..792ab69 100644
--- a/blocks/mini_calendar/style.css
+++ b/blocks/mini_calendar/style.css
@@ -7,90 +7,108 @@
 			font-family:arial;			

 		}

 		td.weekday {

-			width:40px;

-			height:20px;

+			width:34px;

+			height:34px;

             background-color:#cb2121;

             color:green;

             text-align:center;

             font-size:10px;

-            font-weight:bold;

+            /* font-weight:bold; */

 		}

 		th.weekday {

-			width:40px;

-			height:29px;

+			width:34px;

+			height:20px;

             background-color:white;

             color:black;

             text-align:center;

             font-size:11px;

-            font-weight:bold;

+            font-weight:normal; 

 		}

 		.monthday {

-			width:40px;

-			height:20px;

+		/*	width:29px; */

+			height:36px; 

             background-color:#aea2a2;

             color:white;

             text-align:left;

             font-size:10pt;

-            font-weight:bold;

+            /* font-weight:bold; */

                         

 		}

 		.monthtoday {

-			width:38px;

-			height:38px;

+		/*	width:25px; */

+			height:32px; 

            /* background-color:#3666ba; */

             color:#225eac;

    			text-align:center;

    			font-size:14px;

-            font-weight:bold;

+      		font-weight:bold;

+			font-family: arial; 

             border:1px solid #333333;

 		}

 		.event {

-			width:38px;

-			height:38px;

+			/* width:25px; */

+			 height:32px; 

             background-color:#225eac;

    			text-align:center;

-            border:1px solid #333333;					

+            border:1px solid #333333;

+			cursor: pointer;					

 		}

 		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {

 			color:white;		

 		}

-		.eventtoday{

-		 	width:38px;

-			height:38px;

+		.eventtoday {

+		 /*	width:25px; */

+			height:32px;  

             background-color:#225eac;

-            color:#ef8e25;

+            color: white;

    			text-align:center;

    			font-size:14px;

             font-weight:bold;

+            font-family: arial;

             border:1px solid #333333;			

 		}

 		td.cal_weekday {

-			width:40px;

-			height:40px;

+			width:34px;

+			height:34px;

             background-color:#a1a1a1;

             vertical-align:top;

             color:#eeeeee;

             font-family:arial;

             text-align:center;

-            font-size:14px;

+            font-size:12px;

 		}

 		td.cal_weekend {

-			width:40px;

-			height:40px;

+			width:34px;

+			height:34px;

             background-color:#8f8f8f;

             vertical-align:top;

             color:#eeeeee;

             font-family:arial;

             text-align:center;

-            font-size:14px;

+            font-size:12px;

 		}

 		td.cal_notmonth {

-			width:40px;

-			height:40px;

+			width:34px;

+			height:34px;

             background-color:#6e6e6e;

             vertical-align:top;

             color:#d4d4d4;

             text-align:left;

             font-size:11px;

 		}

+		div.event_title {

+			font-family: Geneva, Verdana, Arial;

+			font-size: 14px;

+		}

+		div.event_text {

+			font-family: Geneva, Verdana, Arial;

+			font-size: 12px;

+			padding-top: 3px;

+			padding-left: 10px;

+			padding-right: 5px;		

+		}

+		div.event_time {

+			font-family: Geneva, Verdana, Arial;

+			font-size: 12px;			

+		}

 /* END>> CALENDAR STYLES */
\ No newline at end of file
diff --git a/blocks/rss_agw/index.php b/blocks/rss_agw/index.php
index 8649582..3a492ca 100644
--- a/blocks/rss_agw/index.php
+++ b/blocks/rss_agw/index.php
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) {
 /**
  * Armed Global Warfare Feed
  */
-define('AGW_FEED', 'http://www.armedglobalwarfare.com/index.php?type=rss;action=.xml;limit=150');
+define('AGW_FEED', 'http://www.armedglobalwarfare.com/index.php?type=rss;action=.xml;limit=300');
 
 /**
  * Cache File
diff --git a/blocks/rss_agw/style.css b/blocks/rss_agw/style.css
index 0bc6e81..e9d0824 100644
--- a/blocks/rss_agw/style.css
+++ b/blocks/rss_agw/style.css
@@ -2,11 +2,11 @@
 		display: none;

 	}

 	.rss span.title{

-		font-size: 16px;

+		font-size: 10px;

 		font-weight: bold;

 		/* text-decoration:underline; */	

 	}

-	

+

 	.rss span.date{

 		font-family: 'Trebuchet MS', Trebuchet, Verdana, sans-serif; 

 		font-size: 11px;