projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f60d9f6)
monster commit to change names of MKWS classes to be case-insensitive, MKWS-294
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:28:12 +0000 (18:28 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:28:12 +0000 (18:28 +0200)
17 files changed:
examples/htdocs/wolfram.html patch | blob | history
src/mkws-popup.js patch | blob | history
src/mkws-team.js patch | blob | history
src/mkws-widget-builder.js patch | blob | history
src/mkws-widget-categories.js patch | blob | history
src/mkws-widget-main.js patch | blob | history
src/mkws-widget-reference.templates/Reference.handlebars patch | blob | history
src/mkws-widget.js patch | blob | history
src/mkws.templates/Facet.handlebars patch | blob | history
src/mkws.templates/Navi.handlebars patch | blob | history
src/mkws.templates/Pager.handlebars patch | blob | history
src/mkws.templates/Progress.handlebars patch | blob | history
src/mkws.templates/Ranking.handlebars patch | blob | history
src/mkws.templates/Results.handlebars patch | blob | history
src/mkws.templates/Search.handlebars patch | blob | history
src/mkws.templates/Stat.handlebars patch | blob | history
src/mkws.templates/Termlists.handlebars patch | blob | history

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 34438c1..3bc605d 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -44,14 +44,14 @@
   <!-- Test case: using single JS files in the right order, MKWS config in HEAD
        before JS files loaded, and a broken jQuery object in BODY section -->
   <body>
   <!-- Test case: using single JS files in the right order, MKWS config in HEAD
        before JS files loaded, and a broken jQuery object in BODY section -->
   <body>
-    <div class="mkwsAuthname"></div>
-    <div class="mkwsSwitch"></div>
-    <div class="mkwsLang"></div>
-    <div class="mkwsProgress"></div>
-    <div class="mkwsSearch"></div>
-    <div class="mkwsResults"></div>
-    <div class="mkwsTargets"></div>
-    <div class="mkwsStat"></div>
+    <div class="mkws-authname mkwsAuthname"></div>
+    <div class="mkws-switch mkwsSwitch"></div>
+    <div class="mkws-lang mkwsLang"></div>
+    <div class="mkws-progress mkwsProgress"></div>
+    <div class="mkws-search mkwsSearch"></div>
+    <div class="mkws-results mkwsResults"></div>
+    <div class="mkws-targets mkwsTargets"></div>
+    <div class="mkws-stat mkwsStat"></div>
 
     <!-- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script> -->
     <script type="text/javascript">
 
     <!-- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script> -->
     <script type="text/javascript">
diff --git a/src/mkws-popup.js b/src/mkws-popup.js
index 97156c0..74886ff 100644 (file)
--- a/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@ -10,7 +10,7 @@ mkws.registerWidgetType('popup', function() {
     debug("init popup window");
 
     var popup_window = $(this.node);
     debug("init popup window");
 
     var popup_window = $(this.node);
-    // var popup_window = $(".mkwsPopup"); // $(document).ready()
+    // var popup_window = $(".mkws-popup mkwsPopup"); // $(document).ready()
     if (!popup_window) {
         debug("no popup found, skip...");
         return;
     if (!popup_window) {
         debug("no popup found, skip...");
         return;
@@ -49,7 +49,7 @@ mkws.registerWidgetType('popup', function() {
             close: function() {}
         });
 
             close: function() {}
         });
 
-        // open at search query submit: "input.mkwsButton"
+        // open at search query submit: "input.mkws-button mkwsButton"
         var id_botton = that.attr("popup_button");
         if (id_botton) {
             $(id_botton).button().click(function() {
         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 b0b95dc..415ff79 100644 (file)
--- 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) {
 
   // 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) {
   }
   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') {
     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^="mkws-team"],[class*=" mkws-team"])');
     } else {
     } else {
-      selector = selector + '.mkwsTeam_' + teamName;
+      selector = selector + '.mkws-team-' + teamName;
     }
 
     var node = $(selector);
     }
 
     var node = $(selector);
@@ -410,7 +410,7 @@ mkws.makeTeam = function($, teamName) {
   function renderDetails(data, marker) {
     var template = loadTemplate("Record");
     var details = template(data);
   function renderDetails(data, marker) {
     var template = loadTemplate("Record");
     var details = template(data);
-    return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
+    return '<div class="mkws-details mkwsDetails mkwsTeam_' + m_teamName + '" ' +
       'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
   }
   that.renderDetails = renderDetails;
       'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
   }
   that.renderDetails = renderDetails;
@@ -430,10 +430,10 @@ mkws.makeTeam = function($, teamName) {
         node = $(".mkws-template-" + name);
       }
       if (node && node.length < 1) {
         node = $(".mkws-template-" + name);
       }
       if (node && node.length < 1) {
-        node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
+        node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
       }
       if (node && node.length < 1) {
       }
       if (node && node.length < 1) {
-        node = $(".mkwsTemplate_" + name);
+        node = $(".mkws-template_" + name);
       }
       if (node) source = node.html();
       if (!source) source = m_templateText[name];
       }
       if (node) source = node.html();
       if (!source) source = m_templateText[name];
diff --git a/src/mkws-widget-builder.js b/src/mkws-widget-builder.js
index aae9a81..110f24a 100644 (file)
--- a/src/mkws-widget-builder.js
+++ b/src/mkws-widget-builder.js
@@ -12,7 +12,7 @@ mkws.registerWidgetType('builder', function() {
     var    sort = team.widget('sort').value();
     var perpage = team.widget('per-page').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 mkwsRecords" ' +
                 'autosearch="' + query + '" ' +
                 'sort="' + sort + '" ' +
                 'perpage="' + perpage + '"></div>');
                 'autosearch="' + query + '" ' +
                 'sort="' + sort + '" ' +
                 'perpage="' + perpage + '"></div>');
diff --git a/src/mkws-widget-categories.js b/src/mkws-widget-categories.js
index 90df81e..fc8896f 100644 (file)
--- a/src/mkws-widget-categories.js
+++ b/src/mkws-widget-categories.js
@@ -20,7 +20,7 @@ mkws.registerWidgetType('categories', function() {
 
       var text = [];
       text.push("Select category: ");
 
       var text = [];
       text.push("Select category: ");
-      text.push("<select name='mkwsCategory' " +
+      text.push("<select name='mkws-category mkwsCategory' " +
                 "onchange='mkws.limitCategory(\"" + that.team.name() + "\", this.value)'>");
       text.push("<option value=''>[All]</option>");
       $(data).find('category').each(function() {
                 "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-main.js b/src/mkws-widget-main.js
index ef4b3c7..3ee3bc7 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -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;";
       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 mkwsSummary mkws-team-" + team.name();
       hit.containerClass += " " + hit.detailLinkId;
       // ### At some point, we may be able to move the
       // m_currentRecordId and m_currentRecordData members
       hit.containerClass += " " + hit.detailLinkId;
       // ### At some point, we may be able to move the
       // m_currentRecordId and m_currentRecordData members
diff --git a/src/mkws-widget-reference.templates/Reference.handlebars b/src/mkws-widget-reference.templates/Reference.handlebars
index 62a9d2a..cedad80 100644 (file)
--- 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}}}
 <i>{{md-title-responsibility}}</i>
 {{/if}}
 {{{mkws-paragraphs md-description paragraphs sentences}}}
-<p class="mkwsCredit">Wikipedia</p>
+<p class="mkws-credit mkwsCredit">Wikipedia</p>
diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 3712764..4e428b1 100644 (file)
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -57,7 +57,7 @@ mkws.makeWidget = function($, team, type, node) {
     }
 
     var s = [];
     }
 
     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], '"');
     for (var name in attrs) {    
       if (name !== '_team')
         s.push(' ', name, '="', attrs[name], '"');
diff --git a/src/mkws.templates/Facet.handlebars b/src/mkws.templates/Facet.handlebars
index cf697ed..7a4eedf 100644 (file)
--- 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
 }}
 
   field - for the xtargets facet ONLY, the opaque identifier of the target
 }}
 
