add bootstrap styling to translate forms, and tidy up

2 files changed, 24 insertions, 18 deletions

diff --git a/templates/language_master_strings.tpl b/templates/language_master_strings.tpl
index f183f36..b97a237 100644
--- a/templates/language_master_strings.tpl
+++ b/templates/language_master_strings.tpl
@@ -20,7 +20,7 @@
 					<div class="form-group">
 						{formlabel label="Master String" for="master_string"}
 						{forminput}
-							<textarea cols="50" rows="5" name="edit_master[{$sourceHash}]" id="master_string">{$masterStrings.$sourceHash.source|escape}</textarea>
+							<textarea class="form-control" name="edit_master[{$sourceHash}]" id="master_string">{$masterStrings.$sourceHash.source|escape}</textarea>
 						{/forminput}
 					</div>
 {*
@@ -33,19 +33,24 @@
 					{foreach from=$languages key=langCode item=lang}
 						{if $langCode ne 'en'}
 						<div class="form-group">
-							<div class="formlabel">
-								{$lang.native_name}
-								{if $gBitSystem->getConfig('google_api_key')}
-									<div class="autotranslate" onclick="autoTranslate('{$sourceHash}','{$langCode}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} Auto</div>
-								{/if}
-							</div>
 							{forminput}
 								{* if results are guessed, we don't need to escape *}
 								{if $masterStrings.$sourceHash.textarea}
-									<textarea name="edit_trans[{$sourceHash}][{$langCode}]" id="{$langCode}_{$sourceHash}" lang="{$langCode}" rows="3" cols="50">{if $tranStrings.$sourceHash.$langCode.guessed}{$tranStrings.$sourceHash.$langCode.trans}{else}{$tranStrings.$sourceHash.$langCode.trans|escape|stripslashes}{/if}</textarea>
+									<textarea class="form-control" name="edit_trans[{$sourceHash}][{$langCode}]" id="{$langCode}_{$sourceHash}" lang="{$langCode}" rows="3" cols="50">{if $tranStrings.$sourceHash.$langCode.guessed}{$tranStrings.$sourceHash.$langCode.trans}{else}{$tranStrings.$sourceHash.$langCode.trans|escape|stripslashes}{/if}</textarea>
+										{if $gBitSystem->getConfig('google_api_key')}
+											<div class="pull-left"><div class="btn btn-xs btn-default" onclick="autoTranslate('{$sourceHash}','{$langCode}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} Auto</div></div>
+										{/if}
 								{else}
-									<input type="text" name="edit_trans[{$sourceHash}][{$langCode}]" id="{$langCode}_{$sourceHash}" lang="{$langCode}" value="{if $tranStrings.$sourceHash.$langCode.guessed}{$tranStrings.$sourceHash.$langCode.trans}{else}{$tranStrings.$sourceHash.$langCode.trans|escape|stripslashes}{/if}" size="45" maxlength="2048" />
+									<div class="input-group">
+										{if $gBitSystem->getConfig('google_api_key')}
+										<div class="input-group-addon">
+											<div class="autotranslate" onclick="autoTranslate('{$sourceHash}','{$langCode}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} Auto</div>
+										</div>
+										{/if}
+										<input type="text" class="form-control" name="edit_trans[{$sourceHash}][{$langCode}]" id="{$langCode}_{$sourceHash}" lang="{$langCode}" value="{if $tranStrings.$sourceHash.$langCode.guessed}{$tranStrings.$sourceHash.$langCode.trans}{else}{$tranStrings.$sourceHash.$langCode.trans|escape|stripslashes}{/if}" maxlength="2048" />
+									</div>
 								{/if}
+								<div class="help-block">{$lang.native_name}</div>
 							{/forminput}
 						</div>
 						{/if}
diff --git a/templates/translate_strings.tpl b/templates/translate_strings.tpl
index 2c1af77..9fe5259 100644
--- a/templates/translate_strings.tpl
+++ b/templates/translate_strings.tpl
@@ -31,19 +31,20 @@
 				{legend legend=$languages.$lang.full_name}
 					{foreach from=$tranStrings key=sourceHash item=tran}
 						{if $allTrans || (!$gBitSystem->isFeatureActive( 'i18n_track_translation_usage' ) || $tran.version)}
-							<div class="row{if !$tran.version and !allTrans} warning{/if}">
-								<div class="formlabel">
-									<label for="{$sourceHash}">{tr}Translate{/tr}</label>
-									{if $gBitSystem->getConfig('google_api_key')}
-										<br/><div class="btn btn-xs autotranslate" onclick="autoTranslate('{$sourceHash}','{$editLang}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} {tr}Auto{/tr}</div>
-									{/if}
-								</div>
+							<div class="{if !$tran.version and !allTrans} warning{/if}">
 								{forminput}
 									<a href="{$smarty.const.LANGUAGES_PKG_URL}master_strings.php?source_hash={$sourceHash}">{$tran.source|escape|nl2br}</a><br/>
 									{if $tran.textarea}
-										<textarea style="font-size:medium;width:100%" name="edit_trans[{$sourceHash}]" id="{$editLang}_{$sourceHash}" lang="{$editLang}" rows="5" cols="50">{$tran.trans|escape|stripslashes}</textarea>
+										<textarea class="form-control" name="edit_trans[{$sourceHash}]" id="{$editLang}_{$sourceHash}" lang="{$editLang}" rows="5" cols="50">{$tran.trans|escape|stripslashes}</textarea>
 									{else}
-										<input style="font-size:medium;width:100%" name="edit_trans[{$sourceHash}]" id="{$editLang}_{$sourceHash}" lang="{$editLang}" value="{$tran.trans|escape|stripslashes}" size="45" maxlength="255" />
+									<div class="input-group">
+										{if $gBitSystem->getConfig('google_api_key')}
+										<div class="input-group-addon">
+											<div onclick="autoTranslate('{$sourceHash}','{$editLang}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} {tr}Auto{/tr}</div>
+										</div>
+										{/if}
+										<input class="form-control" name="edit_trans[{$sourceHash}]" id="{$editLang}_{$sourceHash}" lang="{$editLang}" value="{$tran.trans|escape|stripslashes}" maxlength="2048" />
+									</div>
 									{/if}
 								{/forminput}
 							</div>