Split View Relationship tpl ito own file

The inclusion of  templates/CRM/Contact/Form/Relationship.tpl simply contains a chunk
of code for the view file in a big IF - this separates that out it's own file & is
more thoughtful about the inclusion....

diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index 37f9a5a6271b22d63562e4d78c8964359e0ed670..f1fc994faa899b6fa7c1e860f442b316c4a82f9d 100644 (file)
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -9,65 +9,6 @@
 *}
 {* this template is used for adding/editing/viewing relationships  *}
 
-  {if $action eq 4 } {* action = view *}
-    <div class="crm-block crm-content-block crm-relationship-view-block">
-      <table class="crm-info-panel">
-        {foreach from=$viewRelationship item="row"}
-          <tr>
-            <td class="label">{$row.relation}</td>
-            <td><a class="no-popup" href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.cid`"}">{$row.name}</a></td>
-          </tr>
-          {if $isCurrentEmployer}
-            <tr><td class="label">{ts}Current Employee?{/ts}</td><td>{ts}Yes{/ts}</td></tr>
-          {/if}
-          {if $row.start_date}
-            <tr><td class="label">{ts}Start Date{/ts}</td><td>{$row.start_date|crmDate}</td></tr>
-          {/if}
-          {if $row.end_date}
-            <tr><td class="label">{ts}End Date{/ts}</td><td>{$row.end_date|crmDate}</td></tr>
-          {/if}
-          {if $row.description}
-            <tr><td class="label">{ts}Description{/ts}</td><td>{$row.description}</td></tr>
-          {/if}
-          {foreach from=$viewNote item="rec"}
-            {if $rec }
-              <tr><td class="label">{ts}Note{/ts}</td><td>{$rec}</td></tr>
-            {/if}
-          {/foreach}
-          <tr>
-            <td class="label"><label>{ts}Permissions{/ts}</label></td>
-            <td>
-              {if $row.is_permission_a_b or $row.is_permission_b_a}
-                {if $row.is_permission_a_b}
-                  <div>
-                  {if $row.rtype EQ 'a_b' AND $is_contact_id_a}
-                    {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_a_b permDisplayName=$displayName otherDisplayName=$row.display_name displayText=true}
-                  {else}
-                    {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_a_b otherDisplayName=$displayName permDisplayName=$row.display_name displayText=true}
-                  {/if}
-                  </div>
-                {/if}
-                {if $row.is_permission_b_a}
-                  <div>
-                  {if $row.rtype EQ 'a_b' AND $is_contact_id_a}
-                    {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_b_a otherDisplayName=$displayName permDisplayName=$row.display_name displayText=true}
-                  {else}
-                    {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_b_a permDisplayName=$displayName otherDisplayName=$row.display_name displayText=true}
-                  {/if}
-                  </div>
-                {/if}
-              {else}
-                {ts}None{/ts}
-              {/if}
-            </td>
-          </tr>
-          <tr><td class="label">{ts}Status{/ts}</td><td>{if $row.is_active}{ts}Enabled{/ts}{else}{ts}Disabled{/ts}{/if}</td></tr>
-        {/foreach}
-      </table>
-      {include file="CRM/Custom/Page/CustomDataView.tpl"}
-    </div>
-  {/if}
-
   {if $action eq 2 or $action eq 1} {* add and update actions *}
     <div class="crm-block crm-form-block crm-relationship-form-block">
       <table class="form-layout-compressed">

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index 2cffd1e82f0394a4e666537debc4977df1ec57fa..bdc7ac33cd9133fcfcb35a06593683a95955a2f8 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -8,7 +8,9 @@
  +--------------------------------------------------------------------+
 *}
 {* Relationship tab within View Contact - browse, and view relationships for a contact *}
-{if $action neq 16} {* add, update or view *}
+{if $action eq 4 } {* action = view *}
+  {include file="CRM/Contact/Page/View/ViewRelationship.tpl"}
+{elseif $action neq 16} {* add, update *}
   {include file="CRM/Contact/Form/Relationship.tpl"}
 {else}
   <div id="contact-summary-relationship-tab" class="view-content">

diff --git a/templates/CRM/Contact/Page/View/ViewRelationship.tpl b/templates/CRM/Contact/Page/View/ViewRelationship.tpl
new file mode 100644 (file)
index 0000000..1c675a1
--- /dev/null
+++ b/templates/CRM/Contact/Page/View/ViewRelationship.tpl
@@ -0,0 +1,58 @@
+<div class="crm-block crm-content-block crm-relationship-view-block">
+  <table class="crm-info-panel">
+      {foreach from=$viewRelationship item="row"}
+        <tr>
+          <td class="label">{$row.relation}</td>
+          <td><a class="no-popup" href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.cid`"}">{$row.name}</a></td>
+        </tr>
+          {if $isCurrentEmployer}
+            <tr><td class="label">{ts}Current Employee?{/ts}</td><td>{ts}Yes{/ts}</td></tr>
+          {/if}
+          {if $row.start_date}
+            <tr><td class="label">{ts}Start Date{/ts}</td><td>{$row.start_date|crmDate}</td></tr>
+          {/if}
+          {if $row.end_date}
+            <tr><td class="label">{ts}End Date{/ts}</td><td>{$row.end_date|crmDate}</td></tr>
+          {/if}
+          {if $row.description}
+            <tr><td class="label">{ts}Description{/ts}</td><td>{$row.description}</td></tr>
+          {/if}
+          {foreach from=$viewNote item="rec"}
+              {if $rec }
+                <tr><td class="label">{ts}Note{/ts}</td><td>{$rec}</td></tr>
+              {/if}
+          {/foreach}
+        <tr>
+          <td class="label"><label>{ts}Permissions{/ts}</label></td>
+          <td>
+              {if $row.is_permission_a_b or $row.is_permission_b_a}
+                  {if $row.is_permission_a_b}
+                    <div>
+                        {if $row.rtype EQ 'a_b' AND $is_contact_id_a}
+                            {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_a_b permDisplayName=$displayName otherDisplayName=$row.display_name displayText=true}
+                        {else}
+                            {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_a_b otherDisplayName=$displayName permDisplayName=$row.display_name displayText=true}
+                        {/if}
+                    </div>
+                  {/if}
+                  {if $row.is_permission_b_a}
+                    <div>
+                        {if $row.rtype EQ 'a_b' AND $is_contact_id_a}
+                            {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_b_a otherDisplayName=$displayName permDisplayName=$row.display_name displayText=true}
+                        {else}
+                            {include file="CRM/Contact/Page/View/RelationshipPerm.tpl" permType=$row.is_permission_b_a permDisplayName=$displayName otherDisplayName=$row.display_name displayText=true}
+                        {/if}
+                    </div>
+                  {/if}
+              {else}
+                  {ts}None{/ts}
+              {/if}
+          </td>
+        </tr>
+        <tr><td class="label">{ts}Status{/ts}</td><td>{if $row.is_active}{ts}Enabled{/ts}{else}{ts}Disabled{/ts}{/if}</td></tr>
+      {/foreach}
+  </table>
+    {include file="CRM/Custom/Page/CustomDataView.tpl"}
+</div>
+
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>