diff options
| author | beccabroek <beccabroek@gmail.com> | 2018-09-07 17:18:24 -0500 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-09-11 14:57:48 -0700 |
| commit | 457ca04073ff10cb1df2e7c5ab5192430a2ac6a9 (patch) | |
| tree | 7e08838036ff59b0c7f9126dc4049bb04f173ec4 /app/server-control | |
| parent | fc7a33f279de2c56c62a1939fb0c7c2a7ed3a22b (diff) | |
| download | phosphor-webui-457ca04073ff10cb1df2e7c5ab5192430a2ac6a9.tar.gz phosphor-webui-457ca04073ff10cb1df2e7c5ab5192430a2ac6a9.zip | |
Switch to xterm
Switch to xterm from hterm in the GUI, as
it supports more encoding styles. Was seeing
errors in console thrown by hterm during boot.
Also resolves the issue of text wrapping
observed in the below issue.
Resolves openbmc/openbmc#3262
Tested: Errors are no longer thrown during boot
related to encoding. xterm displaying console
messages and delivering messages.
Change-Id: I9f39c3616d7ff2c1045ff1ad29f603c65784ab30
Signed-off-by: beccabroek <beccabroek@gmail.com>
Diffstat (limited to 'app/server-control')
3 files changed, 20 insertions, 12 deletions
diff --git a/app/server-control/controllers/remote-console-controller.html b/app/server-control/controllers/remote-console-controller.html index d26ebbe..3011eb0 100644 --- a/app/server-control/controllers/remote-console-controller.html +++ b/app/server-control/controllers/remote-console-controller.html @@ -9,7 +9,11 @@ </section> <section class="row column"> <p class="serial-lan__copy">The Serial over LAN (SoL) console redirects the output of the server’s serial port to a browser window on your workstation.</p> - <serial-console show-tab-btn="true"></serial-console> + </section> + <section class="row column"> + <div class="terminal-container"> + <serial-console show-tab-btn="true"></serial-console> + </div> </section> </div> diff --git a/app/server-control/controllers/remote-console-window-controller.html b/app/server-control/controllers/remote-console-window-controller.html index eca7bec..bde520d 100644 --- a/app/server-control/controllers/remote-console-window-controller.html +++ b/app/server-control/controllers/remote-console-window-controller.html @@ -1,5 +1,7 @@ <div class="serial-lan__header"> <a class="bold" ng-click="close()"><i class="icon icon__return"></i> Return to OpenBmc</a> </div> -<serial-console show-tab-btn="false"></serial-console> +<div class="window-terminal-container"> + <serial-console show-tab-btn="false"></serial-console> +</div> diff --git a/app/server-control/styles/remote-console.scss b/app/server-control/styles/remote-console.scss index c4dd9ac..41b144d 100644 --- a/app/server-control/styles/remote-console.scss +++ b/app/server-control/styles/remote-console.scss @@ -8,16 +8,6 @@ .serial-lan__copy { padding: 1em 0; } -.serial-lan__terminal { - position: relative; - width: 101%; //extra 1% to fix redraw issue with terminal window - height: 400px; - border: 1em solid #19273c; - //TODO: Need to move from hterm to xterm as iframe used is adding the extra - //scroll bar. Also need to rework on the height setting along with $window - //directive. - overflow-x: hidden; -} .serial-lan__actions { float: right; @@ -40,3 +30,15 @@ line-height: 0; a {color: $black;} } + +.terminal-container { + position: relative; + height: 25em; + width: 100%; +} + +.window-terminal-container { + position: relative; + height: 25em; + max-width: 70em; +} |
