resolve menu conflict

6 files changed, 24 insertions, 23 deletions

diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index 1db857d..1194edc 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -7,10 +7,10 @@
 
 			{foreach from=$formWikiFeatures key=item item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$item}
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -50,10 +50,10 @@
 
 			{foreach from=$formWikiBooks key=item item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$item}
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -69,10 +69,10 @@
 
 			{foreach from=$formWikiInOut key=item item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$item}
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -88,10 +88,10 @@
 
 			{foreach from=$formWikiLists key=item item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$item}
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -182,10 +182,10 @@
 
 				{foreach from=$formWikiWatch key=item item=output}
 					<div class="control-group">
-						{formlabel label=`$output.label` for=$item}
+						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-							{formhelp note=`$output.note` page=`$output.page`}
+							{formhelp note=$output.note page=$output.page}
 						{/forminput}
 					</div>
 				{/foreach}
diff --git a/templates/create_book.tpl b/templates/create_book.tpl
index ee93a33..3f671a4 100644
--- a/templates/create_book.tpl
+++ b/templates/create_book.tpl
@@ -9,7 +9,7 @@
 	<div class="body">
 		{form legend="Create new Wiki Book"}
 			<div class="control-group">
-				{formfeedback error=`$errors.title`}
+				{formfeedback error=$errors.title}
 				{formlabel label="Book Title" for="name"}
 				{forminput}
 					<input type="text" name="name" id="name" size="50" maxlength="240" value="{$name}"/>
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index edb4ed4..2b3af9c 100644
--- a/templates/edit_page.tpl
+++ b/templates/edit_page.tpl
@@ -20,7 +20,7 @@
 		<script type="text/javascript">/* <![CDATA[ */
 			alert( "{$errors.edit_conflict|strip_tags}" );
 		/* ]]> */</script>
-		{formfeedback warning=`$errors.edit_conflict`}
+		{formfeedback warning=$errors.edit_conflict}
 	{/if}
 
 	<div class="body">
@@ -65,7 +65,7 @@
 						<input type="hidden" name="content_id" value="{$pageInfo.content_id}" />
 
 						<div class="control-group">
-							{formfeedback warning=`$errors.title`}
+							{formfeedback warning=$errors.title}
 							{formlabel label="$conDescr Title" for="title"}
 							{forminput}
 								{if $gBitUser->hasPermission( 'p_wiki_rename_page' ) || !$pageInfo.page_id}
@@ -90,7 +90,7 @@
 							<input type="hidden" name="section" value="{$pageInfo.section}" />
 						{/if}
 
-						{textarea}{$pageInfo.data}{/textarea}
+						{textarea edit=$pageInfo.data}
 
 						{if $footnote}
 							<div class="control-group">
diff --git a/templates/menu_wiki.tpl b/templates/menu_wiki.tpl
index e7b122d..28bd235 100644
--- a/templates/menu_wiki.tpl
+++ b/templates/menu_wiki.tpl
@@ -1,6 +1,7 @@
 {strip}
-<a accesskey="{$key|truncate:1:""}" class="{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}head{else}item{/if}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} selected{/if}" href="{$menu.index_url}">{tr}{$menu.menu_title}{/tr}</a>
-<ul>
+=======
+<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+<ul class="dropdown-menu">
 	{if $gBitUser->hasPermission( 'p_wiki_view_page' )}
 		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{booticon iname="icon-home" iexplain="`$smarty.const.WIKI_PKG_DIR` Home" ilocation=menu}</a></li>
 	{/if}
diff --git a/templates/page_history.tpl b/templates/page_history.tpl
index f338082..149283c 100644
--- a/templates/page_history.tpl
+++ b/templates/page_history.tpl
@@ -71,7 +71,7 @@
 				<tr class="odd">
 					<td colspan="4">
 						<a href="{$gContent->mInfo.display_url}">{tr}Current{/tr}</a>
-						&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=`$gContent->mPageId` source="current"}
+						&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=$gContent->mPageId source="current"}
 					</td>
 				</tr>
 
@@ -84,12 +84,12 @@
 					</tr>
 					<tr class="{cycle values='even,odd'}">
 						<td colspan="3">
-							{smartlink ititle="View" page_id=`$gContent->mPageId` preview=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" page_id=`$gContent->mPageId` compare=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" page_id=`$gContent->mPageId` diff2=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=`$gContent->mPageId` source=`$item.version`}
+							{smartlink ititle="View" page_id=$gContent->mPageId preview=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" page_id=$gContent->mPageId compare=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" page_id=$gContent->mPageId diff2=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=$gContent->mPageId source=$item.version}
 							{if $gBitUser->hasPermission( 'p_wiki_rollback' )}
-								&nbsp;&bull;&nbsp;{smartlink ititle="Rollback" page_id=`$gContent->mPageId` rollback=`$item.version`}
+								&nbsp;&bull;&nbsp;{smartlink ititle="Rollback" page_id=$gContent->mPageId rollback=$item.version}
 							{/if}
 						</td>
 						<td style="text-align:right;">
diff --git a/templates/s5.tpl b/templates/s5.tpl
index 0ee7049..2b380e3 100644
--- a/templates/s5.tpl
+++ b/templates/s5.tpl
@@ -7,7 +7,7 @@
 	<title>{$gContent->mInfo.title|escape}</title>
 	<meta name="generator" content="S5" />
 	<meta name="version" content="S5 1.0" />
-	<meta name="author" content="{displayname user_id=`$gContent->mInfo.user_id` nolink='yes'}" />
+	<meta name="author" content="{displayname user_id=$gContent->mInfo.user_id nolink='yes'}" />
 	<meta name="company" content="" />
 	<meta name="defaultView" content="slideshow" />
 	<meta name="controlVis" content="hidden" />