Switch to form-group divs for BS3

1 files changed, 31 insertions, 31 deletions

diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index 2c42b98..24af4da 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -14,7 +14,7 @@
 					{legend legend="User Information"}
 						<input type="hidden" name="view_user" value="{$editUser->mUserId}" />
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Real Name" for="real_name"}
 							{forminput}
 								<input type="text" name="real_name" id="real_name" value="{$editUser->mInfo.real_name|escape}" />
@@ -24,7 +24,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Username"}
 							{forminput}
 								{if $gBitUser->hasPermission('p_users_admin')}
@@ -38,7 +38,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Last login"}
 							{forminput}
 								{$editUser->mInfo.last_login|bit_long_datetime}
@@ -46,7 +46,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Is email public?" for="users_email_display"}
 							{forminput}
 								<select name="users_email_display" id="users_email_display">
@@ -58,7 +58,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Country" for="country"}
 							{forminput}
 								<select name="users_country" id="country">
@@ -73,7 +73,7 @@
 						</div>
 
 						{if $gBitSystem->isFeatureActive('users_change_language')}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Language" for="language"}
 								{forminput}
 									<select name="bitlanguage" id="bitlanguage">
@@ -89,7 +89,7 @@
 						{/if}
 
 						{foreach from=$customFields key=i item=field}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label=$field}
 								{forminput}
 									<input type="text" name="CUSTOM[{$field}]" value="{$editUser->mPrefs.$field}" maxlength="250" />
@@ -97,7 +97,7 @@
 							</div>
 						{/foreach}
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="User information" for="users_information"}
 							{forminput}
 								<select name="users_information" id="users_information">
@@ -108,7 +108,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="HomePage" for="users_homepage"}
 							{forminput}
 								<input size="50" type="text" name="users_homepage" id="users_homepage" value="{$editUser->mInfo.users_homepage|escape|default:'http://'}" />
@@ -117,7 +117,7 @@
 						</div>
 
 						{if $gBitSystem->getConfig('users_themes') == 'y'}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Theme" for="style"}
 								{forminput}
 									<select name="style" id="style">
@@ -130,7 +130,7 @@
 							</div>
 						{/if}
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Displayed time zone"}
 							{forminput}
 								<label><input type="radio" name="site_display_utc" value="UTC" {if $editUser->mPrefs.site_display_utc eq 'UTC'}checked="checked"{/if} />{tr}UTC{/tr}</label>
@@ -146,15 +146,15 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="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>
 						</div>
 
-						<div class="control-group submit">
-							<input type="submit" class="ink-button" name="prefs" value="{tr}Change preferences{/tr}" />
+						<div class="form-group submit">
+							<input type="submit" class="btn btn-default" name="prefs" value="{tr}Change preferences{/tr}" />
 						</div>
 					{/legend}
 				{/form}
@@ -162,7 +162,7 @@
 				<div>
 				{form legend="Change your email address" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
 					<input type="hidden" name="view_user" value="{$editUser->mUserId}" />
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Email" for="email"}
 						{forminput}
 							<input size="50" type="text" name="email" id="email" value="{$editUser->mInfo.email|escape}" />
@@ -170,7 +170,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Password" for="pass"}
 						{forminput}
 							<input type="password" name="pass" id="pass" />
@@ -178,8 +178,8 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="chgemail" value="{tr}Change email{/tr}" />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="chgemail" value="{tr}Change email{/tr}" />
 					</div>
 				{/form}
 				</div>
@@ -189,7 +189,7 @@
 					<input type="hidden" name="view_user" value="{$editUser->mUserId}" />
 					{* Users with admin priv can change password without knowing the old one *}
 					{if !$view_user or ( !$gBitUser->hasPermission('p_users_admin') and $view_user )}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Old password" for="old"}
 							{forminput}
 								<input type="password" name="old" id="old" />
@@ -200,7 +200,7 @@
 						<input type="hidden" name="old" value="" />
 					{/if}
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="New password" for="pass1"}
 						{forminput}
 							<input type="password" name="pass1" id="pass1" />
@@ -208,7 +208,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Again please" for="pass2"}
 						{forminput}
 							<input type="password" name="pass2" id="pass2" />
@@ -216,8 +216,8 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="chgpswd" value="{tr}Change Password{/tr}" />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="chgpswd" value="{tr}Change Password{/tr}" />
 					</div>
 				{/form}
 				</div>
@@ -225,7 +225,7 @@
 				{* this should go in tidbits *}
 				{if $gBitSystem->isFeatureActive( 'feature_tasks' )}
 					{form legend="User Tasks"}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Tasks per page" for="tasks_max_records"}
 							{forminput}
 								<select name="tasks_max_records" id="tasks_max_records">
@@ -241,15 +241,15 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="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>
 						</div>
 
-						<div class="control-group submit">
-							<input type="submit" class="ink-button" name="tasksprefs" value="{tr}Change preferences{/tr}" />
+						<div class="form-group submit">
+							<input type="submit" class="btn btn-default" name="tasksprefs" value="{tr}Change preferences{/tr}" />
 						</div>
 					{/form}
 				{/if}
@@ -257,7 +257,7 @@
 
 			{jstab title="Pictures"}
 				{legend legend="Pictures and Icons"}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Pictures"}
 						{forminput}
 							<a href="{$smarty.const.USERS_PKG_URL}my_images.php{if $editUser->mUserId ne $gBitUser->mUserId}?user_id={$editUser->mUserId}{/if}">{tr}Change pictures{/tr}</a>
@@ -265,7 +265,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Avatar"}
 						{forminput}
 							{if $editUser->mInfo.avatar_url}
@@ -275,7 +275,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Self Portrait"} {forminput}
 							{if $editUser->mInfo.portrait_url}
 								<img src="{$editUser->mInfo.portrait_url}" />
@@ -284,7 +284,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Logo" for=""}
 						{forminput}
 							{if $editUser->mInfo.logo_url}