Templates changes to cover uninitialized variables and style changes for PHP8.4

17 files changed, 186 insertions, 178 deletions

diff --git a/templates/admin.tpl b/templates/admin.tpl
index 6b90bbf..5a896a5 100644..100755
--- a/templates/admin.tpl
+++ b/templates/admin.tpl
@@ -2,15 +2,15 @@
 
 <div class="floaticon">
 	{bithelp}
-	{if $package}
+	{if !empty($package)}
 		{assign var=iconsize value=$gBitSystem->getConfig("site_icon_size")}
 		{biticon ipackage="$package" iname="pkg_`$package`" iexplain="$package" iclass="$iconsize icon"}
 	{/if}
 </div>
 
-<div class="admin {$package}">
+<div class="admin{if !empty($package)} {$package}{/if}">
 	<div class="header">
-		{if $package}
+		{if !empty($package)}
 			<h1>{tr}Configure{/tr}: {tr}{$pageName|default:$page|replace:"_":" "|capitalize}{/tr}</h1>
 		{else}
 			<h1>{tr}Administration{/tr}</h1>
@@ -20,10 +20,10 @@
 	{* The rest determines which page to include using "page" GET parameter. Default: list-sections
 	Add a value in first check when you create a new admin page. *}
 	<div class="body">
-		{if $adminFile }
+		{if !empty($adminFile) }
 			{include file="bitpackage:$package/admin_`$adminFile`.tpl"}
 		{else}
-			{if $smarty.request.version_check}
+			{if !empty($smarty.request.version_check) }
 				{if $version_info.error.number ne 0}
 					{formfeedback error=$version_info.error.string}
 				{elseif $version_info}
diff --git a/templates/admin_features.tpl b/templates/admin_features.tpl
index 88335f0..bf175f9 100644..100755
--- a/templates/admin_features.tpl
+++ b/templates/admin_features.tpl
@@ -1,5 +1,6 @@
 {* $Header$ *}
 {strip}
+{if !empty($page)}{assign var=page value=0}{/if}
 {form}
 	{jstabs}
 		{jstab title="bitweaver Settings"}
@@ -10,7 +11,7 @@
 						{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|default:''}
 						{/forminput}
 					</div>
 				{/foreach}
@@ -22,7 +23,7 @@
 						{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|default:''}
 						{/forminput}
 					</div>
 				{/foreach}
@@ -31,7 +32,7 @@
 
 		{jstab title="Homepage Settings"}
 			{legend legend="Homepage Settings"}
-				<div class="form-group">
+				<div class="form-group col-sm-12">
 					{formlabel label="Home page" for="bit_index"}
 					{forminput}
 						<select name="bit_index" id="bit_index">
@@ -59,7 +60,7 @@
 					{/forminput}
 				</div>
 
-				<div class="form-group">
+				<div class="form-group col-sm-12">
 					{formlabel label="URI for custom home" for="site_url_index"}
 					{forminput}
 						<input type="text" id="site_url_index" name="site_url_index" value="{$gBitSystem->getConfig('site_url_index')|escape}" size="50" />
@@ -145,7 +146,7 @@
 							{elseif $output.type == 'text'}
 								<input size="50" type="text" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 							{/if}
-							{formhelp note=$output.note page=$output.page}
+							{formhelp note=$output.note page=$output.page|default:''}
 						{/forminput}
 					</div>
 				{/foreach}
@@ -165,7 +166,7 @@
 						{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|default:''}
 						{/forminput}
 					</div>
 				{/foreach}
diff --git a/templates/admin_menu_options.tpl b/templates/admin_menu_options.tpl
index 1deb10a..d4436cf 100644..100755
--- a/templates/admin_menu_options.tpl
+++ b/templates/admin_menu_options.tpl
@@ -111,8 +111,8 @@
 			<td>{$admmoptions[user].perm}</td>
 			<td>{$admmoptions[user].groupname}</td>
 			<td class="alignright">
-				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$admmoptions[user].option_id}" onclick="return confirm('{tr}Are you sure you want to delete this menu item?{/tr}')" title="{tr}Delete this menu{/tr}">{booticon iname="fa-trash" iexplain="remove"}</a>
-				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;option_id={$admmoptions[user].option_id}" title="Edit this menu">{booticon iname="fa-pen-to-square" iexplain="edit"}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$admmoptions[user].option_id}" onclick="return confirm('{tr}Are you sure you want to delete this menu item?{/tr}')" title="{tr}Delete this menu{/tr}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;option_id={$admmoptions[user].option_id}" title="Edit this menu">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
 			</td>
 		</tr>
 	{sectionelse}
diff --git a/templates/admin_notifications.tpl b/templates/admin_notifications.tpl
index 1ced4d6..b02cac6 100644..100755
--- a/templates/admin_notifications.tpl
+++ b/templates/admin_notifications.tpl
@@ -55,7 +55,7 @@
 					<td>{$channels[user].event}</td>
 					<td>{$channels[user].object}</td>
 					<td>{$channels[user].email}</td>
-					<td class="actionicon">{smartlink ititle="remove" booticon="fa-trash" offset=$offset removeevent=$channels[user].event object=$channels[user].object email=$channels[user].email}</td>
+					<td class="actionicon">{smartlink ititle="remove" booticon="icon-trash" offset=$offset removeevent=$channels[user].event object=$channels[user].object email=$channels[user].email}</td>
 				</tr>
 			{sectionelse}
 				<tr class="norecords"><td colspan="4">{tr}No records found{/tr}</td></tr>
