Add add_person/add_business flows; tidy contact view/edit for type

- add_person.php + add_person.tpl: minimal form, auto-injects $00
- add_business.php + add_business.tpl: org name + $02+ type checkboxes
- menu_contact.tpl: replace generic edit link with Add Person / Add Business
- Contact.php: fix title overwrite (org no longer clobbers person name);
  fix null trim on organisation; fix $00 type xref stored correctly
- edit.php: isPerson flag; xref groups loaded; type list filtered $02+ for businesses
- edit.tpl: person/business field visibility; tabbed xref block at bottom of Details tab
- edit_type_header.tpl: value fixed to {$type.item}; $00/$01 filtered out
- display_contact.tpl: person/business field selection; note above addresses;
  no-addresses fallback removed; allow_edit=false on xref tabs
- display_type_header.tpl: heading Personal/Business Contact; $02+ types only
- contact_date_bar.tpl: remove Add crossref shortcut (now in edit tabs)
- view_xref_*_item.tpl: dates and edit actions gated on $xrefAllowEdit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

18 files changed, 213 insertions, 92 deletions

diff --git a/templates/add_business.tpl b/templates/add_business.tpl
new file mode 100644
index 0000000..b696949
--- /dev/null
+++ b/templates/add_business.tpl
@@ -0,0 +1,45 @@
+{strip}
+<div class="edit contact">
+	<div class="header">
+		<h1>{tr}Add Business{/tr}</h1>
+	</div>
+
+	<div class="body">
+		{formfeedback error=$errors}
+
+		{form id="addBusinessForm"}
+			<div class="form-group">
+				{formlabel label="Organisation" for="organisation"}
+				{forminput}
+					<input type="text" class="form-control" name="organisation" id="organisation" value="{$smarty.request.organisation|escape}" />
+				{/forminput}
+			</div>
+
+			{if $businessTypes}
+			<div class="form-group">
+				{formlabel label="Type"}
+				{forminput}
+					{foreach from=$businessTypes item=type}
+						<label class="checkbox">
+							<input type="checkbox" name="contact_types[]" value="{$type.item|escape}" /> {$type.name|escape}
+						</label>
+					{/foreach}
+				{/forminput}
+			</div>
+			{/if}
+
+			<div class="form-group">
+				{formlabel label="Note" for="edit"}
+				{forminput}
+					<input type="text" class="form-control" name="edit" id="edit" value="{$smarty.request.edit|escape}" />
+				{/forminput}
+			</div>
+
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fCancel"      value="{tr}Cancel{/tr}" />
+				<input type="submit" class="btn btn-primary" name="fSaveContact" value="{tr}Save{/tr}" />
+			</div>
+		{/form}
+	</div>
+</div>
+{/strip}
diff --git a/templates/add_person.tpl b/templates/add_person.tpl
new file mode 100644
index 0000000..079fa5e
--- /dev/null
+++ b/templates/add_person.tpl
@@ -0,0 +1,53 @@
+{strip}
+<div class="edit contact">
+	<div class="header">
+		<h1>{tr}Add Person{/tr}</h1>
+	</div>
+
+	<div class="body">
+		{formfeedback error=$errors}
+
+		{form id="addPersonForm"}
+			<div class="form-group">
+				{formlabel label="Title" for="prefix"}
+				{forminput}
+					<input type="text" class="form-control input-small" name="prefix" id="prefix" value="{$smarty.request.prefix|escape}" placeholder="Mr / Mrs / Dr …" />
+				{/forminput}
+			</div>
+
+			<div class="form-group">
+				{formlabel label="Forename" for="forename"}
+				{forminput}
+					<input type="text" class="form-control" name="forename" id="forename" value="{$smarty.request.forename|escape}" />
+				{/forminput}
+			</div>
+
+			<div class="form-group">
+				{formlabel label="Surname" for="surname"}
+				{forminput}
+					<input type="text" class="form-control" name="surname" id="surname" value="{$smarty.request.surname|escape}" />
+				{/forminput}
+			</div>
+
+			<div class="form-group">
+				{formlabel label="Suffix" for="suffix"}
+				{forminput}
+					<input type="text" class="form-control input-small" name="suffix" id="suffix" value="{$smarty.request.suffix|escape}" />
+				{/forminput}
+			</div>
+
+			<div class="form-group">
+				{formlabel label="Note" for="edit"}
+				{forminput}
+					<input type="text" class="form-control" name="edit" id="edit" value="{$smarty.request.edit|escape}" />
+				{/forminput}
+			</div>
+
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fCancel"      value="{tr}Cancel{/tr}" />
+				<input type="submit" class="btn btn-primary" name="fSaveContact" value="{tr}Save{/tr}" />
+			</div>
+		{/form}
+	</div>
+</div>
+{/strip}
diff --git a/templates/contact_date_bar.tpl b/templates/contact_date_bar.tpl
index 883a597..6facd39 100755
--- a/templates/contact_date_bar.tpl
+++ b/templates/contact_date_bar.tpl
@@ -5,7 +5,6 @@
   {if $print_page ne 'y'}
     {if !$lock}
       {if $gBitUser->hasPermission('p_edit_contact')}
