Remove unnecessary (and unused) hardwired default.

[mkws-moved-to-github.git] / src / mkws-widget-main.js

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 3ee3bc7..53e2f5c 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -22,12 +22,13 @@ mkws.registerWidgetType('targets', function() {
       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;
       cleandata.push(cur);
     }
 
-    var template = that.team.loadTemplate(that.config.template || "Targets");
+    var template = that.team.loadTemplate(that.config.template || "targets");
     that.node.html(template({data: cleandata}));
   });
 });
@@ -36,7 +37,7 @@ mkws.registerWidgetType('targets', function() {
 mkws.registerWidgetType('stat', function() {
   var that = this;
   this.team.queue("stat").subscribe(function(data) {
-    var template = that.team.loadTemplate(that.config.template || "Stat");
+    var template = that.team.loadTemplate(that.config.template || "stat");
     that.node.html(template(data));
   });
 });
@@ -55,7 +56,7 @@ mkws.registerWidgetType('pager', function() {
     output.found = data.total;
 
     //client indexes pages from 1 but pz2 from 0
-    var onsides = 6;
+    var onsides = 5;
     var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
     var currentPage = that.team.currentPage();
 
@@ -83,7 +84,7 @@ mkws.registerWidgetType('pager', function() {
 
     if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
 
-    var template = that.team.loadTemplate(that.config.template || "Pager");
+    var template = that.team.loadTemplate(that.config.template || "pager");
     that.node.html(template(output));
   });
 });
@@ -101,11 +102,10 @@ mkws.registerWidgetType('details', function() {
   this.team.queue("record").subscribe(function(data) {
     console.log(data);
     if ($.inArray(recid, data.recid) > -1) {
-      var template = that.team.loadTemplate(that.config.template || "Record");
+      var template = that.team.loadTemplate(that.config.template || "details");
       that.node.html(template(data));
     }
   });
-  that.autosearch();
 });
 
 mkws.registerWidgetType('records', function() {
@@ -129,9 +129,10 @@ mkws.registerWidgetType('records', function() {
         } 
       }
     }
-    var template = team.loadTemplate(that.config.template || "Records");
-    var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
-    that.node.html(template(targs));
+    var template = team.loadTemplate(that.config.template || "records");
+    var summaryPartial = team.loadTemplate("summary");
+    var tdata = $.extend({}, {"hits": data.hits}, that.config.template_vars);
+    that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
   });
 
   that.autosearch();
@@ -162,7 +163,7 @@ mkws.registerWidgetType('navi', function() {
       output.filters.push(cur);
     });
 
-    var template = that.team.loadTemplate(that.config.template || "Navi");
+    var template = that.team.loadTemplate(that.config.template || "navi");
     that.node.html(template(output));
   });
 });
@@ -200,7 +201,7 @@ mkws.registerWidgetType('per-page', function() {
 mkws.registerWidgetType('done', function() {
   var that = this;
   this.team.queue("complete").subscribe(function(n) {
-    var template = that.team.loadTemplate(that.config.template || "Done");
+    var template = that.team.loadTemplate(that.config.template || "done");
     that.node.html(template({count: n}));
   });
 });
@@ -212,7 +213,7 @@ mkws.registerWidgetType('switch', function() {
   var output = {};
   output.recordClick = "mkws.switchView(\'" + tname + "\', \'records\')";
   output.targetClick = "mkws.switchView(\'" + tname + "\', \'targets\')";
-  var template = this.team.loadTemplate(this.config.template || "Switch");
+  var template = this.team.loadTemplate(this.config.template || "switch");
   this.node.html(template(output));
   this.hideWhenNarrow();
 });
@@ -222,7 +223,7 @@ 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");
+  var template = this.team.loadTemplate(this.config.template || "search");
   this.node.html(template(output));
 });
 
@@ -238,7 +239,7 @@ mkws.registerWidgetType('search-form', function() {
 
 
 mkws.registerWidgetType('results', function() {
-  var template = this.team.loadTemplate(this.config.template || "Results");
+  var template = this.team.loadTemplate(this.config.template || "results");
   this.node.html(template({team: this.team.name()}));
   this.autosearch();
 });
@@ -272,7 +273,7 @@ mkws.registerWidgetType('ranking', function() {
     output.perPage.push(cur);
   }
 
-  var template = this.team.loadTemplate(this.config.template || "Ranking");
+  var template = this.team.loadTemplate(this.config.template || "ranking");
   this.node.html(template(output));
 });
 
@@ -287,7 +288,7 @@ mkws.registerWidgetType('lang', function() {
   var list = [];
 
   /* display a list of configured languages, or all */
-  var lang_options = this.config.lang_options || [];
+  var lang_options = this.config.lang_options;
   var toBeIncluded = {};
   for (var i = 0; i < lang_options.length; i++) {
     toBeIncluded[lang_options[i]] = true;
@@ -314,7 +315,7 @@ mkws.registerWidgetType('lang', function() {
 
   this.log("language menu: " + list.join(", "));
 
-  var template = this.team.loadTemplate(this.config.template || "Lang");
+  var template = this.team.loadTemplate(this.config.template || "lang");
   this.node.html(template({languages: list}));
   this.hideWhenNarrow();
 
@@ -367,7 +368,7 @@ mkws.registerWidgetType('progress', function() {
   var that = this;
   this.node.hide();
   this.team.queue("stat").subscribe(function(data) {
-    var template = that.team.loadTemplate(that.config.template || "Progress");
+    var template = that.team.loadTemplate(that.config.template || "progress");
     that.node.html(template({
       done: data.clients - data.activeclients,
       waiting: data.activeclients