Modify templates for ink frameworkINK_Port

7 files changed, 49 insertions, 49 deletions

diff --git a/templates/admin_languages.tpl b/templates/admin_languages.tpl
index ef09345..f141b79 100644
--- a/templates/admin_languages.tpl
+++ b/templates/admin_languages.tpl
@@ -1,7 +1,7 @@
 {form legend="Language Settings"}
 	<input type="hidden" name="page" value="{$page}" />
 
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{formlabel label="Language" for="bitlanguage"}
 		{forminput}
 			<select name="bitlanguage" id="bitlanguage">
@@ -14,7 +14,7 @@
 	</div>
 
 	{foreach from=$formLanguageToggles key=feature item=output}
-		<div class="control-group">
+		<div class="control-group column-group gutters">
 			{formlabel label=$output.label for=$feature}
 			{forminput}
 				{html_checkboxes name=$feature values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -23,7 +23,7 @@
 		</div>
 	{/foreach}
 
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{formlabel label="Google API Key" for="google_api_key"}
 		{forminput}
 			{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"}
@@ -33,6 +33,6 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" class="btn btn-default" name="prefs" value="{tr}Change Settings{/tr}" />
+		<input type="submit" class="ink-button" name="prefs" value="{tr}Change Settings{/tr}" />
 	</div>
 {/form}
diff --git a/templates/edit_languages.tpl b/templates/edit_languages.tpl
index b858bd4..94cd5ec 100644
--- a/templates/edit_languages.tpl
+++ b/templates/edit_languages.tpl
@@ -14,33 +14,33 @@
 						{form legend="Create or Edit Language"}
 							{formfeedback error=$saveErrors }
 							<input type="hidden" name="update_lang_code" value="{$defaults.lang_code}" />
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Native name of the language" for="native_name"}
 								{forminput}
 									<input type="text" id="native_name" name="native_name" size="45" value="{$defaults.native_name}" />
 								{/forminput}
 							</div>
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="English name of the language" for="english_name"}
 								{forminput}
 									<input type="text" name="english_name" id="english_name" size="45" value="{$defaults.english_name}" />
 								{/forminput}
 							</div>
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Language code" for="lang_code"}
 								{forminput}
 									<input type="text" name="lang_code" id="lang_code" size="8" maxlength="32" value="{$defaults.lang_code}" />
 									{formhelp note='For official language codes, see <a class="external" href="http://www.loc.gov/standards/iso639-2/langcodes.html">ISO639-1</a> and to add a localisation you can append the country code from <a class="external" href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1</a>.<br />e.g. ISO639-1 for english is "en" and the country code for britain is "uk". The resulting code is "en-uk".'}
 								{/forminput}
 							</div>
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								<label class="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>
 							</div>
 							<div class="control-group submit">
-								<input type="submit" class="btn btn-default" name="save_language" value="{tr}Save Language{/tr}" />
+								<input type="submit" class="ink-button" name="save_language" value="{tr}Save Language{/tr}" />
 							</div>
 							{formhelp note="A note for localisations: when you have a language, say 'de' and you add a localisation such as 'de-at' it will first check de-at for a string and then fall back to de. If it still hasn't found a translation, it will default to english."}
 						{/form}
@@ -51,7 +51,7 @@
 			{jstab title="Choose Language"}
 				{formfeedback success=$saveSuccess}
 				{form legend="Choose language"}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Select the language to edit" for="select_language"}
 						{forminput}
 							<select name="lang" id="select_language">
@@ -65,7 +65,7 @@
 					</div>
 
 					{if $gBitSystem->isFeatureActive( 'i18n_track_translation_usage' )}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<label class="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."}
@@ -73,7 +73,7 @@
 						</div>
 					{/if}
 
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						<label class="checkbox">
 							<input type="checkbox" id="un_trans" name="un_trans" />Only Untranslated
 							{formhelp note="Display only untranslated strings when editing the language translations."}
