A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/prog2

You need to sign in or sign up before continuing.
Commit 4fd85e37 by Gabor Gutyan

VM panel view fix

Switching to VM Summary view the buttons for running instances erroneously directed to dashboard instead of vm-detail view. Also corrected status icon display on these buttons.
parent c6e0603f
...@@ -87,18 +87,21 @@ ...@@ -87,18 +87,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="panel-body" id="vm-graph-view" style="display: none"> <div class="panel-body" id="vm-graph-view" style="display: none">
<p class="pull-right"> <p class="pull-right">
<input class="knob" data-fgColor="chartreuse" data-thickness=".4" data-max="{{ max_instances }}" data-width="100" data-height="100" data-readOnly="true" value="{{ instances|length|add:more_instances }}"> <input class="knob" data-fgColor="chartreuse" data-thickness=".4" data-max="{{ max_instances }}" data-width="100" data-height="100" data-readOnly="true" value="{{ instances|length|add:more_instances }}">
</p> </p>
<span class="bigbig">{% blocktrans with count=running_vm_num %}<span class="big-tag">{{ count }}</span> running{% endblocktrans %}</span> <span class="bigbig">{% blocktrans with count=running_vm_num %}<span class="big-tag">{{ count }}</span> running{% endblocktrans %}</span>
<ul class="list-inline" style="max-height: 95px; overflow: hidden;"> <ul class="list-inline" style="max-height: 95px; overflow: hidden;">
{% for vm in running_vms %} {% for vm in instances %}
{% if vm.status == "ACTIVE" %}
<li style="display: inline-block; padding: 2px;"> <li style="display: inline-block; padding: 2px;">
<a href="{{vm.get_absolute_url}}" title="{{vm.primary_host.get_fqdn}}" class="label label-success"> <a href="{% url 'dashboard.views.detail' vm.id %}" title="{{ vm | get_status_display }}" class="label label-success">
<i class="fa {{vm.get_status_icon}}"></i> {{vm.name}} <i class="fa {{ vm | get_status_icon }}" ></i> {{vm.name}}
</a> </a>
</li> </li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
...@@ -117,4 +120,4 @@ ...@@ -117,4 +120,4 @@
</p> </p>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
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