Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/test/Makefile b/test/Makefile
index 45c3422..77e1a6f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -103,5 +103,5 @@ help:
        @echo "     [ node-modules ]"
        @echo "     [ apache-stop apache-start ]"
        @echo ""
-       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"
+       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
 

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index a2e8129..924730b 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -19,6 +19,7 @@
     RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
     RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
     RewriteRule /service-proxy-credoauth  /service-proxy/?command=auth&action=login&username=credo&password=emu [P] # [NE,P]
+    RewriteRule /service-proxy-kohaauth  /service-proxy/?command=auth&action=check,login&username=mkwstest&password=mkwstest [P]
 
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal

diff --git a/tools/htdocs/external/koha/koha-mkws.css b/tools/htdocs/external/koha/koha-mkws.css
index efb3e69..1bf0118 100644 (file)
--- a/tools/htdocs/external/koha/koha-mkws.css
+++ b/tools/htdocs/external/koha/koha-mkws.css
@@ -16,7 +16,7 @@ form[name=mkwsSearchForm] > input[type=submit].mkwsButton {
 select.mkwsTeam_AUTO {
   width: 10em;
   font-size: 11px;
-  height: 20px;
+  height: 25px;
 }
 
 /* facet links */
@@ -105,4 +105,4 @@ input[type=submit].mkwsButton {
   background: #fff;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */