Dat type pemplates need to identify when they are used in parallel.

Add was failing because we did not pass the data properly

7 files changed, 23 insertions, 23 deletions

diff --git a/templates/edit_xref_address_fields.tpl b/templates/edit_xref_address_fields.tpl
index ee24a71..0595d85 100644
--- a/templates/edit_xref_address_fields.tpl
+++ b/templates/edit_xref_address_fields.tpl
@@ -1,16 +1,16 @@
 {strip}
 <div class="row">
-	{formlabel label="House Name/Number" for="xkey_ext"}
+	{formlabel label="House Name/Number" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="House name and/or number when used with postcode, or free format full address."}
 	{/forminput}
 </div>
 
 <div class="row">
-	{formlabel label="Postcode" for="xkey"}
+	{formlabel label="Postcode" for="`$output`xkey"}
 	{forminput}
-		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />&nbsp;<input type="submit" name="fPostcode" value="{tr}Postcode Lookup{/tr}" />
+		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />&nbsp;<input type="submit" name="fPostcode" value="{tr}Postcode Lookup{/tr}" />
 		{formhelp note="Postcode for address."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_contact_fields.tpl b/templates/edit_xref_contact_fields.tpl
index a9c30fc..c3c7c58 100644
--- a/templates/edit_xref_contact_fields.tpl
+++ b/templates/edit_xref_contact_fields.tpl
@@ -1,16 +1,16 @@
 {strip}
 <div class="row">
-	{formlabel label="`$xrefInfo.template_title` Phone Number" for="xkey"}
+	{formlabel label="`$xrefInfo.template_title` Phone Number" for="`$output`xkey"}
 	{forminput}
-		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
+		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
 		{formhelp note="Phone number for `$xrefInfo.template_title` type of xref record."}
 	{/forminput}
 </div>
 
 <div class="row">
-	{formlabel label="`$xrefInfo.template_title` Name" for="xkey_ext"}
+	{formlabel label="`$xrefInfo.template_title` Name" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="Name for `$xrefInfo.template_title` type of xref record."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_key_seal_fields.tpl b/templates/edit_xref_key_seal_fields.tpl
index d7a5f81..1879e60 100644
--- a/templates/edit_xref_key_seal_fields.tpl
+++ b/templates/edit_xref_key_seal_fields.tpl
@@ -1,16 +1,16 @@
 {strip}
 <div class="row">
-	{formlabel label="Key Seal Code" for="xkey"}
+	{formlabel label="Key Seal Code" for="`$output`xkey"}
 	{forminput}
-		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
+		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
 		{formhelp note="Key Seal Code from key management system."}
 	{/forminput}
 </div>
 
 <div class="row">
-	{formlabel label="Contract Number" for="xkey_ext"}
+	{formlabel label="Contract Number" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="Contract number."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_locate_fields.tpl b/templates/edit_xref_locate_fields.tpl
index 5fd6a6e..1514f4a 100644
--- a/templates/edit_xref_locate_fields.tpl
+++ b/templates/edit_xref_locate_fields.tpl
@@ -1,6 +1,6 @@
 {strip}
 <div class="row">
-	{formlabel label="Geographic Location" for="xref"}
+	{formlabel label="Geographic Location" for="`$output`xref"}
 	{forminput}
 		<a class="item" href="http://www.openstreetmap.org/?lat={$xrefInfo.xkey_ext}&lon={$xrefInfo.xkey}&zoom=15&layers=MN" target="_blank">{tr}OpenStreetMap Link{/tr}</a>
 		{formhelp note="Use one of the graphical tools like multimap or google maps to identify actual co-ordinates."}
@@ -8,17 +8,17 @@
 </div>
 
 <div class="row">
-	{formlabel label="Easting/Longitude" for="xkey"}
+	{formlabel label="Easting/Longitude" for="`$output`xkey"}
 	{forminput}
-		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
+		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
 		{formhelp note="Longitude for the location."}
 	{/forminput}
 </div>
 
 <div class="row">
-	{formlabel label="Northing/Latitude" for="xkey_ext"}
+	{formlabel label="Northing/Latitude" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="Latitude for the location."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_phone_fields.tpl b/templates/edit_xref_phone_fields.tpl
index fc64d21..86358c0 100644
--- a/templates/edit_xref_phone_fields.tpl
+++ b/templates/edit_xref_phone_fields.tpl
@@ -1,8 +1,8 @@
 {strip}
 <div class="row">
-	{formlabel label="`$xrefInfo.template_title` Number" for="xkey"}
+	{formlabel label="`$xrefInfo.template_title` Number" for="`$output`xkey"}
 	{forminput}
-		<input type="text" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
+		<input type="text" name="{$output}xkey" id="xkey" value="{$xrefInfo.xkey|escape}" />
 		{formhelp note="Telephone number. Use (+xx) for country code and include leading zero."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_text_fields.tpl b/templates/edit_xref_text_fields.tpl
index 39b57f5..00ed7d5 100644
--- a/templates/edit_xref_text_fields.tpl
+++ b/templates/edit_xref_text_fields.tpl
@@ -1,8 +1,8 @@
 {strip}
 <div class="row">
-	{formlabel label="`$xrefInfo.template_title` Text" for="xkey_ext"}
+	{formlabel label="`$xrefInfo.template_title` Text" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="Simple free format text entries like email or web addresses."}
 	{/forminput}
 </div>
diff --git a/templates/edit_xref_value_fields.tpl b/templates/edit_xref_value_fields.tpl
index 9e29b40..e776f6d 100644
--- a/templates/edit_xref_value_fields.tpl
+++ b/templates/edit_xref_value_fields.tpl
@@ -1,8 +1,8 @@
 {strip}
 <div class="row">
-	{formlabel label="`$xrefInfo.template_title` Value" for="xkey_ext"}
+	{formlabel label="`$xrefInfo.template_title` Value" for="`$output`xkey_ext"}
 	{forminput}
-		<input type="text" name="xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
+		<input type="text" name="{$output}xkey_ext" id="xkey_ext" value="{$xrefInfo.xkey_ext|escape}" />
 		{formhelp note="Numeric values such as distaces and counts."}
 	{/forminput}
 </div>