11:28 a.m.
v2:
Socorro Stoppler (1):
Fixed Memory and Max Memory values when adding a new Guest
Removed showing of max memory in guest and made guest and templates
display the same way for cpu/memory for consistency
ui/pages/guest-add.html.tmpl | 10 +++++-----
ui/pages/tabs/templates.html.tmpl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
--
1.9.1
v1:
Samuel Guimarães (1):
Fixed Memory and Max Memory values when adding a new Guest
ui/pages/guest-add.html.tmpl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--
1.9.3
11:28 a.m.
New subject: [PATCH v2] [Kimchi] Fix showing of memory/cpu for guest and templates
Fixed Memory and Max Memory values when adding a new Guest
Removed showing of max memory in guest and made guest and templates
display the same way for cpu/memory for consistency
Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com>
---
ui/pages/guest-add.html.tmpl | 10 +++++-----
ui/pages/tabs/templates.html.tmpl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl
index a531af2..640e731 100644
--- a/ui/pages/guest-add.html.tmpl
+++ b/ui/pages/guest-add.html.tmpl
@@ -59,12 +59,12 @@
<h3 class="iso-title
{os_distro}" title="{name}">{name}</h3>
<dl
class="iso-info">
<dt>{os_distro}</dt>
- <dd>$_("OS:
")</dd>
+
<dd>$_("OS")</dd>
<dt>{os_version}</dt>
- <dd>$_("Version:
")</dd>
- <dt>{cpus}</dt>
-
<dd>$_("CPUS")</dd>
-
<dt>{memory}M</dt>
+
<dd>$_("Version")</dd>
+ <dt>{cpu_info.vcpus}
Cores</dt>
+
<dd>$_("CPUs")</dd>
+ <dt>{memory.current}
M</dt>
<dd>$_("Memory")</dd>
</dl>
</span>
diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl
index 7e92a37..babaff2 100644
--- a/ui/pages/tabs/templates.html.tmpl
+++ b/ui/pages/tabs/templates.html.tmpl
@@ -127,9 +127,9 @@
--><span class="item-hidden column-type
os-type-filter">$_("OS")</span><!--
--><span class='column-version os-version-filter font-bold'
val="{os_version}">{os_version}</span><!--
--><span class="item-hidden column-version
os-version-filter">$_("Version")</span><!--
- --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}</strong>
$_("cores")</span><!--
+ --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}
$_("Cores")</strong></span><!--
--><span class="item-hidden column-processors
cpus-filter">$_("CPUs")</span><!--
- --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}</strong>
$_("M")</span><!--
+ --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}
$_("M")</strong></span><!--
--><span class="item-hidden column-memory
memory-filter">$_("Memory")</span>
</li>
</script>
--
1.9.1
6:51 a.m.
New subject: [PATCH v2] [Kimchi] Fix showing of memory/cpu for guest and templates
Reviewed by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
On 14-03-2016 13:28, Socorro Stoppler wrote:
Fixed Memory and Max Memory values when adding a new Guest
Removed showing of max memory in guest and made guest and templates
display the same way for cpu/memory for consistency
Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com>
---
ui/pages/guest-add.html.tmpl | 10 +++++-----
ui/pages/tabs/templates.html.tmpl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl
index a531af2..640e731 100644
--- a/ui/pages/guest-add.html.tmpl
+++ b/ui/pages/guest-add.html.tmpl
@@ -59,12 +59,12 @@
<h3 class="iso-title
{os_distro}" title="{name}">{name}</h3>
<dl
class="iso-info">
<dt>{os_distro}</dt>
- <dd>$_("OS:
")</dd>
+
<dd>$_("OS")</dd>
<dt>{os_version}</dt>
- <dd>$_("Version:
")</dd>
- <dt>{cpus}</dt>
-
<dd>$_("CPUS")</dd>
-
<dt>{memory}M</dt>
+
<dd>$_("Version")</dd>
+ <dt>{cpu_info.vcpus}
Cores</dt>
+
<dd>$_("CPUs")</dd>
+ <dt>{memory.current}
M</dt>
<dd>$_("Memory")</dd>
</dl>
</span>
diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl
index 7e92a37..babaff2 100644
--- a/ui/pages/tabs/templates.html.tmpl
+++ b/ui/pages/tabs/templates.html.tmpl
@@ -127,9 +127,9 @@
--><span class="item-hidden column-type
os-type-filter">$_("OS")</span><!--
--><span class='column-version os-version-filter font-bold'
val="{os_version}">{os_version}</span><!--
--><span class="item-hidden column-version
os-version-filter">$_("Version")</span><!--
- --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}</strong>
$_("cores")</span><!--
+ --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}
$_("Cores")</strong></span><!--
--><span class="item-hidden column-processors
cpus-filter">$_("CPUs")</span><!--
- --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}</strong>
$_("M")</span><!--
+ --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}
$_("M")</strong></span><!--
--><span class="item-hidden column-memory
memory-filter">$_("Memory")</span>
</li>
</script>
--
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM
8:55 a.m.
New subject: [PATCH v2] [Kimchi] Fix showing of memory/cpu for guest and templates
Tested-by: Paulo Vital <pvital(a)linux.vnet.ibm.com>
Reviewed-by: Paulo Vital <pvital(a)linux.vnet.ibm.com>
This patch fixes Issue #862
On 03/14/2016 01:28 PM, Socorro Stoppler wrote:
Fixed Memory and Max Memory values when adding a new Guest
Removed showing of max memory in guest and made guest and templates
display the same way for cpu/memory for consistency
Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com>
---
ui/pages/guest-add.html.tmpl | 10 +++++-----
ui/pages/tabs/templates.html.tmpl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl
index a531af2..640e731 100644
--- a/ui/pages/guest-add.html.tmpl
+++ b/ui/pages/guest-add.html.tmpl
@@ -59,12 +59,12 @@
<h3 class="iso-title
{os_distro}" title="{name}">{name}</h3>
<dl
class="iso-info">
<dt>{os_distro}</dt>
- <dd>$_("OS:
")</dd>
+
<dd>$_("OS")</dd>
<dt>{os_version}</dt>
- <dd>$_("Version:
")</dd>
- <dt>{cpus}</dt>
-
<dd>$_("CPUS")</dd>
-
<dt>{memory}M</dt>
+
<dd>$_("Version")</dd>
+ <dt>{cpu_info.vcpus}
Cores</dt>
+
<dd>$_("CPUs")</dd>
+ <dt>{memory.current}
M</dt>
<dd>$_("Memory")</dd>
</dl>
</span>
diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl
index 7e92a37..babaff2 100644
--- a/ui/pages/tabs/templates.html.tmpl
+++ b/ui/pages/tabs/templates.html.tmpl
@@ -127,9 +127,9 @@
--><span class="item-hidden column-type
os-type-filter">$_("OS")</span><!--
--><span class='column-version os-version-filter font-bold'
val="{os_version}">{os_version}</span><!--
--><span class="item-hidden column-version
os-version-filter">$_("Version")</span><!--
- --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}</strong>
$_("cores")</span><!--
+ --><span class='column-processors cpus-filter'
val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}
$_("Cores")</strong></span><!--
--><span class="item-hidden column-processors
cpus-filter">$_("CPUs")</span><!--
- --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}</strong>
$_("M")</span><!--
+ --><span class='column-memory memory-filter'
val="{memory.current}"><strong>{memory.current}
$_("M")</strong></span><!--
--><span class="item-hidden column-memory
memory-filter">$_("Memory")</span>
</li>
</script>
3178
days inactive
3180
days old
4 comments
4 participants
participants (4)
-
Aline Manera -
Jose Ricardo Ziviani -
Paulo Vital -
Socorro Stoppler