Merge pull request #3 from eoconnell/masterHEADmaster

Some more stuff

3 files changed, 115 insertions, 116 deletions

diff --git a/blocks/forum_login/index.php b/blocks/forum_login/index.php
index c5343d9..ca094f6 100644
--- a/blocks/forum_login/index.php
+++ b/blocks/forum_login/index.php
@@ -25,8 +25,6 @@ if (isset($GLOBALS['ID_MEMBER']) && $GLOBALS['ID_MEMBER'] != 0): ?>
 		<p>
 			<center>
 				<b>Your IP:</b> <?php echo $ip; ?><br />
-				<?php /* fix this, what about avatars that arent saved no our site */ ?>
-				<img src="<?php echo $avatar_path . $avatar; ?>" alt="<?php echo 'No Avatar'; ?>" /><br/>
 				<b>Total posts:</b> <?php echo $posts; ?><br />
 			</center>
 		</p>
diff --git a/blocks/mini_calendar/functions.php b/blocks/mini_calendar/functions.php
index ffc98a6..0aed0d5 100644
--- a/blocks/mini_calendar/functions.php
+++ b/blocks/mini_calendar/functions.php
@@ -29,7 +29,8 @@
 <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')
+<?php echo "myWindow = window.open('". Bayonet_Config::$ini['site']['url'] . "blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300');"; ?>
+     myWindow = window.open('blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300')
      myWindow.focus();
 }
 </script>
diff --git a/blocks/mini_calendar/style.css b/blocks/mini_calendar/style.css
index d34db05..52af08d 100644
--- a/blocks/mini_calendar/style.css
+++ b/blocks/mini_calendar/style.css
@@ -1,114 +1,114 @@
-/* START>> CALENDAR STYLES*/

-		.monthTitle{

-  			color:black;

-            text-align:center;

-            font-size:12px;

-            font-weight:bold;

-			font-family:arial;			

-		}

-		td.weekday {

-			width:40px;

-			height:20px;

-            background-color:#cb2121;

-            color:green;

-            text-align:center;

-            font-size:10px;

-            /* font-weight:bold; */

-		}

-		th.weekday {

-			width:40px;

-			height:29px;

-            background-color:white;

-            color:black;

-            text-align:center;

-            font-size:11px;

-            font-weight:normal; 

-		}

-		.monthday {

-			width:40px; 

-			height:20px; 

-            background-color:#aea2a2;

-            color:white;

-            text-align:left;

-            font-size:10pt;

-            /* font-weight:bold; */

-                        

-		}

-		.monthtoday {

-			width:38px; 

-			height:38px; 

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

-            color:#225eac;

-   			text-align:center;

-   			font-size:14px;

-      		font-weight:bold;

-			font-family: arial; 

-            border:1px solid #333333;

-		}

-		.event {

-			width:38px; 

-		 	height:38px; 

-            background-color:#225eac;

-   			text-align:center;

-            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;  

-            background-color:#225eac;

-            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;

-            background-color:#a1a1a1;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:12px;

-		}

-		td.cal_weekend {

-			width:40px;

-			height:40px;

-            background-color:#8f8f8f;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:12px;

-		}

-		td.cal_notmonth {

-			width:40px;

-			height:40px;

-            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;			

-		}

+/* START>> CALENDAR STYLES*/
+		.monthTitle{
+  			color:black;
+            text-align:center;
+            font-size:12px;
+            font-weight:bold;
+			font-family:arial;			
+		}
+		td.weekday {
+			width:40px;
+			height:20px;
+            background-color:#cb2121;
+            color:green;
+            text-align:center;
+            font-size:10px;
+            /* font-weight:bold; */
+		}
+		th.weekday {
+			width:40px;
+			height:29px;
+            background-color:white;
+            color:black;
+            text-align:center;
+            font-size:11px;
+            font-weight:normal; 
+		}
+		.monthday {
+			width:40px; 
+			height:20px; 
+            background-color:#aea2a2;
+            color:white;
+            text-align:left;
+            font-size:10pt;
+            /* font-weight:bold; */
+                        
+		}
+		.monthtoday {
+			width:38px; 
+			height:38px; 
+           /* background-color:#3666ba; */
+            color:#225eac;
+   			text-align:center;
+   			font-size:14px;
+      		font-weight:bold;
+			font-family: arial; 
+            border:1px solid #333333;
+		}
+		.event {
+			width:38px; 
+		 	height:38px; 
+            background-color:#225eac;
+   			text-align:center;
+            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;  
+            background-color:#225eac;
+            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;
+            background-color:#a1a1a1;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:12px;
+		}
+		td.cal_weekend {
+			width:40px;
+			height:40px;
+            background-color:#8f8f8f;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:12px;
+		}
+		td.cal_notmonth {
+			width:40px;
+			height:40px;
+            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