From 9d4fa2963b1059fed54aaeae583bf02a30c42239 Mon Sep 17 00:00:00 2001 From: jhunkeler Date: Mon, 4 Jan 2010 04:54:14 +0000 Subject: Fixed SVN maybe. git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@448 c5b2fb0a-d05d-0410-98c8-828840a80ff6 --- blocks/donations/index.php | 2 +- blocks/mini_calendar/functions.php | 30 ++++++++-------- blocks/mini_calendar/style.css | 72 ++++++++++++++++++++++++-------------- blocks/rss_agw/index.php | 2 +- blocks/rss_agw/style.css | 4 +-- 5 files changed, 63 insertions(+), 47 deletions(-) (limited to 'blocks') 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 @@ - + 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 */ + ?> + +
- +
@@ -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 ''; //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 '
'.$day_num.'
'; }else if($day_num == $today && $isEvent==false){ echo '
'.$day_num.'
'; }else if($day_num != $today && $isEvent==true){ - echo '
'; + echo "
"; echo $day_num; echo '
'; }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; -- cgit