X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=4e91fce55e69641c813970d1a3e29b1ada3b6254;hb=ca8a466132753c8239f41680cb21edee8c7f4262;hp=ac427e5bd0a9a57f01047dce3257f5ab88891501;hpb=0110825c865a30c5684711b4af596e4910b598af;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index ac427e5..4e91fce 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -29,7 +29,7 @@ function team($, teamName) { 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 + var m_widgets = {}; // Maps widget-type to array of widget objects that.toString = function() { return '[Team ' + teamName + ']'; }; @@ -303,23 +303,16 @@ function team($, teamName) { switch(view) { case 'targets': - if (targets) targets.css('display', 'block'); - if (results) results.css('display', 'none'); - if (blanket) blanket.css('display', 'none'); - if (motd) motd.css('display', 'none'); + if (targets) $(targets).show(); + if (results) $(results).hide(); + if (blanket) $(blanket).hide(); + if (motd) $(motd).hide(); break; case 'records': - if (targets) targets.css('display', 'none'); - if (results) results.css('display', 'block'); - 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'); + if (targets) $(targets).hide(); + if (results) $(results).show(); + if (blanket) $(blanket).show(); + if (motd) $(motd).hide(); break; default: alert("Unknown view '" + view + "'"); @@ -348,50 +341,6 @@ function team($, teamName) { }; - /* - * All the HTML stuff to render the search forms and - * result pages. - */ - function mkwsHtmlAll() { - mkwsSetLang(); - - var container = findnode(".mkwsMOTDContainer"); - if (container.length) { - // Move the MOTD from the provided element down into the container - findnode(".mkwsMOTD").appendTo(container); - } - } - - - function mkwsSetLang() { - var lang = mkws.getParameterByName("lang") || m_config.lang; - if (!lang || !mkws.locale_lang[lang]) { - m_config.lang = "" - } else { - m_config.lang = lang; - } - - log("Locale language: " + (m_config.lang ? m_config.lang : "none")); - return m_config.lang; - } - - - // 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 - // different languages. - // - function M(word) { - var lang = m_config.lang; - - if (!lang || !mkws.locale_lang[lang]) - return word; - - return mkws.locale_lang[lang][word] || word; - } - mkws.M = M; // so the Handlebars helper can use it - - // Finds the node of the specified class within the current team function findnode(selector, teamName) { teamName = teamName || m_teamName; @@ -407,11 +356,8 @@ function team($, teamName) { //log('findnode(' + selector + ') found ' + node.length + ' nodes'); return node; } - that.findnode = findnode; - // This much simpler and more efficient function should be usable - // in place of most uses of findnode. function widgetNode(type) { var w = that.widget(type); return w ? $(w.node) : undefined; @@ -449,7 +395,7 @@ function team($, teamName) { source = m_tempateText[name]; } if (!source) { - source = defaultTemplate(name); + source = mkws.defaultTemplate(name); } template = Handlebars.compile(source); @@ -462,118 +408,49 @@ function team($, teamName) { that.loadTemplate = loadTemplate; - function defaultTemplate(name) { - if (name === 'Record') { - return '\ -
{{translate "Title"}} | \ -\ - {{md-title}}\ - {{#if md-title-remainder}}\ - ({{md-title-remainder}})\ - {{/if}}\ - {{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ - {{/if}}\ - | \ -
---|---|
{{translate "Date"}} | \ -{{md-date}} | \ -
{{translate "Author"}} | \ -{{md-author}} | \ -
{{translate "Links"}} | \ -\ - {{#each md-electronic-url}}\ - Link{{index1}}\ - {{/each}}\ - | \ -
{{translate "Subject"}} | \ -\ - {{#first location having="md-subject"}}\ - {{#if md-subject}}\ - {{#commaList md-subject}}\ - {{this}}{{/commaList}}\ - {{/if}}\ - {{/first}}\ - | \ -
{{translate "Locations"}} | \ -\ - {{#commaList location}}\ - {{attr "@name"}}{{/commaList}}\ - | \ -