add-forminput-label-param-for-bs3

2 files changed, 38 insertions, 36 deletions

diff --git a/templates/edit_languages.tpl b/templates/edit_languages.tpl
index f1ecad4..1b086c8 100644
--- a/templates/edit_languages.tpl
+++ b/templates/edit_languages.tpl
@@ -34,10 +34,10 @@
 								{/forminput}
 							</div>
 							<div class="form-group">
-								<label class="checkbox">
+								{forminput label="checkbox"}
 									<input type="checkbox" name="is_disabled" id="is_disabled" {if $isDisabled || $defaults.is_disabled}checked="checked"{/if} value="y" />Disabled
 									{formhelp note="Disabling a language will remove it from available language menus."}
-								</label>
+								{/forminput}
 							</div>
 							<div class="form-group submit">
 								<input type="submit" class="btn btn-default" name="save_language" value="{tr}Save Language{/tr}" />
@@ -66,18 +66,18 @@
 
 					{if $gBitSystem->isFeatureActive( 'i18n_track_translation_usage' )}
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" id="all_trans" name="all_trans" {if $allTrans}checked="checked"{/if} value="y" />Display all strings
 								{formhelp note="This will display translation strings for all bitweaver versions. This means it will also show strings that are not used at all and might be useless to you."}
-							</label>
+							{/forminput}
 						</div>
 					{/if}
 
 					<div class="form-group">
-						<label class="checkbox">
+						{forminput label="checkbox"}
 							<input type="checkbox" id="un_trans" name="un_trans" />Only Untranslated
 							{formhelp note="Display only untranslated strings when editing the language translations."}
-						</label>
+						{/forminput}
 					</div>
 
 					{formfeedback warning="Editing a language for the first time will cause an import of the language. this can take several minutes, depending on your configuration."}
diff --git a/templates/import_languages.tpl b/templates/import_languages.tpl
index 1b8e1b5..0c4b2cd 100644
--- a/templates/import_languages.tpl
+++ b/templates/import_languages.tpl
@@ -14,18 +14,19 @@
 				{form legend="Import languages" enctype="multipart/form-data"}
 					<div class="form-group">
 						{formlabel label="Select the languages to Import"}
-						{forminput}
-							{formhelp note="Languages that are checked below will be imported from the language string files in the bitweaver distribution. If you have your own language file, please choose it below."}
-							{foreach from=$impLanguages key=langCode item=lang}
-								<label><input type="checkbox" name="imp_languages[]" value="{$langCode}" /> {$lang.full_name}</label><br/>
-							{/foreach}
+						{formhelp note="Languages that are checked below will be imported from the language string files in the bitweaver distribution. If you have your own language file, please choose it below."}
+						{foreach from=$impLanguages key=langCode item=lang}
+							{forminput label="checkbox"}
+								<input type="checkbox" name="imp_languages[]" value="{$langCode}" /> {$lang.full_name}
+							{/forminput}
+						{/foreach}
 
-							{if $gBitUser->isAdmin()}
-								<br/>
-								<label><input type="checkbox" name="import_master" value="1" /> Master Strings</label><br/>
+						{if $gBitUser->isAdmin()}
+							{forminput label="checkbox"}
+								<input type="checkbox" name="import_master" value="1" /> Master Strings
 								{formhelp note="The English strings file will be used to set up the language database and will be used as a reference for translations."}
-							{/if}
-						{/forminput}
+							{/forminput}
+						{/if}
 					</div>
 
 					<div class="form-group">
@@ -46,15 +47,14 @@
 
 					<div class="form-group">
 						{formlabel label="Options"}
-						{forminput}
-							<label><input type="radio" name="overwrite" value="n" />
-								{tr}Do not import string if it has been changed in the local database{/tr}</label>
-							<br/>
-							<label><input type="radio" name="overwrite" value="y" />
-								{tr}Overwrite changes in the local database{/tr}</label>
-							<br/>
-							<label><input type="radio" name="overwrite" value="r" checked="checked" />
-								{tr}Manually resolve conflicts between database and import file{/tr}</label>
+						{forminput label="radio"}
+							<input type="radio" name="overwrite" value="n" /> {tr}Do not import string if it has been changed in the local database{/tr}
+						{/forminput}
+						{forminput label="radio"}
+							<input type="radio" name="overwrite" value="y" /> {tr}Overwrite changes in the local database{/tr}
+						{/forminput}
+						{forminput label="radio"}
+							<input type="radio" name="overwrite" value="r" checked="checked" /> {tr}Manually resolve conflicts between database and import file{/tr}
 						{/forminput}
 					</div>
 
@@ -70,10 +70,10 @@
 						<div class="form-group">
 							{formlabel label="Language to export" for="exp_lang"}
 							{forminput}
-								<select name="export_lang_code" id="export_lang_code">
-									{foreach from=$expLanguages key=langCode item=lang}
-										<option value="{$langCode}" {if $exp_language eq $langCode}selected="selected"{/if}>{$lang.full_name}</option>
-									{/foreach}
+								<select class="form-input" name="export_lang_code" id="export_lang_code">
+								{foreach from=$expLanguages key=langCode item=lang}
+									<option value="{$langCode}" {if $exp_language eq $langCode}selected="selected"{/if}>{$lang.full_name}</option>
+								{/foreach}
 								</select>
 								{formhelp note=""}
 							{/forminput}
@@ -81,28 +81,30 @@
 
 						{if $gBitSystem->isFeatureActive( 'i18n_track_translation_usage' )}
 							<div class="form-group">
-								<label class="checkbox">
+								{forminput label="checkbox"}
 									<input type="checkbox" name="all_trans" id="all_trans" checked="checked" value="y" />All translations
 									{formhelp note="This will export all strings of the chosen language for all versions of bitweaver. It is generally a good idea to export these."}
-								</label>
+								{/forminput}
 							</div>
 						{else}
 							<input type="hidden" name="all_trans" value="y" />
 						{/if}
 
 						<div class="form-group">
-							<label class="checkbox">
+							{forminput label="checkbox"}
 								<input type="checkbox" name="include_empty" id="include_empty" value="y" />Include Empty
 								{formhelp note="This will include empty translation strings as well. This is generally not needed."}
-							</label>
+							{/forminput}
 						</div>
 
 						<div class="form-group">
 							{formlabel label="Destination" for="is_disabled"}
-							{forminput}
-								<label><input type="radio" name="target" value="temp" /> {tr}Save to temporary file{/tr}</label><br />
+							{forminput label="radio"}
+								<input type="radio" name="target" value="temp" /> {tr}Save to temporary file{/tr}
 								{formhelp note="This will save the file to a temporary location on the server."}
-								<label><input type="radio" name="target" value="download" checked="checked" /> {tr}Download translation file{/tr}</label><br/>
+							{/forminput}
+							{forminput label="radio"}
+								<input type="radio" name="target" value="download" checked="checked" /> {tr}Download translation file{/tr}
 								{formhelp note="Save this to languages/lang/(lang_code)/language.php where lang_code is the language your are downloading."}
 							{/forminput}
 						</div>