add-forminput-label-param-for-bs3

3 files changed, 18 insertions, 18 deletions

diff --git a/templates/edit_gallery.tpl b/templates/edit_gallery.tpl
index 889f20d..0c6f9d7 100644
--- a/templates/edit_gallery.tpl
+++ b/templates/edit_gallery.tpl
@@ -51,18 +51,18 @@ function updateGalleryPagination() {
 
 						{if $gBitUser->hasPermission('p_fisheye_create_public_gal')}
 							<div class="form-group">
-								<label class="checkbox">
+								{forminput label="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."}
-								</label>
+								{/forminput}
 							</div>
 						{/if}
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="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."}
-							</label>
+							{/forminput}
 						</div>
 
 						<div class="form-group">
@@ -116,10 +116,10 @@ function updateGalleryPagination() {
 						{/if}
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="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."}
-							</label>
+							{/forminput}
 						</div>
 
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index 58fee26..383ed0d 100644
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -60,9 +60,9 @@
 
 						<div class="form-group">
 							{forminput}
-								<label class="checkbox">
+								{forminput label="checkbox"}
 									<input type="checkbox" name="generate_thumbnails" value="1"/> {tr}Regenerate Thumbnails{/tr}
-								</label>
+								{/forminput}
 							{/forminput}
 						</div>
 
@@ -70,11 +70,11 @@
 							{formlabel label="Rotate Image"}
 							{forminput}
 {if function_exists('exif_read_data')}
-								<label class="radio"><input type="radio" name="rotate_image" value="auto"/> {biticon ipackage="fisheye" iname="rotate_auto" iexplain="Auto Rotate"}</label> &nbsp;&nbsp;&nbsp;&nbsp;
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="icon-chevron-sign-up" iexplain="Auto Rotate"}</label>
 {/if}
-								<label class="radio"><input type="radio" name="rotate_image" value="-90"/> {biticon ipackage="fisheye" iname="rotate_ccw" iexplain="Rotate Counter Clockwise"}</label> &nbsp;&nbsp;&nbsp;&nbsp;
-								<label class="radio">{biticon ipackage="fisheye" iname="rotate_cw" iexplain="Rotate Clockwise"} <input type="radio" name="rotate_image" value="90"/></label>
-								<label class="radio"> <input type="radio" name="rotate_image" value="" checked="checked"/> {tr}don't rotate{/tr}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="" checked="checked"/> {tr}don't rotate{/tr}</label>
 							{/forminput}
 						</div>
 
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index 5478ea4..8471b8e 100644
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -89,10 +89,10 @@
 			<div class="width50p floatleft">
 				{if $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' )}
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="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."}
-						</label>
+						{/forminput}
 					</div>
 				{else}
 					<input type="hidden" name="process_archive" value="true" />
@@ -100,18 +100,18 @@
 
 				{if function_exists('exif_read_data')}
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="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."}
-						</label>
+						{/forminput}
 					</div>
 				{/if}
 
 				<div class="form-group">
-					<label class="checkbox">
+					{forminput label="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."}
-					</label>
+					{/forminput}
 				</div>
 
 				<div class="form-group">