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
d66ecb5a
authored
Nov 11, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-349-fav-icon' into 'master'
Issue 349 fav icon See merge request !271
parents
a146d824
3c5ee93d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletions
+9
-1
circle/dashboard/static/dashboard/dashboard.js
+1
-1
circle/dashboard/templates/dashboard/vm-detail.html
+7
-0
circle/dashboard/views/vm.py
+1
-0
No files found.
circle/dashboard/static/dashboard/dashboard.js
View file @
d66ecb5a
...
...
@@ -132,7 +132,7 @@ $(function () {
$
(
'.js-hidden'
).
hide
();
/* favourite star */
$
(
"#dashboard-vm-list"
).
on
(
'click'
,
'.dashboard-vm-favourite'
,
function
(
e
)
{
$
(
"#dashboard-vm-list
, .page-header
"
).
on
(
'click'
,
'.dashboard-vm-favourite'
,
function
(
e
)
{
var
star
=
$
(
this
).
children
(
"i"
);
var
pk
=
$
(
this
).
data
(
"vm"
);
if
(
star
.
hasClass
(
"fa-star-o"
))
{
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
d66ecb5a
...
...
@@ -70,6 +70,13 @@
{{ instance.name }}
</div>
<small>
{{ instance.primary_host.get_fqdn }}
</small>
<small
class=
"dashboard-vm-favourite"
style=
"line-height: 39.6px;"
data-vm=
"{{ instance.pk }}"
>
{% if fav %}
<i
class=
"fa fa-star text-primary title-favourite"
title=
"{% trans "
Unfavourite
"
%}"
></i>
{% else %}
<i
class=
"fa fa-star-o text-primary title-favourite"
title=
"{% trans "
Mark
as
favorite
"
%}"
></i>
{% endif %}
</small>
</h1>
<div
style=
"clear: both;"
></div>
</div>
...
...
circle/dashboard/views/vm.py
View file @
d66ecb5a
...
...
@@ -115,6 +115,7 @@ class VmDetailView(GraphMixin, CheckedDetailView):
'op'
:
{
i
.
op
:
i
for
i
in
ops
},
'connect_commands'
:
user
.
profile
.
get_connect_commands
(
instance
),
'hide_tutorial'
:
hide_tutorial
,
'fav'
:
instance
.
favourite_set
.
filter
(
user
=
user
)
.
exists
(),
})
# activity data
...
...
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