diff --git a/templates/admin_packages.tpl b/templates/admin_packages.tpl
index ee60e05..1f0b4a8 100644..100755
--- a/templates/admin_packages.tpl
+++ b/templates/admin_packages.tpl
@@ -17,7 +17,7 @@
 			{jstab title="Upgradable"}
 				{legend legend="Upgradable packages"}
 					<p class="warning">
-						{biticon class="img-responsive" iname="large/dialog-warning" iexplain="Warning"} {tr}You seem to have at least one package that can be upgraded.{/tr} <a href="{$smarty.const.INSTALL_PKG_URL}install.php?step=4">{tr}We recommend you visit the installer now{/tr}</a>.
+						{biticon class="img-responsive" iname="large/dialog-warning" iexplain="Warning"} {tr}You seem to have at least one package that can be upgraded.{/tr} <a href="{$smarty.const.INSTALL_PKG_URL}install.php?step=4">We recommend you visit the installer now</a>.
 					</p>
 
 					{foreach from=$upgradable item=package key=name}
@@ -29,7 +29,7 @@
 								<label>
 									<strong>{$name|capitalize}</strong>
 								</label>
-								{formhelp note=$package.info}
+								{formhelp note=$package.info|default:'Missing'}
 							{/forminput}
 						</div>
 					{/foreach}
@@ -45,10 +45,10 @@
 
 				{$install_unavailable}
 
-				<div class="bw-columns">
+				<div class="bit-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
-					{if $package.installed && !$package.service && !$package.required}
-					<div class="bw-column-cell">
+					{if $package.installed|default:false and !$package.service|default:false and !$package.required|default:true }
+					<div class="bit-column-cell">
 					<div class="well">
 						<div class="form-group clear">
 							<div class="formlabel">
@@ -57,13 +57,13 @@
 							{forminput}
 								<label>
 									{assign var=is_requirement value=''}
-									{foreach from=$gBitSystem->mRequirements key=req item=reqs}
-										{if $reqs.$name && $gBitSystem->isPackageActive($req) && $package.active_switch eq 'y'}
-											{assign var=is_requirement value='true'}
-										{/if}
-									{/foreach}
-									{if $is_requirement}
-										{booticon iname="fa-check" iexplain="Required"}
+										{foreach from=$gBitSystem->mRequirements key=req item=reqs}
+											{if !empty($reqs.$name) and $gBitSystem->isPackageActive($req) and $package.active_switch eq 'y'}
+												{assign var=is_requirement value='true'}
+											{/if}
+										{/foreach}
+									{if !empty($is_requirement)}
+										{booticon iname="icon-ok"   iexplain="Required"}
 										<input type="hidden" value="y" name="fPackage[{$name}]" id="package_{$name}" />
 									{else}
 										<input type="checkbox" value="y" name="fPackage[{$name}]" id="package_{$name}" {if $package.active_switch eq 'y' }checked="checked"{/if} />
@@ -71,13 +71,13 @@
 									&nbsp; <strong>{$name|capitalize}</strong>
 									{assign var=first_loop value=1}
 									{foreach from=$gBitSystem->mRequirements key=required_by item=reqs}
-										{if $reqs.$name}
-											{if $first_loop}<br />{booticon iname="fa-triangle-exclamation" iexplain="Requirement"} Required by {else}, {/if}{$required_by}
+										{if !empty($reqs.$name)}
+											{if $first_loop}<br />{booticon iname="icon-warning-sign"   iexplain="Requirement"} Required by {else}, {/if}{$required_by}
 											{assign var=first_loop value=0}
 										{/if}
 									{/foreach}
 								</label>
-								{formhelp note=$package.info package=$name}
+								{formhelp note=$package.info|default:'Missing' package=$name}
 							{/forminput}
 						</div>
 					</div>
@@ -90,28 +90,28 @@
 
 			{legend legend="Services installed on your system"}
 				<p>
-					{tr}A service package is a package that allows you to extend the way you display bitweaver content - such as <em>categorising your content</em>. Activating more than one of any service type might lead to conflicts.<br />
-					We therefore recommend that you <em>	enable only one of each</em> <strong>service type</strong>.{/tr}
+					A service package is a package that allows you to extend the way you display bitweaver content - such as <em>categorising your content</em>. Activating more than one of any service type might lead to conflicts.<br />
+					We therefore recommend that you <em>	enable only one of each</em> <strong>service type</strong>.
 				</p>
-				<div class="bw-columns">
+				<div class="bit-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
-					{if $package.installed && $package.service && !$package.required}
-					<div class="bw-column-cell">
+					{if $package.installed and !empty($package.service) and !$package.required|default:false}
+					<div class="bit-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
-								{if !$package.required}<label for="package_{$name}">{/if}{biticon class="img-responsive" ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}{if !$package.required}</label>{/if}
+								{if !$package.required|default:false}<label for="package_{$name}">{/if}{biticon class="img-responsive" ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}{if !$package.required|default:false}</label>{/if}
 							</div>
 							{forminput}
 								<label>
 									{assign var=is_requirement value=''}
 									{foreach from=$gBitSystem->mRequirements key=req item=reqs}
-										{if $reqs.$name && $gBitSystem->isPackageActive($req) && $package.active_switch eq 'y'}
+										{if !empty($reqs.$name) and $gBitSystem->isPackageActive($req) and $package.active_switch eq 'y'}
 											{assign var=is_requirement value='true'}
 										{/if}
 									{/foreach}
 									{if $is_requirement}
-										{booticon iname="fa-check" iexplain="Required"}
+										{booticon iname="icon-ok"   iexplain="Required"}
 										<input type="hidden" value="y" name="fPackage[{$name}]" id="package_{$name}" />
 									{else}
 										<input type="checkbox" value="y" name="fPackage[{$name}]" id="package_{$name}" {if $package.active_switch eq 'y' }checked="checked"{/if} />
