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

13 files changed, 19 insertions, 21 deletions

diff --git a/templates/action_logs.tpl b/templates/action_logs.tpl
index 4233b8a..e248b95 100644
--- a/templates/action_logs.tpl
+++ b/templates/action_logs.tpl
@@ -47,7 +47,7 @@
 
 		{minifind}
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Action Logs{/tr} <span class="total">[ {$listInfo.total_records|default:0} ]</span></caption>
 			<tr>
 				<th></th>
diff --git a/templates/add_structure_content.tpl b/templates/add_structure_content.tpl
index 84ba75a..504bef9 100644
--- a/templates/add_structure_content.tpl
+++ b/templates/add_structure_content.tpl
@@ -77,7 +77,7 @@ function submitStructure(pForm,pContentId,pMode) {
 			{/forminput *}
 
 			{forminput}
-				<table class="data">
+				<table class="table data">
 					<thead>
 						<tr>
 							<th></th>
diff --git a/templates/attachments.tpl b/templates/attachments.tpl
index 6e81ff3..361d9e3 100644
--- a/templates/attachments.tpl
+++ b/templates/attachments.tpl
@@ -41,7 +41,7 @@
 			</ul>
 		{/if}
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Liberty Attachments{/tr}</caption>
 			<tr>
 				<th class="width1p"></th>
diff --git a/templates/center_list_generic.tpl b/templates/center_list_generic.tpl
index 8a37cf8..bad4f98 100644
--- a/templates/center_list_generic.tpl
+++ b/templates/center_list_generic.tpl
@@ -34,7 +34,7 @@
 
 			<div class="clear"></div>
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}{if $contentType}{$contentType}s{else}Content{/if} Listing{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
 				<tr>
 				{counter name=cols start=-1 print=false}
diff --git a/templates/content_permissions.tpl b/templates/content_permissions.tpl
index 36be0e1..d3cd821 100644
--- a/templates/content_permissions.tpl
+++ b/templates/content_permissions.tpl
@@ -18,7 +18,7 @@
 			{assign var=size value="large/"}
 		{/if}
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Permissions set for this content item{/tr}</caption>
 			<tr>
 				<th>{tr}Permission{/tr}</th>
diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl
index 6ee4b3a..6880bae 100644
--- a/templates/content_permissions_inc.tpl
+++ b/templates/content_permissions_inc.tpl
@@ -9,7 +9,7 @@
 
 	{foreach from=$contentPerms.groups item=group}
 		<h3>{tr}Permissions for{/tr}: {$group.group_name}</h3>
-		<table class="data">
+		<table class="table data">
 			<tr>
 				<th>{tr}Permission{/tr}</th>
 				<th>{tr}Status{/tr}</th>
@@ -71,7 +71,7 @@
 	{if $contentPerms.assigned}
 		<br />
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Permissions assigned to this content{/tr}</caption>
 			<tr>
 				<th>{smartlink content_id=$gContent->mContentId ititle=Group isort=group_name idefault=1}</th>
diff --git a/templates/content_role_permissions.tpl b/templates/content_role_permissions.tpl
index 738ed5e..5b97fce 100644
--- a/templates/content_role_permissions.tpl
+++ b/templates/content_role_permissions.tpl
@@ -18,7 +18,7 @@
 			{assign var=size value="large/"}
 		{/if}
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Permissions set for this content item{/tr}</caption>
 			<tr>
 				<th>{tr}Permission{/tr}</th>
diff --git a/templates/content_role_permissions_inc.tpl b/templates/content_role_permissions_inc.tpl
index b80894e..3344375 100644
--- a/templates/content_role_permissions_inc.tpl
+++ b/templates/content_role_permissions_inc.tpl
@@ -9,7 +9,7 @@
 
 	{foreach from=$contentPerms.roles item=role}
 		<h3>{tr}Permissions for{/tr}: {$role.role_name}</h3>
-		<table class="data">
+		<table class="table data">
 			<tr>
 				<th>{tr}Permission{/tr}</th>
 				<th>{tr}Status{/tr}</th>
@@ -71,7 +71,7 @@
 	{if $contentPerms.assigned}
 		<br />
 
-		<table class="data">
+		<table class="table data">
 			<caption>{tr}Permissions assigned to this content{/tr}</caption>
 			<tr>
 				<th>{smartlink content_id=$gContent->mContentId ititle=Group isort=role_name idefault=1}</th>
diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index 9132e27..0880483 100644
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -5,7 +5,7 @@
 {/if}
 {if $gContent->mStorage}
 	<div class="control-group">
-		<table class="data" summary="List of attached files">
+		<table class="table data" summary="List of attached files">
 			<tr>
 				<th scope="col" class="width29p" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
 				<th scope="col" class="width40p" title="{tr}Inclusion Code{/tr}">{tr}Inclusion Code{/tr}</th>
diff --git a/templates/list_comment_files_inc.tpl b/templates/list_comment_files_inc.tpl
index 2676e66..e26cfde 100644
--- a/templates/list_comment_files_inc.tpl
+++ b/templates/list_comment_files_inc.tpl
@@ -13,7 +13,7 @@
  		{formfeedback warning=$errors}
  	{/if}
 
-	<table class="data">
+	<table class="table data">
 		<tr>
 			<th style="width:40%;">{tr}File{/tr}</th>
 			<th style="width:10%;">{tr}Type{/tr}</th>
diff --git a/templates/mime/audio/edit.tpl b/templates/mime/audio/edit.tpl
index 7ed7d23..0d18da5 100644
--- a/templates/mime/audio/edit.tpl
+++ b/templates/mime/audio/edit.tpl
@@ -36,11 +36,10 @@
 
 {if $attachment.source_file}
 	<div class="control-group">
-		{formlabel label="Remove Original" for="remove_original"}
-		{forminput}
-			<input type="checkbox" id="remove_original" name="plugin[{$attachment.attachment_id}][mimeaudio][remove_original]" value="y" />
+		<label class="checkbox">
+			<input type="checkbox" id="remove_original" name="plugin[{$attachment.attachment_id}][mimeaudio][remove_original]" value="y" />Remove Original
 			{formhelp note="This will permanently remove the original file from the server. This will still allow you to listen to the audio file but not download it."}
-		{/forminput}
+		</label>
 	</div>
 {/if}
 
diff --git a/templates/mime/image/edit.tpl b/templates/mime/image/edit.tpl
index da6e791..366cd10 100644
--- a/templates/mime/image/edit.tpl
+++ b/templates/mime/image/edit.tpl
@@ -1,11 +1,10 @@
 {strip}
 {if $gBitSystem->isFeatureActive( 'mime_image_panoramas' )}
 	<div class="control-group">
-		{formlabel label="Panorama Image" for="panorama"}
-		{forminput}
-			<input type="checkbox" value="y" name="plugin[{$attachment.attachment_id}][mimeimage][preference][is_panorama]" id="panorama" {if $attachment.thumbnail_url.panorama}checked="checked"{/if} />
+		<label class="checkbox">
+			<input type="checkbox" value="y" name="plugin[{$attachment.attachment_id}][mimeimage][preference][is_panorama]" id="panorama" {if $attachment.thumbnail_url.panorama}checked="checked"{/if} />Panorama Image
 			{formhelp note="If this image is a 360&deg; panoramic image with equirectangular projection, check this box. This works best for images with a 360&deg; by 180&deg; field of view (FOV)"}
-		{/forminput}
+		</label>
 	</div>
 {/if}
 {/strip}
diff --git a/templates/storage_thumbs.tpl b/templates/storage_thumbs.tpl
index 9e7ac57..bdf58bd 100644
--- a/templates/storage_thumbs.tpl
+++ b/templates/storage_thumbs.tpl
@@ -7,7 +7,7 @@
 {/if}
 
 <div class="storage">
-	<table class="data">
+	<table class="table data">
 		<caption>
 			{tr}Files attached to this page{/tr}
 		</caption>