From: Eileen Date: Sun, 17 Nov 2013 22:19:49 +0000 (+1300) Subject: CRM-12023 whitespace only align html in summary.tpl in order to make it more legible X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3860cf720314640b1ece7f290d4d357d7ea81a5f;p=civicrm-core.git CRM-12023 whitespace only align html in summary.tpl in order to make it more legible ---------------------------------------- * CRM-12023: Create regions on Summary.tpl for customisation of that screen http://issues.civicrm.org/jira/browse/CRM-12023 --- diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 5b7d8e0521..8a46ae8886 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -25,7 +25,7 @@ *} {* Contact Summary template for new tabbed interface. Replaces Basic.tpl *} {if $action eq 2} - {include file="CRM/Contact/Form/Contact.tpl"} + {include file="CRM/Contact/Form/Contact.tpl"} {else} {include file="CRM/common/wysiwyg.tpl" includeWysiwygEditor=true} @@ -35,12 +35,12 @@
- {include file="CRM/Contact/Page/Inline/ContactName.tpl"} + {include file="CRM/Contact/Page/Inline/ContactName.tpl"}
{if !$summaryPrint} -
+
    {assign var='urlParams' value="reset=1"} {if $searchKey} @@ -71,252 +71,248 @@ {* Check for permissions to provide Restore and Delete Permanently buttons for contacts that are in the trash. *} {if (call_user_func(array('CRM_Core_Permission','check'), 'access deleted contacts') and $is_deleted)} -
  • - -
    {ts}Restore from Trash{/ts}
    -
    -
  • - - {if call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')} -
  • - -
    {ts}Delete Permanently{/ts}
    -
    -
  • - {/if} +
  • + +
    {ts}Restore from Trash{/ts}
    +
    +
  • - {elseif call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')} - {assign var='deleteParams' value="&reset=1&delete=1&cid=$contactId"} -
  • - -
    {ts}Delete Contact{/ts}
    -
    -
  • + {if call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')} +
  • + +
    {ts}Delete Permanently{/ts}
    +
    +
  • {/if} - {* Previous and Next contact navigation when accessing contact summary from search results. *} - {if $nextPrevError} -
  • - {help id="id-next-prev-buttons"}  -
  • - {else} - {if $nextContactID} - {assign var='viewParams' value=$urlParams|cat:"&cid=$nextContactID"} -
  • - -
    {ts}Next{/ts}
    -
    -
  • - {/if} - {if $prevContactID} - {assign var='viewParams' value=$urlParams|cat:"&cid=$prevContactID"} -
  • - -
    {ts}Previous{/ts}
    -
    -
  • - {/if} - {/if} + {elseif call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')} + {assign var='deleteParams' value="&reset=1&delete=1&cid=$contactId"} +
  • + +
    {ts}Delete Contact{/ts}
    +
    +
  • + {/if} + {* Previous and Next contact navigation when accessing contact summary from search results. *} + {if $nextPrevError} +
  • + {help id="id-next-prev-buttons"}  +
  • + {else} + {if $nextContactID} + {assign var='viewParams' value=$urlParams|cat:"&cid=$nextContactID"} +
  • + +
    {ts}Next{/ts}
    +
    +
  • + {/if} + {if $prevContactID} + {assign var='viewParams' value=$urlParams|cat:"&cid=$prevContactID"} +
  • + +
    {ts}Previous{/ts}
    +
    +
  • + {/if} + {/if} - {if !empty($groupOrganizationUrl)} + {if !empty($groupOrganizationUrl)}
  • - +
    {ts}Associated Multi-Org Group{/ts}
    -
    +
  • - {/if} + {/if}
-
+
{/if}
-
- - -
- {if (isset($hookContentPlacement) and ($hookContentPlacement neq 3)) or empty($hookContentPlacement)} - - {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 2} - {include file="CRM/Contact/Page/View/SummaryHook.tpl"} - {/if} +
+ -
-
-
-
- {include file="CRM/Contact/Page/Inline/ContactInfo.tpl"} -
-
-
-
- {if !empty($imageURL)} -
- {include file="CRM/Contact/Page/ContactImage.tpl"} -
- {/if} -
-
-
- -
{$contactTag}
-
-
-
{ts}Contact Type{/ts}
-
- {if isset($contact_type_label)}{$contact_type_label}{/if} -
-
+
+ {if (isset($hookContentPlacement) and ($hookContentPlacement neq 3)) or empty($hookContentPlacement)} -
-
- {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if} -
-
- {$contactId} - {if !empty($userRecordUrl)} - -  / {$userRecordId} - - {/if} -
-
-
-
+ {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 2} + {include file="CRM/Contact/Page/View/SummaryHook.tpl"} + {/if} -
+
+
+
+
+ {include file="CRM/Contact/Page/Inline/ContactInfo.tpl"} +
+
+
+
+ {if !empty($imageURL)} +
+ {include file="CRM/Contact/Page/ContactImage.tpl"} +
+ {/if} +
+
+
+ +
{$contactTag}
-
-
-
-
- {if $showEmail} -
- {include file="CRM/Contact/Page/Inline/Email.tpl"} -
- {/if} - {if $showWebsite} -
- {include file="CRM/Contact/Page/Inline/Website.tpl"} -
- {/if} -
-
- -
-
- {if $showPhone} -
- {include file="CRM/Contact/Page/Inline/Phone.tpl"} -
- {/if} - {if $showIM} -
- {include file="CRM/Contact/Page/Inline/IM.tpl"} -
- {/if} - {if $showOpenID} -
- {include file="CRM/Contact/Page/Inline/OpenID.tpl"} -
- {/if} -
-
- -
-
- {if $showAddress} -
- {assign var='locationIndex' value=1} - {if $address} - {foreach from=$address item=add key=locationIndex} -
- {include file="CRM/Contact/Page/Inline/Address.tpl"} -
- {/foreach} - {assign var='locationIndex' value=$locationIndex+1} - {/if} - {* add new link *} - {if $permission EQ 'edit'} - {assign var='add' value=0} -
- {include file="CRM/Contact/Page/Inline/Address.tpl"} -
- {/if} - -
+
+
{ts}Contact Type{/ts}
+
+ {if isset($contact_type_label)}{$contact_type_label}{/if} +
+
+
+
+ {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if} +
+
+ {$contactId} + {if !empty($userRecordUrl)} + +  / {$userRecordId} + {/if} -
- {if $showCommunicationPreferences} -
-
-
- {include file="CRM/Contact/Page/Inline/CommunicationPreferences.tpl"} -
-
-
- {/if} - {if $contact_type eq 'Individual' AND $showDemographics} -
-
-
- {include file="CRM/Contact/Page/Inline/Demographics.tpl"} -
-
-
- {/if} -
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {if $showEmail} +
+ {include file="CRM/Contact/Page/Inline/Email.tpl"} +
+ {/if} + {if $showWebsite} +
+ {include file="CRM/Contact/Page/Inline/Website.tpl"} +
+ {/if} +
+
- {if $showCustomData} -
-
-
- {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='1'} -
+
+
+ {if $showPhone} +
+ {include file="CRM/Contact/Page/Inline/Phone.tpl"} +
+ {/if} + {if $showIM} +
+ {include file="CRM/Contact/Page/Inline/IM.tpl"} +
+ {/if} + {if $showOpenID} +
+ {include file="CRM/Contact/Page/Inline/OpenID.tpl"} +
+ {/if} +
+
-
- {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='0'} -
+
+
+ {if $showAddress} +
+ {assign var='locationIndex' value=1} + {if $address} + {foreach from=$address item=add key=locationIndex} +
+ {include file="CRM/Contact/Page/Inline/Address.tpl"} +
+ {/foreach} + {assign var='locationIndex' value=$locationIndex+1} + {/if} + {* add new link *} + {if $permission EQ 'edit'} + {assign var='add' value=0} +
+ {include file="CRM/Contact/Page/Inline/Address.tpl"} +
+ {/if} -
+
+ {/if} +
+ {if $showCommunicationPreferences} +
+
+
+ {include file="CRM/Contact/Page/Inline/CommunicationPreferences.tpl"}
- {/if} +
+ {/if} + {if $contact_type eq 'Individual' AND $showDemographics} +
+
+
+ {include file="CRM/Contact/Page/Inline/Demographics.tpl"} +
+
+
+ {/if} +
+
+
+
- {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 1} - {include file="CRM/Contact/Page/View/SummaryHook.tpl"} - {/if} - {else} - {include file="CRM/Contact/Page/View/SummaryHook.tpl"} - {/if} + {if $showCustomData} +
+
+
+ {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='1'} +
+
+ {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='0'} +
+ +
+
+
+ {/if} + + {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 1} + {include file="CRM/Contact/Page/View/SummaryHook.tpl"} + {/if} + {else} + {include file="CRM/Contact/Page/View/SummaryHook.tpl"} + {/if}
-
+
- + {/if} {* CRM-10560 *}