major clean up for Smarty 3.0 and another pass at cleaning the top menus

5 files changed, 9 insertions, 6 deletions

diff --git a/templates/menu_items.tpl b/templates/menu_items.tpl
index 498e465..7bbe953 100644
--- a/templates/menu_items.tpl
+++ b/templates/menu_items.tpl
@@ -12,7 +12,8 @@
 	<div class="body">
 		{formfeedback hash=$formfeedback}
 		{if $delList}
-			<ul>
+			<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+<ul class="{$packageMenuClass}">
 				{foreach from=$delList item=delItem}
 					<li>{$delItem}</li>
 				{/foreach}
diff --git a/templates/menu_items_details_inc.tpl b/templates/menu_items_details_inc.tpl
index 174b666..9f1eeb0 100644
--- a/templates/menu_items_details_inc.tpl
+++ b/templates/menu_items_details_inc.tpl
@@ -2,7 +2,8 @@
 {if $gNexus->mInfo.tree}
 	{form legend="Item Details"}
 		{foreach from=$gNexus->mInfo.tree item=item key=key}
-			{if $item.first}<ul>{else}</li>{/if}
+			{if $item.first}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+<ul class="{$packageMenuClass}">{else}</li>{/if}
 			{if $item.last}</ul>{else}
 				<li>
 					<div class="{cycle values='even,odd'}">
diff --git a/templates/menu_items_edit_inc.tpl b/templates/menu_items_edit_inc.tpl
index 5c29b2a..4d17e0e 100644
--- a/templates/menu_items_edit_inc.tpl
+++ b/templates/menu_items_edit_inc.tpl
@@ -60,7 +60,7 @@
 	<div class="control-group">
 		{formlabel label="Resource type" for="rsrc_type"}
 		{forminput}
-			{html_options name="rsrc_type" id="rsrc_type" options=$rsrcTypes selected=`$editItem.rsrc_type`}
+			{html_options name="rsrc_type" id="rsrc_type" options=$rsrcTypes selected=$editItem.rsrc_type}
 			{formhelp note="Here you can pick the resource type you wish to link to."}
 		{/forminput}
 	</div>
@@ -76,7 +76,7 @@
 	<div class="control-group">
 		{formlabel label="Permission" for="perm"}
 		{forminput}
-			{html_options name="perm" id="perm" options=$perms selected=`$editItem.perm`}
+			{html_options name="perm" id="perm" options=$perms selected=$editItem.perm}
 			{formhelp note="Permission required to view this item and any children associated with it. If no permission is selected, the menu is visible to all users."}
 		{/forminput}
 	</div>
diff --git a/templates/menu_nexus.tpl b/templates/menu_nexus.tpl
index fd8b601..7f084d2 100644
--- a/templates/menu_nexus.tpl
+++ b/templates/menu_nexus.tpl
@@ -1,5 +1,6 @@
 {strip}
-<ul>
+<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+<ul class="{$packageMenuClass}">
 	<li><a class="head" href="{$smarty.const.NEXUS_PKG_URL}menus.php">{booticon ipackage="icons" iname="icon-sitemap" iexplain="Menus" ilocation=menu}</a></li>
 	{if $gNexus->mInfo.menu_id}
 		<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menu_items.php?menu_id={$gNexus->mInfo.menu_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Items" ilocation=menu}</a></li>
diff --git a/templates/menus.tpl b/templates/menus.tpl
index ee9e6fb..0cec365 100644
--- a/templates/menus.tpl
+++ b/templates/menus.tpl
@@ -36,7 +36,7 @@
 			<div class="control-group">
 				{formlabel label="Editable menu" for="editable"}
 				{forminput}
-					{html_checkboxes name="editable" values="1" checked=`$editMenu.editable` labels=false id="editable"}
+					{html_checkboxes name="editable" values="1" checked=$editMenu.editable labels=false id="editable"}
 					{formhelp note="Checking this will allow users with the correct permission (p_nexus_insert_item) to add menu items when they are editing content such as a wiki page or a fisheye gallery."}
 				{/forminput}
 			</div>