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

----------------------------------------
* CRM-12268: Completing a pay-later ignores the membership number of terms
  http://issues.civicrm.org/jira/browse/CRM-12268

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 8abcd363373772289f53646ae236509fcc510777..b3ac0da9dd3f5d54ba34e1c75132e1d704944455 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1656,7 +1656,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
       }
       $statusMsg = implode('<br/>', $statusMsg);
       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));
       }
     }
 

diff --git a/css/civicrm.css b/css/civicrm.css
index aba780eec6634009f5da2fda82c408052c379203..bebc0055cf64ca74a4e7a5b510fa2094cd0f0c69 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3777,6 +3777,11 @@ div.m ul#civicrm-menu,
   padding-top: 6px;
 }
 
+#crm-container.crm-public .calc-value {
+  padding-top: 6px;
+  font-size: 15px;
+}
+
 #crm-container.crm-public .crm-section,
 .crm-section {
   margin-bottom: 0;

diff --git a/templates/CRM/Price/Form/Calculate.tpl b/templates/CRM/Price/Form/Calculate.tpl
index 56931b8eacd9929a30e0557d4321ab479304c2cc..1d76c20876490863d16513f5d718b5f02c18049a 100644 (file)
--- a/templates/CRM/Price/Form/Calculate.tpl
+++ b/templates/CRM/Price/Form/Calculate.tpl
@@ -28,7 +28,7 @@
          {if ( $extends eq 'Contribution' ) || ( $extends eq 'Membership' )}
            {ts}Total Amount{/ts}{else}{ts}Total Fee(s){/ts}
          {/if}</label></div>
-  <div class="content view-value" id="pricevalue" ></div>
+  <div class="content calc-value" id="pricevalue" ></div>
 </div>
 
 <script type="text/javascript">