Merge branch 'refactoring-rom' into refactoring-alex

gargantext/views/api/ngramlists.py

@@ -174,13 +174,10 @@ class GroupChange(APIView):
                             NodeNgramNgram.ngram1_id.in_(all_nodes_involved),
                             NodeNgramNgram.ngram2_id.in_(all_nodes_involved)))
                 )
-        n_removed = old_links.count()
-        old_links.delete(synchronize_session='fetch')
-        print('n_removed', n_removed)
-        print("links", links)
-        print(
-            [i for i in ((group_node, mainform, subform, 1.0) for (mainform,subform) in links)]
-            )
+        n_removed = old_links.delete(synchronize_session=False)
+        session.commit()
+
+        # add new groupings
         bulk_insert(
             NodeNgramNgram,
             ('node_id', 'ngram1_id', 'ngram2_id', 'weight'),
@@ -194,7 +191,6 @@ class GroupChange(APIView):
 
 
 
-
 class ListChange(APIView):
     """
     Any ngram action on standard NodeNgram lists (MAIN, MAP, STOP)

static/css/gargantext/tables.css

@@ -40,7 +40,10 @@ td .note {
 
 span.note {
   font-size: 10px;
-  color: #333;
+}
+
+span.note.glyphicon {
+  color: #555;
 }
 
 p.note {
@@ -99,7 +102,7 @@ tr:hover {
 #group_box_mainform {
     margin-bottom: 0;
     line-height: 1 ;
-    margin-left: .05em ;
+    margin-left: .08em ;
 }
 
 #group_box_content {