Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
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
9 years ago
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: ssh key spacing fixes
parent
8f05251d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
19 deletions
+28
-19
circle/dashboard/templates/dashboard/vm-detail/home.html
+26
-19
circle/vm/operations.py
+2
-0
No files found.
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
7961f28a
...
@@ -145,27 +145,34 @@
...
@@ -145,27 +145,34 @@
</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
%}
>
<i
class=
"fa fa-{{op.mount_store.icon}}"
></i>
<i
class=
"fa fa-{{op.mount_store.icon}}"
></i>
{{ 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>
<div
class=
"operation-wrapper"
>
<dt>
{% trans "SSH keys" %}
</dt>
<a
href=
"{{ op.install_keys.get_url }}"
class=
"btn btn-info btn-xs operation"
<dd>
{{ op.install_keys.description }}
</dd>
{%
if
op
.
install_keys
.
disabled
%}
disabled
{%
endif
%}
>
<dd>
<i
class=
"fa fa-{{op.install_keys.icon}}"
></i>
<div
class=
"operation-wrapper"
>
{{ op.install_keys.name }}
<a
href=
"{{ op.install_keys.get_url }}"
class=
"btn btn-info btn-xs operation"
</a>
{%
if
op
.
install_keys
.
disabled
%}
disabled
{%
endif
%}
>
</div>
<i
class=
"fa fa-{{op.install_keys.icon}}"
></i>
{{ op.install_keys.name }}
</a>
</div>
</dd>
</dl>
{% endif %}
{% endif %}
</div>
</div>
<div
class=
"col-md-8"
>
<div
class=
"col-md-8"
>
...
...
This diff is collapsed.
Click to expand it.
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
=
()
...
...
This diff is collapsed.
Click to expand it.
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