some menu cleaning & added overclock toggle

base.php

@@ -97,7 +97,11 @@ function je($s)
 function tr($key)
 {
 	global $_messages;
-	return isset($_messages[$key]) ? $_messages[$key] : ('??' . $key . '??');
+	if (isset($_messages[$key])) return $_messages[$key];
+	else {
+		ob_end_clean();
+		die('??' . $key . '??');
+	}
 }
 
 /** Like eval, but allows <?php and ?> */

js/appcommon.js

@@ -33,8 +33,12 @@ $.ready(function () {
     let h = x.querySelector('h2')
 
     let hdl = function () {
+      if ($(x).hasClass('d-expanded')) {
+        $(x).removeClass('d-expanded')
+      } else {
         $(x).toggleClass('expanded')
       }
+    }
     $(h).on('click', hdl).on('keypress', cr(hdl))
   })
 

lang/en.php

@@ -12,10 +12,24 @@ return [
 	'menu.term' => 'Back to Terminal',
 	'menu.cfg_system' => 'System Settings',
 	'menu.cfg_wifi_conn' => 'Connecting to Network',
-
 	'menu.settings' => 'Settings',
 
-	'title.term' => 'Terminal',
+	// not used - api etc. Added to suppress warnings
+	'menu.term_set' => '',
+	'menu.wifi_connstatus' => '',
+	'menu.wifi_set' => '',
+	'menu.wifi_scan' => '',
+	'menu.network_set' => '',
+	'menu.system_set' => '',
+	'menu.write_defaults' => '',
+	'menu.restore_defaults' => '',
+	'menu.restore_hard' => '',
+	'menu.reset_screen' => '',
+	'menu.index' => '',
+
+	// Terminal page
+
+	'title.term' => 'Terminal', // page title of the terminal page
 
 	'term_nav.config' => 'Config',
 	'term_nav.wifi' => 'WiFi',
@@ -26,18 +40,14 @@ return [
 	'term_nav.keybd' => 'Keyboard',
 	'term_nav.paste_prompt' => 'Paste text to send:',
 
-	'net.ap' => 'DHCP Server (AP)',
+	// Terminal settings page
-	'net.sta' => 'DHCP Client (Station)',
-	'net.sta_mac' => 'Station MAC',
-	'net.ap_mac' => 'AP MAC',
-	'net.details' => 'MAC addresses',
 
 	'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. They can be changed later by the terminal application
+		reset command is received (<code>\ec</code>). They can be changed by the 
-		via control commands.
+		terminal application using escape sequences.
 		',
 	'term.explain_expert' => '
 		Those are advanced config options that usually don\'t need to be changed.
@@ -58,7 +68,7 @@ return [
 	'term.term_width' => 'Width',
 	'term.term_height' => 'Height',
 	'term.buttons' => 'Button labels',
-	'term.theme' => 'Color scheme',
+	'term.theme' => 'Color palette',
 	'term.cursor_shape' => 'Cursor style',
 	'term.parser_tout_ms' => 'Parser timeout',
 	'term.display_tout_ms' => 'Redraw delay',
@@ -67,13 +77,13 @@ return [
 	'term.show_config_links' => 'Show nav links',
 	'term.show_buttons' => 'Show buttons',
 	'term.loopback' => 'Local Echo (<span style="text-decoration:overline">SRM</span>)',
-	'term.crlf_mode' => 'CR+LF enter (LNM)',
+	'term.crlf_mode' => 'Enter = CR+LF (LNM)',
 	'term.want_all_fn' => 'Capture all keys<br>(F5, F11, F12…)',
 	'term.button_msgs' => 'Button codes<br>(ASCII, dec, CSV)',
 	'term.color_fg' => 'Default fg.',
 	'term.color_bg' => 'Default bg.',
-	'term.color_fg_prev' => 'Fg. colors',
+	'term.color_fg_prev' => 'Foreground',
-	'term.color_bg_prev' => 'Bg. colors',
+	'term.color_bg_prev' => 'Background',
 	'term.colors_preview' => 'Defaults',
 
 	'cursor.block_blink' => 'Block, blinking',
@@ -83,23 +93,7 @@ return [
     'cursor.bar_blink' => 'I-bar, blinking',
     'cursor.bar_steady' => 'I-bar, steady',
 
-//	// terminal color labels
+	// Network config page
-//	'color.0' => 'Black',
-//	'color.1' => 'Red',
-//	'color.2' => 'Green',
-//	'color.3' => 'Yellow',
-//	'color.4' => 'Blue',
-//	'color.5' => 'Purple',
-//	'color.6' => 'Cyan',
-//	'color.7' => 'Silver',
-//	'color.8' => 'Gray',
-//	'color.9' => 'Light Red',
-//	'color.10' => 'Light Green',
-//	'color.11' => 'Light Yellow',
-//	'color.12' => 'Light Blue',
-//	'color.13' => 'Light Purple',
-//	'color.14' => 'Light Cyan',
-//	'color.15' => 'White',
 
 	'net.explain_sta' => '
 		Switch off Dynamic IP to configure the static IP address.',
@@ -118,6 +112,14 @@ return [
 	'net.sta_addr_mask' => 'Subnet mask',
 	'net.sta_addr_gw' => 'Gateway IP',
 
+	'net.ap' => 'DHCP Server (AP)',
+	'net.sta' => 'DHCP Client (Station)',
+	'net.sta_mac' => 'Station MAC',
+	'net.ap_mac' => 'AP MAC',
+	'net.details' => 'MAC addresses',
+
+	// Wifi config page
+
 	'wifi.ap' => 'Built-in Access Point',
 	'wifi.sta' => 'Join Existing Network',
 
@@ -143,67 +145,51 @@ return [
 	'wifi.enter_passwd' => 'Enter password for ":ssid:"',
 	'wifi.sta_explain' => 'After selecting a network, press Apply to connect.',
 
-	'wifi.conn.status' => 'Status:',
+	// Wifi connecting status page
-	'wifi.conn.back_to_config' => 'Back to WiFi config',
+
-	'wifi.conn.telemetry_lost' => 'Telemetry lost; something went wrong, or your device disconnected.',
+	'wificonn.status' => 'Status:',
-	'wifi.conn.explain_android_sucks' => '
+	'wificonn.back_to_config' => 'Back to WiFi config',
+	'wificonn.telemetry_lost' => 'Telemetry lost; something went wrong, or your device disconnected.',
+	'wificonn.explain_android_sucks' => '
 		If you\'re configuring ESPTerm via a smartphone, or were connected
 		from another external network, your device may lose connection and this 
 		progress indicator won\'t work. Please wait a while (~ 15 seconds), 
 		then check if the connection succeeded.',
 
-	'wifi.conn.explain_reset' => '
+	'wificonn.explain_reset' => '
 		To force enable the built-in AP, hold the BOOT 
 		button until the blue LED starts flashing. Hold the button longer (until the LED 
 		flashes rapidly) for a "factory reset".',
 
-	'wifi.conn.disabled' =>"Station mode is disabled.",
+	'wificonn.disabled' =>"Station mode is disabled.",
-	'wifi.conn.idle' =>"Idle, not connected and has no IP.",
+	'wificonn.idle' =>"Idle, not connected and has no IP.",
-	'wifi.conn.success' => "Connected! Received IP ",
+	'wificonn.success' => "Connected! Received IP ",
-	'wifi.conn.working' => "Connecting to selected AP",
+	'wificonn.working' => "Connecting to selected AP",
-	'wifi.conn.fail' => "Connection failed, check settings & try again. Cause: ",
+	'wificonn.fail' => "Connection failed, check settings & try again. Cause: ",
 
-	'system.save_restore' => 'Save & Restore',
+	// Access restrictions form
-	'system.confirm_restore' => 'Restore all settings to their default values?',
-	'system.confirm_restore_hard' =>
-		'Restore to firmware default settings? This will reset ' .
-		'all active settings and switch to AP mode with the default SSID.',
-	'system.confirm_store_defaults' =>
-		'Enter admin password to confirm you want to overwrite the default settings.',
-	'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 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 communication UART. The debug UART is fixed 
-		at 115.200 baud, one stop-bit and no parity.
-		',
 
-	'system.security' => 'Access Restrictions',
+	'pwlock.title' => 'Access Restrictions',
-	'system.explain_security' => '
+	'pwlock.explain' => '
 		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.<br>
 		The default password is "%def_access_pw%".
 	',
-	'system.pwlock' => 'Protected pages',
+	'pwlock.region' => 'Protected pages',
-	'system.pwlock.none' => 'None, all open',
+	'pwlock.region.none' => 'None, all open',
-	'system.pwlock.settings_noterm' => 'WiFi, Net & System settings',
+	'pwlock.region.settings_noterm' => 'WiFi, Net & System settings',
-	'system.pwlock.settings' => 'All settings pages',
+	'pwlock.region.settings' => 'All settings pages',
-	'system.pwlock.menus' => 'This entire menu section',
+	'pwlock.region.menus' => 'This entire menu section',
-	'system.pwlock.all' => 'Everything, even terminal',
+	'pwlock.region.all' => 'Everything, even terminal',
-	'system.new_access_pw' => 'New password',
+	'pwlock.new_access_pw' => 'New password',
-	'system.new_access_pw2' => 'New pass., repeat',
+	'pwlock.new_access_pw2' => 'Repeat',
-	'system.admin_pw' => 'Admin password',
+	'pwlock.admin_pw' => 'Admin password',
-	'system.access_name' => 'Username',
+	'pwlock.access_name' => 'Username',
-
+
-	'system.change_adminpw' => 'Change Admin Password',
+	// Setting admin password
-	'system.explain_adminpw' =>
+
+	'adminpw.title' => 'Change Admin Password',
+	'adminpw.explain' =>
 		'
 		The "admin password" is used to manipulate the stored default settings
 		and to change access restrictions. This password is not saved as part 
@@ -212,10 +198,36 @@ return [
 		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.',
+	'adminpw.new_admin_pw' => 'New admin password',
-	'system.new_admin_pw2' => 'New pass., repeat',
+	'adminpw.new_admin_pw2' => 'Repeat',
-	'system.old_admin_pw' => 'Old admin pass.',
+	'adminpw.old_admin_pw' => 'Old admin password',
+
+	// Persist form
 
+	'persist.title' => 'Save & Restore',
+	'persist.explain' => '
+		ESPTerm saves all settings in Flash. The active settings can be copied to
+		the "defaults area" and restored later using the blue button below.
+		',
+	'persist.confirm_restore' => 'Restore all settings to their default values?',
+	'persist.confirm_restore_hard' =>
+		'Restore to firmware default settings? This will reset ' .
+		'all active settings and switch to AP mode with the default SSID.',
+	'persist.confirm_store_defaults' =>
+		'Enter admin password to confirm you want to overwrite the default settings.',
+	'persist.password' => 'Admin password:',
+	'persist.restore_defaults' => 'Reset to saved defaults',
+	'persist.write_defaults' => 'Save active settings as defaults',
+	'persist.restore_hard' => 'Reset active settings to factory defaults',
+	'persist.restore_hard_explain' => '(This clears the WiFi config! Does not affect saved defaults or admin password.)',
+
+	// UART settings form
+
+	'uart.title' => 'Serial Port Parameters',
+	'uart.explain' => '
+		This form controls the communication UART. The debug UART is fixed 
+		at 115.200 baud, one stop-bit and no parity.
+		',
 	'uart.baud' => 'Baud rate',
 	'uart.parity' => 'Parity',
 	'uart.parity.none' => 'None',
@@ -226,6 +238,19 @@ return [
 	'uart.stop_bits.one_and_half' => 'One and half',
 	'uart.stop_bits.two' => 'Two',
 
+	// HW tuning form
+
+	'hwtuning.title' => 'Hardware Tuning',
+	'hwtuning.explain' => '
+		ESP8266 can be overclocked from 80&nbsp;MHz to 160&nbsp;MHz. 
+		This will make it more responsive and allow faster screen updates
+		at the expense of slightly higher power consumption. This can also make 
+		it more susceptible to interference. Use with care.
+		',
+	'hwtuning.overclock' => 'Overclock to 160MHz',
+
+	// Generic button / dialog labels
+
 	'apply' => 'Apply!',
 	'enabled' => 'Enabled',
 	'disabled' => 'Disabled',

pages/cfg_network.php

@@ -2,6 +2,7 @@
 $ipmask='pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"';
 ?>
 
+<!-- STA -->
 <form class="Box str mobcol" action="<?= e(url('network_set')) ?>" method="GET" id="form-netsta">
 	<h2 tabindex=0><?= tr('net.sta') ?></h2>
 
@@ -35,6 +36,7 @@ $ipmask='pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"';
 	</div>
 </form>
 
+<!-- AP -->
 <form class="Box str mobcol" action="<?= e(url('network_set')) ?>" method="GET" id="form-netap">
 	<h2 tabindex=0><?= tr('net.ap') ?></h2>
 
@@ -73,6 +75,7 @@ $ipmask='pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"';
 	</div>
 </form>
 
+<!-- MACs -->
 <div class="Box mobcol">
 	<h2><?= tr('net.details') ?></h2>
 

pages/cfg_system.php

@@ -1,108 +1,131 @@
+<!-- Persist -->
 <div class="Box str mobcol">
-	<h2 tabindex=0><?= tr('system.save_restore') ?></h2>
+	<h2 tabindex=0><?= tr('persist.title') ?></h2>
 
 	<div class="Row explain nomargintop">
-		<?= tr('system.explain_persist') ?>
+		<?= tr('persist.explain') ?>
 	</div>
 
 	<div class="Row buttons2">
 		<a class="button icn-restore"
-		   onclick="return confirm('<?= tr('system.confirm_restore') ?>');"
+		   onclick="return confirm('<?= tr('persist.confirm_restore') ?>');"
 		   href="<?= e(url('restore_defaults')) ?>">
-			<?= tr('system.restore_defaults') ?>
+			<?= tr('persist.restore_defaults') ?>
 		</a>
 	</div>
 
 	<div class="Row buttons2">
-		<a onclick="writeDefaults(); return false;" href="#"><?= tr('system.write_defaults') ?></a>
+		<a onclick="writeDefaults(); return false;" href="#"><?= tr('persist.write_defaults') ?></a>
 	</div>
 
 	<div class="Row buttons2">
-		<a onclick="return confirm('<?= tr('system.confirm_restore_hard') ?>');"
+		<a onclick="return confirm('<?= tr('persist.confirm_restore_hard') ?>');"
 		   href="<?= e(url('restore_hard')) ?>">
-			<?= tr('system.restore_hard') ?>
+			<?= tr('persist.restore_hard') ?>
 		</a><br>
-		<?= tr('system.restore_hard_explain') ?>
+		<?= tr('persist.restore_hard_explain') ?>
 	</div>
 </div>
 
+<!-- Overclock -->
+<form class="Box str mobcol" action="<?= e(url('system_set')) ?>" method="GET" id="form-hw">
+	<h2 tabindex=0><?= tr('hwtuning.title') ?></h2>
+
+	<div class="Row explain">
+		<?= tr('hwtuning.explain') ?>
+	</div>
+
+	<div class="Row checkbox" >
+		<label><?= tr('hwtuning.overclock') ?></label><!--
+		--><span class="box" tabindex=0 role=checkbox></span>
+		<input type="hidden" id="overclock" name="overclock" value="%overclock%">
+	</div>
+
+	<div class="Row buttons">
+		<a class="button icn-ok" href="#" onclick="qs('#form-hw').submit()"><?= tr('apply') ?></a>
+	</div>
+</form>
+
+
 <?php
 $NOFILL = 'readonly onfocus="this.removeAttribute(\'readonly\')" style="cursor:text" autocomplete="off"';
 ?>
 
-<form class="Box str mobcol" action="<?= e(url('system_set')) ?>" method="GET" id="form-2">
+<!-- Access perms -->
-	<h2 tabindex=0><?= tr('system.security') ?></h2>
+<form class="Box str mobcol" action="<?= e(url('system_set')) ?>" method="GET" id="form-access">
+	<h2 tabindex=0><?= tr('pwlock.title') ?></h2>
 
 	<div class="Row explain">
-		<?= tr('system.explain_security') ?>
+		<?= tr('pwlock.explain') ?>
 	</div>
 
 	<div class="Row">
-		<label for="pwlock"><?= tr("system.pwlock") ?></label>
+		<label for="pwlock"><?= tr("pwlock.region") ?></label>
 		<select name="pwlock" id="pwlock">
-			<option value="0"><?= tr("system.pwlock.none") ?></option>
+			<option value="0"><?= tr("pwlock.region.none") ?></option>
-			<option value="1"><?= tr("system.pwlock.settings_noterm") ?></option>
+			<option value="1"><?= tr("pwlock.region.settings_noterm") ?></option>
-			<option value="2"><?= tr("system.pwlock.settings") ?></option>
+			<option value="2"><?= tr("pwlock.region.settings") ?></option>
-			<option value="3"><?= tr("system.pwlock.menus") ?></option>
+			<option value="3"><?= tr("pwlock.region.menus") ?></option>
-			<option value="4"><?= tr("system.pwlock.all") ?></option>
+			<option value="4"><?= tr("pwlock.region.all") ?></option>
 		</select>
 	</div>
 
 	<div class="Row">
-		<label for="access_name"><?= tr('system.access_name') ?></label>
+		<label for="access_name"><?= tr('pwlock.access_name') ?></label>
 		<input type="text" name="access_name" id="access_name" value="%h:access_name%">
 	</div>
 
 	<div class="Row">
-		<label for="access_pw"><?= tr('system.new_access_pw') ?></label>
+		<label for="access_pw"><?= tr('pwlock.new_access_pw') ?></label>
 		<input type="password" name="access_pw" id="access_pw" <?=$NOFILL?>>
 	</div>
 
 	<div class="Row">
-		<label for="access_pw2"><?= tr('system.new_access_pw2') ?></label>
+		<label for="access_pw2"><?= tr('pwlock.new_access_pw2') ?></label>
 		<input type="password" name="access_pw2" id="access_pw2" <?=$NOFILL?>>
 	</div>
 
 	<div class="Row">
-		<label for="pw"><?= tr('system.admin_pw') ?></label>
+		<label for="pw"><?= tr('pwlock.admin_pw') ?></label>
 		<input type="password" name="pw" id="pw" required>
 	</div>
 
 	<div class="Row buttons">
-		<a class="button icn-ok" href="#" onclick="qs('#form-2').submit()"><?= tr('apply') ?></a>
+		<a class="button icn-ok" href="#" onclick="qs('#form-access').submit()"><?= tr('apply') ?></a>
 	</div>
 </form>
 
-<form class="Box str mobcol" action="<?= e(url('system_set')) ?>" method="GET" id="form-3">
+<!-- Admin pw -->
-	<h2 tabindex=0><?= tr('system.change_adminpw') ?></h2>
+<form class="Box str mobcol" action="<?= e(url('system_set')) ?>" method="GET" id="form-admin">
+	<h2 tabindex=0><?= tr('adminpw.title') ?></h2>
 
 	<div class="Row explain">
-		<?= tr('system.explain_adminpw') ?>
+		<?= tr('adminpw.explain') ?>
 	</div>
 
 	<div class="Row">
-		<label for="admin_pw"><?= tr('system.new_admin_pw') ?></label>
+		<label for="admin_pw"><?= tr('adminpw.new_admin_pw') ?></label>
 		<input type="password" name="admin_pw" id="admin_pw">
 	</div>
 
 	<div class="Row">
-		<label for="admin_pw2"><?= tr('system.new_admin_pw2') ?></label>
+		<label for="admin_pw2"><?= tr('adminpw.new_admin_pw2') ?></label>
 		<input type="password" name="admin_pw2" id="admin_pw2">
 	</div>
 
 	<div class="Row">
-		<label for="pw"><?= tr('system.old_admin_pw') ?></label>
+		<label for="pw"><?= tr('adminpw.old_admin_pw') ?></label>
 		<input type="password" name="pw" id="pw" required>
 	</div>
 
 	<div class="Row buttons">
-		<a class="button icn-ok" href="#" onclick="qs('#form-3').submit()"><?= tr('apply') ?></a>
+		<a class="button icn-ok" href="#" onclick="qs('#form-admin').submit()"><?= tr('apply') ?></a>
 	</div>
 </form>
 
 <script>
 	function writeDefaults() {
-		var pw = prompt('<?= tr('system.confirm_store_defaults') ?>');
+		var pw = prompt('<?= tr('persist.confirm_store_defaults') ?>');
 		if (!pw) return;
 		location.href = <?=json_encode(url('write_defaults')) ?> + '?pw=' + pw;
 	}

pages/cfg_term.php

@@ -2,7 +2,8 @@
 	<a href="<?= e(url('reset_screen')) ?>"><?= tr('term.reset_screen') ?></a>
 </div>
 
-<form class="Box fold desktop-expanded str" action="<?= e(url('term_set')) ?>" method="GET" id='form-scheme'>
+<!-- Theme -->
+<form class="Box mobcol str" action="<?= e(url('term_set')) ?>" method="GET" id='form-scheme'>
 	<h2><?= tr('term.color_scheme') ?></h2>
 
 	<div class="Row explain">
@@ -119,7 +120,8 @@
 	</div>
 </form>
 
-<form class="Box fold str" action="<?= e(url('term_set')) ?>" method="GET" id='form-initial'>
+<!-- Initials -->
+<form class="Box mobcol str" action="<?= e(url('term_set')) ?>" method="GET" id='form-initial'>
 	<h2><?= tr('term.defaults') ?></h2>
 
 	<div class="Row explain">
@@ -183,11 +185,12 @@
 	</div>
 </form>
 
-<form class="Box fold str" action="<?= e(url('term_set')) ?>" method="GET" id="form-uart">
+<!-- UART -->
-	<h2 tabindex=0><?= tr('system.uart') ?></h2>
+<form class="Box mobcol str" action="<?= e(url('term_set')) ?>" method="GET" id="form-uart">
+	<h2 tabindex=0><?= tr('uart.title') ?></h2>
 
 	<div class="Row explain">
-		<?= tr('system.explain_uart') ?>
+		<?= tr('uart.explain') ?>
 	</div>
 
 	<div class="Row">
@@ -237,7 +240,8 @@
 	</div>
 </form>
 
-<form class="Box fold str" action="<?= e(url('term_set')) ?>" method="GET" id='form-expert'>
+<!-- Expert terminal opts -->
+<form class="Box mobcol str" action="<?= e(url('term_set')) ?>" method="GET" id='form-expert'>
 	<h2><?= tr('term.expert') ?></h2>
 
 	<div class="Row explain">

pages/cfg_wifi.php

@@ -1,3 +1,4 @@
+<!-- AP -->
 <form class="Box str mobcol" action="<?= e(url('wifi_set')) ?>" method="GET" id="form-ap">
 	<h2 tabindex=0><?= tr('wifi.ap') ?></h2>
 
@@ -42,6 +43,7 @@
 	</div>
 </form>
 
+<!-- STA -->
 <form class="Box str mobcol expanded" action="<?= e(url('wifi_set')) ?>" method="GET" id="form-sta">
 	<h2 tabindex=0><?= tr('wifi.sta') ?></h2>
 

pages/cfg_wifi_conn.php

@@ -1,13 +1,13 @@
 <h1><?= tr('menu.cfg_wifi_conn') ?></h1>
 
 <div class="Box">
-	<p><b><?= tr('wifi.conn.status') ?></b> <span id="status"></span><span class="anim-dots">.</span></p>
+	<p><b><?= tr('wificonn.status') ?></b> <span id="status"></span><span class="anim-dots">.</span></p>
-	<a href="<?= e(url('cfg_wifi')) ?>" id="backbtn" class="button"><?= tr('wifi.conn.back_to_config') ?></a>
+	<a href="<?= e(url('cfg_wifi')) ?>" id="backbtn" class="button"><?= tr('wificonn.back_to_config') ?></a>
 </div>
 
 <div class="Box">
-	<p><?= tr('wifi.conn.explain_android_sucks') ?></p>
+	<p><?= tr('wificonn.explain_android_sucks') ?></p>
-	<p><?= tr('wifi.conn.explain_reset') ?></p>
+	<p><?= tr('wificonn.explain_reset') ?></p>
 </div>
 
 <script>
@@ -16,15 +16,15 @@
 	var failCounter = 0;
 
 	var messages = <?= json_encode([
-		'disabled' => tr('wifi.conn.disabled'),
+		'disabled' => tr('wificonn.disabled'),
-		'idle' => tr('wifi.conn.idle'),
+		'idle' => tr('wificonn.idle'),
-		'success' => tr('wifi.conn.success'),
+		'success' => tr('wificonn.success'),
-		'working' => tr('wifi.conn.working'),
+		'working' => tr('wificonn.working'),
-		'fail' => tr('wifi.conn.fail'),
+		'fail' => tr('wificonn.fail'),
 	]) ?>;
 
 	function onFail() {
-		$("#status").html(<?= json_encode(tr('wifi.conn.telemetry_lost')) ?>);
+		$("#status").html(<?= json_encode(tr('wificonn.telemetry_lost')) ?>);
 		$('.anim-dots').addClass('hidden');
 	}
 

sass/app.scss

@@ -7,7 +7,7 @@
 
 @import "utils";
 
-$form-label-w: 160px;
+$form-label-w: 180px;
 $form-label-gap: 8px;
 $form-field-w: 250px;
 

sass/layout/_box.scss

@@ -139,6 +139,7 @@
 	&.expanded {
 		.Row {
 			display: flex;
+			&.explain { display: block; }
 
 			&.v {
 				display: block;
@@ -146,10 +147,12 @@
 		}
 	}
 
+	// desktop-expanded
 	@include media($tablet-min) {
-		&.desktop-expanded {
+		&.d-expanded {
 			.Row {
 				display: flex;
+				&.explain { display: block; }
 
 				&.v {
 					display: block;