@@ -83,13 +83,13 @@
 					{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."}
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="delete_language" value="{tr}Delete Language{/tr}" />&nbsp;
-						<input type="submit" class="btn btn-default" name="edit_language" value="{tr}Edit Description{/tr}" />&nbsp;
+						<input type="submit" class="ink-button" name="delete_language" value="{tr}Delete Language{/tr}" />&nbsp;
+						<input type="submit" class="ink-button" name="edit_language" value="{tr}Edit Description{/tr}" />&nbsp;
 					</div>
 
 					{if $gBitUser->hasPermission( 'p_languages_create' )}
 						<div class="control-group submit">
-							<input type="submit" class="btn btn-default" name="new_language" value="{tr}Create New Language{/tr}" />
+							<input type="submit" class="ink-button" name="new_language" value="{tr}Create New Language{/tr}" />
 						</div>
 					{/if}
 				{/form}
@@ -98,10 +98,10 @@
 			{jstab title="Language Cache"}
 				{formfeedback success=$saveSuccess}
 				{form legend="Clear Language Cache"}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Clear Language Cache" for="clear_cache"}
 						{forminput}
-							<input type="submit" class="btn btn-default" name="clear_cache" id="clear_cache" value="{tr}Clear Cache{/tr}" />
+							<input type="submit" class="ink-button" name="clear_cache" id="clear_cache" value="{tr}Clear Cache{/tr}" />
 							{formhelp note="Clear the cached language translations for all languages. It is necessary to clear the cache when you have made changes to the language database."}
 						{/forminput}
 					</div>
diff --git a/templates/import_languages.tpl b/templates/import_languages.tpl
index 8929629..5969ea6 100644
--- a/templates/import_languages.tpl
+++ b/templates/import_languages.tpl
@@ -12,7 +12,7 @@
 		{jstabs}
 			{jstab title="Import Languages"}
 				{form legend="Import languages" enctype="multipart/form-data"}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{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."}
@@ -28,7 +28,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Upload Language File"}
 						{forminput}
 							{formhelp note="Choose a language file to upload..."}
@@ -44,7 +44,7 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Options"}
 						{forminput}
 							<label><input type="radio" name="overwrite" value="n" />
@@ -59,7 +59,7 @@
 					</div>
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="import" value="{tr}Import{/tr}" />
+						<input type="submit" class="ink-button" name="import" value="{tr}Import{/tr}" />
 					</div>
 				{/form}
 			{/jstab}
@@ -67,7 +67,7 @@
 			{if $expLanguages}
 				{jstab title="Export Languages"}
 					{form legend="Export language"}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							{formlabel label="Language to export" for="exp_lang"}
 							{forminput}
 								<select name="export_lang_code" id="export_lang_code">
@@ -80,7 +80,7 @@
 						</div>
 
 						{if $gBitSystem->isFeatureActive( 'i18n_track_translation_usage' )}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								<label class="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."}
@@ -90,14 +90,14 @@
 							<input type="hidden" name="all_trans" value="y" />
 						{/if}
 
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<label class="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>
 						</div>
 
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							{formlabel label="Destination" for="is_disabled"}
 							{forminput}
 								<label><input type="radio" name="target" value="temp" /> {tr}Save to temporary file{/tr}</label><br />
@@ -108,7 +108,7 @@
 						</div>
 
 						<div class="control-group submit">
-							<input type="submit" class="btn btn-default" name="export" value="{tr}Export{/tr}" />
+							<input type="submit" class="ink-button" name="export" value="{tr}Export{/tr}" />
 						</div>
 					{/form}
 				{/jstab}
diff --git a/templates/import_resolve.tpl b/templates/import_resolve.tpl
index a176ad4..eed936c 100644
--- a/templates/import_resolve.tpl
+++ b/templates/import_resolve.tpl
@@ -13,21 +13,21 @@
 			{foreach from=$impConflicts key=lang item=langConflicts}
 				<h2>{tr}Conflicts{/tr}: {$impLanguages.$lang.translated_name}</h2>
 				{foreach from=$langConflicts key=sourceHash item=conflict}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Master String"}
 						{forminput}
 								{$conflict.master|escape|nl2br}
 						{/forminput}
 					</div>
 
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Existing"}
 						{forminput}
 							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="" checked="checked" /> {$conflict.existing|escape|nl2br}</label>
 						{/forminput}
 					</div>
 
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Imported"}
 						{forminput}
 							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="{$conflict.import}" /> {$conflict.import|escape|nl2br}</label>
@@ -38,7 +38,7 @@
 			{/foreach}
 
 			<div class="control-group submit">
-				<input type="submit" class="btn btn-default" name="resolve" value="{tr}Import{/tr}" />
+				<input type="submit" class="ink-button" name="resolve" value="{tr}Import{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/language_master_strings.tpl b/templates/language_master_strings.tpl
index 51fabd3..f425d80 100644
--- a/templates/language_master_strings.tpl
+++ b/templates/language_master_strings.tpl
@@ -17,7 +17,7 @@
 			{tr}Translations strings may appear empty if the language is not loaded. The language will be automatically loaded when you click the edit icon.{/tr}
 			{foreach from=$sources item=sourceHash}
 					<input type="hidden" name="source_hash[]" value="{$sourceHash}" />
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{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>
@@ -25,14 +25,14 @@
 					</div>
 {*
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="delete_master" value="{tr}Delete Master{/tr}" />
-						&nbsp;<input type="submit" class="btn btn-default" name="change_master" value="{tr}Save{/tr}" />
+						<input type="submit" class="ink-button" name="delete_master" value="{tr}Delete Master{/tr}" />
+						&nbsp;<input type="submit" class="ink-button" name="change_master" value="{tr}Save{/tr}" />
 					</div>
 *}
 
 					{foreach from=$languages key=langCode item=lang}
 						{if $langCode ne 'en'}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								{$lang.native_name}
 								{if $gBitSystem->getConfig('google_api_key')}
@@ -53,15 +53,15 @@
 				{/foreach}
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />
-					<input type="submit" class="btn btn-default" name="save_translations" value="{tr}Save{/tr}" />
-					<input type="submit" class="btn btn-default" name="delete_master" value="{tr}Delete Master String{/tr}" />
+					<input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" />
+					<input type="submit" class="ink-button" name="save_translations" value="{tr}Save{/tr}" />
+					<input type="submit" class="ink-button" name="delete_master" value="{tr}Delete Master String{/tr}" />
 					{if $gBitSystem->getConfig('google_api_key')}
-					<div class="btn btn-default" onclick="return autoTranslateEmpty()">Auto Translate Empty Strings</div>
+					<div class="ink-button" onclick="return autoTranslateEmpty()">Auto Translate Empty Strings</div>
 					{/if}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formhelp note="Auto Translations will try and get an estimated translation using google language tools. Please make sure you check the returned strings for incorrect formatting."}
 				</div>
 			{/form}
@@ -69,7 +69,7 @@
 		{else}
 			{form legend="Translation Filter"}
 				<input type="hidden" name="char" value="{$smarty.request.char}" \>
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Filter" for=""}
 					{forminput}
 						<label><input type="radio" name="filter" {if !$smarty.request.filter                 }checked="checked" {/if}value="" /> {tr}No filter{/tr}</label><br />
@@ -86,7 +86,7 @@
 				</div>
 
 				<div class="submit">
-					<input type="submit" class="btn btn-default" name="set_filter" value="{tr}Set Filter{/tr}" />
+					<input type="submit" class="ink-button" name="set_filter" value="{tr}Set Filter{/tr}" />
 				</div>
 			{/form}
 
@@ -109,7 +109,7 @@
 				</ol>
 
 				<div class="submit">
-					<input type="submit" class="btn btn-default" name="delete_master" value="{tr}Delete Seleted Master Strings{/tr}" />
+					<input type="submit" class="ink-button" name="delete_master" value="{tr}Delete Seleted Master Strings{/tr}" />
 				</div>
 
 				{alphabar iall=1}
diff --git a/templates/select_translations.tpl b/templates/select_translations.tpl
index ebb8c75..01a27da 100644
--- a/templates/select_translations.tpl
+++ b/templates/select_translations.tpl
@@ -1,6 +1,6 @@
 {* don't show if this is the page creation *}
 {if $gContent->mContentId}
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{formlabel label="Translations" for="to_id"}
 		{forminput}
 			<input type="hidden" name="i18n[translation_id]" value="{$translationId}" />
@@ -11,7 +11,7 @@
 				{/foreach}
 			</select>
 			<br />
-			<input type="submit" class="btn btn-default" name="i18n[translate]" value="{tr}Translate{/tr}" />
+			<input type="submit" class="ink-button" name="i18n[translate]" value="{tr}Translate{/tr}" />
 			&nbsp; <label><input type="checkbox" name="i18n[google]" /> {tr}Attempt Google translation{/tr}</label>
 			{formhelp note="To translate this page into a different language, select that language above and click <strong>Translate</strong>. To use Google's translation service, enable the checkbox first (depending on the size of this page's text, Google's translation might take a while). "}
 		{/forminput}
diff --git a/templates/translate_strings.tpl b/templates/translate_strings.tpl
index c2d9bf5..b3ef669 100644
--- a/templates/translate_strings.tpl
+++ b/templates/translate_strings.tpl
@@ -8,7 +8,7 @@
 
 	<div class="body">
 		{form id="translateform"}
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Select the language to edit" for="select_language"}
 				{forminput}
 					<select name="choose_lang" id="select_language" onchange="this.form.submit()">
@@ -35,7 +35,7 @@
 								<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>
+										<br/><div class="btn btn-mini autotranslate" onclick="autoTranslate('{$sourceHash}','{$editLang}')">{biticon iname="google-favicon" ipackage="languages" iexplain="Auto-Translate"} {tr}Auto{/tr}</div>
 									{/if}
 								</div>
 								{forminput}
@@ -51,10 +51,10 @@
 					{/foreach}
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />&nbsp;
-						<input type="submit" class="btn btn-default" name="save_translations" value="{tr}Save{/tr}" />
+						<input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" />&nbsp;
+						<input type="submit" class="ink-button" name="save_translations" value="{tr}Save{/tr}" />
 						{if $gBitSystem->getConfig('google_api_key')}
-						<div class="btn btn-default" onclick="return autoTranslateEmpty()">{tr}Auto Translate Empty Strings{/tr}</div>
+						<div class="ink-button" onclick="return autoTranslateEmpty()">{tr}Auto Translate Empty Strings{/tr}</div>
 						{/if}
 					</div>