From: Mike Taylor <mike@indexdata.com>
Date: Fri, 17 Oct 2014 14:25:58 +0000 (+0100)
Subject: Towards MKWS-294 (Change names of MKWS classes to be case-insensitive)
X-Git-Tag: 1.0.0~155^2~16
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=f944d2112f977ffe31545ceaee8a1ebeb1e128d8;p=mkws-moved-to-github.git

Towards MKWS-294 (Change names of MKWS classes to be case-insensitive)

The code now runs with the new-style classes. But there is lots more to do. Running applications are as ugly as sin because the CSS styles don't yet apply; use of teams has yet to be tested; backwards compatibility is only partly implemented; many examples need testing under the compatibility rules, then upgrading
---

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 3a4fa5b..df7382f 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -286,6 +286,16 @@ mkws.log("Using window.name '" + window.name + "'");
 // wrapper to provide local copy of the jQuery object.
 (function($) {
   var log = mkws.log;
+  var _old2new = { // Maps old-style widget names to new-style
+    'Authname': 'auth-name',
+    'ConsoleBuilder': 'console-builder',
+    'Coverart': 'cover-art',
+    'GoogleImage': 'google-image',
+    'MOTD': 'motd',
+    'MOTDContainer': 'motd-container',
+    'Perpage': 'per-page',
+    'SearchForm': 'search-form',
+  };
 
   function handleNodeWithTeam(node, callback) {
     // First branch for DOM objects; second branch for jQuery objects
@@ -303,10 +313,15 @@ mkws.log("Using window.name '" + window.name + "'");
 
     for (var i = 0; i < list.length; i++) {
       var cname = list[i];
-      if (cname.match(/^mkwsTeam_/)) {
-        teamName = cname.replace(/^mkwsTeam_/, '');
+      if (cname.match(/^mkws-team-/)) {
+        teamName = cname.replace(/^mkws-team-/, '');
+      } else if (cname.match(/^mkws-/)) {
+        // New-style names of the form mkws-foo-bar
+        type = cname.replace(/^mkws-/, '');
       } else if (cname.match(/^mkws/)) {
-        type = cname.replace(/^mkws/, '');
+        // Old-style names of the form mkwsFooBar
+        var tmp = cname.replace(/^mkws/, '');
+        type = _old2new[tmp] || tmp;
       }
     }
 
@@ -353,8 +368,8 @@ mkws.log("Using window.name '" + window.name + "'");
       for (var tname in mkws.teams) {
         var team = mkws.teams[tname];
         team.visitWidgets(function(t, w) {
-          var w1 = team.widget(t + "-Container-" + from);
-          var w2 = team.widget(t + "-Container-" + to);
+          var w1 = team.widget(t + "-container-" + from);
+          var w2 = team.widget(t + "-container-" + to);
           if (w1) {
             w1.node.hide();
           }
@@ -443,9 +458,10 @@ mkws.log("Using window.name '" + window.name + "'");
       var s = "";
       for (var type in mkws.widgetType2function) {
 	if (s) s += ',';
-	s += '.mkws' + type;
-	s += ',.mkws' + type + "-Container-wide";
-	s += ',.mkws' + type + "-Container-narrow";
+	s += '.mkws-' + type;
+	s += ',.mkws-' + type + "-container-wide";
+	s += ',.mkws-' + type + "-container-narrow";
+        // ### Do we need to do something about old-style names?
       }
       return s;
     }
diff --git a/src/mkws-popup.js b/src/mkws-popup.js
index 7496a07..ee26049 100644
--- a/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@ -4,13 +4,13 @@
 
 //"use strict";
 // $(document).ready(function () {
-mkws.registerWidgetType('Popup', function() {
+mkws.registerWidgetType('popup', function() {
     var $ = mkws.$;
     var debug = mkws.log;
     debug("init popup window");
 
     var popup_window = $(this.node);
-    // var popup_window = $(".mkwsPopup"); // $(document).ready()
+    // var popup_window = $(".mkws-popup"); // $(document).ready()
     if (!popup_window) {
         debug("no popup found, skip...");
         return;
@@ -49,7 +49,7 @@ mkws.registerWidgetType('Popup', function() {
             close: function() {}
         });
 
-        // open at search query submit: "input.mkwsButton"
+        // open at search query submit: "input.mkws-button"
         var id_botton = that.attr("popup_button");
         if (id_botton) {
             $(id_botton).button().click(function() {
diff --git a/src/mkws-team.js b/src/mkws-team.js
index 0879add..0825553 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -191,13 +191,13 @@ mkws.makeTeam = function($, teamName) {
 
   // Used by the Records widget and onRecord()
   function recordElementId(s) {
-    return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
+    return 'mkws-rec_' + s.replace(/[^a-z0-9]/ig, '_');
   }
   that.recordElementId = recordElementId;
 
   // Used by onRecord(), showDetails() and renderDetails()
   function recordDetailsId(s) {
-    return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
+    return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
   }
 
 
@@ -390,10 +390,10 @@ mkws.makeTeam = function($, teamName) {
     teamName = teamName || m_teamName;
 
     if (teamName === 'AUTO') {
-      selector = (selector + '.mkwsTeam_' + teamName + ',' +
-                  selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+      selector = (selector + '.mkws-team-' + teamName + ',' +
+                  selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"],[class^="mkws-team-"],[class*=" mkws-team-"])');
     } else {
-      selector = selector + '.mkwsTeam_' + teamName;
+      selector = selector + '.mkws-team-' + teamName;
     }
 
     var node = $(selector);
@@ -410,7 +410,7 @@ mkws.makeTeam = function($, teamName) {
   function renderDetails(data, marker) {
     var template = loadTemplate("Record");
     var details = template(data);
-    return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
+    return '<div class="mkws-details mkws-team-' + m_teamName + '" ' +
       'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
   }
   that.renderDetails = renderDetails;
@@ -425,9 +425,9 @@ mkws.makeTeam = function($, teamName) {
     var template = m_template[name];
     if (template === undefined && Handlebars.compile) {
       var source;
-      var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
+      var node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
       if (node && node.length < 1) {
-        node = $(".mkwsTemplate_" + name);
+        node = $(".mkws-template_" + name);
       }
       if (node) source = node.html();
       if (!source) source = m_templateText[name];
diff --git a/src/mkws-widget-authname.js b/src/mkws-widget-authname.js
index b1e0b1f..b96dad2 100644
--- a/src/mkws-widget-authname.js
+++ b/src/mkws-widget-authname.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('Authname', function() {
+mkws.registerWidgetType('auth-name', function() {
   var that = this;
 
   this.team.queue("authenticated").subscribe(function(authName) {
diff --git a/src/mkws-widget-builder.js b/src/mkws-widget-builder.js
index 6468e86..dac54ab 100644
--- a/src/mkws-widget-builder.js
+++ b/src/mkws-widget-builder.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('Builder', function() {
+mkws.registerWidgetType('builder', function() {
   var that = this;
   var team = this.team;
 
@@ -8,11 +8,11 @@ mkws.registerWidgetType('Builder', function() {
   });
   this.node.append(button);
   button.click(function() {
-    var   query = team.widget('Query').value();
-    var    sort = team.widget('Sort').value();
-    var perpage = team.widget('Perpage').value();
+    var   query = team.widget('query').value();
+    var    sort = team.widget('sort').value();
+    var perpage = team.widget('per-page').value();
 
-    var html = ('<div class="mkwsRecords" ' +
+    var html = ('<div class="mkws-records" ' +
                 'autosearch="' + query + '" ' +
                 'sort="' + sort + '" ' +
                 'perpage="' + perpage + '"></div>');
@@ -21,8 +21,8 @@ mkws.registerWidgetType('Builder', function() {
   });
 });
 
-mkws.registerWidgetType('ConsoleBuilder', function() {
-  mkws.promotionFunction('Builder').call(this);
+mkws.registerWidgetType('console-builder', function() {
+  mkws.promotionFunction('builder').call(this);
   this.callback = function(s) {
     console.log("generated widget: " + s);
   }
diff --git a/src/mkws-widget-categories.js b/src/mkws-widget-categories.js
index 6982db8..754e68b 100644
--- a/src/mkws-widget-categories.js
+++ b/src/mkws-widget-categories.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('Categories', function() {
+mkws.registerWidgetType('categories', function() {
   var that = this;
 
   if (!mkws.authenticated) {
@@ -20,7 +20,7 @@ mkws.registerWidgetType('Categories', function() {
 
       var text = [];
       text.push("Select category: ");
-      text.push("<select name='mkwsCategory' " +
+      text.push("<select name='mkws-category' " +
                 "onchange='mkws.limitCategory(\"" + that.team.name() + "\", this.value)'>");
       text.push("<option value=''>[All]</option>");
       $(data).find('category').each(function() {
diff --git a/src/mkws-widget-log.js b/src/mkws-widget-log.js
index 4ea6cd8..b520e35 100644
--- a/src/mkws-widget-log.js
+++ b/src/mkws-widget-log.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('Log', function() {
+mkws.registerWidgetType('log', function() {
   var that = this;
 
   this.team.queue("log").subscribe(function(teamName, timestamp, message) {
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index e01675f..500735e 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -5,7 +5,7 @@
 // source files.
 
 
-mkws.registerWidgetType('Targets', function() {
+mkws.registerWidgetType('targets', function() {
   if (!this.config.show_switch) return;
   var that = this;
 
@@ -33,7 +33,7 @@ mkws.registerWidgetType('Targets', function() {
 });
 
 
-mkws.registerWidgetType('Stat', function() {
+mkws.registerWidgetType('stat', function() {
   var that = this;
   this.team.queue("stat").subscribe(function(data) {
     var template = that.team.loadTemplate(that.config.template || "Stat");
@@ -42,7 +42,7 @@ mkws.registerWidgetType('Stat', function() {
 });
 
 
-mkws.registerWidgetType('Pager', function() {
+mkws.registerWidgetType('pager', function() {
   var that = this;
   var M = mkws.M;
 
@@ -88,7 +88,7 @@ mkws.registerWidgetType('Pager', function() {
   });
 });
 
-mkws.registerWidgetType('Details', function() {
+mkws.registerWidgetType('details', function() {
   var that = this;
   var recid = that.node.attr("data-mkws-recid");
   if (this.team.gotRecords()) { 
@@ -108,7 +108,7 @@ mkws.registerWidgetType('Details', function() {
   that.autosearch();
 });
 
-mkws.registerWidgetType('Records', function() {
+mkws.registerWidgetType('records', function() {
   var that = this;
   var team = this.team;
 
@@ -118,7 +118,7 @@ mkws.registerWidgetType('Records', function() {
       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 = "mkwsSummary mkwsTeam_" + team.name();
+      hit.containerClass = "mkws-summary mkws-team-" + team.name();
       hit.containerClass += " " + hit.detailLinkId;
       // ### At some point, we may be able to move the
       // m_currentRecordId and m_currentRecordData members
@@ -138,7 +138,7 @@ mkws.registerWidgetType('Records', function() {
 });
 
 
-mkws.registerWidgetType('Navi', function() {
+mkws.registerWidgetType('navi', function() {
   var that = this;
   var teamName = this.team.name();
 
@@ -168,10 +168,10 @@ mkws.registerWidgetType('Navi', function() {
 });
 
 
-// It seems this and the Perpage widget doen't need to subscribe to
+// It seems this and the per-page widget doen't need to subscribe to
 // anything, since they produce events rather than consuming them.
 //
-mkws.registerWidgetType('Sort', function() {
+mkws.registerWidgetType('sort', function() {
   var that = this;
 
   this.node.change(function() {
@@ -184,7 +184,7 @@ mkws.registerWidgetType('Sort', function() {
 });
 
 
-mkws.registerWidgetType('Perpage', function() {
+mkws.registerWidgetType('per-page', function() {
   var that = this;
 
   this.node.change(function() {
@@ -197,7 +197,7 @@ mkws.registerWidgetType('Perpage', function() {
 });
 
 
-mkws.registerWidgetType('Done', function() {
+mkws.registerWidgetType('done', function() {
   var that = this;
   this.team.queue("complete").subscribe(function(n) {
     var template = that.team.loadTemplate(that.config.template || "Done");
@@ -206,7 +206,7 @@ mkws.registerWidgetType('Done', function() {
 });
 
 
-mkws.registerWidgetType('Switch', function() {
+mkws.registerWidgetType('switch', function() {
   if (!this.config.show_switch) return;
   var tname = this.team.name();
   var output = {};
@@ -218,7 +218,7 @@ mkws.registerWidgetType('Switch', function() {
 });
 
 
-mkws.registerWidgetType('Search', function() {
+mkws.registerWidgetType('search', function() {
   var output = {};
   output.team = this.team.name();
   output.queryWidth = this.config.query_width;
@@ -227,24 +227,24 @@ mkws.registerWidgetType('Search', function() {
 });
 
 
-mkws.registerWidgetType('SearchForm', function() {
+mkws.registerWidgetType('search-form', function() {
   var team = this.team;
   this.node.submit(function() {
-    var val = team.widget('Query').value();
+    var val = team.widget('query').value();
     team.newSearch(val);
     return false;
   });
 });
 
 
-mkws.registerWidgetType('Results', function() {
+mkws.registerWidgetType('results', function() {
   var template = this.team.loadTemplate(this.config.template || "Results");
   this.node.html(template({team: this.team.name()}));
   this.autosearch();
 });
 
 
-mkws.registerWidgetType('Ranking', function() {
+mkws.registerWidgetType('ranking', function() {
   var output = {};
   output.perPage = [];
   output.sort = [];
@@ -277,7 +277,7 @@ mkws.registerWidgetType('Ranking', function() {
 });
 
 
-mkws.registerWidgetType('Lang', function() {
+mkws.registerWidgetType('lang', function() {
   // dynamic URL or static page? /path/foo?query=test
   /* create locale language menu */
   if (!this.config.show_lang) return;
@@ -339,8 +339,8 @@ mkws.registerWidgetType('Lang', function() {
 });
 
 
-mkws.registerWidgetType('MOTD', function() {
-  var container = this.team.widget('MOTDContainer');
+mkws.registerWidgetType('motd', function() {
+  var container = this.team.widget('motd-container');
   if (container) {
     // Move the MOTD from the provided element down into the container
     this.node.appendTo(container.node);
@@ -352,7 +352,7 @@ mkws.registerWidgetType('MOTD', function() {
 // is copied up into its team, allowing it to affect other widgets in
 // the team.
 //
-mkws.registerWidgetType('Config', function() {
+mkws.registerWidgetType('config', function() {
   var c = this.config;
   for (var name in c) {
     if (c.hasOwnProperty(name)) {
@@ -363,7 +363,7 @@ mkws.registerWidgetType('Config', function() {
 });
 
 
-mkws.registerWidgetType('Progress', function() {
+mkws.registerWidgetType('progress', function() {
   var that = this;
   this.node.hide();
   this.team.queue("stat").subscribe(function(data) {
@@ -382,9 +382,9 @@ mkws.registerWidgetType('Progress', function() {
 // no actual functionality. We register these to prevent ignorable
 // warnings when they occur.
 
-mkws.registerWidgetType('Query', function() {});
-mkws.registerWidgetType('MOTDContainer', function() {});
-mkws.registerWidgetType('Button', function() {});
+mkws.registerWidgetType('query', function() {});
+mkws.registerWidgetType('motd-container', function() {});
+mkws.registerWidgetType('button', function() {});
 
 
 })(mkws.$); // jQuery wrapper
diff --git a/src/mkws-widget-record.js b/src/mkws-widget-record.js
index 6623842..1d77e40 100644
--- a/src/mkws-widget-record.js
+++ b/src/mkws-widget-record.js
@@ -1,5 +1,5 @@
 // A widget for one record
-mkws.registerWidgetType('Record', function() {
+mkws.registerWidgetType('record', function() {
   if (!this.config.maxrecs) this.config.maxrecs = 1;
   var that = this;
   var team = this.team;
@@ -11,22 +11,22 @@ mkws.registerWidgetType('Record', function() {
   that.autosearch();
 });
 
-mkws.registerWidgetType('Image', function() {
-  mkws.promotionFunction('Records').call(this);
+mkws.registerWidgetType('image', function() {
+  mkws.promotionFunction('records').call(this);
   if (!this.config.template) this.config.template = 'Image';
 });
 
-mkws.registerWidgetType('GoogleImage', function() {
-  mkws.promotionFunction('Image').call(this);
+mkws.registerWidgetType('google-image', function() {
+  mkws.promotionFunction('image').call(this);
   if (!this.config.target) this.config.target = 'Google_Images';
 });
 
-mkws.registerWidgetType('Lolcat', function() {
-  mkws.promotionFunction('GoogleImage').call(this);
+mkws.registerWidgetType('lolcat', function() {
+  mkws.promotionFunction('google-image').call(this);
   if (!this.config.autosearch) this.config.autosearch = 'kitteh';
 });
 
-mkws.registerWidgetType('Coverart', function() {
-  mkws.promotionFunction('Image').call(this);
+mkws.registerWidgetType('cover-art', function() {
+  mkws.promotionFunction('image').call(this);
   if (!this.config.target) this.config.target = 'AmazonBooks';
 });
diff --git a/src/mkws-widget-reference.js b/src/mkws-widget-reference.js
index c8d41be..2993a60 100644
--- a/src/mkws-widget-reference.js
+++ b/src/mkws-widget-reference.js
@@ -1,5 +1,5 @@
-mkws.registerWidgetType('Reference', function() {
-  mkws.promotionFunction('Record').call(this);
+mkws.registerWidgetType('reference', function() {
+  mkws.promotionFunction('record').call(this);
   if (!this.config.target) this.config.target = 'wikimedia_wikipedia_single_result';
   if (!this.config.template) this.config.template = 'Reference';
   this.config.template_vars.paragraphs = this.config.paragraphs || 0;
diff --git a/src/mkws-widget-reference.templates/Reference.handlebars b/src/mkws-widget-reference.templates/Reference.handlebars
index 62a9d2a..bd3700a 100644
--- a/src/mkws-widget-reference.templates/Reference.handlebars
+++ b/src/mkws-widget-reference.templates/Reference.handlebars
@@ -14,4 +14,4 @@ md-* - metadata fields passed through from backend
 <i>{{md-title-responsibility}}</i>
 {{/if}}
 {{{mkws-paragraphs md-description paragraphs sentences}}}
-<p class="mkwsCredit">Wikipedia</p>
+<p class="mkws-credit">Wikipedia</p>
diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index 4052251..2e684f6 100644
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('Termlists', function() {
+mkws.registerWidgetType('termlists', function() {
   // Initially hide the termlists; display when we get results
   var that = this;
   var team = this.team;
@@ -15,7 +15,7 @@ mkws.registerWidgetType('Termlists', function() {
 });
 
 
-mkws.registerWidgetType('Facet', function() {
+mkws.registerWidgetType('facet', function() {
   var facetConfig = {
     xtargets: [ "Sources",  16, false ],
     subject:  [ "Subjects", 10, true ],
diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 3712764..1a009b9 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -57,7 +57,7 @@ mkws.makeWidget = function($, team, type, node) {
     }
 
     var s = [];
-    s.push('<div class="mkws', type, ' mkwsTeam_', attrs._team, '"');
+    s.push('<div class="mkws', type, ' mkws-team-', attrs._team, '"');
     for (var name in attrs) {    
       if (name !== '_team')
         s.push(' ', name, '="', attrs[name], '"');
@@ -180,7 +180,7 @@ mkws.makeWidget = function($, team, type, node) {
   if (fn) {
     fn.call(that);
     log("made " + type + " widget(node=" + node + ")");
-  } else if (type.match(/-Container-(narrow|wide)$/)) {
+  } else if (type.match(/-[Cc]ontainer-(narrow|wide)$/)) {
     // Not really a widget: no need to log its lack of promotion
   } else {
     log("made UNPROMOTED widget(type=" + type + ", node=" + node + ")");
diff --git a/src/mkws.templates/Facet.handlebars b/src/mkws.templates/Facet.handlebars
index cf697ed..7b1217b 100644
--- a/src/mkws.templates/Facet.handlebars
+++ b/src/mkws.templates/Facet.handlebars
@@ -10,9 +10,9 @@ terms:
   field - for the xtargets facet ONLY, the opaque identifier of the target
 }}
 
-<div class="mkwsFacetTitle">{{caption}}</div>
+<div class="mkws-facet-title">{{caption}}</div>
 {{#each terms}}
-  <div class="mkwsTerm">
+  <div class="mkws-term">
     <a href="#" {{{linkdata}}}>{{term}}</a> <span>{{count}}</span>
   </div>
 {{/each}}
diff --git a/src/mkws.templates/Navi.handlebars b/src/mkws.templates/Navi.handlebars
index 7f3c554..8256e13 100644
--- a/src/mkws.templates/Navi.handlebars
+++ b/src/mkws.templates/Navi.handlebars
@@ -7,7 +7,7 @@ filters
   click - handler script to remove limit
 }}
 {{#each filters}}
-  {{{mkws-translate facet}}}: <a class="mkwsRemovable" href="#" onclick="{{{click}}}">{{value}}</a>
+  {{{mkws-translate facet}}}: <a class="mkws-removable" href="#" onclick="{{{click}}}">{{value}}</a>
   {{#unless @last}}|{{/unless}}
 {{/each}}
 
diff --git a/src/mkws.templates/Pager.handlebars b/src/mkws.templates/Pager.handlebars
index 3f098e6..394659a 100644
--- a/src/mkws.templates/Pager.handlebars
+++ b/src/mkws.templates/Pager.handlebars
@@ -21,9 +21,9 @@ pages:
 
 <div style="float: clear">
   {{#if prevClick}}
-    <a href="#" class="mkwsPrev" onclick="{{prevClick}}">&#60;&#60; {{{mkws-translate "Prev"}}}</a> |
+    <a href="#" class="mkws-prev" onclick="{{prevClick}}">&#60;&#60; {{{mkws-translate "Prev"}}}</a> |
   {{else}}
-    <span class="mkwsPrev">&#60;&#60; {{{mkws-translate "Prev"}}}</span> |
+    <span class="mkws-prev">&#60;&#60; {{{mkws-translate "Prev"}}}</span> |
   {{/if}}
 
   {{#if morePrev}}...{{/if}}
@@ -32,15 +32,15 @@ pages:
     {{#if click}}
       <a href="#" onclick="{{click}}">{{number}}</a>
     {{else}}
-      <span class="mkwsCurrentPage">{{number}}</span>
+      <span class="mkws-current-page">{{number}}</span>
     {{/if}}
   {{/each}}
 
   {{#if moreNext}}...{{/if}}
 
   {{#if nextClick}}
-    | <a href="#" class="mkwsNext" onclick="{{nextClick}}">{{{mkws-translate "Next"}}} &#62;&#62;</a>
+    | <a href="#" class="mkws-next" onclick="{{nextClick}}">{{{mkws-translate "Next"}}} &#62;&#62;</a>
   {{else}}
-    | <span class="mkwsNext">{{{mkws-translate "Next"}}} &#62;&#62;</span>
+    | <span class="mkws-next">{{{mkws-translate "Next"}}} &#62;&#62;</span>
   {{/if}}
 </div>
diff --git a/src/mkws.templates/Progress.handlebars b/src/mkws.templates/Progress.handlebars
index 1b08a2c..43f0623 100644
--- a/src/mkws.templates/Progress.handlebars
+++ b/src/mkws.templates/Progress.handlebars
@@ -4,8 +4,8 @@ Progress
 done - number of targets complete
 waiting - number of targets waiting
 }}
-<span class="mkwsDone">{{#mkws-repeat done}}&#x2588;{{/mkws-repeat}}</span>
+<span class="mkws-done">{{#mkws-repeat done}}&#x2588;{{/mkws-repeat}}</span>
 {{~#if waiting~}}
-<span class="mkwsWaiting">{{#mkws-repeat waiting}}&#x2588;{{/mkws-repeat}}</span>
+<span class="mkws-waiting">{{#mkws-repeat waiting}}&#x2588;{{/mkws-repeat}}</span>
 {{~/if~}}
 
diff --git a/src/mkws.templates/Ranking.handlebars b/src/mkws.templates/Ranking.handlebars
index 1c823bb..130fbe3 100644
--- a/src/mkws.templates/Ranking.handlebars
+++ b/src/mkws.templates/Ranking.handlebars
@@ -15,7 +15,7 @@ perPage
 <form>
   {{~#if showSort~}}
     {{{mkws-translate "Sort by"}}}
-    <select class="mkwsSort mkwsTeam_{{team}}">
+    <select class="mkws-sort mkws-team-{{team}}">
       {{#each sort}}
         {{#if selected}}
           <option value="{{{key}}}" selected="selected">{{{mkws-translate label}}}</option>
@@ -27,7 +27,7 @@ perPage
   {{~/if~}}
   {{~#if showPerPage}}
     {{{mkws-translate "and show"}}}
-    <select class="mkwsPerpage mkwsTeam_{{team}}">
+    <select class="mkws-per-page mkws-team-{{team}}">
       {{#each perPage}}
         {{#if selected}}
           <option value="{{perPage}}" selected="selected">{{perPage}}</option>
diff --git a/src/mkws.templates/Results.handlebars b/src/mkws.templates/Results.handlebars
index f0d405c..3c97d3d 100644
--- a/src/mkws.templates/Results.handlebars
+++ b/src/mkws.templates/Results.handlebars
@@ -5,19 +5,19 @@ team - team for this widget
 }}
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
   <tr>
-    <td class="mkwsTermlists-Container-wide mkwsTeam_{{team}}" width="250" valign="top">
-      <div class="mkwsTermlists mkwsTeam_{{team}}"></div>
+    <td class="mkws-termlists-container-wide mkws-team-{{team}}" width="250" valign="top">
+      <div class="mkws-termlists mkws-team-{{team}}"></div>
     </td>
-    <td class="mkwsMOTDContainer mkwsTeam_{{team}}" valign="top">
-      <div class="mkwsRanking mkwsTeam_{{team}}"></div>
-      <div class="mkwsPager mkwsTeam_{{team}}"></div>
-      <div class="mkwsNavi mkwsTeam_{{team}}"></div>
-      <div class="mkwsRecords mkwsTeam_{{team}}"></div>
+    <td class="mkws-motd-container mkws-team-{{team}}" valign="top">
+      <div class="mkws-ranking mkws-team-{{team}}"></div>
+      <div class="mkws-pager mkws-team-{{team}}"></div>
+      <div class="mkws-navi mkws-team-{{team}}"></div>
+      <div class="mkws-records mkws-team-{{team}}"></div>
     </td>
   </tr>
   <tr>
     <td colspan="2">
-      <div class="mkwsTermlists-Container-narrow mkwsTeam_{{team}}"></div>
+      <div class="mkws-termlists-container-narrow mkws-team-{{team}}"></div>
     </td>
   </tr>
 </table>
diff --git a/src/mkws.templates/Search.handlebars b/src/mkws.templates/Search.handlebars
index 5530013..03c827b 100644
--- a/src/mkws.templates/Search.handlebars
+++ b/src/mkws.templates/Search.handlebars
@@ -4,8 +4,8 @@ Search form
 team - MKWS team
 queryWidth - configured width for search box
 }}
-<form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_{{team}}" action="">
-  <input class="mkwsQuery mkwsTeam_{{team}}" type="text" size="{{queryWidth}}">
-  <input class="mkwsButton mkwsTeam_{{team}}" type="submit" value="{{{mkws-translate "Search"}}}">
+<form name="mkws-search-form" class="mkws-search-form mkws-team-{{team}}" action="">
+  <input class="mkws-query mkws-team-{{team}}" type="text" size="{{queryWidth}}">
+  <input class="mkws-button mkws-team-{{team}}" type="submit" value="{{{mkws-translate "Search"}}}">
 </form>
 
diff --git a/src/mkws.templates/Stat.handlebars b/src/mkws.templates/Stat.handlebars
index d8ae997..c912c22 100644
--- a/src/mkws.templates/Stat.handlebars
+++ b/src/mkws.templates/Stat.handlebars
@@ -6,4 +6,4 @@ clients - total targets for this search
 records - number of records returned and available
 hits - number of hits across all targets
 }}
- -- <span class="mkwsClientCount">{{{mkws-translate "Active clients"}}} : {{activeclients}}/{{clients}}</span> -- {{{mkws-translate "Retrieved records"}}} : {{records}}/{{hits}}
+ -- <span class="mkws-client-count">{{{mkws-translate "Active clients"}}} : {{activeclients}}/{{clients}}</span> -- {{{mkws-translate "Retrieved records"}}} : {{records}}/{{hits}}
diff --git a/src/mkws.templates/Termlists.handlebars b/src/mkws.templates/Termlists.handlebars
index 7c6f3b8..5ee6f6b 100644
--- a/src/mkws.templates/Termlists.handlebars
+++ b/src/mkws.templates/Termlists.handlebars
@@ -5,7 +5,7 @@ team - the current team
 facets - array of facet names
 }}
 
-<div class="mkwsTermlistsTitle">Termlists</div>
+<div class="mkws-termlists-title">Termlists</div>
 {{#each facets}}
-  <div class="mkwsFacet mkwsTeam_{{../team}}" data-mkws-facet="{{this}}"></div>
+  <div class="mkws-facet mkws-team-{{../team}}" data-mkws-facet="{{this}}"></div>
 {{/each}}