some style and text fixes

pull/2/head
Ondřej Hruška 7 years ago
parent d59c0e876a
commit ddfc4c01d0
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
  1. 21
      lang/en.php
  2. 9
      pages/cfg_system.php
  3. 26
      pages/cfg_term.php
  4. 2
      pages/help/charsets.php
  5. 4
      pages/help/cmd_system.php
  6. 2
      pages/help/sgr_colors.php
  7. 2
      pages/help/sgr_styles.php
  8. 6
      sass/form/_form_layout.scss
  9. 12
      sass/layout/_box.scss
  10. 3
      sass/pages/_about.scss

@ -35,9 +35,9 @@ return [
'term.defaults' => 'Initial Settings', 'term.defaults' => 'Initial Settings',
'term.expert' => 'Expert Options', 'term.expert' => 'Expert Options',
'term.explain_initials' => ' 'term.explain_initials' => '
Those are the initial settings used after ESPTerm powers on or when the screen 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, reset command is received. They can be later changed by control commands by the
those changes won\'t be saved in Flash. terminal application.
', ',
'term.explain_expert' => ' 'term.explain_expert' => '
Those are advanced config options that usually don\'t need to be changed. 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.fn_alt_mode' => 'SS3 Fn keys',
'term.show_config_links' => 'Show nav links', 'term.show_config_links' => 'Show nav links',
'term.show_buttons' => 'Show buttons', 'term.show_buttons' => 'Show buttons',
'term.loopback' => 'Local Echo', 'term.loopback' => 'Local Echo (<span style="text-decoration:overline">SRM</span>)',
'term.crlf_mode' => 'Enter sends CR+LF', 'term.crlf_mode' => 'CR+LF enter (LNM)',
'term.want_all_fn' => 'Capture all keys<br>(F5, F11, F12…)', 'term.want_all_fn' => 'Capture all keys<br>(F5, F11, F12…)',
'term.button_msgs' => 'Button codes<br>(ASCII, dec, CSV)', 'term.button_msgs' => 'Button codes<br>(ASCII, dec, CSV)',
'term.color_fg' => 'Default fg.', 'term.color_fg' => 'Default fg.',
@ -173,21 +173,23 @@ return [
'system.password' => 'Admin password:', 'system.password' => 'Admin password:',
'system.restore_defaults' => 'Reset to saved defaults', 'system.restore_defaults' => 'Reset to saved defaults',
'system.write_defaults' => 'Save active settings as 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' => ' 'system.explain_persist' => '
ESPTerm saves all settings in Flash. The active settings can be copied to ESPTerm saves all settings in Flash. The active settings can be copied to
the "defaults area" and restored later using the blue button below. the "defaults area" and restored later using the blue button below.
', ',
'system.uart' => 'Serial Port', 'system.uart' => 'Serial Port',
'system.explain_uart' => ' '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. at 115.200 baud, one stop-bit and no parity.
', ',
'system.security' => 'Access Restrictions', 'system.security' => 'Access Restrictions',
'system.explain_security' => ' 'system.explain_security' => '
Some parts, or all of the web interface can be protected by a password prompt. 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.<br>
The default password is "%def_access_pw%".
', ',
'system.pwlock' => 'Protected pages', 'system.pwlock' => 'Protected pages',
'system.pwlock.none' => 'None, all open', 'system.pwlock.none' => 'None, all open',
@ -207,7 +209,8 @@ return [
and to change access restrictions. This password is not saved as part 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 of the main config, i.e. using save / restore does not affect this
password. When the admin password is forgotten, the easiest way to 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.<br>
The default admin password is "%def_admin_pw%".
', ',
'system.new_admin_pw' => 'New admin pass.', 'system.new_admin_pw' => 'New admin pass.',
'system.new_admin_pw2' => 'New pass., repeat', 'system.new_admin_pw2' => 'New pass., repeat',

@ -5,7 +5,7 @@
<?= tr('system.explain_persist') ?> <?= tr('system.explain_persist') ?>
</div> </div>
<div class="Row buttons"> <div class="Row buttons2">
<a class="button icn-restore" <a class="button icn-restore"
onclick="return confirm('<?= tr('system.confirm_restore') ?>');" onclick="return confirm('<?= tr('system.confirm_restore') ?>');"
href="<?= e(url('restore_defaults')) ?>"> href="<?= e(url('restore_defaults')) ?>">
@ -13,15 +13,16 @@
</a> </a>
</div> </div>
<div class="Row buttons"> <div class="Row buttons2">
<a onclick="writeDefaults(); return false;" href="#"><?= tr('system.write_defaults') ?></a> <a onclick="writeDefaults(); return false;" href="#"><?= tr('system.write_defaults') ?></a>
</div> </div>
<div class="Row buttons"> <div class="Row buttons2">
<a onclick="return confirm('<?= tr('system.confirm_restore_hard') ?>');" <a onclick="return confirm('<?= tr('system.confirm_restore_hard') ?>');"
href="<?= e(url('restore_hard')) ?>"> href="<?= e(url('restore_hard')) ?>">
<?= tr('system.restore_hard') ?> <?= tr('system.restore_hard') ?>
</a> </a><br>
<?= tr('system.restore_hard_explain') ?>
</div> </div>
</div> </div>

@ -2,7 +2,7 @@
<a href="<?= e(url('reset_screen')) ?>"><?= tr('term.reset_screen') ?></a> <a href="<?= e(url('reset_screen')) ?>"><?= tr('term.reset_screen') ?></a>
</div> </div>
<form class="Box mobopen str" action="<?= e(url('term_set')) ?>" method="GET" id='form-scheme'> <form class="Box fold desktop-expanded str" action="<?= e(url('term_set')) ?>" method="GET" id='form-scheme'>
<h2><?= tr('term.color_scheme') ?></h2> <h2><?= tr('term.color_scheme') ?></h2>
<div class="Row explain"> <div class="Row explain">
@ -166,6 +166,18 @@
<input class="tiny" type="text" name="bm5" id="bm5" value="%h:bm5%"> <input class="tiny" type="text" name="bm5" id="bm5" value="%h:bm5%">
</div> </div>
<div class="Row checkbox" >
<label><?= tr('term.crlf_mode') ?></label><!--
--><span class="box" tabindex=0 role=checkbox></span>
<input type="hidden" id="crlf_mode" name="crlf_mode" value="%crlf_mode%">
</div>
<div class="Row checkbox" >
<label><?= tr('term.loopback') ?></label><!--
--><span class="box" tabindex=0 role=checkbox></span>
<input type="hidden" id="loopback" name="loopback" value="%loopback%">
</div>
<div class="Row buttons"> <div class="Row buttons">
<a class="button icn-ok" href="#" onclick="qs('#form-initial').submit()"><?= tr('apply') ?></a> <a class="button icn-ok" href="#" onclick="qs('#form-initial').submit()"><?= tr('apply') ?></a>
</div> </div>
@ -262,24 +274,12 @@
<input type="hidden" id="want_all_fn" name="want_all_fn" value="%want_all_fn%"> <input type="hidden" id="want_all_fn" name="want_all_fn" value="%want_all_fn%">
</div> </div>
<div class="Row checkbox" >
<label><?= tr('term.crlf_mode') ?></label><!--
--><span class="box" tabindex=0 role=checkbox></span>
<input type="hidden" id="crlf_mode" name="crlf_mode" value="%crlf_mode%">
</div>
<div class="Row checkbox" > <div class="Row checkbox" >
<label><?= tr('term.show_config_links') ?></label><!-- <label><?= tr('term.show_config_links') ?></label><!--
--><span class="box" tabindex=0 role=checkbox></span> --><span class="box" tabindex=0 role=checkbox></span>
<input type="hidden" id="show_config_links" name="show_config_links" value="%show_config_links%"> <input type="hidden" id="show_config_links" name="show_config_links" value="%show_config_links%">
</div> </div>
<div class="Row checkbox" >
<label><?= tr('term.loopback') ?></label><!--
--><span class="box" tabindex=0 role=checkbox></span>
<input type="hidden" id="loopback" name="loopback" value="%loopback%">
</div>
<div class="Row buttons"> <div class="Row buttons">
<a class="button icn-ok" href="#" onclick="qs('#form-expert').submit()"><?= tr('apply') ?></a> <a class="button icn-ok" href="#" onclick="qs('#form-expert').submit()"><?= tr('apply') ?></a>
</div> </div>

@ -41,7 +41,7 @@
} }
?> ?>
<h3>Switching commands</h3> <h3>Codepage switching commands</h3>
<p> <p>
There are two character set slots, G0 and G1. There are two character set slots, G0 and G1.

@ -14,8 +14,8 @@
<tr> <tr>
<td>`\ec`</td> <td>`\ec`</td>
<td> <td>
Clear screen, reset attributes and cursor. Clear screen, reset attributes and cursor. This command also restores the default
The screen size, title and button labels remain unchanged. screen size, title, button labels and messages.
</td> </td>
</tr> </tr>
<tr> <tr>

@ -1,6 +1,6 @@
<div class="Box fold"> <div class="Box fold">
<h2>Commands: Color SGR</h2> <h2>Commands: Color attributes</h2>
<div class="Row v"> <div class="Row v">
<p> <p>

@ -1,5 +1,5 @@
<div class="Box fold"> <div class="Box fold">
<h2>Commands: Style SGR</h2> <h2>Commands: Style attributes</h2>
<div class="Row v"> <div class="Row v">
<p> <p>

@ -65,13 +65,17 @@ form { @include naked(); }
} }
// buttons2 is the same style, but different selector for use in the admin page // buttons2 is the same style, but different selector for use in the admin page
&.buttons { &.buttons, &.buttons2 {
margin: 16px auto; margin: 16px auto;
input, .button { input, .button {
margin-right: dist(-1); margin-right: dist(-1);
} }
} }
&.buttons2 {
display:block;
}
&.centered { &.centered {
justify-content: center; justify-content: center;
} }

@ -145,6 +145,18 @@
} }
} }
} }
@include media($tablet-min) {
&.desktop-expanded {
.Row {
display: flex;
&.v {
display: block;
}
}
}
}
} }
.Box.fold { .Box.fold {

@ -24,7 +24,8 @@
.page-help { .page-help {
code { code {
background: rgba(33, 97, 109, 0.31); background: #2da2b9;
color: black;
border-radius: 1px; border-radius: 1px;
padding: 0 2px; padding: 0 2px;
} }

Loading…
Cancel
Save