Merge branch 'dev' into test

src/app/ControlPage/control/controlnav/controlnav.component.css

@@ -32,7 +32,7 @@
 
 .tabs ul li.active {
   box-sizing: border-box;
-  border-bottom: 3px solid #19aa8d !important;
+  border-bottom: 5px solid #19aa8d !important;
 }
 
 .tabs ul li span {
@@ -87,7 +87,7 @@
  */
 .tabs::-webkit-scrollbar-track {
   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  background-color: #F5F5F5;
+  background-color: #676a6c;
 }
 
 .tabs::-webkit-scrollbar {
@@ -95,7 +95,7 @@
 }
 
 .tabs::-webkit-scrollbar-thumb {
-  background-color: #19aa8d;
+  background-color: #F5F5F5;
 }
 
 .scroll-botton {

src/app/elements/term/term.component.ts

@@ -70,7 +70,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
     if (this.host) {
       NavList.List[this.index].Term = this.term;
 
-      this.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');
+      // this.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');
 
       TermWS.emit('host', {'uuid': this.host.id, 'userid': this.userid, 'secret': this.secret});
 
@@ -87,6 +87,12 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
       TermWS.on('disconnect', function () {
         that.TerminalDisconnect();
       });
+      TermWS.on('logout', function (data) {
+        if (data['room'] === NavList.List[that.index].room) {
+          NavList.List[this.index].connected = false;
+          this.term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
+        }
+      });
       TermWS.on('room', function (data) {
         if (data['secret'] === that.secret) {
           NavList.List[that.index].room = data['room'];