Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7961f28a
authored
Jun 08, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: ssh key spacing fixes
parent
8f05251d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
circle/dashboard/templates/dashboard/vm-detail/home.html
+12
-5
circle/vm/operations.py
+2
-0
No files found.
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
7961f28a
...
@@ -145,10 +145,10 @@
...
@@ -145,10 +145,10 @@
</dl>
</dl>
{% if op.mount_store %}
{% if op.mount_store %}
<
strong>
{% trans "Store" %}
</strong
>
<
dl
>
<p
>
<dt>
{% trans "Store" %}
</dt
>
{{ op.mount_store.description }}
<dd>
{{ op.mount_store.description }}
</dd>
</p
>
<dd
>
<div
class=
"operation-wrapper"
>
<div
class=
"operation-wrapper"
>
<a
href=
"{{ op.mount_store.get_url }}"
class=
"btn btn-info btn-xs operation"
<a
href=
"{{ op.mount_store.get_url }}"
class=
"btn btn-info btn-xs operation"
{%
if
op
.
mount_store
.
disabled
%}
disabled
{%
endif
%}
>
{%
if
op
.
mount_store
.
disabled
%}
disabled
{%
endif
%}
>
...
@@ -156,9 +156,14 @@
...
@@ -156,9 +156,14 @@
{{ op.mount_store.name }}
{{ op.mount_store.name }}
</a>
</a>
</div>
</div>
</dd>
</dl>
{% endif %}
{% endif %}
{% if op.install_keys %}
{% if op.install_keys %}
<strong>
{% trans "SSH keys" %}
</strong>
<dl>
<dt>
{% trans "SSH keys" %}
</dt>
<dd>
{{ op.install_keys.description }}
</dd>
<dd>
<div
class=
"operation-wrapper"
>
<div
class=
"operation-wrapper"
>
<a
href=
"{{ op.install_keys.get_url }}"
class=
"btn btn-info btn-xs operation"
<a
href=
"{{ op.install_keys.get_url }}"
class=
"btn btn-info btn-xs operation"
{%
if
op
.
install_keys
.
disabled
%}
disabled
{%
endif
%}
>
{%
if
op
.
install_keys
.
disabled
%}
disabled
{%
endif
%}
>
...
@@ -166,6 +171,8 @@
...
@@ -166,6 +171,8 @@
{{ op.install_keys.name }}
{{ op.install_keys.name }}
</a>
</a>
</div>
</div>
</dd>
</dl>
{% endif %}
{% endif %}
</div>
</div>
<div
class=
"col-md-8"
>
<div
class=
"col-md-8"
>
...
...
circle/vm/operations.py
View file @
7961f28a
...
@@ -1423,6 +1423,8 @@ class PasswordResetOperation(RemoteAgentOperation):
...
@@ -1423,6 +1423,8 @@ class PasswordResetOperation(RemoteAgentOperation):
class
InstallKeysOperation
(
RemoteAgentOperation
):
class
InstallKeysOperation
(
RemoteAgentOperation
):
id
=
'install_keys'
id
=
'install_keys'
name
=
_
(
"install SSH keys"
)
name
=
_
(
"install SSH keys"
)
description
=
_
(
"Copy your public keys to the virtual machines. "
"Only works on UNIX-like operating systems."
)
acl_level
=
"user"
acl_level
=
"user"
task
=
agent_tasks
.
add_keys
task
=
agent_tasks
.
add_keys
required_perms
=
()
required_perms
=
()
...
...
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