Minor cleanup.

[mkdru-moved-to-drupal.org.git] / mkdru.theme.js

diff --git a/mkdru.theme.js b/mkdru.theme.js
index 13886d9..229c482 100644 (file)
--- a/mkdru.theme.js
+++ b/mkdru.theme.js
@@ -101,8 +101,11 @@ Drupal.theme.prototype.mkdruPager = function (pages, start, current, total, prev
 };
 
 Drupal.theme.prototype.mkdruCounts = function(first, last, available, total) {
-  return first + Drupal.t(' to ') + last + Drupal.t(' of ') + available
+  if (last > 0)
+    return first + Drupal.t(' to ') + last + Drupal.t(' of ') + available
          + Drupal.t(' available (') + total + Drupal.t(' found)');
+  else
+    return Drupal.t('No results');
 };
 
 Drupal.theme.prototype.mkdruStatus = function(activeClients, clients) {
@@ -114,26 +117,30 @@ Drupal.theme.prototype.mkdruFacet = function (terms, facet, max, selections) {
   var html = "";
   for (var i = 0; i < terms.length && i < max; i++ ) {
     var term = terms[i];
-    html += '<a href="'+term.hashQuery+'"';
+    html += '<a href="'+term.toggleLink+'"';
     if (term.selected) html += ' class="cross"><strong';
     html += '>'+terms[i].name;
     if (term.selected) html += "</strong>";
     html += '</a><span> (' + terms[i].freq
         + ')</span><br/>';
   }
-  //TODO, meed to look up target name from ID
   if (terms.length == 0 && selections && selections.length) {
     for (var i=0; i<selections.length; i++) {
       if (selections[i]) {
+        // since we have no target name (only id) go for the basename
+        // FIXME get the proper target name
+        var name = facet == "source" ? selections[i].replace(/.*[\/\\]/, "")
+          .replace(/\?.*/, '')
+          : selections[i];
         html += '<a class="cross" href="'
           + mkdru.removeLimit(facet, selections[i])
-          + '"><strong>'+selections[i]+'</strong></a><span> (0)</span><br/>';
+          + '"><strong>'+name+'</strong></a><span> (0)</span><br/>';
       }
     } 
   }
   return html;
 };
 
-Drupal.theme.prototype.mkdruFacetContainer = function (facetCfg) {
+Drupal.theme.prototype.mkdruFacetContainer = function (facetsCfg) {
   return "";
 };