@@ -119,15 +119,15 @@
 									&nbsp; <strong>{$name|capitalize}</strong>
 									{assign var=first_loop value=1}
 									{foreach from=$gBitSystem->mRequirements key=required_by item=reqs}
-										{if $reqs.$name}
-											{if $first_loop}<br />{booticon iname="fa-triangle-exclamation" iexplain="Requirement"} Required by {else}, {/if}{$required_by}
+										{if !empty($reqs.$name)}
+											{if $first_loop}<br />{booticon iname="icon-warning-sign"   iexplain="Requirement"} Required by {else}, {/if}{$required_by}
 											{assign var=first_loop value=0}
 										{/if}
 									{/foreach}
 									<br />
-									{tr}Service Type{/tr}: <strong>{$package.service|capitalize|replace:"_":" "}</strong>
+									{tr}Service Type{/tr}: <strong>{$package.service|default:''|capitalize|replace:"_":" "}</strong>
 								</label>
-								{formhelp note=$package.info package=$name}
+								{formhelp note=$package.info|default:'Missing' package=$name}
 							{/forminput}
 						</div>
 					</div>
@@ -145,10 +145,10 @@
 
 		{jstab title="Required"}
 			{legend legend="Required packages installed on your system"}
-				<div class="bw-columns">
+				<div class="bit-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
-					{if $package.installed && !$package.service && $package.required}
-					<div class="bw-column-cell">
+					{if $package.installed and !$package.service and $package.required|default:false }
+					<div class="bit-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
@@ -156,7 +156,7 @@
 							</div>
 							{forminput}
 								<strong>{$name|capitalize}</strong>
-								{formhelp note=$package.info package=$name}
+								{formhelp note=$package.info|default:'Missing' package=$name}
 							{/forminput}
 						</div>
 					</div>
@@ -166,10 +166,10 @@
 				</div>
 			{/legend}
 			{legend legend="Required services installed on your system"}
-				<div class="bw-columns">
+				<div class="bit-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
-					{if $package.installed && $package.service && $package.required}
-					<div class="bw-column-cell">
+					{if $package.installed and !empty($package.service) and $package.required|default:false}
+					<div class="bit-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
@@ -179,7 +179,7 @@
 								<label>
 									<strong>{$name|capitalize}</strong>
 								</label>
-								{formhelp note=$package.info package=$name}
+								{formhelp note=$package.info|default:'Missing' package=$name}
 							{/forminput}
 						</div>
 					</div>
@@ -191,18 +191,18 @@
 		{/jstab}
 
 
-		{if $requirementsMap || $requirements}
+		{if !empty($requirementsMap) or !empty($requirements)}
 			{jstab title="Dependencies"}
 				{legend legend="Requirements"}
-					{if $requirementsMap}
+					{if !empty($requirementsMap)}
 						<p class="help">{tr}Below you will find an illustration of how packages depend on each other.{/tr}</p>
 						<div style="text-align:center; overflow:auto;">
-							<img alt="A graphical representation of package requirements" title="Requirements graph" src="{$smarty.const.KERNEL_PKG_URL}requirements_graph.php?install_version=1&amp;format={$smarty.request.format}&amp;command={$smarty.request.command}" usemap="#Requirements" />
+							<img alt="{tr}A graphical representation of package requirements{/tr}" title="{tr}Requirements graph{/tr}" src="{$smarty.const.KERNEL_PKG_URL}requirements_graph.php?install_version=1&amp;format={$smarty.request.format|default:''}&amp;command={$smarty.request.command|default:''}" usemap="#Requirements" />
 							{$requirementsMap}
 						</div>
 					{/if}
 
-					{if $requirements}
+					{if !empty($requirements)}
 						<p class="help">{tr}Below you will find a detailed table with package requirements. If not all package requirements are met, consider trying to meet all package requirements. If you don't meet them, you may continue at your own peril.{/tr}</p>
 						<table id="requirements">
 							<caption>Package Requirements</caption>
@@ -232,8 +232,8 @@
 								<tr class="{$class}">
 									<td>{$dep.requires|ucfirst}</td>
 									<td>{$dep.required_version.min}</td>
-									<td>{$dep.required_version.max}</td>
-									<td>{$dep.required_version.available}</td>
+									<td>{$dep.required_version.max|default:''}</td>
+									<td>{$dep.required_version.available|default:''}</td>
 									<td>
 										{if $dep.result == 'ok'}
 											OK
@@ -264,7 +264,7 @@
 							{formfeedback warning="At least one package recommend a version lower to the one you have installed. This might cause problems."}
 						{/if}
 
-						{if !$min_dep && !$max_dep && !$missing}
+						{if !$min_dep and !$max_dep and !$missing}
 							{formfeedback success="All package requirements have been met."}
 						{/if}
 					{/if}
@@ -287,10 +287,10 @@
 
 				<hr style="clear:both" />
 
-				<div class="bw-columns">
+				<div class="bit-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
-					{if ((1 or $package.tables) && !$package.required && !$package.installed) }
-					<div class="bw-column-cell">
+					{if ((1 or $package.tables) and !$package.required|default:false and !$package.installed|default:false) }
+					<div class="bit-column-cell">
 					<div class="well">
 						<div class="form-group clear">
 							<div class="formlabel">
@@ -298,7 +298,7 @@
 							</div>
 							{forminput}
 								{$name|capitalize}
-								{formhelp note=$package.info package=$name}
+								{formhelp note=$package.info|default:'Missing' package=$name}
 							{/forminput}
 						</div>
 					</div>
