From b98084b7ee00a6aa22c5324f96fbc7e75d9fa369 Mon Sep 17 00:00:00 2001
From: Retspen <anatoliy.guskov@gmail.com>
Date: Fri, 13 Mar 2015 17:30:09 +0200
Subject: [PATCH] Day is over

---
 static/css/webvirtcloud.css |  4 ++++
 templates/instance.html     | 39 +++++++++++++++++--------------------
 vrtManager/instance.py      |  3 ++-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/static/css/webvirtcloud.css b/static/css/webvirtcloud.css
index 7679d8c..a3cb74e 100644
--- a/static/css/webvirtcloud.css
+++ b/static/css/webvirtcloud.css
@@ -10,6 +10,10 @@ body {
     background-color: #FFF;
 }
 
+#max-width-page {
+    max-width: 768px;
+}
+
 .side-nav {
     background-color: #FFF;
     font-size: 1.2em;
diff --git a/templates/instance.html b/templates/instance.html
index 5ffbdb0..7c135c4 100644
--- a/templates/instance.html
+++ b/templates/instance.html
@@ -12,31 +12,28 @@
 
                 {% include 'errors_block.html' %}
 
-                <div class="row">
+                <div class="row" id="max-width-page">
                     <div class="col-lg-12">
 
-                                    Status:
-                                    {% ifequal status 5 %}
-                                       <span class="text-danger">{% trans "Off" %}</span>
-                                    {% endifequal %}
-                                    {% ifequal status 1 %}
-                                        <span class="text-success">{% trans "Active" %}</span>
-                                    {% endifequal %}
-                                    {% ifequal status 3 %}
-                                        <span class="text-warning">{% trans "Suspend" %}</span>
-                                    {% endifequal %}
+                            {% ifequal status 5 %}
+                               <span class="text-danger">{% trans "Off" %}</span>
+                            {% endifequal %}
+                            {% ifequal status 1 %}
+                                <span class="text-success">{% trans "Active" %}</span>
+                            {% endifequal %}
+                            {% ifequal status 3 %}
+                                <span class="text-warning">{% trans "Suspend" %}</span>
+                            {% endifequal %}
 
-                            Vcpu: {% if cur_vcpu %}{{ cur_vcpu }}{% else %}{{ vcpu }}{% endif %}
-                           Ram: {{ cur_memory }}{% trans "MB" %}
-                            {% ifnotequal description 'None' %}
-                                {{ description }}
-                            {% endifnotequal %}
+                            {% if cur_vcpu %}{{ cur_vcpu }}{% else %}{{ vcpu }}{% endif %} {% trans "Vcpu" %}
+                            {{ cur_memory }}{% trans "MB" %} {% trans "Ram" %}
+                            {% for disk in disks %}
+                                {{ disk.size|filesizeformat }} {% trans "Disk" %}
+                            {% endfor %}
+
+                            {{ description }}
+                    <hr>
 
-                    </div>
-                </div>
-                <hr>
-                <div class="row">
-                    <div class="col-lg-12">
                         <div role="tabpanel">
                             <!-- Nav tabs -->
                             <ul class="nav nav-pills" role="tablist">
diff --git a/vrtManager/instance.py b/vrtManager/instance.py
index 814eb92..b1b3369 100644
--- a/vrtManager/instance.py
+++ b/vrtManager/instance.py
@@ -205,6 +205,7 @@ class wvmInstance(wvmConnect):
                         try:
                             vol = self.get_volume_by_path(src_fl)
                             volume = vol.name()
+                            disk_size = vol.info()[1]
                             stg = vol.storagePoolLookupByVolume()
                             storage = stg.name()
                         except libvirtError:
@@ -213,7 +214,7 @@ class wvmInstance(wvmConnect):
                         pass
                     finally:
                         result.append(
-                            {'dev': dev, 'image': volume, 'storage': storage, 'path': src_fl, 'format': disk_format})
+                            {'dev': dev, 'image': volume, 'storage': storage, 'path': src_fl, 'format': disk_format, 'size': disk_size})
             return result
 
         return util.get_xml_path(self._XMLDesc(0), func=disks)