tidy up permission checks, display of dynamically collapsable list seems quite impossible with permissions -> removed for now

3 files changed, 11 insertions, 41 deletions

diff --git a/templates/edit_pigeonholes.tpl b/templates/edit_pigeonholes.tpl
index 17ae59b..89d8046 100644
--- a/templates/edit_pigeonholes.tpl
+++ b/templates/edit_pigeonholes.tpl
@@ -45,7 +45,7 @@
 			<div class="row">
 				{formlabel label="Theme" for="pigeonhole-style"}
 				{forminput}
-					{html_options id="pigeonhole-style" name="pigeonhole[prefs][pigeonholes_style]" output=$styles values=$styles selected=$gContent->mPrefs.pigeonholes_style}
+					{html_options id="pigeonhole-style" name="pigeonhole[prefs][style]" output=$styles values=$styles selected=$gContent->mPrefs.style}
 					{formhelp note="This theme will be applied when viewing any page belonging to this category." warning="Setting is inherited from parent category."}
 				{/forminput}
 			</div>
@@ -53,7 +53,7 @@
 			<div class="row">
 				{formlabel label="Permission" for="perm"}
 				{forminput}
-					{html_options name="pigeonhole[prefs][pigeonholes_permission]" id="perm" options=$perms selected=`$gContent->mPrefs.pigeonholes_permission`}
+					{html_options name="pigeonhole[prefs][permission]" id="perm" options=$perms selected=`$gContent->mPrefs.permission`}
 					{formhelp note="Permission required to view any page in this category." warning="Setting is inherited from parent category."}
 				{/forminput}
 			</div>
@@ -61,7 +61,7 @@
 			<div class="row">
 				{formlabel label="Group" for="group"}
 				{forminput}
-					{html_options name="pigeonhole[prefs][pigeonholes_group]" id="group" options=$groups selected=`$gContent->mPrefs.pigeonholes_group_id`}
+					{html_options name="pigeonhole[prefs][group_id]" id="group" options=$groups selected=`$gContent->mPrefs.group_id`}
 					{formhelp note="Users of only this group can view the content of this category." warning="Setting is inherited from parent category."}
 				{/forminput}
 			</div>
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index ca11271..e8ca2b8 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -1,47 +1,14 @@
 {strip}
 {if $gBitSystemPrefs.pigeonholes_list_style == "dynamic" && !$no_details}
 
-	{* ======= crazy display for only few category memebers - only display method that allows custom sorting ======= *}
-	{if $gContent->mStructureId eq $subtree[ix].structure_id or $smarty.request.expand_all}
-		{assign var=iname value=Expanded}
-	{else}
-		{assign var=iname value=Collapsed}
-	{/if}
-
-	<div class="highlight">
-		{if $edit}
-			<div class="floaticon">
-				{smartlink ititle="Edit Category" ibiticon="liberty/edit" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=edit}
-				{smartlink ititle="Remove Category" ibiticon="liberty/delete" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=remove}
-			</div>
-		{/if}
-
-		<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>
-
-		<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>
-	</div>
+	<h3 class="highlight"><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.data|escape}
 
 			{if $pigeonItem.members}
-				<ul id="sid{$subtree[ix].structure_id}" style="display:{if $gContent->mStructureId eq $subtree[ix].structure_id or $smarty.request.expand_all}block{else}none{/if}; padding:2em;" class="data">
+				{$pigeonItem.data|escape}
+				<ul style="display:{if $gContent->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}
 
@@ -70,12 +37,14 @@
 						</ul>
 					</li>
 				</ul>
-			{else}
-				<div id="sid{$subtree[ix].structure_id}" class="norecords">{tr}No Records Found{/tr}</div>
 			{/if}
 		{/if}
 	{/foreach}
 
+	{if $gContent->mInfo.structure_id eq $subtree[ix].structure_id}
+		{formfeedback hash=$memberFeedback}
+	{/if}
+
 {else}
 
 	{* ======= very basic display of the pigoenhole structure ======= *}
diff --git a/templates/view_structure.tpl b/templates/view_structure.tpl
index e3d074b..17d1f9e 100644
--- a/templates/view_structure.tpl
+++ b/templates/view_structure.tpl
@@ -7,6 +7,7 @@
 	<div class="body">
 		{if $gBitSystemPrefs.pigeonholes_list_style == "table"}
 			{include file="bitpackage:pigeonholes/view_structure_inc.tpl" no_details=true no_edit=true}
+			{formfeedback hash=$memberFeedback}
 			{include file="bitpackage:pigeonholes/view_table_inc.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' )}