Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
4e193d1e
Commit
4e193d1e
authored
Feb 04, 2018
by
zheng liu
Browse files
Options
Browse Files
Download
Plain Diff
Merged in dev (pull request #54)
Dev
parents
a9e809b1
0bfc57a7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
mock.py
mock.py
+2
-2
cleftbar.component.css
src/app/ControlPage/cleftbar/cleftbar.component.css
+3
-0
cleftbar.component.html
src/app/ControlPage/cleftbar/cleftbar.component.html
+3
-2
cleftbar.component.ts
src/app/ControlPage/cleftbar/cleftbar.component.ts
+1
-0
term.component.ts
src/app/elements/term/term.component.ts
+2
-2
No files found.
mock.py
View file @
4e193d1e
...
...
@@ -125,7 +125,7 @@ def asset_groups_assets():
},
{
"id"
:
1
,
"name"
:
"Default"
,
"name"
:
"Default
long name long name long name
"
,
"comment"
:
"Default asset group"
,
"assets_granted"
:
[
{
...
...
@@ -157,7 +157,7 @@ def asset_groups_assets():
},
{
"id"
:
44
,
"hostname"
:
"192.168.1.6"
,
"hostname"
:
"192.168.1.6
long name long name long name long name long name
"
,
"ip"
:
"192.168.2.6"
,
"port"
:
22
,
"platform"
:
"Linux"
,
...
...
src/app/ControlPage/cleftbar/cleftbar.component.css
View file @
4e193d1e
...
...
@@ -42,6 +42,9 @@ label {
list-style
:
none
;
cursor
:
pointer
;
color
:
#ffffff
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.filetree
label
{
...
...
src/app/ControlPage/cleftbar/cleftbar.component.html
View file @
4e193d1e
...
...
@@ -7,9 +7,10 @@
<ul
class=
"filetree"
>
<li
*
ngFor=
"let hostGroup of HostGroups | SearchFilter: q; let i = index "
>
<input
type=
"checkbox"
id=
"hostgroup-{{i}}"
>
<label
for=
"hostgroup-{{i}}"
>
{{hostGroup.name}}
</label>
<label
for=
"hostgroup-{{i}}"
matTooltip=
"{{hostGroup.name}}"
[
matTooltipPosition
]="
TooltipPosition
"
>
{{hostGroup.name}}
</label>
<ul
[
ngClass
]="{'
insearch
'
:
q
}"
>
<li
*
ngFor=
"let host of hostGroup.assets_granted | SearchFilter: q"
(
click
)="
Connect
(
host
)"
(
contextmenu
)="
onRightClick
($
event
)"
>
<li
*
ngFor=
"let host of hostGroup.assets_granted | SearchFilter: q"
(
click
)="
Connect
(
host
)"
(
contextmenu
)="
onRightClick
($
event
)"
matTooltip=
"{{host.hostname}}"
[
matTooltipPosition
]="
TooltipPosition
"
>
<i
class=
"fa"
[
ngClass
]="'
fa-
'+(
host
.
platform
||'
undefined
').
toLowerCase
()"
id=
"fa-{{i}}"
></i>
{{host.hostname}}
</li>
...
...
src/app/ControlPage/cleftbar/cleftbar.component.ts
View file @
4e193d1e
...
...
@@ -47,6 +47,7 @@ export class CleftbarComponent implements OnInit {
event
:
MouseEvent
;
clientX
=
0
;
clientY
=
0
;
TooltipPosition
=
'above'
;
static
Reload
()
{
}
...
...
src/app/elements/term/term.component.ts
View file @
4e193d1e
...
...
@@ -97,7 +97,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
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'
);
//
this.term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
}
});
TermWS
.
on
(
'room'
,
function
(
data
)
{
...
...
@@ -109,7 +109,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
TerminalDisconnect
()
{
NavList
.
List
[
this
.
index
].
connected
=
false
;
this
.
term
.
write
(
'
\
r
\
n
\
x1b[31mBye Bye!
\
x1b[m
\
r
\
n'
);
//
this.term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
TermWS
.
emit
(
'logout'
,
NavList
.
List
[
this
.
index
].
room
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment