projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0c9d8d9 e01ba74)
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 patch | diff1 | diff2 | blob | history
examples/htdocs/mike.html patch | diff1 | diff2 | blob | history

diff --combined Makefile
index 4bb0cc2,6d6441f..dcd5995
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,11 +1,11 @@@
  # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
  
  all:
-       ${MAKE} -C./src $@
+       ${MAKE} -C./tools/htdocs $@
        ${MAKE} -C./doc $@
  
  clean distclean:
-       ${MAKE} -C./src $@
+       ${MAKE} -C./tools/htdocs $@
        ${MAKE} -C./doc $@
        ${MAKE} -C./examples/htdocs $@
        ${MAKE} -C./test $@
@@@ -20,7 -20,9 +20,7 @@@ phantomjs p
  setup:        
        ${MAKE} -C./test node-modules
  
 -check: setup check-js
 -      @echo ""
 -      @echo "To run jasmine regression tests, type: make phantomjs"
 +check: setup check-js phantomjs
  
  help:
        @echo "make [ all | setup | clean | distclean ]"
diff --combined examples/htdocs/mike.html
index ec52c16,0880126..1b71a49
--- 1/examples/htdocs/mike.html
--- 2/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@@ -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>
@@@ -28,9 -32,16 +28,9 @@@
      <div class="mkwsLang"></div>
      <div class="mkwsProgress"></div>
      <div class="mkwsSearch"></div>
 -    <div class="mkwsResults" autosearch="!param!q"></div>
 +    <div class="mkwsResults"></div>
      <div class="mkwsTargets"></div>
      <div class="mkwsStat"></div>
      <div class="mkwsBuilder"></div>
    </body>
 -  <script class="mkwsTemplate_facetTitle-Sources" type="text/x-handlebars-template">
 -    <a href="?q={{query}}">Targets</a>
 -  </script>
 -  <script class="mkwsTemplate_facet-Sources" type="text/x-handlebars-template">
 -    <a href="mike2.html?q={{query}}&t={{field}}">{{term}}</a>
 -    <span>{{count}}</span>
 -  </script>
  </html>
MasterKey Widget Set