Inline the mkws_responsive_design() function, which is only used once.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 98ac5ee..099e67f 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -413,7 +413,7 @@ function switchView(view) {
     var results = document.getElementById('mkwsResults') ||
                  document.getElementById('mkwsRecords');
     var blanket = document.getElementById('mkwsBlanket');
-    var motd    = document.getElementById('mkwsEmbeddedMOTD');
+    var motd    = document.getElementById('mkwsMOTD');
 
     switch(view) {
         case 'targets':
@@ -585,12 +585,11 @@ function mkws_html_all(config) {
           <td width="250" valign="top">\
             <div id="mkwsTermlists"></div>\
           </td>\
-          <td valign="top">\
+          <td id="mkwsMOTDContainer" valign="top">\
             <div id="mkwsRanking"></div>\
             <div id="mkwsPager"></div>\
             <div id="mkwsNavi"></div>\
             <div id="mkwsRecords"></div>\
-            <div id="mkwsEmbeddedMOTD"></div>\
           </td>\
         </tr>\
       </table>');
@@ -615,37 +614,33 @@ function mkws_html_all(config) {
     if (mkws_config.use_service_proxy)
        mkws_service_proxy_auth(config.service_proxy_auth);
 
-    if (mkws_config.responsive_design)
-       mkws_responsive_design();
+    if (mkws_config.responsive_design) {
+       // Responsive web design - change layout on the fly based on
+       // current screen width. Required for mobile devices.
+       var timeout = null;
+       $(window).resize( function(e) {
+           if (timeout)
+               clearTimeout(timeout);
+           timeout = setTimeout(function () { mkws_mobile_resize() }, 50);
+       });
+
+       // initial check after page load
+       $(document).ready(function() { mkws_mobile_resize() });
+    }
 
     domReady();
 
     // on first page, hide the termlist
     $(document).ready(function() { $("#mkwsTermlists").hide(); } );
-    var elem = document.getElementById("mkwsMOTD");
-    if (elem) {
-       // Move the MOTD from the provided element down into the embedded one
-       document.getElementById("mkwsEmbeddedMOTD").innerHTML = elem.innerHTML;
-        elem.style.display = "none";
+    var motd = document.getElementById("mkwsMOTD");
+    var container = document.getElementById("mkwsMOTDContainer");
+    if (motd && container) {
+       // Move the MOTD from the provided element down into the container
+        motd.parentNode.removeChild(motd);
+       container.appendChild(motd);
     }
 }
 
-/* Responsive web design - change layout on the fly depending on
- * the current screen size width/height. Required for mobile devices.
- */
-function mkws_responsive_design () {
-    var timeout = null;
-
-    $(window).resize( function(e) {
-       if (timeout)
-           clearTimeout(timeout);
-       timeout = setTimeout(function () { mkws_mobile_resize() }, 50);
-    });
-
-    // initial check after page load
-    $(document).ready(function() { mkws_mobile_resize() });
-}
-
 function mkws_set_lang(mkws_config)  {
     var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
     if (!lang || !mkws_locale_lang[lang]) {