From: Heikki Levanto Date: Fri, 28 Feb 2014 12:50:19 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~1384 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=098b75175b5a1e665a3c11f8e09b49169a8ddeb5;hp=fef3c34f0323a85e46f5e752714ff1514f45bef5 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/examples/htdocs/heikki-motd.html b/examples/htdocs/heikki-motd.html index 68b4b5c..feb2aae 100644 --- a/examples/htdocs/heikki-motd.html +++ b/examples/htdocs/heikki-motd.html @@ -2,12 +2,38 @@ Heikkis MOTD test - - + + + + + + + + + +

Heikkis test for the MOTD

This is the MOTD div

This is the mkwsMOTD div

+
The MOTD should not be visible above this line.

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index a15324b..1292b5f 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -998,7 +998,7 @@ function team($, teamName) { // on first page, hide the termlist $(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); }); var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName); - var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName); + var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName); if (motd.length && container.length) { // Move the MOTD from the provided element down into the container motd.appendTo(container); @@ -1424,7 +1424,7 @@ function team($, teamName) { // elements that have the old magic IDs. var ids = [ "Switch", "Lang", "Search", "Pager", "Navi", "Results", "Records", "Targets", "Ranking", - "Termlists", "Stat" ]; + "Termlists", "Stat", "MOTD" ]; for (var i = 0; i < ids.length; i++) { var id = 'mkws' + ids[i]; var node = $('#' + id);