From 3616d99b67a129619923c531a8e149ba8da7d6be Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 12 Oct 2017 14:44:53 -0400
Subject: [PATCH] Update the time date display for event profile pages.

Use the same date output format that was done on greatlakescfa website.
---
 css/front.css                  | 25 ++++++++++++---
 index.php                      |  6 ++--
 views/front/events/detail.html | 57 ++++++++++++++++++++--------------
 3 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/css/front.css b/css/front.css
index ef3be29..fef27fb 100644
--- a/css/front.css
+++ b/css/front.css
@@ -166,7 +166,24 @@ input[name='contact_fname'], input[name='contact_lname']{
 #glm-event-view-select{
     width: 125px;
 }
-#glm-event-detail-dates:before {
+.glm-event-date:before {
+    /* top: 0px; */
+    content: "";
+    background-image: url(../assets/calendar-icon-24x24.png);
+    background-height: 24px;
+    background-width: 24px;
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    left: -36px;
+}
+.glm-event-date {
+    margin-bottom: 15px;
+}
+.glm-event-times {
+    margin-bottom: 15px;
+}
+.glm-event-times:before {
     content: "";
     background-image: url("../assets/time-icon-24x24.png");
     background-height: 24px;
@@ -174,7 +191,7 @@ input[name='contact_fname'], input[name='contact_lname']{
     position: absolute;
     width: 24px;
     height: 24px;
-    top: 6px;
+    /* top: 6px; */
     left: -35px;
 }
 #glm-event-detail-location {
@@ -397,7 +414,7 @@ a.fc-time-grid-event.fc-v-event {
     color: black;
 }
 .month-nav-container{
-    
+
 }
 
 .month-nav, .year-nav{
@@ -409,7 +426,7 @@ a.fc-time-grid-event.fc-v-event {
 .month-nav:hover, .year-nav:hover{
     cursor: pointer;
     border: 1px solid black;
-    
+
 }
 #event-date-toggle{
     width: 130px;
diff --git a/index.php b/index.php
index 4735cb5..c3bd161 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.66
+ * Version: 1.6.67
 
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
@@ -22,7 +22,7 @@
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
 
- * @version 1.6.66
+ * @version 1.6.67
 
  */
 
@@ -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.66');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.67');
 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/views/front/events/detail.html b/views/front/events/detail.html
index 71067bb..aa6212f 100644
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -60,33 +60,21 @@
                         <div class="small-12 medium-{if $event.locations || $event.use_member_location.value || $event.other_ref_dest}7{else}12{/if} column">
                             <div id="glm-event-detail-dates">
                                 {foreach $event.recurrences as $rec}
-                                    <div>
-                                    <span>
-                                    {if !$event.all_day}
+                                    <div class="glm-event-date">
+                                        <span class="date-tag"></span>
+                                        <span class="glm-date-display">
 
-                                        <strong>
-                                            {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}
-                                        </strong>
-                                    {/if}
-                                    </span>
-                                    {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' }
-                                        {$rec.name}
-                                    {/if}
-                                    
-                                    ( {if $event.recurrences.0.recurring.value == 1} Occurring {/if}
-                                    
-                                    
-                                    {$rec.from_date.timestamp|date_format:"%m/%d/%Y"}
+                                    {if $event.recurrences.0.recurring.value == 1} Occurring {/if}
+
+                                    {$rec.from_date.timestamp|date_format:"%A, %B %e, %Y"}
                                       {if $rec.from_date.date != $rec.to_date.date}
-                                        - {$rec.to_date.timestamp|date_format:"%m/%d/%Y"}
+                                        - {$rec.to_date.timestamp|date_format:"%B %e, %Y"}
                                        {else if $rec.specific_dates}
-                                        - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"}
+                                        - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}
                                       {/if}
 
+                                        </span>
+
                                     {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
                                     <span class="agenda-days-of-week">
                                         on
@@ -100,7 +88,30 @@
 
                                     </span>
                                     {/if}
-                                      )
+
+                                    </div>
+                                    <div class="glm-event-times">
+
+                                        <span class="time-tag"></span>
+
+                                    <span>
+                                    {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}
+                                    </span>
+                                    {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' }
+                                        {$rec.name}
+                                    {/if}
+
+
+
+
+
                                         {if $expired} <span style="color:red;"> (Expired) </span> {/if}
                                     </div>
                                 {/foreach}
-- 
2.17.1