X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdruding2.js;h=a8750d7088c5c1d14829adbd96e96198563d627f;hb=6d3e45d1efa44a92bbec357dde94c669c316deb9;hp=b1ed4fd2b24b45318105eba081368de60e4c066b;hpb=c97cbb2a807f178df5ea6fc410c340b3bd1d6a16;p=mkdruding2.git

diff --git a/mkdruding2.js b/mkdruding2.js
index b1ed4fd..a8750d7 100644
--- a/mkdruding2.js
+++ b/mkdruding2.js
@@ -1,10 +1,13 @@
 Drupal.theme.mkdruResult = function(hit, num, detailLink) {
+  var link = choose_url(hit);
+  if (!link) link = choose_url(hit['location'][0]);
   var html = "";
   html += '<li class="search-result" id="rec_' + hit.recid + '" >'
-    + '<h3 class="title">'
-    + '<a href="' + hit['location'][0]['md-electronic-url'] 
-    + '" target="_blank" >'
-    + hit["md-title"] + '</a></h3>';
+    + '<h3 class="title">';
+  if (link) html += '<a href="'+link+'" target="_blank" >';
+  html += hit["md-title"];
+  if (link) html += '</a>';
+  html += '</h3>';
   html += '<div class="search-snippet-info">'
      + '<p class="search-snippet"></p>'
      + '<div class="ting-object clearfix">'
@@ -34,7 +37,7 @@ Drupal.theme.mkdruResult = function(hit, num, detailLink) {
   return html;
 };
 
-Drupal.theme.mkdruFacetContainer = function (facetsData, facetsCfg) {
+Drupal.theme.mkdruFacetContainer = function (facetsCfg) {
   var fs = [];
   for (var fname in facetsCfg) {
     facetsCfg[fname].originalKey = fname;
@@ -48,7 +51,7 @@ Drupal.theme.mkdruFacetContainer = function (facetsData, facetsCfg) {
     html += '<legend><span class="fieldset-legend">'+f.displayName
       +'</span></legend>';
     html += '<div class="fieldset-wrapper">';
-    html += '<div class="mkdru-facet-'+f.originalKey+'"/>';
+    html += '<div class="mkdru-facet-'+f.originalKey+' form-checkboxes"/>';
     html += '</div>';
     html += '</fieldset>'
   }
@@ -56,24 +59,33 @@ Drupal.theme.mkdruFacetContainer = function (facetsData, facetsCfg) {
   return html;
 };
 
-Drupal.theme.mkdruFacet = function (terms, facet, max) {
+Drupal.theme.mkdruFacet = function (terms, facet, max, selections) {
   var html = "";
   for (var i = 0; i < terms.length && i < max; i++ ) {
-    html += '<a href="';
-    if (facet == 'source')
-      html += mkdru.addLimit(facet, terms[i].id);
-    else
-      html += mkdru.addLimit(facet, terms[i].name);
-    html += '">' + terms[i].name + '</a><span> (' + terms[i].freq + ')</span><br/>'
-      ;
+    var term = terms[i];
+    var id = term.name.split(/w+/).join("-").toLowerCase();
+    html += '<div class="form-item form-type-checkbox">';
+    html += '<input type="checkbox" id="'+id+'" onclick="window.location=\''
+      +term.toggleLink+'\'; return true;" class="form-checkbox"';
+    if (term.selected) html += ' checked="checked"';
+    html += '/><label class="option" for="'+id+'">'+term.name; 
+    html += '<span> ('+term.freq+')</span></label></div>';
   }
-  return html;
-};
-
-Drupal.theme.mkdruFacetLimit = function (term, link) {
-  if (term) {
-    return '<p><strong>' + term.name + '</strong></p>'
-      + '<p><a href="' + link + '">' + Drupal.t('Show all...') + '</a></p>';
+  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 += '<div class="form-item form-type-checkbox">';
+        html += '<input type="checkbox" checked="checked" id="'+name+'" '
+          +'onclick="window.location=\''+mkdru.removeLimit(facet, selections[i])
+          +'\';return true;" class="form-checkbox"/><label class="option" for="'
+          +name+'">'+name+'</a><span> (0)</span></label></div>';
+      }
+    }
   }
+  return html;
 };
-