Merge branch 'master' into prettysimple
authorJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
committerJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
Conflicts:
src/templates/facets.handlebars

1  2 
src/mkws-widget-main.js
src/templates/facets.handlebars

Simple merge
index 0000000,9a2424b..3ca13a6
mode 000000,100644..100644
--- /dev/null
@@@ -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}}