Merge branch 'UI-fix' into 'master'

VM panel view fix

See merge request !2

circle/dashboard/templates/dashboard/index-vm.html

@@ -87,18 +87,21 @@
       </div>
     </div>
   </div>
+
   <div class="panel-body" id="vm-graph-view" style="display: none">
     <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 }}">
     </p>
     <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;">
-        {% for vm in running_vms %}
+        {% for vm in instances %}
+         {% if vm.status == "ACTIVE" %}
         <li style="display: inline-block; padding: 2px;">
-          <a href="{{vm.get_absolute_url}}" title="{{vm.primary_host.get_fqdn}}"  class="label label-success">
-            <i class="fa {{vm.get_status_icon}}"></i> {{vm.name}}
+          <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}}
           </a>
         </li>
+         {% endif %}
         {% endfor %}
       </ul>
 
@@ -117,4 +120,4 @@
       </p>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file