diff --git a/templates/admin_system.tpl b/templates/admin_system.tpl
index a5cd97c..226d499 100644..100755
--- a/templates/admin_system.tpl
+++ b/templates/admin_system.tpl
@@ -20,10 +20,10 @@
 				{/if}
 				{if $gBitSystem->isCacheActive()}
 					<div class="inline-block alert alert-success">{tr}Active{/tr}: APC</div>
-					{formhelp note="To disable object caching, edit your config_inc.php and add this line <strong>define( 'BIT_CACHE_OBJECTS', FALSE );</strong>."}
+					{formhelp note="To disable object caching, edit your config_inc.php and add this line <strong>define( 'BIT_CACHE_OBJECTS', false );</strong>."}
 				{else}
 					<div class="inline-block alert alert-warning">{tr}Disabled{/tr}</div>
-					{formhelp note="To disable object caching, edit your config_inc.php and add this line <strong>define( 'BIT_CACHE_OBJECTS', FALSE );</strong>."}
+					{formhelp note="To disable object caching, edit your config_inc.php and add this line <strong>define( 'BIT_CACHE_OBJECTS', false );</strong>."}
 				{/if}
 			{/forminput}
 		</div>
@@ -54,7 +54,7 @@
 							<td>{$item.path|replace:$smarty.const.BIT_ROOT_PATH:""|replace:"//":"/"}</td>
 							<td class="alignright">{$item.du.count}</td>
 							<td class="alignright">{$item.du.size|display_bytes}</td>
-							<td class="actionicon">{smartlink ititle=Empty booticon="fa-trash" prune=$key}</td>
+							<td class="actionicon">{smartlink ititle=Empty booticon="icon-trash" prune=$key}</td>
 						</tr>
 					{/foreach}
 				</table>
@@ -75,7 +75,7 @@
 							<td>{$item.path|replace:$smarty.const.BIT_ROOT_PATH:""|replace:"//":"/"}{$key}</td>
 							<td class="alignright">{$item.du.count}</td>
 							<td class="alignright">{$item.du.size|display_bytes}</td>
-							<td class="actionicon">{smartlink ititle="Compile Templates" booticon="fa-edit" compiletemplates=$key}</td>
+							<td class="actionicon">{smartlink ititle="Compile Templates" booticon="icon-edit" compiletemplates=$key}</td>
 						</tr>
 					{/foreach}
 				</table>
diff --git a/templates/ajax_file_browser_inc.tpl b/templates/ajax_file_browser_inc.tpl
index fc83975..f91c185 100644..100755
--- a/templates/ajax_file_browser_inc.tpl
+++ b/templates/ajax_file_browser_inc.tpl
@@ -4,7 +4,7 @@
 		<div style="margin-bottom:1em;cursor:hand;">
 			{foreach from=$fileList.dir item=finfo}
 				<div class="{cycle values="even,odd"}" style="margin-left:{$finfo.indent}px;" id="{$finfo.relpath|escape}" title="open" onclick='BitFileBrowser.browse(this.id,this.title,"{$smarty.request.ajax_path_conf}");'>
-					{booticon iname="fa-folder-closed" id="image-`$finfo.relpath`" iexplain="Open"} {$finfo.name}
+					{booticon iname="icon-folder-close"  id="image-`$finfo.relpath`"  iexplain="Open"} {$finfo.name}
 				</div>
 				<div id="{$finfo.relpath|escape}-bitInsert"></div>
 			{/foreach}
@@ -16,7 +16,7 @@
 					</div>
 				{else}
 					<div class="{cycle values="even,odd"}" style="margin-left:{$finfo.indent}px;">
-						{booticon iname="fa-triangle-exclamation" iexplain="Empty"} [{tr}empty{/tr}]
+						{booticon iname="icon-warning-sign"   iexplain="Empty"} [{tr}empty{/tr}]
 					</div>
 				{/if}
 			{/foreach}
diff --git a/templates/confirm.tpl b/templates/confirm.tpl
index 40821ff..09d4375 100644..100755
--- a/templates/confirm.tpl
+++ b/templates/confirm.tpl
@@ -16,9 +16,9 @@
 							{/section}
 						</ul>
 					{/if}
-					{formfeedback warning=$msgFields.warning}
-					{formfeedback success=$msgFields.success}
-					{formfeedback error=$msgFields.error}
+					{formfeedback warning=$msgFields.warning|default:''}
+					{formfeedback success=$msgFields.success|default:''}
+					{formfeedback error=$msgFields.error|default:''}
 				</div>
 
 				<div class="form-group submit">
diff --git a/templates/error.tpl b/templates/error.tpl
index 780936b..a80181b 100644..100755
--- a/templates/error.tpl
+++ b/templates/error.tpl
@@ -1,15 +1,15 @@
 {strip}
 <div class="display errorpage">
 	<div class="header">
-		{if $errorHeading}
+		{if !empty($errorHeading)}
 			<h1>{tr}{$errorHeading}{/tr}</h1>
 		{/if}
 	</div>
 
-	<div class="body">
-	{if $fatalTitle}
+	<div class="body row">
+		{if $fatalTitle}
 		<h2>{tr}{$fatalTitle}{/tr}</h2>
-	{/if}
+		{/if}
 
 	{if $msg}
 		<div class="alert alert-warning">{$msg|escape}</div>
@@ -22,7 +22,7 @@
 	</div>
 	{/if}
 
