From 2b604c1690756a595e49e732f4f14e6760ecebe6 Mon Sep 17 00:00:00 2001 From: laury Date: Wed, 13 Dec 2017 11:43:42 -0500 Subject: [PATCH] re-do frontRegApp, checkout, ids, classes, glm-grid to Found-grid - Changes I made in frontRegApp.js were made in that compiled file rather than the individual files. Will make a gulp commit after this commit. - Checkout page is changed so summary appears below billing/shipping sections in small view, but on the right in medium-up - A bunch of IDs and classes added, changed, or removed, to make for a more usable markup - CSS changes.. all over - Removed references of glm-grid in registration.html, Foundation grid now used instead. --- css/front.css | 52 ++-- js/frontRegApp.js | 2 +- js/views/front/regRequestRegistrant.js | 13 +- js/views/front/regTime.js | 2 +- js/views/front/registrantForm.js | 4 +- views/front/registrations/cart.html | 4 +- views/front/registrations/checkout.html | 285 ++++++++++---------- views/front/registrations/registration.html | 247 ++++++++--------- views/front/registrations/summary.html | 4 +- 9 files changed, 317 insertions(+), 296 deletions(-) diff --git a/css/front.css b/css/front.css index d87f096..fa0d1a2 100644 --- a/css/front.css +++ b/css/front.css @@ -2,37 +2,36 @@ /*{{{ Temp replacement for glm-row without max-width and other checkout form tampering */ @media(max-width: 641px){ - #regApp{ + #regApp { padding: 0; } - .glm-reg-classes{ + .glm-reg-classes { padding: 0; } - .glm-reg-image-container{ + .glm-reg-image-container { padding: 0; margin-bottom: 10px; } - #glm-reg-event-name{ + #glm-reg-event-name { padding: 0; line-height: 1.2; } - .glm-reg-account-info,.glm-reg-billing-info{ + .glm-reg-account-info,.glm-reg-billing-info { padding: 0; } } .glm-reg-event-terms{ padding: 0; } -.glm-reg-event-profile-details{ - padding-left: 0; +.glm-reg-event-profile-details { } -.glm-reg-image-container{ - padding: 0; +.glm-reg-image-container { + padding: 0 10px 0 0; max-height: 350px; overflow: hidden; text-align: center; } -.glm-reg-map{ +.glm-reg-map { width: 100%; margin: 0; height: 250px; @@ -42,14 +41,14 @@ background-size: cover; position: relative; } -#glm-reg-detail-map-button{ +#glm-reg-detail-map-button { height: 35px; padding: 5px 7px; width: 171px; float: left; border-right: 1px solid white; } -#glm-reg-detail-directions-button{ +#glm-reg-detail-directions-button { height: 35px; padding: 5px 7px; width: 170px; @@ -103,7 +102,7 @@ } .glm-reg-class-container{ - padding: 0; + } .glm-reg-row { clear: both; @@ -111,7 +110,6 @@ margin-right: auto; width: 100%; min-height: 1.5rem; - white-space: nowrap; } .glm-reg-indent-1 { padding-left: .5rem; @@ -152,8 +150,8 @@ clear: both; border: solid 1px black; background-color: white; - margin-top: 1rem; - margin-bottom: 1rem; + margin: 1rem auto; + max-width: 64rem; font-size: 0.875rem; } @@ -183,6 +181,7 @@ border: 1px solid black; /* padding: 10px; */ margin: 1rem 0; + float: left; } .glm-reg-event-item h2 { font-size: 1.5rem; @@ -339,9 +338,8 @@ label.registrant-label { .reg-class-count { float: right; } -.glm-reg-event-profile{ +.glm-reg-event-profile { margin-bottom: 25px; - padding: 0; } .reg-class-accounts { @@ -354,10 +352,23 @@ label.registrant-label { /*}}} End Event Registration Page */ /*{{{ New Attendee Form */ +.reg-class-times > div { + margin-bottom: 20px; +} +.new-reg { + margin-bottom: 20px; +} .new-reg, .reg-edit-form { - padding: 0 5px; + padding: 10px; border: solid 1px black; background-color: white; + max-width: 500px; +} +.new-reg .button.add-new-registrant { + margin-bottom: 0; +} +.glm-add-new-account { + margin-bottom: 0; } .new-reg h4 { font-size: 22px; @@ -496,7 +507,6 @@ span.glm-error { } #glm-reg-list .glm-reg-event-item .glm-reg-list-image-container { padding: 0; - } /* Reg detail styles */ @@ -532,9 +542,11 @@ span.glm-error { } #regApp .reg-edit-form .update-registrant-button-container .update-registrant { float: left; + margin-bottom: 0; } #regApp .reg-edit-form .update-registrant-button-container .update-registrant.cancel { float: right; + padding: 10px; } #accountHeader { background: -webkit-linear-gradient(top, #f2f2f2 45%, #FFFFFF 100%); diff --git a/js/frontRegApp.js b/js/frontRegApp.js index 2e53861..c9c7c78 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -889,7 +889,7 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({ var newId = 0; app.Views.Front.RegTime = Backbone.View.extend({ tagName: 'div', - + className: 'glm-row', template: _.template( jQuery('#regTime-template').html() ), diff --git a/js/views/front/regRequestRegistrant.js b/js/views/front/regRequestRegistrant.js index 81c1ec6..c1cb305 100644 --- a/js/views/front/regRequestRegistrant.js +++ b/js/views/front/regRequestRegistrant.js @@ -76,11 +76,16 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({ // show the edit form editRegistrant: function(){ - if ( app.checkForEditLock() === true ) { - return; + if ( !this.$('.reg-edit-form').is(":visible") ) { + if ( app.checkForEditLock() === true ) { + return; + } + this.$('.reg-edit-form').show(); + app.regEventLock = true; + } else { + this.$('.reg-edit-form').hide(); + app.regEventLock = false; } - this.$('.reg-edit-form').show(); - app.regEventLock = true; }, // render the view diff --git a/js/views/front/regTime.js b/js/views/front/regTime.js index e1e1660..609e0a0 100644 --- a/js/views/front/regTime.js +++ b/js/views/front/regTime.js @@ -3,7 +3,7 @@ var newId = 0; app.Views.Front.RegTime = Backbone.View.extend({ tagName: 'div', - className: 'glm-row', + className: 'reg-class-time', template: _.template( jQuery('#regTime-template').html() ), diff --git a/js/views/front/registrantForm.js b/js/views/front/registrantForm.js index c65f1b5..8a60544 100644 --- a/js/views/front/registrantForm.js +++ b/js/views/front/registrantForm.js @@ -3,9 +3,9 @@ app.Views.Front.RegistrantForm = Backbone.View.extend({ className: function(){ if ( app.timeSpecific === true ) { - return 'new-reg'; + return 'new-reg new-reg-time'; } else { - return 'new-reg-notime'; + return 'new-reg new-reg-notime'; } }, diff --git a/views/front/registrations/cart.html b/views/front/registrations/cart.html index 302e50a..16f3716 100644 --- a/views/front/registrations/cart.html +++ b/views/front/registrations/cart.html @@ -9,7 +9,7 @@ {/if}--> {if $cartPageText} -
+
{$cartPageText}
{/if} @@ -25,7 +25,7 @@
{/if} -
+
Request ID: {$cartId}

Selected Registrations

diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html index e1d2772..dbbfbc0 100644 --- a/views/front/registrations/checkout.html +++ b/views/front/registrations/checkout.html @@ -1,13 +1,13 @@ {apply_filters('glm_members_registrations_header', 'accountHeader')} {if $checkoutPageText} -
+
{$checkoutPageText}
{/if} {if $haveMessages} -
+
Please Note:
    {foreach $messages as $m} @@ -18,7 +18,7 @@ {/if} {if $haveCart} -
    + @@ -35,156 +35,159 @@
-