From: Jason Skomorowski Date: Mon, 7 Jul 2014 23:30:04 +0000 (-0400) Subject: Merge branch 'master' into templateallthemarkup X-Git-Tag: 1.0.0~324^2~58 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=cda7d85862a85b0841478d87a086582cb02ba002;hp=7bd030f15309e4349183ea5d5961378706f357d0 Merge branch 'master' into templateallthemarkup Conflicts: src/.gitignore src/mkws-core.js src/mkws-team.js src/mkws-widget-termlists.js tools/htdocs/Makefile --- diff --git a/.gitignore b/.gitignore index b25c15b..b72f9be 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *~ +*.swp diff --git a/README b/README index 5696cd1..7aacc48 100644 --- a/README +++ b/README @@ -30,6 +30,11 @@ or you can download the source from http://nodejs.org/download/ and build it yourself. Looks like you need node and npm, make install puts them into /usr/local/bin. +To compile the default templates you'll need to install the stable version +of Handlebars. Currently it's at 1.3.0 and available by npm: + + npm install handlebars@1.3.0 -g + For apache setup, see tools/apache2/README NEWS diff --git a/examples/htdocs/topic-bootstrap-reorganise.html b/examples/htdocs/topic-bootstrap-reorganise.html new file mode 100644 index 0000000..4cb3e7d --- /dev/null +++ b/examples/htdocs/topic-bootstrap-reorganise.html @@ -0,0 +1,123 @@ + + + + + + + MKWS demo: Compound reference widget, Bootstrap edition + + + + + + + + + + + + + +

+ +

Images

+ + +

News

Articles

Books

+ +

Results from all targets

+ +

Images

+ + +

News

Articles

Books

Results from all targets