-	{if $page and ( $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_wiki_admin' ) )}
+	{if !empty($page) and ( $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_wiki_admin' ) )}
 		<p>{tr}Create the page{/tr}: <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page={$page}">{$page}</a></p>
 	{/if}
 
diff --git a/templates/force_installer.tpl b/templates/force_installer.tpl
index b7a59c6..a22c8f7 100644..100755
--- a/templates/force_installer.tpl
+++ b/templates/force_installer.tpl
@@ -1,6 +1,4 @@
-{if ($gBrowserInfo.browser neq 'ie') or ($gBrowserInfo.browser eq 'ie' and $gBrowserInfo.maj_ver gt 7) }
 <?xml version="1.0" encoding="utf-8"?>
-{/if}
 {strip}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -13,12 +11,6 @@
 	<title>Upgrade Bitweaver</title>
 	<link rel="shortcut icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" />
 	<link rel="icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" />
-
-	{* if $gBrowserInfo.browser eq 'ie'}
-		<!--[if lt IE 7]>
-			<script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/fixes/ie7/IE8.js"></script>
-		<![endif]-->
-	{/if *}
 </head>
 <body id="step{$smarty.request.step}">
 	<div id="container">
diff --git a/templates/html.tpl b/templates/html.tpl
index aaa837b..70d962f 100644..100755
--- a/templates/html.tpl
+++ b/templates/html.tpl
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$bitlanguage|default:'en'}" lang="{$bitlanguage|default:'en'}" {if $gBitLanguage->isLanguageRTL()}dir="rtl"{/if}>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$bitlanguage|default:'en'}" lang="{$bitlanguage|default:'en'}" {$htmlTagAttributes|default:''} {if $gBitLanguage->isLanguageRTL()}dir="rtl"{/if}>
 {if $gBitThemes->mDisplayMode}
 	{assign var=displayClass value=$gBitThemes->mDisplayMode|cat:"mode"|cat:" "}
 {/if}
 {if !empty($gQueryUser->mUserId)}
 	{assign var=userClass value="user"|cat:$gQueryUser->mUserId|cat:" "}
 {/if}
-{if $gContent->mContentId}
+{if !empty($gContent->mContentId)}
 	{assign var=contentClass value="cid"|cat:$gContent->mContentId}
 {/if}
 {strip}
@@ -15,11 +15,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="referrer" content="always">
 
-	<link rel="icon" href="{$gBitThemes->getStyleUrl()}favicon.png" type="image/png">
+	<link rel="icon" href="{$gBitThemes->getStyleUrl()}favicon.ico" type="image/ico" />
 
 	{**** if the theme has a header, it goes first ****}
-	{if file_exists("`$smarty.const.CONFIG_THEME_PATH`theme_head_inc.tpl")}
-		{include file="`$smarty.const.CONFIG_THEME_PATH`theme_head_inc.tpl"}
+	{if !empty($theme_head)}
+		{include file=$theme_head}
 	{/if}
 
 	{**** get custom head files from individual packages ****}
@@ -27,18 +27,11 @@
 		{include file=$file}
 	{/foreach}
 
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="{$smarty.const.CONFIG_PKG_URL}js/html5shim/html5shiv.js"></script>
-    <![endif]-->
-	{if $baseHref}
-	<base href="{$baseHref}">
-	{/if}
 </head>
 <body itemscope itemtype="http://schema.org/WebPage"
 	{if $gBitSystem->mOnload} onload="{foreach from=$gBitSystem->mOnload item=loadString}{$loadString}{/foreach}" {/if}
 	{if $gBitSystem->mOnunload} onunload="{foreach from=$gBitSystem->mOnunload item=loadString}{$loadString}{/foreach}"	{/if} 
-	id="{$gBitSystem->getActivePackage()}" class="{$displayClass}{$userClass}{$contentClass}">
+	id="{$gBitSystem->getActivePackage()}" class="{$displayClass}{$userClass|default:''}{$contentClass}">
 {if $gBitSystem->mDebugHtml}
 	<div id="bw_debughtml">
 		<a href="#postdebug" onclick="document.getElementById('bw_debughtml').style.display='none';">Go to content</a>
@@ -59,57 +52,66 @@
 		{/if}
 	{/if}
 
-	{if $leftCol && $rightCol}
-		{assign var=extraColumns value=2}
-	{elseif !empty($leftCol)}
-		{assign var=extraColumns value=1}
+	{if !empty($leftCol)}
+		{if !empty($rightCol)}
+			{assign var=extraColumns value=2}
+		{else}
+			{assign var=extraColumns value=1}
+		{/if}
 	{elseif !empty($rightCol)}
 		{assign var=extraColumns value=1}
 	{else}
-		{assign var=extraColumns value=0}{/if}
+		{assign var=extraColumns value=0}
+	{/if}
 
 	{if $gBitSystem->isFeatureActive( 'site_top_column' ) && !$gHideModules}
-	<header itemscope itemtype="http://schema.org/WPHeader" class="container{$gBitSystem->getConfig('layout-header')}" id="bw-main-header">
+	<header itemscope itemtype="http://schema.org/WPHeader" role="banner" class="container{$gBitSystem->getConfig('layout-header')}" id="bw-main-header">
 		{$gBitThemes->displayLayoutColumn('t')}
 		{if $gBitSystem->getConfig('site_notice')}
 		<div class="container{$gBitSystem->getConfig('layout-header')}">
 			<div class="sitenotice">{$gBitSystem->getConfig('site_notice')}</div>
 		</div>
-	{/if}
+		{/if}
 
 	</header>
 	{/if}
 
 	<div id="bw-main-spacer-top"></div>
 
-	<section id="bw-main-content" class="container{$gBitSystem->getConfig('layout-body')}"><div class="row">
-		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='row' serviceHash=$gContent->mInfo}
+	<section id="bw-main-content" class="container{$gBitSystem->getConfig('layout-body')}">
+		<div class="row">
+			{if !empty($gContent->mInfo)}
+				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='row' serviceHash=$gContent->mInfo}
+			{/if}
 
-		{**** Theme Layout Modules : NAVIGATION ****}
-		{if $leftCol}
-		<nav id="navigation" class="col-md-3 col-sm-4 col-xs-12">
-			<div class="row">
-				{$leftCol}
-			</div>
-		</nav><!-- end #navigation -->{* needed by output filters. *}
-		{/if}
+			{**** Theme Layout Modules : NAVIGATION ****}
+			{if !empty($leftCol)}
+			<nav id="navigation" class="col-md-3 col-sm-4 col-xs-12">
+				<div class="row">
+					{$leftCol}
+				</div>
+			</nav><!-- end #navigation -->{* needed by output filters. *}
+			{/if}
 
-		<main id="wrapper" class="col-md-{math equation='12-x*3' x=$extraColumns} col-sm-{math equation='12-x*4' x=$extraColumns} col-xs-12">
-			{**** Theme Layout Modules : CENTER ****}
-			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='wrapper' serviceHash=$gContent->mInfo}
-			{include file="bitpackage:liberty/structure_display.tpl"}
-			{include file=$mid}
-		</main><!-- end #wrapper -->
+			<main role="main" id="wrapper" class="col-md-{math equation='12-x*3' x=$extraColumns} col-sm-{math equation='12-x*4' x=$extraColumns} col-xs-12">
+				{**** Theme Layout Modules : CENTER ****}
+				{if !empty($gContent->mInfo)}
+					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='wrapper' serviceHash=$gContent->mInfo}
+				{/if}	
+				{include file="bitpackage:liberty/structure_display.tpl"}
+				{include file=$mid}
+			</main><!-- end #wrapper -->
 
-		{**** Theme Layout Modules : EXTRA ****}
-		{if $rightCol}
-		<nav id="extra" class="col-md-3 col-sm-4 col-xs-12">
-			<div class="row">
-				{$rightCol}
-			</div>
-		</nav><!-- end #extra -->{* needed by output filters. *}
-		{/if}
-	</div></section>
+			{**** Theme Layout Modules : EXTRA ****}
+			{if $rightCol}
+			<nav id="extra" class="col-md-3 col-sm-4 col-xs-12">
+				<div class="row">
+					{$rightCol}
+				</div>
+			</nav><!-- end #extra -->{* needed by output filters. *}
+			{/if}
+		</div>
+	</section>
 
 	<div id="bw-spacer-bottom"></div>
 
@@ -126,6 +128,7 @@
 
 	{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}</div>{/if}
 	{include file="bitpackage:kernel/footer.tpl"}
+	{include file="bitpackage:ckeditor/footer.tpl"}
 	</body>
 </html>
 {/strip}
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 04b595e..a23c364 100644..100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,9 +1,10 @@
 {strip}
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta name="generator" content="bitweaver - http://www.bitweaver.org">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="generator" content="bitweaver - http://www.bitweaver.org" />
+<meta name="author" content="http://rainbowdigitalmedia.uk" />
 
-{if $metaDescription}
-<meta name="description" content="{$metaDescription|escape}">
+{if !empty($metaDescription)}
+<meta name="description" content="{$metaDescription|escape}" />
 {elseif $smarty.server.REQUEST_URI==$smarty.const.BIT_ROOT_URL}
 <meta name="description" content="{$gBitSystem->getConfig('site_description')|escape}"/>
 {elseif !empty($gContent) && $gContent->isValid()}
@@ -11,14 +12,14 @@
 {/if}
 
 {if $metaKeywords}
-<meta name="keywords" content="{$metaKeywords|escape}">
+<meta name="keywords" content="{$metaKeywords|escape}" />
 {elseif $smarty.server.REQUEST_URI==BIT_ROOT_URI}
-<meta name="keywords" content="{$metaKeywords|default:$gBitSystem->getConfig('site_keywords')}">
+<meta name="keywords" content="{$metaKeywords|default:$gBitSystem->getConfig('site_keywords')}" />
 {elseif !empty($gContent) && $gContent->isValid()}
 <meta name="keywords" content="{','|implode:$gContent->generateKeywords()|strip_tags|escape}"/>
 {/if}
 
-{if $canonicalLink}
+{if !empty($canonicalLink)}
 <link rel="canonical" href="{$canonicalLink|escape}"/>
 {/if}
 {if !empty($relTags)}
@@ -31,36 +32,36 @@
 {/if}
 
 {if $gBitSystem->isFeatureActive( 'site_header_extended_nav' )}
-	<link rel="start" title="{$gBitSystem->getConfig('site_title')} {tr}Home{/tr}" href="{$smarty.const.BIT_ROOT_URL}">
+	<link rel="start" title="{$gBitSystem->getConfig('site_title')} {tr}Home{/tr}" href="{$smarty.const.BIT_ROOT_URL}" />
 
 	{if $gBitSystem->isFeatureActive( 'site_header_help' )}
