Merge branch 'master' of github.com:bitweaver/themes

7 files changed, 14 insertions, 14 deletions

diff --git a/templates/admin_columns.tpl b/templates/admin_columns.tpl
index 1d3fa94..ce26e7a 100644
--- a/templates/admin_columns.tpl
+++ b/templates/admin_columns.tpl
@@ -12,7 +12,7 @@
 				{formhelp warning="If checked, the column is visible."}
 				{foreach from=$activeColumns 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 hash=$output}
@@ -139,4 +139,4 @@
 
 {/form}
 
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl
index 005acf4..6290f1b 100644
--- a/templates/admin_layout.tpl
+++ b/templates/admin_layout.tpl
@@ -110,7 +110,7 @@
 				<div class="control-group">
 					{formlabel label="Module" for="module_rsrc"}
 					{forminput}
-						{*html_options name="fAssign[module_rsrc]" id="module_rsrc" options=$allModules selected=`$fAssign.name` *}
+						{*html_options name="fAssign[module_rsrc]" id="module_rsrc" options=$allModules selected=$fAssign.name *}
 						<select name="fAssign[module_rsrc]" id="module_rsrc" onchange="javascript:BitThemes.viewModuleParamsHelp( this.options[this.selectedIndex].value )">
 						{foreach key=pkg item=modules from=$allModules}
 							<optgroup label="{$pkg}">
@@ -263,7 +263,7 @@
 					{if $fEdit && $fAssign.name}
 						<input type="hidden" name="fAssign[module]" value="{$fAssign.module}" id="module" />{$fAssign.module}
 					{else}
-						{* html_options name="fAssign[module_rsrc]" id="module" values=$allCenters options=$allCenters selected=`$mod` *}
+						{* html_options name="fAssign[module_rsrc]" id="module" values=$allCenters options=$allCenters selected=$mod *}
 						<select name="fAssign[module_rsrc]" id="module" {*onchange="javascript:BitThemes.viewModuleParamsHelp( this.options[this.selectedIndex].value )"*}>
 						{foreach key=pkg item=modules from=$allCenters}
 							<optgroup label="{$pkg}">
diff --git a/templates/admin_modules.tpl b/templates/admin_modules.tpl
index af8cbbb..06effe4 100644
--- a/templates/admin_modules.tpl
+++ b/templates/admin_modules.tpl
@@ -3,10 +3,10 @@
 	<input type="hidden" name="page" value="{$page}" />
 	{foreach from=$formModuleFeatures 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_themes.tpl b/templates/admin_themes.tpl
index 60f966f..8d3c216 100644
--- a/templates/admin_themes.tpl
+++ b/templates/admin_themes.tpl
@@ -36,10 +36,10 @@
 
 	{foreach from=$themeSettings 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_themes_menus.tpl b/templates/admin_themes_menus.tpl
index 1e85809..212d58d 100644
--- a/templates/admin_themes_menus.tpl
+++ b/templates/admin_themes_menus.tpl
@@ -12,7 +12,7 @@
 			{form legend="Menu Settings"}
 				{foreach from=$formMenuSettings 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 hash=$output}
@@ -39,7 +39,7 @@
 				{form legend="Menu Javascript Settings"}
 					{foreach from=$formMenuJsSettings 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 hash=$output}
diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl
index af2bf56..00f7c35 100644
--- a/templates/module_config_inc.tpl
+++ b/templates/module_config_inc.tpl
@@ -1,6 +1,6 @@
 {capture name=shared}
-	{smartlink ititle="Up" booticon="icon-arrow-up" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
-	{smartlink ititle="Down" booticon="icon-arrow-down" iforce="icon" page=$page move_module=down module_package=$module_package module_id=`$modInfo.module_id`}
+	{smartlink ititle="Up" booticon="icon-arrow-up" iforce="icon" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Down" booticon="icon-arrow-down" iforce="icon" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
 	{if $colkey eq 'left' or $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=move value=right}
diff --git a/templates/module_config_role_inc.tpl b/templates/module_config_role_inc.tpl
index 8b4b005..abf98f4 100644
--- a/templates/module_config_role_inc.tpl
+++ b/templates/module_config_role_inc.tpl
@@ -1,6 +1,6 @@
 {capture name=shared}
-	{smartlink ititle="Up" booticon="icon-cloud-upload" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
-	{smartlink ititle="Down" booticon="icon-cloud-download" iforce="icon" page=$page move_module=down module_package=$module_package module_id=`$modInfo.module_id`}
+	{smartlink ititle="Up" booticon="icon-cloud-upload" iforce="icon" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Down" booticon="icon-cloud-download" iforce="icon" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
 	{if $colkey eq 'left' or $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=icon value=next}