Merge remote branch 'origin/MKWS-229'
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 2 Jul 2014 08:55:07 +0000 (08:55 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 2 Jul 2014 08:55:07 +0000 (08:55 +0000)
1  2 
Makefile
examples/htdocs/mike.html

diff --cc Makefile
Simple merge
@@@ -1,13 -1,17 +1,13 @@@
  <html>
    <head>
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 -    <title>MKWS demo: Reference Universe widget</title>
 +    <title>MKWS demo: Orex</title>
      <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
 -    <script type="text/javascript">
 -      var mkws_config = {
 -        service_proxy_auth: "//mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=mkwstest&password=mkwstest"
 -      };
 -    </script>
 +    <script type="text/javascript">var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };</script>
      <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.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/pz2.js"></script>
+     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+     <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.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>