-		<link rel="help" title="{tr}Help{/tr}" href="{$gBitSystem->getConfig('site_header_help')}">
+		<link rel="help" title="{tr}Help{/tr}" href="{$gBitSystem->getConfig('site_header_help')}" />
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'site_header_copyright' )}
-		<link rel="copyright" title="{tr}Copyright{/tr}" href="{$gBitSystem->getConfig('site_header_copyright')}">
+		<link rel="copyright" title="{tr}Copyright{/tr}" href="{$gBitSystem->getConfig('site_header_copyright')}" />
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'site_header_contents' )}
-		<link rel="contents" title="{tr}Contents{/tr}" href="{$gBitSystem->getConfig('site_header_contents')}">
+		<link rel="contents" title="{tr}Contents{/tr}" href="{$gBitSystem->getConfig('site_header_contents')}" />
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'site_header_index' )}
-		<link rel="index" title="{tr}Index{/tr}" href="{$gBitSystem->getConfig('site_header_index')}">
+		<link rel="index" title="{tr}Index{/tr}" href="{$gBitSystem->getConfig('site_header_index')}" />
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'site_header_glossary' )}
-		<link rel="glossary" title="{tr}Glossary{/tr}" href="{$gBitSystem->getConfig('site_header_glossary')}">
+		<link rel="glossary" title="{tr}Glossary{/tr}" href="{$gBitSystem->getConfig('site_header_glossary')}" />
 	{/if}
 
 	{assign var=headPageUrl value="`$smarty.server.SCRIPT_NAME`?sort_mode=`$listInfo.sort_mode`&amp;find=`$listInfo.find`"}
 	{if $listInfo.current_page > 1}
-		<link rel="first" title="{tr}First page{/tr}" href="{$headPageUrl}&amp;list_page=1">
-		<link rel="previous" title="{tr}Previous page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.current_page-1}">
+		<link rel="first" title="{tr}First page{/tr}" href="{$headPageUrl}&amp;list_page=1" />
+		<link rel="previous" title="{tr}Previous page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.current_page-1}" />
 	{/if}
 	{if $listInfo.current_page < $listInfo.total_pages}
-		<link rel="next" title="{tr}Next page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.current_page+1}">
-		<link rel="last" title="{tr}Last page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.total_pages}">
+		<link rel="next" title="{tr}Next page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.current_page+1}" />
+		<link rel="last" title="{tr}Last page{/tr}" href="{$headPageUrl}&amp;list_page={$listInfo.total_pages}" />
 	{/if}
 {/if}
 