+ + diff --git a/examples/htdocs/two-teams.html b/examples/htdocs/two-teams.html index 006f11b..694522e 100644 --- a/examples/htdocs/two-teams.html +++ b/examples/htdocs/two-teams.html @@ -9,7 +9,7 @@ - + diff --git a/src/mkws-core.js b/src/mkws-core.js index f09bf16..ce71fda 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -16,6 +16,7 @@ var mkws = { // initial value allows jQuery popup to use logging. teams: {}, widgetType2function: {}, + defaultTemplates: {}, locale_lang: { "de": { @@ -179,6 +180,7 @@ mkws.setMkwsConfig = function(overrides) { facets: ["xtargets", "subject", "author"], /* display facets, in this order, [] for none */ responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ log_level: 1, /* log level for development: 0..2 */ + template_vars: {}, /* values that may be exposed to templates */ dummy: "dummy" }; @@ -202,110 +204,6 @@ mkws.objectInheritingFrom = function(o) { } -mkws.defaultTemplate = function(name) { - if (name === 'Record') { - return '\ -

\ - \ - \ - \ - \ - {{#if md-date}}\ - \ - \ - \ - \ - {{/if}}\ - {{#if md-author}}\ - \ - \ - \ - \ - {{/if}}\ - {{#if md-electronic-url}}\ - \ - \ - \ - \ - {{/if}}\ - {{#mkws-if-any location having="md-subject"}}\ - \ - \ - \ - \ - {{/mkws-if-any}}\ - \ - \ - \ - \ -

{{mkws-translate "Title"}}	\ - {{md-title}}\ - {{#if md-title-remainder}}\ - ({{md-title-remainder}})\ - {{/if}}\ - {{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ - {{/if}}\ -
{{mkws-translate "Date"}}	{{md-date}}
{{mkws-translate "Author"}}	{{md-author}}
{{mkws-translate "Links"}}	\ - {{#each md-electronic-url}}\ - Link{{mkws-index1}}\ - {{/each}}\ -
{{mkws-translate "Subject"}}	\ - {{#mkws-first location having="md-subject"}}\ - {{#if md-subject}}\ - {{#mkws-commaList md-subject}}\ - {{this}}{{/mkws-commaList}}\ - {{/if}}\ - {{/mkws-first}}\ -
{{mkws-translate "Locations"}}	\ - {{#mkws-commaList location}}\ - {{mkws-attr "@name"}}{{/mkws-commaList}}\ -

\ -'; - } else if (name === "Summary") { - return '\ -\ - {{md-title}}\ -\ -{{#if md-title-remainder}}\ - {{md-title-remainder}}\ -{{/if}}\ -{{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ -{{/if}}\ -{{#if md-date}}, {{md-date}}\ -{{#if location}}\ -, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\ -{{/if}}\ -{{#if md-medium}}\ -, {{md-medium}}\ -{{/if}}\ -{{/if}}\ -'; - } else if (name === "Image") { - return '\ - \ - {{#mkws-first md-thumburl}}\ - {{../md-title}}

\ - {{/mkws-first}}\ -
\ - \ -'; - } else if (name === 'Facet') { - return '\ -{{term}}\ -{{count}}\ -'; - } - - return null; -}; - - // The following functions are dispatchers for team methods that // are called from the UI using a team-name rather than implicit // context. diff --git a/src/mkws-team.js b/src/mkws-team.js index f4e0c88..52f2ee5 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -388,38 +388,33 @@ function team($, teamName) { function loadTemplate(name, fallbackString) { var template = m_template[name]; - - if (template === undefined) { - // Fall back to generic template if there is no team-specific one + if (template === undefined && Handlebars.compile) { var source; var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name()); if (node && node.length < 1) { node = $(".mkwsTemplate_" + name); } - if (node) { - source = node.html(); - } - - // If the template is not defined in HTML, check the following - // in order: template registered in the team by a widget; - // fallback string provided on this invocation; global default. - if (!source) { - source = m_templateText[name]; - } - if (!source) { - source = fallbackString; - } - if (!source) { - source = mkws.defaultTemplate(name); + if (node) source = node.html(); + if (!source) source = m_templateText[name]; + if (source) { + template = Handlebars.compile(source); + log("compiled template '" + name + "'"); } - - if (!source) return null; - template = Handlebars.compile(source); - log("compiled template '" + name + "'"); + } + //if (template === undefined) template = mkws_templatesbyteam[m_teamName][name]; + if (template === undefined && Handlebars.templates) { + template = Handlebars.templates[name]; + } + if (template === undefined && mkws.defaultTemplates) { + template = mkws.defaultTemplates[name]; + } + if (template) { m_template[name] = template; + return template; } - - return template; + else { + alert("Missing MKWS template for " + name); + } } that.loadTemplate = loadTemplate; diff --git a/src/mkws-templates.js b/src/mkws-templates.js new file mode 100644 index 0000000..86150aa --- /dev/null +++ b/src/mkws-templates.js @@ -0,0 +1,388 @@ +(function() { + var template = Handlebars.template, templates = mkws.defaultTemplates = mkws.defaultTemplates || {}; +templates['Image'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing; + +function program1(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n \n "; + stack1 = (helper = helpers['mkws-first'] || (depth0 && depth0['mkws-first']),options={hash:{},inverse:self.noop,fn:self.programWithDepth(2, program2, data, depth0),data:data},helper ? helper.call(depth0, (depth0 && depth0['md-thumburl']), options) : helperMissing.call(depth0, "mkws-first", (depth0 && depth0['md-thumburl']), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n
\n \n"; + return buffer; + } +function program2(depth0,data,depth1) { + + var buffer = "", stack1; + buffer += "\n $\""$ \n "; + return buffer; + } + + buffer += "\n"; + stack1 = helpers.each.call(depth0, (depth0 && depth0.hits), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + return buffer; + }); +templates['Record'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, helper, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this; + +function program1(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n ("; + if (helper = helpers['md-title-remainder']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-remainder']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + ")\n "; + return buffer; + } + +function program3(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n "; + if (helper = helpers['md-title-responsibility']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-responsibility']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + return buffer; + } + +function program5(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n \n " + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Date", options) : helperMissing.call(depth0, "mkws-translate", "Date", options))) + + "\n "; + if (helper = helpers['md-date']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-date']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n \n "; + return buffer; + } + +function program7(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n \n " + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Author", options) : helperMissing.call(depth0, "mkws-translate", "Author", options))) + + "\n "; + if (helper = helpers['md-author']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-author']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n \n "; + return buffer; + } + +function program9(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n \n " + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Links", options) : helperMissing.call(depth0, "mkws-translate", "Links", options))) + + "\n \n "; + stack1 = helpers.each.call(depth0, (depth0 && depth0['md-electronic-url']), {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n \n \n "; + return buffer; + } +function program10(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n Link"; + if (helper = helpers['mkws-index1']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['mkws-index1']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + return buffer; + } + +function program12(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n \n " + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Subject", options) : helperMissing.call(depth0, "mkws-translate", "Subject", options))) + + "\n \n "; + stack1 = (helper = helpers['mkws-first'] || (depth0 && depth0['mkws-first']),options={hash:{ + 'having': ("md-subject") + },inverse:self.noop,fn:self.program(13, program13, data),data:data},helper ? helper.call(depth0, (depth0 && depth0.location), options) : helperMissing.call(depth0, "mkws-first", (depth0 && depth0.location), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n \n \n "; + return buffer; + } +function program13(depth0,data) { + + var buffer = "", stack1; + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-subject']), {hash:{},inverse:self.noop,fn:self.program(14, program14, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + return buffer; + } +function program14(depth0,data) { + + var buffer = "", stack1, helper, options; + buffer += "\n "; + stack1 = (helper = helpers['mkws-commaList'] || (depth0 && depth0['mkws-commaList']),options={hash:{},inverse:self.noop,fn:self.program(15, program15, data),data:data},helper ? helper.call(depth0, (depth0 && depth0['md-subject']), options) : helperMissing.call(depth0, "mkws-commaList", (depth0 && depth0['md-subject']), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + return buffer; + } +function program15(depth0,data) { + + var buffer = ""; + buffer += "\n " + + escapeExpression((typeof depth0 === functionType ? depth0.apply(depth0) : depth0)); + return buffer; + } + +function program17(depth0,data) { + + var buffer = "", helper, options; + buffer += "\n " + + escapeExpression((helper = helpers['mkws-attr'] || (depth0 && depth0['mkws-attr']),options={hash:{},data:data},helper ? helper.call(depth0, "@name", options) : helperMissing.call(depth0, "mkws-attr", "@name", options))); + return buffer; + } + + buffer += "\n\n \n \n \n \n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-date']), {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-author']), {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-electronic-url']), {hash:{},inverse:self.noop,fn:self.program(9, program9, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = (helper = helpers['mkws-if-any'] || (depth0 && depth0['mkws-if-any']),options={hash:{ + 'having': ("md-subject") + },inverse:self.noop,fn:self.program(12, program12, data),data:data},helper ? helper.call(depth0, (depth0 && depth0.location), options) : helperMissing.call(depth0, "mkws-if-any", (depth0 && depth0.location), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n \n \n \n \n

" + + escapeExpression((helper = helpers['mkws-translate'] \|\| (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Title", options) : helperMissing.call(depth0, "mkws-translate", "Title", options))) + + "	\n "; + if (helper = helpers['md-title']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-remainder']), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 \|\| stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-responsibility']), {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data}); + if(stack1 \|\| stack1 === 0) { buffer += stack1; } + buffer += "\n
" + + escapeExpression((helper = helpers['mkws-translate'] \|\| (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Locations", options) : helperMissing.call(depth0, "mkws-translate", "Locations", options))) + + "	\n "; + stack1 = (helper = helpers['mkws-commaList'] \|\| (depth0 && depth0['mkws-commaList']),options={hash:{},inverse:self.noop,fn:self.program(17, program17, data),data:data},helper ? helper.call(depth0, (depth0 && depth0.location), options) : helperMissing.call(depth0, "mkws-commaList", (depth0 && depth0.location), options)); + if(stack1 \|\| stack1 === 0) { buffer += stack1; } + buffer += "\n

" + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Title", options) : helperMissing.call(depth0, "mkws-translate", "Title", options))) + + "

