much bootstrap overhaul

32 files changed, 173 insertions, 87 deletions

diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index f3cdc27..e77cb63 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -56,8 +56,10 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="admin_submit" value="Submit Admin Information" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="admin_submit" value="Submit Admin Information" />
+		{/forminput}
 	</div>
 {/form}
 {/strip}
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 82319cd..0d2d324 100644
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -66,8 +66,10 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
 
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index f19a551..e524f77 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -26,8 +26,10 @@
 		{/foreach}
 	{/legend}
 
-	<div class="control-group submit">
-		Please press this button only once<br />
+	<div class="control-group">
+		{forminput}
+			Please press this button only once<br />
+		{/forminput}
 		Depending on the number of packages and the hardware,<br />
 		this process might take up to a few minutes.<br /><br />
 		<input type="hidden" name="resetdb" value="{$resetdb}" />
diff --git a/templates/install_beta1_beta2_done.tpl b/templates/install_beta1_beta2_done.tpl
index cfba23a..5ab616c 100644
--- a/templates/install_beta1_beta2_done.tpl
+++ b/templates/install_beta1_beta2_done.tpl
@@ -30,7 +30,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index 0fc660d..1793696 100644
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -94,7 +94,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="bit_settings" value="{tr}Set Preferences{/tr}" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="bit_settings" value="{tr}Set Preferences{/tr}" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_bit_settings_done.tpl b/templates/install_bit_settings_done.tpl
index 22d5a6b..ba7de0e 100644
--- a/templates/install_bit_settings_done.tpl
+++ b/templates/install_bit_settings_done.tpl
@@ -55,7 +55,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index 8cb2bf3..06b015a 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -27,8 +27,10 @@
 
 			{if $error}
 				<p class="error">Before you can continue with the installation, you must rectify the <strong>problems listed in red</strong>. After you have made the changes, you can reload the page.</p>
-				<div class="control-group submit">
-					<input type="submit" class="btn" name="reload" value="Reload Page" />
+				<div class="control-group">
+		{forminput}
+						<input type="submit" class="btn" name="reload" value="Reload Page" />
+		{/forminput}
 				</div>
 			{else}
 				<p class="alert alert-success">Your system meets all the requirements. You are ready to install Bitweaver.</p>
@@ -224,8 +226,10 @@
 	{/jstabs}
 
 	{if !$error}
-		<div class="control-group submit">
-			<input type="submit" class="btn" name="reload" value="Reload page" />
+		<div class="control-group">
+		{forminput}
+				<input type="submit" class="btn" name="reload" value="Reload page" />
+		{/forminput}
 			&nbsp;
 			<input type="submit" class="btn" name="continue" value="Continue install process" />
 		</div>
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index b31f763..8709d36 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -55,8 +55,10 @@
 				</p>
 			{/if}
 
-			<div class="control-group submit">
-				<input type="submit" class="btn" name="create_tables" value="Try to create missing table/s" />
+			<div class="control-group">
+		{forminput}
+					<input type="submit" class="btn" name="create_tables" value="Try to create missing table/s" />
+		{/forminput}
 			</div>
 
 			<div class="control-group">
@@ -183,8 +185,10 @@
 		{/if}
 
 		{if $delPerms || $insPerms || $serviceList}
-			<div class="control-group submit">
-				<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Issues" />
+			<div class="control-group">
+		{forminput}
+					<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Issues" />
+		{/forminput}
 			</div>
 
 			<div class="control-group">
@@ -194,8 +198,10 @@
 				{/forminput}
 			</div>
 		{else}
-			<div class="control-group submit">
-				<input type="submit" class="btn" name="skip" value="Continue install process" />
+			<div class="control-group">
+		{forminput}
+					<input type="submit" class="btn" name="skip" value="Continue install process" />
+		{/forminput}
 			</div>
 		{/if}
 	{/legend}
diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl
index 6b70a9c..fd3307d 100644
--- a/templates/install_cleanup_done.tpl
+++ b/templates/install_cleanup_done.tpl
@@ -38,7 +38,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
-{/form}
\ No newline at end of file
+{/form}
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index 2f9c645..fb01a92 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -164,8 +164,10 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		<input type="hidden" name="dbcase" value="{$gBitDbCaseSensitivity}" />
+	<div class="control-group">
+		{forminput}
+			<input type="hidden" name="dbcase" value="{$gBitDbCaseSensitivity}" />
+		{/forminput}
 		<input type="hidden" name="resetdb" value="{$resetdb}" />
 		<input type="submit" class="btn" value="Confirm Settings" name="submit_db_info" />
 	</div>
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index 1225c87..17b972d 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -91,7 +91,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue {$section|default:"install"} process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue {$section|default:"install"} process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl
index 05d835f..9dbc5dd 100644
--- a/templates/install_database_reset.tpl
+++ b/templates/install_database_reset.tpl
@@ -7,8 +7,10 @@
 		<p>If you don't want to reset or change your installation settings, please press the continue button.</p>
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="continue_install" value="Continue {$section|default:"install"} process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="continue_install" value="Continue {$section|default:"install"} process" />
+		{/forminput}
 	</div>
 
 	<div class="control-group">
