Don't wrap mkwsStatus element's "Retrieved records" in a pointless <span>

[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 cf2c46f..a9263ca 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -40,11 +40,10 @@ mkws.registerWidgetType('Stat', function() {
   this.team.queue("stat").subscribe(function(data) {
     if (that.node.length === 0)  alert("huh?!");
 
-    $(that.node).html('<span class="head">' + M('Status info') + '</span>' +
+    $(that.node).html(' -- ' +
+                      '<span class="mkwsClientCount">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
                       ' -- ' +
-                      '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
-                      ' -- ' +
-                      '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+                      M('Retrieved records') + ': ' + data.records + '/' + data.hits);
   });
 });
 
@@ -157,13 +156,13 @@ mkws.registerWidgetType('Navi', function() {
 
     filters.visitTargets(function(id, name) {
       if (text) text += " | ";
-      text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
+      text += M('source') + ': <a class="mkwsRemovable" href="#" onclick="mkws.delimitTarget(\'' + teamName +
         "', '" + id + "'" + ');return false;">' + name + '</a>';
     });
 
     filters.visitFields(function(field, value) {
       if (text) text += " | ";
-      text += M(field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
+      text += M(field) + ': <a class="mkwsRemovable" href="#" onclick="mkws.delimitQuery(\'' + teamName +
         "', '" + field + "', '" + value + "'" +
         ');return false;">' + value + '</a>';
     });
@@ -234,7 +233,7 @@ mkws.registerWidgetType('Search', function() {
 
 
 mkws.registerWidgetType('SearchForm', function() {
-  var team = this.team;    
+  var team = this.team;
   $(this.node).submit(function() {
     var val = team.widget('Query').value();
     team.newSearch(val);