From: Wolfram Schneider Date: Tue, 8 Apr 2014 10:36:29 +0000 (+0000) Subject: Merge remote branch 'origin/wosch' X-Git-Tag: 1.0.0~995 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=35693e489b648e8b13184d50946d345009a94322;hp=7de5147d6c9e5ea9029099af8865484fc8809afa;p=mkws-moved-to-github.git Merge remote branch 'origin/wosch' Conflicts: test/spec/mkws-pazpar2.js --- diff --git a/Makefile b/Makefile index b3e4fab..e37daa0 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ phantomjs: # must be called once after GIT checkout setup: #why? ${MAKE} -C./tools/htdocs mkws-js-min - ${MAKE} -C./examples/htdocs jasmine-links ${MAKE} -C./test node-modules check: setup check-js diff --git a/examples/htdocs/Makefile b/examples/htdocs/Makefile index 26bbafe..683cb0e 100644 --- a/examples/htdocs/Makefile +++ b/examples/htdocs/Makefile @@ -8,8 +8,6 @@ apache-config.txt: ../apache2/mkws-examples-mike chmod ugo-w $@ jasmine-links: - ln -fs ../jasmine . - ln -fs ../../test . help: @echo "make [ all | clean | jasmine-links ]" diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html index 8678a01..e7f42ad 100644 --- a/examples/htdocs/jasmine-local-popup.html +++ b/examples/htdocs/jasmine-local-popup.html @@ -6,13 +6,13 @@ - + - - - - - + + + + + @@ -40,6 +40,7 @@ var jasmine_config = { search_query: "netbsd", expected_hits: 10, + active_clients: 16, show_record_url: true }; diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html index f979e63..1ef798e 100644 --- a/examples/htdocs/jasmine-popup.html +++ b/examples/htdocs/jasmine-popup.html @@ -6,13 +6,13 @@ - + - - - - - + + + + + diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html index 4de368e..88ed19d 100644 --- a/examples/htdocs/jasmine.html +++ b/examples/htdocs/jasmine.html @@ -11,10 +11,10 @@ }; - - - - + + + +