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

7 files changed, 25 insertions, 32 deletions

diff --git a/templates/admin_list_newsletters.tpl b/templates/admin_list_newsletters.tpl
index 3ac1d5f..0f70c31 100644
--- a/templates/admin_list_newsletters.tpl
+++ b/templates/admin_list_newsletters.tpl
@@ -13,7 +13,7 @@
 
 			{minifind}
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Newsletters{/tr}</caption>
 				<tr>
 					<th>{smartlink ititle="Name" isort=name offset=$offset}</th>
diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl
index 48681b4..31f5d38 100644
--- a/templates/admin_newsletter_subscriptions.tpl
+++ b/templates/admin_newsletter_subscriptions.tpl
@@ -37,7 +37,7 @@
 		{form id="list"}
 			<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Subscriptions{/tr}</caption>
 				<tr>
 					<th>{smartlink ititle="Email" isort=email offset=$offset idefault=1}</th>
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index 9d1d036..b96ae20 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -52,11 +52,10 @@
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 
 						<div class="control-group">
-							{formlabel label="Draft" for="draft"}
-							{forminput}
-								<input type="checkbox" name="is_draft" id="draft" value="y" {if $pageInfo.is_draft eq 'y'}checked="checked"{/if} />
+							<label class="checkbox">
+								<input type="checkbox" name="is_draft" id="draft" value="y" {if $pageInfo.is_draft eq 'y'}checked="checked"{/if} />Draft
 								{formhelp note=""}
-							{/forminput}
+							</label>
 						</div>
 
 						<div class="control-group">
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">
diff --git a/templates/list_newsletters.tpl b/templates/list_newsletters.tpl
index fb26060..08d9a02 100644
--- a/templates/list_newsletters.tpl
+++ b/templates/list_newsletters.tpl
@@ -13,7 +13,7 @@
 
 			{minifind}
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Newsletters{/tr}</caption>
 				<tr>
 					<th>{smartlink ititle="Name" isort=name offset=$offset}</th>
diff --git a/templates/mail_queue.tpl b/templates/mail_queue.tpl
index c2a63f2..0fcf621 100644
--- a/templates/mail_queue.tpl
+++ b/templates/mail_queue.tpl
@@ -8,7 +8,7 @@
 	
 	{form}
 		{if $queue}
-			<table class="data">
+			<table class="table data">
 			<tr>
 				<th class="item">{smartlink ititle="Email" isort="email" offset=$offset}</th>
 				<th class="item">{smartlink ititle="Content Title" isort="title" offset=$offset}</th>
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index e2da946..c9a1c7c 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -66,11 +66,10 @@
 						</div>
 
 						<div class="control-group">
-							{formlabel label="Send Test"}
-							{forminput}
-								<input type="checkbox" name="test_mode" />
+							<label class="checkbox">
+								<input type="checkbox" name="test_mode" />Send Test
 								{formhelp note="This will enable you to send the newsletter to the same recipients again."}
-							{/forminput}
+							</label>
 						</div>
 {*
 						<div class="control-group">