major cleanup to install of new installation testing

4 files changed, 9 insertions, 20 deletions

diff --git a/templates/install.tpl b/templates/install.tpl
index 14a17d0..812b8d8 100644
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -47,16 +47,7 @@
 
 				<nav class="pull-right width60p" style="padding:10px 20px 0 0;">
 					<div class="pull-right">
-						<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
-					</div>
-
-					<div class="pull-right width50p" style="padding:0 10px;">
-						<div class="progress">
-						  <div class="bar bar-success" style="width: {$progress|default:0}%;"></div>
-						</div>
-					</div>
-					<div class="pull-right">
-						<em>{$section|default:"Install"} Progress</em>
+						<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc">{booticon iname="fa-question-circle"} Help</a>
 					</div>
 				</nav>
 			</div>
@@ -65,7 +56,7 @@
 					{foreach from=$menu_steps item=step key=key}
 						<li class="{if $smarty.request.step == $key}active{/if}">
 							<a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}" {if $step.state eq 'uncompleted'}onclick="return false;"{/if}>
-							{if $step.icon}<i class="{$step.icon}"></i> {/if} {$step.name}
+							{if $step.icon}{booticon iname=$step.icon} {/if}{$step.name}
 							</a>
 						</li>
 					{/foreach}
@@ -83,7 +74,9 @@
 	</div>
 
 	<footer class="container content-center">
-		{include file="bitpackage:kernel/bot_bar.tpl"}
+		{if $gBitInstaller->isInstalled()}
+			{include file="bitpackage:kernel/bot_bar.tpl"}
+		{/if}
 	</footer>
 </body>
 </html>
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 579f2bc..94605d9 100644
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -10,9 +10,7 @@
 			<ul class="result">
 			{foreach from=$warning item=warn}
 				<li class="warning">
-					{booticon iname="icon-warning-sign"  ipackage="icons"  iexplain=warning}
-					&nbsp;
-					{$warn}
+					{booticon iname="fa-triangle-exclamation"} {$warn}
 				</li>
 			{/foreach}
 			</div>
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index bb3d75d..861f4c8 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -7,7 +7,7 @@
 
 			{if $packageUpgrades}
 				<h2>Packages and their upgrades</h2>
-				<div class="alert alert-danger"><div class="pull-left"><i class="icon-warning-sign" style="font-size:3em;padding-right:20px;"></i></div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="http://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
+				<div class="alert alert-danger"><div class="pull-left">{booticon iname="fa-triangle-exclamation" style="font-size:3em;padding-right:20px;"}</div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="http://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
 				{foreach from=$packageUpgrades item=upgrade key=package}
 					{* users don't have the option to select what packages to upgrade since the code of the package is dependent on this upgrade
 					<h3>{forminput label="checkbox"}<input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}{/forminput}</h3> *}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 1ba0b44..89bc382 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -3,9 +3,7 @@
 	<div class="col-md-8">
 		<h1>Welcome to the Bitweaver Installer</h1>
 
-		{if $gBitUser->isAdmin()}
-			<p class="alert alert-block">Since this does not appear to be your first install, you can access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p>
-		{/if}
+		<p class="alert alert-block">Since this does not appear to be your first install, you can access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p>
 
 		<p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="http://www.bitweaver.org">bitweaver.org</a>.  Help is available via <a class="external" href="http://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="http://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p>
 
@@ -13,7 +11,7 @@
 
 		<div class="form-group">
 			{forminput}
-				{if $gBitUser->isAdmin()}
+				{if $gBitInstaller->isInstalled()}
 					<a class="btn btn-default" href="{$smart.const.INSTALL_PKG_URL}?step=4">Upgrade</a> <a class="btn" href="{$smart.const.INSTALL_PKG_URL}?step=3">Install Packages</a>
 					<a class="btn btn-danger pull-right" href="{$smart.const.INSTALL_PKG_URL}?step=1">Restart Installation</a>
 				{else}