Merged in dev (pull request #27)

Dev

.angular-cli.json

@@ -23,6 +23,7 @@
         "../node_modules/layui-layer/dist/theme/default/layer.css",
         "../node_modules/animate.css/animate.min.css",
         "assets/inspinia/style.scss",
+        "../node_modules/xterm/dist/xterm.css",
         "sass/style.scss",
         "styles.css"
       ],
@@ -32,7 +33,7 @@
         "../node_modules/jquery-sparkline/jquery.sparkline.js",
         "../node_modules/tether/dist/js/tether.min.js",
         "../node_modules/bootstrap/dist/js/bootstrap.min.js",
-        "../node_modules/term.js/src/term.js",
+        "../node_modules/xterm/dist/xterm.js",
         "../node_modules/layui-layer/dist/layer.js",
         "../node_modules/socket.io-client/dist/socket.io.js",
         "./assets/js/mstsc.js",

src/app/ControlPage/cleftbar/cleftbar.component.css

@@ -75,11 +75,3 @@ label {
 .fa.fa-undefined:before {
   content: "\f26c";
 }
-
-.fa.fa-Linux:before {
-  content: "\f17c";
-}
-
-.fa.fa-Windows:before {
-  content: "\f17a";
-}

src/app/ControlPage/cleftbar/cleftbar.component.html

@@ -10,7 +10,7 @@
       <label for="hostgroup-{{i}}">{{hostGroup.name}}</label>
       <ul [ngClass]="{'insearch': q }">
         <li *ngFor="let host of hostGroup.assets_granted | SearchFilter: q" (click)="Connect(host)">
-          <i class="fa" [ngClass]="'fa-'+host.plantform" id="fa-{{i}}"></i>
+          <i class="fa" [ngClass]="'fa-'+(host.plantform||'undefined').toLowerCase()" id="fa-{{i}}"></i>
           {{host.hostname}}
         </li>
       </ul>

src/app/ControlPage/cleftbar/cleftbar.component.ts

@@ -133,11 +133,11 @@ export class CleftbarComponent implements OnInit {
     if (userid === '') {
       return;
     }
-    if (host.plantform === 'Linux') {
+    if (host.plantform.toLowerCase() === 'linux') {
       jQuery('app-ssh').show();
       jQuery('app-rdp').hide();
       this._term.TerminalConnect(host, userid);
-    } else if (host.plantform === 'Windows') {
+    } else if (host.plantform.toLowerCase() === 'windows') {
       jQuery('app-ssh').hide();
       jQuery('app-rdp').show();
       this._rdp.Connect(host, userid);

src/app/ControlPage/control/ssh/ssh.component.ts

@@ -109,7 +109,7 @@ export class SshComponent implements OnInit {
       });
 
       socket.on('disconnect', function () {
-        this.TerminalDisconnect(NavList.List[id]);
+        SshComponent.TerminalDisconnect(NavList.List[id]);
         // TermStore.term[id]["term"].destroy();
         // TermStore.term[id]["connected"] = false;
       });

src/app/ControlPage/controlpage.component.css

@@ -7,7 +7,8 @@ div, term-leftbar, term-body {
 div {
   background-color: black;
   margin: 0;
-  padding-top:30px;
+  top:30px;
+  position: absolute;
 }
 
 app-cleftbar {