From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 4 Nov 2014 17:15:00 +0000 (-0500)
Subject: Merge branch 'master' into prettysimple
X-Git-Tag: 1.0.0~83^2~6
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=4cd2b3de24d03395424d3f6fc58fe9dbaa87c22d;hp=-c

Merge branch 'master' into prettysimple

Conflicts:
	src/templates/facets.handlebars
---

4cd2b3de24d03395424d3f6fc58fe9dbaa87c22d
diff --combined src/mkws-widget-main.js
index 7fe78ef,8a51a4d..0fe9d90
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@@ -22,6 -22,7 +22,7 @@@ mkws.registerWidgetType('targets', func
        cur.id = data[i].id;
        cur.hits = data[i].hits;
        cur.diagnostic = data[i].diagnostic;
+       cur.message = data[i].message;
        cur.records = data[i].records;
        cur.state = data[i].state;
        cleandata.push(cur);
@@@ -55,7 -56,7 +56,7 @@@ mkws.registerWidgetType('pager', functi
      output.found = data.total;
  
      //client indexes pages from 1 but pz2 from 0
 -    var onsides = 6;
 +    var onsides = 5;
      var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
      var currentPage = that.team.currentPage();
  
diff --combined src/templates/facets.handlebars
index 0000000,9a2424b..3ca13a6
mode 000000,100644..100644
--- a/src/templates/facets.handlebars
+++ b/src/templates/facets.handlebars
@@@ -1,0 -1,11 +1,9 @@@
+ {{!
+ Facets, a container of all configured facets.
+ 
+ team - the current team
+ facets - array of facet names
+ }}
 -
 -<div class="mkws-termlists-title mkwsTermlistsTitle">{{mkws-translate "Facets"}}</div>
+ {{#each facets}}
+   <div class="mkws-facet mkwsFacet mkws-team-{{../team}}" data-mkws-facet="{{this}}"></div>
+ {{/each}}