Update from glm event templates

Bringing in changes.

diff --git a/glm-member-db-events/views/front/events/detail.html b/glm-member-db-events/views/front/events/detail.html
index 7e0d8a9..64610bb 100644 (file)
--- a/glm-member-db-events/views/front/events/detail.html
+++ b/glm-member-db-events/views/front/events/detail.html
@@ -59,14 +59,45 @@
                         {/if}
                         <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">
-                                <div><strong>{$event.dates}</strong>{if $expired} <span style="color:red;">(Expired)</span>{/if}</div>
+                                {foreach $event.recurrences as $rec}
+                                    <div>
+                                    <span>
                                 {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"}
+                                        {if $rec.start_time.time == $rec.end_time.time}
+                                            {$rec.start_time.time}
                                     {else}
-                                        {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
+                                            {$rec.start_time.time} - {$rec.end_time.time}
                                     {/if}
                                 {/if}
+                                    </span>
+                                    {if $rec.name && $rec.name != 'Imported'}
+                                        {$rec.name}
+                                    {/if}
+                                    ( Occurring
+                                    {$rec.from_date.timestamp|date_format:"%m/%d/%Y"}
+                                      {if $rec.from_date.date != $rec.to_date.date}
+                                        - {$rec.to_date.timestamp|date_format:"%m/%d/%Y"}
+                                       {else if $rec.specific_dates}
+                                        - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"}
+                                      {/if}
+
+                                    {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
+                                    <span class="agenda-days-of-week">
+                                        on
+                                        {foreach $rec.day_of_week.names as $day}
+                                        {if $day == "Thursday"}
+                                            <span> {$day|substr:0:4} </span>
+                                         {else}
+                                            <span> {$day|substr:0:3} </span>
+                                         {/if}
+                                         {/foreach}
+
+                                    </span>
+                                    {/if}
+                                      )
+                                        {if $expired} <span style="color:red;"> (Expired) </span> {/if}
+                                    </div>
+                                {/foreach}
                             </div>
                             {if $event.hide_address.name == 'No'}
                                 {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)}
@@ -75,7 +106,7 @@
                                     {if $event.locations.address} {$event.locations.address}<br> {/if}
                                     {if $event.locations.city.name}{$event.locations.city.name}{/if}{if $event.locations.state.value}, {$event.locations.state.value} {/if}
                                     {if $event.locations.zip} {$event.locations.zip} {/if}
-                                    {if $event.locations.phone} {$event.locations.phone} {/if}
+                                    {if $event.locations.phone} {apply_filters('glm_associate_phone_filter', $event.locations.phone)} {/if}
                                     </div>
                                 {elseif $event.use_member_location.value || $event.other_ref_dest}
                                     <div id="glm-event-detail-location">
@@ -83,7 +114,7 @@
                                     {if $event.member.addr1} {$event.member.addr1}<br> {/if}
                                     {if $event.member.city}{$event.member.city}{/if}{if $event.member.state.value}, {$event.member.state.value}{/if}
                                     {if $event.member.zip} {$event.member.zip} {/if}
-                                    {if $event.member.phone} {$event.member.phone} {/if}
+                                    {if $event.member.phone} {apply_filters('glm_associate_phone_filter', $event.member.phone)} {/if}
                                     </div>
                                 {/if}
                             {/if}
@@ -101,7 +132,12 @@
                                 {if $event.url}<a href="{$event.url}" target="_blank">{$event.url}</a><br>{/if}
                                 {if $event.contact_name}Contact: {$event.contact_name}<br>{/if}
                                 {if $event.contact_email}Email: <a href="mailto: {$event.contact_email}">{$event.contact_email}</a><br>{/if}
-                                {if $event.contact_phone}<span class="glm-event-detail-contact-phone"><span class="glm-field-title">Phone: </span><span class="glm-field-value">{$event.contact_phone}</span></span><br>{/if}
+                                {if $event.contact_phone}
+                                    <span class="glm-event-detail-contact-phone">
+                                        <span class="glm-field-title">Phone: </span>
+                                        <span class="glm-field-value">{apply_filters('glm_associate_phone_filter', $event.contact_phone)}</span>
+                                    </span><br>
+                                {/if}
                                 {if $event.file1}
                                 <div>File:
                                     <a href="{$filePathUrl}{$event.file1}">{if $event.file1_descr}{$event.file1_descr}{else}{$event.file1}{/if}</a>
@@ -138,8 +174,8 @@
 
         // Replace the phone separation character with whatever is set in the management
         {if $settings.phone_infix}
-            var processedPhone = $('.glm-event-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}');
-            $('.glm-event-detail-contact-phone .glm-field-value').text(processedPhone);
+            //var processedPhone = $('.glm-event-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}');
+            //$('.glm-event-detail-contact-phone .glm-field-value').text(processedPhone);
         {/if}
     });
 </script>