From 12f260a90839f5a992a375344e79ef04844049a7 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Sat, 29 Jul 2006 17:44:36 +0000
Subject: fix menu links and correctly display links according to when they are
 needed

---
 templates/menu_pigeonholes.tpl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'templates/menu_pigeonholes.tpl')

diff --git a/templates/menu_pigeonholes.tpl b/templates/menu_pigeonholes.tpl
index 7971789..013a64e 100644
--- a/templates/menu_pigeonholes.tpl
+++ b/templates/menu_pigeonholes.tpl
@@ -6,15 +6,12 @@
 
 	{if $gBitUser->hasPermission( 'p_pigeonholes_view' )}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}list.php">{biticon ipackage=liberty iname=list iexplain="List Categories" iforce="icon"} {tr}List Categories{/tr}</a></li>
-		{if $gContent->mStructureId}
+		{if $gContent->mStructureId and $gContent->mType.content_type_guid == $smarty.const.PIGEONHOLES_CONTENT_TYPE_GUID}
 			<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$gContent->mStructureId}">{biticon ipackage=liberty iname=spacer iexplain="" iforce="icon"} {tr}View Category{/tr}</a></li>
-			{if $gBitUser->hasPermission( 'p_pigeonholes_edit' ) and $gContent->mStructureId}
-				<li><a class="head" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.structure_id}">{biticon ipackage=liberty iname=edit iexplain="Edit Category" iforce="icon"} {tr}Edit Category{/tr}</a>
-					<ul>
-						<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.root_structure_id}&amp;action=create">{biticon ipackage=liberty iname=insert iexplain="Insert Category" iforce="icon"} {tr}Insert Category{/tr}</a></li>
-						<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_structure.php?structure_id={$gContent->mInfo.structure_id}">{biticon ipackage=pigeonholes iname=organise iexplain="Change Structure" iforce="icon"} {tr}Change Structure{/tr}</a></li>
-					</ul>
-				</li>
+			{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+				<li><a class="head" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.structure_id}&amp;action=edit">{biticon ipackage=liberty iname=edit iexplain="Edit Category" iforce="icon"} {tr}Edit Category{/tr}</a></li>
+				<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.root_structure_id}&amp;action=create">{biticon ipackage=liberty iname=insert iexplain="Insert Category" iforce="icon"} {tr}Insert Category{/tr}</a></li>
+				<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_structure.php?structure_id={$gContent->mInfo.structure_id}">{biticon ipackage=pigeonholes iname=organise iexplain="Change Structure" iforce="icon"} {tr}Change Structure{/tr}</a></li>
 			{/if}
 		{/if}
 	{/if}
-- 
cgit v1.3