From: Mike Taylor <mike@indexdata.com>
Date: Tue, 8 Apr 2014 10:55:38 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~990
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=4fe180e85171e520a37c3a78c60bf4a0343996f4;hp=0f08fec86e2a088587212039d590b1c3ad8fcf55;p=mkws-moved-to-github.git

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

diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike
index 355226c..7018172 100644
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName x.example.indexdata.com
     DocumentRoot /usr/local/src/git/mkws/examples/htdocs/
-    Alias /tools/htdocs/ /usr/local/src/git/mkws/tools/htdocs/
+    Alias /src/ /usr/local/src/git/mkws/tools/htdocs/
     ErrorLog /var/log/apache2/mkws-examples-error.log
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 1ef798e..1232712 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -4,7 +4,7 @@
     <title>MKWS demo: jQuery popup plugin with jasmine test framework</title>
 
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="src/mkws.css" />
 
     <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>