bootstrap and Smarty 3 cleanup

18 files changed, 73 insertions, 87 deletions

diff --git a/templates/index.php b/templates/index.php
deleted file mode 100644
index 3e305fe..0000000
--- a/templates/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php 
-
-	// This is not a package.
-	header ("location: ../index.php");
-
-?>
\ No newline at end of file
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index ffe0af4..c52087a 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -15,7 +15,7 @@
 							<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>
+							<label class="checkbox"><input type="checkbox" name="PACKAGE[]" value="{$package}" id="{$package}" checked="checked" /> {$item.name}</label>
 							{formhelp note=$item.info}
 							{formhelp note="<strong>Location</strong>: `$item.url`"}
 							{formhelp package=$package}
@@ -28,7 +28,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
diff --git a/templates/install_beta1_beta2_done.tpl b/templates/install_beta1_beta2_done.tpl
index 5ab616c..0f46f14 100644
--- a/templates/install_beta1_beta2_done.tpl
+++ b/templates/install_beta1_beta2_done.tpl
@@ -32,7 +32,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<input type="submit" class="btn" value="Continue install process" />
+			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index 619d907..e2d4ffd 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver integrity check</h1>
 
-{form class="form-horizontal" id="integrity_check"}
+{form id="integrity_check"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	{legend legend="Database Integrity Check"}
@@ -57,7 +57,7 @@
 
 			<div class="control-group">
 				{forminput}
-					<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
@@ -89,49 +89,47 @@
 				{/if}
 			</p>
 
-			<table class="data">
-				<caption>Permissions that need amending</caption>
-				{if $insPerms}
-					<tr><th style="width:20px;"></th><th colspan="4" style="width:99%;">New Permissions</th></tr>
+			{if $insPerms}
+			<h2>New permissions that will be added</h2>
+			<table class="table data">
+				<tr>
+					<th>Permission</th>
+					<th>Description</th>
+					<th class="width10p">Level</th>
+					<th class="width10p">Package</th>
+				</tr>
+				{foreach from=$insPerms item=perm}
 					<tr>
-						<th></th>
-						<th style="width:30%;">Permission</th>
-						<th style="width:40%;">Description</th>
-						<th style="width:15%;">Level</th>
-						<th style="width:14%;">Package</th>
+						<td><label class="checkbox" for="{$perm.0}"><input type="checkbox" value="{$perm.0}" id="{$perm.0}" name="perms[{$perm.0}]" checked="checked" /><strong>{$perm.0}</strong></label></td>
+						<td><label for="{$perm.0}">{$perm.1}</label></td>
+						<td><label for="{$perm.0}">{$perm.2}</label></td>
+						<td><label for="{$perm.0}">{$perm.3}</label></td>
 					</tr>
-					{foreach from=$insPerms item=perm}
-						<tr class="{cycle values="odd,even"}">
-							<td><input type="checkbox" value="{$perm.0}" id="{$perm.0}" name="perms[{$perm.0}]" checked="checked" /></td>
-							<td><label for="{$perm.0}"><strong>{$perm.0}</strong></label></td>
-							<td><label for="{$perm.0}">{$perm.1}</label></td>
-							<td><label for="{$perm.0}">{$perm.2}</label></td>
-							<td><label for="{$perm.0}">{$perm.3}</label></td>
-						</tr>
-					{/foreach}
-				{/if}
+				{/foreach}
+			</table>
+			{/if}
 
-				{if $delPerms}
-					<tr><th></th><th colspan="4">Permissions no longer in use</th></tr>
+			{if $delPerms}
+			<h2>Permissions no longer in use that will be deleted</h2>
+			<table class="table data">
+				<tr>
+					<th>Permission</th>
+					<th>Description</th>
+					<th class="width10p">Level</th>
+					<th class="width10p">Package</th>
+				</tr>
+				{foreach from=$delPerms item=perm}
 					<tr>
-						<th></th>
-						<th>Permission</th>
-						<th>Description</th>
-						<th>Level</th>
-						<th>Package</th>
+						<td><label class="checkbox" for="{$perm.0}"><input type="checkbox" value="{$perm.0}" id="{$perm.0}" name="perms[{$perm.0}]" checked="checked" /> <strong>{$perm.0}</strong></label></td>
+						<td><label for="{$perm.0}">{$perm.1}</label></td>
+						<td><label for="{$perm.0}">{$perm.2}</label></td>
+						<td><label for="{$perm.0}">{$perm.3}</label></td>
 					</tr>
-					{foreach from=$delPerms item=perm}
-						<tr class="{cycle values="odd,even"}">
-							<td><input type="checkbox" value="{$perm.0}" id="{$perm.0}" name="perms[{$perm.0}]" checked="checked" /></td>
-							<td><label for="{$perm.0}"><strong>{$perm.0}</strong></label></td>
-							<td><label for="{$perm.0}">{$perm.1}</label></td>
-							<td><label for="{$perm.0}">{$perm.2}</label></td>
-							<td><label for="{$perm.0}">{$perm.3}</label></td>
-						</tr>
-					{/foreach}
-				{/if}
-			</table>
-		{else}
+				{/foreach}
+			{/if}
+		</table>
+		{/if}
+		{if empty( $insPerms ) && empty( $delPerms )}
 			<p class="alert alert-success">
 				The permissioning system in your installation is up to date and does not require any adjustments. Even though this is true, we recommend you visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/permissions.php"} page at some point to ensure that all permissions are active.
 			</p>
@@ -165,7 +163,7 @@
 							<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>
+							<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> {$package|capitalize}</label>
 							{formhelp note=$schema.$package.info}
 							{formhelp note="<strong>Location</strong>: `$schema.$package.url`"}
 							{formhelp package=$package}
@@ -183,13 +181,13 @@
 		{if $delPerms || $insPerms || $serviceList}
 			<div class="control-group">
 		{forminput}
-					<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Issues" />
+					<input type="submit" class="btn btn-primary" name="resolve_conflicts" value="Resolve Issues" />
 		{/forminput}
 			</div>
 
 			<div class="control-group">
 				{forminput}
-					<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl
index 5a7c9db..b2a3b21 100644
--- a/templates/install_cleanup_done.tpl
+++ b/templates/install_cleanup_done.tpl
@@ -1,6 +1,6 @@
 <h1>Resolved Conflicts</h1>
 
-{form class="form-horizontal" legend="Resolved Conflicts"}
+{form}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<p class="alert alert-success">
@@ -19,10 +19,7 @@
 			{/forminput}
 		</div>
 
-		<p>Since permissions have been modified, you should visit the
-			{smartlink ititle="permission maintenance" ipackage=users
-			ifile=admin/permissions.php} page to make sure that all permissions
-			are assigned to the correct groups.</p>
+		<p>Since permissions have been modified, you should visit the {smartlink ititle="permission maintenance" ipackage=users ifile="admin/permissions.php"} page to make sure that all permissions are assigned to the correct groups.</p>
 	{/if}
 
 	{if $deActivated}
diff --git a/templates/install_datapump_done.tpl b/templates/install_datapump_done.tpl
index 769cb10..b0859e5 100644
--- a/templates/install_datapump_done.tpl
+++ b/templates/install_datapump_done.tpl
@@ -45,7 +45,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<input type="submit" class="btn" value="Continue install process" />
+			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 46f021f..9984dc6 100644
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -2,7 +2,7 @@
 
 <h1>{$title|default:"You must be logged in as an administrator to run the installer."}</h1>
 
-{form class="form-horizontal" name="login" legend="Please sign in to continue" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
+{form class="form-horizontal" name="login" legend="Please sign in to continue"}
 	<div class="control-group">
 		{formfeedback error="$error"}
 		{formlabel label="Username or Email" for="user"}
@@ -23,9 +23,6 @@
 		{forminput}
 			<input type="submit" class="btn btn-primary" name="signin" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
 		{/forminput}
-		{if $gBitSystem->isFeatureActive('site_https_login_required') || $smarty.server.HTTPS=='on'}
-			{booticon iname="icon-lock" ipackage="icons" iexplain="Secure Login"}
-		{/if}
 	</div>
 {/form}
 
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index bcc39e8..b60176f 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -54,7 +54,7 @@
 							<div class="control-group">
 								<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>
+									<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
 									{formhelp note=$item.info is_installer=1}
 									{formhelp note="<strong>Location</strong>: `$item.url`"}
 									{formhelp package=$package}
@@ -87,7 +87,7 @@
 				{/if}
 				<div class="control-group">
 					{forminput}
-						<label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+						<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
@@ -125,11 +125,11 @@
 					<div class="control-group">
 						{formlabel label=""}
 						{forminput}
-							<label><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" />&nbsp;Delete database tables</label>
+							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" />&nbsp;Delete database tables</label>
 							{formhelp note="If selected, the package's database tables are deleted. If no other option is selected, specific settings might remain in Kernel configuration, and specific content might remain in Liberty tables, both of which might lead to undesired results."}
-							<label><input type="checkbox" name="remove_actions[]" value="settings" checked="checked" />&nbsp;Delete package settings</label>
+							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="settings" checked="checked" />&nbsp;Delete package settings</label>
 							{formhelp note="If selected, all package specific settings are removed. Therefor the package is reset to it's default values, including permissions."}
-							<label><input type="checkbox" name="remove_actions[]" value="content" checked="checked" />&nbsp;Delete stored content</label>
+							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="content" checked="checked" />&nbsp;Delete stored content</label>
 							{formhelp note="If selected, all content that has been stored in the common content storage area is removed."}
 						{/forminput}
 					</div>
@@ -144,7 +144,7 @@
 										<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>
+										<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong></label>
 										{formhelp note=$item.info is_installer=1}
 										{formhelp note="<strong>Location</strong>: `$item.url`"}
 										{formhelp package=$package}
@@ -167,7 +167,7 @@
 
 					<div class="control-group">
 						{forminput}
-							<label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+							<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 							{formhelp note="Display SQL statements."}
 						{/forminput}
 					</div>
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 7259ad3..c539f3d 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -2,15 +2,15 @@
 
 {jstabs tab=0}
 	{jstab title="Available Upgrades"}
-		{form class="form-horizontal" id="package_select" legend="Packages that will be upgraded" id="package_select"}
+		{form id="package_select" legend="Packages that will be upgraded" id="package_select"}
 			<input type="hidden" name="step" value="{$next_step}" />
 
 			{if $packageUpgrades}
 				<h2>Packages and their upgrades</h2>
-				<p class="danger">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>).</p>
+				<div class="alert alert-error"><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>
 				{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><label><input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}</label></h3> *}