@@ -18,7 +20,9 @@
 		<p>If you want to reinstall Bitweaver into the same database as before, make sure you have deleted all Bitweaver related tables before doing so. Reinstalling into an existing database might cause unwanted effects.</p>
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="reset_config_inc" value="Reset config_inc.php file" onclick="return confirm( 'Are you absolutely sure you want to reset your configuration file?' );" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl
index 0b3301e..6a21100 100644
--- a/templates/install_datapump.tpl
+++ b/templates/install_datapump.tpl
@@ -27,8 +27,10 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		{if $pumpList}
+	<div class="control-group">
+		{forminput}
+			{if $pumpList}
+		{/forminput}
 			<input type="submit" class="btn" value="Populate my site" name="fSubmitDataPump" /> 
 		{/if}
 		<input type="submit" class="btn" value="Skip" name="skip" />
diff --git a/templates/install_datapump_done.tpl b/templates/install_datapump_done.tpl
index caf7064..769cb10 100644
--- a/templates/install_datapump_done.tpl
+++ b/templates/install_datapump_done.tpl
@@ -43,7 +43,9 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index dd49785..5c94838 100644
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -47,7 +47,9 @@
 	<p class="help" style="text-align:center;">Finally, we thank you again for using Bitweaver.</p>
 	<br />
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" size="20" value="Enter your Bitweaver site" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" size="20" value="Enter your Bitweaver site" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 544c0a1..c6558e2 100644
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -19,8 +19,10 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="login" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="login" 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'}
 			{biticon iname="emblem-readonly" ipackage="icons" iexplain="Secure Login"}
 		{/if}
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 5098033..62bd4c0 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -90,8 +90,10 @@
 						</code><br />
 					</p>
 				{/if}
-				<div class="control-group submit">
-					Please press this button only once.<br />
+				<div class="control-group">
+		{forminput}
+						Please press this button only once.<br />
+		{/forminput}
 					Depending on the number of packages and the hardware,<br />
 					this process might take up to a few minutes.<br /><br />
 					<input type="hidden" name="resetdb" value="{$resetdb}" />
@@ -159,8 +161,10 @@
 						{/if}
 					{/foreach}
 
-					<div class="control-group submit">
-						Please press this button only once.<br />
+					<div class="control-group">
+		{forminput}
+							Please press this button only once.<br />
+		{/forminput}
 						Depending on the number of packages and the hardware,<br />
 						this process might take up to a few minutes.<br /><br />
 						<input type="submit" class="btn" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
@@ -206,8 +210,10 @@
 	{if !$first_install}
 		{form}
 			<input type="hidden" name="step" value="{$next_step}" />
-			<div class="control-group submit">
-				&nbsp;&nbsp;<input type="submit" class="btn" name="cancel" value="Skip this stage" />
+			<div class="control-group">
+		{forminput}
+					&nbsp;&nbsp;<input type="submit" class="btn" name="cancel" value="Skip this stage" />
+		{/forminput}
 			</div>
 		{/form}
 	{/if}
diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl
index bdb7227..0171a85 100644
--- a/templates/install_packages_done.tpl
+++ b/templates/install_packages_done.tpl
@@ -97,7 +97,9 @@
 		{/if}
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 3dabd76..5e85029 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -152,8 +152,10 @@
 				{/if}
 			{/if}
 
-			<div class="control-group submit">
-				<input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
+			<div class="control-group">
+		{forminput}
+					<input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
+		{/forminput}
 			</div>
 
 			<div class="control-group">
diff --git a/templates/install_upgrade_done.tpl b/templates/install_upgrade_done.tpl
index 3b63cd1..589ccfb 100644
--- a/templates/install_upgrade_done.tpl
+++ b/templates/install_upgrade_done.tpl
@@ -17,7 +17,9 @@
 		{/foreach}
 	</dl>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="continue" value="Continue Install Process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="continue" value="Continue Install Process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index bb9a640..3f3b588 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -71,8 +71,10 @@
 				{/foreach}
 			</table>
 
-			<div class="control-group submit">
-				<input type="submit" class="btn" name="fix_version_210beta" value="Fix Permissions" />
+			<div class="control-group">
+		{forminput}
+					<input type="submit" class="btn" name="fix_version_210beta" value="Fix Permissions" />
+		{/forminput}
 			</div>
 
 			<div class="control-group">
@@ -83,12 +85,16 @@
 			</div>
 		{else}
 			{if $upToDate}
-				<div class="control-group submit">
-					<input type="submit" class="btn" name="skip" value="Continue install process" />
+				<div class="control-group">
+		{forminput}
+						<input type="submit" class="btn" name="skip" value="Continue install process" />
+		{/forminput}
 				</div>
 			{else}
