Re: [Kimchi-devel] [PATCH][Kimchi] Fix minor issues in Kimchi UI: Template CPUs and Guest CPUs

Hi Rodrigo, I am not able to apply this patch on current master branch. Could you rebase and resend, please? Regards, Aline Manera On 03/03/2016 03:54 PM, Rodrigo Trujillo wrote: > This patch apply two fixes: > - display Templates number of cores (it was missing the number) > - change "Memory Used" by "Memory Utilization" > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; > --- > ui/pages/guest.html.tmpl | 2 +- > ui/pages/tabs/guests.html.tmpl | 2 +- > ui/pages/tabs/templates.html.tmpl | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl > index 4097a0c..15bac3e 100644 > --- a/ui/pages/guest.html.tmpl > +++ b/ui/pages/guest.html.tmpl > @@ -73,7 +73,7 @@ > <div class="progress-bar cpu-progress-bar"></div> > </div> > </span><!-- > - --><span class="item-hidden">$_("Processors > Used")</span><!-- > + --><span class="item-hidden">$_("Processors > Utilization")</span><!-- > --><span class='column-memory'> > <div class='percentage-label memory-percentage'></div> > <div class="progress"> > diff --git a/ui/pages/tabs/guests.html.tmpl > b/ui/pages/tabs/guests.html.tmpl > index 8bd815f..d1e9dc3 100644 > --- a/ui/pages/tabs/guests.html.tmpl > +++ b/ui/pages/tabs/guests.html.tmpl > @@ -69,7 +69,7 @@ > --><span class="column-name"><span>$_("Guest > Name ID")</span></span><!-- > --><span class="column-type"><span>$_("OS > Type")</span></span><!-- > --><span > class="column-vnc"><span>$_("VNC")</span></span><!-- > - --><span > class="column-processors"><span>$_("Processors Used")</span></span><!-- > + --><span > class="column-processors"><span>$_("Processors > Utilization")</span></span><!-- > --><span > class="column-memory"><span>$_("Memory Utilization")</span></span><!-- > --><span > class="column-storage"><span>$_("Storage I/O")</span></span><!-- > --><span > class="column-network"><span>$_("Network I/O")</span></span><!-- > diff --git a/ui/pages/tabs/templates.html.tmpl > b/ui/pages/tabs/templates.html.tmpl > index d62a8c3..7e92a37 100644 > --- a/ui/pages/tabs/templates.html.tmpl > +++ b/ui/pages/tabs/templates.html.tmpl > @@ -127,7 +127,7 @@ > --><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="{cpus}"><strong>{cpus}</strong> $_("cores")</span><!-- > + --><span class='column-processors cpus-filter' > val="{cpu_info.vcpus}"><strong>{cpu_info.vcpus}</strong> > $_("cores")</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="item-hidden column-memory > memory-filter">$_("Memory")</span> _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel