From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 10 Jul 2013 15:28:39 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 0.9.1~275
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=073be95d012b356da93f53b9d9b7e8a65bd181c9;hp=d272101c1ff6e10e0d027e296727fcb905079bbf;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into wosch
---

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 4004ce2..c5f7d48 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -204,6 +204,7 @@ function add_single_facet(acc, caption, data, max, cclIndex) {
     acc.push('<div class="facet">');
     acc.push('<div class="termtitle">' + M(caption) + '</div>');
     for (var i = 0; i < data.length && i < max; i++ ) {
+	acc.push('<div class="term">');
         acc.push('<a href="#" ');
 	var action;
 	if (!cclIndex) {
@@ -214,7 +215,8 @@ function add_single_facet(acc, caption, data, max, cclIndex) {
 	    action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
 	}
 	acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-		 + '<span> (' + data[i].freq + ')</span><br/>');
+		 + ' <span>' + data[i].freq + '</span>');
+	acc.push('</div>');
     }
     acc.push('</div>');
 }
diff --git a/tools/htdocs/mkwsStyle.css b/tools/htdocs/mkwsStyle.css
index b807ed3..b9887d9 100644
--- a/tools/htdocs/mkwsStyle.css
+++ b/tools/htdocs/mkwsStyle.css
@@ -130,6 +130,14 @@
     -webkit-border-top-right-radius: 10px;
 }
 
+#mkwsTermlists div.facet div.term {
+    clear: both;
+}
+
+#mkwsTermlists div.facet div.term span {
+    float: right;
+}
+
 #mkwsTermlists div.termtitle {
     font-weight: bold;
 }