merge recent changes with HEAD - R1 and HEAD are identical now

2 files changed, 70 insertions, 18 deletions

diff --git a/templates/menus.tpl b/templates/menus.tpl
index f67b9f6..caf51a1 100644
--- a/templates/menus.tpl
+++ b/templates/menus.tpl
@@ -56,7 +56,7 @@
 								 
 								<select name="type_{$plugin.plugin_guid}" id="type_{$plugin.plugin_guid}">
 									{foreach from=$plugin.menu_types key=type item=menu_type}
-										{if $type == hor and $use_custom_top_bar}
+										{if $type eq hor and $use_custom_top_bar and !$editMenu.type eq 'hor'}
 											<option value="">{tr}Only one horizontal menu can exist.{/tr}</option>
 										{else}
 											<option value="{$type}"{if $type eq $editMenu.type} selected="selected"{/if}>{$menu_type.label}</option>
@@ -82,6 +82,26 @@
 			</div>
 		{/form}
 
+		{if $use_custom_top_bar}
+			{form legend="Top Bar Menu Position"}
+				<div class="row">
+					{formlabel label="Position" for="top_bar_position"}
+					{forminput}
+						<select name="top_bar_position" id="top_bar_position">
+							<option value="right" {if $gBitSystemPrefs.top_bar_position eq 'right'}selected="selected"{/if}>{tr}To the right of the bitweaver menu{/tr}</option>
+							<option value="left" {if $gBitSystemPrefs.top_bar_position eq 'left'}selected="selected"{/if}>{tr}To the left of the bitweaver menu{/tr}</option>
+							<option value="replace" {if $gBitSystemPrefs.top_bar_position eq 'replace'}selected="selected"{/if}>{tr}Replace the bitweaver menu{/tr}</option>
+						</select>
+						{formhelp note="Here you can set the position of where your custom top bar menu should be."}
+					{/forminput}
+				</div>
+
+				<div class="row submit">
+					<input type="submit" name="store_pos" value="Save Settings" />
+				</div>
+			{/form}
+		{/if}
+
 		<table class="data" summary="{tr}List of menus that can be used on this site{/tr}">
 			<caption>{tr}Existing menus{/tr}</caption>
 			<tr>
@@ -127,6 +147,16 @@
 				</tr>
 			{/foreach}
 		</table>
+
+		{if $menuList}
+			<div class="row">
+				{formlabel label="Menu Cache" for=""}
+				{forminput}
+					{smartlink ititle="Rewrite Menu Cache" action=rewrite_cache}
+					{formhelp note="This will remove any old files in the nexus menu cache directory and rewrite any exiting menus. Useful when you have renamed menus."}
+				{/forminput}
+			</div>
+		{/if}
 	</div><!-- end .body -->
 </div><!-- end .nexus -->
 {/strip}
diff --git a/templates/tikiwiki/item.tpl b/templates/tikiwiki/item.tpl
index cacd822..75d7736 100644
--- a/templates/tikiwiki/item.tpl
+++ b/templates/tikiwiki/item.tpl
@@ -1,21 +1,43 @@
- {strip}
-{if $item.head and ( $type eq 'ieo' or $type eq 'iec' )}
+{strip}
+{if $type eq 'ieo' or $type eq 'iec'}
 	<span style="display:block;">
-{/if}
-{if $item.expand_url}
-	<a style="float:left;padding:0 3px;" href="{$item.expand_url}">
-		{biticon ipackage=liberty iname=folder id="`$tog_next`img" iexplain="expand menu"}
-	</a>
-{/if}
-<a class="{if $item.head}head{else}item{/if}{if $item.rsrc_type eq 'ext'} external{/if}" title="{$item.hint}" {if $item.display_url}href="{$item.display_url}{/if}">
-	{$item.title}
-</a>
-{if $item.head and ( $type eq 'ieo' or $type eq 'iec' )}
+		{if $item.expand_url}
+			<a style="float:left;padding:0 3px;" href="{$item.expand_url}">
+				{biticon ipackage=liberty iname=folder id="`$tog_next`img" iexplain="expand menu"}
+			</a>
+		{/if}
+
+		<a class="{if $item.head}head{else}item{/if}{if $item.rsrc_type eq 'ext'} external{/if}" title="{$item.hint}" {if $item.display_url}href="{$item.display_url}{/if}">
+			{$item.title}
+		</a>
 	</span>
-{/if}
-{if $item.head and ( $type eq 'ieo' or $type eq 'iec' )}
-	<script type="text/javascript">
-		setfoldericonstate('{$tog_next}');
-	</script>
+
+	{if $item.head}
+		<script type="text/javascript">
+			setfoldericonstate('{$tog_next}');
+		</script>
+	{/if}
+{elseif $type eq 'iho' or $type eq 'ihc'}
+	<span style="display:block;">
+		{if $item.expand_url}
+			<a style="float:left;padding:0 3px;" href="{$item.expand_url}">
+				{biticon ipackage=liberty iname=folder id="`$tog_next`img" iexplain="expand menu"} {$item.title}
+			</a>
+		{else}
+			<a class="{if $item.head}head{else}item{/if}{if $item.rsrc_type eq 'ext'} external{/if}" title="{$item.hint}" {if $item.display_url}href="{$item.display_url}{/if}">
+				{$item.title}
+			</a>
+		{/if}
+	</span>
+
+	{if $item.head}
+		<script type="text/javascript">
+			setfoldericonstate('{$tog_next}');
+		</script>
+	{/if}
+{else}
+	<a class="{if $item.head}head{else}item{/if}{if $item.rsrc_type eq 'ext'} external{/if}" title="{$item.hint}" {if $item.display_url}href="{$item.display_url}{/if}">
+		{$item.title}
+	</a>
 {/if}
 {/strip}