-		{smartlink ititle='Add additional crossref record' ifile="add_xref.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id group=-1}
 		{smartlink ititle="Edit Contact" ifile="edit.php" booticon="icon-user-edit" content_id=$gContent->mInfo.content_id}
       {/if}
     {/if}
diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl
index 0db300c..be3ed4e 100755
--- a/templates/display_contact.tpl
+++ b/templates/display_contact.tpl
@@ -9,20 +9,19 @@
 			<div class="clear"></div>
 		</div>
 		{/if}
-		{if isset($gContent->mInfo.name) && ($gContent->mInfo.name <> '') }
+		{if $gContent->mInfo.contact_types.0.content_id}
 		<div class="form-group">
-			{formlabel label="Name" for="name"}
+			{formlabel label="Name"}
 			{forminput}
-				{$gContent->mInfo.name|escape} 
+				{$gContent->mInfo.name|escape}
 			{/forminput}
 			<div class="clear"></div>
 		</div>
-		{/if}
-		{if isset($gContent->mInfo.organisation) && ($gContent->mInfo.organisation <> '') }
+		{else}
 		<div class="form-group">
-			{formlabel label="Organisation" for="organisation"}
+			{formlabel label="Organisation"}
 			{forminput}
-				{$gContent->mInfo.organisation|escape} 
+				{$gContent->mInfo.organisation|escape}
 			{/forminput}
 			<div class="clear"></div>
 		</div>
@@ -45,26 +44,21 @@
 			<div class="clear"></div>
 		</div>
 		{/if}
-		{section name=address loop=$gContent->mInfo.address}
-			{include file="bitpackage:contact/display_address.tpl" header=$gContent->mInfo.address[address].source_title address=$gContent->mInfo.address[address] locate=1}
-		{sectionelse}
-			<li class="item norecords">
-				{tr}No addresses found{/tr}
-				{if $gBitUser->hasPermission('p_edit_contact')}
-					{smartlink ititle="Add an address record" ifile="add_xref_address.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id}
-				{/if}
-			</li>
-		{/section}
-
+		{if $gContent->mInfo.data}
 		<div class="form-group">
-			{formlabel label="General Notes" for="data"}
+			{formlabel label="Note"}
 			{forminput}
 				{$gContent->mInfo.data}
 			{/forminput}
 		</div>
+		{/if}
+
+		{section name=address loop=$gContent->mInfo.address}
+			{include file="bitpackage:contact/display_address.tpl" header=$gContent->mInfo.address[address].source_title address=$gContent->mInfo.address[address] locate=1}
+		{/section}
 
 		{jstabs}
 			{section name=type loop=$gContent->mInfo.type}
-				{include file="bitpackage:liberty/list_xref.tpl" source=$gContent->mInfo.type[type].source source_title=$gContent->mInfo.type[type].title group=$gContent->mInfo.type[type].sort_order allow_add=true}
+				{include file="bitpackage:liberty/list_xref.tpl" source=$gContent->mInfo.type[type].source source_title=$gContent->mInfo.type[type].title group=$gContent->mInfo.type[type].sort_order allow_edit=false}
 			{/section}
 		{/jstabs}
diff --git a/templates/display_type_header.tpl b/templates/display_type_header.tpl
index 7440659..350ce1c 100755
--- a/templates/display_type_header.tpl
+++ b/templates/display_type_header.tpl
@@ -1,8 +1,8 @@
 <div class="form-group">
-	{formlabel label="Content Types" for=content_types}
+	{formlabel label="{if $gContent->mInfo.contact_types.0.content_id}Personal Contact{else}Business Contact{/if}"}
 	{forminput}
 		{foreach from=$gContent->mInfo.contact_types key=type_id item=type}
-			{if isset($type.content_id) }{$type.cross_ref_title}<br/> {/if}
+			{if isset($type.content_id) && $type.item gt '$01'}{$type.cross_ref_title}<br/>{/if}
 		{/foreach}
 	{/forminput}
 	<div class="clear"></div>
diff --git a/templates/edit.tpl b/templates/edit.tpl
index 82a7086..ca3b9cb 100755
--- a/templates/edit.tpl
+++ b/templates/edit.tpl
@@ -51,8 +51,10 @@
 							<div class="clear"></div>
 						</div>
 
-						{include file="bitpackage:contact/edit_type_header.tpl"}
-							
+						{if !$isPerson}
+							{include file="bitpackage:contact/edit_type_header.tpl"}
+						{/if}
+
 						{if $gContent->mInfo.name || $gContent->mInfo.contact_types.0.content_id || !isset( $gContent->mInfo.contact_types ) }
 							<div class="form-group">
 								{formlabel label="Title" for="prefix"}
@@ -83,7 +85,7 @@
 								<div class="clear"></div>
 							</div>
 						{/if}
-						{if $gContent->mInfo.organisation || $gContent->mInfo.contact_types.1.content_id || !isset( $gContent->mInfo.contact_types ) }
+						{if !$isPerson && ( $gContent->mInfo.organisation || !isset( $gContent->mInfo.contact_types ) )}
 							<div class="form-group">
 								{formlabel label="Organisation" for="organisation"}
 								{forminput}
@@ -95,14 +97,21 @@
 {* include edit_personal.tpl *}
 
 
-						<div class="form-group">
-							{formlabel label="Note" for="description"}
-							{forminput}
-								<input size="60" type="text" name="description" id="description" value="{$gContent->mInfo.description|escape}" />
-							{/forminput}
-							<div class="clear"></div>
-						</div>
 					{/legend}
+
+					{if $gContent->mInfo.contact_xref_groups && $gContent->isValid()}
+						{jstabs}
+							{section name=xrefGroup loop=$gContent->mInfo.contact_xref_groups}
+								{include file=$gContent->getXrefListTemplate($gContent->mInfo.contact_xref_groups[xrefGroup].template)
+									source=$gContent->mInfo.contact_xref_groups[xrefGroup].source
+									source_title=$gContent->mInfo.contact_xref_groups[xrefGroup].title
+									group=$gContent->mInfo.contact_xref_groups[xrefGroup].sort_order
+									allow_add=true
+									allow_edit=true}
+							{/section}
+						{/jstabs}
+					{/if}
+
 				{/jstab}
 
 				{jstab title="Contact Notes"}
diff --git a/templates/edit_type_header.tpl b/templates/edit_type_header.tpl
index 4ca117f..3d42abb 100755
--- a/templates/edit_type_header.tpl
+++ b/templates/edit_type_header.tpl
@@ -3,7 +3,9 @@
 	{forminput}
 		{if isset( $gContent->mInfo.contact_types ) }
 			{foreach from=$gContent->mInfo.contact_types key=type_id item=type}
-				<input type="checkbox" name="contact_types[{$type_id}]" value="{$type.item}" {if isset($type.content_id) } checked="checked"{/if} /> {$type.cross_ref_title}<br/>
+				{if $type.item gt '$01'}
+					<input type="checkbox" name="contact_types[{$type_id}]" value="{$type.item}" {if isset($type.content_id) } checked="checked"{/if} /> {$type.cross_ref_title}<br/>
+				{/if}
 			{/foreach}
 		{else}
 			{foreach from=$gContent->mInfo.contact_type_list key=type_id item=type}
diff --git a/templates/menu_contact.tpl b/templates/menu_contact.tpl
index f6602ed..0f362ba 100755
--- a/templates/menu_contact.tpl
+++ b/templates/menu_contact.tpl
@@ -3,7 +3,8 @@
 <ul class="{$packageMenuClass}">
 	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list.php">{booticon ipackage="icons" iname="icon-telephone" iexplain="List contacts" ilocation=menu}</a></li>
 	{if $gBitUser->isAdmin() || $gBitUser->hasPermission( 'p_contact_edit' ) }
-		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}edit.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Create/Edit a Contact" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}add_person.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Add Person" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}add_business.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Add Business" ilocation=menu}</a></li>
 	{/if}
 	{if !empty($gContent->mContentId) && $gBitUser->hasPermission( 'p_liberty_post_comments' ) }
 		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}display_contact.php?content_id={$gContent->mContentId}#addcomment">{booticon ipackage="icons" iname="icon-telephone-error" iexplain="Log a call" ilocation=menu}</a></li>
