fixing front page events widget date formats

diff --git a/glm-member-db-events/views/front/events/eventsFeed.html b/glm-member-db-events/views/front/events/eventsFeed.html
index 6120863..5f39578 100644 (file)
--- a/glm-member-db-events/views/front/events/eventsFeed.html
+++ b/glm-member-db-events/views/front/events/eventsFeed.html
@@ -7,18 +7,17 @@
                     <div class="event">
                         <div class="event-detail">
                             <a class="front-event-link" href="{$siteBaseUrl}event-detail/{$event.name_slug}/"><span class="front-event-title">{$event.name}</span></a>
-
-
                             {if $event.recurrences.0.from_date.timestamp|date_format:"%Y" != $event.recurrences.0.to_date.timestamp|date_format:"%Y"}
-                            <span class="date-time">{$event.recurrences.0.from_date.timestamp|date_format:"%b %e, %Y"}</span>
+                                <span class="date-time">{$event.recurrences.0.from_date.timestamp|date_format:"%b %e, %Y"}</span>
+                            {elseif $event.recurrences.0.to_date.timestamp == $event.recurrences.0.from_date.timestamp}
+                                <span class="date-time">{$event.recurrences.0.from_date.timestamp|date_format:"%b %e, %Y"}</span>
                             {else}
-                            <span class="date-time">{$event.recurrences.0.from_date.timestamp|date_format:"%b %e"}</span>
+                                <span class="date-time">{$event.recurrences.0.from_date.timestamp|date_format:"%b %e"}</span>
                             {/if}
                             
                             {if $event.recurrences.0.to_date.timestamp != $event.recurrences.0.from_date.timestamp}
                                 <span class="date-time"> - {$event.recurrences.0.to_date.timestamp|date_format:"%b %e, %Y"} </span> 
                             {/if}
-                        
                         </div>
                     </div>
                 </div>

diff --git a/parts/blog-feed-front.php b/parts/blog-feed-front.php
index cd88570..99bc42f 100644 (file)
--- a/parts/blog-feed-front.php
+++ b/parts/blog-feed-front.php
@@ -93,11 +93,11 @@
     <h2 class="upcoming-events-title">Upcoming Events</h2>
     <div id="events-widget-wrapper">
         <h4 class="events-widget-title">Parents</h4>
-        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="1"]');?>
+        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="1" group_by_day="false"]');?>
         <h4 class="events-widget-title">Students</h4>
-        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="2"]');?>
+        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="2" group_by_day="false"]');?>
         <h4 class="events-widget-title">Professional Learning</h4>
-        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="3"]');?>
+        <?php echo do_shortcode('[glm-members-event-list template="eventsFeed.html" category="3" group_by_day="false"]');?>
     </div>
     <a href="<?php echo get_permalink(324); ?>" class="button view-all-events">View All Events</a>
 </div>
\ No newline at end of file