From: Anthony Talarico Date: Mon, 8 Jan 2018 14:04:24 +0000 (-0500) Subject: fixing cart summary styles for front end and admin X-Git-Tag: v1.0.0^2~78 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=89b5b679f4a61d334644ce7c975413c31a9877b7;p=WP-Plugins%2Fglm-member-db-registrations.git fixing cart summary styles for front end and admin trying to make the admin cart styled properly, separating the admin styles and the front styles for the same view file --- diff --git a/css/admin.css b/css/admin.css index c55028f..945faad 100644 --- a/css/admin.css +++ b/css/admin.css @@ -108,28 +108,223 @@ } +/* Event Registration Edit Page */ +.glm-reg-label{ + font-weight: bold; +} +/*{{{ Temp replacement for glm-row without max-width and other checkout form tampering */ +.glm-bold{ + font-weight: bold; +} +.glm-reg-cart-event-container .glm-reg-cart-event-class:not(:nth-child(2)) .glm-reg-cart-charges-col { + visibility: hidden; +} +.glm-reg-cart-event-container .glm-reg-cart-event-class .glm-reg-cart-charges-col { + max-width: 55px; + float: right; +} +.glm-reg-cart-event-class{ + background-color: rgba(66,162,208, .1); + float: left; +} +.reg-cart-class-name > span{ + font-weight: bold; +} +.glm-reg-cart-subtotal{ + padding: 0; +} +.glm-reg-row { + clear: both; + margin-left: auto; + margin-right: auto; + width: 100%; + min-height: 1.5rem; +} +.glm-reg-indent-1 { + padding-left: .5rem; +} +.glm-reg-indent-2 { + padding-left: 1rem; +} +.glm-reg-indent-3 { + padding-left: 1.5rem; +} +.glm-reg-space-left { + padding-left: 1.25rem; +} +.glm-reg-right { + text-align: right; +} +.glm-reg-row-bold { + font-weight: bold; +} +.glm-reg-header-row.glm-cart-summary-event-name-row { +/* background-color: #005779;*/ + background-color: light-grey; + color: black; +/* padding: 5px;*/ +/* min-height: 40px;*/ + height: auto; + float: left; +} +.glm-reg-header-row.glm-cart-summary-event-name-row a { + color: white; +} +.glm-reg-header-row .glm-cart-summary-event-name { + display: inline; + font-size: 22px; + font-weight: bold; + color: black; +} +.glm-reg-header-row { + clear: both; + background-color: #eee; + height: 2rem; + padding-top: .2rem; +} +.glm-reg-nowrap { + white-space: nowrap; +} +.glm-reg-required { + color: red; +} +.glm-reg-fail input { + border: 4px #FFaBa9 solid; +} +/*}}} end of tampering */ +label.registrant-label { + width: 80%; +} +.glm-reg-cart-header-data{ + color: black; +} +.reg-class-count { + float: right; +} +.glm-reg-event-profile { + margin-bottom: 25px; +} +/*}}} End New Register Account */ +/*{{{ Errors */ +span.glm-error { + /* position: absolute; */ + top-margin: -56px; + /* left: 0px; */ + color: red; + font-size: 10px; +} +.glm-reg-warning { + color: red; +} +/*}}} End Errors */ +.glm-reg-cart-registrant-item:nth-child(odd){ +/* background-color: rgba(66,162,208, .1);*/ +} +.glm-reg-cart-registrant-item{ + margin: 5px 0; + clear: both; +} +.glm-reg-cart-header-data{ + color: white; +} +.glm-reg-cart-total{ + font-size: 22px; + padding-left: 0; +} +.glm-reg-cart-total-attendees{ + font-size: 24px; +} +.glm-reg-cart-summary-custom-fields,.glm-reg-cart-custom-charge{ + margin-top: -2px; +} +.glm-reg-cart-item{ + padding-left: -15px; +} +/* MOBILE ONLY ----------*/ +@media(max-width: 640px){ + .glm-reg-cart-registrant-item{ + padding-bottom: 5px; + } + .reg-cart-class-name{ + max-width: 100px; + } + .glm-reg-cart-data{ + display: block; + font-size: 13px; + } + .glm-reg-cart-data-value{ + margin-top: -5px; + line-height: 1; + } + .glm-reg-cart-summary{ + padding: 0; + } + .glm-reg-cart-registrant { +/* padding-left: 12px !important;*/ + } + .reg-cart-class-name{ + line-height: 1; + padding-bottom: 10px; + } + .glm-reg-cart-charge{ + padding: 0; + text-align: right; + float: right; + } + .glm-reg-cart-item{ + } + .glm-reg-cart-total-attendees{ + font-size: 19px; + } + .glm-reg-submit { + padding: 0; + } + .glm-reg-cart-item, .glm-reg-cart-registrant{ +/* padding: 0;*/ + } + +} +/*{{{ Media Queries */ +@media (min-width: 64.063em) { + /* Large */ + .glm-small-only { + display: none; + } +} +@media (min-width: 50.065em) { + /* Medium */ + .glm-small-only { + display: none; + } +} +@media (max-width: 50em) { + /* Small */ + .glm-medium-up { + display: none; + } +} +@media (max-width: 1024px) { - - - - - - - - - - - - + +} +@media(min-width: 1024px){ + .glm-reg-cart-summary-custom-fields{ + padding-left: 30px; + margin-top: -5px; + } + .glm-reg-cart-custom-charge{ + margin-top: -5px; + } +} \ No newline at end of file diff --git a/css/front.css b/css/front.css index cfea10a..eedecfd 100644 --- a/css/front.css +++ b/css/front.css @@ -9,7 +9,8 @@ visibility: hidden; } .glm-reg-cart-event-class{ - + background-color: rgba(66,162,208, .1); + float: left; } .glm-reg-event-profile-details { @@ -868,7 +869,7 @@ span.glm-error { text-decoration: none; } .glm-reg-cart-registrant-item:nth-child(odd){ - background-color: rgba(66,162,208, .1); +/* background-color: rgba(66,162,208, .1);*/ } .glm-reg-cart-registrant-item{ margin: 5px 0; @@ -1285,6 +1286,9 @@ hr.glm-reg-class-separator{ } .reg-cart-class-name > span { font-weight: bold; +} +.reg-cart-class-name { + } .glm-reg-cart-registrant { padding-left: 25px; diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php index 2bfe122..88c5bbe 100644 --- a/models/front/registrations/registration.php +++ b/models/front/registrations/registration.php @@ -371,7 +371,8 @@ 'country_list' => $this->config['countries'], 'pluginAssetsUrl' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL, ); - + + echo '".print_r($templateData,1).""; // Return status, any suggested view, and any data to controller diff --git a/views/front/registrations/cartSummary.html b/views/front/registrations/cartSummary.html index cdc4c30..7b6af62 100644 --- a/views/front/registrations/cartSummary.html +++ b/views/front/registrations/cartSummary.html @@ -1,22 +1,16 @@ -{if $summaryType=="checkout"} - {assign var="summaryClass2Col" value="glm-small-12 "} - {assign var="summaryClass3Col" value="glm-small-12 "} - {assign var="summaryClass4Col" value="glm-small-12 "} - {assign var="summaryClass6Col" value="glm-small-12 "} +{if $summaryType=="adminRequest"} + {assign var="summaryColumnsItem" value="glm-small-6 "} + {assign var="summaryColumnsCharge" value="glm-small-4 "} {else} - {assign var="summaryClass2Col" value="glm-small-12 glm-medium-2 "} - {assign var="summaryClass3Col" value="glm-small-12 glm-medium-3 "} - {assign var="summaryClass4Col" value="glm-small-12 glm-medium-4 "} - {assign var="summaryClass6Col" value="glm-small-12 glm-medium-6 "} -{/if} -{assign var="summaryCustomClass4Col" value="glm-small-4 "} - + {assign var="summaryColumnsItem" value="glm-small-9 "} + {assign var="summaryColumnsCharge" value="glm-small-3 "} +{/if}
{foreach $cart.events as $event}
-
+
{if $summaryType=="cart"} @@ -25,14 +19,14 @@
-
-
+
+
-
+
{$terms.reg_term_attendee_plur_cap}: {$event.eventRegistrants}
-
+
${$event.eventCharges|number_format:2}
@@ -40,7 +34,7 @@
{foreach $event.classes as $class} -
+
Registration Level: {$class.class_name}
@@ -63,12 +57,12 @@ {foreach $rate.registrants as $registrant}
-
-
+
+
{$terms.reg_term_attendee_cap}: {$registrant.fname} {$registrant.lname}
-
+
{if $registrant.registrantRate > 0} ${$registrant.registrantRate|number_format:2} {else} @@ -85,13 +79,13 @@ {if $registrant.event_attendee_custom_form} {foreach $registrant.event_attendee_custom_form.form as $customField} {if $customField.priority_display.value || $customField.cost > 0} -
-
+
+
{$customField.field_name}: {$customField.stored}
{if $customField.cost > 0} -
+
${$customField.cost|number_format:2}
{/if} @@ -100,7 +94,7 @@ {/foreach} {/if} {if $registrant.registrantDiscounts > 0} -
+
{$terms.reg_term_attendee_cap} Discount
@@ -113,10 +107,12 @@ {/foreach} {* registrants *} {/foreach} {* rates *} -
+ {if $summaryType !== 'adminRequest'} +
+ {/if} {/foreach} {* classes *} {if $event.eventDiscounts > 0} -
+
Event Discounts
@@ -125,8 +121,8 @@
{/if} -
-
+
+
Subtotal:   ${$event.eventCharges|number_format:2}