From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 7 Jul 2014 14:19:49 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~413
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=8fe63c71f79f1689f4fa61e6f4f2dcfa6dd2d7af;hp=19f0be5e676562eab1afd8441bf4c11d8d55d446;p=mkws-moved-to-github.git

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

diff --git a/test/Makefile b/test/Makefile
index 07c3d5b..ce5c954 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -107,8 +107,9 @@ help:
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
 	@echo "Examples"
-	@echo "                         make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
-	@echo "DEBUG=0 APACHE_PORT=5050 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
-	@echo "DEBUG=2                  make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
+	@echo ""
+	@echo "make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
+	@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
+	@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
 	@echo ""
 
diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 96380a7..e849dbf 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -600,13 +600,13 @@ describe("Check per page options", function () {
 
             $("div.mkwsRecords").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
                 waitcount++;
-                // debug("DOM wait for change, per page: " + waitcount);
+                debug("DOM wait for change, per page: " + waitcount);
             });
         });
 
         waitsFor(function () {
             //debug("wait for: " + waitcount);
-            return waitcount >= 6 ? true : false;
+            return waitcount >= 30 ? true : false;
         }, "Records DOM change, by per page", 3 * jasmine_config.second);
 
         runs(function () {
diff --git a/tools/htdocs/external/koha/Makefile b/tools/htdocs/external/koha/Makefile
index 7bfbbed..560545b 100644
--- a/tools/htdocs/external/koha/Makefile
+++ b/tools/htdocs/external/koha/Makefile
@@ -1,5 +1,9 @@
+# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+#
+# this makefile will generate CSS files for Koha MKWS widgets
+
 E_DIR=	../../../../examples/htdocs
-COMPONENTS = ${E_DIR}/mkws-widget-reference.css
+COMPONENTS = ${E_DIR}/mkws-widget-reference.css koha-mkws-widget-ru.css
 
 KOHA_CSS = koha-mkws.css 
 KOHA_COMPLETE_CSS = koha-mkws-complete.css 
@@ -9,10 +13,13 @@ all: ${KOHA_COMPLETE_CSS}
 clean:
 	rm -f ${KOHA_COMPLETE_CSS}
 
-${KOHA_COMPLETE_CSS}:
+${KOHA_COMPLETE_CSS}: ${COMPONENTS} ${KOHA_CSS}
 	cat ${COMPONENTS} ${KOHA_CSS} > $@.tmp
 	mv -f $@.tmp $@
 
 distclean: clean
 	rm -f *.orig *.bak *.rej
 
+help:
+	@echo "make [ all | clean ]"
+
diff --git a/tools/htdocs/external/koha/koha-mkws-complete.css b/tools/htdocs/external/koha/koha-mkws-complete.css
index 7daa169..d52efb3 100644
--- a/tools/htdocs/external/koha/koha-mkws-complete.css
+++ b/tools/htdocs/external/koha/koha-mkws-complete.css
@@ -32,6 +32,49 @@
     content: "Source: ";
     font-weight: bold;
 }
+/* original "ru" config
+.mkwsReferenceUniverse {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background: #FCFBFA; 
+  padding: 0.5em 1em 0.25em;
+  box-shadow: 0 0 2px 0 #7F8F93;
+  border-radius: 0 0 1.5em;
+  -moz-border-radius: 0 0 1.5em;
+  -webkit-border-radius: 0 0 1.5em;
+  line-height: 1.4;
+  color: #86979B;
+  background: radial-gradient(ellipse at center,  #ffffff 0%,#f8f8f8 100%);
+}
+*/
+
+.mkwsReferenceUniverse {
+  padding: 0.5em 1em 0.25em;
+}
+
+.mkwsReferenceUniverse h2 {
+  font-size: 100%;
+  color: #4A5456;
+  padding-bottom: .5em;
+}
+
+.mkwsReferenceUniverse ul {
+  margin: 0;
+  padding: 0;
+}
+
+.mkwsReferenceUniverse li {
+  margin: .95em .25em;
+  padding-top: .75em;
+  border-top: 1px dotted #BEC8CC;
+  font-size: 90%;
+  list-style: none;
+}
+
+.mkwsReferenceUniverse a {
+  text-decoration: none;
+  font-weight:bold;
+  color: #2B77AF;
+}
 /*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
  * Licence: GPL, http://www.indexdata.com/licences/gpl
  *