From a739d7a2ad5376662bc1a57a4d53104829a514f4 Mon Sep 17 00:00:00 2001 From: laury Date: Fri, 8 Dec 2017 17:41:53 -0500 Subject: [PATCH] Styles for reg list and header, payment overhaul start --- css/front.css | 47 ++++++ views/front/registrations/checkout.html | 82 ++++++++++- views/front/registrations/header.html | 4 +- views/front/registrations/list.html | 152 ++++++++++---------- views/front/registrations/registration.html | 2 +- 5 files changed, 210 insertions(+), 77 deletions(-) diff --git a/css/front.css b/css/front.css index d3b1d76..3b1f303 100644 --- a/css/front.css +++ b/css/front.css @@ -360,3 +360,50 @@ span.glm-error { } } /*}}} */ + + +/* Reg list styles */ +#glm-reg-list .glm-reg-event-item { + padding: 0; + border: 1px solid lightgrey; + overflow: hidden; + border-radius: 4px; + background: -webkit-linear-gradient(top, #f2f2f2 45%, #FFFFFF 100%); + background: -moz-linear-gradient(center top, #f2f2f2 45%, #FFFFFF 100%); + background: -ms-linear-gradient(top, #f2f2f2 45%, #FFFFFF 100%); +} +#glm-reg-list .glm-reg-event-item .glm-reg-list-details-wrapper { + padding: 0 10px; +} +#glm-reg-list .glm-reg-event-item .glm-reg-list-data { + padding: 5px 10px; +} +#glm-reg-list .glm-reg-event-item .glm-reg-list-image-container { + padding: 0; + +} + +/* Reg detail styles */ +#regApp { + +} + +#accountHeader { + background: -webkit-linear-gradient(top, #f2f2f2 45%, #FFFFFF 100%); + background: -moz-linear-gradient(center top, #f2f2f2 45%, #FFFFFF 100%); + background: -ms-linear-gradient(top, #f2f2f2 45%, #FFFFFF 100%); + border: 1px solid lightgrey; + border-radius: 4px; + height: 60px; + margin: 0 auto; + max-width: 1024px; + padding: 10px 20px; +} +#accountHeader .button { + border-radius: 3px; + margin-bottom: 0; +} +#reg_bulletin { + max-width: 1024px; + margin: 10px auto; +} \ No newline at end of file diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html index 286030a..5901fb9 100644 --- a/views/front/registrations/checkout.html +++ b/views/front/registrations/checkout.html @@ -287,7 +287,87 @@

Payment Information

- + + + Currently the 'select' foreach iterates without also dumping the payment method detail div + Either iterate over it once again (as below) or find some way to spit it out outside of the 'select' element + + {foreach $payMethods as $payMethod} + + {$pmname = array_search($payMethod.value, $payMethodsNumb)} + {$pm = $payMethodsNumb.{$pmname}} + {if $payMethods.{$pm}.default} + +
+ {if $pmname == "CompCode"} +
+
+
Enter code:
+
+ +
+
+
+ {else if $pmname == "CreditCard"} + +
+
+
Name on Card:
+
+ +
+
+
+
Card Type:
+
+ +
+
+
+
Card Number:
+
+ +
+
+
+
Card Expiration:
+
+ +
+
+
+
CVV:
+
+ +
+
+
+ {else} +
+

*** {$pmname} ****

+
+ {/if} + {/if} + {/foreach} + the code below is the same, but doesn't utilize a foreach loop + + {$pm = $payMethodsNumb.NoCharge} {if $payMethods.{$pm}.default}
diff --git a/views/front/registrations/header.html b/views/front/registrations/header.html index ef96418..f9572d8 100644 --- a/views/front/registrations/header.html +++ b/views/front/registrations/header.html @@ -2,7 +2,7 @@
{if $loggedIn} Logged in as {$loggedIn.fname} {$loggedIn.lname} - Logout + Logout {else} Login Create an Account @@ -12,7 +12,7 @@ Register for Another Event {/if} {if $page != 'cart'} - Return to Cart + ↵ Return to Cart {/if}  
diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index 2d6f812..c8a75a5 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -1,7 +1,7 @@ {include file='front/registrations/header.html'} {if $reg_bulletin} -
+
{$reg_bulletin}
{/if} @@ -15,94 +15,100 @@

{$event.event_name}

-
- +
+
+ -
- {$lastDate = ''} - {foreach $event.recurrences as $rec} +
+ {$lastDate = ''} + {foreach $event.recurrences as $rec} - {$eDate = $rec.from_date.timestamp|date_format:"%A, %B %e, %Y"} - {if $eDate != $lastDate} - {$lastDate = $eDate} + {$eDate = $rec.from_date.timestamp|date_format:"%A, %B %e, %Y"} + {if $eDate != $lastDate} + {$lastDate = $eDate}
- {if $event.recurrences.0.recurring.value == 1} Occurring {/if} + When: + {if $event.recurrences.0.recurring.value == 1} Occurring {/if} - {$eDate} - {if $rec.from_date.date != $rec.to_date.date} - - {$rec.to_date.timestamp|date_format:"%B %e, %Y"} - {else if $rec.specific_dates} - - {$rec.specific_dates|@end|date_format:"%B %e, %Y"} - {/if} + {$eDate} + {if $rec.from_date.date != $rec.to_date.date} + - {$rec.to_date.timestamp|date_format:"%B %e, %Y"} + {else if $rec.specific_dates} + - {$rec.specific_dates|@end|date_format:"%B %e, %Y"} + {/if} - {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 } - on - {foreach $rec.day_of_week.names as $day} - {if $day == "Thursday"} - {$day|substr:0:4} - {else} - {$day|substr:0:3} - {/if} - {/foreach} + {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 } + on + {foreach $rec.day_of_week.names as $day} + {if $day == "Thursday"} + {$day|substr:0:4} + {else} + {$day|substr:0:3} + {/if} + {/foreach} - {/if} - -
- {/if} - {if isset($event.all_day) && !$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 $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 isset($event.all_day) && !$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 $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} - {/if} +
+ {else} + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} - {/foreach} + {/if} + + {/foreach} -
-
- - - {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 $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}
- {/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} +
+
+ {/if} - -
- {$event.intro} + +
+ + What: + {$event.intro} +
{if $event.image} diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index 84abd58..b4248c4 100644 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -271,7 +271,7 @@ {include file='front/registrations/header.html'} {if $reg_bulletin} -
+
{$reg_bulletin}
{/if} -- 2.17.1