Remove erroneous mkws-template_underscore and fix demos. MKWS-294

diff --git a/examples/htdocs/images.html b/examples/htdocs/images.html
index 8960535..6d4f8c8 100644 (file)
--- a/examples/htdocs/images.html
+++ b/examples/htdocs/images.html
@@ -6,7 +6,7 @@
     <title>MKWS demo: Images</title>
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="//x.mkws.indexdata.com/mkws-complete.js"></script>
-    <script class="mkws-template-Records" type="text/x-handlebars-template">
+    <script class="mkws-template-records" type="text/x-handlebars-template">
       {{#each hits}}
         <div class="{{containerClass}}">
           <a href="#" id="{{detailLinkId}}" onclick="{{detailClick}}">

diff --git a/examples/htdocs/lolcat.html b/examples/htdocs/lolcat.html
index 05d76f3..727fdd7 100644 (file)
--- a/examples/htdocs/lolcat.html
+++ b/examples/htdocs/lolcat.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript">mkws_config = { perpage_default: 1 }</script>
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
-    <script class="mkws-template_summary" type="text/x-handlebars-template">
+    <script class="mkws-template-summary" type="text/x-handlebars-template">
       <a href="#" id="{{_id}}" onclick="{{_onclick}}">
         {{#mkws-first md-thumburl}}
          <img src="{{this}}" alt="{{../md-title}}"/>

diff --git a/examples/htdocs/templates.html b/examples/htdocs/templates.html
index dc0adb7..6c02276 100644 (file)
--- a/examples/htdocs/templates.html
+++ b/examples/htdocs/templates.html
@@ -4,7 +4,7 @@
     <title>MKWS demo client</title>
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
-    <script class="mkws-template_summary" type="text/x-handlebars-template">
+    <script class="mkws-template-summary" type="text/x-handlebars-template">
       <a href="#" id="{{_id}}" onclick="{{_onclick}}">
        <b>{{md-title}}</b>
       </a>
@@ -15,7 +15,7 @@
        <span><i>{{md-title-responsibility}}</i></span>
       {{/if}}
     </script>
-    <script class="mkws-template_record" type="text/x-handlebars-template">
+    <script class="mkws-template-record" type="text/x-handlebars-template">
       <table>
        <tr>
          <th>Title</th>

diff --git a/examples/htdocs/topic.css b/examples/htdocs/topic.css
index c7c9a3d..47da435 100644 (file)
--- a/examples/htdocs/topic.css
+++ b/examples/htdocs/topic.css
@@ -74,11 +74,11 @@ b, strong {
     font-style: italic;
   }
   
-.mkws-googleimage .mkws-summary {
+.mkws-google-image .mkws-summary {
   padding: 0;
   font-weight: 400;
 }
-  .mkws-googleimage img {
+  .mkws-google-image img {
     max-width: 100%;
     max-height: 200px;
     padding: 1em 0 .5em;

diff --git a/examples/htdocs/topic.html b/examples/htdocs/topic.html
index 5e43736..642941b 100644 (file)
--- a/examples/htdocs/topic.html
+++ b/examples/htdocs/topic.html
@@ -38,7 +38,7 @@
       return window.location.pathname + "?q=" + encodeURIComponent(topic);
     });
   </script>
-  <script class="mkws-template_topicimage" type="text/x-handlebars-template">
+  <script class="mkws-template-topic-image" type="text/x-handlebars-template">
     {{#each hits}}
       <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
        <a href="{{mkws-googleurl md-electronic-url}}" target="_blank">
@@ -51,7 +51,7 @@
       </div>
     {{/each}}
   </script>
-  <script class="mkws-template_topicfacet" type="text/x-handlebars-template">
+  <script class="mkws-template-topic-facet" type="text/x-handlebars-template">
     {{#each terms}}
       <li class="list-group-item mkws-term">
         <span class="badge">{{count}}</span>
@@ -76,7 +76,7 @@
         <ul class="panel-body list-group mkws-facet mkws-team-main"
             autosearch="!param!q"
             data-mkws-facet="subject"
-            data-mkws-config='{ "template": "TopicFacet" }'></ul>
+            data-mkws-config='{ "template": "topic-facet" }'></ul>
       </div></div>
     </div>
     <!-- images -->
@@ -85,8 +85,8 @@
         <div class="panel-heading title">
           <h3 class="panel-title">Images</h3>
         </div>
-        <div class="panel-body mkws-googleimage" autosearch="!param!q"
-             data-mkws-config='{ "maxrecs": 4, "template": "TopicImage", "target": "google_images_js" }'></div>
+        <div class="panel-body mkws-google-image" autosearch="!param!q"
+             data-mkws-config='{ "maxrecs": 4, "template": "topic-image", "target": "google_images_js" }'></div>
       </div></div>
     </div>
 

diff --git a/examples/htdocs/tpl.html b/examples/htdocs/tpl.html
index 274c238..f521523 100644 (file)
--- a/examples/htdocs/tpl.html
+++ b/examples/htdocs/tpl.html
@@ -7,7 +7,7 @@
 
 
 <!-- MKWS demo! A template to fit the Toronto Public Library -->
-<script class="mkws-template_referenceuniverse" type="text/x-handlebars-template">
+<script class="mkws-template-reference-universe" type="text/x-handlebars-template">
   <h3>Results from Reference Universe</h3>
   {{#each hits}}
     <div class="refinement">

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 57d7cf5..7ec9c2f 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -438,12 +438,6 @@ mkws.makeTeam = function($, teamName) {
       if (node && node.length < 1) {
         node = $(".mkws-template-" + name);
       }
-      if (node && node.length < 1) {
-        node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
-      }
-      if (node && node.length < 1) {
-        node = $(".mkws-template_" + name);
-      }
       if (node) source = node.html();
       if (!source) source = m_templateText[name];
       if (source) {