From ddfc4c01d0381a96be03ac35c2f6e17e2828bacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 26 Sep 2017 11:29:34 +0200 Subject: [PATCH] some style and text fixes --- lang/en.php | 21 ++++++++++++--------- pages/cfg_system.php | 9 +++++---- pages/cfg_term.php | 26 +++++++++++++------------- pages/help/charsets.php | 2 +- pages/help/cmd_system.php | 4 ++-- pages/help/sgr_colors.php | 2 +- pages/help/sgr_styles.php | 2 +- sass/form/_form_layout.scss | 6 +++++- sass/layout/_box.scss | 12 ++++++++++++ sass/pages/_about.scss | 3 ++- 10 files changed, 54 insertions(+), 33 deletions(-) diff --git a/lang/en.php b/lang/en.php index 9b29c99..0b45801 100644 --- a/lang/en.php +++ b/lang/en.php @@ -35,9 +35,9 @@ return [ 'term.defaults' => 'Initial Settings', 'term.expert' => 'Expert Options', 'term.explain_initials' => ' - Those are the initial settings used after ESPTerm powers on or when the screen - reset command is received. Some options can be changed by the application via escape sequences, - those changes won\'t be saved in Flash. + Those are the initial settings used after ESPTerm powers on, or when the screen + reset command is received. They can be later changed by control commands by the + terminal application. ', 'term.explain_expert' => ' Those are advanced config options that usually don\'t need to be changed. @@ -66,8 +66,8 @@ return [ 'term.fn_alt_mode' => 'SS3 Fn keys', 'term.show_config_links' => 'Show nav links', 'term.show_buttons' => 'Show buttons', - 'term.loopback' => 'Local Echo', - 'term.crlf_mode' => 'Enter sends CR+LF', + 'term.loopback' => 'Local Echo (SRM)', + 'term.crlf_mode' => 'CR+LF enter (LNM)', 'term.want_all_fn' => 'Capture all keys
(F5, F11, F12…)', 'term.button_msgs' => 'Button codes
(ASCII, dec, CSV)', 'term.color_fg' => 'Default fg.', @@ -173,21 +173,23 @@ return [ 'system.password' => 'Admin password:', 'system.restore_defaults' => 'Reset to saved defaults', 'system.write_defaults' => 'Save active settings as defaults', - 'system.restore_hard' => 'Reset active settings to firmware defaults', + 'system.restore_hard' => 'Reset active settings to factory defaults', + 'system.restore_hard_explain' => '(This clears the WiFi config! Does not affect saved defaults or admin password.)', 'system.explain_persist' => ' ESPTerm saves all settings in Flash. The active settings can be copied to the "defaults area" and restored later using the blue button below. ', 'system.uart' => 'Serial Port', 'system.explain_uart' => ' - This form controls the primary, communication UART. The debug UART is fixed + This form controls the communication UART. The debug UART is fixed at 115.200 baud, one stop-bit and no parity. ', 'system.security' => 'Access Restrictions', 'system.explain_security' => ' Some parts, or all of the web interface can be protected by a password prompt. - Leave the new password fields empty if you do not wish to change it. + Leave the new password fields empty if you do not wish to change it.
+ The default password is "%def_access_pw%". ', 'system.pwlock' => 'Protected pages', 'system.pwlock.none' => 'None, all open', @@ -207,7 +209,8 @@ return [ and to change access restrictions. This password is not saved as part of the main config, i.e. using save / restore does not affect this password. When the admin password is forgotten, the easiest way to - re-gain access is to wipe and re-flash the chip. + re-gain access is to wipe and re-flash the chip.
+ The default admin password is "%def_admin_pw%". ', 'system.new_admin_pw' => 'New admin pass.', 'system.new_admin_pw2' => 'New pass., repeat', diff --git a/pages/cfg_system.php b/pages/cfg_system.php index bcf99f9..c4993a9 100644 --- a/pages/cfg_system.php +++ b/pages/cfg_system.php @@ -5,7 +5,7 @@ -
+
@@ -13,15 +13,16 @@
-
+
-
+
- +
+
diff --git a/pages/cfg_term.php b/pages/cfg_term.php index 11b70aa..c56c737 100644 --- a/pages/cfg_term.php +++ b/pages/cfg_term.php @@ -2,7 +2,7 @@
-
+

@@ -166,6 +166,18 @@
+
+ + +
+ +
+ + +
+
@@ -262,24 +274,12 @@
-
- - -
-
-
- - -
-
diff --git a/pages/help/charsets.php b/pages/help/charsets.php index c21b1dc..961eda6 100644 --- a/pages/help/charsets.php +++ b/pages/help/charsets.php @@ -41,7 +41,7 @@ } ?> -

Switching commands

+

Codepage switching commands

There are two character set slots, G0 and G1. diff --git a/pages/help/cmd_system.php b/pages/help/cmd_system.php index f7b19f0..28989d3 100644 --- a/pages/help/cmd_system.php +++ b/pages/help/cmd_system.php @@ -14,8 +14,8 @@ `\ec` - Clear screen, reset attributes and cursor. - The screen size, title and button labels remain unchanged. + Clear screen, reset attributes and cursor. This command also restores the default + screen size, title, button labels and messages. diff --git a/pages/help/sgr_colors.php b/pages/help/sgr_colors.php index 7ad778c..ff42217 100644 --- a/pages/help/sgr_colors.php +++ b/pages/help/sgr_colors.php @@ -1,6 +1,6 @@

-

Commands: Color SGR

+

Commands: Color attributes

diff --git a/pages/help/sgr_styles.php b/pages/help/sgr_styles.php index bfa788a..d8b2e44 100644 --- a/pages/help/sgr_styles.php +++ b/pages/help/sgr_styles.php @@ -1,5 +1,5 @@

-

Commands: Style SGR

+

Commands: Style attributes

diff --git a/sass/form/_form_layout.scss b/sass/form/_form_layout.scss index 6e76b4e..ae9e792 100755 --- a/sass/form/_form_layout.scss +++ b/sass/form/_form_layout.scss @@ -65,13 +65,17 @@ form { @include naked(); } } // buttons2 is the same style, but different selector for use in the admin page - &.buttons { + &.buttons, &.buttons2 { margin: 16px auto; input, .button { margin-right: dist(-1); } } + &.buttons2 { + display:block; + } + &.centered { justify-content: center; } diff --git a/sass/layout/_box.scss b/sass/layout/_box.scss index 219757f..f97c1d5 100755 --- a/sass/layout/_box.scss +++ b/sass/layout/_box.scss @@ -145,6 +145,18 @@ } } } + + @include media($tablet-min) { + &.desktop-expanded { + .Row { + display: flex; + + &.v { + display: block; + } + } + } + } } .Box.fold { diff --git a/sass/pages/_about.scss b/sass/pages/_about.scss index 91a1cda..1e5dfdf 100644 --- a/sass/pages/_about.scss +++ b/sass/pages/_about.scss @@ -24,7 +24,8 @@ .page-help { code { - background: rgba(33, 97, 109, 0.31); + background: #2da2b9; + color: black; border-radius: 1px; padding: 0 2px; }