projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 82a9552)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 12:53:49 +0000 (12:53 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 12:53:49 +0000 (12:53 +0000)
examples/htdocs/mike.html patch | blob | history
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 84e17d6..1fc539b 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -19,12 +19,25 @@
     <script type="text/javascript" src="http://x.mkws.indexdata.com/mkws.js"></script>
   </head>
   <body>
-    <div class="mkwsSwitch"></div>
-    <div class="mkwsLang"></div>
-    <div class="mkwsSearch"></div>
-    <div class="mkwsSearch mkwsTeam_2"></div>
-    <div class="mkwsResults"></div>
-    <div class="mkwsTargets"></div>
-    <div class="mkwsStat"></div>
+    <table width="100%" border="1">
+      <tr>
+       <td valign="top" width="50%">
+         <div class="mkwsSwitch"></div>
+         <div class="mkwsLang"></div>
+         <div class="mkwsSearch"></div>
+         <div class="mkwsResults"></div>
+         <div class="mkwsTargets"></div>
+         <div class="mkwsStat"></div>
+       </td>
+       <td valign="top" width="50%">
+         <div class="mkwsSwitch mkwsTeam_2"></div>
+         <div class="mkwsLang mkwsTeam_2"></div>
+         <div class="mkwsSearch mkwsTeam_2"></div>
+         <div class="mkwsResults mkwsTeam_2"></div>
+         <div class="mkwsTargets mkwsTeam_2"></div>
+         <div class="mkwsStat mkwsTeam_2"></div>
+       </td>
+      </tr>
+    </table>
   </body>
 </html>
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 5548cef..6a39166 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -902,19 +902,19 @@ function team($, teamName) {
            $(".mkwsResults.mkwsTeam_" + m_teamName).html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
-    <td id="mkwsTermlistContainer1" class="mkwsTermlistContainer1 mkwsTeam_AUTO" width="250" valign="top">\
-      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_AUTO"></div>\
+    <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
+      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
     <td id="mkwsMOTDContainer" valign="top">\
-      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_AUTO"></div>\
-      <div id="mkwsPager" class="mkwsPager mkwsTeam_AUTO"></div>\
-      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_AUTO"></div>\
-      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_AUTO"></div>\
+      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsPager" class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
   <tr>\
     <td colspan="2">\
-      <div id="mkwsTermlistContainer2" class="mkwsTermlistContainer2 mkwsTeam_AUTO"></div>\
+      <div class="mkwsTermlistContainer2 mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
 </table>');
@@ -939,9 +939,9 @@ function team($, teamName) {
        if (mkws_config.responsive_design_width) {
            // Responsive web design - change layout on the fly based on
            // current screen width. Required for mobile devices.
-           $(window).resize(function(e) { mkws_resize_page() });
+           $(window).resize(function(e) { mkws.resize_page() });
            // initial check after page load
-           $(document).ready(function() { mkws_resize_page() });
+           $(document).ready(function() { mkws.resize_page() });
        }
 
        domReady();
@@ -1085,34 +1085,6 @@ function team($, teamName) {
     }
 
 
-    function mkws_resize_page () {
-       var list = ["mkwsSwitch"];
-
-       var width = mkws_config.responsive_design_width;
-       var parentId = $("#mkwsTermlists").parent().attr('id');
-
-       if ($(window).width() <= width &&
-           parentId === "mkwsTermlistContainer1") {
-           debug("changing from wide to narrow: " + $(window).width());
-           $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer2"));
-           $("#mkwsTermlistContainer1").hide();
-           $("#mkwsTermlistContainer2").show();
-           for(var i = 0; i < list.length; i++) {
-               $("#" + list[i]).hide(); // ### make team-aware
-           }
-       } else if ($(window).width() > width &&
-                  parentId === "mkwsTermlistContainer2") {
-           debug("changing from narrow to wide: " + $(window).width());
-           $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer1"));
-           $("#mkwsTermlistContainer1").show();
-           $("#mkwsTermlistContainer2").hide();
-           for(var i = 0; i < list.length; i++) {
-               $("#" + list[i]).show(); // ### make team-aware
-           }
-       }
-    };
-
-
     /* locale */
     function M(word) {
        var lang = mkws_config.lang;
@@ -1365,6 +1337,38 @@ function _mkws_jquery_plugin ($) {
     }
 
 
+    mkws.resize_page = function () {
+       var list = ["mkwsSwitch", "mkwsLang"];
+
+       var width = mkws_config.responsive_design_width;
+       var parent = $(".mkwsTermlists").parent();
+
+       if ($(window).width() <= width &&
+           parent.hasClass("mkwsTermlistContainer1")) {
+           log("changing from wide to narrow: " + $(window).width());
+           $(".mkwsTermlistContainer1").hide();
+           $(".mkwsTermlistContainer2").show();
+           for (var tname in mkws.teams) {
+               $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer2.mkwsTeam_" + tname));
+               for(var i = 0; i < list.length; i++) {
+                   $("." + list[i] + ".mkwsTeam_" + tname).hide();
+               }
+           }
+       } else if ($(window).width() > width &&
+                  parent.hasClass("mkwsTermlistContainer2")) {
+           log("changing from narrow to wide: " + $(window).width());
+           $(".mkwsTermlistContainer1").show();
+           $(".mkwsTermlistContainer2").hide();
+           for (var tname in mkws.teams) {
+               $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer1.mkwsTeam_" + tname));
+               for(var i = 0; i < list.length; i++) {
+                   $("." + list[i] + ".mkwsTeam_" + tname).show();
+               }
+           }
+       }
+    };
+
+
     mkws.showDetails = function (prefixRecId, tname) {
        mkws.teams[tname].showDetails(prefixRecId);
     }
MasterKey Widget Set