completely pull positioning stuff and try and make listing better - table based layout rocks now

4 files changed, 33 insertions, 51 deletions

diff --git a/templates/edit_pigeonholes.tpl b/templates/edit_pigeonholes.tpl
index 5151da2..854961d 100644
--- a/templates/edit_pigeonholes.tpl
+++ b/templates/edit_pigeonholes.tpl
@@ -6,7 +6,6 @@
 	</div>
 
 	<div class="body">
-		{$feedback.success}
 		{formfeedback hash=$feedback}
 		{form legend="Create / Edit Category"}
 			{if $gPigeonholes->mStructureId}
diff --git a/templates/list.tpl b/templates/list.tpl
index 0d57607..504f74d 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -18,8 +18,8 @@
 		<div class="navbar">
 			<ul>
 				<li>{biticon ipackage=liberty iname=sort iexplain=sort}</li>
-				<li>{smartlink ititle="Title" find=$find isort=title idefault=1 icontrol=$listInfo}</li>
-				<li>{smartlink ititle="Description" find=$find isort=data icontrol=$listInfo}</li>
+				<li>{smartlink ititle="Title" isort=title idefault=1 icontrol=$listInfo}</li>
+				<li>{smartlink ititle="Description" isort=data icontrol=$listInfo}</li>
 			</ul>
 		</div>
 		<div class="clear"></div>
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index 07a308e..640427c 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -1,36 +1,5 @@
 {strip}
-{if $list_style == "table"}
-
-	{* ======= this display method requires "alphabetisation" ======= *}
-	<h3><a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a></h3>
-
-	{foreach from=$pigeonList item=pigeonItem}
-		{if $pigeonItem.structure_id eq $subtree[ix].structure_id && $pigeonItem.members}
-			{$pigeonItem.data|escape}
-			<table class="data"><tr>
-				{*use a fixed number here for now, we can change this eventually with a preference*}
-				{math equation="100 / x" x=3 assign=width format="%u"}
-				{foreach from=$pigeonItem.members item=pigeonColumn}
-					<td style="vertical-align:top; width:{$width}%;">
-						{foreach from=$pigeonColumn item=members key=index}
-							<h2>{$index}</h2>
-							<ul>
-								{foreach from=$members item=member}
-									<li>
-										<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$member.content_id}">{$member.title|escape}</a>
-										<br />
-										<small>{$member.content_type_description}</small>
-									</li>
-								{/foreach}
-							</ul>
-						{/foreach}
-					</td>
-				{/foreach}
-			</tr></table>
-		{/if}
-	{/foreach}
-
-{elseif $list_style == "dynamic"}
+{if $list_style == "dynamic"}
 
 	{* ======= crazy display for only few category memebers - only display method that allows custom sorting ======= *}
 	{if $gPigeonholes->mStructureId eq $subtree[ix].structure_id or $smarty.request.expand_all}
@@ -47,20 +16,21 @@
 			</div>
 		{/if}
 
-		<a href="javascript:icntoggle('sid{$subtree[ix].structure_id}');">
-			{biticon ipackage=liberty iname=$iname id=sid`$subtree[ix].structure_id`img"} {$subtree[ix].title|escape}
-		</a> &nbsp;
+		<h3>
+			<a href="javascript:icntoggle('sid{$subtree[ix].structure_id}');">
+				{biticon ipackage=liberty iname=$iname id=sid`$subtree[ix].structure_id`img"} {$subtree[ix].title|escape}
+				{foreach from=$pigeonList item=pigeonItem}
+					{if $pigeonItem.structure_id eq $subtree[ix].structure_id}
+						<small> &nbsp; &nbsp; [ {$pigeonItem.members_count} ]</small>
+					{/if}
+				{/foreach}
+			</a> &nbsp;
+		</h3>
 
 		<script type="text/javascript">
 			setfoldericonstate('sid{$subtree[ix].structure_id}');
 		</script>
 
-		{foreach from=$pigeonList item=pigeonItem}
-			{if $pigeonItem.structure_id eq $subtree[ix].structure_id}
-				<small> {tr}{$pigeonItem.members_count} Item(s){/tr} </small>
-			{/if}
-		{/foreach}
-
 		<noscript>
 			<div style="padding-left:18px;" class="small"><a href="{$smarty.const.PIGEONHOLES_PKG_URL}{if $edit}edit_pigeonholes{else}index{/if}.php?structure_id={$subtree[ix].structure_id}">{tr}Expand{/tr}</a></div>
 		</noscript>
@@ -68,10 +38,10 @@
 
 	{foreach from=$pigeonList item=pigeonItem}
 		{if $pigeonItem.structure_id eq $subtree[ix].structure_id}
-			<small>{$pigeonItem.data|escape}</small>
+			{$pigeonItem.data|escape}
 
 			{if $pigeonItem.members}
-				<ul id="sid{$subtree[ix].structure_id}" style="display:{if $gPigeonholes->mStructureId eq $subtree[ix].structure_id or $smarty.request.expand_all}block{else}none{/if};" class="data">
+				<ul id="sid{$subtree[ix].structure_id}" style="display:{if $gPigeonholes->mStructureId eq $subtree[ix].structure_id or $smarty.request.expand_all}block{else}none{/if}; padding:2em;" class="data">
 					{foreach from=$pigeonItem.members item=pigeonMember}
 						{assign var=ctg1 value=$pigeonMember.content_type_guid}
 
@@ -113,8 +83,16 @@
 			{smartlink ititle="Remove Category" ibiticon="liberty/delete" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=remove}
 		</div>
 	{/if}
+	
+	{if $subtree[ix].content_id == $smarty.request.content_id || $subtree[ix].structure_id == $smarty.request.structure_id}
+		{assign var=current value=1}
+	{else}
+		{assign var=current value=0}
+	{/if}
 
-	<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a>
+	{if $current}<div class="highlight">{/if}
+		<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a>
+	{if $current}</div>{/if}
 
 	{if !$no_details}
 		{foreach from=$pigeonList item=pigeonItem}
diff --git a/templates/view_structure.tpl b/templates/view_structure.tpl
index a53a3fb..2530d0e 100644
--- a/templates/view_structure.tpl
+++ b/templates/view_structure.tpl
@@ -5,11 +5,16 @@
 	</div>
 
 	<div class="body">
-		{if !$smarty.request.expand_all and !( $smarty.request.action eq 'edit' or $smarty.request.action eq 'create' )}
-			{smartlink ititle="Expand All" expand_all=1 structure_id=$gPigeonholes->mStructureId}
-		{/if}
+		{if $list_style == "table"}
+			{include file="bitpackage:pigeonholes/view_structure_inc.tpl" no_details=true no_edit=true}
+			{include file="bitpackage:pigeonholes/view_table_list.tpl" no_details=true no_edit=true}
+		{else}
+			{if !$smarty.request.expand_all and !( $smarty.request.action eq 'edit' or $smarty.request.action eq 'create' )}
+				{smartlink ititle="Expand All" expand_all=1 structure_id=$gPigeonholes->mStructureId}
+			{/if}
 
-		{include file="bitpackage:pigeonholes/view_structure_inc.tpl"}
+			{include file="bitpackage:pigeonholes/view_structure_inc.tpl"}
+		{/if}
 	</div><!-- end .body -->
 </div><!-- end .liberty -->
 {/strip}