From 309abedc026dcb621d8efa63f2170c8fd8db16a9 Mon Sep 17 00:00:00 2001 From: Gitai Date: Tue, 17 Mar 2020 17:56:08 +0800 Subject: [PATCH 1/6] Update console.html Add Fullscreen box and control elements. --- html/console.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/html/console.html b/html/console.html index 6cb74af7..03444b97 100644 --- a/html/console.html +++ b/html/console.html @@ -39,7 +39,10 @@

Microcontroller Console

Console
- 
--- No Content ---
+
+
+ 
--- No Content ---
+
Console entry
@@ -96,6 +99,12 @@

Microcontroller Console

function(s, st) { showWarning("Error clearing buffer in uC"); } ); }); + + $(".fullscreen-control").addEventListener("click", function(e) { + e.preventDefault(); + var fbc = this.parentNode.classList; + fbc[fbc.contains("full") ? "remove" : "add"].call(fbc, "full"); + }); ajaxJson('GET', "/console/baud", function(data) { $("#baud-sel").value = data.rate; }, From 99faca6659b2956555d2c73b37204d9921b95d1c Mon Sep 17 00:00:00 2001 From: Gitai Date: Tue, 17 Mar 2020 18:38:27 +0800 Subject: [PATCH 2/6] Update style.css Add fullscreen styles --- html/style.css | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 1bb11cd3..6743c018 100644 --- a/html/style.css +++ b/html/style.css @@ -248,6 +248,51 @@ input.inline { margin-left: 0.5em; } +/* Console fullscreen */ +.fullscreen-box { + position: relative; +} + +.fullscreen-box.full { + position: fixed; + height: 100vh; + width: 100vw; + left: 0; + top: 0; + z-index: 1001; +} + +.fullscreen-box > .fullscreen-control { + position: absolute; + border-radius: 2px; + top: 16px; + right: 16px; + width: 1em; + height: 1em; + text-align: center; + background: #00000025; + padding: 15px; + line-height: 1em; + color: #fff; + cursor: pointer; +} + +.fullscreen-box > .fullscreen-control::before { + content: "F"; +} + +.fullscreen-box.full > .fullscreen-control::before { + content: "X"; +} + +.fullscreen-box > pre.console { + height: 500px; +} + +.fullscreen-box.full > pre.console { + height: 100vh; +} + /* Text console */ pre.console { background-color: #663300; @@ -255,7 +300,6 @@ pre.console { border: 0px solid #000000; color: #66ff66; padding: 5px; - overflow: scroll; margin: 0px; } From 2729d64d3b2f541a5374ce76f336c19100b70fbc Mon Sep 17 00:00:00 2001 From: Gitai Date: Tue, 17 Mar 2020 19:35:31 +0800 Subject: [PATCH 3/6] Update console.html --- html/console.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/console.html b/html/console.html index 03444b97..187c8f3a 100644 --- a/html/console.html +++ b/html/console.html @@ -100,7 +100,7 @@

Microcontroller Console

); }); - $(".fullscreen-control").addEventListener("click", function(e) { + $(".fullscreen-control")[0].addEventListener("click", function(e) { e.preventDefault(); var fbc = this.parentNode.classList; fbc[fbc.contains("full") ? "remove" : "add"].call(fbc, "full"); From 219e66ee4b73457e6f470bc70be7a44c85102809 Mon Sep 17 00:00:00 2001 From: Gitai Date: Thu, 19 Mar 2020 08:52:27 +0800 Subject: [PATCH 4/6] Update log.html Fullscreen for log --- html/log.html | 95 ++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/html/log.html b/html/log.html index 884cf205..f4be5113 100644 --- a/html/log.html +++ b/html/log.html @@ -1,60 +1,69 @@ -
-
-

Debug Log

-
+
+
+

Debug Log

+
-
-

The debug log shows the most recent characters printed by the esp-link software itself to - its own debug log.

-
-

- Refresh -  Reset esp-link -

-

- UART debug log: - auto - off - on uart0 - on uart1 -

-
+
+

The debug log shows the most recent characters printed by the esp-link software itself to + its own debug log.

+
+

+ Refresh +  Reset esp-link +

+

+ UART debug log: + auto + off + on uart0 + on uart1 +

+
+
+ 

     

   

 

+

 
 
 
 
 

From 43e566b3de4a144fe7ec196c959041a7ca28312d Mon Sep 17 00:00:00 2001
From: Gitai 
Date: Thu, 19 Mar 2020 08:53:58 +0800
Subject: [PATCH 5/6] Update style.css

A syntax error
---
 html/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/style.css b/html/style.css
index 6743c018..24a3ed04 100644
--- a/html/style.css
+++ b/html/style.css
@@ -69,7 +69,7 @@ a:hover {
 }
 .click-to-edit span:active, .click-to-edit div:active {
     box-shadow: 0 0 0 1px rgba(0,0,0, 0.15) inset, 0 0 6px rgba(0,0,0, 0.20) inset;
-    border-color: #000\9;
+    border-color: #000;
 }
 /* Firefox: Get rid of the inner focus border */
 .click-to-edit span::-moz-focus-inner,

From a97597bca13505ce98a29df997deb2b177f0552f Mon Sep 17 00:00:00 2001
From: Gitai 
Date: Thu, 19 Mar 2020 09:02:55 +0800
Subject: [PATCH 6/6] Update style.css

fix bottom boundary overflow
---
 html/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/style.css b/html/style.css
index 24a3ed04..acc6f369 100644
--- a/html/style.css
+++ b/html/style.css
@@ -295,6 +295,7 @@ input.inline {
 
 /* Text console */
 pre.console {
+  box-sizing: border-box;
   background-color: #663300;
   border-radius: 5px;
   border: 0px solid #000000;