\n "; + if (helper = helpers['md-title']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-remainder']), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-responsibility']), {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n

" + + escapeExpression((helper = helpers['mkws-translate'] || (depth0 && depth0['mkws-translate']),options={hash:{},data:data},helper ? helper.call(depth0, "Locations", options) : helperMissing.call(depth0, "mkws-translate", "Locations", options))) + + "

\n "; + stack1 = (helper = helpers['mkws-commaList'] || (depth0 && depth0['mkws-commaList']),options={hash:{},inverse:self.noop,fn:self.program(17, program17, data),data:data},helper ? helper.call(depth0, (depth0 && depth0.location), options) : helperMissing.call(depth0, "mkws-commaList", (depth0 && depth0.location), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n

\n"; + return buffer; + }); +templates['Records'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this; + +function program1(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n

\n \n "; + if (helper = helpers['md-title']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n \n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-remainder']), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-responsibility']), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + stack1 = helpers['if'].call(depth0, (depth0 && depth0.renderedDetails), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n

\n"; + return buffer; + } +function program2(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n "; + if (helper = helpers['md-title-remainder']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-remainder']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + return buffer; + } + +function program4(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n "; + if (helper = helpers['md-title-responsibility']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-responsibility']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n "; + return buffer; + } + +function program6(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n "; + if (helper = helpers.renderedDetails) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0.renderedDetails); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n "; + return buffer; + } + + buffer += "\n"; + stack1 = helpers.each.call(depth0, (depth0 && depth0.hits), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + return buffer; + }); +templates['Reference'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, helper, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing; + +function program1(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n"; + if (helper = helpers['md-title-remainder']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-remainder']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n"; + return buffer; + } + +function program3(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n"; + if (helper = helpers['md-title-responsibility']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title-responsibility']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n"; + return buffer; + } + + buffer += "\n $\"";$ \n

