X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=d6026c7d271812700f1df014e350c410654e5d62;hb=7e9da39ce2d1e1bc72138b59d539b9072dcadb06;hp=aeb3ad399a3184fe8f7074ddf9228ddbbfe83684;hpb=579d6d7627f98a5246d9957926f5546a8b82f819;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index aeb3ad3..d6026c7 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,32 +1,26 @@
/* A very simple client that shows a basic usage of the pz2.js
*/
-"use strict"; // HTML5: disable for debug >= 2
+"use strict"; // HTML5: disable for debug_level >= 2
+
+// Set up namespace and some state.
+var mkws = {
+ filters: [],
+};
/*
* global config object: mkws_config
*
- * needs to be defined in the HTML header before
- * including this JS file
+ * Needs to be defined in the HTML header before including this JS file.
+ * Define empty mkws_config for simple applications that don't define it.
*/
-
if (!mkws_config)
- var mkws_config = {}; // for the guys who forgot to define mkws_config...
-
-if (typeof mkws_config.use_service_proxy === 'undefined')
- mkws_config.use_service_proxy = true;
-
-// global debug flag
-var mkws_debug;
+ var mkws_config = {};
-var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
+// Wrapper for jQuery
+(function ($) {
-var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
-var usesessions = mkws_config.use_service_proxy ? false : true;
-
-
-var mkws_locale_lang = {
+mkws.locale_lang = {
"de": {
"Authors": "Autoren",
"Subjects": "Schlagwörter",
@@ -47,6 +41,7 @@ var mkws_locale_lang = {
"Date": "Datum",
"Subject": "Schlagwort",
"Location": "Ort",
+ // ### to add: Records, Targets
"dummy": "dummy"
},
@@ -71,18 +66,89 @@ var mkws_locale_lang = {
"Date": "Dato",
"Subject": "Emneord",
"Location": "Lokation",
+ // ### to add: Records, Targets
"dummy": "dummy"
}
};
+// keep time state for debugging
+mkws.debug_time = {
+ "start": $.now(),
+ "last": $.now()
+};
+
+mkws.debug_function = function (string) {
+ if (!mkws.debug_level)
+ return;
+
+ if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
+ return;
+ }
+
+ var now = $.now();
+ var timestamp = (now - mkws.debug_time.start)/1000 + " (+" + (now - mkws.debug_time.last)/1000 + ") "
+ mkws.debug_time.last = now;
+
+ // you need to disable use strict at the top of the file!!!
+ if (mkws.debug_level >= 3) {
+ console.log(timestamp + arguments.callee.caller);
+ } else if (mkws.debug_level >= 2) {
+ console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
+ }
+ console.log(timestamp + string);
+}
+var debug = mkws.debug_function; // local alias
+
+{
+ /* default mkws config */
+ var config_default = {
+ use_service_proxy: true,
+ service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+ lang: "",
+ sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+ perpage_options: [10, 20, 30, 50],
+ sort_default: "relevance",
+ perpage_default: 20,
+ query_width: 50,
+ show_lang: true, /* show/hide language menu */
+ show_sort: true, /* show/hide sort menu */
+ show_perpage: true, /* show/hide perpage menu */
+ lang_options: [], /* display languages links for given languages, [] for all */
+ facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
+ responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
+ debug_level: 1, /* debug level for development: 0..2 */
+
+ dummy: "dummy"
+ };
+
+ /* set global debug_level flag early */
+ if (typeof mkws_config.debug_level !== 'undefined') {
+ mkws.debug_level = mkws_config.debug_level;
+ } else if (typeof config_default.debug_level !== 'undefined') {
+ mkws.debug_level = config_default.debug_level;
+ }
+
+ /* override standard config values by function parameters */
+ for (var k in config_default) {
+ if (typeof mkws_config[k] === 'undefined')
+ mkws_config[k] = config_default[k];
+ debug("Set config: " + k + ' => ' + mkws_config[k]);
+ }
+}
+
+if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
+ debug("Reset query width: " + mkws_config.query_width);
+ mkws_config.query_width = 50;
+}
for (var key in mkws_config) {
if (mkws_config.hasOwnProperty(key)) {
if (key.match(/^language_/)) {
var lang = key.replace(/^language_/, "");
// Copy custom languages into list
- mkws_locale_lang[lang] = mkws_config[key];
+ mkws.locale_lang[lang] = mkws_config[key];
+ debug("Added locally configured language '" + lang + "'");
}
}
}
@@ -93,15 +159,18 @@ for (var key in mkws_config) {
// autoInit is set to true on default
var my_paz = new pz2( { "onshow": my_onshow,
"showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
- "pazpar2path": pazpar2path,
+ "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
"oninit": my_oninit,
"onstat": my_onstat,
"onterm": my_onterm,
"termlist": "xtargets,subject,author",
"onbytarget": my_onbytarget,
- "usesessions" : usesessions,
+ "usesessions" : mkws_config.use_service_proxy ? false : true,
"showResponseType": '', // or "json" (for debugging?)
"onrecord": my_onrecord } );
+
+mkws.my_paz = my_paz; // export
+
// some state vars
var curPage = 1;
var recPerPage = 20;
@@ -109,7 +178,6 @@ var totalRec = 0;
var curDetRecId = '';
var curDetRecData = null;
var curSort = 'relevance';
-var curFilter = null;
var submitted = false;
var SourceMax = 16;
var SubjectMax = 10;
@@ -127,12 +195,15 @@ function my_onshow(data) {
totalRec = data.merged;
// move it out
var pager = document.getElementById("mkwsPager");
- pager.innerHTML = "";
- pager.innerHTML +='
' + M('Displaying') + ': '
- + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
- ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
- + data.total + ')
';
- drawPager(pager);
+ if (pager) {
+ pager.innerHTML = "";
+ pager.innerHTML +='' + M('Displaying') + ': '
+ + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+ ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+ + data.total + ')
';
+ drawPager(pager);
+ }
+
// navi
var results = document.getElementById("mkwsRecords");
@@ -140,9 +211,8 @@ function my_onshow(data) {
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
html.push(''
- +'
'+ (i + 1 + recPerPage * (curPage - 1)) +'. '
+'
'
+ +'" onclick="mkws.showDetails(this.id);return false;">'
+ hit["md-title"] +' ');
if (hit["md-title-remainder"] !== undefined) {
html.push('
' + hit["md-title-remainder"] + ' ');
@@ -163,11 +233,11 @@ function my_onstat(data) {
if (stat == null)
return;
- stat.innerHTML = '
Status info ' +
+ stat.innerHTML = '
' + M('Status info') + ' ' +
' -- ' +
- '
' + data.activeclients + '/' + data.clients + ' ' +
+ '
' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + ' ' +
' -- ' +
- '
' + data.records + '/' + data.hits + ' ';
+ '
' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ' ';
}
function my_onterm(data) {
@@ -188,9 +258,9 @@ function my_onterm(data) {
if (facets[i] == "sources") {
add_single_facet(acc, "Sources", data.xtargets, SourceMax, null);
} else if (facets[i] == "subjects") {
- add_single_facet(acc, "Subjects", data.subject, SubjectMax, "su");
+ add_single_facet(acc, "Subjects", data.subject, SubjectMax, "subject");
} else if (facets[i] == "authors") {
- add_single_facet(acc, "Authors", data.author, AuthorMax, "au");
+ add_single_facet(acc, "Authors", data.author, AuthorMax, "author");
} else {
alert("bad facet configuration: '" + facets[i] + "'");
}
@@ -200,19 +270,19 @@ function my_onterm(data) {
replaceHtml(termlist, acc.join(''));
}
-function add_single_facet(acc, caption, data, max, cclIndex) {
+function add_single_facet(acc, caption, data, max, pzIndex) {
acc.push('
');
acc.push('
' + M(caption) + '
');
for (var i = 0; i < data.length && i < max; i++ ) {
acc.push('
');
acc.push('
' + data[i].name + ' '
+ '
' + data[i].freq + ' ');
@@ -235,8 +305,18 @@ function my_onrecord(data) {
function my_onbytarget(data) {
var targetDiv = document.getElementById("mkwsBytarget");
- var table ='
Target ID Hits Diags '
- +'Records State ';
+ if (!targetDiv) {
+ // No mkwsTargets div.
+ return;
+ }
+
+ var table ='' +
+ '' + M('Target ID') + ' ' +
+ '' + M('Hits') + ' ' +
+ '' + M('Diags') + ' ' +
+ '' + M('Records') + ' ' +
+ '' + M('State') + ' ' +
+ ' ';
for (var i = 0; i < data.length; i++ ) {
table += "" + data[i].id +
@@ -272,7 +352,7 @@ function onFormSubmitEventHandler()
resetPage();
loadSelect();
triggerSearch();
- switchView('records'); // In case it's configured to start off as hidden
+ mkws.switchView('records'); // In case it's configured to start off as hidden
submitted = true;
return false;
}
@@ -294,7 +374,24 @@ function resetPage()
function triggerSearch ()
{
- my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
+ var pp2filter = "";
+ var pp2limit = "";
+
+ for (var i in mkws.filters) {
+ var filter = mkws.filters[i];
+ if (filter.id) {
+ if (pp2filter)
+ pp2filter += ",";
+ pp2filter += 'pz:id=' + filter.id;
+ } else {
+ if (pp2limit)
+ pp2limit += ",";
+ pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
+ }
+ }
+
+ debug("triggerSearch: filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
+ my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit });
}
function loadSelect ()
@@ -308,37 +405,102 @@ function loadSelect ()
}
// limit the query after clicking the facet
-function limitQuery (field, value)
+mkws.limitQuery = function (field, value)
{
- document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
- onFormSubmitEventHandler();
+ debug("limitQuery(field=" + field + ", value=" + value + ")");
+ mkws.filters.push({ field: field, value: value });
+ redraw_navi();
+ resetPage();
+ loadSelect();
+ triggerSearch();
+ return false;
}
// limit by target functions
-function limitTarget (id, name)
+mkws.limitTarget = function (id, name)
{
- var navi = document.getElementById('mkwsNavi');
- navi.innerHTML =
- 'Source: '
- + name + ' ';
- curFilter = 'pz:id=' + id;
+ debug("limitTarget(id=" + id + ", name=" + name + ")");
+ mkws.filters.push({ id: id, name: name });
+ redraw_navi();
resetPage();
loadSelect();
triggerSearch();
return false;
}
-function delimitTarget ()
+mkws.delimitQuery = function (field, value)
{
- var navi = document.getElementById('mkwsNavi');
- navi.innerHTML = '';
- curFilter = null;
+ debug("delimitQuery(field=" + field + ", value=" + value + ")");
+ var newFilters = [];
+ for (var i in mkws.filters) {
+ var filter = mkws.filters[i];
+ if (filter.field &&
+ field == filter.field &&
+ value == filter.value) {
+ debug("delimitTarget() removing filter " + JSON.stringify(filter));
+ } else {
+ debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+ newFilters.push(filter);
+ }
+ }
+ mkws.filters = newFilters;
+
+ redraw_navi();
resetPage();
loadSelect();
triggerSearch();
return false;
}
+
+mkws.delimitTarget = function (id)
+{
+ debug("delimitTarget(id=" + id + ")");
+ var newFilters = [];
+ for (var i in mkws.filters) {
+ var filter = mkws.filters[i];
+ if (filter.id) {
+ debug("delimitTarget() removing filter " + JSON.stringify(filter));
+ } else {
+ debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+ newFilters.push(filter);
+ }
+ }
+ mkws.filters = newFilters;
+
+ redraw_navi();
+ resetPage();
+ loadSelect();
+ triggerSearch();
+ return false;
+}
+
+
+function redraw_navi ()
+{
+ var navi = document.getElementById('mkwsNavi');
+ if (!navi) return;
+
+ var text = "";
+ for (var i in mkws.filters) {
+ if (text) {
+ text += " | ";
+ }
+ var filter = mkws.filters[i];
+ if (filter.id) {
+ text += 'Source: ' + filter.name + ' ';
+ } else {
+ text += filter.field + ': ' + filter.value + ' ';
+ }
+ }
+
+ navi.innerHTML = text;
+}
+
+
function drawPager (pagerDiv)
{
//client indexes pages from 1 but pz2 from 0
@@ -355,7 +517,7 @@ function drawPager (pagerDiv)
var prev = '<< ' + M('Prev') + ' | ';
if (curPage > 1)
- prev = ''
+ prev = ' '
+'<< ' + M('Prev') + ' | ';
var middle = '';
@@ -364,13 +526,13 @@ function drawPager (pagerDiv)
if(i == curPage)
numLabel = '' + i + ' ';
- middle += ' '
+ middle += ' '
+ numLabel + ' ';
}
var next = ' | ' + M('Next') + ' >> ';
if (pages - curPage > 0)
- next = ' | '
+ next = ' | '
+ M('Next') + ' >> ';
var predots = '';
@@ -385,7 +547,7 @@ function drawPager (pagerDiv)
+ prev + predots + middle + postdots + next + '';
}
-function showPage (pageNum)
+mkws.showPage = function (pageNum)
{
curPage = pageNum;
my_paz.showPage( curPage - 1 );
@@ -393,21 +555,23 @@ function showPage (pageNum)
// simple paging functions
-function pagerNext() {
+mkws.pagerNext = function () {
if ( totalRec - recPerPage*curPage > 0) {
my_paz.showNext();
curPage++;
}
}
-function pagerPrev() {
+mkws.pagerPrev = function () {
if ( my_paz.showPrev() != false )
curPage--;
}
// switching view between targets and records
-function switchView(view) {
+mkws.switchView = function(view) {
+ debug("switchView: " + view);
+
var targets = document.getElementById('mkwsTargets');
var results = document.getElementById('mkwsResults') ||
document.getElementById('mkwsRecords');
@@ -439,7 +603,7 @@ function switchView(view) {
}
// detailed record drawing
-function showDetails (prefixRecId) {
+mkws.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
var oldRecId = curDetRecId;
curDetRecId = recId;
@@ -476,38 +640,82 @@ function replaceHtml(el, html) {
function renderDetails(data, marker)
{
+ if (mkws.templateRecord === undefined) {
+ maybeLoadTemplate("Record");
+ }
+
+ if (mkws.templateRecord) {
+ var template = mkws.templateRecord;
+ return template(data);
+ }
+
var details = '';
- if (marker) details += ''+ marker + ' ';
+ if (marker) details += ''+ marker + ' ';
+
+ var locations = [];
+ for (var i in data.location) {
+ locations.push(data.location[i]['@name']);
+ }
details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
details += renderField("Date", data["md-date"]);
details += renderField("Author", data["md-author"]);
details += renderField("URL", data["md-electronic-url"]);
details += renderField("Subject", data["location"][0]["md-subject"]);
- details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
+ if (locations.length == 0) {
+ details += 'No locations for record! ';
+ } else {
+ details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
+ }
details += '
';
return details;
}
+
+function maybeLoadTemplate(name)
+{
+ debug("trying to load template 'name'");
+ var source = $("#mkwsTemplate" + name).html();
+ debug("source = " + source);
+ if (!source) {
+ // No template: mark as not provided, fall back to hardwired behaviour
+ mkws['template' + name] = 0;
+ return;
+ }
+
+ var template = Handlebars.compile(source);
+ debug("template = " + template);
+ mkws['template' + name] = template;
+}
+
+
function renderField(caption, data, data2, data3) {
if (data === undefined) {
return "";
}
- if (caption == "URL") {
- data = '' + data + ' ';
+ var res = "";
+ for (var i = 0; i < data.length; i++) {
+ var s = data[i];
+ if (i > 0)
+ res += ", ";
+
+ if (caption == "URL")
+ s = '' + s + ' ';
+
+ res += s
}
if (data2 != undefined) {
- data = data + " (" + data2 + ")";
+ res = res + " (" + data2 + ")";
}
if (data3 != undefined) {
- data = data + " " + data3 + " ";
+ res = res + " " + data3 + " ";
}
- return ' ' + M(caption) + ' ' + data + ' ';
+ return '' + M(caption) + ' ' + res + ' ';
}
@@ -515,49 +723,10 @@ function renderField(caption, data, data2, data3) {
* All the HTML stuff to render the search forms and
* result pages.
*/
-function mkws_html_all(config) {
-
- /* default mkws config */
- var mkws_config_default = {
- sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
- perpage: [10, 20, 30, 50],
- sort_default: "relevance",
- perpage_default: 20,
- query_width: 50,
- switch_menu: false, /* show/hide Records|Targets menu */
- lang_menu: true, /* show/hide language menu */
- sort_menu: true, /* show/hide sort menu */
- perpage_menu: true, /* show/hide perpage menu */
- lang_display: [], /* display languages links for given languages, [] for all */
- facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
- responsive_design_width: 980, /* a page with less pixel width considered as narrow */
- debug: 1, /* debug level for development: 0..2 */
-
- dummy: "dummy"
- };
-
- /* set global debug flag early */
- if (typeof config.debug !== 'undefined') {
- mkws_debug = config.debug;
- } else if (typeof mkws_config_default.debug !== 'undefined') {
- mkws_debug = mkws_config_default.debug;
- }
-
- /* override standard config values by function parameters */
- for (var k in mkws_config_default) {
- if (typeof config[k] === 'undefined')
- mkws_config[k] = mkws_config_default[k];
- debug("Set config: " + k + ' => ' + mkws_config[k]);
- }
-
- if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
- debug("Reset query width: " + mkws_config.query_width);
- mkws_config.query_width = 50;
- }
-
- mkws_set_lang(mkws_config);
- if (mkws_config.lang_menu)
- mkws_html_lang(mkws_config);
+function mkws_html_all() {
+ mkws_set_lang();
+ if (mkws_config.show_lang)
+ mkws_html_lang();
// For some reason, doing this programmatically results in
// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
@@ -602,23 +771,24 @@ function mkws_html_all(config) {
if ($("#mkwsRanking").length) {
var ranking_data = '';
ranking_data += '';
$("#mkwsRanking").html(ranking_data);
}
- mkws_html_switch(config);
+ mkws_html_switch();
if (mkws_config.use_service_proxy)
- mkws_service_proxy_auth(config.service_proxy_auth);
+ mkws_service_proxy_auth(mkws_config.service_proxy_auth,
+ mkws_config.service_proxy_auth_domain);
- if (mkws_config.responsive_design) {
+ if (mkws_config.responsive_design_width) {
// Responsive web design - change layout on the fly based on
// current screen width. Required for mobile devices.
$(window).resize( function(e) { mkws_resize_page() });
@@ -639,9 +809,9 @@ function mkws_html_all(config) {
}
}
-function mkws_set_lang(mkws_config) {
- var lang = $.parseQuerystring().lang || mkws_config.lang || "";
- if (!lang || !mkws_locale_lang[lang]) {
+function mkws_set_lang() {
+ var lang = $.parseQuerystring().lang || mkws_config.lang;
+ if (!lang || !mkws.locale_lang[lang]) {
mkws_config.lang = ""
} else {
mkws_config.lang = lang;
@@ -651,20 +821,12 @@ function mkws_set_lang(mkws_config) {
return mkws_config.lang;
}
-function mkws_html_switch(config) {
+function mkws_html_switch() {
debug("HTML switch");
- $("#mkwsSwitch").html($(" ", {
- href: '#',
- onclick: "switchView(\'records\')",
- text: M("Records")
- }));
+ $("#mkwsSwitch").append($('' + M('Records') + ' '));
$("#mkwsSwitch").append($(" ", { text: " | " }));
- $("#mkwsSwitch").append($(" ", {
- href: '#',
- onclick: "switchView(\'targets\')",
- text: M("Targets")
- }));
+ $("#mkwsSwitch").append($('' + M('Targets') + ' '));
debug("HTML targets");
$("#mkwsTargets").html('\
@@ -672,41 +834,37 @@ function mkws_html_switch(config) {
No information available yet.\
');
$("#mkwsTargets").css("display", "none");
-
- if (!config.switch_menu) {
- debug("disable switch menu");
- $("#mkwsSwitch").css("display", "none");
- }
}
-function mkws_html_sort(config) {
+function mkws_html_sort() {
debug("HTML sort");
var sort_html = '';
- for(var i = 0; i < config.sort.length; i++) {
- var key = config.sort[i][0];
- var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
+ for(var i = 0; i < mkws_config.sort_options.length; i++) {
+ var opt = mkws_config.sort_options[i];
+ var key = opt[0];
+ var val = opt.length == 1 ? opt[0] : opt[1];
sort_html += '' + val + ' ';
+ sort_html += '>' + M(val) + '';
}
sort_html += ' ';
return sort_html;
}
-function mkws_html_perpage(config) {
+function mkws_html_perpage() {
debug("HTML perpage");
var perpage_html = '';
- for(var i = 0; i < config.perpage.length; i++) {
- var key = config.perpage[i];
+ for(var i = 0; i < mkws_config.perpage_options.length; i++) {
+ var key = mkws_config.perpage_options[i];
perpage_html += '' + key + ' ';
@@ -721,13 +879,14 @@ function mkws_html_perpage(config) {
* The username/password is configured in the apache config file
* for the site.
*/
-function mkws_service_proxy_auth(auth_url) {
- if (!auth_url)
- auth_url = "http://mkws.indexdata.com/service-proxy-auth";
-
+function mkws_service_proxy_auth(auth_url, auth_domain) {
debug("Run service proxy auth URL: " + auth_url);
- var request = new pzHttpRequest(auth_url);
+ var request = new pzHttpRequest(auth_url, function(err) {
+ alert("HTTP call for authentication failed: " + err)
+ return;
+ }, auth_domain);
+
request.get(null, function(data) {
if (!$.isXMLDoc(data)) {
alert("service proxy auth response document is not valid XML document, give up!");
@@ -738,29 +897,32 @@ function mkws_service_proxy_auth(auth_url) {
alert("service proxy auth repsonse status: " + status.text() + ", give up!");
return;
}
+
+ debug("Service proxy auth successfully done");
+ mkws.service_proxy_auth = true;
});
}
/* create locale language menu */
-function mkws_html_lang(mkws_config) {
+function mkws_html_lang() {
var lang_default = "en";
var lang = mkws_config.lang || lang_default;
var list = [];
/* display a list of configured languages, or all */
- var lang_display = mkws_config.lang_display || [];
+ var lang_options = mkws_config.lang_options || [];
var hash = {};
- for (var i = 0; i < lang_display.length; i++) {
- hash[lang_display[i]] = 1;
+ for (var i = 0; i < lang_options.length; i++) {
+ hash[lang_options[i]] = 1;
}
- for (var k in mkws_locale_lang) {
- if (hash[k] == 1 || lang_display.length == 0)
+ for (var k in mkws.locale_lang) {
+ if (hash[k] == 1 || lang_options.length == 0)
list.push(k);
}
// add english link
- if (lang_display.length == 0 || hash[lang_default] == 1)
+ if (lang_options.length == 0 || hash[lang_default] == 1)
list.push(lang_default);
debug("Language menu for: " + list.join(", "));
@@ -786,7 +948,7 @@ function mkws_html_lang(mkws_config) {
function mkws_resize_page () {
var list = ["mkwsSwitch"];
- var width = mkws_config.responsive_design_width || 980;
+ var width = mkws_config.responsive_design_width;
var parentId = $("#mkwsTermlists").parent().attr('id');
if ($(window).width() <= width &&
@@ -814,10 +976,10 @@ function mkws_resize_page () {
function M(word) {
var lang = mkws_config.lang;
- if (!lang || !mkws_locale_lang[lang])
+ if (!lang || !mkws.locale_lang[lang])
return word;
- return mkws_locale_lang[lang][word] ? mkws_locale_lang[lang][word] : word;
+ return mkws.locale_lang[lang][word] || word;
}
/*
@@ -842,6 +1004,9 @@ $.extend({
// service-proxy or pazpar2
pazpar2: function(config) {
+ var id_popup = config.id_popup || "#mkwsPopup";
+ id_popup = id_popup.replace(/^#/, "");
+
// simple layout
var div = '
\
\
@@ -898,7 +1063,7 @@ $.extend({
var popup = '\
\
-