From: Steve Sutton Date: Thu, 26 Oct 2017 12:30:26 +0000 (-0400) Subject: Updating detail template for times output. X-Git-Tag: v1.6.70^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6cff9aa4983328620e4cceddb6be919ef81d8610;p=WP-Plugins%2Fglm-member-db-events.git Updating detail template for times output. If there's no time to output then don't display the glm-event-times div. Re-arranging some of the markup to keep the expired and name part out of that if statement for the all_day. --- diff --git a/index.php b/index.php index 8e3b6df..5b0206e 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.6.69 + * Version: 1.6.70 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ @@ -22,7 +22,7 @@ * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.6.69 + * @version 1.6.70 */ @@ -47,7 +47,7 @@ if (!defined('ABSPATH')) { * 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.6.69'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.70'); define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.4'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/readme.txt b/readme.txt index bd88b2e..2cfd84f 100644 --- a/readme.txt +++ b/readme.txt @@ -25,6 +25,10 @@ e.g. 1. Activate the plugin through the 'Plugins' menu in WordPress == Changelog == += 1.6.70 = +* Fix time output for events with no time. Doesn't display the glm-event-times + div. + = 1.6.69 = * Fix event detail page description output. * Fix output if more than one time schedule. Show's date only once if it diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 5c9d822..ce3474d 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -95,30 +95,28 @@ {/if} -
- - - - - {if !$event.all_day} - + {if !$event.all_day} +
+ + {if $rec.start_time.time == $rec.end_time.time || $rec.start_time_only.value} {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} {else} {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} - {$rec.end_time.time|strtotime|date_format:"%l:%M %P"} {/if} - {/if} - + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} + {if $expired} (Expired) {/if} + +
+ {else} {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} - - - - {if $expired} (Expired) {/if} -
+ {/if} {/foreach} {if $event.hide_address.name == 'No'}