add-forminput-label-param-for-bs3

10 files changed, 64 insertions, 70 deletions

diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl
index 8a897fa..729c79e 100644
--- a/templates/admin_group_edit.tpl
+++ b/templates/admin_group_edit.tpl
@@ -51,20 +51,20 @@
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" id="default_home" name="default_home_group" {if $groupInfo.group_id eq $defaultGroupId}checked="checked"{/if} value="y" />Default home page
-						</label>
-						{formhelp note="This is the home page if a user belongs to many groups. Only one group may be the default home. If none is selected, users/my.php is the default."}
+							{formhelp note="This is the home page if a user belongs to many groups. Only one group may be the default home. If none is selected, users/my.php is the default."}
+						{/forminput}
 
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="is_default" value="y" {if $groupInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members
-						</label>
-						{formhelp note="Users are automatically added to this group when registering at your site."}
+							{formhelp note="Users are automatically added to this group when registering at your site."}
+						{/forminput}
 
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="is_public" value="y" {if $groupInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public
-						</label>
-						{formhelp note="A user will be able to select this group at registration."}
+							{formhelp note="A user will be able to select this group at registration."}
+						{/forminput}
 					</div>
 
 					<div class="form-group submit">
diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl
index 7279232..18eca53 100644
--- a/templates/admin_list_users.tpl
+++ b/templates/admin_list_users.tpl
@@ -86,28 +86,24 @@
 
 					<div class="form-group">
 						{forminput}
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="admin_verify_user" id="admin_verify_user" /> {tr}Validate user by email{/tr}
 								{formhelp note="This will email the user a validation url with a temporary one time password. On validation the user is forced to choose a new password."}
-							</label>
+							{/forminput}
 						{/forminput}
 					</div>
 
 					<div class="form-group">
-						{forminput}
-							<label class="checkbox">
-								<input type="checkbox" name="admin_verify_email" id="admin_verify_email" /> {tr}Validate email address{/tr}
-								{formhelp note="This feature should be used only when you need the maximum security and should be used with discretion. If a visitor's email server is not responding, they will not be able to register. You also must have a valid sender email to use this feature."}
-							</label>
+						{forminput label="checkbox"}
+							<input type="checkbox" name="admin_verify_email" id="admin_verify_email" /> {tr}Validate email address{/tr}
+							{formhelp note="This feature should be used only when you need the maximum security and should be used with discretion. If a visitor's email server is not responding, they will not be able to register. You also must have a valid sender email to use this feature."}
 						{/forminput}
 					</div>
 
 					<div class="form-group">
-						{forminput}
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="admin_noemail_user" id="admin_noemail_user" /> {tr}Don't email added user" for="admin_noemail_user{/tr}
 							{formhelp note="If you for some reason don't want to email the added user the login and password, or validation url."}
-						</label>
 						{/forminput}
 					</div>
 
diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 5c3ea0e..4a14765 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -17,7 +17,7 @@
 									<option value="{$meth_name}" {if $auth_method.value eq $meth_name} selected="selected"{/if}>{$method.name}</option>
 								{/foreach}
 							</select>
-						</label>
+						{/forminput}
 						<br />
 					{/foreach}
 					{*
@@ -52,10 +52,10 @@
 							{/if}
 							{formhelp note=$output.note page=$output.page link=$output.link}
 						{else}
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
 								{formhelp note=$output.note page=$output.page link=$output.link}
-							</label>
+							{/forminput}
 						{/if}
 					{/forminput}
 				</div>
@@ -138,18 +138,18 @@
 
 			{foreach from=$registerSettings key=feature item=output}
 				<div class="form-group">
-					{forminput}
-						{if $output.type == 'text'}
+					{if $output.type == 'text'}
+						{forminput}
 							{formlabel label=$output.label for=$feature}
 							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 							{formhelp note=$output.note page=$output.page link=$output.link}
-						{else}
-							<label class="checkbox">
-								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
-								{formhelp note=$output.note page=$output.page link=$output.link}
-							</label>
-						{/if}
-					{/forminput}
+						{/forminput}
+					{else}
+						{forminput label="checkbox"}
+							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
+							{formhelp note=$output.note page=$output.page link=$output.link}
+						{/forminput}
+					{/if}
 				</div>
 			{/foreach}
 
@@ -167,18 +167,18 @@
 
 			{foreach from=$httpSettings key=feature item=output}
 				<div class="form-group">
-					{forminput}
-						{if $output.type == 'text'}
+					{if $output.type == 'text'}
+						{forminput}
 							{formlabel label=$output.label for=$feature}
-							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
+							<input type="text" class="form-control" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 							{formhelp note=$output.note page=$output.page link=$output.link}
-						{else}
-							<label class="checkbox">
-								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
-								{formhelp note=$output.note page=$output.page link=$output.link}
-							</label>
-						{/if}
-					{/forminput}
+						{/forminput}
+					{else}
+						{forminput label="checkbox"}
+							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
+							{formhelp note=$output.note page=$output.page link=$output.link}
+						{/forminput}
+					{/if}
 				</div>
 			{/foreach}
 
diff --git a/templates/admin_role_edit.tpl b/templates/admin_role_edit.tpl
index 2218e32..2a9d66a 100644
--- a/templates/admin_role_edit.tpl
+++ b/templates/admin_role_edit.tpl
@@ -63,24 +63,24 @@
 					</div>
 
 					<div class="form-group">
-					<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" id="default_home" name="default_home_role" {if $roleInfo.role_id eq $defaultRoleId}checked="checked"{/if} value="y" />Default home page
 							{formhelp note="This is the home page if a user belongs to many roles. Only one role may be the default home. If none is selected, users/my.php is the default."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="is_default" value="y" {if $roleInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members
 							{formhelp note="Users are automatically added to this role when registering at your site."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="is_public" value="y" {if $roleInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public
 							{formhelp note="A user will be able to select this role at registration."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group submit">
diff --git a/templates/edit_personal_page.tpl b/templates/edit_personal_page.tpl
index bd6db6e..e7883d8 100644
--- a/templates/edit_personal_page.tpl
+++ b/templates/edit_personal_page.tpl
@@ -119,10 +119,10 @@
 
 						{if $gBitUser->hasPermission( 'p_wiki_save_minor' )}
 							<div class="form-group">
-								<label class="checkbox">
+								{forminput label="checkbox"}
 									<input type="checkbox" name="isminor" id="isminor" value="on" />Minor save
 									{formhelp note="This will prevent the generation of a new version. You can use this, if your changes are minor."}
-								</label>
+								{/forminput}
 							</div>
 						{/if}
 
@@ -203,10 +203,10 @@
 							</div>
 
 							<div class="form-group">
-								<label class="checkbox">
+								{forminput label="checkbox"}
 									<input type="checkbox" name="parsehtml" id="parsehtml" {if $parsehtml eq 'y'}checked="checked"{/if} />Try to convert HTML to wiki
 									{formhelp note=""}
-								</label>
+								{/forminput}
 							</div>
 
 							<div class="form-group submit">
diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl
index a48e47d..cffe273 100644
--- a/templates/login_inc.tpl
+++ b/templates/login_inc.tpl
@@ -25,11 +25,9 @@
 
 	{if $gBitSystem->isFeatureActive('users_remember_me')}
 		<div class="form-group">
-			{forminput class="offset"}
-			<label class="checkbox">
+			{forminput label="checkbox"}
 				<input type="checkbox" name="rme" id="rme" value="on" checked="checked" />
 				{tr}Remember Me{/tr}
-			</label>
 			{/forminput}
 		</div>
 	{/if}
diff --git a/templates/register.tpl b/templates/register.tpl
index 9e7825e..9f0c512 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -174,9 +174,9 @@
 				{formlabel label=$output.label for=$op_id}
 				{forminput}
 					{if $output.type == 'checkbox'}
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							{html_checkboxes name="$op_name" values="y" selected=$output.value labels=false id=$op_id}
-						</label>
+						{/forminput}
 					{elseif $output.type == 'option'}
 						<select name="{$op_name}" id="{$op_id}">
 							{foreach from=$output.options item='op_text' key='op_value'}
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index 24af4da..f7d6c24 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -147,10 +147,10 @@
 						</div>
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="users_double_click" id="users_double_click" {if $editUser->mPrefs.users_double_click eq 'y'}checked="checked"{/if} />Use double-click to edit pages
 								{formhelp note="Enabling this feature will allow you to double click on any wiki page and it will automatically take you to the edit page. Note that this does not work in all browsers."}
-							</label>
+							{/forminput}
 						</div>
 
 						<div class="form-group submit">
@@ -242,10 +242,10 @@
 						</div>
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="tasks_use_dates" id="tasks_use_dates" {if $tasks_use_dates eq 'y'}checked="checked"{/if} />Use dates
 								{formhelp note=""}
-							</label>
+							{/forminput}
 						</div>
 
 						<div class="form-group submit">
diff --git a/templates/users_import.tpl b/templates/users_import.tpl
index 79fab16..d1c3ca6 100644
--- a/templates/users_import.tpl
+++ b/templates/users_import.tpl
@@ -46,31 +46,31 @@
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="overwrite" id="overwrite" />Overwrite existing users
 							{formhelp note=""}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="admin_verify_user" id="admin_verify_user" />Validate users by email
 							{formhelp note="This will email the user a validation url with a temporary one time password. On validation the user is forced to choose a new password."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="admin_verify_email" id="admin_verify_email" />Validate email address
 							{formhelp note="This feature should be used only when you need the maximum security and should be used with discretion. If a visitor's email server is not responding, they will not be able to register. You also must have a valid sender email to use this feature."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" name="admin_noemail_user" id="admin_noemail_user" />Don't email imported users
 							{formhelp note="If you for some reason don't want to email imported users the login and password, or validation url."}
-						</label>
+						{/forminput}
 					</div>
 
 					<div class="form-group submit">
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index c991e65..3f0392a 100644
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -62,10 +62,10 @@
 		{foreach from=$users item=userHash key=userId}
 			<li class="item {cycle values='even,odd'} pull-left" style="width:31%;padding:0 0 0 1%;background:url('{$userHash.thumbnail_url|default:"`$smarty.const.USERS_PKG_URL`icons/silhouette_100.png"|escape}') no-repeat scroll top right transparent;">
 					{if $gBitUser->hasPermission( 'p_users_admin' )}
-					<label class="checkbox">
+					{forminput label="checkbox"}
 						<input type="checkbox" name="batch_user_ids[]" value="{$userHash.user_id}" /> 
 <small>{$listInfo.offset+$userHash@iteration}.</small> <strong>{$userHash.real_name|default:$userHash.login|escape}</strong> 
-					</label>
+					{/forminput}
 						<div><a href="/{$userHash.login}">{$userHash.login}</a></div>
 					{else}
 					<h4>{displayname hash=$userHash}</h4>