From: Anthony Talarico Date: Wed, 14 Sep 2016 17:45:54 +0000 (-0400) Subject: adding date range to the agenda view for recurring events X-Git-Tag: v1.4.0^2~47 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b03148e2d742f178853a70a7e58e2d2b7de01122;p=WP-Plugins%2Fglm-member-db-events.git adding date range to the agenda view for recurring events --- diff --git a/css/front.css b/css/front.css index 8566e0d..fe1389f 100644 --- a/css/front.css +++ b/css/front.css @@ -296,3 +296,10 @@ a.fc-time-grid-event.fc-v-event { float: right; } } +.event-name{ + display: inline-block; +} +.absolute-dates{ + font-size: 13px; + font-weight: bold; +} \ No newline at end of file diff --git a/models/front/events/list.php b/models/front/events/list.php index 5cc185f..05098cc 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -628,6 +628,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } print_r($calDates); +// echo "
", print_r($eventsByDate), "
"; // Compile template data $templateData = array( 'assetsUrl' => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/', diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index d3b1794..f85408e 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -20,12 +20,13 @@ {foreach $events as $event}
-

{$event.name}

+

{$event.name}

+ {$event.dates} {if !$event.all_day} {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} - {$event.starting_date|date_format:"%l:%M %P"} +
{$event.starting_date|date_format:"%l:%M %P"}
{else} - {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"} +
{$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
{/if} {/if}
@@ -197,5 +198,13 @@ $(document).on("click", "button.fc-button", function () { eventsCalMonthAJAX(month_obj); }); + + var dates = $(".absolute-dates"); + dates.each( function (){ + if( $(this).text().indexOf('-') < 0 ){ + $(this).remove(); + } + }); + });