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
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
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.)
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
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
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
Mike Taylor [Tue, 8 Apr 2014 10:51:35 +0000 (11:51 +0100)]
Not needed now we have a .gitignore
Mike Taylor [Tue, 8 Apr 2014 10:51:22 +0000 (11:51 +0100)]
New
Wolfram Schneider [Tue, 8 Apr 2014 10:46:44 +0000 (10:46 +0000)]
add new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:44:35 +0000 (10:44 +0000)]
add new aliases /src /jasmine /test
Wolfram Schneider [Tue, 8 Apr 2014 10:36:29 +0000 (10:36 +0000)]
Merge remote branch 'origin/wosch'
Conflicts:
test/spec/mkws-pazpar2.js
Mike Taylor [Tue, 8 Apr 2014 10:19:30 +0000 (11:19 +0100)]
New **make-default** rule: ../tools/htdocs/mkws.js
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.
Mike Taylor [Tue, 8 Apr 2014 10:15:57 +0000 (11:15 +0100)]
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.
Wolfram Schneider [Mon, 7 Apr 2014 18:43:36 +0000 (18:43 +0000)]
more facet sources fixes
Wolfram Schneider [Mon, 7 Apr 2014 18:37:42 +0000 (18:37 +0000)]
fix totally broken facets
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
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
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
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.
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
Wolfram Schneider [Mon, 7 Apr 2014 16:12:11 +0000 (16:12 +0000)]
add new aliases /src /jasmine /test
Wolfram Schneider [Mon, 7 Apr 2014 16:04:18 +0000 (16:04 +0000)]
Merge remote branch 'origin/master' into wosch
Mike Taylor [Mon, 7 Apr 2014 15:59:48 +0000 (16:59 +0100)]
Make facetConfig local to the Facet widget.
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.
Mike Taylor [Mon, 7 Apr 2014 15:58:33 +0000 (16:58 +0100)]
Remove unnecessary check on facetConfig for Termlists widget.
Mike Taylor [Mon, 7 Apr 2014 15:58:03 +0000 (16:58 +0100)]
Move mkws.facetConfig into mkws-widget-termlists.js, the only place that needs it.
Mike Taylor [Mon, 7 Apr 2014 15:56:14 +0000 (16:56 +0100)]
Remove facetConfig, which is no longer needed here.
Mike Taylor [Mon, 7 Apr 2014 15:55:59 +0000 (16:55 +0100)]
Simplify generation of facet scaffolding.
No longer needs the use of mkws.facetConfig.
Mike Taylor [Mon, 7 Apr 2014 15:53:00 +0000 (16:53 +0100)]
Remove no-longer-needed kludgy mkwsFacetNAME elements from CSS classes.
Mike Taylor [Mon, 7 Apr 2014 15:52:06 +0000 (16:52 +0100)]
Each facet is now (finally!) its own widget.
Mike Taylor [Mon, 7 Apr 2014 15:51:30 +0000 (16:51 +0100)]
data-mkws-facet is now set of the index's name, not its caption.
Wolfram Schneider [Mon, 7 Apr 2014 15:48:24 +0000 (15:48 +0000)]
move ./bomb.pl script to ./bin sub-directory
Wolfram Schneider [Mon, 7 Apr 2014 15:48:05 +0000 (15:48 +0000)]
save
Wolfram Schneider [Mon, 7 Apr 2014 15:41:15 +0000 (15:41 +0000)]
./tmp is gone
Wolfram Schneider [Mon, 7 Apr 2014 15:40:42 +0000 (15:40 +0000)]
add ./logs directory to git
Wolfram Schneider [Mon, 7 Apr 2014 15:35:11 +0000 (15:35 +0000)]
new variable APACHE_HTTPD
Wolfram Schneider [Mon, 7 Apr 2014 15:31:16 +0000 (15:31 +0000)]
cleanup generated apache
Mike Taylor [Mon, 7 Apr 2014 15:26:07 +0000 (16:26 +0100)]
Add as-yet-unused data-mkws-facet attribute to mkwsFacet elements.
Wolfram Schneider [Mon, 7 Apr 2014 15:23:23 +0000 (15:23 +0000)]
use Alias instead symlinks
Wolfram Schneider [Mon, 7 Apr 2014 15:23:07 +0000 (15:23 +0000)]
jasmine-links is no longer needed
Wolfram Schneider [Mon, 7 Apr 2014 15:21:17 +0000 (15:21 +0000)]
some *.js files moved from tools/htdocs to ./src
Wolfram Schneider [Mon, 7 Apr 2014 15:19:23 +0000 (15:19 +0000)]
some *.js files moved from tools/htdocs to ./src
Wolfram Schneider [Mon, 7 Apr 2014 15:07:02 +0000 (15:07 +0000)]
silent apache-stop
Wolfram Schneider [Mon, 7 Apr 2014 15:05:40 +0000 (15:05 +0000)]
automatic start/stop for apache during phantomjs tests
Wolfram Schneider [Mon, 7 Apr 2014 14:52:41 +0000 (14:52 +0000)]
cleanup tmp dir
Wolfram Schneider [Mon, 7 Apr 2014 14:52:23 +0000 (14:52 +0000)]
generate apache config file for jasmine
Wolfram Schneider [Mon, 7 Apr 2014 14:51:51 +0000 (14:51 +0000)]
add modules and missing config options
Mike Taylor [Mon, 7 Apr 2014 14:15:14 +0000 (15:15 +0100)]
Reverse order of mkwsFacetXXX and mkwsFacet classes.
Wolfram Schneider [Mon, 7 Apr 2014 14:14:34 +0000 (14:14 +0000)]
change template language to standard apache
Wolfram Schneider [Mon, 7 Apr 2014 14:00:19 +0000 (14:00 +0000)]
add a temp dir
Wolfram Schneider [Mon, 7 Apr 2014 13:55:20 +0000 (13:55 +0000)]
convert to a real template
Wolfram Schneider [Mon, 7 Apr 2014 13:52:17 +0000 (13:52 +0000)]
copy of mkws-dev, MKWS-148
Mike Taylor [Mon, 7 Apr 2014 13:23:20 +0000 (14:23 +0100)]
Separate pub/sub event for each facet.
Took *a lot* of poxing about to fix the closure-variable error.
Mike Taylor [Mon, 7 Apr 2014 11:01:32 +0000 (12:01 +0100)]
Separate out callback for displaying termlists area and filling individual lists.
Mike Taylor [Mon, 7 Apr 2014 10:55:09 +0000 (11:55 +0100)]
Remove code to create termlist scaffolding: now in mkws-team.js
Mike Taylor [Mon, 7 Apr 2014 10:52:50 +0000 (11:52 +0100)]
Scaffolding for facets is put in place before widgets are created.
Mike Taylor [Fri, 4 Apr 2014 16:15:30 +0000 (17:15 +0100)]
Make findnode() visible as a team method.
Mike Taylor [Fri, 4 Apr 2014 16:07:33 +0000 (17:07 +0100)]
Put facetConfig into the mkws object.
Mike Taylor [Fri, 4 Apr 2014 16:00:50 +0000 (17:00 +0100)]
Scaffolding is now generated immediately, not when data arrives.
Mike Taylor [Fri, 4 Apr 2014 15:51:29 +0000 (16:51 +0100)]
Styles refer to .mkwsFacet rather than div.facet within .mkwsTermlists
Mike Taylor [Fri, 4 Apr 2014 15:49:44 +0000 (16:49 +0100)]
Remove unnecessary check.
Mike Taylor [Fri, 4 Apr 2014 15:40:11 +0000 (16:40 +0100)]
Rename variable.
Mike Taylor [Fri, 4 Apr 2014 15:39:46 +0000 (16:39 +0100)]
Remove obsolete logging.
Mike Taylor [Fri, 4 Apr 2014 15:31:48 +0000 (16:31 +0100)]
Merge the two consecutive facet-generation loops into one.
Throw away the accumulating-state hash.
Mike Taylor [Fri, 4 Apr 2014 15:30:04 +0000 (16:30 +0100)]
Reorder code to bring scaffold-generation together.
Mike Taylor [Fri, 4 Apr 2014 15:28:24 +0000 (16:28 +0100)]
Eliminate the addSingleScaffold function, inlining its code.
Mike Taylor [Fri, 4 Apr 2014 15:26:32 +0000 (16:26 +0100)]
Make addSingleScaffold private to the loop that uses it.
Mike Taylor [Fri, 4 Apr 2014 15:25:36 +0000 (16:25 +0100)]
Loop separately for addSingleScaffold and makeSingleFacet
Mike Taylor [Fri, 4 Apr 2014 15:20:29 +0000 (16:20 +0100)]
Remove unused arguments from addSingleScaffold and makeSingleFacet
Mike Taylor [Fri, 4 Apr 2014 15:17:49 +0000 (16:17 +0100)]
Revert author-facet title to "Authors", not "Author"
Makes the Jasmine-test work again.
Mike Taylor [Fri, 4 Apr 2014 15:16:02 +0000 (16:16 +0100)]
Break addSingleFacet into two functions, addSingleScaffold which adds
scaffolding to the main HTML, and makeSingleFacet which returns the
HTML of a specific facet.
Mike Taylor [Fri, 4 Apr 2014 15:12:07 +0000 (16:12 +0100)]
We now use a silly half-and-half scheme where an accumulator fills up
the scaffolding HTML while we also gather separately the HTML of each
individual facet. Working towards facet separation.
Mike Taylor [Fri, 4 Apr 2014 14:53:26 +0000 (15:53 +0100)]
Differences between various facets are now driven by a table rather
than hardwired switching.
Mike Taylor [Fri, 4 Apr 2014 14:29:49 +0000 (15:29 +0100)]
Emit "mkwsFacet" class rather than just "facet"
Not only is this cleaner, but it means each facet can be a widget.
Mike Taylor [Fri, 4 Apr 2014 13:42:38 +0000 (14:42 +0100)]
Remove pointless defensive test.
Mike Taylor [Fri, 4 Apr 2014 13:30:42 +0000 (14:30 +0100)]
New regular-ass body
Mike Taylor [Fri, 4 Apr 2014 13:17:26 +0000 (14:17 +0100)]
Comment out the SVG
Mike Taylor [Fri, 4 Apr 2014 13:13:28 +0000 (14:13 +0100)]
Add mkws-widget-termlists.js to COMPONENTS
Mike Taylor [Fri, 4 Apr 2014 13:07:40 +0000 (14:07 +0100)]
Move Termlists widget to its own file.
Mike Taylor [Fri, 4 Apr 2014 13:07:26 +0000 (14:07 +0100)]
New file mkws-widget-termlists.js
Contains the "Termlists" widget from mkws-widgets.js
Mike Taylor [Fri, 4 Apr 2014 13:05:04 +0000 (14:05 +0100)]
Remove mkws-widget-image.js from COMPONENTS>
Mike Taylor [Fri, 4 Apr 2014 13:04:48 +0000 (14:04 +0100)]
All code moved into mkws-widget-record.js
Mike Taylor [Fri, 4 Apr 2014 13:04:32 +0000 (14:04 +0100)]
Move all image-related widgets into mkws-widget-record.js
Mike Taylor [Fri, 4 Apr 2014 12:42:39 +0000 (13:42 +0100)]
Add some SVG. Just a placeholder till we're ready to generate our own.
Mike Taylor [Fri, 4 Apr 2014 11:23:51 +0000 (12:23 +0100)]
Use <div></div> instead of <div/>
For reasons that are TOTALLY opaque to me, the latter causes the other
MKWS divs to vanish when the cover-art appears. what is this i dont even
Mike Taylor [Fri, 4 Apr 2014 11:22:52 +0000 (12:22 +0100)]
Use Amazon cover-art widet.
Mike Taylor [Fri, 4 Apr 2014 11:22:13 +0000 (12:22 +0100)]
Add Amazon cover-art widget.
Mike Taylor [Thu, 3 Apr 2014 16:26:42 +0000 (17:26 +0100)]
Use the Lolcat widget.
Mike Taylor [Thu, 3 Apr 2014 16:26:26 +0000 (17:26 +0100)]
Add Lolcat subclass.
Mike Taylor [Thu, 3 Apr 2014 16:26:06 +0000 (17:26 +0100)]
All of the functionality of the autosearch function now happens on
the "ready" event. Previously, the initial checks of the query were
done when the widget was created, but that doesn't allow us to set the
query by default in a subclass promotion-function (as in fact we now
do with the Lolcat subclass).
Mike Taylor [Thu, 3 Apr 2014 16:20:25 +0000 (17:20 +0100)]
Search for "lolcat" instead of sauropod.
Mike Taylor [Thu, 3 Apr 2014 16:19:25 +0000 (17:19 +0100)]
Use "GoogleImage" subclass widget.
Mike Taylor [Thu, 3 Apr 2014 16:19:11 +0000 (17:19 +0100)]
Add "GoogleImage" subclass widget.
Mike Taylor [Thu, 3 Apr 2014 16:16:31 +0000 (17:16 +0100)]
Use "target" attribute instead of "targetfilter"
Mike Taylor [Thu, 3 Apr 2014 16:16:16 +0000 (17:16 +0100)]
Support "target" config element as a shortcut for UDB search using targetfilter.
Mike Taylor [Thu, 3 Apr 2014 16:12:06 +0000 (17:12 +0100)]
New
Mike Taylor [Thu, 3 Apr 2014 16:12:02 +0000 (17:12 +0100)]
Add mkws-widget-image.js to COMPONENTS
Mike Taylor [Thu, 3 Apr 2014 16:11:50 +0000 (17:11 +0100)]
Use new mkwsImage class.