Tidy up to Smarty3 and BS3

1 files changed, 50 insertions, 47 deletions

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 -->