CRM-13992 : custom data single record view handling, DELETE action handling, QA check...

[civicrm-core.git] / templates / CRM / Contact / Page / View / Relationship.tpl

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index 417209ab4ebb1d76d208819eb1fbfafe6c52e75b..7ae47ea55af28567f926260700736e9fb988ce58 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -26,13 +26,12 @@
 {* Relationship tab within View Contact - browse, and view relationships for a contact *}
 {if !empty($cdType) }
   {include file="CRM/Custom/Form/CustomData.tpl"}
+{elseif $action neq 16} {* add, update or view *}
+  {include file="CRM/Contact/Form/Relationship.tpl"}
 {else}
- <div class="view-content">
-   {if $action eq 1 or $action eq 2 or $action eq 4 or $action eq 8} {* add, update or view *}
-    {include file="CRM/Contact/Form/Relationship.tpl"}
-  {/if}
+<div class="view-content">
 <div class="crm-block crm-content-block">
-  {if $action NEQ 1 AND $action NEQ 2 AND $permission EQ 'edit'}
+  {if $permission EQ 'edit'}
         <div class="action-link">
             <a accesskey="N" href="{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}" class="button"><span><div class="icon add-icon"></div>{ts}Add Relationship{/ts}</span></a>
         </div>
@@ -70,16 +69,17 @@
                 {assign var = "rtype" value = "b_a" }
             {/if*}
 
-            <tr id="rel_{$rel.id}" class="{cycle values="odd-row,even-row"} row-relationship {if $rel.is_permission_a_b eq 1 or $rel.is_permission_b_a eq 1}row-highlight{/if}">
+            <tr id="relationship-{$rel.id}" class="crm-entity {cycle values="odd-row,even-row"} row-relationship {if $rel.is_permission_a_b eq 1 or $rel.is_permission_b_a eq 1}row-highlight{/if}">
 
             {if $relationshipTabContext}
-                <td class="bold">
-                   <a href="{crmURL p='civicrm/contact/view/rel' q="action=view&reset=1&selectedChild=rel&cid=`$contactId`&id=`$rel.id`&rtype=`$rel.rtype`"}">{$rel.relation}</a>
-      {if ($rel.cid eq $rel.contact_id_a and $rel.is_permission_a_b eq 1) OR
-          ($rel.cid eq $rel.contact_id_b and $rel.is_permission_b_a eq 1) }
-                <span id="permission-b-a" class="crm-marker permission-relationship"> *</span>
-            {/if}
-    </td>
+              <td class="bold">
+                <a href="{crmURL p='civicrm/contact/view/rel' q="action=view&reset=1&selectedChild=rel&cid=`$contactId`&id=`$rel.id`&rtype=`$rel.rtype`"}">{$rel.relation}</a>
+                {if ($rel.cid eq $rel.contact_id_a and $rel.is_permission_a_b eq 1) OR
+                ($rel.cid eq $rel.contact_id_b and $rel.is_permission_b_a eq 1) }
+                  <span id="permission-b-a" class="crm-marker permission-relationship"> *</span>
+                {/if}
+                {if $rel.description}<p class='description'>{$rel.description}</p>{/if}
+             </td>
                 <td>
        <a href="{crmURL p='civicrm/contact/view' q="action=view&reset=1&cid=`$rel.cid`"}">{$rel.name}</a>
             {if ($contactId eq $rel.contact_id_a and $rel.is_permission_a_b eq 1) OR
@@ -114,21 +114,20 @@
 {/if}
 {* end of code to show current relationships *}
 
-{if NOT ($currentRelationships or $inactiveRelationships) }
-
-  {if $action NEQ 1} {* show 'no relationships' message - unless already in 'add' mode. *}
+{if $currentRelationships or $inactiveRelationships}
+  {include file="CRM/common/enableDisableApi.tpl"}
+{else}
        <div class="messages status no-popup">
             <div class="icon inform-icon"></div>
-           {capture assign=crmURL}{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}{/capture}
+           {capture assign=link}accesskey="N" class="action-item action-item-first" href="{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}"{/capture}
            {if $permission EQ 'edit'}
-                    {ts 1=$crmURL}There are no Relationships entered for this contact. You can <a accesskey="N" href='%1'>add one</a>.{/ts}
+                    {ts 1=$link}There are no Relationships entered for this contact. You can <a %1>add one</a>.{/ts}
                 {elseif ! $relationshipTabContext}
                     {ts}There are no related contacts / organizations on record for you.{/ts}
                 {else}
                     {ts}There are no Relationships entered for this contact.{/ts}
                 {/if}
         </div>
-  {/if}
 {/if}
 </div>
 <div class="spacer"></div>
@@ -146,12 +145,15 @@
         <tr>
             <th>{ts}Relationship{/ts}</th>
             <th></th>
+            <th id="dis-start_date">{ts}Start{/ts}</th>
+            <th id="dis-end_date">{ts}End{/ts}</th>
             <th>{ts}City{/ts}</th>
             <th>{ts}State/Prov{/ts}</th>
+            <th>{ts}Email{/ts}</th>
             <th>{ts}Phone{/ts}</th>
-            <th id="dis-end_date">{ts}End Date{/ts}</th>
             <th></th>
             <th class="hiddenElement"></th>
+            <th class="hiddenElement"></th>
         </tr>
         </thead>
         {foreach from=$inactiveRelationships item=rel}
@@ -161,14 +163,20 @@
           {else}
             {assign var = "rtype" value = "a_b" }
           {/if}
-          <tr id="rel_{$rel.id}" class="{cycle values="odd-row,even-row"}">
-            <td class="bold">{$rel.relation}</td>
+          <tr id="relationship-{$rel.id}" class="crm-entity {cycle values="odd-row,even-row"}">
+            <td class="bold">
+              {$rel.relation}
+              {if $rel.description}<p class='description'>{$rel.description}</p>{/if}
+            </td>
             <td><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$rel.cid`"}">{$rel.name}</a></td>
+            <td class="dis-crm-rel-start_date">{$rel.start_date}</td>
+            <td class="dis-crm-rel-end_date">{$rel.end_date}</td>
             <td>{$rel.city}</td>
             <td>{$rel.state}</td>
+            <td>{$rel.email}</td>
             <td>{$rel.phone}</td>
-            <td>{$rel.end_date}</td>
             <td class="nowrap">{$rel.action|replace:'xx':$rel.id}</td>
+            <td class="dis-start_date hiddenElement">{$rel.start_date|crmDate}</td>
             <td class="dis-end_date hiddenElement">{$rel.end_date|crmDate}</td>
           </tr>
         {/foreach}