projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 62c0346)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 25 Jun 2013 13:19:55 +0000 (13:19 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 25 Jun 2013 13:19:55 +0000 (13:19 +0000)
etc/apache2/spclient-live patch | blob | history
experiments/spclient/.gitignore [new file with mode: 0644] patch | blob
experiments/spclient/index-somesite.html patch | blob | history
experiments/spclient/index2.html patch | blob | history

diff --git a/etc/apache2/spclient-live b/etc/apache2/spclient-live
index 59e5a2b..973df78 100644 (file)
--- a/etc/apache2/spclient-live
+++ b/etc/apache2/spclient-live
@@ -15,8 +15,10 @@
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
     RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+    RewriteRule /service-proxy/auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
 
     Header set Access-Control-Allow-Origin "http://somesite.indexdata.com"
+    Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
     ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
diff --git a/experiments/spclient/.gitignore b/experiments/spclient/.gitignore
new file mode 100644 (file)
index 0000000..a7392c7
--- /dev/null
+++ b/experiments/spclient/.gitignore
@@ -0,0 +1 @@
+mkws-complete.js
diff --git a/experiments/spclient/index-somesite.html b/experiments/spclient/index-somesite.html
index 7f495d7..f383292 100644 (file)
--- a/experiments/spclient/index-somesite.html
+++ b/experiments/spclient/index-somesite.html
@@ -4,21 +4,19 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo client</title>
-    <!-- Next four lines required by MKWS -->
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <link rel="stylesheet" href="mkwsStyle.css" />
     <script type="text/javascript">
       var mkws_config = { 
+      use_service_proxy: true,
       service_proxy_url: "http://mkws.indexdata.com/service-proxy/",
-      service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+      service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=guest&password=guest",
       }; 
     </script>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws.js"></script>
+    <script type="text/javascript" src="mkws-complete.js"></script>
   </head>
   <body>
-    <!-- These five <div>s are provided by MKWS -->
     <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
     <div id="mkwsSearch"></div>
     <div id="mkwsRecords"></div>
     <div id="mkwsTargets"></div>
diff --git a/experiments/spclient/index2.html b/experiments/spclient/index2.html
index f172e10..324001a 100644 (file)
--- a/experiments/spclient/index2.html
+++ b/experiments/spclient/index2.html
@@ -6,7 +6,7 @@
     <script type="text/javascript" src="mkws-complete.js"></script>
   </head>
   <body>
-    <div id="mkwsSwitch"></div> <!-- These five <div>s are provided by MKWS -->
+    <div id="mkwsSwitch"></div>
     <div id="mkwsLang"></div>
     <div id="mkwsSearch"></div>
     <div id="mkwsRecords"></div>
MasterKey Widget Set