From: Mike Taylor Date: Thu, 16 Oct 2014 13:44:08 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws X-Git-Tag: 1.0.0~178 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=1b1930f16512cb3718ad3fd84c1eb5e42d9f1488;hp=f3b0e5a1eaf5d1f1a58e48907b151cb469ff95c6 Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws --- diff --git a/examples/htdocs/popup-dev.html b/examples/htdocs/popup-dev.html index 9376d28..d48a23f 100644 --- a/examples/htdocs/popup-dev.html +++ b/examples/htdocs/popup-dev.html @@ -1,7 +1,7 @@ - MKWS demo: Reference widget with popup window + MKWS demo: Reference & Credo, and popup widget, development @@ -9,7 +9,7 @@ @@ -24,7 +24,6 @@ - @@ -34,11 +33,13 @@ + + -

MKWS widgets in a popup window

+

MKWS demo: Reference & Credo, and popup widget, development

diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html index a44259a..a5cc9fb 100644 --- a/examples/htdocs/popup.html +++ b/examples/htdocs/popup.html @@ -1,7 +1,7 @@ - MKWS demo: Reference widget with popup window + MKWS demo: Reference & Credo, and popup widget @@ -9,26 +9,22 @@ - - + + -

MKWS widgets in a popup window

+

MKWS demo: Reference & Credo, and popup widget

diff --git a/test/Makefile b/test/Makefile index e4606ba..c0333fa 100644 --- a/test/Makefile +++ b/test/Makefile @@ -125,6 +125,7 @@ help: @echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}" @echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}" @echo "" + @echo "make APACHE_PORT=5050 apache-start" @echo "make phantomjs-all" @echo ""