WIP

3 files changed, 37 insertions, 10 deletions

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 4e0c9eef..7a1dcf28 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -38,7 +38,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
 
   return "<div class=\"rules\">\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    &raquo;\n    "
+    + "    &laquo;\n    "
     + container.escapeExpression(((helper = (helper = helpers.source || (depth0 != null ? depth0.source : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"source","hash":{},"data":data}) : helper)))
     + "\n</div>\n";
 },"6":function(container,depth0,helpers,partials,data) {
@@ -46,11 +46,27 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
 
   return "    "
     + container.escapeExpression(container.lambda(depth0, depth0))
-    + "\n"
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+    + " "
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n";
 },"7":function(container,depth0,helpers,partials,data) {
-    return "    &raquo;\n";
+    return "&laquo;";
 },"9":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<div class=\"tags\">\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</div>\n";
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "    "
+    + container.escapeExpression(container.lambda(depth0, depth0))
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    return ",";
+},"13":function(container,depth0,helpers,partials,data) {
     return "        <li><span>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span></li>\n";
@@ -60,8 +76,10 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
   return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n<div class=\"glossary\">\n    <ol>\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </ol>\n</div>\n";
 },"useData":true});
 })();
\ No newline at end of file
diff --git a/ext/fg/css/popup.css b/ext/fg/css/popup.css
index 55daa25a..cef0a994 100644
--- a/ext/fg/css/popup.css
+++ b/ext/fg/css/popup.css
@@ -34,6 +34,10 @@ body {
     display: inline-block;
 }
 
+.tags {
+    color: #777;
+}
+
 .glossary {
     font-size:   12pt;
 }
diff --git a/util/tmpl/term.html b/util/tmpl/term.html
index 1aa12d9e..870b463c 100644
--- a/util/tmpl/term.html
+++ b/util/tmpl/term.html
@@ -7,16 +7,21 @@
 {{#if rules}}
 <div class="rules">
     {{#each rules}}
-    {{.}}
-    {{#unless @last}}
-    &raquo;
-    {{/unless}}
+    {{.}} {{#unless @last}}&laquo;{{/unless}}
     {{/each}}
-    &raquo;
+    &laquo;
     {{source}}
 </div>
 {{/if}}
 
+{{#if tags}}
+<div class="tags">
+    {{#each tags}}
+    {{.}}{{#unless @last}},{{/unless}}
+    {{/each}}
+</div>
+{{/if}}
+
 <div class="glossary">
     <ol>
         {{#each glossary}}