Converted to ding1 mkdru theme (dybamo subtheme)

diff --git a/css/mkdruding1.css b/css/mkdruding1.css
new file mode 100644 (file)
index 0000000..41ad8a5
--- /dev/null
+++ b/css/mkdruding1.css
@@ -0,0 +1,33 @@
+a.cross:hover {
+  text-decoration: line-through;
+}
+
+.mkdru-result-description {
+  font-size: 0.8em;
+}
+
+.mkdru-pager-container {
+  text-align: center;
+  background-color: #F6F6F2;
+  border-color: #F9F9F9;
+  padding: 3px 5px 3px 5px;
+}
+
+.mkdru-pager-inner-container {
+  border-top: 1px solid #D6D6D6;
+  border-bottom: 1px solid #D6D6D6;
+  padding: 5px 0px 5px 0px;
+}
+
+.mkdru-status-container {
+  background-color: #F6F6F2;
+  border-color: #F9F9F9;
+  padding: 3px 5px 3px 5px;
+}
+
+.mkdru-status-inner-container {
+  border-top: 1px solid #D6D6D6;
+  border-bottom: 1px solid #D6D6D6;
+  padding: 5px 0px 5px 0px;
+}
+

diff --git a/css/mkdruding2.css b/css/mkdruding2.css
deleted file mode 100644 (file)
index 41ad8a5..0000000
--- a/css/mkdruding2.css
+++ /dev/null
@@ -1,33 +0,0 @@
-a.cross:hover {
-  text-decoration: line-through;
-}
-
-.mkdru-result-description {
-  font-size: 0.8em;
-}
-
-.mkdru-pager-container {
-  text-align: center;
-  background-color: #F6F6F2;
-  border-color: #F9F9F9;
-  padding: 3px 5px 3px 5px;
-}
-
-.mkdru-pager-inner-container {
-  border-top: 1px solid #D6D6D6;
-  border-bottom: 1px solid #D6D6D6;
-  padding: 5px 0px 5px 0px;
-}
-
-.mkdru-status-container {
-  background-color: #F6F6F2;
-  border-color: #F9F9F9;
-  padding: 3px 5px 3px 5px;
-}
-
-.mkdru-status-inner-container {
-  border-top: 1px solid #D6D6D6;
-  border-bottom: 1px solid #D6D6D6;
-  padding: 5px 0px 5px 0px;
-}
-

diff --git a/mkdruding1.info b/mkdruding1.info
new file mode 100644 (file)
index 0000000..0104bbf
--- /dev/null
+++ b/mkdruding1.info
@@ -0,0 +1,6 @@
+name = Ding1-like mkdru theme
+description = Style metasearch results like the results from the data-well
+core = 6.x
+base theme = dynamo
+
+stylesheets[all][] = css/mkdruding1.css

diff --git a/mkdruding1.js b/mkdruding1.js
new file mode 100644 (file)
index 0000000..8321feb
--- /dev/null
+++ b/mkdruding1.js
@@ -0,0 +1,88 @@
+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">';
+  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">'
+      + '<div class="ting-overview clearfix">'
+        + '<div class="left-column left">'
+          + '<div class="picture"></div>'
+        + '</div>'
+        + '<div class="right-column left">';
+  if (hit["md-author"]) {
+    html += '<div class="creator"><span class="byline">By </span>'
+      + '<a class="author" href="/search/meta/'+hit['md-author']+'">'
+      + hit['md-author']+'</a>';
+    if (hit['md-date']) {
+      html += '<span class="date"> ('+hit['md-date']+')</span>';
+    }
+    html += '</div><p></p>';
+  }
+  html += "</div>";
+  if (hit["md-description"]) {
+    // limit description to 400 characters
+    html += hit["md-description"][0].substr(0, 400);
+  }
+  html += '</div>'
+  html += '</div>'
+  html += '</div>'
+  html += '</li>';
+  return html;
+};
+
+Drupal.theme.mkdruFacetContainer = function (facetsCfg) {
+  var fs = [];
+  for (var fname in facetsCfg) {
+    facetsCfg[fname].originalKey = fname;
+    fs.push(facetsCfg[fname]);
+  }
+  fs.sort(function (a,b) { return a.orderWeight - b.orderWeight });
+  var html = '<h2>Facet browser</h2><div class="content">';
+  for (var i=0; i<fs.length; i++) {
+    var f = fs[i];
+    html += '<fieldset class="form-wrapper">'
+    html += '<legend><span class="fieldset-legend">'+f.displayName
+      +'</span></legend>';
+    html += '<div class="fieldset-wrapper">';
+    html += '<div class="mkdru-facet-'+f.originalKey+'"/>';
+    html += '</div>';
+    html += '</fieldset>'
+  }
+  html += '</div>';
+  return html;
+};
+
+Drupal.theme.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.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/>';
+  }
+  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>'+name+'</strong></a><span> (0)</span><br/>';
+      }
+    }
+  }
+  return html;
+};

