change templating in _config.php file, add minor styling

_config.php

@@ -6,14 +6,14 @@
  You can modify the date display by assigning new date templates to any of the following
    date scenarios. Use the above date format keys.
    
-'OneDay' 			=> '$StartMonth%{sMonShort}. %{sDayNumShort}, %{sYearFull}'
-'SameMonthSameYear' => '%{sMonShort}. %{sDayNumShort} - %{eDayNumShort}, %{eYearFull}'
-'DiffMonthSameYear' => '%{sMonShort}. %{sDayNumShort} - %{eMonShort}. %{eDayNumShort}, %{eYearFull}'
-'DiffMonthDiffYear' => '%{sMonShort}. %{sDayNumShort}, %{sYearFull} - %{eMonShort} %{eDayNumShort}, %{eYearFull}'
+'OneDay' 			=> '$StartMonthNameShort. $StartDayNumberShort, $StartYearFull'
+'SameMonthSameYear' => '$StartMonthNameShort. $StartDayNumberShort - $EndDatNumberShort, $EndYearFull'
+'DiffMonthSameYear' => '$StartMonthNameShort. $StartDayNumberShort - $EndMonthNameShort. $EndDayNumberShort, $EndYearFull'
+'DiffMonthDiffYear' => '$StartMonthNameShort. $StartDayNumberShort, $StartYearFull - $EndMonthNameShort $EndDayNumberShort, $EndYearFull'
 
-'OneDayHeader' 			=> '%{sMonFull} %{sDayNumShort}%{sDaySuffix}, %{sYearFull}'
-'MonthHeader' 			=> '%{sMonFull}, %{sYearFull}'
-'YearHeader' 				=> '%{sYearFull}'
+'OneDayHeader' 			=> '$StartMonthNameFull $StartDayNumberShort$StartDaySuffix, $StartYearFull'
+'MonthHeader' 			=> '$StartMonthNameFull, $StartYearFull'
+'YearHeader' 				=> '$StartYearFull'
 
 */
 );

css/calendar.css

@@ -1,13 +1,13 @@
 
-.event-calendar-events ul, .event-calendar-events ul li { list-style:none; margin:0; padding:0; }
+#event-calendar-events ul, .event-calendar-events ul li { list-style:none; margin:0; padding:0; }
 
