projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 053770d)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 27 Oct 2014 13:55:50 +0000 (13:55 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 27 Oct 2014 13:55:50 +0000 (13:55 +0000)
doc/mkws-manual.markdown patch | blob | history
examples/htdocs/jasmine-cors-popup.html patch | blob | history
examples/htdocs/jasmine-local-popup.html patch | blob | history
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/popup.html patch | blob | history

diff --git a/doc/mkws-manual.markdown b/doc/mkws-manual.markdown
index eebfd03..66a666b 100644 (file)
--- a/doc/mkws-manual.markdown
+++ b/doc/mkws-manual.markdown
@@ -849,7 +849,8 @@ popup_width     string  880                 Width of the popup window (if used),
 popup_height    string  760                 Height of the popup window (if used), in
                                             pixels.
 
-popup_button    string  `input.mkwsButton`  (Never change this.)
+popup_button    string  `input.mkwsButton`  A click on this selector will trigger the
+                                           popup to open
 
 popup_modal     string  0                   Modal confirmation mode. Valid values are 0 or 1
 
@@ -857,6 +858,8 @@ popup_autoOpen  string  1                   Open popup window on load. Valid val
 
 ----
 
+You can have more than one mkws-popup widgets on a page. Please use a different 
+popup_button value to address the right ones.
 
 The structure of the HTML generated by the MKWS widgets
 -------------------------------------------------------
diff --git a/examples/htdocs/jasmine-cors-popup.html b/examples/htdocs/jasmine-cors-popup.html
index 07b5d1d..03c1e79 100644 (file)
--- a/examples/htdocs/jasmine-cors-popup.html
+++ b/examples/htdocs/jasmine-cors-popup.html
@@ -54,8 +54,8 @@
     };
 
     var jasmine_config = {
-      search_query: "netbsd",
-      expected_hits: 10,
+      search_query: "freebsd",
+      expected_hits: 20,
       check_motd: false,
       show_record_url: true
     };
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index bba7056..6bc7355 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -55,8 +55,8 @@
     };
 
     var jasmine_config = {
-      search_query: "netbsd",
-      expected_hits: 10,
+      search_query: "freebsd",
+      expected_hits: 20,
       active_clients: 13,
       check_motd: false,
       check_sortby: true,
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 586b262..9c6eb86 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -57,8 +57,8 @@
     };
 
     var jasmine_config = {
-      search_query: "netbsd",
-      expected_hits: 10,
+      search_query: "freebsd",
+      expected_hits: 20,
       active_clients: 13,
       check_motd: false,
       show_record_url: true
diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html
index 1cfc66d..256d695 100644 (file)
--- a/examples/htdocs/popup.html
+++ b/examples/htdocs/popup.html
@@ -16,10 +16,20 @@
     <!-- jquery-ui need a reference to the internal jQuery object -->
     <script>$ = jQuery = mkws.$; </script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+
+    <style>
+    .mkws-search { float: left !important; }
+    .mkws-search input.mkws-button { color: black; }
+    </style>
   </head>
 
   <body>
-    <h3>MKWS demo: Popup Widget</h3>
+    <h3>MKWS demo: popup widget(s)</h3>
+
+    <div>
+      <p><a id="popup_no1">popup number 1</a></p>
+      <p><a id="popup_no2">popup number 2</a></p>
+    </div>
 
     <!-- search box is outside the popup window -->
     <div class="mkws-search"></div>
@@ -33,5 +43,16 @@
       <div class="mkws-stat"></div>
     </div>
 
+    <!-- popup widget config -->
+    <div class="mkws-popup" popup_width="500" popup_height="350" popup_modal="0" popup_autoOpen="0" popup_button="a#popup_no1">
+       <h1>popup no 1</h1>
+       some text...
+    </div>
+
+    <div class="mkws-popup" popup_width="400" popup_height="250" popup_modal="0" popup_autoOpen="0" popup_button="a#popup_no2">
+       <h1>popup no 2</h1>
+       other text...
+    </div>
+
   </body>
 </html>
MasterKey Widget Set