Last part of MKWS-322 (Use "facets" widget in place of "termlists")

diff --git a/examples/htdocs/custom.css b/examples/htdocs/custom.css
index 0a99dec..80eb04a 100644 (file)
--- a/examples/htdocs/custom.css
+++ b/examples/htdocs/custom.css
@@ -1,4 +1,4 @@
-.mkws-termlists {
+.mkws-facets {

     background: white;
 }
 .mkws-facet {
     background: white;
 }
 .mkws-facet {

diff --git a/examples/htdocs/heikki-motd.html b/examples/htdocs/heikki-motd.html
index aa53154..843d3bc 100644 (file)
--- a/examples/htdocs/heikki-motd.html
+++ b/examples/htdocs/heikki-motd.html
@@ -19,7 +19,7 @@
     <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
 
     <style type="text/css">
     <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
 
     <style type="text/css">

-      .mkws-termlists div.facet {
+      .mkws-facets div.facet {

       float:left;
       width: 30%;
       margin: 0.3em;
       float:left;
       width: 30%;
       margin: 0.3em;

diff --git a/examples/htdocs/heikki.html b/examples/htdocs/heikki.html
index 8a92369..5138bfe 100644 (file)
--- a/examples/htdocs/heikki.html
+++ b/examples/htdocs/heikki.html
@@ -21,7 +21,7 @@
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">

-      .mkws-termlists div.facet {
+      .mkws-facets div.facet {

       float:left;
       width: 30%;
       margin: 0.3em;
       float:left;
       width: 30%;
       margin: 0.3em;

@@ -56,7 +56,7 @@
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">

-            <div class="mkws-termlists"></div>
+            <div class="mkws-facets"></div>

           </div>
         </td>
       </tr>
           </div>
         </td>
       </tr>

diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index dbe236a..8a8e64b 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -22,7 +22,7 @@
 
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">
 
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">

-      .mkws-termlists div.facet {
+      .mkws-facets div.facet {

       float:left;
       width: 30%;
       margin: 0.3em;
       float:left;
       width: 30%;
       margin: 0.3em;

@@ -71,7 +71,7 @@
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">

-            <div class="mkws-termlists"></div>
+            <div class="mkws-facets"></div>

           </div>
         </td>
       </tr>
           </div>
         </td>
       </tr>

diff --git a/examples/htdocs/language.html b/examples/htdocs/language.html
index d24e017..2cbd8be 100644 (file)
--- a/examples/htdocs/language.html
+++ b/examples/htdocs/language.html
@@ -40,7 +40,7 @@
                        "Subject": "موضوع",
                        "Location": "موقع",
                        // Facet heading and individual facet names
                        "Subject": "موضوع",
                        "Location": "موقع",
                        // Facet heading and individual facet names

-                       "Termlists": "العضو الأجل",
+                       "Facets": "العضو الأجل",

                        "Sources": "مصادر",
                        "Subjects": "المواضيع",
                        "Authors": "الكتاب",
                        "Sources": "مصادر",
                        "Subjects": "المواضيع",
                        "Authors": "الكتاب",

diff --git a/examples/htdocs/local-auto.html b/examples/htdocs/local-auto.html
index 27336ef..1c5604d 100644 (file)
--- a/examples/htdocs/local-auto.html
+++ b/examples/htdocs/local-auto.html
@@ -30,7 +30,7 @@
        sort='relevance'
        targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
 >News will appear here</div>
        sort='relevance'
        targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
 >News will appear here</div>

-       <div class='mkws-termlists mkws-team-news'/>
+       <div class='mkws-facets mkws-team-news'/>

        </td>
        <td width="30%">
          <h2>Blog</h2>
        </td>
        <td width="30%">
          <h2>Blog</h2>

@@ -39,7 +39,7 @@
        sort='relevance'
        targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
 >Blog entries will appear here</div>
        sort='relevance'
        targets='pz:id~josiah.brown.edu:210/innopac|connect.indexdata.com:9000/mit_opencourseware'
 >Blog entries will appear here</div>

-       <div class='mkws-termlists mkws-team-blog'/>
+       <div class='mkws-facets mkws-team-blog'/>

        </td>
       </tr>
     </table>
        </td>
       </tr>
     </table>

diff --git a/examples/htdocs/lowlevel.html b/examples/htdocs/lowlevel.html
index ebf4043..74b55d2 100644 (file)
--- a/examples/htdocs/lowlevel.html
+++ b/examples/htdocs/lowlevel.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
     <style type="text/css">
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
     <style type="text/css">

-      .mkws-termlists div.facet {
+      .mkws-facets div.facet {

       float:left;
       width: 30%;
       margin: 0.3em;
       float:left;
       width: 30%;
       margin: 0.3em;

@@ -38,7 +38,7 @@
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">
       <tr>
         <td>
           <div style="height:300px; overflow: hidden">

-            <div class="mkws-termlists"></div>
+            <div class="mkws-facets"></div>

           </div>
         </td>
       </tr>
           </div>
         </td>
       </tr>

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 7d3d444..6b71bc1 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -298,7 +298,8 @@ mkws.log("Using window.name '" + window.name + "'");
     'MOTDContainer': 'motd-container',
     'Perpage': 'per-page',
     'SearchForm': 'search-form',
     'MOTDContainer': 'motd-container',
     'Perpage': 'per-page',
     'SearchForm': 'search-form',

-    'ReferenceUniverse': 'reference-universe'
+    'ReferenceUniverse': 'reference-universe',
+    'Termlists': 'facets'

   };
   // Annoyingly, there is no built-in way to invert a hash
   var _new2old = {};
   };
   // Annoyingly, there is no built-in way to invert a hash
   var _new2old = {};

diff --git a/src/mkws-widget-facets.js b/src/mkws-widget-facets.js
index ce47068..478bf0a 100644 (file)
--- a/src/mkws-widget-facets.js
+++ b/src/mkws-widget-facets.js
@@ -1,4 +1,4 @@
-mkws.registerWidgetType('termlists', function() {
+mkws.registerWidgetType('facets', function() {

   // Initially hide the facets; display when we get results
   var that = this;
   var team = this.team;
   // Initially hide the facets; display when we get results
   var that = this;
   var team = this.team;

diff --git a/src/templates/results.handlebars b/src/templates/results.handlebars
index fcda1bc..fc87e4c 100644 (file)
--- a/src/templates/results.handlebars
+++ b/src/templates/results.handlebars
@@ -5,8 +5,8 @@ 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="mkws-termlists-container-wide mkws-team-{{team}}" width="250" valign="top">
-      <div class="mkws-termlists mkwsTermlists mkws-team-{{team}}"></div>
+    <td class="mkws-facets-container-wide mkws-team-{{team}}" width="250" valign="top">
+      <div class="mkws-facets mkwsTermlists mkws-team-{{team}}"></div>

     </td>
     <td class="mkws-motd-container mkwsMOTDContainer mkws-team-{{team}}" valign="top">
       <div class="mkws-ranking mkwsRanking mkws-team-{{team}}"></div>
     </td>
     <td class="mkws-motd-container mkwsMOTDContainer mkws-team-{{team}}" valign="top">
       <div class="mkws-ranking mkwsRanking mkws-team-{{team}}"></div>

@@ -17,7 +17,7 @@ team - team for this widget
   </tr>
   <tr>
     <td colspan="2">
   </tr>
   <tr>
     <td colspan="2">

-      <div class="mkws-termlists-container-narrow mkws-team-{{team}}"></div>
+      <div class="mkws-facets-container-narrow mkws-team-{{team}}"></div>

     </td>
   </tr>
 </table>
     </td>
   </tr>
 </table>

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 91543c2..29ce177 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -231,7 +231,7 @@ describe("Check Termlist", function () {
     var $ = mkws.$;
 
     it("found Termlist", function () {
     var $ = mkws.$;
 
     it("found Termlist", function () {

-        var termlist = $("div.mkws-termlists");
+        var termlist = $("div.mkws-facets");

         debug("Termlist success: " + termlist.length);
         expect(termlist.length).toBe(1);
 
         debug("Termlist success: " + termlist.length);
         expect(termlist.length).toBe(1);
 

diff --git a/tools/htdocs/mkws.css b/tools/htdocs/mkws.css
index fce226a..5964b65 100644 (file)
--- a/tools/htdocs/mkws.css
+++ b/tools/htdocs/mkws.css
@@ -1,7 +1,7 @@
 .mkwsLang, .mkws-lang,
 .mkwsSwitch, .mkws-switch,
 .mkwsSearch, .mkws-search,
 .mkwsLang, .mkws-lang,
 .mkwsSwitch, .mkws-switch,
 .mkwsSearch, .mkws-search,

-.mkwsTermlists, .mkws-termlists,
+.mkwsTermlists, .mkws-facets,

 .mkwsFacet, .mkws-facet,
 .mkwsRanking, .mkws-ranking,
 .mkwsPager, .mkws-pager,
 .mkwsFacet, .mkws-facet,
 .mkwsRanking, .mkws-ranking,
 .mkwsPager, .mkws-pager,

@@ -112,7 +112,7 @@
     text-transform: uppercase;
 }
 
     text-transform: uppercase;
 }
 

-.mkwsTermlists, .mkws-termlists {
+.mkwsTermlists, .mkws-facets {

     background: #d0e0ff;
     padding: 0.7em;
     font-size: small;
     background: #d0e0ff;
     padding: 0.7em;
     font-size: small;

@@ -123,7 +123,7 @@
     -webkit-border-top-right-radius: 10px;
 }
 
     -webkit-border-top-right-radius: 10px;
 }
 

-.mkwsTermlists.active, .mkws-termlists.active {
+.mkwsTermlists.active, .mkws-facets.active {

     display: block;
 }
 
     display: block;
 }