From: Anthony Talarico Date: Wed, 20 Dec 2017 15:38:05 +0000 (-0500) Subject: adding icons and new data to the event reg list view X-Git-Tag: v1.0.0^2~158 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=031ad3d58e94b23989f2368906f6888e344ee699;p=WP-Plugins%2Fglm-member-db-registrations.git adding icons and new data to the event reg list view adding cost and time to the event reg list, adding icons instead of text --- diff --git a/css/front.css b/css/front.css index e6994bc..28a2928 100644 --- a/css/front.css +++ b/css/front.css @@ -47,6 +47,37 @@ height: 24px; left: -26px; } +.glm-reg-list-dates::before{ + content: ""; + background-image: url(../assets/events/calendar-icon-24x24.png); + background-height: 24px; + background-width: 24px; + position: absolute; + width: 24px; + height: 24px; + left: -12px; +} +.glm-reg-cost::before{ + /* top: 0px; */ + content: ""; + background-image: url(../assets/events/cost-icon-24x24.png); + background-height: 24px; + background-width: 24px; + position: absolute; + width: 24px; + height: 24px; + left: -26px; +} +.glm-reg-list-cost::before{ + content: ""; + background-image: url(../assets/events/cost-icon-24x24.png); + background-height: 24px; + background-width: 24px; + position: absolute; + width: 24px; + height: 24px; + left: -12px; +} .glm-reg-time::before{ content: ""; background-image: url(../assets/events/time-icon-24x24.png); @@ -57,6 +88,16 @@ height: 24px; left: -26px; } +.glm-reg-list-times::before{ + content: ""; + background-image: url(../assets/events/time-icon-24x24.png); + background-height: 24px; + background-width: 24px; + position: absolute; + width: 24px; + height: 24px; + left: -12px; +} .glm-reg-event-profile-map-container{ padding: 0; margin-left: 15px; @@ -72,6 +113,17 @@ height: 24px; left: -26px; } +.glm-reg-list-location::before{ + content: ""; + background-image: url(../assets/events/location-icon-24x24.png); + background-height: 24px; + background-width: 24px; + position: absolute; + width: 24px; + height: 24px; + left: -12px; + +} .glm-reg-event-profile-details{ margin-bottom: 15px; } @@ -161,6 +213,7 @@ } .glm-reg-list-details{ padding: 0; + margin: 0 0 5px 10px; } .glm-reg-list-data{ padding: 0; diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index 4088592..b715458 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -16,6 +16,13 @@ {/if} {if $haveRegEvents} {foreach $regEvents as $event} + {assign var=first value = $event.times|@key} + {assign var=first_date value = $event.times.$first.start_time.timestamp} + {assign var=last value = $event.reg_time|@end} + {assign var=last_date value = $event.end_datetime} + {assign var=time_specific value = $event.time_specific.value} + +
@@ -29,6 +36,7 @@
-->
+ {$lastDate = ''} {foreach $event.recurrences as $rec} @@ -36,28 +44,31 @@ {if $eDate != $lastDate} {$lastDate = $eDate} -
- When: - {if $event.recurrences.0.recurring.value == 1} Occurring {/if} + +
+ - {$eDate} + {if $rec.from_date.timestamp|date_format:"%Y" != $rec.to_date.timestamp|date_format:"%Y"} + {$eDate}, {$rec.from_date.timestamp|date_format:"%Y"} + {else} + {$eDate} + {/if} + {if $rec.from_date.date != $rec.to_date.date} - {if $rec.from_date.timestamp|date_format:"%Y" != $rec.to_date.date.timestamp|date_format:"%Y"} - - {$rec.to_date.timestamp|date_format:"%B %e"}, + {if $rec.from_date.timestamp|date_format:"%Y" != $rec.to_date.timestamp|date_format:"%Y"} + - {$rec.to_date.timestamp|date_format:"%B %e, %Y"} {else} - - {$rec.to_date.timestamp|date_format:"%B %e"} + - {$rec.to_date.timestamp|date_format:"%B %e, %Y"} {/if} {else if $rec.specific_dates} {if $rec.from_date.timestamp|date_format:"%Y" != $rec.specific_dates|@end|date_format:"%Y"} - - {$rec.specific_dates|@end|date_format:"%B %e"}, + - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}, {else} - - {$rec.specific_dates|@end|date_format:"%B %e"} + - {$rec.specific_dates|@end|date_format:"%B %e, %Y"} {/if} - {else} - , + {/if} - {$rec.from_date.timestamp|date_format:"%Y"} - +
{/if} - {if isset($event.all_day) && !$event.all_day} -
+ {if isset($rec.all_day) && !$rec.all_day.value} +
{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} @@ -82,49 +92,45 @@ {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} -
{else} + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} {/if} - {/foreach} + + {if $event.eventCost} + +
+ {$event.eventCost} +
+ {/if} + {if $event.hide_address.name == 'No'} +
+ {if !$event.use_member_location.value && isset($event.locations) && ($event.locations.name || $event.locations.address)} + {if $event.locations.name}{$event.locations.name}
{/if} + {/if} +
+ {/if}
- - {if $event.hide_address.name == 'No'} -
- -
- Where: - {if !$event.use_member_location.value && isset($event.locations) && ($event.locations.name || $event.locations.address)} - {if $event.locations.name}{$event.locations.name}
{/if} - {if $event.locations.address} {$event.locations.address}
{/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} {apply_filters('glm_associate_phone_filter', $event.locations.phone)} {/if} - {elseif isset($event.member) && $event.use_member_location.value} - {if $event.member.member} {$event.member.member}
{/if} - {if $event.member.addr1} {$event.member.addr1}
{/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} {apply_filters('glm_associate_phone_filter', $event.member.phone)} {/if} - {/if} + + +
- - What: {$event.intro}