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

6 files changed, 19 insertions, 18 deletions

diff --git a/templates/admin_articles.tpl b/templates/admin_articles.tpl
index 073f466..47465b4 100644
--- a/templates/admin_articles.tpl
+++ b/templates/admin_articles.tpl
@@ -8,10 +8,10 @@
 			{legend legend="CMS Settings"}
 				{foreach from=$formCmsSettings 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}
@@ -46,10 +46,10 @@
 			{legend legend="CMS Settings"}
 				{foreach from=$formArticleListing 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/admin_topics.tpl b/templates/admin_topics.tpl
index 8cb3f41..2b660a4 100644
--- a/templates/admin_topics.tpl
+++ b/templates/admin_topics.tpl
@@ -64,15 +64,15 @@
 
 					<td style="text-align:center;">
 						{if $topics[user].active_topic eq 'n'}
-							{smartlink ititle='activate' booticon="icon-remove-circle" fActivateTopic=1 topic_id=`$topics[user].topic_id`}
+							{smartlink ititle='activate' booticon="icon-remove-circle" fActivateTopic=1 topic_id=$topics[user].topic_id}
 						{else}
-							{smartlink ititle='deactivate' booticon="icon-ok-circle" fDeactivateTopic=1 topic_id=`$topics[user].topic_id`}
+							{smartlink ititle='deactivate' booticon="icon-ok-circle" fDeactivateTopic=1 topic_id=$topics[user].topic_id}
 						{/if}
 					</td>
 
 					<td align="right">
-						{smartlink ititle='edit' booticon="icon-edit" ifile='edit_topic.php' topic_id=`$topics[user].topic_id`}
-						{* smartlink ititle='permissions' booticon="icon-key" ipackage='kernel' ifile='object_permissions.php' objectName="Topic `$topics[user].name`" object_type=topic permType=topics object_id=`$topics[user].topic_id` *}
+						{smartlink ititle='edit' booticon="icon-edit" ifile='edit_topic.php' topic_id=$topics[user].topic_id}
+						{* smartlink ititle='permissions' booticon="icon-key" ipackage='kernel' ifile='object_permissions.php' objectName="Topic `$topics[user].name`" object_type=topic permType=topics object_id=$topics[user].topic_id *}
 						<br />
 						<a href="{$smarty.const.ARTICLES_PKG_URL}admin/admin_topics.php?fRemoveTopic=1&amp;topic_id={$topics[user].topic_id}">{booticon iname="icon-trash" ipackage="icons" iforce=icon_text iexplain="Remove Topic"}</a>
 						<br />
diff --git a/templates/admin_types.tpl b/templates/admin_types.tpl
index 91905ee..136a15a 100644
--- a/templates/admin_types.tpl
+++ b/templates/admin_types.tpl
@@ -34,7 +34,7 @@
 								{/foreach}
 								<td style="text-align:center;">
 									{if $types[user].article_cnt eq 0}
-										{smartlink ititle="remove" booticon="icon-trash" remove_type=`$types[user].article_type_id`}
+										{smartlink ititle="remove" booticon="icon-trash" remove_type=$types[user].article_type_id}
 									{else}
 										{$types[user].article_cnt}
 									{/if}
diff --git a/templates/article_history.tpl b/templates/article_history.tpl
index b447815..d722fd4 100644
--- a/templates/article_history.tpl
+++ b/templates/article_history.tpl
@@ -63,7 +63,7 @@
 				<tr class="odd">
 					<td colspan="4">
 						<a href="{$gContent->mInfo.display_url}">{tr}Current{/tr}</a>
-						&nbsp;&bull;&nbsp;{smartlink ititle="Source" article_id=`$gContent->mArticleId` source="current"}
+						&nbsp;&bull;&nbsp;{smartlink ititle="Source" article_id=$gContent->mArticleId source="current"}
 					</td>
 				</tr>
 
@@ -76,13 +76,13 @@
 					</tr>
 					<tr class="{cycle values='even,odd'}">
 						<td colspan="3">
-							{smartlink ititle="View" article_id=`$gContent->mArticleId` preview=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" article_id=`$gContent->mArticleId` compare=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" article_id=`$gContent->mArticleId` diff2=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Source" article_id=`$gContent->mArticleId` source=`$item.version`}
+							{smartlink ititle="View" article_id=$gContent->mArticleId preview=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" article_id=$gContent->mArticleId compare=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" article_id=$gContent->mArticleId diff2=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Source" article_id=$gContent->mArticleId source=$item.version}
 							{* Articles doesnt have rollback option yet
 							{if $gContent->hasUserPermission( 'p_articles_rollback' )}
-								&nbsp;&bull;&nbsp;{smartlink iurl="rollback.php" ititle="Rollback" article_id=`$gContent->mArticleId` version=`$item.version`}
+								&nbsp;&bull;&nbsp;{smartlink iurl="rollback.php" ititle="Rollback" article_id=$gContent->mArticleId version=$item.version}
 							{/if}
 							*}
 						</td>
diff --git a/templates/edit_article.tpl b/templates/edit_article.tpl
index a087683..6d6320b 100644
--- a/templates/edit_article.tpl
+++ b/templates/edit_article.tpl
@@ -22,7 +22,7 @@
 	{/if}
 
 	{formfeedback hash=$feedback}
-	{formfeedback warning=`$errors.title`}
+	{formfeedback warning=$errors.title}
 
 	<div class="body">
 		{form enctype="multipart/form-data" id="writearticle"}
diff --git a/templates/menu_articles.tpl b/templates/menu_articles.tpl
index 16dcea7..e1c2eb1 100644
--- a/templates/menu_articles.tpl
+++ b/templates/menu_articles.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_articles_read' )}
 		<li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}index.php">{booticon iname="icon-home" ipackage="icons" iexplain="Articles Home" ilocation=menu}</a></li>
 		{if $gBitUser->hasPermission( 'p_articles_approve_submission ' ) ||
@@ -19,7 +20,7 @@
 			$gBitUser->hasPermission( 'p_articles_approve_submission ' ) ||
 			$gBitUser->hasPermission( 'p_articles_remove_submission ' ) ||
 			($gBitSystem->isFeatureActive('articles_auto_approve') && $gBitUser->isRegistered())}
-			<li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id={$smarty.const.ARTICLE_STATUS_PENDING}">{booticon iname="icon-list" ipackage="icons" iexplain="List Submissions" ilocation=menu}</a></li>
+			<li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id="{$smarty.const.ARTICLE_STATUS_PENDING}">{booticon iname="icon-list" ipackage="icons" iexplain="List Submissions" ilocation="menu"}</a></li>
 		{/if}
 	{/if}
 	{if $gBitUser->hasPermission( 'p_articles_admin' )}