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

6 files changed, 18 insertions, 17 deletions

diff --git a/templates/admin_pigeonholes.tpl b/templates/admin_pigeonholes.tpl
index 8030112..8acd0b0 100644
--- a/templates/admin_pigeonholes.tpl
+++ b/templates/admin_pigeonholes.tpl
@@ -6,10 +6,10 @@
 	{legend legend="Display Settings"}
 		{foreach from=$pigeonholeDisplaySettings key=feature item=output}
 			<div class="control-group">
-				{formlabel label=`$output.label` for=$feature}
+				{formlabel label=$output.label for=$feature}
 				{forminput}
 					{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-					{formhelp note=`$output.note` page=`$output.page`}
+					{formhelp note=$output.note page=$output.page}
 				{/forminput}
 			</div>
 		{/foreach}
@@ -26,10 +26,10 @@
 	{legend legend="Listing Settings"}
 		{foreach from=$pigeonholeListSettings key=feature item=output}
 			<div class="control-group">
-				{formlabel label=`$output.label` for=$feature}
+				{formlabel label=$output.label for=$feature}
 				{forminput}
 					{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-					{formhelp note=`$output.note` page=`$output.page`}
+					{formhelp note=$output.note page=$output.page}
 				{/forminput}
 			</div>
 		{/foreach}
@@ -62,10 +62,10 @@
 	{legend legend="Pigeonhole Edit Settings"}
 		{foreach from=$pigeonholeEditSettings key=feature item=output}
 			<div class="control-group">
-				{formlabel label=`$output.label` for=$feature}
+				{formlabel label=$output.label for=$feature}
 				{forminput}
 					{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-					{formhelp note=`$output.note` page=`$output.page`}
+					{formhelp note=$output.note page=$output.page}
 				{/forminput}
 			</div>
 		{/foreach}
@@ -74,10 +74,10 @@
 	{legend legend="Pigeonhole Content Edit Settings"}
 		{foreach from=$pigeonholeContentEditSettings key=feature item=output}
 			<div class="control-group">
-				{formlabel label=`$output.label` for=$feature}
+				{formlabel label=$output.label for=$feature}
 				{forminput}
 					{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-					{formhelp note=`$output.note` page=`$output.page`}
+					{formhelp note=$output.note page=$output.page}
 				{/forminput}
 			</div>
 		{/foreach}
diff --git a/templates/assign_content.tpl b/templates/assign_content.tpl
index 5f0e10f..5e0f8c0 100644
--- a/templates/assign_content.tpl
+++ b/templates/assign_content.tpl
@@ -132,7 +132,7 @@
 					{foreach from=$assignableContent item=item}
 						<tr class="{cycle values='odd,even'}">
 							<td><a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">{$item.title|escape}</a></td>
-							<td>{assign var=content_type_guid value=`$item.content_type_guid`}{$contentTypes.$content_type_guid}</td>
+							<td>{assign var=content_type_guid value=$item.content_type_guid}{$contentTypes.$content_type_guid}</td>
 							{foreach from=$pigeonList item=pigeon}
 								<td style="text-align:center">
 									<input type="checkbox" name="pigeonhole[{$item.content_id}][]" value="{$pigeon.content_id}"
diff --git a/templates/edit_pigeonholes.tpl b/templates/edit_pigeonholes.tpl
index 5192f07..4fe0fbb 100644
--- a/templates/edit_pigeonholes.tpl
+++ b/templates/edit_pigeonholes.tpl
@@ -67,7 +67,7 @@
 							<div class="control-group">
 								{formlabel label="Permission" for="perm"}
 								{forminput}
-									{html_options name="pigeonhole[prefs][permission]" id="perm" options=$perms selected=`$gContent->mPrefs.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>
@@ -77,7 +77,7 @@
 							<div class="control-group">
 								{formlabel label="Group" for="group_id"}
 								{forminput}
-									{html_options name="pigeonhole[prefs][group_id]" id="group_id" options=$groups selected=`$gContent->mPrefs.group_id`}
+									{html_options name="pigeonhole[prefs][group_id]" id="group_id" 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/list.tpl b/templates/list.tpl
index 6db8af2..1715944 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -29,10 +29,10 @@
 		{foreach from=$pigeonList item=item}
 			{if $gBitUser->hasPermission( 'p_pigeonholes_update' )}
 				<div class="floaticon">
-					{smartlink ititle="Change Structure" ifile="edit_structure.php" booticon="icon-recycle" structure_id=`$item.structure_id`}
-					{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" booticon="icon-file" structure_id=`$item.structure_id` action=create}
-					{smartlink ititle="Edit Category" ifile="edit_pigeonholes.php" booticon="icon-edit" structure_id=`$item.structure_id` action="edit"}
-					{smartlink ititle="Remove Category" ifile="edit_pigeonholes.php" booticon="icon-trash" action="remove" structure_id=`$item.structure_id`}
+					{smartlink ititle="Change Structure" ifile="edit_structure.php" booticon="icon-recycle" structure_id=$item.structure_id}
+					{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" booticon="icon-file" structure_id=$item.structure_id action="create"}
+					{smartlink ititle="Edit Category" ifile="edit_pigeonholes.php" booticon="icon-edit" structure_id=$item.structure_id action="edit"}
+					{smartlink ititle="Remove Category" ifile="edit_pigeonholes.php" booticon="icon-trash" action="remove" structure_id=$item.structure_id}
 				</div>
 			{/if}
 			<h2>{$item.display_link}</h2>
diff --git a/templates/menu_pigeonholes.tpl b/templates/menu_pigeonholes.tpl
index ffcbee0..8b677a0 100644
--- a/templates/menu_pigeonholes.tpl
+++ b/templates/menu_pigeonholes.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}">
 	{if $gBitUser->hasPermission( 'p_pigeonholes_create' )}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?action=create">{booticon iname="icon-file" iexplain="Create Category" ilocation=menu}</a></li>
 	{/if}
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index 6fa9e11..9a1b500 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -57,7 +57,7 @@
 	{* ======= very basic display of the pigoenhole structure ======= *}
 	{if !$no_edit  and $gBitUser->hasPermission( 'p_pigeonholes_update' )}
 		<div class="floaticon">
-			{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" booticon="icon-file" structure_id=`$subtree[ix].structure_id` action=create}
+			{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" booticon="icon-file" structure_id=$subtree[ix].structure_id action=create}
 			{smartlink ititle="Edit Category" booticon="icon-edit" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=edit}
 			{smartlink ititle="Remove Category" booticon="icon-trash" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=remove}
 		</div>