projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6ae429d)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jan 2014 14:44:08 +0000 (14:44 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 27 Jan 2014 14:44:08 +0000 (14:44 +0000)
examples/apache2/mkws-examples-mike patch | blob | history
examples/htdocs/mike.html patch | blob | history
examples/htdocs/mike2.html patch | blob | history

diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike
index 9078c70..355226c 100644 (file)
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -6,7 +6,7 @@
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
     RewriteEngine on
-    RewriteRule      /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo [P]
+    RewriteRule      /service-proxy-auth/ http://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/mike.html b/examples/htdocs/mike.html
index faace6e..e503be0 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Mike's playground</title>
-    <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="http://x.mkws.indexdata.com/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
         service_proxy_auth: "http://x.example.indexdata.com/service-proxy-auth/",
@@ -17,37 +17,13 @@
     <script type="text/javascript" src="http://x.mkws.indexdata.com/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/pazpar2/js/pz2.js"></script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/mkws.js"></script>
-    <style type="text/css">
-      td { vertical-align: top }
-    </style>
   </head>
   <body>
-    <h1>A site about stuff</h1>
-    <table border="1" width="100%">
-      <tr>
-       <td width="33%">
-         <h2>Welcome</h2>
-         Main site content goes here.
-       </td>
-       <td width="33%">
-         <h2>Blog</h2>
-<div id='mkwsRecords'
-       autosearch='mike'
-       sort='relevance'
-       targets='pz:id~josiah.brown.edu:210/innopac'
->Brown results will appear here</div>
-         <div id='mkwsTermlists'/>
-       </td>
-       <td width="33%">
-         <h2>News</h2>
-<div id='mkwsRecords_MIT'
-       autosearch='fiona'
-       sort='title'
-       targets='pz:id~connect.indexdata.com:9000/mit_opencourseware'
->MIT results will appear here</div>
-         <div id='mkwsTermlists_MIT'/>
-       </td>
-      </tr>
-    </table>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsStat"></div>
   </body>
 </html>
diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index 5bf8aa1..0154b91 100644 (file)
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -3,7 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
     <title>MKWS demo: Mike's playground</title>
     <link rel="stylesheet" type="text/css" href="http://x.mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
MasterKey Widget Set