Re: [Kimchi-devel] [PATCH 4/7] [WOK] Refactoring new-ui JS due to merge conflicts

FYI, manifest reference: https://developer.chrome.com/multidevice/android/installtohomescreen https://w3c.github.io/manifest/ Samuel -----Original Message----- From: kimchi-devel-bounces(a)ovirt.org [mailto:kimchi-devel-bounces@ovirt.org] On Behalf Of Samuel Henrique De Oliveira Guimaraes Sent: quarta-feira, 16 de setembro de 2015 13:22 To: Aline Manera <alinefm(a)linux.vnet.ibm.com>; sguimaraes943(a)gmail.com; Kimchi Devel <kimchi-devel(a)ovirt.org&gt; Subject: Re: [Kimchi-devel] [PATCH 4/7] [WOK] Refactoring new-ui JS due to merge conflicts The manifest.json file is necessary to add Chrome / Browser bookmark into application drawer in Android devices. I need to investigate if the json file has to be in the same folder as the images, otherwise we can move this json to a different folder.

Samuel -----Original Message----- From: kimchi-devel-bounces(a)ovirt.org [mailto:kimchi-devel-bounces@ovirt.org] On Behalf Of Aline Manera Sent: quarta-feira, 16 de setembro de 2015 13:03 To: sguimaraes943(a)gmail.com; Kimchi Devel <kimchi-devel(a)ovirt.org&gt; Subject: Re: [Kimchi-devel] [PATCH 4/7] [WOK] Refactoring new-ui JS due to merge conflicts On 15/09/2015 16:56, sguimaraes943(a)gmail.com wrote: > From: samhenri <samuel.guimaraes(a)eldorado.org.br&gt; > > Adding new-ui assets again due to merge conflicts. > > Signed-off-by: samhenri <samuel.guimaraes(a)eldorado.org.br&gt; > --- > ui/images/Makefile.am | 2 +- > ui/images/logo.ico | Bin 1214 -> 15086 bytes > ui/images/theme-default/Makefile.am | 2 +- > ui/images/theme-default/logo-white.png | Bin 9879 -> 7438 bytes > ui/js/src/wok.grid.js | 395 ++++++++------------------------- > ui/js/src/wok.line-chart.js | 70 +++--- > ui/js/src/wok.login.js | 3 + > ui/js/src/wok.main.js | 42 ++-- > ui/js/src/wok.message.js | 34 +-- > ui/js/src/wok.window.js | 31 ++- > ui/pages/login.html.tmpl | 155 ++++++++----- > ui/pages/wok-ui.html.tmpl | 136 +++++++----- > 12 files changed, 377 insertions(+), 493 deletions(-) > > diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am index > 297c0bd..6627b50 100644 > --- a/ui/images/Makefile.am > +++ b/ui/images/Makefile.am > @@ -19,4 +19,4 @@ SUBDIRS = theme-default > > imagedir = $(datadir)/wok/ui/images > > -dist_image_DATA = *.ico > +dist_image_DATA = *.png *.ico *.json The /ui/images dir should not contain .json files so there is no need to add them to build process. _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel