Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
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
dba6a664
authored
Mar 17, 2014
by
Kálmán Viktor
Committed by
Guba Sándor
Mar 18, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: disk list design
Conflicts: circle/dashboard/templates/dashboard/_disk-list-element.html
parent
9af39473
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
3 deletions
+18
-3
circle/dashboard/static/dashboard/dashboard.css
+9
-0
circle/dashboard/templates/dashboard/_disk-list-element.html
+2
-1
circle/dashboard/templates/dashboard/template-edit.html
+4
-1
circle/dashboard/templates/dashboard/vm-detail/resources.html
+3
-1
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
dba6a664
...
...
@@ -383,3 +383,12 @@ a.hover-black {
.vm-details-help
ul
{
padding-left
:
0px
;
}
.template-disk-list
{
list-style
:
none
;
padding-left
:
0
;
}
.template-disk-list
li
{
padding-bottom
:
5px
;
}
circle/dashboard/templates/dashboard/_disk-list-element.html
View file @
dba6a664
{% load i18n %}
{% load sizefieldtags %}
<i
class=
"{% if d.is_downloading %}icon-refresh icon-spin{% else %}icon-file{% endif %}"
></i>
<i
class=
"{% if d.is_downloading %}icon-refresh icon-spin{% else %}icon-file{%
if not d.ready %}"
style=
"color: #d9534f;{% endif %}{%
endif %}"
></i>
{{ d.name }} (#{{ d.id }}) -
{% if not d.is_downloading %}
{% if d.ready %}
...
...
@@ -14,4 +14,5 @@
data-disk-pk=
"{{ d.pk }}"
class=
"btn btn-xs btn-danger pull-right disk-remove"
>
<i
class=
"icon-remove"
></i>
{% if long_remove %} Remove{% endif %}
</a>
<div
class=
"btn btn-xs btn-danger pull-right"
><i
class=
"icon-remove"
></i>
{% if long_remove %} Remove{% endif %}
</div>
<div
style=
"clear: both;"
></div>
circle/dashboard/templates/dashboard/template-edit.html
View file @
dba6a664
...
...
@@ -72,7 +72,10 @@
<h4
class=
"no-margin"
><i
class=
"icon-file"
></i>
{% trans "Disk list" %}
</h4>
</div>
<div
class=
"panel-body"
>
<ul
style=
"list-style: none; padding-left: 0;"
>
<ul
class=
"template-disk-list"
>
{% if not disks %}
{% trans "No disks are added!" %}
{% endif %}
{% for d in disks %}
<li>
{% include "dashboard/_disk-list-element.html" %}
...
...
circle/dashboard/templates/dashboard/vm-detail/resources.html
View file @
dba6a664
...
...
@@ -60,7 +60,9 @@
{% endif %}
{% for d in instance.disks.all %}
<h4
class=
"list-group-item-heading dashboard-vm-details-network-h3"
>
{% include "dashboard/_disk-list-element.html" %}
{% with long_remove=True %}
{% include "dashboard/_disk-list-element.html" %}
{% endwith %}
</h4>
{% endfor %}
</div>
...
...
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