From: Mike Taylor <mike@indexdata.com>
Date: Tue, 8 Apr 2014 11:05:34 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~988
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=ee7ad50d2b733dbe4961e38a6022da2a34fd08d4;hp=68bfbd03cfa88311c514048362c6203de40394a8;p=mkws-moved-to-github.git

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

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index e7f42ad..33935d6 100644
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -11,7 +11,16 @@
     <script type="text/javascript" src="src/pz2.js"></script>
     <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/mkws.js"></script>
+    <!-- <script type="text/javascript" src="src/mkws.js"></script> -->
+    <script type="text/javascript" src="src/mkws-handlebars.js"></script>
+    <script type="text/javascript" src="src/mkws-core.js"></script>
+    <script type="text/javascript" src="src/mkws-team.js"></script>
+    <script type="text/javascript" src="src/mkws-widgets.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-log.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-record.js"></script>
+
     <script type="text/javascript" src="src/mkws-jquery.js"></script>
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 86c297a..d1f2279 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -13,19 +13,19 @@ Listen ${APACHE_PORT}
 
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
 
-Include /etc/apache2/mods-enabled/alias.load
-Include /etc/apache2/mods-enabled/authz*.load
-Include /etc/apache2/mods-enabled/proxy*.load
-Include /etc/apache2/mods-enabled/rewrite.load
-Include /etc/apache2/mods-enabled/headers.load
-Include /etc/apache2/mods-enabled/mime.load
-Include /etc/apache2/mods-enabled/deflate.load
-
-Include /etc/apache2/mods-enabled/alias*.conf
-Include /etc/apache2/mods-enabled/authz*.conf
-Include /etc/apache2/mods-enabled/proxy*.conf
-Include /etc/apache2/mods-enabled/mime.conf
-Include /etc/apache2/mods-enabled/deflate.conf
+Include /etc/apache2/mods-available/alias.load
+Include /etc/apache2/mods-available/authz*.load
+Include /etc/apache2/mods-available/proxy*.load
+Include /etc/apache2/mods-available/rewrite.load
+Include /etc/apache2/mods-available/headers.load
+Include /etc/apache2/mods-available/mime.load
+Include /etc/apache2/mods-available/deflate.load
+
+Include /etc/apache2/mods-available/alias*.conf
+Include /etc/apache2/mods-available/authz*.conf
+Include /etc/apache2/mods-available/proxy*.conf
+Include /etc/apache2/mods-available/mime.conf
+Include /etc/apache2/mods-available/deflate.conf
 
 # pazpar2 / service proxy config
 <VirtualHost *:${APACHE_PORT}>