Tidy up to Smarty3 and BS3

22 files changed, 102 insertions, 100 deletions

diff --git a/templates/add_xref.tpl b/templates/add_xref.tpl
index db25dab..1c2b6c2 100644
--- a/templates/add_xref.tpl
+++ b/templates/add_xref.tpl
@@ -38,7 +38,7 @@ function updateContactXrefFormat() { {/literal}
 						<div class="form-group">
 							{formlabel label="Reference Type" for="source"}
 							{forminput}
-								{html_options name="source" id="source" options=$xrefInfo.xref_type_list.list selected=$smarty.const.CONTACT_FORMAT_GENERIC onchange="updateContactXrefFormat();}
+								{html_options name="source" id="source" options=$xrefInfo.xref_type_list.list selected=$smarty.const.CONTACT_FORMAT_GENERIC onchange="updateContactXrefFormat();"}
 								{formhelp note="Select type of reference information to add"}
 							{/forminput}
 						</div>
@@ -53,7 +53,7 @@ function updateContactXrefFormat() { {/literal}
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/add_xref_address.tpl b/templates/add_xref_address.tpl
index 17b1862..67374cd 100644
--- a/templates/add_xref_address.tpl
+++ b/templates/add_xref_address.tpl
@@ -19,7 +19,7 @@
 						<div class="form-group">
 							{formlabel label="Address Type" for="source"}
 							{forminput}
-								{html_options name="$xrefInfo.xref_type_list[$xrefInfo.source]" options=$xrefInfo.xref_type_list selected=`$xrefInfo.source`}
+								{html_options name="$xrefInfo.xref_type_list[$xrefInfo.source]" options=$xrefInfo.xref_type_list selected=$xrefInfo.source}
 								{formhelp note="Type of cross link reference to add."}
 							{/forminput}
 						</div>
@@ -44,7 +44,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/admin_xref_types.tpl b/templates/admin_xref_types.tpl
index 5b6c1e1..41eb9c1 100644
--- a/templates/admin_xref_types.tpl
+++ b/templates/admin_xref_types.tpl
@@ -49,37 +49,37 @@
 
 			{section name=type loop=$xref_types}
 				<tr class="{cycle values="even,odd"}">
-					<td style="text-align:center;">
-						<h2>
+					<td class="">
+						<h3>
 							{$xref_types[type].source}
-						</h2>
+						</h3>
 					</td>
 
 					<td>
-						<h2>
+						<h3>
 							<a href="{$smarty.const.CONTACT_PKG_URL}list.php?source={$xref_types[type].source}">{$xref_types[type].cross_ref_title}</a>
 							&nbsp; <small>[ {$xref_types[type].num_entries} ]</small>
-						</h2>
+						</h3>
 
 					</td>
 
-					<td style="text-align:center;">
+					<td class="">
 						{$xref_types[type].template}
 					</td>
 
-					<td style="text-align:center;">
+					<td class="">
 						{$xref_types[type].cross_ref_href}
 					</td>
 
-					<td style="text-align:center;">
+					<td class="">
 						{$xref_types[type].multi}
 					</td>
 
-					<td style="text-align:center;">
+					<td class="">
 						{$xref_types[type].role}
 					</td>
 
-					<td align="right">
+					<td class="">
 						{smartlink ititle='edit' booticon="icon-edit" ifile='edit_xref_type.php' source=$xref_types[type].source}
 						{* smartlink ititle='permissions' booticon="icon-key" ipackage='kernel' ifile='object_permissions.php' objectName="Topic `$xref_types[type].name`" object_type=topic permType=topics object_id=$xref_types[type].topic_id *}
 						<a href="{$smarty.const.CONTACT_PKG_URL}admin/admin_topics.php?fRemoveSource=1&amp;source={$xref_types[type].topic_id}">{booticon iname="icon-trash" ipackage="icons" iforce=icon_text iexplain="Remove Source"}</a>
diff --git a/templates/contact_date_bar.tpl b/templates/contact_date_bar.tpl
index d7f1e17..77ca728 100644
--- a/templates/contact_date_bar.tpl
+++ b/templates/contact_date_bar.tpl
@@ -1,17 +1,17 @@
 <div class="floaticon">
   {if $lock}
-    {biticon ipackage="icons" iname="locked" iexplain="locked"}{$info.editor|userlink}
+    {booticon iname="icon-lock" ipackage="icons" iexplain="Locked"}{$info.editor|userlink}
   {/if}
   {if $print_page ne 'y'}
     {if !$lock}
       {if $gBitUser->hasPermission('p_edit_contact')}
-		{smartlink ititle="Add additional crossref record" ifile="add_xref.php" ibiticon="icons/bookmark-new" content_id=$pageInfo.content_id xref_type=-1}
-		{smartlink ititle="Edit Contact" ifile="edit.php" ibiticon="icons/accessories-text-editor" content_id=$pageInfo.content_id}
+		{smartlink ititle='Add additional crossref record' ifile="add_xref.php" booticon="icon-note-add" content_id=$pageInfo.content_id xref_type=-1}
+		{smartlink ititle="Edit Contact" ifile="edit.php" booticon="icon-user-edit" content_id=$pageInfo.content_id}
       {/if}
     {/if}
-    <a title="{tr}print{/tr}" href="print.php?content_id={$pageInfo.content_id}">{biticon ipackage="icons" iname="document-print" iexplain="print"}</a>
+    <a title="{tr}print{/tr}" href="print.php?content_id={$pageInfo.content_id}">{booticon ipackage="icons" iname="icon-print" iexplain="print"}</a>
       {if $gBitUser->hasPermission('p_remove_contact')}
-        <a title="{tr}remove this contact{/tr}" href="remove_contact.php?content_id={$pageInfo.content_id}">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
+        <a title="{tr}remove this contact{/tr}" href="remove_contact.php?content_id={$pageInfo.content_id}">{booticon ipackage="icons" iname="icon-user-delete" iexplain="delete"}</a>
       {/if}
   {/if} {* end print_page *}
 </div> {*end .floaticon *}
diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl
index ac4254f..92646f3 100644
--- a/templates/display_contact.tpl
+++ b/templates/display_contact.tpl
@@ -51,7 +51,7 @@
 			<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" ibiticon="icons/bookmark-new" content_id=$pageInfo.content_id}
+					{smartlink ititle="Add an address record" ifile="add_xref_address.php" booticon="icon-note-add" content_id=$pageInfo.content_id}
 				{/if}
 			</li>
 		{/section}
diff --git a/templates/edit_key_break.tpl b/templates/edit_key_break.tpl
index 959ceac..bb070af 100644
--- a/templates/edit_key_break.tpl
+++ b/templates/edit_key_break.tpl
@@ -45,7 +45,7 @@
 				{capture assign=textarea_help}
 					{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 				{/capture}
-				{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+				{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 			{/legend}
 				<div class="form-group submit">
 					<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
diff --git a/templates/edit_xref.tpl b/templates/edit_xref.tpl
index 92da394..d6659f9 100644
--- a/templates/edit_xref.tpl
+++ b/templates/edit_xref.tpl
@@ -47,7 +47,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_address.tpl b/templates/edit_xref_address.tpl
index 6153fc0..5f8af06 100644
--- a/templates/edit_xref_address.tpl
+++ b/templates/edit_xref_address.tpl
@@ -22,7 +22,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}
diff --git a/templates/edit_xref_address_fields.tpl b/templates/edit_xref_address_fields.tpl
index 284be64..56e282a 100644
--- a/templates/edit_xref_address_fields.tpl
+++ b/templates/edit_xref_address_fields.tpl
@@ -1,6 +1,6 @@
 {strip}
 <div class="form-group">
-	{formlabel label="House Name/Number" for="`$output`xkey_ext"}
+	{formlabel label="House Name/Number" for="$outputxkey_ext"}
 	{forminput}
 		<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."}
@@ -9,7 +9,7 @@
 </div>
 
 <div class="form-group">
-	{formlabel label="Postcode" for="`$output`xkey"}
+	{formlabel label="Postcode" for="$outputxkey"}
 	{forminput}
 		<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."}
diff --git a/templates/edit_xref_contact.tpl b/templates/edit_xref_contact.tpl
index 8b10506..2ea82b6 100644
--- a/templates/edit_xref_contact.tpl
+++ b/templates/edit_xref_contact.tpl
@@ -22,7 +22,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_key_seal.tpl b/templates/edit_xref_key_seal.tpl
index 7452ec7..3118ac6 100644
--- a/templates/edit_xref_key_seal.tpl
+++ b/templates/edit_xref_key_seal.tpl
@@ -38,7 +38,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_locate.tpl b/templates/edit_xref_locate.tpl
index 55795b1..3cb599d 100644
--- a/templates/edit_xref_locate.tpl
+++ b/templates/edit_xref_locate.tpl
@@ -47,7 +47,7 @@
 						{capture assign=textarea_help}
 							{tr}Directions to assist finding the actual location where site is not accessable via the postcode.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_phone.tpl b/templates/edit_xref_phone.tpl
index 77a7b3a..a3b640f 100644
--- a/templates/edit_xref_phone.tpl
+++ b/templates/edit_xref_phone.tpl
@@ -22,7 +22,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_text.tpl b/templates/edit_xref_text.tpl
index 41ebfb5..defdd3b 100644
--- a/templates/edit_xref_text.tpl
+++ b/templates/edit_xref_text.tpl
@@ -29,7 +29,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 
diff --git a/templates/edit_xref_value.tpl b/templates/edit_xref_value.tpl
index 0ae58d6..5f20952 100644
--- a/templates/edit_xref_value.tpl
+++ b/templates/edit_xref_value.tpl
@@ -22,7 +22,7 @@
 						{capture assign=textarea_help}
 							{tr}Keep the text attached to reference items short and use comment records to add larger volumns of text. This should be reserved for simple notes such 'as use after 5PM' or the link.{/tr}
 						{/capture}
-						{textarea rows=5 noformat=1 edit=$xrefInfo.data}
+						{textarea rows=5 noformat=1 id="edittext" nowysiwyg="yes" edit=$xrefInfo.data}
 					{/legend}
 				{/jstab}
 				{include file="bitpackage:contact/edit_xref_dates.tpl"}			
diff --git a/templates/list.tpl b/templates/list.tpl
index 76f440c..a6828ad 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -11,38 +11,44 @@
 
 		{include file="bitpackage:contact/display_list_header.tpl"}
 
-		<div class="navbar">
-			<ul>
-				<li>{biticon ipackage="icons" iname="emblem-symbolic-link" iexplain="sort by"}</li>
-				<li>{smartlink ititle="Contract" isort="xkey" ihash=$listInfo.ihash}</li>		
-		{*		<li>{smartlink ititle="Forename" isort="forename" ihash=$listInfo.ihash}</li>
-				<li>{smartlink ititle="Surname" isort="surname" ihash=$listInfo.ihash}</li>		*}
-				<li>{smartlink ititle="Title" isort="title" idefault=1 iorder=desc ihash=$listInfo.ihash}</li>
-		{*		<li>{smartlink ititle="Address" isort="street" ihash=$listInfo.ihash}</li>
-				<li>{smartlink ititle="Town" isort="town" ihash=$listInfo.ihash}</li>			*}
-				<li>{smartlink ititle="Location" isort="location" ihash=$listInfo.ihash}</li>
-				<li>{smartlink ititle="Postcode" isort="postcode" ihash=$listInfo.ihash}</li>
-			</ul>
-		</div>
-
-		<ul class="clear data">
+		<table class="table data clear">
+			<caption>{tr}Available Content{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
+			<tr>
+				<th class="width2p">{booticon ipackage="icons" iname="icon-link" iexplain="sort by"}</th>
+				<th>{smartlink ititle="Contract" isort="xkey" ihash=$listInfo.ihash}</th>
+	{*			{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+					<th>{smartlink ititle="Forename" isort="forename" ihash=$listInfo.ihash}</th>
+					<th>{smartlink ititle="Surname" isort="surname" ihash=$listInfo.ihash}</th>
+				{/if}	*}
+				<th>{smartlink ititle="Title" isort="title" idefault=1 iorder=desc ihash=$listInfo.ihash}</th>
+				{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+					<th>{smartlink ititle="Address" isort="street" ihash=$listInfo.ihash}</th>
+					<th>{smartlink ititle="Town" isort="town" ihash=$listInfo.ihash}</th>
+				{/if}
+				<th>{smartlink ititle="Location" isort="location" ihash=$listInfo.ihash}</th>
+				<th>{smartlink ititle="Postcode" isort="postcode" ihash=$listInfo.ihash}</th>
+			</tr>
 			{section name=content loop=$listcontacts}
-				<li class="item {cycle values='odd,even'}">
+				<tr class="{cycle values='odd,even'}">
+					<td class="alignright">
 						<a href="display_contact.php?content_id={$listcontacts[content].content_id}" title="ci_{$listcontacts[content].content_id}">
 						{$listcontacts[content].xkey}&nbsp;-&nbsp;
 						{$listcontacts[content].title}
-						</a>&nbsp;&nbsp;&nbsp;
-						{if isset($listcontacts[content].organisation) && ($listcontacts[content].organisation <> '') }Company: {$listcontacts[content].organisation}&nbsp;&nbsp;{/if} 
-						{if isset($listcontacts[content].dob) && ($listcontacts[content].dob <> '')  }DOB: {$listcontacts[content].dob}&nbsp;&nbsp;{/if}
-						{if isset($listcontacts[content].nino) && ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}&nbsp;&nbsp;{/if}
-						{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' ) }Edited: {$listcontacts[content].last_modified|bit_short_date}&nbsp;&nbsp;{/if}
-						
-					<div class="footer">
-						{if isset($listcontacts[content].uprn) && ($listcontacts[content].uprn <> '') }UPRN: {$listcontacts[content].uprn}&nbsp;&nbsp;{/if}
-						{if isset($listcontacts[content].postcode) && ($listcontacts[content].postcode <> '') }
-							{tr}Address{/tr}&nbsp;-&nbsp; 
-							{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') }
-								{$listcontacts[content].house},&nbsp;{/if}
+						</a>&
+					</td>
+					{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+						<td>{$item.content_status_name}</td>
+					{/if}
+					<td>{$item.display_link}</td>
+					<td>{assign var=content_type_guid value=$item.content_type_guid}{$gLibertySystem->getContentTypeName($content_type_guid)}</td>
+					{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+						<td>{if isset($listcontacts[content].dob) && ($listcontacts[content].dob <> '')  }DOB: {$listcontacts[content].dob}{/if}</td>
+						<td>{if isset($listcontacts[content].nino) && ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td>
+					{/if}
+					<td>{if isset($listcontacts[content].organisation) && ($listcontacts[content].organisation <> '') }Company: {$listcontacts[content].organisation}&nbsp;&nbsp;{/if}</td>
+					{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+						<td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') }
+							{$listcontacts[content].house},&nbsp;{/if}
 							{if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') }
 								{$listcontacts[content].add1},&nbsp;{/if}
 							{if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') }
@@ -50,32 +56,29 @@
 							{if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') }
 								{$listcontacts[content].add3},&nbsp;{/if}
 							{if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') }
-								{$listcontacts[content].add4},&nbsp;{/if}
-							{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') }
-								{$listcontacts[content].town},&nbsp;{/if}
-							{if isset($listcontacts[content].county) && ($listcontacts[content].county <> '') }
-								{$listcontacts[content].county},&nbsp;{/if}
-							{$listcontacts[content].postcode}&nbsp;&nbsp;
-							{if isset($listcontacts[content].grideast) }
-								&lt;{$listcontacts[content].grideast|escape}&nbsp;,&nbsp;{$listcontacts[content].gridnorth|escape}&gt;&nbsp;{/if}
-						{/if}
+								{$listcontacts[content].add4},&nbsp;{/if}</td>
+						<td>{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') }
+							{$listcontacts[content].town}{/if}</td>
+					{/if}
+					<td>{if isset($listcontacts[content].grideast) }
+						&lt;{$listcontacts[content].grideast|escape}&nbsp;,&nbsp;{$listcontacts[content].gridnorth|escape}&gt;&nbsp;{/if}
 						{if $listcontacts[content].y_coordinate and $listcontacts[content].x_coordinate }
 								&nbsp;Exact Cords:&lt;{$listcontacts[content].y_coordinate|escape}&nbsp;,&nbsp;{$listcontacts[content].x_coordinate|escape}&gt;&nbsp;
-						{/if}	
-						<br />
+						{/if}
+					</td>	
+					<td>{$listcontacts[content].postcode}</td>
+					<td>
 						{tr}Refs{/tr}: {$listcontacts[content].refs|default:0}&nbsp;&nbsp;
 						{tr}Tasks{/tr}: {$listcontacts[content].tasks|default:0}&nbsp;&nbsp;
 						{tr}Addresses{/tr}: {$listcontacts[content].addresses|default:0}
-					</div>
-					<div class="clear"></div>
-				</li>
+					</td>
+				</tr>
 			{sectionelse}
-				<li class="item norecords">
-					{tr}No records found{/tr}
-				</li>
+				<tr class="norecords">
+					<td colspan="8">{tr}No records found{/tr}</td>
+				</tr>
 			{/section}
-		</ul>
-
+		</table>
 		{pagination}
 	</div><!-- end .body -->
 </div><!-- end .contacts -->
diff --git a/templates/list_contact_type.tpl b/templates/list_contact_type.tpl
index 1f82582..b475b70 100644
--- a/templates/list_contact_type.tpl
+++ b/templates/list_contact_type.tpl
@@ -18,7 +18,7 @@
 								{$pageInfo.xref0[xref].last_update_date|bit_short_date}

 							</td>

 							<td>
-								{smartlink ititle="Add additional contact types" ifile="add_xref.php" ibiticon="icons/bookmark-new" content_id=$pageInfo.content_id}
+								{smartlink ititle="Add additional contact types" ifile="add_xref.php" booticon="icon-page-add" content_id=$pageInfo.content_id}
 							</td>
 						</tr>
 					{/section}
diff --git a/templates/list_ticket.tpl b/templates/list_ticket.tpl
index a52176f..f794fe6 100644
--- a/templates/list_ticket.tpl
+++ b/templates/list_ticket.tpl
@@ -26,7 +26,7 @@
 							</td>
 							<td>
 								<span class="actionicon">
-									{smartlink ititle="View" ifile="view_ticket.php" ibiticon="icons/accessories-text-editor" ticket_id=$pageInfo.tickets[ticket].ticket_id}
+									{smartlink ititle="View" ifile="view_ticket.php" booticon="icon-note-edit" ticket_id=$pageInfo.tickets[ticket].ticket_id}
 								</span>
 								<label for="ev_{$pageInfo.tickets[ticket].ticket_no}">	
 									{$pageInfo.tickets[ticket].staff_id}
diff --git a/templates/list_xref.tpl b/templates/list_xref.tpl
index 6f819ba..edae52c 100644
--- a/templates/list_xref.tpl
+++ b/templates/list_xref.tpl
@@ -30,7 +30,7 @@
 							<td>
 								{if isset($pageInfo.xref[xref].usn) && ($pageInfo.xref[xref].usn <> '') }
 									{$pageInfo.xref[xref].usn|escape}
-									{smartlink ititle="Link to" ifile="../property/display_property.php" ibiticon="icons/accessories-text-editor" property_id=$pageInfo.xref[xref].usn}
+									{smartlink ititle="Link to" ifile="../property/display_property.php" booticon="icon-note-edit" property_id=$pageInfo.xref[xref].usn}
 								{/if}
 							</td>
 							{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
@@ -40,10 +40,10 @@
 							{/if}
 							<td>
 								<span class="actionicon">
-									{smartlink ititle="View" ifile="view_xref.php" ibiticon="icons/view-fullscreen" source=$pageInfo.xref[xref].source xref=$pageInfo.xref[xref].cross_reference}
+									{smartlink ititle="View" ifile="view_xref.php" booticon="icon-note-go" source=$pageInfo.xref[xref].source xref=$pageInfo.xref[xref].cross_reference}
 								</span>
 								<span class="actionicon">
-									{smartlink ititle="Edit" ifile="edit_xref.php" ibiticon="icons/accessories-text-editor" source=$pageInfo.xref[xref].source xref=$pageInfo.xref[xref].cross_reference}
+									{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" source=$pageInfo.xref[xref].source xref=$pageInfo.xref[xref].cross_reference}								</span>
 								</span>
 								<label for="ev_{$pageInfo.xref[xref].cross_reference}">	
 									{$pageInfo.xref[xref].cross_reference}
diff --git a/templates/list_xref_generic.tpl b/templates/list_xref_generic.tpl
index 0602f8b..355182b 100644
--- a/templates/list_xref_generic.tpl
+++ b/templates/list_xref_generic.tpl
@@ -31,7 +31,7 @@
 							<td>
 								{if isset($pageInfo.$source[xref].xref) && $pageInfo.$source[xref].xref <> '' && $pageInfo.$source[xref].xref > 100 }
 									{$pageInfo.$source[xref].xref|escape}
-									{smartlink ititle="Link to" ifile="display_contact.php" ibiticon="icons/accessories-text-editor" content_id=$pageInfo.$source[xref].xref}
+									{smartlink ititle="Link to" ifile="display_contact.php" booticon="icon-note-edit" content_id=$pageInfo.$source[xref].xref}
 								{else}
 									------
 								{/if}
@@ -57,21 +57,21 @@
 							<td>
 								<span class="actionicon">
 									{if $gBitUser->hasPermission( 'p_contact_view_detail' )}
-										{smartlink ititle="View" ifile="view_xref.php" ibiticon="icons/view-fullscreen" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
+										{smartlink ititle="View" ifile="view_xref.php" booticon="icon-view" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
 									{/if}	
 									{if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' }
 										{if $pageInfo.$source[xref].source eq 'KEY_B' }
-											{smartlink ititle="Callout" ifile="edit_key_break.php" ibiticon="icons/edit-redo" expunge=0 content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
-											{smartlink ititle="Reseal" ifile="edit_key_break.php" ibiticon="icons/edit-undo" expunge=2 content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
+											{smartlink ititle="Callout" ifile="edit_key_break.php" booticon="icon-redo" expunge=0 content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
+											{smartlink ititle="Reseal" ifile="edit_key_break.php" booticon="icon-undo" expunge=2 content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
 										{else}
-											{smartlink ititle="Edit" ifile="edit_xref.php" ibiticon="icons/accessories-text-editor" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
+											{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id}
 										{/if}
 									{/if}	
 									{if $gBitUser->hasPermission( 'p_contact_expunge' ) and $pageInfo.$source[xref].source ne 'KEY_B' }
 										{if $source eq 'history' }
-											{smartlink ititle="Restore" ifile="edit_xref.php" ibiticon="icons/edit-undo" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=-1}
+											{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=-1}
 										{else}
-											{smartlink ititle="Delete" ifile="edit_xref.php" ibiticon="icons/edit-delete" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=1}
+											{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$pageInfo.content_id xref_id=$pageInfo.$source[xref].xref_id expunge=1}
 										{/if}	
 									{/if}	
 								</span>
@@ -90,7 +90,7 @@
 		{if $gBitUser->hasPermission('p_contact_update')}
 			<div>
 				{if $source ne 'history' }
-					{smartlink ititle="Add additional detail record" ifile="add_xref.php" ibiticon="icons/bookmark-new" content_id=$pageInfo.content_id xref_type=$xref_type}
+					{smartlink ititle="Add additional detail record" ifile="add_xref.php" booticon="icon-note-add" content_id=$pageInfo.content_id xref_type=$xref_type}
 				{/if}	
 			</div>
 		{/if}
diff --git a/templates/menu_contact.tpl b/templates/menu_contact.tpl
index d95796c..1140569 100644
--- a/templates/menu_contact.tpl
+++ b/templates/menu_contact.tpl
@@ -1,19 +1,18 @@
 {strip}
 {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
-	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list.php">{tr}List Contacts{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{tr}List Domestic Contracts{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{tr}List Business Contracts{/tr}</a></li>
+	<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>
+	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{booticon ipackage="icons" iname="icon-telephone-key" iexplain="List domestic contacts" ilocation=menu}</a></li>
+	<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{booticon ipackage="icons" iname="icon-telephone-link" iexplain="List business contacts" ilocation=menu}</a></li>
 	{if $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_contact_edit' ) }
-		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}edit.php">{biticon ipackage="icons" iname="document-new" iexplain="create contact" iforce="icon"} {tr}Create/Edit a Contact{/tr}</a></li>
+		<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>
 	{/if}
 	{if $pageInfo.content_id and ( $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_task_edit' ) ) }
-		<li><a class="item" href="{$smarty.const.TASKS_PKG_URL}edit.php?content_id={$pageInfo.content_id}">{biticon ipackage="icons" iname="document-new" iexplain="create task" iforce="icon"} {tr}Create/Edit a Job{/tr}</a></li>
-		<li><a class="item" href="{$smarty.const.TASKS_PKG_URL}add_callout.php?content_id={$pageInfo.content_id}&property={$pageInfo.content_id}">{biticon ipackage="icons" iname="document-new" iexplain="create task" iforce="icon"} {tr}Log a callout{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.TASKS_PKG_URL}edit.php?content_id={$pageInfo.content_id}">{booticon ipackage="icons" iname="icon-build_add" iexplain="Create/Edit a Job" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.TASKS_PKG_URL}add_callout.php?content_id={$pageInfo.content_id}&property={$pageInfo.content_id}">{booticon ipackage="icons" iname="icon-telephone-error" iexplain="Log a callout" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_contact_admin')}
-		<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}load_contacts.php">{tr}Load Contact Index Dump{/tr}</a></li>
-		<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=contact">{tr}Admin contacts{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=contact">{booticon ipackage="icons" iname="icon-telephone-go" iexplain="Admin contacts" ilocation=menu}</a></li>
 	{/if}
 </ul>
 {/strip}
diff --git a/templates/show_contact.tpl b/templates/show_contact.tpl
index 4d02d1f..c399a29 100644
--- a/templates/show_contact.tpl
+++ b/templates/show_contact.tpl
@@ -18,7 +18,7 @@
 			{/jstab}
 		{/if}
 		{jstab title="Images" class="contact_pics"}
-			{include file="`$smarty.const.FISHEYE_PKG_PATH`gallery_views/`$galLayout`/fisheye_`$galLayout`_test.tpl" }
+			{include file="`$smarty.const.FISHEYE_PKG_PATH`gallery_views/fixed_grid/fisheye_fixed_grid_test.tpl" }
 		{/jstab}
 	{/jstabs}
 	</div> {* end .body *}