-				<div class="control-group submit">
-					<input type="submit" class="btn" name="update_version" value="Update version and continue" />
+				<div class="control-group">
+		{forminput}
+						<input type="submit" class="btn" name="update_version" value="Update version and continue" />
+		{/forminput}
 				</div>
 			{/if}
 		{/if}
diff --git a/templates/install_version_done.tpl b/templates/install_version_done.tpl
index f15b110..033ee12 100644
--- a/templates/install_version_done.tpl
+++ b/templates/install_version_done.tpl
@@ -13,7 +13,9 @@
 		</p>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue install process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue install process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 7d70e2e..7aa2152 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -11,8 +11,10 @@
 
 		<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>
 
-		<div class="control-group submit">
-			<input type="submit" class="btn" name="install" value="Begin the install process" />
+		<div class="control-group">
+		{forminput}
+				<input type="submit" class="btn" name="install" value="Begin the install process" />
+		{/forminput}
 			<p><strong>This installer will guide you through the installation or upgrade.</strong></p>
 		</div>
 
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index a76026e..8131678 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -297,7 +297,9 @@
 		{/jstab}
 	{/jstabs}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Execute Migration" name="fSubmitDatabase" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Execute Migration" name="fSubmitDatabase" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/migrate_database_done.tpl b/templates/migrate_database_done.tpl
index 9738d60..a35c37e 100644
--- a/templates/migrate_database_done.tpl
+++ b/templates/migrate_database_done.tpl
@@ -18,7 +18,9 @@
 		</ul>
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/migrate_final_done.tpl b/templates/migrate_final_done.tpl
index 8283865..050bf57 100644
--- a/templates/migrate_final_done.tpl
+++ b/templates/migrate_final_done.tpl
@@ -1,15 +1,19 @@
 <h1>Upgrade Process Completed</h1>
 {form class="form-horizontal" 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 submit">
-		<input type="hidden" name="step" value="{$next_step}" />
+	<div class="control-group">
+		{forminput}
+			<input type="hidden" name="step" value="{$next_step}" />
+		{/forminput}
 		<input type="submit" class="btn" name="continue_install" value="Return to Installer" />
 	</div>
 
 	<hr />
 
 	<p>Enter your Bitweaver site now to see if the migrate process was successful.</p>
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="enter_bitweaver" value="Enter site" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="enter_bitweaver" value="Enter site" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl
index f807e8f..f259db6 100644
--- a/templates/migrate_welcome.tpl
+++ b/templates/migrate_welcome.tpl
@@ -13,7 +13,9 @@
 
 	<strong>{formfeedback warning=$dbWarning}</strong>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/upgrade_final_done.tpl b/templates/upgrade_final_done.tpl
index 024b18a..ed107f1 100644
--- a/templates/upgrade_final_done.tpl
+++ b/templates/upgrade_final_done.tpl
@@ -7,8 +7,10 @@
 		additional packages, your system will automatically be analysed for
 		potential problems.
 	</p>
-	<div class="control-group submit">
-		<input type="hidden" name="step" value="{$next_step}" />
+	<div class="control-group">
+		{forminput}
+			<input type="hidden" name="step" value="{$next_step}" />
+		{/forminput}
 		<input type="submit" class="btn" name="continue_install" value="Install more packages" />
 	</div>
 
@@ -21,8 +23,10 @@
 		try to <strong>resolve conflicts</strong>. This option is recommended. It will
 		inform you of the health of your install.
 	</p>
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Conflicts" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="resolve_conflicts" value="Resolve Conflicts" />
+		{/forminput}
 	</div>
 
 	<hr />
@@ -32,7 +36,9 @@
 		Bitweaver now. You can return to the installer at any time to
 		resolve potential issues and insert missing permissions and settings.
 	</p>
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="enter_bitweaver" value="Enter Bitweaver" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="enter_bitweaver" value="Enter Bitweaver" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 1abf9ba..5ba0023 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -36,8 +36,10 @@
 		</ul>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
+		{/forminput}
 	</div>
 
 	<div class="control-group">
diff --git a/templates/upgrade_packages_done.tpl b/templates/upgrade_packages_done.tpl
index 9a0e073..0e3a6a0 100644
--- a/templates/upgrade_packages_done.tpl
+++ b/templates/upgrade_packages_done.tpl
@@ -30,7 +30,9 @@
 		</div>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" value="Continue upgrade process" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" value="Continue upgrade process" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 4d9fa4a..d9c616b 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -28,7 +28,9 @@
 		{formhelp note="Display SQL statements."}
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
+		{/forminput}
 	</div>
 {/form}
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index b3ab734..3ee29cb 100644
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -56,7 +56,9 @@
 		</p>
 	{/if}
 
-	<div class="control-group submit">
-		<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" />
+	<div class="control-group">
+		{forminput}
+			<input type="submit" class="btn" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" />
+		{/forminput}
 	</div>
 {/form}