+					<h3><label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}</label></h3> *}
 
 					<h3>{$package}</h3>
 					<input type="hidden" name="packages[]" value="{$package}" />
@@ -154,14 +154,14 @@
 
 			<div class="control-group">
 				{forminput}
-					<label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+					<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
 
 			<div class="control-group">
 				{forminput}
-					<input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
+					<input type="submit" class="btn btn-primary" name="upgrade_packages" value="Upgrade Packages" />
 				{/forminput}
 			</div>
 		{/form}
diff --git a/templates/install_upgrade_done.tpl b/templates/install_upgrade_done.tpl
index 589ccfb..5faffb9 100644
--- a/templates/install_upgrade_done.tpl
+++ b/templates/install_upgrade_done.tpl
@@ -1,6 +1,6 @@
 <h1>Upgrade Packages</h1>
 
-{form class="form-horizontal" id="package_select" legend="Upgraded Packages" id="package_select"}
+{form id="package_select" legend="Upgraded Packages" id="package_select"}
 	<p class="alert alert-success">The following packages were successfully upgraded</p>
 	<input type="hidden" name="step" value="{$next_step}" />
 	<dl>
@@ -19,7 +19,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<input type="submit" class="btn" name="continue" value="Continue Install Process" />
+			<input type="submit" class="btn btn-primary" name="continue" value="Continue Install Process" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index c499669..734f110 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver version update</h1>
 
