mkws-moved-to-github.git
10 years agoMerge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 15 Apr 2014 15:56:54 +0000 (16:56 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

10 years agoAdd commented-out code for iterating over teams and widgets.
Mike Taylor [Tue, 15 Apr 2014 15:56:48 +0000 (16:56 +0100)]
Add commented-out code for iterating over teams and widgets.

10 years agoaddWidget registers its parameter w, not the function widget!
Mike Taylor [Tue, 15 Apr 2014 15:54:41 +0000 (16:54 +0100)]
addWidget registers its parameter w, not the function widget!

10 years agoAdd team.widgetTypes function, returns sorted list of contained types.
Mike Taylor [Tue, 15 Apr 2014 15:54:22 +0000 (16:54 +0100)]
Add team.widgetTypes function, returns sorted list of contained types.

10 years agoSpace.
Mike Taylor [Tue, 15 Apr 2014 15:34:29 +0000 (16:34 +0100)]
Space.

10 years agoRegister widgets added to each team.
Mike Taylor [Tue, 15 Apr 2014 15:26:37 +0000 (16:26 +0100)]
Register widgets added to each team.

10 years agoTeam now has has m_widgets hash, mapping type to widget object.
Mike Taylor [Tue, 15 Apr 2014 15:26:20 +0000 (16:26 +0100)]
Team now has has m_widgets hash, mapping type to widget object.
New method team.registerWidget adds a widget to the register.
New method team.widget returns the widget of a specified type,
or a count if there is more than one such widget.

10 years agofinish tools/htdocs -> src migration
Wolfram Schneider [Tue, 15 Apr 2014 15:26:18 +0000 (15:26 +0000)]
finish tools/htdocs -> src migration

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 15 Apr 2014 15:15:12 +0000 (15:15 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agodo not depend on local cached JS files
Wolfram Schneider [Tue, 15 Apr 2014 15:13:01 +0000 (15:13 +0000)]
do not depend on local cached JS files

All external JS files will be loaded from the original site(s). This
should make it possible to run /jasmine-popup.html after a
git checkout, without running gmake (on windows).

To use the cached JS files for developing, use
jasmine-local-popup.html instead.

10 years agoRemove stray tab.
Mike Taylor [Tue, 15 Apr 2014 11:47:56 +0000 (12:47 +0100)]
Remove stray tab.

10 years agoAdded "mike-test" target for PhantomJS invocation.
Mike Taylor [Tue, 15 Apr 2014 10:55:16 +0000 (11:55 +0100)]
Added "mike-test" target for PhantomJS invocation.

10 years agoFor my local examples site, add aliases for /tools/htdocs/, /src/,
Mike Taylor [Tue, 15 Apr 2014 10:50:17 +0000 (11:50 +0100)]
For my local examples site, add aliases for /tools/htdocs/, /src/,
/jasmine/ and /test/ -- ALL needed by jasmine-popup.html

10 years agode-couple phantomjs regression test from debian apache setup
Wolfram Schneider [Tue, 15 Apr 2014 10:46:48 +0000 (10:46 +0000)]
de-couple phantomjs regression test from debian apache setup

This make it easier to run the regressiont test on a mac
if you already have a mkws apache setup running.

10 years agorefactor
Wolfram Schneider [Tue, 15 Apr 2014 08:42:12 +0000 (08:42 +0000)]
refactor

smaller describe blocks

10 years agorun with standard SP MKWS test account
Wolfram Schneider [Mon, 14 Apr 2014 17:54:01 +0000 (17:54 +0000)]
run with standard SP MKWS test account

10 years agodisable MOTD tests, which fails in all non-popup pages, MKWS-147
Wolfram Schneider [Mon, 14 Apr 2014 17:46:14 +0000 (17:46 +0000)]
disable MOTD tests, which fails in all non-popup pages, MKWS-147

I think that it does not fail in /jasmine-popup.html is a mistake

10 years agoRemove the old 2013-06-24--todo file: everything we discussed and decided back then...
Mike Taylor [Mon, 14 Apr 2014 14:53:33 +0000 (15:53 +0100)]
Remove the old 2013-06-24--todo file: everything we discussed and decided back then has either been done, or we've decided to do something different

10 years agoUpdate MKAdmin instructions.
Mike Taylor [Mon, 14 Apr 2014 14:50:18 +0000 (15:50 +0100)]
Update MKAdmin instructions.

10 years agoNew
Mike Taylor [Mon, 14 Apr 2014 14:47:20 +0000 (15:47 +0100)]
New

10 years agoObsoelete
Mike Taylor [Mon, 14 Apr 2014 13:29:23 +0000 (14:29 +0100)]
Obsoelete

10 years agorun more code inside a local run() block
Wolfram Schneider [Mon, 14 Apr 2014 09:37:50 +0000 (09:37 +0000)]
run more code inside a local run() block

10 years agosplit the lage facet test in smaller pieces
Wolfram Schneider [Mon, 14 Apr 2014 09:34:07 +0000 (09:34 +0000)]
split the lage facet test in smaller pieces

10 years agofix source click tests
Wolfram Schneider [Sun, 13 Apr 2014 11:32:15 +0000 (11:32 +0000)]
fix source click tests

10 years agowait for source facets after author limit search
Wolfram Schneider [Sun, 13 Apr 2014 11:06:20 +0000 (11:06 +0000)]
wait for source facets after author limit search

10 years agoexpect at least one hit while waiting for less hits for an limit source search
Wolfram Schneider [Sat, 12 Apr 2014 16:40:21 +0000 (16:40 +0000)]
expect at least one hit while waiting for less hits for an limit source search

10 years agoexpect at least one hit while waiting for less hits for an limit author search
Wolfram Schneider [Sat, 12 Apr 2014 16:36:40 +0000 (16:36 +0000)]
expect at least one hit while waiting for less hits for an limit author search

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Sat, 12 Apr 2014 16:33:45 +0000 (16:33 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoDon't decorate teamless widget nodes with mkwsTeam_AUTO.
Mike Taylor [Fri, 11 Apr 2014 10:57:47 +0000 (11:57 +0100)]
Don't decorate teamless widget nodes with mkwsTeam_AUTO.

10 years agohandleNodeWithTeam now passes "AUTO" to the callback if the node in
Mike Taylor [Fri, 11 Apr 2014 10:57:22 +0000 (11:57 +0100)]
handleNodeWithTeam now passes "AUTO" to the callback if the node in
question has no team.

10 years agofindnode now creates crazy-wacky complicated jQuery selectors to find
Mike Taylor [Fri, 11 Apr 2014 10:56:20 +0000 (11:56 +0100)]
findnode now creates crazy-wacky complicated jQuery selectors to find
nodes that either belong to the specified team, or in the case that
the team is "AUTO", no team at all. This makes it possible for us to
avoid decorating nodes with mkwsTeam_AUTO classes.

Down the line, we should be able to make this cleaner by having each
class know what widgets it contains, so we don't need to do this
findnode magic -- ideally so we don't need findnode at all.

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Fri, 11 Apr 2014 10:34:17 +0000 (10:34 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoAdd style for mkwsSelected
Mike Taylor [Thu, 10 Apr 2014 12:24:29 +0000 (13:24 +0100)]
Add style for mkwsSelected

10 years agoCurrently selected page is marked by a <span class="mkwsSelected">
Mike Taylor [Thu, 10 Apr 2014 12:20:48 +0000 (13:20 +0100)]
Currently selected page is marked by a <span class="mkwsSelected">

10 years agoRemove unnecessary explicit bolding.
Mike Taylor [Thu, 10 Apr 2014 11:50:04 +0000 (12:50 +0100)]
Remove unnecessary explicit bolding.

10 years agoTweak
Mike Taylor [Thu, 10 Apr 2014 11:35:42 +0000 (12:35 +0100)]
Tweak

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Thu, 10 Apr 2014 09:55:04 +0000 (09:55 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoFirst complete draft.
Mike Taylor [Wed, 9 Apr 2014 16:19:30 +0000 (17:19 +0100)]
First complete draft.

10 years agoreShow() invokes resetPage()
Mike Taylor [Wed, 9 Apr 2014 16:17:14 +0000 (17:17 +0100)]
reShow() invokes resetPage()

10 years agoNo need to invoke resetPage() before reShow(), which will do it for us.
Mike Taylor [Wed, 9 Apr 2014 16:16:51 +0000 (17:16 +0100)]
No need to invoke resetPage() before reShow(), which will do it for us.

10 years agoReformat
Mike Taylor [Wed, 9 Apr 2014 15:21:24 +0000 (16:21 +0100)]
Reformat

10 years agoRolling
Mike Taylor [Wed, 9 Apr 2014 15:20:20 +0000 (16:20 +0100)]
Rolling

10 years agoAdd parameters to all team methods.
Mike Taylor [Wed, 9 Apr 2014 14:28:07 +0000 (15:28 +0100)]
Add parameters to all team methods.

10 years agoRolling
Mike Taylor [Wed, 9 Apr 2014 14:02:48 +0000 (15:02 +0100)]
Rolling

10 years agoAppend
Mike Taylor [Wed, 9 Apr 2014 12:49:08 +0000 (13:49 +0100)]
Append

10 years agoComment
Mike Taylor [Wed, 9 Apr 2014 12:28:32 +0000 (13:28 +0100)]
Comment

10 years agoComment
Mike Taylor [Wed, 9 Apr 2014 12:28:27 +0000 (13:28 +0100)]
Comment

10 years agoFirst bits of the developer guide.
Mike Taylor [Wed, 9 Apr 2014 12:23:12 +0000 (13:23 +0100)]
First bits of the developer guide.

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 9 Apr 2014 10:52:39 +0000 (10:52 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agologroate config
Wolfram Schneider [Wed, 9 Apr 2014 10:52:31 +0000 (10:52 +0000)]
logroate config

10 years agoclean
Wolfram Schneider [Wed, 9 Apr 2014 10:03:46 +0000 (10:03 +0000)]
clean

10 years agoAdd the "Done" widget.
Mike Taylor [Tue, 8 Apr 2014 16:09:33 +0000 (17:09 +0100)]
Add the "Done" widget.
Shows how applications can handle bugs MKWS-48 and MKWS-49.

10 years agoonStat publishes a "complete" event when the number of active clients
Mike Taylor [Tue, 8 Apr 2014 16:08:57 +0000 (17:08 +0100)]
onStat publishes a "complete" event when the number of active clients
falls to zero. This enables us to make a "search is complete" widget,
which fixes bugs MKWS-48 and MKWS-49.

10 years agoAdd mkwsDone widget.
Mike Taylor [Tue, 8 Apr 2014 16:07:02 +0000 (17:07 +0100)]
Add mkwsDone widget.
Use Wolfram's smaller, better, faster library.

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 15:47:56 +0000 (15:47 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoFix facet style on .mkwsFacet rather than their container .mkwsTermlists
Mike Taylor [Tue, 8 Apr 2014 15:45:32 +0000 (16:45 +0100)]
Fix facet style on .mkwsFacet rather than their container .mkwsTermlists

10 years agouse fork/exec() instead system, MKWS-157
Wolfram Schneider [Tue, 8 Apr 2014 15:40:45 +0000 (15:40 +0000)]
use fork/exec() instead system, MKWS-157

simplify alarm() handling

10 years agoNew layout with one facet separated from the others.
Mike Taylor [Tue, 8 Apr 2014 15:39:22 +0000 (16:39 +0100)]
New layout with one facet separated from the others.

10 years agogerman lang
Wolfram Schneider [Tue, 8 Apr 2014 12:04:51 +0000 (12:04 +0000)]
german lang

10 years agouse single component mkws-*.js files (was mkws.js)
Wolfram Schneider [Tue, 8 Apr 2014 12:01:52 +0000 (12:01 +0000)]
use single component mkws-*.js files (was mkws.js)

test with german lang, and with standard test account

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 11:56:53 +0000 (11:56 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoUse Douglas Crockford's mkws.objectInheritingFrom rather than the
Mike Taylor [Tue, 8 Apr 2014 11:48:12 +0000 (12:48 +0100)]
Use Douglas Crockford's mkws.objectInheritingFrom rather than the
built-in Object.create, which is not available in IE8.

10 years agoUse Douglas Crockford's mkws.objectInheritingFrom rather than the
Mike Taylor [Tue, 8 Apr 2014 11:48:02 +0000 (12:48 +0100)]
Use Douglas Crockford's mkws.objectInheritingFrom rather than the
built-in Object.create, which is not available in IE8.

10 years agoAdd mkws.objectInheritingFrom function, code is from Douglas
Mike Taylor [Tue, 8 Apr 2014 11:47:16 +0000 (12:47 +0100)]
Add mkws.objectInheritingFrom function, code is from Douglas
Crockford's article "Prototypal Inheritance in JavaScript":
http://javascript.crockford.com/prototypal.html
mkws.objectInheritingFrom behaves the same as Object.create, but since
the latter is not available in IE8 we can't use it.

Fixes bug MKWS-77 *again*.

10 years agosleep a little bit between sending signals to childs
Wolfram Schneider [Tue, 8 Apr 2014 11:34:26 +0000 (11:34 +0000)]
sleep a little bit between sending signals to childs

10 years agosince we have ./logs/.gitignore, we don't need a ./logs/.gitkeep file anymore
Wolfram Schneider [Tue, 8 Apr 2014 11:15:55 +0000 (11:15 +0000)]
since we have ./logs/.gitignore, we don't need a ./logs/.gitkeep file anymore

10 years agorun with 'phantomjs' tests
Wolfram Schneider [Tue, 8 Apr 2014 11:13:49 +0000 (11:13 +0000)]
run with 'phantomjs' tests

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 11:10:21 +0000 (11:10 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoget rid of the "apache2: Could not reliably determine the server's fully qualified...
Wolfram Schneider [Tue, 8 Apr 2014 11:10:02 +0000 (11:10 +0000)]
get rid of the "apache2: Could not reliably determine the server's fully qualified domain name, using 10.0.0.5 for ServerName" warning

10 years agoReinstate Alias /tools/htdocs/
Mike Taylor [Tue, 8 Apr 2014 11:06:57 +0000 (12:06 +0100)]
Reinstate Alias /tools/htdocs/
Point Alias /src/ to the src directory.

10 years agoMerge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 8 Apr 2014 11:05:34 +0000 (12:05 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

10 years agoGet mkws.css from /tools/htdocs/ after all, as /src/ is the source directory.
Mike Taylor [Tue, 8 Apr 2014 11:05:19 +0000 (12:05 +0100)]
Get mkws.css from /tools/htdocs/ after all, as /src/ is the source directory.

10 years agouse single component mkws-*.js files (was mkws.js)
Wolfram Schneider [Tue, 8 Apr 2014 11:00:36 +0000 (11:00 +0000)]
use single component mkws-*.js files (was mkws.js)

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 10:56:12 +0000 (10:56 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoMerge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 8 Apr 2014 10:55:38 +0000 (11:55 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

10 years agoGet mkws.css from /src/ rather than /tools/htdocs/.
Mike Taylor [Tue, 8 Apr 2014 10:55:05 +0000 (11:55 +0100)]
Get mkws.css from /src/ rather than /tools/htdocs/.
(Both were aliases to the same directory anyway.)

10 years agoinclude apache config files directly from /etc/apache2/mods-available
Wolfram Schneider [Tue, 8 Apr 2014 10:54:51 +0000 (10:54 +0000)]
include apache config files directly from /etc/apache2/mods-available

this is more robust for testing than using /etc/apache2/mods-enabled/
which may requires to run first: sudo a2enmod headers

10 years agoAlias /tools/htdocs/ replaced with Alias /src/
Mike Taylor [Tue, 8 Apr 2014 10:54:35 +0000 (11:54 +0100)]
Alias /tools/htdocs/ replaced with Alias /src/
I think this reflects changes in jasmine-popup.html

10 years agoMerge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Tue, 8 Apr 2014 10:53:13 +0000 (10:53 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

10 years agoNot needed now we have a .gitignore
Mike Taylor [Tue, 8 Apr 2014 10:51:35 +0000 (11:51 +0100)]
Not needed now we have a .gitignore

10 years agoNew
Mike Taylor [Tue, 8 Apr 2014 10:51:22 +0000 (11:51 +0100)]
New

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:46:44 +0000 (10:46 +0000)]
add new aliases /src /jasmine /test

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:44:35 +0000 (10:44 +0000)]
add new aliases /src /jasmine /test

10 years agoMerge remote branch 'origin/wosch'
Wolfram Schneider [Tue, 8 Apr 2014 10:36:29 +0000 (10:36 +0000)]
Merge remote branch 'origin/wosch'

Conflicts:
test/spec/mkws-pazpar2.js

10 years agoNew **make-default** rule: ../tools/htdocs/mkws.js
Mike Taylor [Tue, 8 Apr 2014 10:19:30 +0000 (11:19 +0100)]
New **make-default** rule: ../tools/htdocs/mkws.js

10 years agoMove saved_config code inside $(document).ready(function() {} block.
Mike Taylor [Tue, 8 Apr 2014 10:19:06 +0000 (11:19 +0100)]
Move saved_config code inside $(document).ready(function() {} block.
It DOES work there -- I don't know why I thought before it didn't.
(I was probably confused by the difficulty of dealing with a variable
that may or may not have been defined.)
Fixes bug MKWS-149.

10 years agoRevert jasmine-config.html to 4ded4703dd42e64d3e4bd253c1298c35dbb9da7f
Mike Taylor [Tue, 8 Apr 2014 10:15:57 +0000 (11:15 +0100)]
Revert jasmine-config.html to 4ded4703dd42e64d3e4bd253c1298c35dbb9da7f

10 years agoMove mkws_config setting up above inclusion of MKWS.
Mike Taylor [Tue, 8 Apr 2014 09:35:15 +0000 (10:35 +0100)]
Move mkws_config setting up above inclusion of MKWS.
Patches around MKWS-149 ("setting pazpar2_url no longer works")
But we want to reinstate the old behaviour, so this is not a fix.

10 years agomore facet sources fixes
Wolfram Schneider [Mon, 7 Apr 2014 18:43:36 +0000 (18:43 +0000)]
more facet sources fixes

10 years agofix totally broken facets
Wolfram Schneider [Mon, 7 Apr 2014 18:37:42 +0000 (18:37 +0000)]
fix totally broken facets

10 years agotest with /jasmine-local-popup.html by default
Wolfram Schneider [Mon, 7 Apr 2014 18:16:17 +0000 (18:16 +0000)]
test with /jasmine-local-popup.html by default

This should make it easier to detect if the MKWS / mkadmin setup is broken

10 years agocheck the exact number of active connections
Wolfram Schneider [Mon, 7 Apr 2014 18:14:41 +0000 (18:14 +0000)]
check the exact number of active connections

This should make it easier to detect if the MKWS / mkadmin setup is broken

10 years agoif the source click fails, skip all tests which test for a single active connection
Wolfram Schneider [Mon, 7 Apr 2014 18:03:27 +0000 (18:03 +0000)]
if the source click fails, skip all tests which test for a single active connection

10 years agoFix jQuery selectors for new, cleaner representation of facets.
Mike Taylor [Mon, 7 Apr 2014 16:27:18 +0000 (17:27 +0100)]
Fix jQuery selectors for new, cleaner representation of facets.
I may not have caught them all -- test doesn't run cleanly.

10 years agoMerge branch 'wosch' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch
Wolfram Schneider [Mon, 7 Apr 2014 16:15:46 +0000 (16:15 +0000)]
Merge branch 'wosch' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch

10 years agoadd new aliases /src /jasmine /test
Wolfram Schneider [Mon, 7 Apr 2014 16:12:11 +0000 (16:12 +0000)]
add new aliases /src /jasmine /test

10 years agoMerge remote branch 'origin/master' into wosch
Wolfram Schneider [Mon, 7 Apr 2014 16:04:18 +0000 (16:04 +0000)]
Merge remote branch 'origin/master' into wosch

10 years agoMake facetConfig local to the Facet widget.
Mike Taylor [Mon, 7 Apr 2014 15:59:48 +0000 (16:59 +0100)]
Make facetConfig local to the Facet widget.

10 years agoMove mkws.facetConfig down inside the Facet widget, the only one that uses it.
Mike Taylor [Mon, 7 Apr 2014 15:59:05 +0000 (16:59 +0100)]
Move mkws.facetConfig down inside the Facet widget, the only one that uses it.

10 years agoRemove unnecessary check on facetConfig for Termlists widget.
Mike Taylor [Mon, 7 Apr 2014 15:58:33 +0000 (16:58 +0100)]
Remove unnecessary check on facetConfig for Termlists widget.