Added list of attendees, small changes in the cart summary

diff --git a/css/front.css b/css/front.css
index 23b8199..5e84bbe 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -329,10 +329,12 @@
 }
 .glm-reg-level-registrant {
     /* width: 90%; */
+    background-color: whitesmoke;
+    border: 1px solid lightgrey;
+    border-radius: 2px;
     font-size: 1rem;
     padding: .4rem;
     margin: .4rem;
-    background-color: lightgrey;
     max-width: auto;
 }
 .glm-reg-level-registrant span {
@@ -438,6 +440,9 @@ body .glm-reg-proceed-to-checkout{
     -webkit-column-count: 2;*/
 
 }
+.reg-class-accounts-title {
+    border-bottom: 1px solid lightgrey;
+}
 /*}}} End Event Registration Page */
 
 /*{{{ New Attendee Form */
@@ -452,8 +457,10 @@ body .glm-reg-proceed-to-checkout{
     margin-bottom: 20px;
 }
 .new-reg .add-new-registrant-cancel{
-    display: inline-block;
+    display: block;
     margin-left: 10px;
+    float: right;
+    width: 100px;
 }
 .new-reg, .reg-edit-form {
     padding: 10px;
@@ -644,14 +651,24 @@ span.glm-error {
 }
 #regApp .reg-edit-form .update-registrant-button-container {
     float: left;
+    width: 100%;
+}
+#regApp .reg-edit-form .update-registrant-button-container .button {
+    padding: 10px 20px;
+    border-radius: 4px;
+    margin-bottom: 0;
+}
+.new-reg .button {
+    padding: 10px 20px;
+    border-radius: 4px;
+    margin-bottom: 0;
 }
 #regApp .reg-edit-form .update-registrant-button-container .update-registrant {
     float: left;
-    margin-bottom: 0;
+    background-color: #55b776;
 }
 #regApp .reg-edit-form .update-registrant-button-container .update-registrant-cancel {
     float: right;
-    padding: 10px;
     margin-left: 10px;
 }
 #accountHeader {
@@ -1088,6 +1105,12 @@ span.glm-error {
 .glm-reg-cart-registrant {
     padding-left: 25px;
 }
+.glm-reg-cart-registrant .glm-reg-label {
+    font-weight: bold;
+}
+.glm-reg-cart-registrant .glm-reg-data {
+    
+}
 
 /* Checkout styles */
 .glm-reg-checkout-field-label {

diff --git a/views/front/registrations/cartSummary.html b/views/front/registrations/cartSummary.html
index 2aa4682..d8aaa44 100644 (file)
--- a/views/front/registrations/cartSummary.html
+++ b/views/front/registrations/cartSummary.html
@@ -39,17 +39,17 @@
    {/if}
    {foreach $rate.registrants as $registrant}
             <div class="glm-reg-row glm-reg-indent-1 glm-reg-cart-registrant">
-                <div class="{$summaryClass2Col} glm-reg-row-bold">
-                    {$registrant.fname} {$registrant.lname}
+                <div class="{$summaryClass2Col} glm-reg-row">
+                    <span class="glm-reg-label">{$terms.reg_term_attendee_cap}: </span><span class="glm-reg-front">{$registrant.fname} {$registrant.lname}</span>
                 </div>
-                <div class="{$summaryClass2Col} glm-column glm-reg-row-bold">
-                    Date & Time:
+                <div class="{$summaryClass2Col} glm-column glm-reg-row">
+                    <span class="glm-reg-label">Date & Time: </span>
                 </div>
                 <div class="{$summaryClass2Col} glm-column">
                     {$registrant.timeReformatted}
                 </div>
                 <div class="{$summaryClass4Col} glm-column glm-reg-space-left glm-reg-right glm-reg-row-bold">
-                    Registrant Charge:
+                    {$terms.reg_term_attendee_cap} Charge:
                 </div>
                 <div class="{$summaryClass4Col} glm-column glm-reg-right">
     {if $registrant.registrantRate > 0}
@@ -81,7 +81,7 @@
     {if $registrant.registrantDiscounts > 0}
             <div class="glm-reg-row glm-reg-indent-2 glm-reg-cart-registrant-discount">
                 <div class="glm-small-8 glm-medium-8 glm-column glm-reg-cart-label">
-                    Registrant Discount
+                    {$terms.reg_term_attendee_cap} Discount
                 </div>
                 <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right glm-reg-cart-data">
                     -${$registrant.registrantDiscounts|number_format:2}
@@ -103,7 +103,7 @@
  {/if}
             <div class="glm-reg-row glm-reg-row-bold glm-reg-cart-event-registrants">
                 <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right glm-reg-cart-label">
-                    Registrants this event: {$event.eventRegistrants}
+                    {$terms.reg_term_attendee_plur_cap} this event: {$event.eventRegistrants}
                 </div>
                 <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right glm-reg-cart-data">
                     ${$event.eventCharges|number_format:2}
@@ -113,7 +113,7 @@
 {/foreach} {* events *}
         <div class="glm-reg-row glm-reg-header-row glm-reg-cart-request-totals">
             <div class="glm-small-12 glm-medium-12 glm-column">
-                Registration Request Totals
+                {$terms.reg_term_registration_cap} Request Totals
             </div>        
         </div>
 {if $cart.totalDiscounts > 0}
@@ -128,7 +128,7 @@
 {/if}
         <div class="glm-reg-row glm-reg-row-bold">
             <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right">
-                Total registrants: {$cart.totalRegistrants}
+                Total {$terms.reg_term_attendee}: {$cart.totalRegistrants}
             </div>
             <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
                 ${$cart.totalCharges|number_format:2}

diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 2101d26..0348026 100644 (file)
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -179,7 +179,9 @@
         <b><%= start_datetime.datetime %></b>
     <% } %>
     <button class="glm-add-new-account">Add New {/literal}{$terms.reg_term_attendee_cap}{literal}</button>
-    <div class="reg-class-accounts"></div>
+    <div class="reg-class-accounts">
+        <span class="reg-class-accounts-title">List of attendees</span>
+    </div>
 </script>
 {/literal}
 {* Template for registrant add form *}{literal}
@@ -316,7 +318,7 @@
             {/if}{literal}
             <div class="update-registrant-button-container">
                 <input class="update-registrant button" value="Update {/literal}{$terms.reg_term_attendee_cap}{literal}" type="submit">
-                <a class="update-registrant-cancel button tiny">Cancel</a>
+                <a class="update-registrant-cancel button">Cancel</a>
             </div>
         </div>
     <% } %>