-<script>/* <![CDATA[ */
+<script nonce="{$cspNonce}">/* <![CDATA[ */
 	BitSystem = {
 		"urls":{
 			"root":"{$smarty.const.BIT_ROOT_URL}",
@@ -73,4 +74,10 @@
 	var bitTk = "{$gBitUser->mTicket}";
 /* ]]> */</script>
 
+{if $gBitSystem->isPackageActive('jscalendar') && $gBitSystem->isFeatureActive( 'site_use_jscalendar' )}
+	<link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/calendar-system.css" media="all" nonce="{$cspNonce} />
+	<script nonce="{$cspNonce}" async src="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/calendar.js"></script>
+	<script nonce="{$cspNonce}" async src="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/lang/calendar-en.js"></script>
+	<script nonce="{$cspNonce}" async src="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/calendar-setup.js"></script>
+{/if}
 {/strip}
diff --git a/templates/menu_kernel_admin.tpl b/templates/menu_kernel_admin.tpl
index 4487ff6..e4cd002 100644..100755
--- a/templates/menu_kernel_admin.tpl
+++ b/templates/menu_kernel_admin.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $packageMenuTitle}<a href="#"> {tr}{$packageMenuTitle}{/tr}</a>{/if}
+{if !empty($packageMenuTitle)}<a href="#"> {tr}{$packageMenuTitle}{/tr}</a>{/if}
 <ul class="{$packageMenuClass}">
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=features">{tr}Kernel{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=packages">{tr}Packages{/tr}</a></li>
@@ -9,7 +9,9 @@
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/apc.php">{tr}APCu Cache{/tr}</a></li>
 	{/if}
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/admin_notifications.php">{tr}Notification{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/db_performance.php">{tr}Database Performance{/tr}</a></li>
+		{if $smarty.const.DB_PERFORMANCE_STATS eq 'true'}
+			<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/db_performance.php">{tr}Database Performance{/tr}</a></li>
+		{/if}
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/phpinfo.php">{tr}PHPinfo{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?version_check=1">{tr}Check Version{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/sitemaps.php">{tr}Sitemaps{/tr}</a></li>
diff --git a/templates/pagination.tpl b/templates/pagination.tpl
index 9499338..8a345dd 100644..100755
--- a/templates/pagination.tpl
+++ b/templates/pagination.tpl
@@ -1,22 +1,26 @@
 {strip}
-{if $listInfo.query_string}
+{if !empty($listInfo.query_string)}
 		{assign var=pageUrl value="`$smarty.server.SCRIPT_NAME`?`$listInfo.query_string`&amp;"}
 {else}
 	{capture name=string}
-		{foreach from=$listInfo.parameters key=param item=value}
-			{if $value|is_array}
-				{foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
-			{else}
-				{if $value ne ''}{$param}={$value}&amp;{/if}
-			{/if}
-		{/foreach}
-		{foreach from=$listInfo.ihash key=param item=value}
-			{if $value|is_array}
-				{foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
-			{else}
-				{if $value ne ''}{$param}={$value}&amp;{/if}
-			{/if}
-		{/foreach}
+		{if isset($listInfo.parameters) }
+			{foreach from=$listInfo.parameters key=param item=value}
+				{if $value|is_array}
+					{foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
+				{else}
+					{if $value ne ''}{$param}={$value}&amp;{/if}
+				{/if}
+			{/foreach}
+		{/if}
+		{if isset($listInfo.ihash) }
+			{foreach from=$listInfo.ihash key=param item=value}
+				{if $value|is_array}
+					{foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
+				{else}
+					{if $value ne ''}{$param}={$value}&amp;{/if}
+				{/if}
+			{/foreach}
+		{/if}
 		{foreach from=$pgnHidden key=param item=value}
 			{if $value|is_array}
 				{foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
@@ -24,7 +28,7 @@
 				{if $value ne ''}{$param}={$value}&amp;{/if}
 			{/if}
 		{/foreach}
-		{*if $listInfo.sort_mode}
+		{if isset($listInfo.sort_mode) and $listInfo.sort_mode ne ''}
 			{if is_array($listInfo.sort_mode)}
 				{foreach from=$listInfo.sort_mode item=sort}
 					sort_mode[]={$sort}&amp;
@@ -32,16 +36,15 @@
 			{else}
 				sort_mode={$listInfo.sort_mode}&amp;
 			{/if}
-		{/if*}
+		{/if}
 		{if isset($listInfo.find) && $listInfo.find ne ''}
 			find={$listInfo.find}&amp;
 		{/if}
 	{/capture}
 	{assign var=pageUrlVar value=$smarty.capture.string|regex_replace:'/"/':'%22'}
-	{assign var=pageUrl value="`$smarty.server.SCRIPT_URL`?`$pageUrlVar`"}
+	{assign var=pageUrl value="`$pgnUrl`?`$pageUrlVar`"}
 {/if}
-
-{if $listInfo.total_pages > 1 && $listInfo.page_records}
+{if !empty($listInfo) and $listInfo.total_pages > 1 && $listInfo.page_records}
 <div class="paginator overflow-hidden clear">
 	<ul class="pagination pull-left">
 		{if $listInfo.current_page > 1}
diff --git a/templates/popup_box.tpl b/templates/popup_box.tpl
index 7288eb4..dc12448 100644..100755
--- a/templates/popup_box.tpl
+++ b/templates/popup_box.tpl
@@ -4,7 +4,7 @@
 	<h3>
 		{$title}
 		{if $closebutton}
-			<a class="closebutton" onclick='javascript:return cClick();'>{booticon iname="fa-circle-xmark" iexplain="close"}</a>
+			<a class="closebutton" onclick='javascript:return cClick();'>{booticon iname="icon-remove"  ipackage="icons"  iexplain="close" iforce="icon"}</a>
 		{/if}
 	</h3>
 
diff --git a/templates/top.tpl b/templates/top.tpl
index f06197a..cb9b8cb 100644..100755
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -1,11 +1,11 @@
-<div id="bw-top">
-	<div class="bw-top-wrapper">
+<div id="bittop">
+	<div class="bittop-wrapper">
 		<a class="brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
 		<div class="pull-right">
 			{if $gBitUser->isRegistered()}
 			<ul class="nav nav-pills">
 				<li class="active dropdown">
-					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#">{booticon iname="fa-user"} {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
+					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#"><i class="icon-user"></i> {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
 					<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 						<li><a href="{$gBitUser->getDisplayUrl()}">{tr}My Profile{/tr}</a></li>
 						<li><a href="{$smarty.const.USERS_PKG_URL}my.php">{tr}My Account{/tr}</a></li>
@@ -17,7 +17,7 @@
 				</li>
 			</ul>
 			{else}
-				<a href="{$smarty.const.USERS_PKG_URL}signin">{tr}login{/tr}</a>
+				<a href="{$smarty.const.USERS_PKG_URL}signin.php">{tr}login{/tr}</a>
 				{if $gBitSystem->isFeatureActive( 'users_allow_register' )}
 					{tr}or{/tr} <a href="{$smarty.const.USERS_PKG_URL}register.php">{tr}register{/tr}</a> 
 				{/if}
diff --git a/templates/top_bar.tpl b/templates/top_bar.tpl
index ae99cd5..ea6e63c 100644..100755
--- a/templates/top_bar.tpl
+++ b/templates/top_bar.tpl
@@ -1,11 +1,11 @@
 {strip}
-<nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" id="bw-top-bar">
+<nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" id="bittopbar">
 	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bw-top-menu">{booticon iname="fa-bars"}</button>
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-top-menu">{booticon iname="icon-reorder"}</button>
 		<a class="navbar-brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
 	</div>
 	{if $gBitSystem->mAppMenu}
-	<div class="collapse navbar-collapse" id="bw-top-menu">
+	<div class="collapse navbar-collapse" id="bit-top-menu">
 		{if $gBitSystem->mAppMenu.bar}
 		<ul class="nav navbar-nav">
 			{foreach key=key item=menu from=$gBitSystem->mAppMenu.bar}
@@ -23,7 +23,7 @@
 			{/foreach}
 		</ul>
 		{/if}
-		{if $gBitSystem->mAppMenu.form}
+		{if !empty($gBitSystem->mAppMenu.form)}
 		{foreach key=key item=menu from=$gBitSystem->mAppMenu.form}
 			{if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled}
 				{include file="`$menu.menu_template`" packageMenuClass="dropdown-menu" packageMenuTitle=$menu.menu_title}
@@ -34,7 +34,7 @@
 		<ul class="nav navbar-nav navbar-right">
 			{if $gBitUser->isRegistered()}
 				<li class="dropdown">
-					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#">{booticon iname="fa-user"} {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
+					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#"><i class="icon-user"></i> {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
 					<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 						<li><a href="{$gBitUser->getDisplayUrl()}">{tr}My Profile{/tr}</a></li>
 						<li><a href="{$smarty.const.USERS_PKG_URL}my">{tr}Dashboard{/tr}</a></li>
@@ -48,7 +48,7 @@
 					</ul>
 				</li>
 			{else}
-				<li><a href="{$smarty.const.USERS_PKG_URL}signin">{tr}Sign In{/tr}</a></li>
+				<li><a href="{$smarty.const.USERS_PKG_URL}signin.php">{tr}Sign In{/tr}</a></li>
 			{/if}
 		</ul>
 	</div>