diff --git a/_config.php b/_config.php index 352775c..dd4e0ef 100644 --- a/_config.php +++ b/_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' */ ); diff --git a/css/calendar.css b/css/calendar.css index 1f68a8e..8b4609d 100755 --- a/css/calendar.css +++ b/css/calendar.css @@ -1,9 +1,7 @@ -.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; } @@ -11,3 +9,5 @@ .vevent .dates { font-weight:700; } +.calendar-view-more.loading {color: #ccc;} + diff --git a/css/calendar_widget.css b/css/calendar_widget.css index a698049..cc9d124 100755 --- a/css/calendar_widget.css +++ b/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;} diff --git a/javascript/calendar.js b/javascript/calendar.js index e1a9ae4..359e9ce 100644 --- a/javascript/calendar.js +++ b/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; } diff --git a/javascript/calendar_widget.js b/javascript/calendar_widget.js index 5d5a386..85febf6 100755 --- a/javascript/calendar_widget.js +++ b/javascript/calendar_widget.js @@ -146,15 +146,9 @@ var monthName = this.settings.calMonthsLabels[this.month] var html = ''; html += ''; -<<<<<<< HEAD html += ''; -======= - html += ''; ->>>>>>> bidstuff html += ''; html += ''; html += ''; @@ -210,11 +204,7 @@ cell++; } -<<<<<<< HEAD html += ""; -======= - html += ""; ->>>>>>> bidstuff html += ''; } html += '
'; html += ''+monthName + " " + this.year + ''; html += '
'; - html += ''+monthName + " " + this.year + ''; - html += '
«<<
'; diff --git a/templates/Includes/EventList.ss b/templates/Includes/EventList.ss index e39381d..e596db9 100644 --- a/templates/Includes/EventList.ss +++ b/templates/Includes/EventList.ss @@ -23,5 +23,5 @@ <% end_loop %> <% if MoreEvents %> -<% _t('Calendar.VIEWMOREEVENTS','View more...') %> +<% _t('Calendar.VIEWMOREEVENTS','View more events...') %> <% end_if %> \ No newline at end of file diff --git a/templates/Layout/Calendar.ss b/templates/Layout/Calendar.ss index d85f238..78b1ddf 100755 --- a/templates/Layout/Calendar.ss +++ b/templates/Layout/Calendar.ss @@ -11,7 +11,7 @@ $Content

$DateHeader

<% if Events %> -
+
<% include EventList %>
<% else %> diff --git a/templates/Layout/CalendarEvent.ss b/templates/Layout/CalendarEvent.ss index 3a9f55a..eec0cf3 100755 --- a/templates/Layout/CalendarEvent.ss +++ b/templates/Layout/CalendarEvent.ss @@ -1,3 +1,5 @@ +$CalendarWidget +$MonthJumper

« Back to $Parent.Title

$Title