Merged in dev (pull request #55)

Dev
Approved-by: zheng liu <liuzheng712@gmail.com>

i18n/cn.json

@@ -40,5 +40,11 @@
   "user": "用户",
   "user group": "用户组",
   "login logs": "登陆日志",
-  "language": "语言选择"
+  "language": "语言选择",
+  "found": "发现",
+  "users ": "用户",
+  "choose a user": "选择一个用户",
+  "please choose a user": "请选择一个用户",
+  "cancel": "取消",
+  "confirm": "确认"
 }

nginx.conf

@@ -5,8 +5,4 @@ server {
     try_files $uri / /index.html;
     alias /opt/luna/;
   }
-
-  location /i18n/ {
-    root /opt/luna/i18n;
-  }
 }

src/app/ControlPage/cleftbar/dialog.html

-<h1 mat-dialog-title>Found {{data.users.length}} Users</h1>
+<h1 mat-dialog-title>{{"Found"|trans}} {{data.users.length}} {{"Users "|trans}}</h1>
 
 <mat-form-field>
   <mat-select [(value)]="selected"
               [compareWith]="compareFn"
               [formControl]="UserSelectControl"
-              placeholder="Choose a User" required>
+              placeholder="{{'Choose a User'|trans}}" required>
     <mat-option *ngFor="let u of data.users" value="{{u.id}}">{{u.username}}</mat-option>
   </mat-select>
-  <mat-error *ngIf="UserSelectControl.hasError('required')">Please choose a User</mat-error>
+  <mat-error *ngIf="UserSelectControl.hasError('required')">{{"Please choose a User"|trans}}</mat-error>
 
 </mat-form-field>
 <div style="float: right">
-  <button mat-raised-button (click)="onNoClick()">Cancel</button>
-  <button mat-raised-button color="primary" [mat-dialog-close]="selected" cdkFocusInitial>Confirm</button>
+  <button mat-raised-button (click)="onNoClick()">{{"Cancel"|trans}}</button>
+  <button mat-raised-button color="primary" [mat-dialog-close]="selected" cdkFocusInitial>{{"Confirm"|trans}}</button>
 </div>

src/app/app-routing.module.ts

@@ -28,7 +28,7 @@ const appRoutes: Routes = [
   {path: 'replay/:token', component: ReplayPageComponent},
   {path: 'monitor/:token', component: MonitorPageComponent},
   {path: 'test', component: TestPageComponent},
-  {path: 'setting', component: SettingPageComponent},
+  // {path: 'setting', component: SettingPageComponent},
   {path: 'undefined', component: BlankPageComponent},
   {path: '', component: ControlPageComponent},
   {path: '**', component: NotFoundComponent}

src/app/elements/iframe/iframe.component.ts

@@ -2,7 +2,7 @@ import {Component, Input, OnInit} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
 import {NavList} from '../../ControlPage/control/control.component';
 
-import {User} from '../../globals';
+import {User, guacamole_token} from '../../globals';
 import {HttpService, LogService} from '../../app.service';
 
 @Component({
@@ -23,17 +23,22 @@ export class ElementIframeComponent implements OnInit {
 
   ngOnInit() {
     // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
-    this._http.get_guacamole_token(User.name, this.host.id, this.userid).subscribe(
-      data => {
-        const base = window.btoa(this.host.hostname + '\0' + 'c' + '\0' + 'jumpserver');
-        // /guacamole/client will redirect to http://guacamole/#/client
-        this.target = document.location.origin +
-          '/guacamole/#/client/' + base + '?token=' + data['authToken'];
-      },
-      error2 => {
-        this._logger.error(error2);
-      }
-    );
+    const base = window.btoa(this.host.hostname + '\0' + 'c' + '\0' + 'jumpserver');
+    if (guacamole_token) {
+      this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + guacamole_token;
+    } else {
+      this._http.get_guacamole_token(User.name, this.host.id, this.userid).subscribe(
+        data => {
+          // /guacamole/client will redirect to http://guacamole/#/client
+          this.target = document.location.origin +
+            '/guacamole/#/client/' + base + '?token=' + data['authToken'];
+          guacamole_token = data['authToken'];
+        },
+        error2 => {
+          this._logger.error(error2);
+        }
+      );
+    }
   }
 
   trust(url) {

src/app/globals.ts

@@ -147,3 +147,4 @@ export let wsEvent: {
 
 export const i18n = new Map();
 
+export let guacamole_token: string;

tools/build.sh

@@ -6,5 +6,6 @@ npm run-script build
 
 rm -fr luna*
 mv dist luna
+cp -R i18n/ luna/
 tar czf luna.tar.gz luna
 md5 luna.tar.gz