From: kurund Date: Mon, 8 Jun 2015 16:16:08 +0000 (+0530) Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-08-21-41-06 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5b141f201eeccd319743cc64b5d8154897ec13ea;p=civicrm-core.git Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-08-21-41-06 Conflicts: templates/CRM/Case/Form/CaseView.tpl --- 5b141f201eeccd319743cc64b5d8154897ec13ea diff --cc templates/CRM/Case/Form/CaseView.tpl index 3273107be7,edd2b1e26f..51cbc49e21 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@@ -27,172 -27,222 +27,172 @@@
-{* here we are showing related cases w/ jquery dialog *} -{if $showRelatedCases} - {include file="CRM/Case/Form/ViewRelatedCases.tpl"} - -{* Main case view *} -{else} - -

{ts}Summary{/ts}

- - {if $multiClient} - - - - {/if} - - {if not $multiClient} - + + + +
+ +
+ {if $hasRelatedCases} +
{$relatedCaseLabel}
+ {/if} + + {/if} - - - - - - -
- {ts}Clients:{/ts} - {foreach from=$caseRoles.client item=client name=clients} - {$client.display_name}{if not $smarty.foreach.clients.last},   {/if} - {/foreach} - - - -
- -
- {if $hasRelatedCases} -
{$relatedCaseLabel}
- {/if} -
- - {foreach from=$caseRoles.client item=client} - - - - {if $client.phone} - - - - {/if} - {if $client.birth_date} - - - - {/if} + {* here we are showing related cases w/ jquery dialog *} + {if $showRelatedCases} + {include file="CRM/Case/Form/ViewRelatedCases.tpl"} + {* Main case view *} + {else} + +

{ts}Summary{/ts}

+
{$client.display_name}
{$client.phone}
{ts}DOB{/ts}: {$client.birth_date|crmDate}
+ {if $multiClient} + +
+ {ts}Clients:{/ts} + {foreach from=$caseRoles.client item=client name=clients} + {$client.display_name}{if not $smarty.foreach.clients.last},   {/if} {/foreach} -
- {if $hasRelatedCases} -
{$relatedCaseLabel}
- {/if} -
- {ts}Subject{/ts}: {$caseDetails.case_subject} - - {ts}Type{/ts}: {$caseDetails.case_type}  - - {ts}Status{/ts}: {$caseDetails.case_status}  - - {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  - - {ts}ID{/ts}: {$caseID} -
+ + {if not $multiClient} + + + {foreach from=$caseRoles.client item=client} + + + + {if $client.phone} + + + + {/if} + {if $client.birth_date} + + + + {/if} + {/foreach} +
{$client.display_name}
{$client.phone}
{ts}DOB{/ts}: {$client.birth_date|crmDate}
+ {if $hasRelatedCases} +
{$relatedCaseLabel}
+ {/if} + + {/if} + + {ts}Subject{/ts}: {$caseDetails.case_subject} + + + {ts}Type{/ts}: {$caseDetails.case_type}  + + + {ts}Status{/ts}: {$caseDetails.case_status}  + + + {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  + + + {ts}ID{/ts}: {$caseID} + + + {if $hookCaseSummary} -
-
- {foreach from=$hookCaseSummary item=val key=div_id} -
{$val.value}
- {/foreach} -
++
+ {foreach from=$hookCaseSummary item=val key=div_id} +
{$val.value}
+ {/foreach} +
{/if} -
-
-

- {$form.add_activity_type_id.html} - {if $hasAccessToAllCases}   - {$form.timeline_id.html}{$form._qf_CaseView_next.html}   - {$form.report_id.html} - {/if} -

+
+
+

+ {$form.add_activity_type_id.html} + {if $hasAccessToAllCases}   + {$form.timeline_id.html}{$form._qf_CaseView_next.html}   + {$form.report_id.html} + {/if} +

+
+
+

+ {if $hasAccessToAllCases} + {ts}Print Report{/ts} + {/if} + + {if $mergeCases} + {ts}Merge Case{/ts} + {$form._qf_CaseView_next_merge_case.html} + + {$form.merge_case_id.html} + + {/if} + + {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))} + {ts}Assign to Another Client{/ts} + {/if} +

+
-
-

- {if $hasAccessToAllCases} - {ts}Print Report{/ts} - {/if} - {if $mergeCases} - {ts}Merge Case{/ts} - {$form._qf_CaseView_next_merge_case.html} - - {$form.merge_case_id.html} - - {/if} +

+ {include file="CRM/Case/Page/CustomDataView.tpl"} - {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))} - {ts}Assign to Another Client{/ts} + - -
-{include file="CRM/Case/Page/CustomDataView.tpl"} - - {if $hasAccessToAllCases}