projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: f3b0e5a)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 16 Oct 2014 13:44:08 +0000 (14:44 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 16 Oct 2014 13:44:08 +0000 (14:44 +0100)
examples/htdocs/popup-dev.html patch | blob | history
examples/htdocs/popup.html patch | blob | history
test/Makefile patch | blob | history

diff --git a/examples/htdocs/popup-dev.html b/examples/htdocs/popup-dev.html
index 9376d28..d48a23f 100644 (file)
--- a/examples/htdocs/popup-dev.html
+++ b/examples/htdocs/popup-dev.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: Reference widget with popup window</title>
+    <title>MKWS demo: Reference & Credo, and popup widget, development</title>
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <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="mkws-widget-reference.css" />
@@ -9,7 +9,7 @@
 
     <script type="text/javascript">
       var mkws_config = {
-         service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth"
+       sp_auth_credentials: "mkwstest/mkwstest"
       };
     </script>
 
@@ -24,7 +24,6 @@
     <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-popup.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>
@@ -34,11 +33,13 @@
     <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="src/mkws-templates.js"></script>
+    <script type="text/javascript" src="src/mkws-popup.js"></script>
 
     <script type="text/javascript" src="mkws-widget-credo.js"></script>
   </head>
   <body>
-    <h3>MKWS widgets in a popup window</h3>
+    <h3>MKWS demo: Reference & Credo, and popup widget, development</h3>
 
     <div class="mkwsSearch"></div>
     <div class="mkwsPopup" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html
index a44259a..a5cc9fb 100644 (file)
--- a/examples/htdocs/popup.html
+++ b/examples/htdocs/popup.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: Reference widget with popup window</title>
+    <title>MKWS demo: Reference & Credo, and popup widget</title>
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <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="//example.indexdata.com/mkws-widget-reference.css" />
@@ -9,26 +9,22 @@
 
     <script type="text/javascript">
       var mkws_config = {
-         service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth"
+       sp_auth_credentials: "mkwstest/mkwstest"
       };
     </script>
 
-    <!--
-    <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
-    <script>jQuery = mkws.$</script>
-    <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    -->
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//jquery-json.googlecode.com/files/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
     <script type="text/javascript" src="//git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD"></script>
     <script type="text/javascript" src="//builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v2.0.0.js"></script>
     <script type="text/javascript" src="//mkws.indexdata.com/mkws.js"></script>
-   
+
     <script type="text/javascript" src="//example.indexdata.com/mkws-widget-credo.js"></script>
   </head>
+
   <body>
-    <h3>MKWS widgets in a popup window</h3>
+    <h3>MKWS demo: Reference & Credo, and popup widget</h3>
 
     <div class="mkwsSearch"></div>
     <div class="mkwsPopup" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
diff --git a/test/Makefile b/test/Makefile
index e4606ba..c0333fa 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -125,6 +125,7 @@ help:
        @echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
        @echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
        @echo ""
+       @echo "make APACHE_PORT=5050 apache-start"
        @echo "make phantomjs-all"
        @echo ""
 
MasterKey Widget Set