Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 6430613..141a6c8 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -39,7 +39,7 @@
     <table width="100%" border="0" cellpadding="6" cellspacing="0">
       <tr>
        <td class="mkwsTermlistContainer1" width="250" valign="top">
-         <div>
+         <div class="mkwsTermlists mkwsTeam_AUTO">
            <div class="title">Termlists</div>
            <div class="mkwsFacet mkwsTeam_AUTO" data-mkws-facet="subject"></div>
            <div class="mkwsFacet mkwsTeam_AUTO" data-mkws-facet="xtargets"></div>

diff --git a/src/mkws-team.js b/src/mkws-team.js
index b986988..f956e55 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -333,7 +333,7 @@ function team($, teamName) {
     // switching view between targets and records
     function switchView(view) {
        var targets = widgetNode('Targets');
-       var results = findnode('.mkwsResults,.mkwsRecords');
+       var results = widgetNode('Results') || widgetNode('Records');
        var blanket = widgetNode('Blanket');
        var motd    = widgetNode('MOTD');
 
@@ -452,13 +452,13 @@ function team($, teamName) {
        mkwsHtmlSwitch();
 
        findnode('.mkwsSearchForm').submit(function() {
-           var val = findnode('.mkwsQuery').val();
+           var val = widgetNode('Query').val();
            newSearch(val);
            return false;
        });
 
        // on first page, hide the termlist
-       $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+       $(document).ready(function() { widgetNode("Termlists").hide(); });
         var container = findnode(".mkwsMOTDContainer");
        if (container.length) {
            // Move the MOTD from the provided element down into the container
@@ -641,9 +641,9 @@ function team($, teamName) {
 
        if (template === undefined) {
            // Fall back to generic template if there is no team-specific one
-           var node = findnode(".mkwsTemplate_" + name);
+           var node = widgetNode("Template_" + name);
            if (!node.length) {
-               node = findnode(".mkwsTemplate_" + name, "ALL");
+               node = widgetNode("Template_" + name, "ALL");
            }
 
            var source = node.html();