On 15/09/2015 16:56, sguimaraes943@gmail.com wrote:
From: samhenri <samuel.guimaraes@eldorado.org.br>
Adding new-ui assets again due to merge conflicts.
Signed-off-by: samhenri <samuel.guimaraes@eldorado.org.br> --- 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.