X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=99307753516046a4bbadf8e24b0e5625f8e407d4;hb=a5db5420d793ca8550f326036e6fa30c95189719;hp=f76edbca775cb8dd49e0028995023191d71b6d91;hpb=072bc22a4fd7ef52fd0d1d77daaf24e4834f3db7;p=mkws-moved-to-github.git
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index f76edbc..9930775 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -121,26 +121,29 @@ mkws.registerWidgetType('Records', function() {
mkws.registerWidgetType('Navi', function() {
var that = this;
var teamName = this.team.name();
- var M = mkws.M;
this.team.queue("navi").subscribe(function() {
var filters = that.team.filters();
- var text = "";
+ var output = {filters:[]};
filters.visitTargets(function(id, name) {
- if (text) text += " | ";
- text += M('source') + ': ' + name + '';
+ var cur = {};
+ cur.facet = 'source';
+ cur.value = name;
+ cur.click = "mkws.delimitTarget('" + teamName + "', '" + id + "'); return false;";
+ output.filters.push(cur);
});
filters.visitFields(function(field, value) {
- if (text) text += " | ";
- text += M(field) + ': ' + value + '';
+ var cur = {};
+ cur.facet = field;
+ cur.value = value;
+ cur.click = "mkws.delimitQuery('" + teamName + "', '" + field + "', '" + value + "'" + ");return false;";
+ output.filters.push(cur);
});
- that.node.html(text);
+ var template = that.team.loadTemplate(that.config.template || "Navi");
+ that.node.html(template(output));
});
});
@@ -342,19 +345,13 @@ mkws.registerWidgetType('Config', function() {
mkws.registerWidgetType('Progress', function() {
var that = this;
-
this.node.hide();
this.team.queue("stat").subscribe(function(data) {
- var s = '';
- for (var i = 0; i < data.clients; i++) {
- if (i == data.clients - data.activeclients) {
- s += '';
- s += '';
- }
- s += '█';
- }
- s += '';
- that.node.html(s);
+ var template = this.team.loadTemplate(this.config.template || "Progress");
+ this.node.html(template({
+ done: data.clients - data.activeclients,
+ waiting: data.activeclients
+ }));
that.node.show();
});
});