"; + if (helper = helpers['md-title']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "

\n"; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-remainder']), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + stack1 = helpers['if'].call(depth0, (depth0 && depth0['md-title-responsibility']), {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + stack1 = (helper = helpers['mkws-paragraphs'] || (depth0 && depth0['mkws-paragraphs']),options={hash:{},data:data},helper ? helper.call(depth0, (depth0 && depth0['md-description']), (depth0 && depth0.paragraphs), (depth0 && depth0.sentences), options) : helperMissing.call(depth0, "mkws-paragraphs", (depth0 && depth0['md-description']), (depth0 && depth0.paragraphs), (depth0 && depth0.sentences), options)); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n

Wikipedia

\n"; + return buffer; + }); +templates['Facet'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, helper, functionType="function", escapeExpression=this.escapeExpression, self=this; + +function program1(depth0,data) { + + var buffer = "", stack1, helper; + buffer += "\n

\n "; + if (helper = helpers.term) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0.term); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + " "; + if (helper = helpers.count) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0.count); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "\n

\n"; + return buffer; + } + + buffer += "\n\n

"; + if (helper = helpers.caption) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0.caption); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "

\n"; + stack1 = helpers.each.call(depth0, (depth0 && depth0.terms), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + return buffer; + }); +templates['Termlists'] = template(function (Handlebars,depth0,helpers,partials,data) { + this.compilerInfo = [4,'>= 1.0.0']; +helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; + var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this; + +function program1(depth0,data,depth1) { + + var buffer = "", stack1, helper; + buffer += "\n

\n"; + return buffer; + } + + buffer += "\n\n

Termlists

\n"; + stack1 = helpers.each.call(depth0, (depth0 && depth0.facets), {hash:{},inverse:self.noop,fn:self.programWithDepth(1, program1, data, depth0),data:data}); + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += "\n"; + return buffer; + }); +})(); \ No newline at end of file diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js index 85c2ba4..f5fb1f7 100644 --- a/src/mkws-widget-main.js +++ b/src/mkws-widget-main.js @@ -116,28 +116,26 @@ mkws.registerWidgetType('Records', function() { var team = this.team; this.team.queue("records").subscribe(function(data) { - var html = []; for (var i = 0; i < data.hits.length; i++) { var hit = data.hits[i]; that.team.queue("record").publish(hit); - var divId = team.recordElementId(hit.recid[0]); - html.push('

', renderSummary(hit), '

'); + hit.detailLinkId = team.recordElementId(hit.recid[0]); + hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;" + hit.containerClass = "mkwsSummary mkwsTeam_" + team.name(); + hit.containerClass += " " + hit.detailLinkId; // ### At some point, we may be able to move the // m_currentRecordId and m_currentRecordData members // from the team object into this widget. if (hit.recid == team.currentRecordId()) { - if (team.currentRecordData()) - html.push(team.renderDetails(team.currentRecordData())); + if (team.currentRecordData()) { + hit.renderedDetails = team.renderDetails(team.currentRecordData()); + console.log(hit.renderedDetails); + } } } - that.node.html(html.join('')); - - function renderSummary(hit) { - var template = team.loadTemplate(that.config.template || "Summary"); - hit._id = team.recordElementId(hit.recid[0]); - hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;" - return template(hit); - } + var template = team.loadTemplate(that.config.template || "Records"); + var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars); + that.node.html(template(targs)); }); that.autosearch(); diff --git a/src/mkws-widget-main.templates/Image.handlebars b/src/mkws-widget-main.templates/Image.handlebars new file mode 100644 index 0000000..abee587 --- /dev/null +++ b/src/mkws-widget-main.templates/Image.handlebars @@ -0,0 +1,18 @@ +{{! +Records presented as images. + +hits: + containerClass - class attribute for same + detailLinkId - id for the element triggering detail display + detailClick - a click event handler for details + renderedDetails - active record details rendered from the Record template + md-* - metadata fields passed through from backend +}} +{{#each hits}} + + {{#mkws-first md-thumburl}} + {{../md-title}}

