X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=81b71c7462470f1570b35aedd065ccb1cd35a300;hp=0013960e9c49864ac9d3b73fd57620181f3ca0e8;hb=cb3027a4ef6f6cc32acd558f1a2585d14e223775;hpb=868a9d3bda5586bb774d8f9da4a6f7158c7057e3

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 0013960..81b71c7 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -19,15 +19,18 @@ mkws.registerWidgetType('targets', function() {
     var cleandata = [];
     for (var i = 0; i < data.length; i++) {
       var cur = {};
+      cur.name = data[i].name;
       cur.id = data[i].id;
       cur.hits = data[i].hits;
       cur.diagnostic = data[i].diagnostic;
       cur.message = data[i].message;
       cur.records = data[i].records;
-      cur.state = data[i].state;
+      cur.state = data[i].state.replace(/^Client_/, '');
       cleandata.push(cur);
     }
 
+    cleandata.sort(function(a,b) { return a.name.localeCompare(b.name) });
+
     var template = that.team.loadTemplate(that.config.template || "targets");
     that.node.html(template({data: cleandata}));
   });
@@ -111,10 +114,15 @@ mkws.registerWidgetType('records', function() {
   var that = this;
   var team = this.team;
 
+  this.team.queue("searchtriggered").subscribe(function() {
+    var op = that.config['newsearch_opacity'];
+    if (op !== undefined) { that.node.fadeTo(500, op); }
+  });
+
   this.team.queue("records").subscribe(function(data) {
+    that.node.css('opacity', 1);
     for (var i = 0; i < data.hits.length; i++) {
       var hit = data.hits[i];
-      that.team.queue("record").publish(hit);
       hit.detailLinkId = team.recordElementId(hit.recid[0]);
       hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
       hit.containerClass = "mkws-summary mkwsSummary mkws-team-" + team.name();
@@ -129,7 +137,7 @@ mkws.registerWidgetType('records', function() {
       }
     }
     var template = team.loadTemplate(that.config.template || "records");
-    var summaryPartial = team.loadTemplate("summary");
+    var summaryPartial = team.loadTemplate(that.config['summary-template'] || "summary");
     var tdata = $.extend({}, {"hits": data.hits}, that.config.template_vars);
     that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
   });
@@ -142,7 +150,7 @@ mkws.registerWidgetType('navi', function() {
   var that = this;
   var teamName = this.team.name();
 
-  this.team.queue("navi").subscribe(function() {
+  this.team.queue("searchtriggered").subscribe(function() {
     var filters = that.team.filters();
     var output = {filters:[]};
 
@@ -221,7 +229,6 @@ mkws.registerWidgetType('switch', function() {
 mkws.registerWidgetType('search', function() {
   var output = {};
   output.team = this.team.name();
-  output.queryWidth = this.config.query_width;
   var template = this.team.loadTemplate(this.config.template || "search");
   this.node.html(template(output));
 });
@@ -253,18 +260,18 @@ mkws.registerWidgetType('ranking', function() {
   output.showPerPage = this.config.show_perpage;
 
   var order = this.team.sortOrder();
-  this.log("making sort, sortOrder = '" + order + "'");
+  this.info("making sort, sortOrder = '" + order + "'");
   for (var i = 0; i < this.config.sort_options.length; i++) {
     var cur = {};
     var opt = this.config.sort_options[i];
     cur.key = opt[0];
-    cur.label = opt.length == 1 ? opt[0] : opt[1];
+    cur.label = opt.length == 1 ? opt[0] : mkws.M(opt[1]);
     if (order == cur.key || order == cur.label) cur.selected = true;
     output.sort.push(cur);
   }
 
   var perpage = this.team.perpage();
-  this.log("making perpage, perpage = " + perpage);
+  this.info("making perpage, perpage = " + perpage);
   for(var i = 0; i < this.config.perpage_options.length; i++) {
     var cur = {};
     cur.perPage = this.config.perpage_options[i];
@@ -312,7 +319,7 @@ mkws.registerWidgetType('lang', function() {
       list.push(cur);
   }
 
-  this.log("language menu: " + list.join(", "));
+  this.info("language menu: " + list.join(", "));
 
   var template = this.team.loadTemplate(this.config.template || "lang");
   this.node.html(template({languages: list}));
@@ -357,7 +364,7 @@ mkws.registerWidgetType('config', function() {
   for (var name in c) {
     if (c.hasOwnProperty(name)) {
       this.team.config[name] = c[name];
-      this.log(this + " copied property " + name + "='" + c[name] + "' up to team");
+      this.info(this + " copied property " + name + "='" + c[name] + "' up to team");
     }
   }
 });