diff --git a/templates/view_xref_address_item.tpl b/templates/view_xref_address_item.tpl
index f8a217c..f6216e4 100755
--- a/templates/view_xref_address_item.tpl
+++ b/templates/view_xref_address_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -27,17 +28,18 @@
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_view_detail' )}
 			{smartlink ititle="View" ifile="view_xref.php" booticon="icon-view" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_bank_item.tpl b/templates/view_xref_bank_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_bank_item.tpl
+++ b/templates/view_xref_bank_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_contact_item.tpl b/templates/view_xref_contact_item.tpl
index 01a7095..86a0fa1 100755
--- a/templates/view_xref_contact_item.tpl
+++ b/templates/view_xref_contact_item.tpl
@@ -16,12 +16,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -37,14 +38,15 @@
 			{else}
 				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
 			{/if}
-		{/if}	
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_date_item.tpl b/templates/view_xref_date_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_date_item.tpl
+++ b/templates/view_xref_date_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_image_item.tpl b/templates/view_xref_image_item.tpl
index 9784fd9..2a4599c 100755
--- a/templates/view_xref_image_item.tpl
+++ b/templates/view_xref_image_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_inc_report_item.tpl b/templates/view_xref_inc_report_item.tpl
index 2c5ee03..31d7557 100755
--- a/templates/view_xref_inc_report_item.tpl
+++ b/templates/view_xref_inc_report_item.tpl
@@ -29,14 +29,14 @@
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_view_detail' )}
 			{smartlink ititle="View" ifile="view_form.php" booticon="icon-view" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
-		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
+		{/if}
+		{if $xrefAllowEdit && $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
 {/strip}
diff --git a/templates/view_xref_locate_item.tpl b/templates/view_xref_locate_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_locate_item.tpl
+++ b/templates/view_xref_locate_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_phone_item.tpl b/templates/view_xref_phone_item.tpl
index dfaf036..1f609fb 100755
--- a/templates/view_xref_phone_item.tpl
+++ b/templates/view_xref_phone_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_sig_item.tpl b/templates/view_xref_sig_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_sig_item.tpl
+++ b/templates/view_xref_sig_item.tpl
@@ -11,12 +11,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -26,15 +27,16 @@
 <td>
 	<span class="actionicon">
 		{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
-				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
-		{/if}	
+			{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}
diff --git a/templates/view_xref_text_item.tpl b/templates/view_xref_text_item.tpl
index 01a7095..86a0fa1 100755
--- a/templates/view_xref_text_item.tpl
+++ b/templates/view_xref_text_item.tpl
@@ -16,12 +16,13 @@
 <td>
 	{$gContent->mInfo.$source[xref].data|escape}
 </td>
+{if $xrefAllowEdit}
 <td>
 {if $source ne 'history' }
 	{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}	
+{else}
 	{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}	
+{/if}
 </td>
 {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
 	<td>
@@ -37,14 +38,15 @@
 			{else}
 				{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
 			{/if}
-		{/if}	
+		{/if}
 		{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
 			{if $source eq 'history' }
 				{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
 			{else}
 				{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
-			{/if}	
-		{/if}	
+			{/if}
+		{/if}
 	</span>
 </td>
+{/if}
 {/strip}