+ {{/mkws-first}} +
+ +{{/each}} diff --git a/src/mkws-widget-main.templates/Record.handlebars b/src/mkws-widget-main.templates/Record.handlebars new file mode 100644 index 0000000..f8bf951 --- /dev/null +++ b/src/mkws-widget-main.templates/Record.handlebars @@ -0,0 +1,59 @@ +{{! +Full record display. +}} + + + + + + {{#if md-date}} + + + + + {{/if}} + {{#if md-author}} + + + + + {{/if}} + {{#if md-electronic-url}} + + + + + {{/if}} + {{#mkws-if-any location having="md-subject"}} + + + + + {{/mkws-if-any}} + + + + +

{{mkws-translate "Title"}}	+ {{md-title}} + {{#if md-title-remainder}} + ({{md-title-remainder}}) + {{/if}} + {{#if md-title-responsibility}} + {{md-title-responsibility}} + {{/if}} +
{{mkws-translate "Date"}}	{{md-date}}
{{mkws-translate "Author"}}	{{md-author}}
{{mkws-translate "Links"}}	+ {{#each md-electronic-url}} + Link{{mkws-index1}} + {{/each}} +
{{mkws-translate "Subject"}}	+ {{#mkws-first location having="md-subject"}} + {{#if md-subject}} + {{#mkws-commaList md-subject}} + {{this}}{{/mkws-commaList}} + {{/if}} + {{/mkws-first}} +
{{mkws-translate "Locations"}}	+ {{#mkws-commaList location}} + {{mkws-attr "@name"}}{{/mkws-commaList}} +

diff --git a/src/mkws-widget-main.templates/Records.handlebars b/src/mkws-widget-main.templates/Records.handlebars new file mode 100644 index 0000000..03ba9a2 --- /dev/null +++ b/src/mkws-widget-main.templates/Records.handlebars @@ -0,0 +1,26 @@ +{{! +Records from a search. + +hits: + containerClass - class attribute for same + detailLinkId - id for the element triggering detail display + detailClick - a click event handler for details + renderedDetails - active record details rendered from the Record template + md-* - metadata fields passed through from backend +}} +{{#each hits}} +

+ + {{md-title}} + + {{#if md-title-remainder}} + {{md-title-remainder}} + {{/if}} + {{#if md-title-responsibility}} + {{md-title-responsibility}} + {{/if}} + {{#if renderedDetails}} + {{{renderedDetails}}} + {{/if}} +

+{{/each}} diff --git a/src/mkws-widget-record.js b/src/mkws-widget-record.js index 106c8a3..13d67c3 100644 --- a/src/mkws-widget-record.js +++ b/src/mkws-widget-record.js @@ -1,10 +1,18 @@ +// A widget for one record mkws.registerWidgetType('Record', function() { - mkws.promotionFunction('Records').call(this); if (!this.config.maxrecs) this.config.maxrecs = 1; + var that = this; + var team = this.team; + team.queue("records").subscribe(function(data) { + var template = team.loadTemplate(that.config.template || "Record"); + var targs = $.extend({}, data.hits[0], that.config.template_vars); + that.node.html(template(targs)); + }); + that.autosearch(); }); mkws.registerWidgetType('Image', function() { - mkws.promotionFunction('Record').call(this); + mkws.promotionFunction('Records').call(this); if (!this.config.template) this.config.template = 'Image'; }); diff --git a/src/mkws-widget-reference.js b/src/mkws-widget-reference.js index b1044d2..c8d41be 100644 --- a/src/mkws-widget-reference.js +++ b/src/mkws-widget-reference.js @@ -2,19 +2,6 @@ mkws.registerWidgetType('Reference', function() { mkws.promotionFunction('Record').call(this); if (!this.config.target) this.config.target = 'wikimedia_wikipedia_single_result'; if (!this.config.template) this.config.template = 'Reference'; - var nPara = this.config.paragraphs || 0; - var nSent = this.config.sentences || 0; - - this.team.registerTemplate('Reference', '\ -

\ -

\ -{{#if md-title-remainder}}\ - {{md-title-remainder}}\ -{{/if}}\ -{{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ -{{/if}}\ - {{{mkws-paragraphs md-description ' + nPara + ' ' + nSent + '}}}\ -

Wikipedia

\ -'); + this.config.template_vars.paragraphs = this.config.paragraphs || 0; + this.config.template_vars.sentences = this.config.sentences || 0; }); diff --git a/src/mkws-widget-reference.templates/Reference.handlebars b/src/mkws-widget-reference.templates/Reference.handlebars new file mode 100644 index 0000000..62a9d2a --- /dev/null +++ b/src/mkws-widget-reference.templates/Reference.handlebars @@ -0,0 +1,17 @@ +{{! +Paragraphs and images from a reference source. + +sentences - number of sentences to include +paragraphs - number of paragraphs to include +md-* - metadata fields passed through from backend +}} +

+{{#if md-title-remainder}} +{{md-title-remainder}} +{{/if}} +{{#if md-title-responsibility}} +{{md-title-responsibility}} +{{/if}} +{{{mkws-paragraphs md-description paragraphs sentences}}} +

Wikipedia

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js index fef616f..54c65c4 100644 --- a/src/mkws-widget-termlists.js +++ b/src/mkws-widget-termlists.js @@ -1,22 +1,19 @@ mkws.registerWidgetType('Termlists', function() { - var that = this; - // Initially hide the termlists; display when we get results + var that = this; + var team = this.team; mkws.$(document).ready(function() { that.node.hide(); }); - this.team.queue("termlists").subscribe(function(data) { + team.queue("termlists").subscribe(function(data) { that.node.show(); }); - var acc = []; - var facets = this.config.facets; - acc.push('

' + mkws.M('Termlists') + '

'); - for (var i = 0; i < facets.length; i++) { - acc.push('

', '

'); - } - this.node.html(acc.join('')); - + var template = team.loadTemplate(this.config.template || "Termlists"); + this.node.html(template({ + team: team, + facets: this.config.facets + })); this.autosearch(); }); @@ -27,8 +24,8 @@ mkws.registerWidgetType('Facet', function() { subject: [ "Subjects", 10, true ], author: [ "Authors", 10, true ] } - var that = this; + var team = this.team; var name = that.config.facet; var ref = facetConfig[name] || [ "Unknown", 10, true ]; var caption = this.config['facet_caption_' + name] || ref[0]; @@ -36,47 +33,38 @@ mkws.registerWidgetType('Facet', function() { var pzIndex = ref[2] ? name : null; that.toString = function() { - return '[Widget ' + that.team.name() + ':' + that.type + '(' + name + ')]'; + return '[Widget ' + team.name() + ':' + that.type + '(' + name + ')]'; }; - var t2 = that.team.loadTemplate('Facet-' + caption); - that.log("template for Facet-" + caption + " is " + !!t2); - if (!t2) { - that.log("no " + caption + "-specific template, falling back"); - t2 = that.team.loadTemplate('Facet'); - } - that.log("template for Facet is " + !!t2); - - that.team.queue("termlists").subscribe(function(data) { + team.queue("termlists").subscribe(function(data) { data = data[name]; - var t1 = that.team.loadTemplate('facetTitle-' + caption, mkws.M(caption)) - var title = t1({ query: that.config.query }); - var acc = []; - acc.push('

', title, '

'); - - var teamName = that.team.name(); + var terms = []; + var teamName = team.name(); for (var i = 0; i < data.length && i < max; i++) { - var fn, field; - // General case modifies the query; special case selects a target - if (pzIndex) { - fn = 'limitQuery'; field = pzIndex; - } else if (!that.team.targetFiltered(data[i].id)) { - fn = 'limitTarget'; field = data[i].id; + var linkdata = ""; + var action = ""; + if (!pzIndex) { + // Special case: target selection + linkdata += ('target_id='+data[i].id+' '); + if (!team.targetFiltered(data[i].id)) { + action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)'; + } + } else { + action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)'; } - - var s = t2({ - team: teamName, - fn: fn, - field: field, + linkdata += 'onclick="' + action + ';return false;"'; + terms.push({ term: data[i].name, count: data[i].freq, - query: that.config.query - }); - acc.push('

', s, '

'); + linkdata: linkdata + }); } - - that.node.html(acc.join('')); + var template = team.loadTemplate(that.config.template || "Facet"); + that.node.html(template({ + name: name, + caption: caption, + terms: terms + })); }); - this.autosearch(); }); diff --git a/src/mkws-widget-termlists.templates/Facet.handlebars b/src/mkws-widget-termlists.templates/Facet.handlebars new file mode 100644 index 0000000..520ce1d --- /dev/null +++ b/src/mkws-widget-termlists.templates/Facet.handlebars @@ -0,0 +1,17 @@ +{{! +A facet in the search. + +name - facet identifier, typically English and lowercase +caption - caption for this facet +terms: + term - term name + count - count of items matching in the current search for this team + linkdata - attributes to add to the term element including an onclick handler +}} + +

+{{#each terms}} +

+ {{term}} {{count}} +

+{{/each}} diff --git a/src/mkws-widget-termlists.templates/Termlists.handlebars b/src/mkws-widget-termlists.templates/Termlists.handlebars new file mode 100644 index 0000000..63865dc --- /dev/null +++ b/src/mkws-widget-termlists.templates/Termlists.handlebars @@ -0,0 +1,11 @@ +{{! +Termlists, a container of all configured facets. + +team - the current team +facets - array of facet names +}} + +

Termlists

+{{#each facets}} +

+{{/each}} diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile index 388a4b8..02d64f8 100644 --- a/tools/htdocs/Makefile +++ b/tools/htdocs/Makefile @@ -17,12 +17,13 @@ VERSION = $(shell tr -d '\012' < ${SRC}/VERSION) COMPONENTS = ${SRC}/mkws-handlebars.js \ ${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.js \ + ${SRC}/mkws-templates.js \ ${SRC}/mkws-widget.js ${SRC}/mkws-widget-main.js ${SRC}/mkws-widget-termlists.js \ ${SRC}/mkws-widget-authname.js ${SRC}/mkws-widget-categories.js ${SRC}/mkws-widget-log.js \ ${SRC}/mkws-widget-record.js ${SRC}/mkws-widget-reference.js ${SRC}/mkws-widget-builder.js GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \ - mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js + mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js mkws-templates.js **make-default**: all @@ -81,12 +82,15 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js echo "Made release $(VERSION)"; \ fi -mkws.js: $(COMPONENTS) Makefile +mkws.js: mkws-templates.js $(COMPONENTS) Makefile rm -f $@ cat ${COMPONENTS} > $@.tmp mv -f $@.tmp $@ chmod 444 $@ +mkws-templates.js: + handlebars -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js + distclean: clean @echo "(No need for distclean, 'make clean' is fine)"

Images

News

Articles

Books

Results from all targets

Related Topics

Related Topics

Images

News

Articles

Books

Results from all targets

"; + if (helper = helpers['md-title']) { stack1 = helper.call(depth0, {hash:{},data:data}); } + else { helper = (depth0 && depth0['md-title']); stack1 = typeof helper === functionType ? helper.call(depth0, {hash:{},data:data}) : helper; } + buffer += escapeExpression(stack1) + + "

{{md-title}}

{{md-title}}