add-forminput-label-param-for-bs3

12 files changed, 59 insertions, 74 deletions

diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index 0b980b7..47f4eeb 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -50,10 +50,10 @@
 
 	<div class="form-group">
 		{forminput}
-			<label class="checkbox">
+			{forminput label="checkbox"}
 				<input type="checkbox" name="testemail" id="testemail" value="y" checked="checked" />
 				{tr}Test Email Transport{/tr}
-			</label>
+			{/forminput}
 			{formhelp note="Check this box to send a test email to the above address. This will let you know if the mailing system is working."}
 		{/forminput}
 	</div>
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index ad140a4..ec52461 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -14,8 +14,8 @@
 						<div class="formlabel">
 							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$item.name}</label>
 						</div>
-						{forminput}
-							<label class="checkbox"><input type="checkbox" name="PACKAGE[]" value="{$package}" id="{$package}" checked="checked" /> {$item.name}</label>
+						{forminput class="checkbox"}
+							<input type="checkbox" name="PACKAGE[]" value="{$package}" id="{$package}" checked="checked" /> {$item.name}
 							{formhelp note=$item.info}
 							{formhelp note="<strong>Location</strong>: `$item.url`"}
 							{formhelp package=$package}
@@ -27,8 +27,8 @@
 	{/legend}
 
 	<div class="form-group">
-		{forminput}
-			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+		{forminput label="checkbox"}
+			<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index 7eb6f86..af96f35 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -56,8 +56,8 @@
 			{/if}
 
 			<div class="form-group">
-				{forminput}
-					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+				{forminput label="checkbox"}
+					<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
@@ -162,8 +162,8 @@
 						<div class="formlabel">
 							<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 						</div>
-						{forminput}
-							<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> {$package|capitalize}</label>
+						{forminput label="checkbox"}
+							<input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> {$package|capitalize}
 							{formhelp note=$schema.$package.info}
 							{formhelp note="<strong>Location</strong>: `$schema.$package.url`"}
 							{formhelp package=$package}
@@ -186,8 +186,8 @@
 			</div>
 
 			<div class="form-group">
-				{forminput}
-					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+				{forminput label="checkbox"}
+					<input type="checkbox" name="debug" id="debug" value="true" /> {tr}Debug mode{/tr}
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index 3097abf..05c673c 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -136,20 +136,16 @@
 	</div>
 
 	<div class="form-group">
-		{forminput}
-		<label class="checkbox">
+		{forminput label="checkbox"}
 			<input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} />Auto submit bugs
 			{formhelp note="Checking this box will automatically submit fatal database errors to the Bitweaver team. If you are running a live site, consider checking this box, as it will also avoid fatal error messages from appearing to the user."}
-		</label>
 		{/forminput}
 	</div>
 
 	<div class="form-group">
-		{forminput}
-		<label class="checkbox">
+		{forminput label="checkbox"}
 			<input type="checkbox" name="is_live" id="is_live" />Site is live
 			{formhelp note="Checking this will make debugging quite difficult as it will hide errors. Only check if your site is being used in a live environment right after installation."}
-		</label>
 		{/forminput}
 	</div>
 
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index 85fd905..ceca098 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -78,11 +78,9 @@
 
 	{if isset( $has_innodb_support )}
 		<div class="form-group">
-			{forminput}
-				<label class="checkbox">
-					<input type="checkbox" name="use_innodb" id="use_innodb" {if $has_innodb_support eq 'DEFAULT'}checked="checked"{/if} />Use InnoDB tables
-					{formhelp note="Your database server supports InnoDB which provides MySQL with a transaction-safe storage engine that has commit, rollback, and crash recovery capabilities. You usually want this for safest possible data storage. Otherwise the standard MyIsam engine is used."}
-				</label>
+			{forminput label="checkbox"}
+				<input type="checkbox" name="use_innodb" id="use_innodb" {if $has_innodb_support eq 'DEFAULT'}checked="checked"{/if} />Use InnoDB tables
+				{formhelp note="Your database server supports InnoDB which provides MySQL with a transaction-safe storage engine that has commit, rollback, and crash recovery capabilities. You usually want this for safest possible data storage. Otherwise the standard MyIsam engine is used."}
 			{/forminput}
 		</div>
 	{/if}
diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl
index c35dcdf..94e529d 100644
--- a/templates/install_datapump.tpl
+++ b/templates/install_datapump.tpl
@@ -3,26 +3,17 @@
 {form legend="Populating the database with useful information"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
-	<p>
-		It's recommended to select this option to add sample data to your installation of Bitweaver. The sample data contains useful information on how to use and navigate the appropriate packages. You will enter the site with a feel for what it might look like later, when populated with actual content. This simplifies theme selection and allows you to evaluate the product more easily.
-	</p>
-	{*
-	<p>
-		This page is only available during the first installation as it can cause problems when applied more than once.
-	</p>
-	so? *}
+	<p>It's recommended to select this option to add sample data to your installation of Bitweaver. The sample data contains useful information on how to use and navigate the appropriate packages. You will enter the site with a feel for what it might look like later, when populated with actual content. This simplifies theme selection and allows you to evaluate the product more easily.</p>
 
 	<div class="form-group">
 		{formlabel label="Packages that can be populated"}
-		{forminput}
-			{foreach from=$pumpList item=file key=package}
-			<label class="checkbox">
-				<input type="checkbox" name="pump_package[]" value="{$package}" checked="checked"/>{$package}
-			</label>
-			{foreachelse}
-				No packages with prepared data have been installed.
-			{/foreach}
+		{foreach from=$pumpList item=file key=package}
+		{forminput label="checkbox"}
+			<input type="checkbox" name="pump_package[]" value="{$package}" checked="checked"/> {$package}
 		{/forminput}
+		{foreachelse}
+			No packages with prepared data have been installed.
+		{/foreach}
 	</div>
 
 	<div class="form-group">
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 570b6e7..f7bcdaf 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -54,7 +54,7 @@
 							<div class="form-group">
 								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 								{forminput}
-									<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
+									{forminput label="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}
@@ -86,8 +86,8 @@
 					</p>
 				{/if}
 				<div class="form-group">
-					{forminput}
-						<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+					{forminput label="checkbox"}
+						<input type="checkbox" name="debug" value="true" /> {tr}Debug mode{/tr}
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
@@ -123,13 +123,16 @@
 					</div>
 
 					<div class="form-group">
-						{formlabel label=""}
-						{forminput}
-							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" />&nbsp;Delete database tables</label>
+						{forminput label="checkbox"}
+							<input type="checkbox" name="remove_actions[]" value="tables" checked="checked" /> Delete database tables
 							{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 class="checkbox"><input type="checkbox" name="remove_actions[]" value="settings" checked="checked" />&nbsp;Delete package settings</label>
+						{/forminput}
+						{forminput label="checkbox"}
+							<input type="checkbox" name="remove_actions[]" value="settings" checked="checked" />&nbsp;Delete package settings
 							{formhelp note="If selected, all package specific settings are removed. Therefor the package is reset to it's default values, including permissions."}
-							<label class="checkbox"><input type="checkbox" name="remove_actions[]" value="content" checked="checked" />&nbsp;Delete stored content</label>
+						{/forminput}
+						{forminput label="checkbox"}
+							<input type="checkbox" name="remove_actions[]" value="content" checked="checked" />&nbsp;Delete stored content
 							{formhelp note="If selected, all content that has been stored in the common content storage area is removed."}
 						{/forminput}
 					</div>
@@ -140,11 +143,9 @@
 						{if $item.tables || $item.defaults}
 							{if $item.installed and !$item.required}
 								<div class="form-group">
-									<label class="control-label">
-										<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
-									</label>
-									{forminput}
-										<label class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong></label>
+									<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
+									{forminput label="checkbox"}
+										<input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong>
 										{formhelp note=$item.info is_installer=1}
 										{formhelp note="<strong>Location</strong>: `$item.url`"}
 										{formhelp package=$package}
@@ -166,8 +167,8 @@
 					</div>
 
 					<div class="form-group">
-						{forminput}
-							<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+						{forminput label="checkbox"}
+							<input type="checkbox" name="debug" value="true" /> Debug mode
 							{formhelp note="Display SQL statements."}
 						{/forminput}
 					</div>
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index cd5ae3a..bb3d75d 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -10,7 +10,7 @@
 				<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>
 				{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 class="checkbox"><input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}</label></h3> *}
+					<h3>{forminput label="checkbox"}<input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}{/forminput}</h3> *}
 
 					<h3>{$package}</h3>
 					<input type="hidden" name="packages[]" value="{$package}" />
@@ -153,8 +153,8 @@
 			{/if}
 
 			<div class="form-group">
-				{forminput}
-					<label class="checkbox"><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+				{forminput label="checkbox"}
+					<input type="checkbox" name="debug" value="true" /> Debug mode
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index b59d9a6..46f045d 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -72,8 +72,8 @@
 			</table>
 
 			<div class="form-group">
-				{forminput}
-					<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+				{forminput label="checkbox"}
+					<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index e42bac8..bc7ff01 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -234,10 +234,10 @@
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} />Automatically submit bugs
 						{formhelp note="Checking this box will automatically submit fatal database errors to the Bitweaver team. If you are running a live site, we recommend you check this box, as it will also avoid horrible error messages from appearing in such cases."}
-					</label>
+					{/forminput}
 				</div>
 			{/legend}
 		{/jstab}
@@ -263,31 +263,31 @@
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="empty_tables" id="empty_tables"{if $empty_tables} checked="checked"{/if} />DROP tables
 						{formhelp note="Checking this box DROP's tables before new data is migrated"}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="convert_blobs" id="convert_blobs"{if $convert_blobs} checked="checked"{/if} />Convert Blobs
 						{formhelp note="Checking this box converts blobs from a MySQL type blob to a PgSQL encoded blob."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					{forminput}
-						<label class="checkbox"><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
+					{forminput label="checkbox"}
+						<input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="stop_on_errors" id="stop_on_errors"{if $stop_on_errors} checked="checked"{/if} />Stop on Errors
 						{formhelp note="Checking this box will cause the script to stop on the first error."}
-					</label>
+					{/forminput}
 				</div>
 			{/legend}
 		{/jstab}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 74116c7..9517a09 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -37,8 +37,7 @@
 	{/if}
 
 	<div class="form-group">
-		{forminput}
-			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+		{forminput label="checkbox"}<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
 			{formhelp note="Display SQL statements."}
 		{/forminput}
 	</div>
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 9f69d67..f8a598c 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -22,10 +22,10 @@
 	</div>
 
 	<div class="form-group">
-		{forminput}
-			<label class="checkbox"><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+		{forminput label="checkbox"}
+			<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
+			{formhelp note="Display SQL statements."}
 		{/forminput}
-		{formhelp note="Display SQL statements."}
 	</div>
 
 	<div class="form-group">