adding location data to the frontpage events widget template

the new eventFrontPageCity template is using the city name in the widget and the location name as a fallback

diff --git a/css/front.css b/css/front.css
index d96c490..7beb283 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -558,6 +558,12 @@ body #glm-event-detail-takeback-mini .glm-member-db-takeback-mini {
 #glm-events-search-form select#glm-event-category {
     width: 85%;
 }
+.glm-events-location-container{
+    float: right;
+}
+.glm-events-time-container{
+    float: left;
+}
 /* 
  * Search form styles end
  */

diff --git a/views/front/events/eventsFrontPageCity.html b/views/front/events/eventsFrontPageCity.html
index 8ff6698..c66df23 100644 (file)
--- a/views/front/events/eventsFrontPageCity.html
+++ b/views/front/events/eventsFrontPageCity.html
@@ -1,4 +1,4 @@
-<div id="glm-events-frontpage-wrapper">
+<div id="glm-events-frontpage-wrapper" class="glm-events-frontpage-wrapper">
     {foreach $eventsByDate as $date => $key}
         <div class="glm-events-frontpage-day">
             {$date|date_format:"%B %e"}
@@ -6,7 +6,7 @@
         </div>
         {foreach $key as $events}
             {foreach $events as $event}
-            <div class="glm-events-frontpage-event-container">
+            <div class="glm-events-frontpage-event-container{if !$event.image} glm-event-no-image{/if}">
                 <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?{else}?eventId={$event.id}&{/if}glm_event_from={$fromDate|unescape:"html"}">
                    {if $event.image}
                     <div class="glm-events-frontpage-event-image"
@@ -20,7 +20,34 @@
                     </div>
                 </a>
                 <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-dates">
-                    {$event.dates}
+                    <span class="glm-events-time-container">
+                        {$eventDateTime = $event.starting_date|date_format:"%I:%M %P"}
+                        {foreach $event.recurrences as $rec}
+                            {$start_time = $rec.start_time.time}
+                            {if $start_time == $eventDateTime}
+                                {if ($rec.from_date.timestamp == $rec.to_date.timestamp && $rec.from_date.timestamp == $date) or ($date <= $rec.to_date.timestamp && $date >= $rec.from_date.timestamp )}
+                                    {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"}
+                                        {else}
+                                            {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
+                                        {/if}
+                                    {else}
+                                        All Day
+                                    {/if}
+                                {/if}
+                            {/if}
+                        {/foreach}
+                    </span>
+                    <span class="glm-events-location-container">
+                        {if $event.locations.city.name}
+                            {$event.locations.city.name}
+                        {else}
+                            {$event.locations.name}
+                        {/if}
+                    </span>
+                    
+                    
                 </div>
                 <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-content">
                     {$event.intro}