From: Anthony Talarico Date: Tue, 11 Oct 2016 16:57:21 +0000 (-0400) Subject: restricting agenda view date output if the start and end date of the events are the... X-Git-Tag: v1.4.6^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a8cf09ecd1ba3b59935a25bb142b48fa2ae6ef72;p=WP-Plugins%2Fglm-member-db-events.git restricting agenda view date output if the start and end date of the events are the same, bumping version number --- diff --git a/index.php b/index.php index c9fb3d0..cace3bb 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Members Database Events * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.4.5 + * Version: 1.4.6 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -20,7 +20,7 @@ * @package glmMembersDatabaseEventsAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.4.5 + * @version 1.4.6 */ /* @@ -38,7 +38,7 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.4.5'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.4.6'); define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.22'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index 1355cf2..d36f42f 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -21,7 +21,13 @@

{$event.name}

-
( Occurring {$event.recurrences.0.from_date.date} - {$event.recurrences.0.to_date.date} + +
+ ( Occurring {$event.recurrences.0.from_date.date} + {if $event.recurrences.0.from_date.date != $event.recurrences.0.to_date.date} + - {$event.recurrences.0.to_date.date} + {/if} + {if $event.recurrences.0.day_of_week.names|@count < 7 && $event.recurrences.0.day_of_week.names|@count > 0 }