-{form class="form-horizontal" id="integrity_check"}
+{form id="integrity_check"}
 	<input type="hidden" name="step" value="{$next_step}" />
 	<input type="hidden" name="update_version" value="true" />
 
@@ -22,7 +22,7 @@
 			</p>
 
 			<p class="help">
-				You can visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile=admin/permissions.php} page at any time to make further adjustments.
+				You can visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/permissions.php"} page at any time to make further adjustments.
 			</p>
 
 
@@ -73,7 +73,7 @@
 
 			<div class="control-group">
 				{forminput}
-					<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
@@ -87,7 +87,7 @@
 			{if $upToDate}
 				<div class="control-group">
 		{forminput}
-						<input type="submit" class="btn" name="skip" value="Continue install process" />
+						<input type="submit" class="btn btn-primary" name="skip" value="Continue install process" />
 		{/forminput}
 				</div>
 			{else}
diff --git a/templates/install_version_done.tpl b/templates/install_version_done.tpl
index 033ee12..e8ae9d6 100644
--- a/templates/install_version_done.tpl
+++ b/templates/install_version_done.tpl
@@ -15,7 +15,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<input type="submit" class="btn" value="Continue install process" />
+			<input type="submit" class="btn btn-primary" value="Continue install process" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index a1712a8..643b79e 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -281,7 +281,7 @@
 
 				<div class="control-group">
 					{forminput}