diff --git a/mkdruding2.info b/mkdruding2.info
deleted file mode 100644 (file)
index 7f603d3..0000000
--- a/mkdruding2.info
+++ /dev/null
@@ -1,27 +0,0 @@
-name = Ding2-like mkdru theme
-description = Style metasearch results like the results from the data-well
-core = 7.x
-base theme = bartik
-
-stylesheets[all][] = css/mkdruding2.css
-
-regions[header] = Header
-regions[help] = Help
-regions[page_top] = Page top
-regions[page_bottom] = Page bottom
-regions[highlighted] = Highlighted
-
-regions[featured] = Featured
-regions[content] = Content
-regions[sidebar_first] = Sidebar first
-regions[sidebar_second] = Sidebar second
-
-regions[triptych_first] = Triptych first
-regions[triptych_middle] = Triptych middle
-regions[triptych_last] = Triptych last
-
-regions[footer_firstcolumn] = Footer first column
-regions[footer_secondcolumn] = Footer second column
-regions[footer_thirdcolumn] = Footer third column
-regions[footer_fourthcolumn] = Footer fourth column
-regions[footer] = Footer

diff --git a/mkdruding2.js b/mkdruding2.js
deleted file mode 100644 (file)
index 8321feb..0000000
--- a/mkdruding2.js
+++ /dev/null
@@ -1,88 +0,0 @@
-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">';
-  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">'
-      + '<div class="ting-overview clearfix">'
-        + '<div class="left-column left">'
-          + '<div class="picture"></div>'
-        + '</div>'
-        + '<div class="right-column left">';
-  if (hit["md-author"]) {
-    html += '<div class="creator"><span class="byline">By </span>'
-      + '<a class="author" href="/search/meta/'+hit['md-author']+'">'
-      + hit['md-author']+'</a>';
-    if (hit['md-date']) {
-      html += '<span class="date"> ('+hit['md-date']+')</span>';
-    }
-    html += '</div><p></p>';
-  }
-  html += "</div>";
-  if (hit["md-description"]) {
-    // limit description to 400 characters
-    html += hit["md-description"][0].substr(0, 400);
-  }
-  html += '</div>'
-  html += '</div>'
-  html += '</div>'
-  html += '</li>';
-  return html;
-};
-
-Drupal.theme.mkdruFacetContainer = function (facetsCfg) {
-  var fs = [];
-  for (var fname in facetsCfg) {
-    facetsCfg[fname].originalKey = fname;
-    fs.push(facetsCfg[fname]);
-  }
-  fs.sort(function (a,b) { return a.orderWeight - b.orderWeight });
-  var html = '<h2>Facet browser</h2><div class="content">';
-  for (var i=0; i<fs.length; i++) {
-    var f = fs[i];
-    html += '<fieldset class="form-wrapper">'
-    html += '<legend><span class="fieldset-legend">'+f.displayName
-      +'</span></legend>';
-    html += '<div class="fieldset-wrapper">';
-    html += '<div class="mkdru-facet-'+f.originalKey+'"/>';
-    html += '</div>';
-    html += '</fieldset>'
-  }
-  html += '</div>';
-  return html;
-};
-
-Drupal.theme.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.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/>';
-  }
-  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>'+name+'</strong></a><span> (0)</span><br/>';
-      }
-    }
-  }
-  return html;
-};

diff --git a/template.php b/template.php
index 465af5a..75c6b45 100644 (file)
--- a/template.php
+++ b/template.php
@@ -1,9 +1,12 @@
 <?php 
 function mkdruding2_preprocess_page(&$vars, $hook) {
   //wouold be nice to include this only during search hook
-  drupal_add_js(drupal_get_path('theme', 'mkdruding2') . '/mkdruding2.js');
-  //for mkdru to generate facet container client-side in the given element
+  drupal_add_js(drupal_get_path('theme', 'mkdruding1') . '/mkdruding1.js');
+  // in ding1 we draw facets to our tab, we could set up the facet container
+  // in /mkdru-results.tpl.php. However, I still do it client side in
+  // the "mkdruFacetContainer" JS theme function to get hold of facet config
+  // this signals that client side container generation should be used
   drupal_add_js(array('mkdru' => array('facetContainerSelector' => 
-    '#block-ding-facetbrowser-facetbrowser')), 'setting');
+    '#mkdru-raw-facet-container')), 'setting');
 }
 

diff --git a/templates/mkdru-results.tpl.php b/templates/mkdru-results.tpl.php
index b3550de..240cee2 100644 (file)
--- a/templates/mkdru-results.tpl.php
+++ b/templates/mkdru-results.tpl.php
@@ -1,4 +1,6 @@
 <div class="mkdru-detail"></div>
+<div id="mkdru-raw-facet-container">
+</div>
 <div class="mkdru-results">
   <div class="mkdru-above mkdru-above-below mkdru-status-container">
     <div class="mkdru-status-inner-container">