From: Wolfram Schneider Date: Wed, 2 Jul 2014 08:55:07 +0000 (+0000) Subject: Merge remote branch 'origin/MKWS-229' X-Git-Tag: 1.0.0~458^2~4 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=792daf2373f2dd35eff60413d3cb7f5e5c1536b7;hp=-c;p=mkws-moved-to-github.git Merge remote branch 'origin/MKWS-229' --- 792daf2373f2dd35eff60413d3cb7f5e5c1536b7 diff --combined Makefile index 4bb0cc2,6d6441f..dcd5995 --- a/Makefile +++ b/Makefile @@@ -1,11 -1,11 +1,11 @@@ # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com all: - ${MAKE} -C./src $@ + ${MAKE} -C./tools/htdocs $@ ${MAKE} -C./doc $@ clean distclean: - ${MAKE} -C./src $@ + ${MAKE} -C./tools/htdocs $@ ${MAKE} -C./doc $@ ${MAKE} -C./examples/htdocs $@ ${MAKE} -C./test $@ @@@ -20,7 -20,9 +20,7 @@@ phantomjs p setup: ${MAKE} -C./test node-modules -check: setup check-js - @echo "" - @echo "To run jasmine regression tests, type: make phantomjs" +check: setup check-js phantomjs help: @echo "make [ all | setup | clean | distclean ]" diff --combined examples/htdocs/mike.html index ec52c16,0880126..1b71a49 --- a/examples/htdocs/mike.html +++ b/examples/htdocs/mike.html @@@ -1,13 -1,17 +1,13 @@@ - MKWS demo: Reference Universe widget + MKWS demo: Orex - + - - - + + + @@@ -28,9 -32,16 +28,9 @@@
-
+
- -