Commit dba6a664 by Kálmán Viktor Committed by Guba Sándor

dashboard: disk list design

Conflicts:

	circle/dashboard/templates/dashboard/_disk-list-element.html
parent 9af39473
...@@ -383,3 +383,12 @@ a.hover-black { ...@@ -383,3 +383,12 @@ a.hover-black {
.vm-details-help ul { .vm-details-help ul {
padding-left: 0px; padding-left: 0px;
} }
.template-disk-list {
list-style: none;
padding-left: 0;
}
.template-disk-list li {
padding-bottom: 5px;
}
{% load i18n %} {% load i18n %}
{% load sizefieldtags %} {% 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 }}) - {{ d.name }} (#{{ d.id }}) -
{% if not d.is_downloading %} {% if not d.is_downloading %}
{% if d.ready %} {% if d.ready %}
...@@ -14,4 +14,5 @@ ...@@ -14,4 +14,5 @@
data-disk-pk="{{ d.pk }}" class="btn btn-xs btn-danger pull-right disk-remove"> 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 %} <i class="icon-remove"></i>{% if long_remove %} Remove{% endif %}
</a> </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> <div style="clear: both;"></div>
...@@ -72,7 +72,10 @@ ...@@ -72,7 +72,10 @@
<h4 class="no-margin"><i class="icon-file"></i> {% trans "Disk list" %}</h4> <h4 class="no-margin"><i class="icon-file"></i> {% trans "Disk list" %}</h4>
</div> </div>
<div class="panel-body"> <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 %} {% for d in disks %}
<li> <li>
{% include "dashboard/_disk-list-element.html" %} {% include "dashboard/_disk-list-element.html" %}
......
...@@ -60,7 +60,9 @@ ...@@ -60,7 +60,9 @@
{% endif %} {% endif %}
{% for d in instance.disks.all %} {% for d in instance.disks.all %}
<h4 class="list-group-item-heading dashboard-vm-details-network-h3"> <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> </h4>
{% endfor %} {% endfor %}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment