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

6 files changed, 15 insertions, 15 deletions

diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index 09b9a6a..699a647 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -5,7 +5,7 @@
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="control-group">
-		{formfeedback error=`$errors.real_name`}
+		{formfeedback error=$errors.real_name}
 		{formlabel label="Full Name" for="real_name"}
 		{forminput}
 			<input type="text" name="real_name" id="real_name" value="{$smarty.session.real_name|default:'Administrator'}" />
@@ -14,7 +14,7 @@
 	</div>
 
 	<div class="control-group">
-		{formfeedback error=`$errors.login`}
+		{formfeedback error=$errors.login}
 		{formlabel label="Admin login" for="login"}
 		{forminput}
 			<input type="text" name="login" id="login" value="{$smarty.session.login|default:'admin'}" />
@@ -23,7 +23,7 @@
 	</div>
 
 	<div class="control-group">
-		{formfeedback error=`$errors.password`}
+		{formfeedback error=$errors.password}
 		{formlabel label="Password" for="password"}
 		{forminput}
 			<input type="password" name="password" id="password" maxlength="32" value="{$smarty.session.password}" />
@@ -40,7 +40,7 @@
 	</div>
 
 	<div class="control-group">
-		{formfeedback error=`$errors.email`}
+		{formfeedback error=$errors.email}
 		{formlabel label="Email" for="email"}
 		{forminput}
 			<input type="text" name="email" id="email" value="{$smarty.session.email}" />
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index 15e938a..ffe0af4 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -12,11 +12,11 @@
 				{if $package eq 'languages'}
 					<div class="control-group">
 						<div class="formlabel">
-							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$item.name`}</label>
+							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$item.name}</label>
 						</div>
 						{forminput}
 							<label><input type="checkbox" name="PACKAGE[]" value="{$package}" id="{$package}" checked="checked" /> {$item.name}</label>
-							{formhelp note=`$item.info`}
+							{formhelp note=$item.info}
 							{formhelp note="<strong>Location</strong>: `$item.url`"}
 							{formhelp package=$package}
 						{/forminput}
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index ffddeab..03de98d 100644
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -7,10 +7,10 @@
 
 	{foreach from=$formInstallToggles 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/install_cleanup.tpl b/templates/install_cleanup.tpl
index ebbb683..e636bd7 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -166,11 +166,11 @@
 				{foreach from=$packages key=package item=item}
 					<div class="control-group">
 						<div class="formlabel">
-							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
+							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 						</div>
 						{forminput}
 							<label><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> {$package|capitalize}</label>
-							{formhelp note=`$schema.$package.info`}
+							{formhelp note=$schema.$package.info}
 							{formhelp note="<strong>Location</strong>: `$schema.$package.url`"}
 							{formhelp package=$package}
 						{/forminput}
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index ea42a32..5666ff8 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -52,7 +52,7 @@
 					{foreach from=$schema key=package item=item}
 						{if !$item.installed and !$item.required}
 							<div class="control-group">
-								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
+								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 								{forminput}
 									<label><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
 									{formhelp note=$item.info is_installer=1}
@@ -141,7 +141,7 @@
 							{if $item.installed and !$item.required}
 								<div class="control-group">
 									<label class="control-label">
-										<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
+										<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 									</label>
 									{forminput}
 										<label><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong></label>
@@ -186,7 +186,7 @@
 					{if $item.required}
 						<div class="control-group">
 							<label class="control-label">
-								{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}
+								{biticon ipackage=$package iname="pkg_$package" iexplain=$package}
 							</label>
 							{forminput}
 								<strong>{$package|capitalize}</strong>
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index e3d96fb..7259ad3 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -173,11 +173,11 @@
 				{if $item.installed}
 					<div class="control-group">
 						<div class="formlabel">
-							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
+							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 						</div>
 						{forminput}
 							<strong>{$package|capitalize}</strong>
-							{formhelp note=`$item.info`}
+							{formhelp note=$item.info}
 							{formhelp note="<strong>Location</strong>: `$item.url`"}
 							{formhelp package=$package}
 						{/forminput}