[DESIGN] improved presentation for annotations

annotations/static/annotations/app.css

@@ -60,7 +60,7 @@
 }
 
 .keyword-container {
-  max-width: 200px;
+  /*display: inline-block;*/
 }
 
 .keyword {
@@ -71,6 +71,8 @@
   display: inline-block;
   float: left;
   padding: 5px;
+  margin: .25em;
+  box-shadow: .2em .2em .1em rgba(0, 0, 0, .125);
 }
 
 .words-pagination {

annotations/static/annotations/selection_tpl.html

 <ul class="noselection">
-  <li>{[{level}]}<span ng-if="category !== null"> {[{category}]}</span></li>
   <li class="miamword" ng-if="local_miamlist === true" ng-click="onClick($event, 'post', miamListId, 'local')">add to miam-list</li>
   <li class="miamword"  ng-if="local_miamlist === false" ng-click="onClick($event, 'delete', miamListId, 'local')">remove from miam-list</li>
 

ngram/lists.py

@@ -97,10 +97,10 @@ def listNgramIds(list_id=None, typeList=None,
 
     ListNgram = aliased(NodeNgram)
     or_args = [ListNgram.node_id == l[0] for l in allLists]
-    query = (session.query(Ngram.id, Ngram.terms, func.count(), ListNgram.node_id)
+    query = (session.query(Ngram.id, Ngram.terms, func.sum(ListNgram.weight), ListNgram.node_id)
             .join(ListNgram, ListNgram.ngram_id == Ngram.id)
             .filter(or_(*or_args))
-            .group_by(Ngram.id, ListNgram)
+            .group_by(Ngram.id, ListNgram.node_id)
             )
 
     if doc_id is not None: