From 173b6db354a04d101f963a26217850ca8355f025 Mon Sep 17 00:00:00 2001
From: Lester Caine <lsces@lsces.co.uk>
Date: Thu, 4 Nov 2010 07:14:48 +0000
Subject: Include name element in generic data

---
 templates/display_contact.tpl |  8 ++++++
 templates/edit.tpl            | 64 +++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl
index bd4f850..1d8075e 100644
--- a/templates/display_contact.tpl
+++ b/templates/display_contact.tpl
@@ -11,6 +11,14 @@
 			{/forminput}
 		</div>
 		{/if}
+		{if isset($pageInfo.name) && ($pageInfo.name <> '') }
+		<div class="row">
+			{formlabel label="Name" for="name"}
+			{forminput}
+				{$pageInfo.name|escape} 
+			{/forminput}
+		</div>
+		{/if}
 		{if isset($pageInfo.organisation) && ($pageInfo.organisation <> '') }
 		<div class="row">
 			{formlabel label="Organisation" for="organisation"}
diff --git a/templates/edit.tpl b/templates/edit.tpl
index f2f0621..5ee9fac 100644
--- a/templates/edit.tpl
+++ b/templates/edit.tpl
@@ -53,37 +53,41 @@
 
 						{include file="bitpackage:contact/edit_type_header.tpl"}
 							
+						{if $pageInfo.name or $pageInfo.contact_types.0.content_id or !isset( $pageInfo.contact_types ) }
+							<div class="row">
+								{formlabel label="Title" for="prefix"}
+								{forminput}
+									<input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" />
+								{/forminput}
+							</div>
+							<div class="row">
+								{formlabel label="Forename" for="forename"}
+								{forminput}
+									<input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" />
+								{/forminput}
+							</div>
+							<div class="row">
+								{formlabel label="Surname" for="surname"}
+								{forminput}
+									<input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" />
+								{/forminput}
+							</div>
+							<div class="row">
+								{formlabel label="Suffix" for="suffix"}
+								{forminput}
+									<input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" />
+								{/forminput}
+							</div>
+						{/if}
+						{if $pageInfo.organisation or $pageInfo.contact_types.1.content_id or !isset( $pageInfo.contact_types ) }
+							<div class="row">
+								{formlabel label="Organisation" for="organisation"}
+								{forminput}
+									<input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" />
+								{/forminput}
+							</div>
+						{/if}
 {*						<div class="row">
-							{formlabel label="Title" for="prefix"}
-							{forminput}
-								<input size="60" type="text" name="prefix" id="prefix" value="{$pageInfo.prefix|escape}" />
-							{/forminput}
-						</div>
-						<div class="row">
-							{formlabel label="Forename" for="forename"}
-							{forminput}
-								<input size="60" type="text" name="forename" id="forename" value="{$pageInfo.forename|escape}" />
-							{/forminput}
-						</div>
-						<div class="row">
-							{formlabel label="Surname" for="surname"}
-							{forminput}
-								<input size="60" type="text" name="surname" id="surname" value="{$pageInfo.surname|escape}" />
-							{/forminput}
-						</div>
-						<div class="row">
-							{formlabel label="Suffix" for="suffix"}
-							{forminput}
-								<input size="60" type="text" name="suffix" id="suffix" value="{$pageInfo.suffix|escape}" />
-							{/forminput}
-						</div>
-						<div class="row">
-							{formlabel label="Organisation" for="organisation"}
-							{forminput}
-								<input size="60" type="text" name="organisation" id="organisation" value="{$pageInfo.organisation|escape}" />
-							{/forminput}
-						</div>
-						<div class="row">
 							{formlabel label="NI Number" for="nino"}
 							{forminput}
 								<input size="10" type="text" name="nino" id="nino" value="{$pageInfo.nino|escape}" />
-- 
cgit v1.3