-<div class="mkwsFacetTitle">{{caption}}</div>
+<div class="mkws-facet-title mkwsFacetTitle">{{caption}}</div>
 {{#each terms}}
 {{#each terms}}
-  <div class="mkwsTerm">
+  <div class="mkws-term mkwsTerm">
     <a href="#" {{{linkdata}}}>{{term}}</a> <span>{{count}}</span>
   </div>
 {{/each}}
     <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..5139fd7 100644 (file)
--- 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}}
   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 mkwsRemovable" href="#" onclick="{{{click}}}">{{value}}</a>
   {{#unless @last}}|{{/unless}}
 {{/each}}
 
   {{#unless @last}}|{{/unless}}
 {{/each}}
 
diff --git a/src/mkws.templates/Pager.handlebars b/src/mkws.templates/Pager.handlebars
index 3f098e6..55768e8 100644 (file)
--- a/src/mkws.templates/Pager.handlebars
+++ b/src/mkws.templates/Pager.handlebars
@@ -21,9 +21,9 @@ pages:
 
 <div style="float: clear">
   {{#if prevClick}}
 
 <div style="float: clear">
   {{#if prevClick}}
-    <a href="#" class="mkwsPrev" onclick="{{prevClick}}">&#60;&#60; {{{mkws-translate "Prev"}}}</a> |
+    <a href="#" class="mkws-prev mkwsPrev" onclick="{{prevClick}}">&#60;&#60; {{{mkws-translate "Prev"}}}</a> |
   {{else}}
   {{else}}
-    <span class="mkwsPrev">&#60;&#60; {{{mkws-translate "Prev"}}}</span> |
+    <span class="mkws-prev mkwsPrev">&#60;&#60; {{{mkws-translate "Prev"}}}</span> |
   {{/if}}
 
   {{#if morePrev}}...{{/if}}
   {{/if}}
 
   {{#if morePrev}}...{{/if}}
@@ -32,15 +32,15 @@ pages:
     {{#if click}}
       <a href="#" onclick="{{click}}">{{number}}</a>
     {{else}}
     {{#if click}}
       <a href="#" onclick="{{click}}">{{number}}</a>
     {{else}}
-      <span class="mkwsCurrentPage">{{number}}</span>
+      <span class="mkws-current-page mkwsCurrentPage">{{number}}</span>
     {{/if}}
   {{/each}}
 
   {{#if moreNext}}...{{/if}}
 
   {{#if nextClick}}
     {{/if}}
   {{/each}}
 
   {{#if moreNext}}...{{/if}}
 
   {{#if nextClick}}
-    | <a href="#" class="mkwsNext" onclick="{{nextClick}}">{{{mkws-translate "Next"}}} &#62;&#62;</a>
+    | <a href="#" class="mkws-next mkwsNext" onclick="{{nextClick}}">{{{mkws-translate "Next"}}} &#62;&#62;</a>
   {{else}}
   {{else}}
-    | <span class="mkwsNext">{{{mkws-translate "Next"}}} &#62;&#62;</span>
+    | <span class="mkws-next mkwsNext">{{{mkws-translate "Next"}}} &#62;&#62;</span>
   {{/if}}
 </div>
   {{/if}}
 </div>
diff --git a/src/mkws.templates/Progress.handlebars b/src/mkws.templates/Progress.handlebars
index cb78cae..603c5ca 100644 (file)
--- 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
 }}
 done - number of targets complete
 waiting - number of targets waiting
 }}
-<span class="mkws-done mkwsDone">{{#mkws-repeat done}}&#x2588;{{/mkws-repeat}}</span>
+<span class="mkws-done mkws-done mkwsDone">{{#mkws-repeat done}}&#x2588;{{/mkws-repeat}}</span>
 {{~#if waiting~}}
 {{~#if waiting~}}
-<span class="mkws-waiting mkwsWaiting">{{#mkws-repeat waiting}}&#x2588;{{/mkws-repeat}}</span>
+<span class="mkws-waiting mkws-waiting mkwsWaiting">{{#mkws-repeat waiting}}&#x2588;{{/mkws-repeat}}</span>
 {{~/if~}}
 
 {{~/if~}}
 
diff --git a/src/mkws.templates/Ranking.handlebars b/src/mkws.templates/Ranking.handlebars
index c016dc5..890e29a 100644 (file)
--- a/src/mkws.templates/Ranking.handlebars
+++ b/src/mkws.templates/Ranking.handlebars
@@ -15,7 +15,7 @@ perPage
 <form>
   {{~#if showSort~}}
     {{{mkws-translate "Sort by"}}}
 <form>
   {{~#if showSort~}}
     {{{mkws-translate "Sort by"}}}
-    <select class="mkwsSort mkwsTeam_{{team}}">
+    <select class="mkws-sort mkwsSort mkws-team-{{team}}">
       {{#each sort}}
         {{#if selected}}
           <option value="{{{key}}}" selected="selected">{{{mkws-translate label}}}</option>
       {{#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"}}}
   {{~/if~}}
   {{~#if showPerPage}}
     {{{mkws-translate "and show"}}}
-    <select class="mkwsPerpage mkwsTeam_{{team}}">
+    <select class="mkws-perpage mkwsPerpage mkws-team-{{team}}">
       {{#each perPage}}
         {{#if selected}}
           <option value="{{perPage}}" selected="selected">{{perPage}}</option>
       {{#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..fcda1bc 100644 (file)
--- 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>
 }}
 <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 mkwsTermlists mkws-team-{{team}}"></div>
     </td>
     </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 mkwsMOTDContainer mkws-team-{{team}}" valign="top">
+      <div class="mkws-ranking mkwsRanking mkws-team-{{team}}"></div>
+      <div class="mkws-pager mkwsPager mkws-team-{{team}}"></div>
+      <div class="mkws-navi mkwsNavi mkws-team-{{team}}"></div>
+      <div class="mkws-records mkwsRecords mkws-team-{{team}}"></div>
     </td>
   </tr>
   <tr>
     <td colspan="2">
     </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>
     </td>
   </tr>
 </table>
diff --git a/src/mkws.templates/Search.handlebars b/src/mkws.templates/Search.handlebars
index 182b852..82cbd15 100644 (file)
--- a/src/mkws.templates/Search.handlebars
+++ b/src/mkws.templates/Search.handlebars
@@ -5,7 +5,7 @@ team - MKWS team
 queryWidth - configured width for search box
 }}
 <form name="mkws-search-form" class="mkws-search-form mkws-team-{{team}}" action="">
 queryWidth - configured width for search box
 }}
 <form name="mkws-search-form" class="mkws-search-form mkws-team-{{team}}" action="">
-  <input class="mkws-query mkwsQuery mkws-team-{{team}}" type="text" size="{{queryWidth}}">
-  <input class="mkws-button mkwsButton mkws-team-{{team}}" type="submit" value="{{{mkws-translate "Search"}}}">
+  <input class="mkws-query mkws-query mkwsQuery mkws-team-{{team}}" type="text" size="{{queryWidth}}">
+  <input class="mkws-button mkws-button mkwsButton mkws-team-{{team}}" type="submit" value="{{{mkws-translate "Search"}}}">
 </form>
 
 </form>
 
diff --git a/src/mkws.templates/Stat.handlebars b/src/mkws.templates/Stat.handlebars
index d8ae997..340c1f8 100644 (file)
--- 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
 }}
 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 mkwsClientCount">{{{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..66caa83 100644 (file)
--- 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
 }}
 
 facets - array of facet names
 }}
 
-<div class="mkwsTermlistsTitle">Termlists</div>
+<div class="mkws-termlists-title mkwsTermlistsTitle">Termlists</div>
 {{#each facets}}
 {{#each facets}}
-  <div class="mkwsFacet mkwsTeam_{{../team}}" data-mkws-facet="{{this}}"></div>
+  <div class="mkws-facet mkwsFacet mkws-team-{{../team}}" data-mkws-facet="{{this}}"></div>
 {{/each}}
 {{/each}}
MasterKey Widget Set