projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 79ba978)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorJason Skomorowski <jason@indexdata.com>
Fri, 16 Jan 2015 17:36:06 +0000 (12:36 -0500)
committerJason Skomorowski <jason@indexdata.com>
Fri, 16 Jan 2015 17:36:06 +0000 (12:36 -0500)
15 files changed:
examples/apache2/mkws-examples-mike patch | blob | history
examples/apache2/mkws-examples-mike-mac patch | blob | history
examples/htdocs/heikki-motd.html patch | blob | history
examples/htdocs/heikki.html patch | blob | history
examples/htdocs/jasmine-local-popup.html patch | blob | history
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/jasmine-pp2.html patch | blob | history
examples/htdocs/jasmine.html patch | blob | history
examples/htdocs/mike.html patch | blob | history
examples/htdocs/mike2.html patch | blob | history
examples/htdocs/popup-dev.html patch | blob | history
examples/htdocs/wolfram.html patch | blob | history
examples/htdocs/wolfram2.html patch | blob | history
src/Makefile patch | blob | history
tools/apache2/mkws-mike-mac patch | blob | history

diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike
index 3f3885a..586b089 100644 (file)
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -1,11 +1,14 @@
 <VirtualHost *:80>
     ServerName x.example.indexdata.com
-    DocumentRoot /home/mike/git/work/mkws/examples/htdocs/
+    DocumentRoot /home/mike/git/work/demos/
     Alias /tools/htdocs/ /home/mike/git/work/mkws/tools/htdocs/
     Alias /src/ /home/mike/git/work/mkws/src/
     Alias /jasmine/ /home/mike/git/work/mkws/examples/jasmine/
     Alias /test/ /home/mike/git/work/mkws/test/
 
+    Alias /mkws-sandbox/ /home/mike/git/work/mkws/examples/htdocs/
+    Alias /metarepo/ /home/mike/git/work/metarepo/htdocs/
+
     <Directory />
         Allow from all
        Require all granted
diff --git a/examples/apache2/mkws-examples-mike-mac b/examples/apache2/mkws-examples-mike-mac
index 1f0ae6d..038c29d 100644 (file)
--- a/examples/apache2/mkws-examples-mike-mac
+++ b/examples/apache2/mkws-examples-mike-mac
@@ -7,14 +7,10 @@
     Alias /test/ /Users/mike/git/work/mkws/test/
 
     <Directory />
-        Allow from all
+        #Allow from all <-- This is for Apache v2.4, but for v4.4 we need ...
+       Require all granted
     </Directory>
 
     ErrorLog /var/log/apache2/mkws-examples-error.log
     CustomLog /var/log/apache2/mkws-examples-access.log combined
-
-    RewriteEngine on
-    RewriteRule      /service-proxy-auth/ http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
-    #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
-    #RewriteLogLevel 9
 </VirtualHost>
diff --git a/examples/htdocs/heikki-motd.html b/examples/htdocs/heikki-motd.html
index ee0461e..8608bc9 100644 (file)
--- a/examples/htdocs/heikki-motd.html
+++ b/examples/htdocs/heikki-motd.html
@@ -11,12 +11,12 @@
           //sort_default: "title:1",
       };
     </script>
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/mkws.js"></script>
 
     <style type="text/css">
       .mkws-facets div.facet {
diff --git a/examples/htdocs/heikki.html b/examples/htdocs/heikki.html
index 624b155..a7b6cdc 100644 (file)
--- a/examples/htdocs/heikki.html
+++ b/examples/htdocs/heikki.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Heikki's playground</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
          // pazpar2_url : "/service-proxy/",
@@ -15,12 +15,12 @@
          // service_proxy_auth : "/service-proxy-auth"
       };
     </script>
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/mkws.js"></script>
     <style type="text/css">
       .mkws-facets div.facet {
       float:left;
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 2561e83..4c7c5d3 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -4,30 +4,30 @@
     <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="/tools/htdocs/mkws.css" />
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
+    <script type="text/javascript" src="/src/mkws-popup.js"></script>
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index afd4722..0c15910 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -4,30 +4,30 @@
     <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="/tools/htdocs/mkws.css" />
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
+    <script type="text/javascript" src="/src/mkws-popup.js"></script>
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index 32a5a6f..68bdb43 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -4,30 +4,30 @@
     <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="/tools/htdocs/mkws.css" />
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
+    <script type="text/javascript" src="/src/mkws-popup.js"></script>
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index 86305c5..55427b8 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo jasmine test framework</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
 
     <script type="text/javascript">
       var mkws_config = {
@@ -11,7 +11,7 @@
       };
     </script>
 
-    <script type="text/javascript" src="tools/htdocs/mkws-complete.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/mkws-complete.min.js"></script>
 
   <!-- SECTION jasmine -->
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 81d9e1d..b3f1789 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -8,26 +8,26 @@
         sp_auth_credentials: "mkwstest/mkwstest"
       }
     </script>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog-DEV.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog-DEV.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
   </head>
   <body>
     <div class="mkws-auth-name"></div>
diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index 6137cf1..e4981c1 100644 (file)
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -7,26 +7,26 @@
         sp_auth_credentials: "mkwstest/mkwstest"
       }
     </script>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
   </head>
   <body>
     <div class="mkws-auth-name mkws-team-bar"></div>
diff --git a/examples/htdocs/popup-dev.html b/examples/htdocs/popup-dev.html
index 41971cd..46aab49 100644 (file)
--- a/examples/htdocs/popup-dev.html
+++ b/examples/htdocs/popup-dev.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Reference & Credo, and popup widget, development</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
     <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="mkws-widget-wikipedia.css" />
     <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
@@ -13,29 +13,29 @@
       };
     </script>
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.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-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.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-filter.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
+    <script type="text/javascript" src="/src/mkws-popup.js"></script>
 
     <script type="text/javascript" src="mkws-widget-credo.js"></script>
   </head>
diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index f222532..252834b 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Wolfram's playground</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
          show_perpage: false,
@@ -16,29 +16,29 @@
       };
     </script>
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jsnlog.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/jsnlog.min.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/handlebars-v2.0.0.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/pz2.js"></script>
 
-    <!-- <script type="text/javascript" src="tools/htdocs/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-filter.js"></script>
+    <!-- <script type="text/javascript" src="/tools/htdocs/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-filter.js"></script>
 
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-facets.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.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-widget-wikipedia.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-facets.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-categories.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-widget-wikipedia.js"></script>
+    <script type="text/javascript" src="/src/mkws-widget-builder.js"></script>
 
-    <script type="text/javascript" src="src/mkws-templates.js"></script>
+    <script type="text/javascript" src="/src/mkws-templates.js"></script>
 
   </head>
 
diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html
index ce86af3..e926079 100644 (file)
--- a/examples/htdocs/wolfram2.html
+++ b/examples/htdocs/wolfram2.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Wolfram's playground</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="/tools/htdocs/mkws.css" />
   </head>
 
   <!-- Test case: using mkws-complete.js and MKWS config in the body section -->
@@ -19,7 +19,7 @@
     <div class="mkws-stat"></div>
     <!-- <div class="mkws-builder"></div> -->
 
-    <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
+    <script type="text/javascript" src="/tools/htdocs/mkws-complete.js"></script>
     <script type="text/javascript">
       var mkws_config = {
        sp_auth_credentials: "mkwstest/mkwstest"
diff --git a/src/Makefile b/src/Makefile
index ed4a0c1..21a8c5a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -72,7 +72,7 @@ $(DEST)/${HANDLEBARS_FILE}:
 
 $(DEST)/${JQUERY_FILE}:
        curl -sSf ${JQUERY_URL} -o $@.tmp
-       perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@
+       perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp | sed 's@<input>@<input/>@' > $@
        rm -f $@.tmp
 
 $(DEST)/${JQUERY_JSON_FILE}:
diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index 7db0c62..21192c5 100644 (file)
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -10,17 +10,12 @@
     Alias /libjs-pz2/ /Users/mike/git/work/libjs-pz2/
     Alias /pazpar2/ /Users/mike/git/work/pazpar2/
 
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spclient-rewrite.log 
-    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
     # For MKC Service Proxy
     ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
 
     # Needed on Mac, which locks Apache down hard by default.
     <Directory />
-        Allow from all
+       Require all granted
     </Directory>
 </VirtualHost>
MasterKey Widget Set