Skip to content
Snippets Groups Projects
Commit 71447ba5 authored by Dave Greenberg's avatar Dave Greenberg
Browse files

CRM-12268 Also fixing minor layout problem for price set calculated totals on...

CRM-12268 Also fixing minor layout problem for price set calculated totals on public pages, and add missing space in Membership form status msg.

----------------------------------------
* CRM-12268: Completing a pay-later ignores the membership number of terms
  http://issues.civicrm.org/jira/browse/CRM-12268
parent bec527e4
No related branches found
No related tags found
No related merge requests found
...@@ -1656,7 +1656,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; ...@@ -1656,7 +1656,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
} }
$statusMsg = implode('<br/>', $statusMsg); $statusMsg = implode('<br/>', $statusMsg);
if ($receiptSend && $mailSend) { if ($receiptSend && $mailSend) {
$statusMsg .= ts('A membership confirmation and receipt has been sent to %1.', array(1 => $this->_contributorEmail)); $statusMsg .= ' ' . ts('A membership confirmation and receipt has been sent to %1.', array(1 => $this->_contributorEmail));
} }
} }
......
...@@ -3777,6 +3777,11 @@ div.m ul#civicrm-menu, ...@@ -3777,6 +3777,11 @@ div.m ul#civicrm-menu,
padding-top: 6px; padding-top: 6px;
} }
#crm-container.crm-public .calc-value {
padding-top: 6px;
font-size: 15px;
}
#crm-container.crm-public .crm-section, #crm-container.crm-public .crm-section,
.crm-section { .crm-section {
margin-bottom: 0; margin-bottom: 0;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
{if ( $extends eq 'Contribution' ) || ( $extends eq 'Membership' )} {if ( $extends eq 'Contribution' ) || ( $extends eq 'Membership' )}
{ts}Total Amount{/ts}{else}{ts}Total Fee(s){/ts} {ts}Total Amount{/ts}{else}{ts}Total Fee(s){/ts}
{/if}</label></div> {/if}</label></div>
<div class="content view-value" id="pricevalue" ></div> <div class="content calc-value" id="pricevalue" ></div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment