Merge branch 'samuel' into unstable

rest_v1_0/ngrams.py

@@ -550,6 +550,7 @@ class Keep(APIView):
         Delete ngrams from the map list
         """
         group_rawreq = dict(request.data)
+        from django.utils.html import escape
         ngram_2del = [int(i) for i in list(group_rawreq.keys())]
         corpus = session.query(Node).filter( Node.id==corpus_id ).first()
         node_mapList = get_or_create_node(nodetype='MapList', corpus=corpus )

templates/explorer.html

@@ -195,13 +195,15 @@
                   <ul class="nav navbar-nav navbar-right">
                      <li>
                         <a>
-                              <img width="17%" title="Compare with other corpus!" onclick="$('#corpuses').modal('show');" src="{% static "js/libs/img2/INTER.png" %}"></img>
+                              <img width="17%" title="Compare with other corpus!" onclick="GetUserPortfolio(); $('#corpuses').modal('show');" src="{% static "js/libs/img2/INTER.png" %}"></img>
                         </a>
                      </li>
                   </ul>
 
                   <div class="colorgraph_div"></div>
 
+                  <div class="sizegraph_div"></div>
+
                   <!---->
 
 
@@ -294,6 +296,7 @@
       <div id="leftcolumn">      
         <div id="tips"></div>
         <div id="names"></div>
+        <div id="ngrams_actions"></div>
 
         
         <br>
@@ -321,7 +324,7 @@
 
            <ul class='etabs'>
              <li id="tabmed" class='tab active'><a href="#tabs3">Medline Pubs</a></li>
-             <li id="tabgps" class='tab'><a onclick="$('#corpuses').modal('show');">+</a></li>
+             <li id="tabgps" class='tab'><a href="#tabs3"></a></li>
            </ul>
 
            <div class='panel-container'>