Update to event reg front end.
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 15:30:59 +0000 (11:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 15:30:59 +0000 (11:30 -0400)
Remove the Extra Event Registration Title from the event reg detail page.
Collapse the Event Detail part and have a Click to view event detail link or button.
Give ability to Edit email for an attendee when editing.
Update the Steps at the top to 4 steps
Add Account Page - Require email and fname lname, email and password.

css/front.css
js/frontRegApp.js
js/views/front/regRequestRegistrant.js
models/admin/ajax/regFront/registrant.php
views/front/registrations/account.html
views/front/registrations/cart.html
views/front/registrations/checkout.html
views/front/registrations/list.html
views/front/registrations/login.html
views/front/registrations/register.html
views/front/registrations/registration.html

index d014c09..650ed58 100644 (file)
@@ -12,7 +12,7 @@
    background-color: rgba(66,162,208, .1);
 /*   float: left;*/
 }
-    
+
 .glm-reg-event-profile-details {
 }
 .reg-cart-summary-edit{
@@ -1220,7 +1220,7 @@ hr.glm-reg-class-separator{
   }
   .progressbar li {
       list-style-type: none;
-      width: 33%;
+      width: 25%;
       float: left;
       font-size: 14px;
       position: relative;
index 7bbdc4e..e8ca491 100644 (file)
@@ -786,6 +786,12 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
         var state   = ( this.$('.reg_state').val() ) ? this.$('.reg_state').val().trim() : '';
         var zip     = this.$('.reg_zip').val().trim();
         var country = ( this.$('.reg_country').val() ) ? this.$('.reg_country').val().trim(): '';
+        var isValidEmail = app.isValidEmail( email );
+        if ( !isValidEmail ) {
+            alert( 'Email must be valid' );
+            this.$('.reg_email').val('');
+            return;
+        }
         if ( this.$('#reg-time-' + modelId).length ) {
             var rTime = this.$('#reg-time-' + modelId).val().trim();
         } else {
@@ -810,6 +816,7 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
             reg_class: this.model.get('reg_class'),
             fname: fname,
             lname: lname,
+            email: email,
             addr1: addr1,
             addr2: addr2,
             city: city,
index bb13ba6..cebbc59 100644 (file)
@@ -40,6 +40,12 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
         var state   = ( this.$('.reg_state').val() ) ? this.$('.reg_state').val().trim() : '';
         var zip     = this.$('.reg_zip').val().trim();
         var country = ( this.$('.reg_country').val() ) ? this.$('.reg_country').val().trim(): '';
+        var isValidEmail = app.isValidEmail( email );
+        if ( !isValidEmail ) {
+            alert( 'Email must be valid' );
+            this.$('.reg_email').val('');
+            return;
+        }
         if ( this.$('#reg-time-' + modelId).length ) {
             var rTime = this.$('#reg-time-' + modelId).val().trim();
         } else {
@@ -64,6 +70,7 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
             reg_class: this.model.get('reg_class'),
             fname: fname,
             lname: lname,
+            email: email,
             addr1: addr1,
             addr2: addr2,
             city: city,
index cf20ec7..3365491 100644 (file)
@@ -385,6 +385,7 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
                     $accountData = array(
                         'fname'   => $modelData['fname'],
                         'lname'   => $modelData['lname'],
+                        'email'   => $modelData['email'],
                         'addr1'   => $modelData['addr1'],
                         'addr2'   => $modelData['addr2'],
                         'city'    => $modelData['city'],
@@ -395,6 +396,7 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
                     $accountDataFormat = array(
                         '%s', // fname
                         '%s', // lname
+                        '%s', // email
                         '%s', // addr1
                         '%s', // addr2
                         '%s', // city
index 452ca50..115c39c 100644 (file)
@@ -25,7 +25,7 @@ Edit/create Account
                         <div class="glm-large-3 glm-columns glm-reg-nowrap">E-Mail Address:</div>
                         <div class="glm-large-9 glm-columns">{$regAccount.fieldData.email}</div>
                     </div>
-  {/if}                    
+  {/if}
                     <div class="glm-reg-row">
                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.fname} glm-reg-required{/if}">First Name:</div>
                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.fname} glm-reg-fail{/if}"><input type="text" name="fname" value="{$regAccount.fieldData.fname}"{if $regAccount.fieldRequired.fname} required{/if}></div>
@@ -147,7 +147,7 @@ Edit/create Account
                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.bill_fax} glm-reg-fail{/if}"><input type="text" name="bill_fax" value="{$regAccount.fieldData.bill_fax}"{if $regAccount.fieldRequired.fax} required{/if}></div>
                     </div>
                 </div>
-           </div>     
+           </div>
            <div class="glm-reg-row">
                 <div class="glm-large-6 glm-columns">
                     <h4>Additional Contact Information</h4>
@@ -209,10 +209,10 @@ Edit/create Account
                 <div class="glm-large-6 glm-columns"><div class="glm-reg-row"><div class="glm-large-12 glm-columns"></div></div></div>
             </div>
         </div>
-        
+
         <div style="white-space; nowrap; clear: all;">
             <span class="glm-reg-warning"><input type="submit" name="Update Account Information" class="button tiny">
         </div>
-        
+
     </form>
-    
\ No newline at end of file
+
index 8ea2420..dc1f67c 100644 (file)
 <div class="row progress-row">
     <div class="progress-container">
         <ul class="progressbar">
-          <li>{$terms.reg_term_register_cap}</li>
-          <li class="active">View Cart</li>
-          <li>Checkout</li>
+            <li>Select {$terms.reg_term_event_cap}</li>
+            <li>{$terms.reg_term_register_cap}</li>
+            <li class="active">View Cart</li>
+            <li>Checkout</li>
         </ul>
     </div>
 </div>
@@ -56,7 +57,7 @@
 
     <div id="glm-cart-comp-codes" class="glm-row" style="white-space: nowrap; line-height: 1rem;">
         <form href="{$regUrl}?page=cart" method="post">
-            If you have a "Comp Code", please enter it here: 
+            If you have a "Comp Code", please enter it here:
             <input type="text" name="regPaymentCode" style="width: 10rem; display: inline;">
             <input type="submit" class="button button-secondary glm-button" style="font-size: .8rem;" name="applyPaymentCode" value="{$terms.reg_term_button_apply_comp_code}">
         </form>
             </p>
         {/if}
     </div>
-    
+
     {assign var="summaryType" value="cart"}
     {include file='front/registrations/cartSummary.html'}
-    
-    
+
+
   {if !$haveCart || !$cart.haveEvents}
     <div>
         <div class="glm-reg-warning">You have not yet submitted your {$terms.reg_term_registration}. See above notes! <img src="{$assetUrl}/fingerUpRed.svg" style="height: 2em;"></div>
   {else}
     <div id="glm-cart-checkout-button" class="glm-right">
     {if $settings.reg_show_navigation_aids}
-        <div class="glm-reg-warning">You have not yet submitted your {$terms.reg_term_registration}! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> 
+        <div class="glm-reg-warning">You have not yet submitted your {$terms.reg_term_registration}! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;">
     {/if}
         <a href="{$regUrl}?page=checkout" class="glm-reg-checkout button glm-reg-button">{$terms.reg_term_button_cart_page_continue}</a></div>
     </div>
   {/if}
-    
+
 
 <script>
 jQuery(function($){
 
     // Registration not submitted Dialog actions
-    {if $settings.reg_not_submitted_dialog}    
+    {if $settings.reg_not_submitted_dialog}
 
       var notSubmittedTimer;
       notSubmittedDialog = $( "#regNotSubmittedDialog" ).dialog({
@@ -100,7 +101,7 @@ jQuery(function($){
           open: function(event,ui) {
               clearInterval(notSubmittedTimer);
           },
-          close: function(event,ui) { 
+          close: function(event,ui) {
               resetNotSubmittedTimer();
           },
           buttons: [
@@ -133,8 +134,8 @@ jQuery(function($){
       });
       startNotSubmittedTimer();
 
-    {/if}  
-    
+    {/if}
+
 });
 </script>
 
index 7c0b687..b0f289b 100755 (executable)
@@ -4,9 +4,10 @@
     <div class="row progress-row">
         <div class="progress-container columns">
             <ul class="progressbar">
-              <li>{$terms.reg_term_register_cap}</li>
-              <li >View Cart</li>
-              <li class="active">Checkout</li>
+                <li>Select {$terms.reg_term_event_cap}</li>
+                <li>{$terms.reg_term_register_cap}</li>
+                <li >View Cart</li>
+                <li class="active">Checkout</li>
             </ul>
         </div>
     </div>
         <div class="glm-center" style="border: 1px solid black; padding: 10px; margin: 20px">
             <span class="glm-reg-warning">NOTE: Your {$terms.reg_term_registration} is not complete until you click the "{$terms.reg_term_button_checkout_page_submit}" button at the bottom of this page.</span> <img src="{$assetUrl}/fingerDownRed.svg" style="height: 2em;">
         </div>
-    {/if}                
+    {/if}
         <div id="glm-reg-checkout-form">
 <!--
             <div>
                 <h3 class="glm-left" style="clear: none;">Checkout</h3>
             </div>-->
             <div class="glm-row">
-                <div class="glm-large-6 glm-small-12 glm-columns">                    
-                    <div class="glm-reg-billing-info">                    
+                <div class="glm-large-6 glm-small-12 glm-columns">
+                    <div class="glm-reg-billing-info">
                         <div class="row">
                             <div class="columns medium-8 small-12 text-left glm-reg-required">
                             <h4>Billing Information</h4>
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.email} glm-reg-required{/if}">E-Mail Address{if $regAccount.fieldRequired.email} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.email} glm-reg-fail{/if}"><input type="text" name="email" value="{$regAccount.fieldData.email}"{if $regAccount.fieldRequired.email} required{/if}></div>
                         </div>
-                        
+
                     </div>
                 </div>
                 <div class="glm-small-12 glm-large-6 glm-columns glm-reg-cart-summary">
                          <h4 id="cart-summary">{$terms.reg_term_registration_cap} Summary</h4>
-    
+
                         {assign var="summaryType" value="checkout"}
                         {include file='front/registrations/cartSummary.html'}
                 </div>
 
             {if $pmName == "NoCharge"}
                 {* Nothing here for now *}
-            {else if $pmName == "OnArrival"} 
+            {else if $pmName == "OnArrival"}
                 {* Nothing here for now *}
-            {else if $pmName == "Cash"} 
+            {else if $pmName == "Cash"}
                 {* Nothing here for now *}
-            {else if $pmName == "Check"} 
+            {else if $pmName == "Check"}
                         <div class="payMethod_{$pmNumb} payMethodSelection glm-hidden">
                             <div class="glm-reg-row">
                                 <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_name} glm-reg-required{/if}">Name on Check{if $regAccount.fieldRequired.cc_name} *{/if}</div>
                             </div>
                         </div>
             {else if $pmName == "CreditCard"}
-            
+
                         <div class="payMethod_{$pmNumb} payMethodSelection glm-hidden">
                 {if $settings.reg_proc_methods == 2 && $regAccount.fieldData.customer_profile_id != ''} {* If using Authorize.net and have a stored credit card profile *}
                             <div class="glm-reg-row">
                             <div class="glm-reg-row">
                                 <div class="glm-reg-checkout-field-data glm-small-5 glm-large-3 glm-columns">
                                     <p>{$settings.reg_authorize_net_merchant_seal|unescape}</p>
-                                </div>                        
+                                </div>
                                 <div class="glm-reg-checkout-field-data glm-small-7 glm-large-9 glm-columns">
-                                    <br>Your credit card will be processed through Authorize.Net. Click the image to the left to verify our security.                                      
+                                    <br>Your credit card will be processed through Authorize.Net. Click the image to the left to verify our security.
                                </div>
-                            </div>                        
+                            </div>
                     {/if}
                 {/if}
                         </div>
                                 </div>
                             </div>
                         </div>
-                                    
+
             {else}
                         <div class="payMethod_{$pmNumb} payMethodSelection glm-hidden">
 
                         </div>
             {/if}
-        
+
     {/foreach}
-                    
+
                 </div>
   {/if} {* / total charges > 0 *}
             </div>
     {if apply_filters('glm-members-customfields-plugin-active', false)}
       {foreach $cart.events as $event}
-        {assign var="fid" value="glm_reg_customfields_reg_event_`$event.reg_event`"} {* assemble the uid with the current event ID *}      
+        {assign var="fid" value="glm_reg_customfields_reg_event_`$event.reg_event`"} {* assemble the uid with the current event ID *}
         {if apply_filters('glm-members-customfields-have-fields', false, $fid)}            <div class="glm-row">
                 <div class="glm-large-6 glm-small-12 glm-columns">
                     <h4>Additional information requested:</h4>
                         <h4>Terms and Conditions</h4>
                         You <span class="glm-reg-required">must check</span> the boxes below to confirm that you agree to the Terms and Conditions for each {$terms.reg_term_event}.
                     </div>
-        {if $haveGlobalTerms}                    
+        {if $haveGlobalTerms}
                     <div class="glm-row">
                         <div class="glm-large-1">&nbsp;</div>
                         <div class="glm-columns glm-reg-event-terms">
                             <input class="glm-reg-terms" id="terms" type="checkbox" name="terms" value="accept" required><label class="glm-reg-terms-label" for="terms"> {$globalTerms}</label><br>
                         </div>
                     </div>
-        {/if}   
-        {if $haveEventTerms}                 
+        {/if}
+        {if $haveEventTerms}
           {foreach $cart.events as $event}
             {if $event.event_terms != ''}
                     <div class="glm-row">
             <div style="text-align: right;">(There is no charge for your request.)</div>
     {/if}
             <div class="glm-right" style="white-space; nowrap;">
-                <!--<span class="glm-reg-warning">You have one more step to complete your {$terms.reg_term_registration}!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;">--> 
+                <!--<span class="glm-reg-warning">You have one more step to complete your {$terms.reg_term_registration}!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;">-->
     {if $settings.reg_show_navigation_aids}
                 <div class="glm-reg-warning">Your {$terms.reg_term_registration} is not complete until you click here! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"></div>
     {/if}
                 <input id="payPalPayButton" type="submit" value="Pay with PayPal" class="button glm-reg-button glm-hidden" disabled>
-                <input id="regSubmitButton" type="submit" value="{$terms.reg_term_button_checkout_page_submit}" class="button glm-reg-button">                
+                <input id="regSubmitButton" type="submit" value="{$terms.reg_term_button_checkout_page_submit}" class="button glm-reg-button">
             </div>
         </form>
-    
-       
+
+
         <div id="regSubmitDialog" title="Please wait...">Please wait while we process your {$terms.reg_term_registration} request. If you don't see a new page, your {$terms.reg_term_registration} request may not have been processed.</div>
         <div id="regSubmitFailDialog" title="Oops!">
             <h3>Something may have gone wrong.</h3>
         <div id="paypal-button-container"></div>
     </center>
     <br>
-    <span class="glm-reg-warning">NOTE:</span> Your {$terms.reg_term_registration_plur} are not complete until you accept the PayPal payment and see the checkout summary page! 
+    <span class="glm-reg-warning">NOTE:</span> Your {$terms.reg_term_registration_plur} are not complete until you accept the PayPal payment and see the checkout summary page!
     <br>
     <div id="payPalPaymentWarningMessage" class="glm-reg-warning"></div>
     <div id="payPalPaymentMessage"></div>
     jQuery(function($){
 
         var payMethodNumb = false;
-        
+
         // When payment method selection changes
         $('.payMethodSelector').on('change', function() {
 
             // Get the value from the selected Payment Method
             payMethodNumb = $(this).val();
             payMethodSelection(payMethodNumb);
-            
+
         });
         function payMethodSelection(payMethodNumb) {
 
                 $('#payPalPayButton').addClass('glm-hidden');
                 $('#payPalPayButton').attr('disabled','disabled');
             }
-            
+
         }
 
         // Dissable checkout button when first clicked to prevent multiple attempts
                 // Don't actually do a submit yet
                 return false;
             }
-            
+
             // If something else is preventing submission, stop here. Use this with custom fields when there are required fields.
             if (e.isDefaultPrevented()) {
                 return false;
             }
-            
+
             // Show submit dialog box
             $( "#regSubmitDialog" ).dialog( "open" );
 
 
         // Start with all pay method inputs dissabled
         $( document ).ready(function() {
-            
+
             // Dialog box to show when submitting checkout page
             $( "#regSubmitDialog" ).dialog({
                 autoOpen: false,
                     }
                 }
             });
-            
+
             // Start with all payment method sections hidden
             $('.payMethodInput').attr('disabled', true);
 
-            // Get currently checked payment method - works after browser back button - Should never be needed, but just in case          
+            // Get currently checked payment method - works after browser back button - Should never be needed, but just in case
             var payMethodNumb = $("input[name='payMethod']:checked").val()
             if (payMethodNumb == '') {
                 payMethodNumb = {$defaultPayMethod}+0;
             }
-                
+
             payMethodSelection(payMethodNumb);
 
         });
         $(".cvv-input").mask("000#");
 
         // Registration not submitted Dialog actions
-        {if $settings.reg_not_submitted_dialog}    
+        {if $settings.reg_not_submitted_dialog}
 
           var notSubmittedTimer;
           notSubmittedDialog = $( "#regNotSubmittedDialog" ).dialog({
               open: function(event,ui) {
                   clearInterval(notSubmittedTimer);
               },
-              close: function(event,ui) { 
+              close: function(event,ui) {
                   resetNotSubmittedTimer();
               },
               buttons: [
           });
           startNotSubmittedTimer();
 
-        {/if}  
+        {/if}
 
-        // When the checkout button is clicked and a PayPal payment is requested, this code is called to create a PayPal button inside of the dialog box 
+        // When the checkout button is clicked and a PayPal payment is requested, this code is called to create a PayPal button inside of the dialog box
         var payPalButtonGenerated = false;
         function displayPayPalButton() {
 
             }
             payPalButtonGenerated = true;
 
-            
+
             // PayPal button actions
             paypal.Button.render({
-    
+
                 // Set your environment
-    
+
         {if $payPalMode}
                 env: 'sandbox',
         {else}
                 env: 'production',
         {/if}
-    
+
                 // Specify the style of the button
                 style: {
                     label: 'pay',
                     shape: 'rect',   // pill | rect
                     color: 'blue'   // gold | blue | silver | black
                 },
-    
+
                 // To create a PayPal see app: https://developer.paypal.com/developer/applications/create
                 client: {
                     sandbox:    '{$payPalSandboxClientId}',
                     production: '{$payPalClientId}'
                 },
-    
+
                 // Wait for the PayPal button to be clicked
                 payment: function(data, actions) {
                     return actions.payment.create({
-                        invoice_number: '{$cartId}', 
+                        invoice_number: '{$cartId}',
                         payment: {
                             payer: {
                                 payer_info: {
                                 {
                                     description: '{$settings.reg_org_name} {$terms.reg_term_registration_plur_cap}',
                                     invoice_number: '{$cartId}',
-                                    amount: { 
-                                        total: '{$cart.grandTotal}', 
-                                        currency: 'USD' 
+                                    amount: {
+                                        total: '{$cart.grandTotal}',
+                                        currency: 'USD'
                                     },
                                     item_list: {
                                         items: [
-            {foreach $cart.chargeItems as $item}                                        
-                                            { 
+            {foreach $cart.chargeItems as $item}
+                                            {
                                                 name: '{$item.name|escape}',
                                                 quantity: {$item.quantity},
                                                 price: {$item.price},
                                             },
             {/foreach}
                                         ]
-                                    } 
+                                    }
                                 }
                             ]
                         }
                         $('#payPalPaymentWarningMessage').html('<br>You canceled the PayPal Payment. Payment is required to submit your {$terms.reg_term_registration_plur}. If you don\'t wish to pay with PayPal, click the button below and select another payment method.');
                 },
                 onError: function(err) {
-console.log(err);                    
+console.log(err);
                     $('#payPalPaymentWarningMessage').html('<br>There was a problem with your PayPal Payment. Payment is required to submit your {$terms.reg_term_registration_plur}. If you\'re unable to pay with PayPal, click the button below and select another payment method.');
                 },
                 // Wait for the payment to be authorized by the customer
@@ -666,7 +667,7 @@ console.log(err);
 
                         // Notify submit code above that it's OK to checkout
                         payPalSubmitOK = true;
-                        
+
                         $( "#payPalPaymentDialog" ).dialog("close");
 
                         // Add PayPal payment details to form
@@ -679,11 +680,11 @@ console.log(err);
                         $("#checkoutForm").submit();
                     });
                 }
-    
+
             }, '#paypal-button-container');
-                
+
         }
 
-        
+
     });
 </script>
index b836497..778f2b7 100644 (file)
@@ -2,9 +2,10 @@
 <div class="row">
         <div class="progress-container columns">
             <ul class="progressbar">
-              <li class="active">{$terms.reg_term_register_cap}</li>
-              <li >View Cart</li>
-              <li>Checkout</li>
+                <li class="active">Select {$terms.reg_term_event_cap}</li>
+                <li>{$terms.reg_term_register_cap}</li>
+                <li >View Cart</li>
+                <li>Checkout</li>
             </ul>
         </div>
 </div>
     {/if}
 {if $haveRegEvents}
     {foreach $regEvents as $event}
-     
+
 
         <!-- EVENT REG ITEM START -->
         <div class="glm-columns glm-small-12 glm-reg-event-item">
-            
+
             <div class="glm-small-12 glm-large-9 glm-columns glm-reg-list-data">
                 <h3><a href="{$thisUrl}?page=registration&eventRegId={$event.id}">{$event.event_name}</a></h3>
                 <!-- START EVENT REG TIMES -->
                         </div>-->
 
                         <div class="glm-columns glm-small-12 glm-reg-list-details">
-                            
+
                             {$lastDate = ''}
                             {foreach $event.recurrences as $rec}
 
                                 {$eDate = $rec.from_date.timestamp|date_format:"%B %e"}
-                                
+
                                 {if $eDate != $lastDate}
                                     {$lastDate = $eDate}
-                                    
+
                                     <div class="glm-reg-list-dates glm-reg-list-details">
 <!--                                        {if $event.recurrences.0.recurring.value == 1} Occurring {/if}-->
 
@@ -48,7 +49,7 @@
                                         {else}
                                             {$eDate}
                                         {/if}
-                                        
+
                                         {if $rec.from_date.date != $rec.to_date.date}
                                             {if $rec.from_date.timestamp|date_format:"%Y" != $rec.to_date.timestamp|date_format:"%Y"}
                                                 - {$rec.to_date.timestamp|date_format:"%B %e, %Y"}
@@ -61,7 +62,7 @@
                                             {else}
                                                 - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}
                                             {/if}
-                                        
+
                                         {/if}
 <!--
                                         {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
                                             {/if}
                                     </div>
                                 {else}
-                        
+
                                     {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' }
                                         {$rec.name}
                                     {/if}
 
                                 {/if}
                             {/foreach}
-                   
+
                             {if $event.eventCost}
 
                                 <div class="glm-reg-list-cost glm-small-12 glm-column glm-reg-list-details">
                                 </div>
 
                             {/if}
-                            {if $event.hide_address.name == 'No'}       
+                            {if $event.hide_address.name == 'No'}
                                 {if !$event.use_member_location.value && isset($event.locations) && ($event.locations.name || $event.locations.address)}
                                     <div class="glm-columns glm-small-12 glm-reg-list-details glm-reg-list-location">
                                            {if $event.locations.name}{$event.locations.name}<br>{/if}
-                                    </div>        
+                                    </div>
                                 {/if}
-                            {/if}          
+                            {/if}
                         </div>
                     </div>
                     <!-- EVENT REG TIMES END -->
                         </div>
                     {/if}-->
                     <!-- EVENT REG LOCATION -->
-                    
+
 
                     <!-- EVENT REG LOCATION END -->
                     <div class="glm-small-12 glm-columns glm-reg-list-description">
                     <img class="glm-reg-list-image" src="{$glmPluginMediaUrl}/images/small/{$event.image}">
                 </div>
             {/if}
-            
+
         </div>
         <!-- EVENT REG ITEM END -->
     {/foreach}
index e1d65ae..2a73780 100644 (file)
@@ -7,10 +7,10 @@
     <div class="glm-row">
         <div class="glm-columns glm-small-12 glm-medium-8">
             <div class="glm-reg-login">
-            
+
                 <h4 class="glm-left">Login</h4>
-                <a id="register" class="button tiny glm-right" href="{$regUrl}?page=register">{$terms.reg_term_button_create_account}</a>
-                
+                <a id="register" class="button glm-right" href="{$regUrl}?page=register">{$terms.reg_term_button_create_account}</a>
+
                 <div class="glm-row">
                     <div class="glm-columns glm-large-12">
                         {if $message}<span style="color: red;">{$message}</span>{/if}
@@ -51,7 +51,7 @@
                 <!--         <a class="forgotLogin" href="{$regUrl}?page=forgot">Forgot Password</a> -->
                 <!--     </div> -->
                 <!-- </div> -->
-                
+
 
         </div>
         </div>
index 141fcc0..605edf5 100644 (file)
             </div>
             <div class="row">
                 <div class="small-12 large-6 columns">
-                    <label class="error">Email Address
+                    <label class="">
+                        <span style="color:red;">Email Address</span>
                         {if $emailError} <span class="glm-error">{$emailError}</span> {/if}
                         <input name="email" value="" required>
                     </label>
                 </div>
                 <div class="small-12 large-6 columns">
-                    <label class="error">{$terms.reg_term_password_cap}
+                    <label class="">
+                        <span style="color:red;">{$terms.reg_term_password_cap}</span>
                         {if $passwordError} <span class="glm-error">{$passwordError}</span> {/if}
                         <input type="password" name="password" value="" required>
                     </label>
             </div>
             <div class="row">
                 <div class="small-12 large-6 columns">
-                    <label class="error">
-                        First Name
+                    <label class="">
+                        <span style="color:red;">First Name</span>
                         <input name="fname" value="{$reg.fname}" required>
                     </label>
                 </div>
                 <div class="small-12 large-6 columns">
-                    <label class="error">
-                        Last Name
+                    <label class="">
+                        <span style="color:red;">Last Name</span>
                     </label>
                     <input name="lname" value="{$reg.lname}" required>
                 </div>
             </div>
             <div class="row">
                 <div class="small-12 large-6 columns">
-                    <label class="error">
+                    <label class="">
                         Address 1
-                        <input name="addr1" value="{$reg.addr1}" required>
+                        <input name="addr1" value="{$reg.addr1}">
                     </label>
                 </div>
                 <div class="small-12 large-6 columns">
             </div>
             <div class="row">
                 <div class="small-12 large-4 columns">
-                    <label class="error">
+                    <label class="">
                         City
-                        <input name="city" value="{$reg.city}" required>
+                        <input name="city" value="{$reg.city}">
                     </label>
                 </div>
                 <div class="small-12 large-4 columns">
-                    <label class="error">
+                    <label class="">
                         State
                         <select name="state">
                             <option value=""></option>
@@ -72,9 +74,9 @@
                     </label>
                 </div>
                 <div class="small-12 large-4 columns">
-                    <label class="error">
+                    <label class="">
                         Zip/Postal Code
-                        <input name="zip" value="{$reg.zip}" required>
+                        <input name="zip" value="{$reg.zip}">
                     </label>
                 </div>
             </div>
index 318cefd..a150783 100644 (file)
@@ -2,7 +2,6 @@
 {* Underscore Templates for the Event Registration App *}
 {* Template for Logged in Account *}
 
-<script src="//maps.googleapis.com/maps/api/js?key={$settings.google_maps_api_key}"></script>
 {literal}
 <script type="text/template" id="account-template">
     <span>Logged in as <%= fname %><%= lname %></span>
@@ -22,7 +21,8 @@
     <div class="row">
         <div class="columns small-12  glm-reg-event-profile">
             <h1 id="glm-reg-event-name"><%= event_name %></h1>
-            <div class="row">
+            <a id="glm-reg-event-detail-link">Click to view {/literal}{$terms.reg_term_event}{literal} details</a>
+            <div id="glm-reg-details" class="row glm-hidden">
                 {/literal}
                 {if $regEvent.image}
                 <div class="small-12 medium-6 large-7 columns glm-reg-image-container">
                     </div>
                     <div class="row">
                         <div class="columns large-4 small-12 text-right">Email&nbsp;Address</div>
-                        <div class="columns large-8 small-12"><input class="reg_email" value="<%- email %>" disabled></div>
+                        <div class="columns large-8 small-12"><input class="reg_email" value="<%- email %>"></div>
                     </div>
                     <div class="row">
                         <div class="columns large-4 small-12 text-right glm-reg-required">First Name *</div>
 {/literal}
 <div id="glm-reg-detail">
 
-    <h1>{$terms.reg_term_registrations_name}</h1>
     {apply_filters('glm_members_registrations_header', 'accountHeader', {$page})}
     <div class="row progress-row">
         <div class="progress-container columns">
             <ul class="progressbar">
+                <li>Select {$terms.reg_term_event_cap}</li>
                 <li class="active">{$terms.reg_term_register_cap}</li>
-              <li >View Cart</li>
-              <li>Checkout</li>
+                <li>View Cart</li>
+                <li>Checkout</li>
             </ul>
         </div>
     </div>
@@ -633,41 +633,45 @@ jQuery(function($){
             $(this).html(mapBtnTxt);
         });
         {if $regEvent.locations.lat !=0 && $regEvent.locations.lon != 0}
-            var eventlocation = new google.maps.LatLng({$regEvent.locations.lat}, {$regEvent.locations.lon});
+            //var eventlocation = new google.maps.LatLng({$regEvent.locations.lat}, {$regEvent.locations.lon});
         {else}
-            var eventlocation = new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon});
+            //var eventlocation = new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon});
         {/if}
         function initMap() {
             // Set default - Need to make this configurable
-            var map = new google.maps.Map(document.getElementById('glm-reg-map'), {
-                zoom: {$settings.maps_default_zoom},
-                center: eventlocation,
-                disableDefaultUI: false,
-                mapTypeId: google.maps.MapTypeId.MAP,
-            });
+            //var map = new google.maps.Map(document.getElementById('glm-reg-map'), {
+            //    zoom: {$settings.maps_default_zoom},
+            //    center: eventlocation,
+            //    disableDefaultUI: false,
+            //    mapTypeId: google.maps.MapTypeId.MAP,
+            //});
 
             // Create a marker for this event
             {if $regEvent.locations.lat !=0 && $regEvent.locations.lon != 0}
-                    var marker = new google.maps.Marker({
-                        map: map,
-                        position: new google.maps.LatLng({$regEvent.locations.lat}, {$regEvent.locations.lon}),
-                        draggable: false,
-                        animation: google.maps.Animation.DROP,
-                        title: ''
-                    });
+                    //var marker = new google.maps.Marker({
+                    //    map: map,
+                    //    position: new google.maps.LatLng({$regEvent.locations.lat}, {$regEvent.locations.lon}),
+                    //    draggable: false,
+                    //    animation: google.maps.Animation.DROP,
+                    //    title: ''
+                    //});
                  {/if}
 
         }
-        google.maps.event.addDomListener(window, 'load', initMap);
+        //google.maps.event.addDomListener(window, 'load', initMap);
     {/if}
-    jQuery("#MemberDrivingDirectionsForm").submit(function(){
-        var place = jQuery("#MemberLocation").val().replace( new RegExp( " ", "g" ), '+' );
-        var lat = jQuery("#MemberLat").val();
-        var lon = jQuery("#MemberLon").val();
-        var url = "https://maps.google.com/maps?daddr=" + place + "%40" + lat + "," + lon;
-        window.open(url, '_blank');
-        return false;
+
+    $('#glm-reg-event-detail-link').click(function(){
+        var detailPart = $('#glm-reg-details');
+        detailPart.toggleClass('glm-hidden');
+        //detailPart.toggle('2000');
+        if ( detailPart.hasClass('glm-hidden') ) {
+            $(this).html('Click to view ' + '{$terms.reg_term_event}' + ' details');
+        } else {
+            $(this).html('Click to hide ' + '{$terms.reg_term_event}' + ' details');
+        }
     });
+
     var reg_class_detail = "#regApp .glm-reg-event-details";
 
     $(reg_class_detail).click(function() {