resolve menu conflict

3 files changed, 11 insertions, 11 deletions

diff --git a/templates/admin_fisheye.tpl b/templates/admin_fisheye.tpl
index 8e6798c..8cb3162 100644
--- a/templates/admin_fisheye.tpl
+++ b/templates/admin_fisheye.tpl
@@ -27,14 +27,14 @@ function updateGalleryPagination() {
 
 				{foreach from=$formGalleryGeneral key=item item=output}
 					<div class="control-group">
-						{formlabel label=`$output.label` for=$item}
+						{formlabel label=$output.label for=$item}
 						{forminput}
 							{if $output.type eq 'text'}
 								<input type="text" name="{$item}" id="{$item}" value="{$gBitSystem->getConfig($item)}"/>
 							{elseif $output.type=='checkbox'}
 								{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
 							{/if}
-							{formhelp note=`$output.note`}
+							{formhelp note=$output.note}
 						{/forminput}
 					</div>
 				{/foreach}
@@ -49,10 +49,10 @@ function updateGalleryPagination() {
 
 				{foreach from=$formGalleryListLists 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`}
+							{formhelp note=$output.note}
 						{/forminput}
 					</div>
 				{/foreach}
@@ -75,10 +75,10 @@ function updateGalleryPagination() {
 
 				{foreach from=$formGalleryLists 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}
@@ -143,10 +143,10 @@ function updateGalleryPagination() {
 
 				{foreach from=$formImageLists 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`}
+							{formhelp note=$output.note}
 						{/forminput}
 					</div>
 				{/foreach}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 6c5953a..6e1f8a5 100644
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -50,7 +50,7 @@
 								{if $galItem->mInfo.user_id == $gBitUser->mUserId || $gBitUser->isAdmin()}
 								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" onclick="BitAjax.updater( 'imgedit', '{$smarty.const.FISHEYE_PKG_URL}edit_image.php', 'ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}' );">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Details"}</a>
 								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Image"}</a></div></noscript>
-{*								jspopup href="`$smarty.const.FISHEYE_PKG_URL`edit_image.php?content_id=`$galItem->mInfo.content_id`" title="edit image" *}
+{*								jspopup href="`$smarty.const.FISHEYE_PKG_URL`edit_image.php?content_id=$galItem->mInfo.content_id" title="edit image" *}
 {*								<a target="_new" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Image"}</a> *}
 								<br />
 								{/if}
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index fe67719..2300497 100644
--- a/templates/menu_fisheye.tpl
+++ b/templates/menu_fisheye.tpl
@@ -1,6 +1,6 @@
 {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="{$packageMenuClass}">
 	{if $gBitUser->hasPermission('p_fisheye_view')}
 		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="icon-list" iexplain="List Galleries" ilocation=menu}</a></li>
 	{/if}