From 71447ba5e960efb820468a7063c363470d727595 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 3 Apr 2013 10:15:11 -0700
Subject: [PATCH] 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
---
CRM/Member/Form/Membership.php | 2 +-
css/civicrm.css | 5 +++++
templates/CRM/Price/Form/Calculate.tpl | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 8abcd36337..b3ac0da9dd 100644
--- 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 aba780eec6..bebc0055cf 100644
--- 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 56931b8eac..1d76c20876 100644
--- 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">
--
GitLab