From 880816e00b7e6c7e452b1aa6bf70ff88cf622eae Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 21 Jan 2015 15:28:53 -0500 Subject: [PATCH] Case ActivityView.tpl cleanup --- templates/CRM/Case/Form/ActivityView.tpl | 115 +++++++++++------------ 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/templates/CRM/Case/Form/ActivityView.tpl b/templates/CRM/Case/Form/ActivityView.tpl index 73d60df04c..c6e9bcb3c9 100644 --- a/templates/CRM/Case/Form/ActivityView.tpl +++ b/templates/CRM/Case/Form/ActivityView.tpl @@ -23,68 +23,61 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* View Case Activities *} {* Uses inline styles since we have not figured out yet how to include our normal .css files. *} +{* View Case Activities *}
-{if $revs} - {strip} - - - - - - - {foreach from=$result item=row} - - - - - - {/foreach} -
{ts}Created By{/ts}{ts}Created On{/ts} 
{$row.name}{$row.date|crmDate}{if $row.id != $latestRevisionID}View Prior Revision{else}View Current Revision{/if}
- {/strip} -{else} -{if $report} -{if $caseID} -
-{/if} - -{foreach from=$report.fields item=row name=report} - - - {if $smarty.foreach.report.first AND ( $activityID OR $parentID OR $latestRevisionID )} {* Add a cell to first row with links to prior revision listing and Prompted by (parent) as appropriate *} - - - {else} - - {/if} - -{/foreach} -{* Display custom field data for the activity. *} -{if $report.customGroups} - {foreach from=$report.customGroups item=customGroup key=groupTitle name=custom} - - + {if $revs} + {strip} +
{$row.label}{$row.value} - {if $activityID}» {ts}List all revisions{/ts}{if !$latestRevisionID}
{ts}(this is the current revision){/ts}{/if}
{/if} - {if $latestRevisionID}» {ts}View current revision{/ts}
{ts}(this is not the current revision){/ts}
{/if} - {if $parentID}» {ts}Prompted by{/ts}{/if} - 		{if $row.label eq 'Details'}{$row.value|crmStripAlternatives|nl2br}{elseif $row.type eq 'Date'}{$row.value|crmDate}{else}{$row.value}{/if}
{$groupTitle}
+ + + + - {foreach from=$customGroup item=customField name=fields} - - - - + {foreach from=$result item=row} + + + + + + {/foreach} +
{ts}Created By{/ts}{ts}Created On{/ts} 
{$customField.label}{$customField.value}
{$row.name}{$row.date|crmDate}{if $row.id != $latestRevisionID}View Prior Revision{else}View Current Revision{/if}
+ {/strip} + {else} + {if $report} + + {foreach from=$report.fields item=row name=report} + + + {if $smarty.foreach.report.first AND ( $activityID OR $parentID OR $latestRevisionID )} {* Add a cell to first row with links to prior revision listing and Prompted by (parent) as appropriate *} + + + {else} + + {/if} + {/foreach} - {/foreach} -{/if} -
{$row.label}{$row.value} + {if $activityID}» {ts}List all revisions{/ts}{if !$latestRevisionID}
{ts}(this is the current revision){/ts}{/if}
{/if} + {if $latestRevisionID}» {ts}View current revision{/ts}
{ts}(this is not the current revision){/ts}
{/if} + {if $parentID}» {ts}Prompted by{/ts}{/if} + 		{if $row.label eq 'Details'}{$row.value|crmStripAlternatives|nl2br}{elseif $row.type eq 'Date'}{$row.value|crmDate}{else}{$row.value}{/if}
-{if $caseID} -
- {ts}Manage Case{/ts} -
-{/if} -{else} -
{ts}This activity might not be attached to any case. Please investigate.{/ts}
-{/if} -{/if} + {* Display custom field data for the activity. *} + {if $report.customGroups} + {foreach from=$report.customGroups item=customGroup key=groupTitle name=custom} + + {$groupTitle} + + {foreach from=$customGroup item=customField name=fields} + + {$customField.label} + {$customField.value} + + {/foreach} + {/foreach} + {/if} + + {/if} + {/if} +
+ {crmButton p='civicrm/case' q="reset=1" class='cancel' icon='close'}{ts}Done{/ts}{/crmButton} +
-- 2.25.1