new icon and pop-out window for Serial over lan
Change-Id: I1722a4fbd1e9ac07162c9732d68dfea283a28aed
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/assets/images/icon-return.svg b/app/assets/images/icon-return.svg
new file mode 100644
index 0000000..776d536
--- /dev/null
+++ b/app/assets/images/icon-return.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 23.1 26.3" style="enable-background:new 0 0 23.1 26.3;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="17.1,22.1 17.1,25.1 1.1,25.1 1.1,1.1 17.1,1.1 17.1,5.1 "/>
+<polygon points="16.1,18.1 17.6,16.6 15.1,14.1 23.1,14.1 23.1,12.2 15.1,12.1 17.6,9.6 16.1,8.1 11.1,13.1 "/>
+</svg>
diff --git a/app/common/styles/base/icons.scss b/app/common/styles/base/icons.scss
index fe6156f..19b4a99 100644
--- a/app/common/styles/base/icons.scss
+++ b/app/common/styles/base/icons.scss
@@ -83,6 +83,11 @@
background-image: url(/assets/images/icon-off.svg);
}
+.icon__return {
+ @include status-icon;
+ background-image: url(/assets/images/icon-return.svg);
+}
+
.icon__info{
margin-top: -4px;
margin-right: .5em;
diff --git a/app/server-control/controllers/remote-console-controller.html b/app/server-control/controllers/remote-console-controller.html
index 34bf2cd..4fbb4b1 100644
--- a/app/server-control/controllers/remote-console-controller.html
+++ b/app/server-control/controllers/remote-console-controller.html
@@ -17,4 +17,5 @@
</div>
</div>
</section>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/app/server-control/controllers/remote-console-window-controller.html b/app/server-control/controllers/remote-console-window-controller.html
new file mode 100644
index 0000000..62a8ecf
--- /dev/null
+++ b/app/server-control/controllers/remote-console-window-controller.html
@@ -0,0 +1,6 @@
+<div class="serial-lan__header">
+ <a class="bold"><i class="icon icon__return"></i> Return to openBmc</a>
+</div>
+<div class="serial-lan__wrapper">
+ <div id="terminal" class="serial-lan__terminal"></div>
+</div>
\ No newline at end of file
diff --git a/app/server-control/styles/remote-console.scss b/app/server-control/styles/remote-console.scss
index 2ef3779..103958a 100644
--- a/app/server-control/styles/remote-console.scss
+++ b/app/server-control/styles/remote-console.scss
@@ -1,5 +1,5 @@
-
.serial-lan__wrapper {
+ overflow: hidden;
.btn-export {
margin: 1.8em 0 1.8em 2em;
}
@@ -22,8 +22,18 @@
.btn-export {
text-decoration: none;
font-size: .9em;
+ &:hover {
+ text-decoration: underline;
+ }
&:visited {
color: $black;
}
}
+}
+
+.serial-lan__header {
+ background: $white;
+ padding: 1.2em;
+ line-height: 0;
+ a {color: $black;}
}
\ No newline at end of file
