X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=2b962a2ff5a8b05ca4f1d6545fa4f4a4f2057173;hb=fccf768cf4e1a2a4c8747cb4c7c807315f226304;hp=63d50fa910cadc0c5c2438e3f22b1c032fb9e0aa;hpb=867fd75779d6a3565ad8b79ab8d1b40ef77c1f69;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 63d50fa..2b962a2 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -314,13 +314,6 @@ function team($, teamName) {
             if (blanket) blanket.css('display', 'block');
             if (motd) motd.css('display', 'none');
             break;
-	case 'none':
-	    alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen");
-            if (targets) targets.css('display', 'none');
-            if (results) results.css('display', 'none');
-            if (blanket) blanket.css('display', 'none');
-            if (motd) motd.css('display', 'none');
-            break;
         default:
             alert("Unknown view '" + view + "'");
 	}
@@ -353,10 +346,6 @@ function team($, teamName) {
      * result pages.
      */
     function mkwsHtmlAll() {
-	mkwsSetLang();
-	if (m_config.show_lang)
-	    mkwsHtmlLang();
-
         var container = findnode(".mkwsMOTDContainer");
 	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
@@ -377,69 +366,6 @@ function team($, teamName) {
 	return m_config.lang;
     }
 
-    // set or re-set "lang" URL parameter
-    function lang_url(lang) {
-	var query = location.search;
-	// no query parameters? done
-	if (!query) {
-	    return "?lang=" + lang;
-	}
-
-	// parameter does not exists
-	if (!query.match(/[\?&]lang=/)) {
-            return query + "&lang=" + lang;
-        }
-
-	// replace existing parameter
-	query = query.replace(/\?lang=([^&#;]*)/, "?lang=" + lang);
-	query = query.replace(/\&lang=([^&#;]*)/, "&lang=" + lang);
-
-	return query;
-    }
-   
-	// dynamic URL or static page? /path/foo?query=test
-    /* create locale language menu */
-    function mkwsHtmlLang() {
-	var lang_default = "en";
-	var lang = m_config.lang || lang_default;
-	var list = [];
-
-	/* display a list of configured languages, or all */
-	var lang_options = m_config.lang_options || [];
-	var toBeIncluded = {};
-	for (var i = 0; i < lang_options.length; i++) {
-	    toBeIncluded[lang_options[i]] = true;
-	}
-
-	for (var k in mkws.locale_lang) {
-	    if (toBeIncluded[k] || lang_options.length == 0)
-		list.push(k);
-	}
-
-	// add english link
-	if (lang_options.length == 0 || toBeIncluded[lang_default])
-            list.push(lang_default);
-
-	log("Language menu for: " + list.join(", "));
-
-	/* the HTML part */
-	var data = "";
-	for(var i = 0; i < list.length; i++) {
-	    var l = list[i];
-
-	    if (data)
-		data += ' | ';
-
-	    if (lang == l) {
-		data += ' <span>' + l + '</span> ';
-	    } else {
-		data += ' <a href="' + lang_url(l) + '">' + l + '</a> '
-	    }
-	}
-
-	findnode(".mkwsLang").html(data);
-    }
-
 
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
@@ -514,7 +440,7 @@ function team($, teamName) {
                 source = m_tempateText[name];
             }
 	    if (!source) {
-		source = defaultTemplate(name);
+		source = mkws.defaultTemplate(name);
 	    }
 
 	    template = Handlebars.compile(source);
@@ -527,94 +453,6 @@ function team($, teamName) {
     that.loadTemplate = loadTemplate;
 
 
-    function defaultTemplate(name) {
-	if (name === 'Record') {
-	    return '\
-<table>\
-  <tr>\
-    <th>{{translate "Title"}}</th>\
-    <td>\
-      {{md-title}}\
-      {{#if md-title-remainder}}\
-	({{md-title-remainder}})\
-      {{/if}}\
-      {{#if md-title-responsibility}}\
-	<i>{{md-title-responsibility}}</i>\
-      {{/if}}\
-    </td>\
-  </tr>\
-  {{#if md-date}}\
-  <tr>\
-    <th>{{translate "Date"}}</th>\
-    <td>{{md-date}}</td>\
-  </tr>\
-  {{/if}}\
-  {{#if md-author}}\
-  <tr>\
-    <th>{{translate "Author"}}</th>\
-    <td>{{md-author}}</td>\
-  </tr>\
-  {{/if}}\
-  {{#if md-electronic-url}}\
-  <tr>\
-    <th>{{translate "Links"}}</th>\
-    <td>\
-      {{#each md-electronic-url}}\
-	<a href="{{this}}">Link{{index1}}</a>\
-      {{/each}}\
-    </td>\
-  </tr>\
-  {{/if}}\
-  {{#if-any location having="md-subject"}}\
-  <tr>\
-    <th>{{translate "Subject"}}</th>\
-    <td>\
-      {{#first location having="md-subject"}}\
-	{{#if md-subject}}\
-	  {{#commaList md-subject}}\
-	    {{this}}{{/commaList}}\
-	{{/if}}\
-      {{/first}}\
-    </td>\
-  </tr>\
-  {{/if-any}}\
-  <tr>\
-    <th>{{translate "Locations"}}</th>\
-    <td>\
-      {{#commaList location}}\
-	{{attr "@name"}}{{/commaList}}\
-    </td>\
-  </tr>\
-</table>\
-';
-	} else if (name === "Summary") {
-	    return '\
-<a href="#" id="{{_id}}" onclick="{{_onclick}}">\
-  <b>{{md-title}}</b>\
-</a>\
-{{#if md-title-remainder}}\
-  <span>{{md-title-remainder}}</span>\
-{{/if}}\
-{{#if md-title-responsibility}}\
-  <span><i>{{md-title-responsibility}}</i></span>\
-{{/if}}\
-';
-	} else if (name === "Image") {
-	    return '\
-      <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
-        {{#first md-thumburl}}\
-	  <img src="{{this}}" alt="{{../md-title}}"/>\
-        {{/first}}\
-	<br/>\
-      </a>\
-';
-	}
-
-	var s = "There is no default '" + name +"' template!";
-	alert(s);
-	return s;
-    }
-
     that.addWidget = function(w) {
         if (!m_widgets[w.type]) {
             m_widgets[w.type] = w;
@@ -639,6 +477,7 @@ function team($, teamName) {
     }
 
     mkwsHtmlAll()
+    mkwsSetLang();
 
     return that;
 };