Mike Taylor [Thu, 3 Jul 2014 16:15:50 +0000 (17:15 +0100)]
Add SSL proxying support for sp-mkws.indexdata.com
Mike Taylor [Thu, 3 Jul 2014 16:15:26 +0000 (17:15 +0100)]
SSL version of MKWS Apache2 config now has mkws-git as a ServerAlias
rather then the old, misleadingly named mkws-dev (which isn't
supported at the back-end).
Mike Taylor [Thu, 3 Jul 2014 16:13:25 +0000 (17:13 +0100)]
Remove trailing whitespace.
Mike Taylor [Thu, 3 Jul 2014 11:16:10 +0000 (12:16 +0100)]
Remove arbitrary distclean rule.
Wolfram Schneider [Thu, 3 Jul 2014 10:47:35 +0000 (10:47 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Thu, 3 Jul 2014 10:44:57 +0000 (10:44 +0000)]
enable to set path of jasmine HTML page
e.g.:
APACHE_PORT=5050 DEBUG=0 make -s phantomjs PHANTOMJS_PATH=jasmine-pp2.html
Mike Taylor [Thu, 3 Jul 2014 10:35:32 +0000 (10:35 +0000)]
Add ServerAlias for sp-mkws.indexdata.com
Wolfram Schneider [Thu, 3 Jul 2014 10:12:28 +0000 (10:12 +0000)]
more cleanup
Wolfram Schneider [Thu, 3 Jul 2014 10:11:39 +0000 (10:11 +0000)]
cleanup
Wolfram Schneider [Thu, 3 Jul 2014 10:10:41 +0000 (10:10 +0000)]
import mkws test settings, used by jasmine-pp2.html
Mike Taylor [Wed, 2 Jul 2014 16:23:37 +0000 (17:23 +0100)]
Add commented-out non-proxied version of the SP auth URL.
This DOES NOT work: the error message in the JavaScript console is:
XMLHttpRequest cannot load http://sp-mkc-sansa.indexdata.com:8080/service-proxy/?command=auth&action=check,login&username=orex&password=orexmkc. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://x.example.indexdata.com' is therefore not allowed access.
I think this must be because of the mod_perl magic on
mkws.indexdata.com, which I'd all but forgotten about. From
mkws/tools/apache2/mkws-live:
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
<Location /service-proxy>
PerlOutputFilterHandler MyApache2::SetACAO
</Location>
Mike Taylor [Wed, 2 Jul 2014 16:11:08 +0000 (17:11 +0100)]
Explicit SP auth URL.
Mike Taylor [Wed, 2 Jul 2014 16:08:55 +0000 (17:08 +0100)]
Whitespace
Mike Taylor [Wed, 2 Jul 2014 15:00:11 +0000 (16:00 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Wed, 2 Jul 2014 14:37:45 +0000 (15:37 +0100)]
Comment on other SP URLs that go direct to sansa or arya
Wolfram Schneider [Wed, 2 Jul 2014 13:02:54 +0000 (13:02 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 13:00:33 +0000 (13:00 +0000)]
need to use mkws.$, not jQuery, part of mkws-226
this will fix the issue with the $.pazpar2() extention
Mike Taylor [Wed, 2 Jul 2014 11:49:38 +0000 (12:49 +0100)]
Major rewrite of library configuration text.
Mike Taylor [Wed, 2 Jul 2014 10:46:07 +0000 (11:46 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 09:14:37 +0000 (11:14 +0200)]
enable to run the tests on a different port.
APACHE_PORT=5000 make check
thats helpfull if the port is already blocked by some other users.
Wolfram Schneider [Wed, 2 Jul 2014 09:03:53 +0000 (09:03 +0000)]
using VPATH was a sweet idea, but it is to error-prone. Using direct path instead.
Wolfram Schneider [Wed, 2 Jul 2014 08:55:07 +0000 (08:55 +0000)]
Merge remote branch 'origin/MKWS-229'
Wolfram Schneider [Wed, 2 Jul 2014 08:49:06 +0000 (08:49 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 08:48:55 +0000 (08:48 +0000)]
make check should run the phantomjs tests as well, MKWS-233
Wolfram Schneider [Wed, 2 Jul 2014 08:47:26 +0000 (08:47 +0000)]
cleanup stale code
Mike Taylor [Tue, 1 Jul 2014 17:47:41 +0000 (18:47 +0100)]
Formatting
Mike Taylor [Tue, 1 Jul 2014 17:44:15 +0000 (18:44 +0100)]
New section (empty)
Mike Taylor [Tue, 1 Jul 2014 17:29:24 +0000 (18:29 +0100)]
Better description of setting SP auth URL.
Mike Taylor [Tue, 1 Jul 2014 15:47:52 +0000 (16:47 +0100)]
Update information on target selection within the library.
Mike Taylor [Fri, 27 Jun 2014 17:06:14 +0000 (18:06 +0100)]
use Orex library, no autosearch
Wolfram Schneider [Fri, 27 Jun 2014 15:04:54 +0000 (17:04 +0200)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
Mike Taylor [Fri, 27 Jun 2014 14:52:13 +0000 (15:52 +0100)]
Add new /service-proxy-orexauth rewrite-rule.
Wolfram Schneider [Fri, 27 Jun 2014 14:47:12 +0000 (16:47 +0200)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
Wolfram Schneider [Fri, 27 Jun 2014 14:46:55 +0000 (16:46 +0200)]
fix pathes for new mkws.js build process
Wolfram Schneider [Fri, 27 Jun 2014 14:32:52 +0000 (16:32 +0200)]
re-organize mkws.js build process, MKWS-229
Wolfram Schneider [Fri, 27 Jun 2014 14:31:19 +0000 (16:31 +0200)]
don't depend on /usr/bin/perl, use your default perl interpreter
Wolfram Schneider [Fri, 27 Jun 2014 14:31:06 +0000 (16:31 +0200)]
fix package usage
Wolfram Schneider [Fri, 27 Jun 2014 14:28:34 +0000 (16:28 +0200)]
finish debugging
Wolfram Schneider [Fri, 27 Jun 2014 14:09:37 +0000 (16:09 +0200)]
keep directoy ./src/releases in git
Wolfram Schneider [Fri, 27 Jun 2014 11:56:56 +0000 (13:56 +0200)]
remove comments
Wolfram Schneider [Fri, 27 Jun 2014 11:54:52 +0000 (13:54 +0200)]
make the package BSD::Resource optional
You should install the package on a server, but it does
not hurt if it is missing.
Mike Taylor [Fri, 27 Jun 2014 10:19:54 +0000 (10:19 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Mike Taylor [Fri, 27 Jun 2014 10:19:41 +0000 (10:19 +0000)]
Add aliases for /tools/htdocs/, /src/, /jasmine/ and /test/ to Apache2 configuration for example.indexdata.com. Allows example.indexdata.com/jasmine-popup.html to run successfully
Wolfram Schneider [Fri, 27 Jun 2014 09:43:09 +0000 (11:43 +0200)]
perl warnings
Wolfram Schneider [Fri, 27 Jun 2014 09:36:17 +0000 (11:36 +0200)]
set CPU limit, in case the alarm handler will be ignored, MKWS-157
Wolfram Schneider [Fri, 27 Jun 2014 09:33:01 +0000 (11:33 +0200)]
update debian package list
Mike Taylor [Fri, 27 Jun 2014 09:05:30 +0000 (10:05 +0100)]
Change use of maybe-defined "mkws_jQuery" to avoid assigning to an undefined variable.
Fixes the "make phantomjs" Jenkins error:
Strict mode forbids implicit creation of global property 'mkws_jQuery'
Note: not yet tested as part of installation (which we need so we can
check that Seb's widgets embedded in the blog still work). I am
pushing so that I can onto the live site and verify that. If there's a
problem there, I'll revert and try again.
Mike Taylor [Fri, 27 Jun 2014 09:00:33 +0000 (10:00 +0100)]
Ignore "logs/mkws-jasmine.pid", generated by tests.
Jason Skomorowski [Tue, 24 Jun 2014 16:17:20 +0000 (12:17 -0400)]
Need a proper test for undefined.
Jason Skomorowski [Tue, 24 Jun 2014 16:10:36 +0000 (12:10 -0400)]
Fix jQuery fix, $ gets clobbered by make even in single quotes.
Jason Skomorowski [Tue, 24 Jun 2014 15:36:32 +0000 (11:36 -0400)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Jason Skomorowski [Tue, 24 Jun 2014 15:35:14 +0000 (11:35 -0400)]
Isolate our version of jQuery in mkws-complete.js
Mike Taylor [Tue, 24 Jun 2014 10:16:16 +0000 (12:16 +0200)]
Add missing trailing semicolon after HTML entity.
Mike Taylor [Tue, 24 Jun 2014 10:15:45 +0000 (12:15 +0200)]
All "targets" settings now use pz:id= instead of pz:id~ (pattern matching)
All "targets" settings now have (incorrect, but working) trailing
slashes. Why is this? The Service-proxy has code that mangles ZURLs
for the use of the CF (adding rich-database-name parameters), and its
lax regular expression wrongly interprets the trailing ":3552" as a
port number. So it "fixes" this ZURL by appending a slash, and then
uses the fixed version of the URL as its unique ID. The result is that
even though the ZURL in the Torus record is
lui.indexdata.com:8080/solr4/select?fq=database:3552
the ID that it uses is
lui.indexdata.com:8080/solr4/select?fq=database:3552/
And indeed if I change the MKWS code to use this ID instead of the
correct one, it can be made to work.
These should soon be replaced by much less fragile UDB-based target
filtering.
Mike Taylor [Tue, 24 Jun 2014 07:25:46 +0000 (09:25 +0200)]
Change pz:id URLs to Harvester's new format.
Wolfram Schneider [Fri, 13 Jun 2014 13:17:48 +0000 (13:17 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Fri, 13 Jun 2014 13:17:38 +0000 (13:17 +0000)]
test the machine "sansa"
Wolfram Schneider [Fri, 13 Jun 2014 13:00:59 +0000 (13:00 +0000)]
display in the title list is a little thin for a lot of these resources, MKWS-205
Additional values to title* are: date, location, and medium
Mike Taylor [Thu, 12 Jun 2014 16:33:18 +0000 (17:33 +0100)]
Set window.name on creation of new tab.
Enables pz2.js to create tab-specific cookies.
Mike Taylor [Thu, 12 Jun 2014 12:02:42 +0000 (13:02 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Thu, 12 Jun 2014 12:02:37 +0000 (13:02 +0100)]
Attempt to inhibit the display of the sole facet's title.
(Not yet working -- don't know why not.)
Wolfram Schneider [Thu, 12 Jun 2014 09:42:09 +0000 (09:42 +0000)]
shorter text
Mike Taylor [Wed, 11 Jun 2014 15:32:14 +0000 (16:32 +0100)]
Add styles for mkwsFacet and contained items.
Not sure how these ever got missed out.
Wolfram Schneider [Wed, 11 Jun 2014 15:11:52 +0000 (15:11 +0000)]
check number of targets (again)
Wolfram Schneider [Wed, 11 Jun 2014 15:11:18 +0000 (15:11 +0000)]
use a our main service proxy with mkws test account
Mike Taylor [Wed, 11 Jun 2014 14:59:51 +0000 (15:59 +0100)]
Add logging.
Mike Taylor [Wed, 11 Jun 2014 14:33:52 +0000 (15:33 +0100)]
Add aliases to make Jasmine test run correctly without symlinks.
Mike Taylor [Wed, 11 Jun 2014 11:46:46 +0000 (12:46 +0100)]
Try to use CredoFacet template.
Wolfram Schneider [Wed, 11 Jun 2014 10:27:01 +0000 (10:27 +0000)]
a test for CORS
with JS/CSS from external sites, and standard SP config
Wolfram Schneider [Wed, 11 Jun 2014 10:23:02 +0000 (10:23 +0000)]
run everything locally, without x.mkws.indexdata.com host
this makes testing and development easier
Wolfram Schneider [Wed, 11 Jun 2014 09:40:07 +0000 (09:40 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 11 Jun 2014 09:36:20 +0000 (09:36 +0000)]
sync from jasmine-local-popup.html
Wolfram Schneider [Wed, 11 Jun 2014 07:52:24 +0000 (07:52 +0000)]
run SP on the host arya only
this makes debugging easier if we bypass the HA load balancer.
Mike Taylor [Tue, 10 Jun 2014 15:53:16 +0000 (16:53 +0100)]
Modified to be a recipient for mike.html's source-facet links.
Mike Taylor [Tue, 10 Jun 2014 15:52:36 +0000 (16:52 +0100)]
Add new mkwsTemplate_facet-Sources template.
Mike Taylor [Tue, 10 Jun 2014 15:47:29 +0000 (16:47 +0100)]
Rename the two "template" variables to t1 and t2.
t2 is now precomputed, rather than once each time through the loop.
Crucially, t2 now tries to load a field-specific facet template before
backing down to the generic one.
Mike Taylor [Tue, 10 Jun 2014 15:45:54 +0000 (16:45 +0100)]
loadTemplate returns null when defaultTemplate can't come up with
anything.
Mike Taylor [Tue, 10 Jun 2014 15:45:08 +0000 (16:45 +0100)]
mkws.defaultTemplate simply returns null when there is no template,
rather than throwing an error. This allows clever calling code to back
off along a sequence of attempted template names.
Mike Taylor [Tue, 10 Jun 2014 15:24:41 +0000 (16:24 +0100)]
Rename variable.
Mike Taylor [Tue, 10 Jun 2014 15:11:34 +0000 (16:11 +0100)]
Tweak Facet template not to generate an action when fn is undefined.
Mike Taylor [Tue, 10 Jun 2014 15:06:55 +0000 (16:06 +0100)]
Generate individual facets using a template rather than code.
Mike Taylor [Tue, 10 Jun 2014 15:05:38 +0000 (16:05 +0100)]
Add default template for facets.
Mike Taylor [Tue, 10 Jun 2014 14:31:12 +0000 (15:31 +0100)]
Facet value is directly included in action, rather than having it refer obliquely to this.firstChild.nodeValue.
Mike Taylor [Tue, 10 Jun 2014 12:37:17 +0000 (13:37 +0100)]
Radically simplify and generalise generation of facet HTML.
Preparation for moving the (much simpler) HTML-generation into a template.
Mike Taylor [Tue, 10 Jun 2014 12:02:22 +0000 (13:02 +0100)]
Invert logic.
Mike Taylor [Tue, 10 Jun 2014 11:57:26 +0000 (12:57 +0100)]
Omit no-longer-needed target_id from limitTarget links.
Mike Taylor [Tue, 10 Jun 2014 11:56:43 +0000 (12:56 +0100)]
mkws.limitTarget invocations use data[i].id directly, rather than by
click-time reference to this.getAttribute('target_id')
Mike Taylor [Tue, 10 Jun 2014 10:22:47 +0000 (11:22 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Tue, 10 Jun 2014 10:21:48 +0000 (11:21 +0100)]
Example of an active facet-heading.
Shows how to fix MKWS-214.
Mike Taylor [Tue, 10 Jun 2014 10:21:01 +0000 (11:21 +0100)]
Emit each facet's title using the template named facetTitle-NAME,
falling back to the old hardwired (maybe translated) caption in the
common case when there is no such template. The template is invoked on
a data object that at present contains only the current query. This
provides the means to fix MKWS-214.
Mike Taylor [Tue, 10 Jun 2014 10:19:38 +0000 (11:19 +0100)]
The loadTemplate function now takes an optional fallbackString
argument, to be used when there is no HTML definition of the template
(either in this team or in the global area), and the team has not
registered a template of this name. The fallback string is used ahead
of the global default.
Jason Skomorowski [Mon, 9 Jun 2014 16:29:43 +0000 (12:29 -0400)]
Flexible widths on images for credobootstrap
Jason Skomorowski [Mon, 9 Jun 2014 16:08:05 +0000 (12:08 -0400)]
Credo bootstrap wider with narrower images
Mike Taylor [Mon, 9 Jun 2014 15:50:40 +0000 (16:50 +0100)]
BS tweak as Suggested by Jason.
Mike Taylor [Mon, 9 Jun 2014 15:21:12 +0000 (16:21 +0100)]
Image-list has maxrecs=3
Mike Taylor [Mon, 9 Jun 2014 15:18:16 +0000 (16:18 +0100)]
More logging
Mike Taylor [Mon, 9 Jun 2014 15:10:23 +0000 (16:10 +0100)]
Image-count down to 3, as Bootstrap apparently can't display four
non-tiny images without non-trivial work.
Mike Taylor [Mon, 9 Jun 2014 15:05:40 +0000 (16:05 +0100)]
Use new google_images_js connector for images -- see CONN-270.
md-title is rendered without HTML quoting, so entites work.
Mike Taylor [Mon, 9 Jun 2014 14:57:05 +0000 (15:57 +0100)]
Use new google_images_js connector for images -- see CONN-270.
md-title is rendered without HTML quoting, so entites work.
Mike Taylor [Mon, 9 Jun 2014 14:36:19 +0000 (15:36 +0100)]
Restrict News/Articles/Books panes to 10 entries each.