Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d148b808
authored
Aug 05, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: mount button
parent
03a510d1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
5 deletions
+22
-5
circle/dashboard/static/dashboard/vm-common.js
+1
-1
circle/dashboard/templates/dashboard/vm-detail/home.html
+14
-0
circle/dashboard/views.py
+4
-2
circle/vm/operations.py
+3
-2
No files found.
circle/dashboard/static/dashboard/vm-common.js
View file @
d148b808
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
$
(
function
()
{
$
(
function
()
{
/* vm operations */
/* vm operations */
$
(
'#ops, #vm-details-resources-disk, #vm-details-renew-op, #vm-details-pw-reset, #vm-details-add-interface'
).
on
(
'click'
,
'.operation'
,
function
(
e
)
{
$
(
'#ops, #vm-details-resources-disk, #vm-details-renew-op, #vm-details-pw-reset, #vm-details-add-interface
, .operation-wrapper
'
).
on
(
'click'
,
'.operation'
,
function
(
e
)
{
var
icon
=
$
(
this
).
children
(
"i"
).
addClass
(
'fa-spinner fa-spin'
);
var
icon
=
$
(
this
).
children
(
"i"
).
addClass
(
'fa-spinner fa-spin'
);
$
.
ajax
({
$
.
ajax
({
...
...
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
d148b808
...
@@ -90,6 +90,20 @@
...
@@ -90,6 +90,20 @@
</div>
</div>
</form>
</form>
</div>
<!-- id:vm-details-tags -->
</div>
<!-- id:vm-details-tags -->
{% if op.mount_store %}
<strong>
{% trans "Store" %}
</strong>
<p>
{{ op.mount_store.description }}
</p>
<div
class=
"operation-wrapper"
>
<a
href=
"{{ op.mount_store.get_url }}"
class=
"btn btn-info btn-xs operation"
{%
if
op
.
mount_store
.
disabled
%}
disabled
{%
endif
%}
>
<i
class=
"fa fa-{{op.mount_store.icon}}"
></i>
{{ op.mount_store.name }}
</a>
</div>
{% endif %}
</div>
</div>
<div
class=
"col-md-8"
>
<div
class=
"col-md-8"
>
{% if graphite_enabled %}
{% if graphite_enabled %}
...
...
circle/dashboard/views.py
View file @
d148b808
...
@@ -938,8 +938,6 @@ vm_ops = OrderedDict([
...
@@ -938,8 +938,6 @@ vm_ops = OrderedDict([
op
=
'sleep'
,
icon
=
'moon-o'
,
effect
=
'info'
)),
op
=
'sleep'
,
icon
=
'moon-o'
,
effect
=
'info'
)),
(
'migrate'
,
VmMigrateView
),
(
'migrate'
,
VmMigrateView
),
(
'save_as_template'
,
VmSaveView
),
(
'save_as_template'
,
VmSaveView
),
(
'mount_store'
,
VmOperationView
.
factory
(
op
=
'mount_store'
,
icon
=
'briefcase'
,
effect
=
'info'
)),
(
'reboot'
,
VmOperationView
.
factory
(
(
'reboot'
,
VmOperationView
.
factory
(
op
=
'reboot'
,
icon
=
'refresh'
,
effect
=
'warning'
)),
op
=
'reboot'
,
icon
=
'refresh'
,
effect
=
'warning'
)),
(
'reset'
,
VmOperationView
.
factory
(
(
'reset'
,
VmOperationView
.
factory
(
...
@@ -963,6 +961,10 @@ vm_ops = OrderedDict([
...
@@ -963,6 +961,10 @@ vm_ops = OrderedDict([
(
'password_reset'
,
VmOperationView
.
factory
(
(
'password_reset'
,
VmOperationView
.
factory
(
op
=
'password_reset'
,
icon
=
'unlock'
,
effect
=
'warning'
,
op
=
'password_reset'
,
icon
=
'unlock'
,
effect
=
'warning'
,
show_in_toolbar
=
False
,
wait_for_result
=
0.5
,
with_reload
=
True
)),
show_in_toolbar
=
False
,
wait_for_result
=
0.5
,
with_reload
=
True
)),
(
'mount_store'
,
VmOperationView
.
factory
(
op
=
'mount_store'
,
icon
=
'briefcase'
,
effect
=
'info'
,
show_in_toolbar
=
False
,
)),
])
])
...
...
circle/vm/operations.py
View file @
d148b808
...
@@ -928,8 +928,9 @@ class MountStoreOperation(InstanceOperation):
...
@@ -928,8 +928,9 @@ class MountStoreOperation(InstanceOperation):
id
=
'mount_store'
id
=
'mount_store'
name
=
_
(
"mount store"
)
name
=
_
(
"mount store"
)
description
=
_
(
description
=
_
(
"This operation exposes your personal files and your store"
"This operation attaches your personal file store. Other users who "
"credentials to other users of this virtual machine (if any)."
)
"has acces to this machine can see these files as well."
)
acl_level
=
"owner"
acl_level
=
"owner"
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