projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 5879554)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorJason Skomorowski <jason@indexdata.com>
Fri, 17 Oct 2014 14:44:01 +0000 (10:44 -0400)
committerJason Skomorowski <jason@indexdata.com>
Fri, 17 Oct 2014 14:44:01 +0000 (10:44 -0400)
examples/htdocs/mike2.html patch | blob | history
src/mkws-popup.js patch | blob | history

diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index 92bd0db..21d95f9 100644 (file)
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -4,10 +4,10 @@
     <title>MKWS demo</title>
     <script type="text/javascript">
       var mkws_config = {
-//        pp2_hostname: "x.sp-mkws.indexdata.com",
-      };
+        sp_auth_credentials: "mkwstest/mkwstest"
+      }
     </script>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/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/handlebars-v2.0.0.js"></script>
@@ -25,13 +25,17 @@
     <script type="text/javascript" src="src/mkws-widget-record.js"></script>
     <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
     <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-    <script type="text/javascript" src="mkws-widget-sru.js"></script>
+    <script type="text/javascript" src="src/mkws-templates.js"></script>
   </head>
   <body>
-    <h1>SRU example: dinosaurs at LoC</h1>
-    <div class="mkwsSRU" autosearch="dinosaur" maximumRecords="3" recordSchema="dc">Stand by ...</div>
-    <!- Use:
-http://z3950.loc.gov:7090/voyager?version=1.1&operation=searchRetrieve&query=dinosaur&maximumRecords=3&recordSchema=dc
-     -->
+    <div class="mkws-authname"></div>
+    <div class="mkws-switch"></div>
+    <div class="mkws-lang"></div>
+    <div class="mkws-progress"></div>
+    <div class="mkws-search"></div>
+    <div class="mkws-results"></div>
+    <div class="mkws-targets"></div>
+    <div class="mkws-stat"></div>
+    <div class="mkws-builder"></div>
   </body>
 </html>
diff --git a/src/mkws-popup.js b/src/mkws-popup.js
index bc54f3c..7496a07 100644 (file)
--- a/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@ -9,7 +9,7 @@ mkws.registerWidgetType('Popup', function() {
     var debug = mkws.log;
     debug("init popup window");
 
-    var popup_window = $(this.node); // mkws.registerWidgetType('Popup',....)
+    var popup_window = $(this.node);
     // var popup_window = $(".mkwsPopup"); // $(document).ready()
     if (!popup_window) {
         debug("no popup found, skip...");
MasterKey Widget Set