fix <label class=checkbox> wrapping to be bootstrap compliant; add .table to all table.data tags

1 files changed, 15 insertions, 20 deletions

diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index 851a323..6e5b609 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -31,43 +31,38 @@
 				</div>
 
 				<div class="control-group">
-					{formlabel label="Users can Subscribe" for="allow_user_sub"}
-					{forminput}
-						<input type="checkbox" name="allow_user_sub" id="allow_user_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} />
+					<label class="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."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group">
-					{formlabel label="Any e-mail Address" for="allow_any_sub"}
-					{forminput}
-						<input type="checkbox" name="allow_any_sub" id="allow_any_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} />
+					<label class="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."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group">
-					{formlabel label="Append Un/Subscribe Instructions" for="unsub_msg"}
-					{forminput}
-						<input type="checkbox" name="unsub_msg" id="unsub_msg" {if !$gContent->isValid() || $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} />
+					<label class="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."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group">
-					{formlabel label="Validate e-mail Addresses" for="validate_addr"}
-					{forminput}
-						<input type="checkbox" name="validate_addr" id="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} />
+					<label class="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."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group">
-					{formlabel label="Registration Opt-In" for="registration_optin"}
-					{forminput}
-						<input type="checkbox" name="registration_optin" id="registration_optin" {if $gContent->getPreference('registration_optin') eq 'y'}checked="checked"{/if} value="y"/>
+					<label class="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."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group submit">