-						<label><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
+						<label class="checkbox"><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
diff --git a/templates/migrate_final_done.tpl b/templates/migrate_final_done.tpl
index 050bf57..e1ee514 100644
--- a/templates/migrate_final_done.tpl
+++ b/templates/migrate_final_done.tpl
@@ -1,5 +1,5 @@
 <h1>Upgrade Process Completed</h1>
-{form class="form-horizontal" legend="Select what you want to do next"}
+{form legend="Select what you want to do next"}
 	<p>Go back to the installer to install additional packages that were not part of this migrate.</p>
 	<div class="control-group">
 		{forminput}
diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl
index a6b9ad8..a7e1e96 100644
--- a/templates/migrate_welcome.tpl
+++ b/templates/migrate_welcome.tpl
@@ -1,6 +1,6 @@
 <h1>Bitweaver migrate tool</h1>
 
-{form class="form-horizontal" legend="Begin the migrate process"}
+{form legend="Begin the migrate process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<p>Welcome to the new and improved Bitweaver migrate process. Our migrate scripts are currently still in development and we cannot take any reponsibility for any loss of data that occurs due to the use of these scripts. Having said this, we are doing our best to make this migrate process as reliable and complete as we possibly can. Due to this, we urge you to follow the instructions here carefully before you proceed. We have done our best to make sure all situations are handled. However, your install might have the one case we haven't run into yet. Initial steps before beginning the actual migrate stages:</p>
diff --git a/templates/upgrade_final_done.tpl b/templates/upgrade_final_done.tpl
index ed107f1..ff66d60 100644
--- a/templates/upgrade_final_done.tpl
+++ b/templates/upgrade_final_done.tpl
@@ -1,5 +1,5 @@
 <h1>Upgrade Process Completed</h1>
-{form class="form-horizontal" legend="Select what you want to do next"}
+{form legend="Select what you want to do next"}
 	<p>
 		Go back to the installer to <strong>install additional
 			packages</strong> that have become available by upgrading. It will
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 3092af9..02773cb 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -38,7 +38,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index d9c616b..5b964c1 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -23,7 +23,7 @@
 
 	<div class="control-group">
 		{forminput}
-			<label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
 		{/forminput}
 		{formhelp note="Display SQL statements."}
 	</div>