X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=8f4235e2e7d77b949580b0108fbf36dd9252b3b1;hb=e8fa844d1d8795fcf1b9d4b7ec60e53e7f470f13;hp=53a65fcb6664054021099f50cbc56aad2fb03ca7;hpb=a40649a84c22976aacbf267cc519d44c098386ee;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 53a65fc..8f4235e 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -26,7 +26,8 @@ function team($, teamName) {
 	"last": $.now()
     };
     var m_paz; // will be initialised below
-    var m_template = {};
+    var m_tempateText = {}; // widgets can register tempates to be compiled
+    var m_template = {}; // compiled templates, from any source
     var m_config = mkws.objectInheritingFrom(mkws.config);
     var m_widgets = {}; // Maps widget-type to object
 
@@ -267,15 +268,17 @@ function team($, teamName) {
 	if (query) m_query = query;
 	if (sortOrder) m_sortOrder = sortOrder;
 	if (perpage) m_perpage = perpage;
-	if (targets) m_filterSet.add(targetFilter(id, id));
+	if (targets) m_filterSet.add(targetFilter(targets, targets));
 
 	var pp2filter = m_filterSet.pp2filter();
 	var pp2limit = m_filterSet.pp2limit(limit);
         var pp2catLimit = m_filterSet.pp2catLimit();
+	if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
 	var params = {};
 	if (pp2limit) params.limit = pp2limit;
-	if (pp2catLimit) params.categoryfilter = pp2catLimit;
 	if (maxrecs) params.maxrecs = maxrecs;
 	if (torusquery) {
 	    if (!mkws.config.use_service_proxy)
@@ -353,13 +356,6 @@ function team($, teamName) {
 	if (m_config.show_lang)
 	    mkwsHtmlLang();
 
-	log("HTML search form");
-	findnode('.mkwsSearch').html('\
-<form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + m_teamName + '" action="" >\
-  <input class="mkwsQuery mkwsTeam_' + m_teamName + '" type="text" size="' + m_config.query_width + '" />\
-  <input class="mkwsButton mkwsTeam_' + m_teamName + '" type="submit" value="' + M('Search') + '" />\
-</form>');
-
 	log("HTML records");
 	// If the team has a .mkwsResults, populate it in the usual
 	// way. If not, assume that it's a smarter application that
@@ -409,16 +405,11 @@ function team($, teamName) {
         ranking_data += '</form>';
 	findnode(".mkwsRanking").html(ranking_data);
 
-	mkwsHtmlSwitch();
-
-	findnode('.mkwsSearchForm').submit(function() {
-	    var val = widgetNode('Query').val();
-	    newSearch(val);
-	    return false;
-	});
-
 	// on first page, hide the termlist
-	$(document).ready(function() { widgetNode("Termlists").hide(); });
+	$(document).ready(function() {
+            var t = widgetNode("Termlists");
+            if (t) t.hide();
+        });
         var container = findnode(".mkwsMOTDContainer");
 	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
@@ -543,24 +534,6 @@ function team($, teamName) {
     }
 
 
-    function mkwsHtmlSwitch() {
-	log("HTML switch for team " + m_teamName);
-
-	var node = findnode(".mkwsSwitch");
-	node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'records\')">' + M('Records') + '</a>'));
-	node.append($("<span/>", { text: " | " }));
-	node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'targets\')">' + M('Targets') + '</a>'));
-
-	log("HTML targets");
-	var node = findnode(".mkwsTargets");
-	node.html('\
-<div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
-  No information available yet.\
-</div>');
-	node.css("display", "none");
-    }
-
-
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
     // want to make it per-team so different teams can operate in
@@ -611,6 +584,11 @@ function team($, teamName) {
     that.renderDetails = renderDetails;
 
 
+    that.registerTemplate = function(name, text) {
+        m_tempateText[name] = text;
+    };
+
+
     function loadTemplate(name) {
 	var template = m_template[name];
 
@@ -626,6 +604,9 @@ function team($, teamName) {
             }
 
 	    if (!source) {
+                source = m_tempateText[name];
+            }
+	    if (!source) {
 		source = defaultTemplate(name);
 	    }