Merge branch 'master' into ding1-theme

diff --git a/mkdru-results.tpl.php b/mkdru-results.tpl.php
index 1dcfc53..240cee2 100644 (file)
--- a/mkdru-results.tpl.php
+++ b/mkdru-results.tpl.php
@@ -1,7 +1,20 @@
 <div class="mkdru-detail"></div>
+<div id="mkdru-raw-facet-container">
+</div>
 <div class="mkdru-results">
-  <div class="mkdru-above mkdru-above-below"><span class="mkdru-counts"></span><span class="mkdru-status"></span></div>
+  <div class="mkdru-above mkdru-above-below mkdru-status-container">
+    <div class="mkdru-status-inner-container">
+      <span class="mkdru-counts"></span>
+      <span class="mkdru-status"></span>
+    </div>
+  </div>
   <div class="mkdru-navi"></div>
-  <ul class="mkdru-result-list"></ul>
-  <div class="mkdru-below mkdru-above-below"><span class="mkdru-pager"></span></div>
-</div>
\ No newline at end of file
+  <ul class="mkdru-result-list search-results">
+  </ul>
+  <div class="mkdru-below mkdru-above-below mkdru-pager-container">
+    <div class="mkdru-pager-inner-container">
+      <span class="mkdru-pager">
+      </span>
+    </div>
+  </div>
+</div>

diff --git a/mkdru.css b/mkdru.css
index 7efeb50..5e16bd2 100644 (file)
--- a/mkdru.css
+++ b/mkdru.css
@@ -1,5 +1,59 @@
-a.cross {
-  text-decoration: line-through;
+#mkdru-raw-facet-container a.cross {
+  background-color: #A7AFB8;
+  color: black;
+  text-decoration: none !important;
+}
+
+#mkdru-raw-facet-container  a.cross:hover {
+  background-color: #D6D6D6;
+  color: black;
+  text-decoration: none !important;
+}
+
+#mkdru-raw-facet-container a:hover {
+  background-color: #A7AFB8;
+  color: black;
+  text-decoration: none !important;
+}
+
+.mkdru-facet-list-container {
+  font-size: 11px;
+  font-family: Arial, sans-serif;
+}
+
+.mkdru-facets-table {
+  table-layout: fixed;
+  width: 670px;
+  border: 1px solid #D6D6D6;
+}
+
+.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;
 }
 
 .node-mkdru div {

diff --git a/mkdru.theme.js b/mkdru.theme.js
index 229c482..fa4964c 100644 (file)
--- a/mkdru.theme.js
+++ b/mkdru.theme.js
@@ -1,18 +1,38 @@
 Drupal.theme.prototype.mkdruResult = function(hit, num, detailLink) {
+  var link = choose_url(hit);
+  if (!link) link = choose_url(hit['location'][0]);
   var html = "";
-  html += '<li class="mkdru-result" id="rec_' + hit.recid + '" >'
-          + '<span>' + num + '. </span>'
-          + '<a href="' + detailLink + '" class="mkdru-result-title">'
-          + hit["md-title"] + '</a> ';
-  if (hit["md-title-remainder"] !== undefined) {
-    html += '<span class="mkdru-result-title-remainder">' 
-            + hit["md-title-remainder"] + ' </span>';
+  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>';
   }
-  if (hit["md-title-responsibility"] !== undefined) {
-    html += '<span class="mkdru-result-author"><i>'
-            + hit["md-title-responsibility"]
-            + '</i></span>';
+  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;
 };
@@ -142,5 +162,24 @@ Drupal.theme.prototype.mkdruFacet = function (terms, facet, max, selections) {
 };
 
 Drupal.theme.prototype.mkdruFacetContainer = function (facetsCfg) {
-  return "";
+  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 = '<div class="content"><table class="mkdru-facets-table"><tr>';
+  for (var i=0; i<fs.length; i++) {
+    var f = fs[i];
+    html += '<td><fieldset class="form-wrapper">'
+    html += '<legend><span class="fieldset-legend">'+f.displayName
+      +'</span></legend>';
+    html += '<div class="fieldset-wrapper">';
+    html += '<div class="mkdru-facet-list-container mkdru-facet-'
+      +f.originalKey+'"/>';
+    html += '</div>';
+    html += '</fieldset></td>'
+  }
+  html += '</tr></table></div>';
+  return html;
 };