-.event-calendar-events > ul { border-top:1px solid #ccc; }
-
-.event-calendar-events .vevent { padding:0 0 1em; margin:0 0 1em; border-bottom:1px solid #ccc; }
+#event-calendar-events .vevent { padding:0 0 1em; margin:0 0 1em; border-bottom:1px solid #ccc; }
 
 .event-calendar-other-dates { margin:1em 0 0; }
 .event-calendar-other-dates ul, .event-calendar-other-dates ul li { list-style:none; margin:0; padding:0; }
 .event-calendar-other-dates h4 { margin:0; }
 
 .vevent .dates { font-weight:700; }
 
+.calendar-view-more.loading {color: #ccc;}
+

css/calendar_widget.css

@@ -1,16 +1,19 @@
 
-.calendar-widget { margin:0 0 2em; }
-.calendar-widget table { width:100%; border-collapse:collapse; border:1px solid #ddd; border-spacing:0; margin:0; }
-.calendar-widget table td, .calendar-widget table th { border:1px solid #ddd; }
+.calendar-widget-table { margin:0 0 2em; }
+.calendar-widget-table table { width:100%; border-collapse:collapse; border:1px solid #ddd; border-spacing:0; margin:0; }
+.calendar-widget-table table td, .calendar-widget table th { border:1px solid #ddd; }
 
-.calendar-widget thead th { text-align:center; padding:5px; font-size:1.2em; }
+.calendar-widget-table thead th { text-align:center; padding:5px; font-size:1.2em; }
 
-.calendar-widget tbody td { background-color:#fff; padding:4px; width:13%; font-size:1em; }
+.calendar-widget-table tbody td { background-color:#fff; padding:4px; width:13%; font-size:1em; }
 
-.calendar-widget tbody .calendar-header td { background-color:#555; color:#fff; border-color:#555; }
+.calendar-widget-table tbody .calendar-header td { background-color:#555; color:#fff; border-color:#555; }
 
-.calendar-widget tbody .calendar-day { text-align:right; }
-.calendar-widget tbody .show-week { width:9%; text-align:center; }
-.calendar-widget tbody .calendar-day:hover, .calendar-widget tbody .show-week:hover, .calendar-widget tbody .selected { background-color:#d9edf7; cursor:pointer; color:#3a87ad; }
-.calendar-widget tbody .out-of-month { background-color:#eee; color:#999; }
-.calendar-widget tbody .today { font-weight:700; color:#3a87ad; }
+.calendar-widget-table tbody .calendar-day { text-align:right; }
+.calendar-widget-table tbody .show-week { width:9%; text-align:center; }
+.calendar-widget-table tbody .calendar-day:hover, 
+.calendar-widget tbody .show-week:hover, 
+.calendar-widget tbody .selected { background-color:#d9edf7; cursor:pointer; color:#3a87ad; }
+.calendar-widget-table tbody .out-of-month { background-color:#eee; color:#999; }
+.calendar-widget-table tbody .today { font-weight:700; color:#3a87ad; }
+.calendar-widget-table tbody .hasEvent {background-image:url(../images/dot.png);background-repeat:no-repeat;background-position:center;}

javascript/calendar.js

@@ -12,7 +12,7 @@ $(function() {
 			url: $t.attr('href'),
 			success: function(data) {
 				$t.remove();
-				$('#events').append(data);
+				$('#event-calendar-events').append(data);
 				fetching = false;
 			}
 

javascript/calendar_widget.js

@@ -146,15 +146,9 @@
 			var monthName = this.settings.calMonthsLabels[this.month]			
 			var html = '<table class="calendar-widget-table">';
 			html += '<thead>';
-<<<<<<< HEAD
 			html += '<tr><th colspan="8"><a class="prev" href="javascript:void(0);"> &laquo; </a>';
 			html +=  '<a href="javascript:void(0);" class="show-month">'+monthName + "&nbsp;" + this.year + '</a>';
 			html += '<a class="next" href="javascript:void(0);"> &raquo; </a></th></tr>';
-=======
-			html += '<tr><th colspan="8"><a class="prev" href="javascript:void(0);"> << </a>';
-			html +=  '<a href="javascript:void(0);" class="show-month">'+monthName + "&nbsp;" + this.year + '</a>';
-			html += '<a class="next" href="javascript:void(0);"> >> </a></th></tr>';
->>>>>>> bidstuff
 			html += '</thead>';
 			html += '<tbody>';
 			html += '<tr class="calendar-header">';
@@ -210,11 +204,7 @@
 					cell++;
 
 				}
-<<<<<<< HEAD
 				html += "<td class='show-week'>&laquo;</td>";
-=======
-				html += "<td class='show-week'>&lt;&lt;</td>";
->>>>>>> bidstuff
 				html += '</tr><tr>';
 			}
 			html += '</tr></tbody></table>';

templates/Includes/EventList.ss

@@ -23,5 +23,5 @@
 <% end_loop %>
 </ul>
 <% if MoreEvents %>
-<a href="$MoreLink" class="calendar-view-more"><% _t('Calendar.VIEWMOREEVENTS','View more...') %></a>
+<a href="$MoreLink" class="calendar-view-more"><% _t('Calendar.VIEWMOREEVENTS','View more events...') %></a>
 <% end_if %>

templates/Layout/Calendar.ss

@@ -11,7 +11,7 @@ $Content
 
 <h2>$DateHeader</h2>
 <% if Events %>
-<div class="event-calendar-events">
+<div id="event-calendar-events">
   <% include EventList %>
 </div>
 <% else %>

templates/Layout/CalendarEvent.ss

@@ -1,3 +1,5 @@
+$CalendarWidget
+$MonthJumper
 <p><a href="$Parent.Link">&laquo; Back to $Parent.Title</a></p>
 <div class="vevent">
   <h3 class="summary">$Title</h3>