add-forminput-label-param-for-bs3

4 files changed, 15 insertions, 15 deletions

diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index c9a4c44..de49918 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -52,10 +52,10 @@
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="is_draft" id="draft" value="y" {if $pageInfo.is_draft eq 'y'}checked="checked"{/if} />Draft
 								{formhelp note=""}
-							</label>
+							{/forminput}
 						</div>
 
 						<div class="form-group">
diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index a55e2c6..a655767 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -31,38 +31,38 @@
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="allow_user_sub" id="allow_user_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} />Users can Subscribe
 						{formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="allow_any_sub" id="allow_any_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} />Any e-mail Address
 						{formhelp note="Users may subscribe using any email address."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="unsub_msg" id="unsub_msg" {if !$gContent->isValid() || $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} />Append Un/Subscribe Instructions
 						{formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="validate_addr" id="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} />Validate e-mail Addresses
 						{formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="registration_optin" id="registration_optin" {if $gContent->getPreference('registration_optin') eq 'y'}checked="checked"{/if} value="y"/>Registration Opt-In
 						{formhelp note="List this newsletter on the registration page and allow user to join newsletter."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group submit">
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 8be1f17..bb1d0c3 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -66,10 +66,10 @@
 						</div>
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="test_mode" />Send Test
 								{formhelp note="This will enable you to send the newsletter to the same recipients again."}
-							</label>
+							{/forminput}
 						</div>
 {*
 						<div class="form-group">
diff --git a/templates/user_register_inc.tpl b/templates/user_register_inc.tpl
index 373b4f1..6e42ccf 100644
--- a/templates/user_register_inc.tpl
+++ b/templates/user_register_inc.tpl
@@ -19,7 +19,7 @@ for (var i = 0; i < checkboxes.length; i++){
 	{formlabel label="Subscriptions"}
 	{forminput}
 	{foreach from=$newsletters item='newsletter'}
-		<label class="checkbox"><input type="checkbox" checked="true" name="subscribe[]" onclick="document.getElementById('unsubscribeall').checked=false;" value="{$newsletter.nl_id}"/><strong>{$newsletter.title}</strong></label>
+		{forminput label="checkbox"}<input type="checkbox" checked="true" name="subscribe[]" onclick="document.getElementById('unsubscribeall').checked=false;" value="{$newsletter.nl_id}"/><strong>{$newsletter.title}</strong>{/forminput}
 	{/foreach}
 	{formhelp note="Uncheck the box to opt-out of the specified newsletter."}
 	{if count($newsletters) > 1}