From a9cae0e76abed641bc5d02f06af649b6e7809b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Mon, 25 Sep 2017 01:36:46 +0200
Subject: [PATCH] better ordering of theme conf

---
 lang/en.php        |  8 ++++--
 pages/cfg_term.php | 72 +++++++++++++++++++++++-----------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/lang/en.php b/lang/en.php
index 569d766..09ec355 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -70,9 +70,11 @@ return [
 	'term.crlf_mode' => 'Enter sends CR+LF',
 	'term.want_all_fn' => 'Capture all keys<br>(F5, F11, F12…)',
 	'term.button_msgs' => 'Button codes<br>(ASCII, dec, CSV)',
-	'term.color_fg' => 'Foreground',
-	'term.color_bg' => 'Background',
-	'term.colors_preview' => 'Preview',
+	'term.color_fg' => 'Default fg.',
+	'term.color_bg' => 'Default bg.',
+	'term.color_fg_prev' => 'Fg. colors',
+	'term.color_bg_prev' => 'Bg. colors',
+	'term.colors_preview' => 'Defaults',
 
 	'cursor.block_blink' => 'Block, blinking',
     'cursor.block_steady' => 'Block, steady',
diff --git a/pages/cfg_term.php b/pages/cfg_term.php
index 6e2d911..8abede1 100644
--- a/pages/cfg_term.php
+++ b/pages/cfg_term.php
@@ -26,34 +26,7 @@
 	</div>
 
 	<div class="Row color-preview">
-		<label><?= tr("term.color_fg") ?></label>
-		<div>
-			<div class="colorprev fg">
-				<span data-fg=0 data-bg=0 style="text-shadow: 0 0 4px white;">0</span><!--
-				--><span data-fg=1 data-bg=0>1</span><!--
-				--><span data-fg=2 data-bg=0>2</span><!--
-				--><span data-fg=3 data-bg=0>3</span><!--
-				--><span data-fg=4 data-bg=0>4</span><!--
-				--><span data-fg=5 data-bg=0>5</span><!--
-				--><span data-fg=6 data-bg=0>6</span><!--
-				--><span data-fg=7 data-bg=0>7</span>
-			</div>
-
-			<div class="colorprev fg">
-				<span data-fg=8 data-bg=0>8</span><!--
-				--><span data-fg=9 data-bg=0>9</span><!--
-				--><span data-fg=10 data-bg=0>10</span><!--
-				--><span data-fg=11 data-bg=0>11</span><!--
-				--><span data-fg=12 data-bg=0>12</span><!--
-				--><span data-fg=13 data-bg=0>13</span><!--
-				--><span data-fg=14 data-bg=0>14</span><!--
-				--><span data-fg=15 data-bg=0>15</span>
-			</div>
-		</div>
-	</div>
-
-	<div class="Row color-preview">
-		<label><?= tr("term.color_bg") ?></label>
+		<label><?= tr("term.color_bg_prev") ?></label>
 		<div>
 			<div class="colorprev bg">
 				<span data-bg=0 data-fg=15>0</span><!--
@@ -79,14 +52,30 @@
 		</div>
 	</div>
 
-	<div class="Row">
-		<div class="SubRow">
-			<label for="default_fg"><?= tr("term.color_fg") ?></label>
-			<input type="text" name="default_fg" id="default_fg" class="short" value="%default_fg%">
-		</div>
-		<div class="SubRow">
-			<label for="default_bg"><?= tr("term.color_bg") ?></label>
-			<input type="text" name="default_bg" id="default_bg" class="short" value="%default_bg%">
+	<div class="Row color-preview">
+		<label><?= tr("term.color_fg_prev") ?></label>
+		<div>
+			<div class="colorprev fg">
+				<span data-fg=0 data-bg=0 style="text-shadow: 0 0 4px white;">0</span><!--
+				--><span data-fg=1 data-bg=0>1</span><!--
+				--><span data-fg=2 data-bg=0>2</span><!--
+				--><span data-fg=3 data-bg=0>3</span><!--
+				--><span data-fg=4 data-bg=0>4</span><!--
+				--><span data-fg=5 data-bg=0>5</span><!--
+				--><span data-fg=6 data-bg=0>6</span><!--
+				--><span data-fg=7 data-bg=0>7</span>
+			</div>
+
+			<div class="colorprev fg">
+				<span data-fg=8 data-bg=0>8</span><!--
+				--><span data-fg=9 data-bg=0>9</span><!--
+				--><span data-fg=10 data-bg=0>10</span><!--
+				--><span data-fg=11 data-bg=0>11</span><!--
+				--><span data-fg=12 data-bg=0>12</span><!--
+				--><span data-fg=13 data-bg=0>13</span><!--
+				--><span data-fg=14 data-bg=0>14</span><!--
+				--><span data-fg=15 data-bg=0>15</span>
+			</div>
 		</div>
 	</div>
 
@@ -102,6 +91,17 @@
 		<div id="fgbg_presets"></div>
 	</div>
 
+	<div class="Row">
+		<div class="SubRow">
+			<label for="default_fg"><?= tr("term.color_fg") ?></label>
+			<input type="text" name="default_fg" id="default_fg" class="short" value="%default_fg%">
+		</div>
+		<div class="SubRow">
+			<label for="default_bg"><?= tr("term.color_bg") ?></label>
+			<input type="text" name="default_bg" id="default_bg" class="short" value="%default_bg%">
+		</div>
+	</div>
+
 	<div class="Row">
 		<label><?= tr("term.cursor_shape") ?></label>
 		<select name="cursor_shape" id="cursor_shape">