From: Mike Taylor <mike@indexdata.com>
Date: Thu, 22 Jan 2015 12:05:35 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=ccbd253959dcf1b49dc17ab22dafc602ad3a6250;hp=bf5ae80570f602e64dd7e3c903528efa70fd711c

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

diff --git a/src/templates/wikipedia.handlebars b/src/templates/wikipedia.handlebars
index 9447fb5..b2a92cb 100644
--- a/src/templates/wikipedia.handlebars
+++ b/src/templates/wikipedia.handlebars
@@ -5,7 +5,20 @@ sentences - number of sentences to include
 paragraphs - number of paragraphs to include
 md-* - metadata fields passed through from backend
 }}
-<img src="{{md-thumburl}}" alt="{{md-title}}">
+
+<!--
+display only the first image
+
+{{#if md-thumburl}}
+<img src="{{md-thumburl.[0]}}" alt="{{md-title}}">
+{{/if}}
+-->
+
+<!-- multiple images -->
+{{#each md-thumburl}}
+  <img src="{{this}}" alt="{{md-title}}">
+{{/each}}
+
 <h1><a href="{{md-electronic-url}}">{{md-title}}</a></h1>
 {{#if md-title-remainder}}
 <b>{{md-title-remainder}}</b>
diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 9b426fb..369dcf9 100644
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -19,6 +19,10 @@
     Alias /test /home/indexdata/mkws-dev/test
     Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
 
+    Alias /demos/src /home/indexdata/mkws-dev/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    Alias /demos /home/indexdata/demos
+
     # CORS setting
     Header set Access-Control-Allow-Credentials true
     Header set Access-Control-Allow-Origin "*"
diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 54813dd..23e744e 100644
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -18,6 +18,9 @@
     Alias /test /home/indexdata/mkws-test/test
     Alias /jasmine /home/indexdata/mkws-test/examples/jasmine
 
+    Alias /demos/src /home/indexdata/mkws-test/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+    Alias /demos /home/indexdata/demos
 
     # CORS setting
     Header set Access-Control-Allow-Credentials true
@@ -37,8 +40,10 @@
     RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=kohademo&password=kohademo [P]
     #RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P]
 
-    ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    ProxyPass        /service-proxy/ http://sp-mkws02.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws02.indexdata.com/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
     #ProxyPass        /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
     #ProxyPassReverse /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
     #ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/