From a17a96df571007bca3ad7e3349c9ee5355362b4f Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Mon, 8 Apr 2013 17:48:31 -0700 Subject: [PATCH] CRM-12299 Fix misalignments in profile/view, profile view when embedded in Confirm and Thankyou pages for online contribution and event regisration, profile view and edit when embedded in user registration or user account edit. Most of these issues were related to the crm-public styles introduced for input fields. ---------------------------------------- * CRM-12299: Profile view and profile pop-up layout fixes http://issues.civicrm.org/jira/browse/CRM-12299 --- css/civicrm.css | 20 +++++-- .../Contribute/Form/Contribution/Confirm.tpl | 16 +++--- .../Contribute/Form/Contribution/ThankYou.tpl | 14 ++--- .../Form/Registration/DisplayProfile.tpl | 56 ++++++++++--------- templates/CRM/Profile/Form/Dynamic.tpl | 4 +- templates/CRM/Profile/Page/View.tpl | 2 +- 6 files changed, 63 insertions(+), 49 deletions(-) diff --git a/css/civicrm.css b/css/civicrm.css index 253af57085..2f805a802d 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -430,13 +430,15 @@ border: none; } -.crm-container .crm-section { +.crm-container .crm-section, +.crm-container-snippet .crm-section { margin-bottom: 1em; } -.crm-container .crm-section .label { +.crm-container .crm-section .label, +.crm-container-snippet .crm-section .label { float: left; - width: 15%; + width: 17%; text-align: right; } @@ -444,8 +446,9 @@ text-align: left; } -.crm-container .crm-section .content { - margin-left: 16%; +.crm-container .crm-section .content, +.crm-container-snippet .crm-section .content { + margin-left: 19%; } .crm-container .no-label .content { @@ -707,7 +710,8 @@ color: #000080; } -.crm-container .crm-marker { +.crm-container .crm-marker, +.crm-container-snippet .crm-marker { color: #8A1F11; font-weight: bold; margin-right: 5px; @@ -3777,6 +3781,10 @@ div.m ul#civicrm-menu, padding-top: 6px; } +.crm-public .crm-profile-view .content { + padding-top: 6px; +} + #crm-container.crm-public .calc-value { padding-top: 6px; font-size: 15px; diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 3e5a42ebcf..1c495358e7 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -124,9 +124,9 @@ {include file="CRM/Contribute/Form/Contribution/Honor.tpl"} {if $customPre} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre} -
+
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPre} +
{/if} {if $pcpBlock} @@ -156,7 +156,7 @@ {/if} {if $onbehalfProfile} -
+
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile}
{ts}Organization Email{/ts}
@@ -228,7 +228,7 @@ {/if} {else}
-
{$credit_card_type}
+
{$credit_card_type}
{$credit_card_number}
{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
@@ -242,9 +242,9 @@ {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="confirmContribution"} {if $customPost} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost} -
+
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPost} +
{/if} {if $contributeMode NEQ 'notify' and $is_monetary and ( $amount GT 0 OR $minimum_fee GT 0 ) } {* In 'notify mode, contributor is taken to processor payment forms next *} diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index 28c6e98312..0252de3c4b 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -176,9 +176,9 @@ {include file="CRM/Contribute/Form/Contribution/Honor.tpl"} {if $customPre} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre} -
+
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPre} +
{/if} {if $pcpBlock} @@ -208,7 +208,7 @@ {/if} {if $onbehalfProfile} -
+
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile}
{ts}Organization Email{/ts}
@@ -281,9 +281,9 @@ {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="thankContribution"} {if $customPost} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost} -
+
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPost} +
{/if} {if $participant.additionalCustomPre} -
{$participant.additionalCustomPreGroupTitle}
- {foreach from=$participant.additionalCustomPre item=value key=field} -
-
{$field}
-
{$value}
-
-
- {/foreach} -
+
{$participant.additionalCustomPreGroupTitle}
+
+ {foreach from=$participant.additionalCustomPre item=value key=field} +
+
{$field}
+
{$value}
+
+
+ {/foreach} +
+
{/if} {if $participant.additionalCustomPost} - {foreach from=$participant.additionalCustomPost item=value key=field} -
{$participant.additionalCustomPostGroupTitle.$field.groupTitle}
- {foreach from=$participant.additionalCustomPost.$field item=value key=field} -
-
{$field}
-
{$value}
-
-
- {/foreach} -
- {/foreach} + {foreach from=$participant.additionalCustomPost item=value key=field} +
{$participant.additionalCustomPostGroupTitle.$field.groupTitle}
+
+ {foreach from=$participant.additionalCustomPost.$field item=value key=field} +
+
{$field}
+
{$value}
+
+
+ {/foreach} +
+
+ {/foreach} {/if}
diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl index 3a8b6bc112..f8d2638faf 100644 --- a/templates/CRM/Profile/Form/Dynamic.tpl +++ b/templates/CRM/Profile/Form/Dynamic.tpl @@ -83,9 +83,9 @@ function proccessMultiRecordForm(formData, jqForm, options) { {* Replace div id "crm-container" only when profile is not loaded in civicrm container, i.e for profile shown in my account and in profile standalone mode otherwise id should be "crm-profile-block" *} {if $action eq 1 or $action eq 2 or $action eq 4 } -
+
{else} -
+
{/if} {if $isDuplicate and ( ($action eq 1 and $mode eq 4 ) or ($action eq 2) or ($action eq 8192) ) } diff --git a/templates/CRM/Profile/Page/View.tpl b/templates/CRM/Profile/Page/View.tpl index 1e8bf0f1ce..5d8b7a66b1 100644 --- a/templates/CRM/Profile/Page/View.tpl +++ b/templates/CRM/Profile/Page/View.tpl @@ -35,7 +35,7 @@ {else} {foreach from=$profileGroups item=group}

{$group.title}

-
+
{$group.content}
{/foreach} -- 2.25.1