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

5 files changed, 21 insertions, 27 deletions

diff --git a/templates/browse_galleries.tpl b/templates/browse_galleries.tpl
index 7df8186..b70b3c3 100644
--- a/templates/browse_galleries.tpl
+++ b/templates/browse_galleries.tpl
@@ -7,7 +7,7 @@
 
 	<div class="body">
 
-		<table class="data">
+		<table class="table data">
 			<tr>
 				<th><a href="{$smarty.const.FISHEYE_PKG_URL}browse.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}Gallery Name{/tr}</a></th>
 			</tr>
diff --git a/templates/edit_gallery.tpl b/templates/edit_gallery.tpl
index 607dfda..b14eac7 100644
--- a/templates/edit_gallery.tpl
+++ b/templates/edit_gallery.tpl
@@ -51,20 +51,18 @@ function updateGalleryPagination() {
 
 						{if $gBitUser->hasPermission('p_fisheye_create_public_gal')}
 							<div class="control-group">
-								{formlabel label="Public Gallery" for="is_public"}
-								{forminput}
-									<input type="checkbox" name="is_public" id="is_public" value="y" {if $gContent->getPreference('is_public') eq 'y'}checked="checked"{/if} />
+								<label class="checkbox">
+									<input type="checkbox" name="is_public" id="is_public" value="y" {if $gContent->getPreference('is_public') eq 'y'}checked="checked"{/if} />Public Gallery
 									{formhelp note="Allow other users to upload to this gallery."}
-								{/forminput}
+								</label>
 							</div>
 						{/if}
 
 						<div class="control-group">
-							{formlabel label="Show Original Images" for="link_original_images"}
-							{forminput}
-								<input type="checkbox" name="link_original_images" id="link_original_images" value="y" {if $gContent->getPreference('link_original_images') eq 'y'}checked="checked"{/if} />
+							<label class="checkbox">
+								<input type="checkbox" name="link_original_images" id="link_original_images" value="y" {if $gContent->getPreference('link_original_images') eq 'y'}checked="checked"{/if} />Show Original Images
 								{formhelp note="Display a link to the original image for anyone viewing the images in the gallery."}
-							{/forminput}
+							</label>
 						</div>
 
 						<div class="control-group">
@@ -118,11 +116,10 @@ function updateGalleryPagination() {
 						{/if}
 
 						<div class="control-group">
-							{formlabel label="Image Comments" for=allow_comments}
-							{forminput}
-								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() || $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />
+							<label class="checkbox">
+								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() || $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />Image Comments
 								{formhelp note="Allow posting comments for an image."}
-							{/forminput}
+							</label>
 						</div>
 
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 6e1f8a5..ed5240d 100644
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -14,7 +14,7 @@
 
 			{formfeedback hash=$formfeedback}
 
-			<table class="data">
+			<table class="table data">
 				<tr>
 					<th scope="col" style="width:200px;">{tr}Thumbnail{/tr}</th>
 					<th scope="col">{tr}Title and Position{/tr}</th>
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index d37fb10..4cacdbb 100644
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -89,11 +89,10 @@
 			<div class="width50p floatleft">
 				{if $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' )}
 					<div class="control-group">
-						{formlabel label="Process Archive(s)" for="process_archive"}
-						{forminput}
-							<input type="checkbox" id="process_archive" name="process_archive" value="true" checked="checked" />
+						<label class="checkbox">
+							<input type="checkbox" id="process_archive" name="process_archive" value="true" checked="checked" />Process Archive(s)
 							{formhelp note="If you don't want to have archived files processed and extracted, please uncheck the above box."}
-						{/forminput}
+						</label>
 					</div>
 				{else}
 					<input type="hidden" name="process_archive" value="true" />
@@ -101,20 +100,18 @@
 
 				{if function_exists('exif_read_data')}
 					<div class="control-group">
-						{formlabel label="Auto-Rotate Images" for="rotate_image"}
-						{forminput}
-							<input type="checkbox" id="rotate_image" name="rotate_image" value="auto" checked="checked" />
+						<label class="checkbox">
+							<input type="checkbox" id="rotate_image" name="rotate_image" value="auto" checked="checked" />Auto-Rotate Images
 							{formhelp note="If your camera was turned sideways when the image was taken, this will attempt to orient the image correctly."}
-						{/forminput}
+						</label>
 					</div>
 				{/if}
 
 				<div class="control-group">
-					{formlabel label="Use Filenames" for="use_filenames"}
-					{forminput}
-						<input type="checkbox" id="use_filenames" name="use_filenames" value="true"/>
+					<label class="checkbox">
+						<input type="checkbox" id="use_filenames" name="use_filenames" value="true"/>Use Filenames
 						{formhelp note="If you would like to name your images based upon their filenames rather than their EXIF data."}
-					{/forminput}
+					</label>
 				</div>
 
 				<div class="control-group">
diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index ff6be66..f36efa8 100644
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -26,7 +26,7 @@
 	<div class="clear"></div>
 {elseif $gContent->getLayout() == 'simple_list'}
 	{assign var=thumbsize value='small'}
-	<table class="data">
+	<table class="table data">
 		<caption>{tr}List of files{/tr} <span class="total">[ {$galInfo.total_records|default:0} ]</span></caption>
 		<tr>
 			{if $thumbsize}