projects / mkws-moved-to-github.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote branch 'origin/MKWS-229'
[mkws-moved-to-github.git] / examples / htdocs / jasmine-local-popup.html
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 9e9345e..8ef34d6 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -6,17 +6,17 @@
     <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" />
 
-    <script type="text/javascript" src="src/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="src/pz2.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/mkws.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/handlebars-v1.1.2.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-widgets.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-termlists.js"></script>
     <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
     <script type="text/javascript" src="src/mkws-widget-log.js"></script>
@@ -35,6 +35,10 @@
 
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
     <script type="text/javascript"> mkws_jasmine_init(500); </script>
+
+    <style type="text/css">
+      body > div > form > input.ui-state-default { background: none; }
+    </style>
   </head>
 
   <body>
@@ -50,7 +54,8 @@
     var jasmine_config = {
       search_query: "netbsd",
       expected_hits: 10,
-      // active_clients: 17,
+      active_clients: 13,
+      check_motd: false,
       show_record_url: true
     };
 
@@ -61,15 +66,8 @@
     });
     </script>
 
-    <pre>
-An embryonic MasterKey Widget Set
-=================================
-
-This directory contains an embryonic MasterKey Widget Set, based
-initially on "jsdemo" though now far removed from those beginnnings.
-[...]
-    </pre>
+<h2>MKWS Jasmine regression tests</h2>
+<p/>
 
-    <div id="testMOTD"><div class="mkwsMOTD">This is the mkwsMOTD div</div></div>
   </body>
 </html>
MasterKey Widget Set