[FEAT] Merging view for Corpus view: documents, journals, terms

	modifié :         urls.py
	Urls adapted

	renommé :         ../templates/corpus.html -> ../templates/corpus/documents.html
	renommé :         ../templates/tests/journals.html -> ../templates/corpus/journals.html
	renommé :         ../templates/tests/ngrams.html -> ../templates/corpus/terms.html
	taking templates made by Samuel

	modifié :         ../templates/menu.html
	Menu template of all Gargantext (extend it to your views)

	nouveau fichier : ../templates/corpus/menu.html
	Menu template for corpus view only (extend it if you develop
	corpus view)

	nouveau fichier : ../templates/corpus/bannerBottome.html
	Bug inside block templates of Django, need to fix this

	modifié :         views.py
	adapting def corpus

	nouveau fichier : corpus_views.py
	Some sugar syntax

gargantext_web/corpus_views.py

+from django.shortcuts import redirect
+from django.shortcuts import render
+from django.db import transaction
+
+from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseForbidden
+from django.template.loader import get_template
+from django.template import Context
+
+from node import models
+#from node.models import Language, ResourceType, Resource, \
+#        Node, NodeType, Node_Resource, Project, Corpus, \
+#        Ngram, Node_Ngram, NodeNgramNgram, NodeNodeNgram
+
+from node.admin import CorpusForm, ProjectForm, ResourceForm, CustomForm
+
+from django.contrib.auth.models import User
+
+import datetime
+from itertools import *
+from dateutil.parser import parse
+
+from django.db import connection
+from django import forms
+
+
+from collections import defaultdict
+
+from parsing.FileParsers import *
+import os
+import json
+
+# SOME FUNCTIONS
+
+from gargantext_web import settings
+
+from django.http import *
+from django.shortcuts import render_to_response,redirect
+from django.template import RequestContext
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth import authenticate, login, logout
+
+from scrappers.scrap_pubmed.admin import Logger
+
+from gargantext_web.db import *
+
+from sqlalchemy import or_, func
+
+from gargantext_web import about
+
+from gargantext_web.api import JsonHttpResponse
+
+
+from ngram.lists import listIds, listNgramIds, ngramList , doList
+
+
+def test_page(request , project_id , corpus_id):
+
+    if not request.user.is_authenticated():
+        return redirect('/login/?next=%s' % request.path)
+
+    try:
+        offset = int(project_id)
+        offset = int(corpus_id)
+    except ValueError:
+        raise Http404()
+
+    t = get_template('tests/test_select-boostrap.html')
+
+    date = datetime.datetime.now()
+    project = cache.Node[int(project_id)]
+    corpus  = cache.Node[int(corpus_id)]
+    type_doc_id = cache.NodeType['Document'].id
+    number = session.query(func.count(Node.id)).filter(Node.parent_id==corpus_id, Node.type_id==type_doc_id).all()[0][0]
+    try:
+        processing = corpus.hyperdata['Processing']
+    except Exception as error:
+        print(error)
+        processing = 0
+
+    html = t.render(Context({
+            'debug': settings.DEBUG,
+            'user': request.user,
+            'date': date,
+            'project': project,
+            'corpus' : corpus,
+            'processing' : processing,
+            'number' : number,
+            }))
+
+    return HttpResponse(html)
+
+def get_ngrams(request , project_id , corpus_id ):
+    if not request.user.is_authenticated():
+        return redirect('/login/?next=%s' % request.path)
+
+    try:
+        offset = int(project_id)
+        offset = int(corpus_id)
+    except ValueError:
+        raise Http404()
+
+    t = get_template('corpus/terms.html')
+
+    date = datetime.datetime.now()
+    project = cache.Node[int(project_id)]
+    corpus  = cache.Node[int(corpus_id)]
+    type_doc_id = cache.NodeType['Document'].id
+    number = session.query(func.count(Node.id)).filter(Node.parent_id==corpus_id, Node.type_id==type_doc_id).all()[0][0]
+
+    lists = dict()
+    for list_type in ['MiamList', 'StopList']:
+        list_id = list()
+        list_id = listIds(user_id=request.user.id, corpus_id=int(corpus_id), typeList=list_type)
+        lists["%s" % list_id[0][0]] = list_type
+
+    try:
+        processing = corpus.hyperdata['Processing']
+    except Exception as error:
+        print(error)
+        processing = 0
+
+    html = t.render(Context({
+            'debug': settings.DEBUG,
+            'user': request.user,
+            'date': date,
+            'project': project,
+            'corpus' : corpus,
+            'processing' : processing,
+            'number' : number,
+            'list_id': list_id[0][0],
+            }))
+
+    return HttpResponse(html)
+
+
+
+def test_test(request , corpus_id , doc_id):
+    """Get All for a doc id"""
+    corpus_id = int(corpus_id)
+    doc_id = int(doc_id)
+    lists = dict()
+    for list_type in ['StopList']:
+        list_id = list()
+        list_id = listIds(user_id=request.user.id, corpus_id=int(corpus_id), typeList=list_type)
+        lists["%s" % list_id[0][0]] = list_type
+    print(list_id[0][0])
+
+
+    # # # ngrams of list_id of corpus_id:
+    # commeca = "StopList"
+    doc_ngram_list = listNgramIds(corpus_id=corpus_id, list_id=list_id[0][0], doc_id=list_id[0][0], user_id=request.user.id)
+
+    to_del = {}
+    for n in doc_ngram_list:
+        to_del[ n[0] ] = True
+
+    print( to_del.keys() )
+
+    results = [ "hola" , "mundo" ]
+    return JsonHttpResponse(results)
+
+
+def get_journals(request , project_id , corpus_id ):
+
+    if not request.user.is_authenticated():
+        return redirect('/login/?next=%s' % request.path)
+
+    try:
+        offset = int(project_id)
+        offset = int(corpus_id)
+    except ValueError:
+        raise Http404()
+
+    t = get_template('corpus/journals.html')
+
+    user = cache.User[request.user.username].id
+    date = datetime.datetime.now()
+    project = cache.Node[int(project_id)]
+    corpus  = cache.Node[int(corpus_id)]
+    type_doc_id = cache.NodeType['Document'].id
+    number = session.query(func.count(Node.id)).filter(Node.parent_id==corpus_id, Node.type_id==type_doc_id).all()[0][0]
+
+    try:
+        processing = corpus.hyperdata['Processing']
+    except Exception as error:
+        print(error)
+        processing = 0
+
+    html = t.render(Context({
+            'debug': settings.DEBUG,
+            'user': request.user,
+            'date': date,
+            'project': project,
+            'corpus' : corpus,
+            'processing' : processing,
+            'number' : number,
+            }))
+
+    return HttpResponse(html)
+
+def test_journals(request , project_id, corpus_id ):
+    results = ["hola" , "mundo"]
+
+    JournalsDict = {}
+
+    user_id = request.user.id
+    document_type_id = cache.NodeType['Document'].id
+    documents  = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == document_type_id ).all()
+    for doc in documents:
+        if "journal" in doc.hyperdata:
+            journal = doc.hyperdata["journal"]
+            if journal not in JournalsDict:
+                JournalsDict [journal] = 0
+            JournalsDict[journal] += 1
+    return JsonHttpResponse(JournalsDict)
+
+def test_ngrams(request , project_id, corpus_id ):
+    results = ["hola" , "mundo"]
+
+    user_id = request.user.id
+    whitelist_type_id = cache.NodeType['WhiteList'].id
+    document_type_id = cache.NodeType['Document'].id
+
+    corpus_id = int(corpus_id)
+    lists = dict()
+    for list_type in ['StopList']:
+        list_id = list()
+        list_id = listIds(user_id=request.user.id, corpus_id=int(corpus_id), typeList=list_type)
+        lists["%s" % list_id[0][0]] = list_type
+    doc_ngram_list = listNgramIds(corpus_id=corpus_id, list_id=list_id[0][0], doc_id=list_id[0][0], user_id=request.user.id)
+    StopList = {}
+    for n in doc_ngram_list:
+        StopList[ n[0] ] = True
+
+    # # 13099  clinical benefits
+    # # 7492   recent data
+    # # 14279  brain development
+    # # 50681  possible cause
+    # # 47111  psychological symptoms
+    # # 3944   common form
+    # ngram_of_interest = 14279
+
+    # documents  = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == document_type_id ).all()
+    # to_print = []
+
+    # for doc in documents:
+    #     NgramOccs = session.query(Node_Ngram).filter( Node_Ngram.node_id==doc.id).all()
+    #     # print( len(NgramOccs) )
+    #     for ngram in NgramOccs:
+    #         if ngram.ngram_id == ngram_of_interest:
+    #             to_print.append( [doc.id,doc.name] )
+    #             break
+
+    # if len(to_print)>0:
+    #     for doc in to_print:
+    #         doc_id = doc[0]
+    #         doc_name = doc[1]
+    #         print("doc_id:",doc_id)
+    #         NgramOccs = session.query(Node_Ngram).filter( Node_Ngram.node_id==doc_id).all()
+    #         for ngram in NgramOccs:
+    #             if ngram.ngram_id == ngram_of_interest:
+    #                 print("\t" , ngram.ngram_id , "\t" , ngram.weight )
+
+    # print (" - - - - -- - - - ")
+    # print("Calculation using the DB:")
+    # white_list = session.query(Node).filter( Node.parent_id==corpus_id , Node.type_id==whitelist_type_id).first()
+    # NgramOccs = session.query(Node_Ngram).filter( Node_Ngram.node_id==white_list.id).all()
+    # for ngram in NgramOccs:
+    #     if ngram.ngram_id == ngram_of_interest:
+    #         print( ngram.weight, "\t" , ngram.ngram_id)
+    # print( "= = = = = = = = == = =  ")
+
+    # NgramTFIDF = session.query(NodeNodeNgram).filter( NodeNodeNgram.nodex_id==corpus_id ).all()
+
+    # for ngram in NgramTFIDF:
+    #     print( "docid:", ngram.nodey_id , ngram.ngram_id  , ngram.score)
+
+
+    Ngrams_Scores = {}
+
+    ## < Getting the Effective nro de OCCS ##
+    documents  = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == document_type_id ).all()
+    for doc in documents:
+        NgramOccs = session.query(Node_Ngram).filter( Node_Ngram.node_id==doc.id).all()
+        for ngram in NgramOccs:
+            if ngram.ngram_id not in StopList:
+                if ngram.ngram_id not in Ngrams_Scores:
+                    Ngrams_Scores[ngram.ngram_id] = {}
+                    Ngrams_Scores[ngram.ngram_id]["scores"] = {
+                        "occ_sum": 0.0,
+                        "occ_uniq": 0.0,
+                        "tfidf_sum": 0.0
+                    }
+                Ngrams_Scores[ngram.ngram_id]["scores"]["occ_sum"]+=ngram.weight
+                Ngrams_Scores[ngram.ngram_id]["scores"]["occ_uniq"]+=1
+            # print("\t" , ngram.ngram_id , "\t" , ngram.weight )
+    ## Getting the Effective nro de OCCS / >##
+
+    # # CA MARCHE PAS POUR TOUT LES NGRAMS!!
+    # ## < Getting the unique number of OCCS ##
+    # summ1 = len(Ngrams_Scores.keys())
+    # white_list = session.query(Node).filter( Node.parent_id==corpus_id , Node.type_id==whitelist_type_id).first()# get whitelist id from corpus
+    # NgramOccs = session.query(Node_Ngram).filter( Node_Ngram.node_id==white_list.id).all()
+
+    # summ2 = 0
+    # for ngram in NgramOccs:
+    #     Ngrams_Scores[ngram.ngram_id]["occ_uniq"] = ngram.weight
+    #     summ2+=1
+    #     # print("\t" , ngram.ngram_id , "\t" , ngram.weight )
+    # print (" -  - -- - - - - - ")
+    # print ("Sum numero 01:",summ1)
+    # print ("Sum numero 02:",summ2)
+    # ## Getting the unique number of OCCS /> ##
+
+
+    Sum = 0
+    NgramTFIDF = session.query(NodeNodeNgram).filter( NodeNodeNgram.nodex_id==corpus_id ).all()
+    for ngram in NgramTFIDF:
+        if ngram.ngram_id not in StopList:
+            Ngrams_Scores[ngram.ngram_id]["scores"]["tfidf_sum"] += ngram.score
+            Sum += Ngrams_Scores[ngram.ngram_id]["scores"]["occ_uniq"]
+            # print( "docid:", ngram.nodey_id , ngram.ngram_id  , ngram.score)
+
+
+    # import pprint
+    # pprint.pprint( Ngrams_Scores )
+
+
+
+    # # select * from node_nodenodengram where ngram_id=14279;
+    # NodeNodeNgram
+    #     nodex_id = real corpus id
+    #     nodey_id = document id
+    #     ngram_id = duh
+
+    # id   | nodex_id | nodey_id | ngram_id |       score
+
+
+    ngrams_ids = Ngrams_Scores.keys()
+
+    import math
+    occs_threshold = min ( 10 , math.sqrt(Sum / len(ngrams_ids)) )
+
+    Metrics = {
+        "ngrams":[],
+        "scores": {}
+    }
+
+
+    query = session.query(Ngram).filter(Ngram.id.in_( ngrams_ids ))
+    ngrams_data = query.all()
+    for ngram in ngrams_data:
+        if ngram.id not in StopList:
+            occ_uniq = Ngrams_Scores[ngram.id]["scores"]["occ_uniq"]
+            if occ_uniq > occs_threshold:
+                Ngrams_Scores[ngram.id]["name"] = ngram.terms
+                Ngrams_Scores[ngram.id]["id"] = ngram.id
+                Ngrams_Scores[ngram.id]["scores"]["tfidf"] = Ngrams_Scores[ngram.id]["scores"]["tfidf_sum"] / occ_uniq
+                del Ngrams_Scores[ngram.id]["scores"]["tfidf_sum"]
+                Metrics["ngrams"].append( Ngrams_Scores[ngram.id] )
+
+
+
+    Metrics["scores"] = {
+    	"initial":"occ_uniq",
+    	"nb_docs":len(documents),
+    	"orig_nb_ngrams":len(ngrams_ids),
+    	"nb_ngrams":len(Metrics["ngrams"]),
+    	"occs_threshold":occs_threshold
+    }
+
+    return JsonHttpResponse(Metrics)
+
+

gargantext_web/urls.py

@@ -12,11 +12,13 @@ import scrappers.scrap_pubmed.views as pubmedscrapper
 
 import tests.ngramstable.views as samtest
 
+import gargantext_web.corpus_views as corpus_views
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
 
+    ############################################################################
     # Admin views
     url(r'^admin/', include(admin.site.urls)),
     url(r'^login/', include(admin.site.urls)),
@@ -25,22 +27,37 @@ urlpatterns = patterns('',
     url(r'^auth/$', views.login_user),
     url(r'^auth/logout/$', views.logout_user),
 
+    ############################################################################
     # Dynamic CSS
     url(r'^img/logo.svg$', views.logo),
     url(r'^css/bootstrap.css$', views.css),
 
+    ############################################################################
     # User Home view
     url(r'^$', views.home_view),
     url(r'^about/', views.get_about),
     url(r'^maintenance/', views.get_maintenance),
 
+    ############################################################################
     # Project Management
     url(r'^projects/$', views.projects),
     url(r'^project/(\d+)/$', views_optimized.project),
     url(r'^delete/(\d+)$', views.delete_node), # => api.node('id' = id, children = 'True', copies = False)
 
+    ############################################################################
     # Corpus management
+    # Document view (main)
     url(r'^project/(\d+)/corpus/(\d+)/$', views.corpus),
+
+    # Journals view
+    url(r'^project/(\d+)/corpus/(\d+)/journals/journals.json$', corpus_views.test_journals),
+    url(r'^project/(\d+)/corpus/(\d+)/journals$', corpus_views.get_journals),
+
+    # Terms view
+    url(r'^project/(\d+)/corpus/(\d+)/ngrams/ngrams.json$', corpus_views.test_ngrams),
+    url(r'^project/(\d+)/corpus/(\d+)/ngrams$', corpus_views.get_ngrams),
+    ############################################################################
+
     # annotations App
     url(r'^project/(\d+)/corpus/(\d+)/document/(\d+)/$', annotations_main_view),
     url(r'^annotations/', include(annotations_urls)),
@@ -48,11 +65,13 @@ urlpatterns = patterns('',
     #
     url(r'^project/(\d+)/corpus/(\d+)/corpus.csv$', views.corpus_csv),
     url(r'^project/(\d+)/corpus/(tests_mvc_listdocuments+)/corpus.tests_mvc_listdocuments$', views.corpus_csv),
+    ############################################################################
 
     # Visualizations
     url(r'^project/(\d+)/corpus/(\d+)/chart$', views.chart),
     url(r'^project/(\d+)/corpus/(\d+)/explorer$', views.graph),
     url(r'^project/(\d+)/corpus/(\d+)/matrix$', views.matrix),
+    ############################################################################
 
     # Data management
     url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv),  # => api.node.children('type' : 'data', 'format' : 'csv')
@@ -60,6 +79,7 @@ urlpatterns = patterns('',
     url(r'^corpus/(\d+)/adjacency.json$', views.adjacency), # => api.analysis('type': 'adjacency', 'format' : 'json')
 
     url(r'^api/tfidf/(\d+)/(\w+)$', views_optimized.tfidf),
+    ############################################################################
 
     # Data management
     #url(r'^api$', gargantext_web.api.Root), # = ?
@@ -84,10 +104,6 @@ urlpatterns = patterns('',
     url(r'^tests/project/(\d+)/ISTEXquery/go$', pubmedscrapper.testISTEX),
     url(r'^tests/paginator/corpus/(\d+)/$', views.newpaginatorJSON),
     url(r'^tests/move2trash/$' , views.move_to_trash_multiple ),
-    url(r'^project/(\d+)/corpus/(\d+)/ngrams/ngrams.json$', samtest.test_ngrams),
-    url(r'^project/(\d+)/corpus/(\d+)/ngrams$', samtest.get_ngrams),
-    url(r'^project/(\d+)/corpus/(\d+)/journals/journals.json$', samtest.test_journals),
-    url(r'^project/(\d+)/corpus/(\d+)/journals$', samtest.get_journals),
     url(r'^corpus/(\d+)/document/(\d+)/testpage$', samtest.test_test)
 )
 

gargantext_web/views.py

@@ -6,9 +6,9 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpRespons
 from django.template.loader import get_template
 from django.template import Context
 
+# remove this
 from node import models
 from node.admin import CorpusForm, ProjectForm, ResourceForm, CustomForm
-
 from django.contrib.auth.models import User
 
 import datetime
@@ -61,12 +61,12 @@ def login_user(request):
                 return HttpResponseRedirect('/projects/')
     return render_to_response('authentication.html', context_instance=RequestContext(request))
 
-
 def logout_user(request):
     logout(request)
     return HttpResponseRedirect('/')
     # Redirect to a success page.
 
+
 def logo(request):
     template = get_template('logo.svg')
     group = "mines"
@@ -111,7 +111,6 @@ def css(request):
     return HttpResponse(css_data, mimetype="text/css")
 
 
-
 def query_to_dicts(query_string, *query_args):
     """Run a simple query and produce a generator
     that returns the results as a bunch of dictionaries
@@ -251,6 +250,7 @@ def projects(request):
         'projects': projects
         })
 
+
 def corpus(request, project_id, corpus_id):
     if not request.user.is_authenticated():
         return redirect('/login/?next=%s' % request.path)
@@ -261,9 +261,8 @@ def corpus(request, project_id, corpus_id):
     except ValueError:
         raise Http404()
 
-    t = get_template('corpus.html')
+    t = get_template('corpus/documents.html')
 
-    user = request.user
     date = datetime.datetime.now()
 
     project = cache.Node[int(project_id)]
@@ -281,7 +280,7 @@ def corpus(request, project_id, corpus_id):
 
     html = t.render(Context({
             'debug': settings.DEBUG,
-            'user': user,
+            'user': request.user,
             'date': date,
             'project': project,
             'corpus' : corpus,
@@ -305,7 +304,7 @@ def newpaginatorJSON(request , corpus_id):
     user_id = request.user.id
     # documents  = session.query(Node).filter(Node.parent_id==corpus_id , Node.type_id == type_document_id ).all()
 
-    documents  = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == type_document_id ).all() 
+    documents  = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == type_document_id ).all()
 
     # for doc in documents:
     #     print(doc.name)

templates/corpus/bannerBottome.html

+								<!--<h3> <img width="20px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img> Graph (later)</h3>--!>

templates/corpus.html → templates/corpus/documents.html

-
-{% extends "menu.html" %}
+{% extends "corpus/menu.html" %}
 
 {% block css %}
 {% load staticfiles %}
@@ -13,7 +12,6 @@
 <link rel="stylesheet" type="text/css" href="{% static "css/dc.css"%}"/>
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery.dynatable.css"%}"/>
 
-
 <script type="text/javascript" src="{% static "js/charts/d3.js"%}"></script>
 <script type="text/javascript" src="{% static "js/charts/crossfilter.js"%}"></script>
 <script type="text/javascript" src="{% static "js/charts/dc.js"%}"></script>
@@ -47,31 +45,8 @@ th a {
 {% endblock %}
 
 
-{% block content %}
 
-<div class="container theme-showcase" role="main">
-        <div class="jumbotron">
-                                {% if project %}
-                                <h1>{{ project.name }}, {{ corpus.name }}
-                                </h1>
-                                {% endif %}
-
-                            {% if corpus %}
-                            <p>
-                            {{ number}} docs, Created on {{ corpus.date }} 
-                            </p>
-                            {% endif %}
-
-                            <!--                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add file</a> -->
-                        <a class="btn btn-primary btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Save as</a>
-                        <a class="btn btn-primary btn-lg" role="button" href="/delete/{{ corpus.id }}">Delete</a></p>
-
-                        {% if number == 0 %}
-                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>
-                        {% endif %}
-    
-        </div>
-</div>
+{% block content %}
 
                 <div class="container">
                         <div class="container">
@@ -96,6 +71,8 @@ th a {
                         <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
 
 
+
+
 <div class="container">
         <div class="jumbotron">
 
@@ -134,52 +111,6 @@ th a {
 </div>
 </div>
 
-<div class="container">
-		<div class="row">
-				<div class="col-md-4">
-						<div class="jumbotron">
-						<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/chart">Advanced charts</a></h3>
-						<ol>
-								<li>Count</li> <!-- read, compute -->
-								<li>Filter</li> <!-- count, compute -->
-								<li>Compare</li> <!-- select, cut -->
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-					</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-                            <!-- <h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3> -->
-								<h3>Matrix (soon)</h3>
-						<ol>
-								<li>Sort</li>
-								<li>Group</li>
-								<li>Cluster</li>
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-						</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-								{% if processing > 0 %}
-                <h3> <img width="20px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img> Graph (later)</h3>
-                {% else %}
-                                <h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
-                {% endif %}
-                        <ol>
-                                <li>Visualize</li>
-                                <li>Explore</li>
-                                <li>Read</li>
-                        </ol>
-                        <h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-                        </div>
-                </div>
-        </div>
-</div>
-
-
 <div id="supmofos">
   
 
@@ -207,3 +138,6 @@ th a {
 
 
 {% endblock %}
+
+
+

templates/tests/journals.html → templates/corpus/journals.html

-
-{% extends "menu.html" %}
+{% extends "corpus/menu.html" %}
 
 {% block css %}
 {% load staticfiles %}
 
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.css" %}">
+<link rel="stylesheet" type="text/css" href="{% static "js/bootstrap/bootstrap-select.min.css" %}">
+
 <link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery.easy-pie-chart.css"%}">
 
@@ -110,32 +111,6 @@ input[type=radio]:checked + label {
 
 
 {% block content %}
-
-<div class="container theme-showcase" role="main">
-        <div class="jumbotron">
-                        {% if project %}
-                            <h1>{{ project.name }}, {{ corpus.name }}
-                            </h1>
-                            {% endif %}
-
-                        {% if corpus %}
-                        <p>
-                        Created on {{ corpus.date }} 
-                        </p>
-                        <div id="stats"></div>
-                        {% endif %}
-
-                            <!--                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add file</a> -->
-                        <a class="btn btn-primary btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Save as</a>
-                        <a class="btn btn-primary btn-lg" role="button" href="/delete/{{ corpus.id }}">Delete</a></p>
-
-                        {% if number == 0 %}
-                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>
-                        {% endif %}
-    
-        </div>
-</div>
-
                 <div class="container">
                         <div class="container">
 
@@ -197,52 +172,6 @@ input[type=radio]:checked + label {
 </div>
 
 
-<div class="container">
-		<div class="row">
-				<div class="col-md-4">
-						<div class="jumbotron">
-						<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/chart">Advanced charts</a></h3>
-						<ol>
-								<li>Count</li> <!-- read, compute -->
-								<li>Filter</li> <!-- count, compute -->
-								<li>Compare</li> <!-- select, cut -->
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-					</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-										<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3>
-						<ol>
-								<li>Sort</li>
-								<li>Group</li>
-								<li>Cluster</li>
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-						</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-								{% if processing > 0 %}
-                <h3> <img width="20px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img> Graph (later)</h3>
-                {% else %}
-                                <h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
-                {% endif %}
-                        <ol>
-                                <li>Visualize</li>
-                                <li>Explore</li>
-                                <li>Read</li>
-                        </ol>
-                        <h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-                        </div>
-                </div>
-        </div>
-</div>
-
-
-
 
 <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 <script src="{% static "js/charts/bootstrap.min.js" %}"></script>

templates/corpus/menu.html

+{% extends "menu.html" %}
+
+{% block corpusBannerTop %}
+
+<div class="container theme-showcase" role="main">
+        <div class="jumbotron">
+
+
+		<div class="row">
+				<div class="col-md-4">
+
+						{% if project %}
+						<h1>{{ project.name }}</h1>
+						<h2>{{ corpus.name }}</h2>
+						{% endif %}
+										<!--<a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add file</a> -->
+
+				</div>
+		
+				<div class="col-md-4">
+						{% if corpus %}
+								<br>
+								<p>
+								<center>
+								Creation date:
+								<br>
+								{{ corpus.date }} 
+								</center>
+								</p>
+						{% endif %}
+				</div>
+
+				<div class="col-md-4">
+						<br>
+						<!--<a class="btn btn-default btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Rename</a>--!>
+						<a class="btn btn-default btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Save as</a>
+						<a class="btn btn-default btn-lg" role="button" href="/delete/{{ corpus.id }}">Delete</a></p>
+
+						{% if number == 0 %}
+								<a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>
+						{% endif %}
+				</div>
+
+
+		<div class="btn-group btn-group-justified">
+				<center>
+						<div class="btn-group">
+						<a type="button" class="btn btn-primary btn-lg active" href="/project/{{project.id}}/corpus/{{ corpus.id }}/">{{number}} Documents</a>
+						</div>
+						<div class="btn-group">
+							<a type="button" class="btn btn-primary btn-lg" href="/project/{{project.id}}/corpus/{{ corpus.id }}/journals">Journals</a>
+						</div>
+						<div class="btn-group">
+							<a type="button" class="btn btn-primary btn-lg" href="/project/{{project.id}}/corpus/{{ corpus.id }}/ngrams">Terms</a>
+						</div>
+				</center>
+		</div>
+</div>
+
+ </div>
+
+{% endblock %}
+
+
+{% block corpusBannerBottom %}
+
+<div class="container">
+		<div class="row">
+				<div class="col-md-4">
+						<div class="jumbotron">
+						<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/chart">Advanced charts</a></h3>
+						<ol>
+								<li>Count</li> <!-- read, compute -->
+								<li>Filter</li> <!-- count, compute -->
+								<li>Compare</li> <!-- select, cut -->
+						</ol>
+						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
+					</div>
+				</div>
+
+				<div class="col-md-4">
+						<div class="jumbotron">
+                            <!-- <h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3> -->
+								<h3>Matrix (soon)</h3>
+						<ol>
+								<li>Sort</li>
+								<li>Group</li>
+								<li>Cluster</li>
+						</ol>
+						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
+						</div>
+				</div>
+
+				<div class="col-md-4">
+						<div class="jumbotron">
+								{% if processing > 0 %}
+										<h3> Graph (later)</h3>
+                {% else %}
+                                <h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
+                {% endif %}
+                        <ol>
+                                <li>Visualize</li>
+                                <li>Explore</li>
+                                <li>Read</li>
+                        </ol>
+                        <h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
+                        </div>
+                </div>
+        </div>
+</div>
+
+
+{% endblock %}
+
+
+

templates/tests/ngrams.html → templates/corpus/terms.html

-
-{% extends "menu.html" %}
+{% extends "corpus/menu.html" %}
 
 {% block css %}
 {% load staticfiles %}
@@ -115,31 +114,6 @@ input[type=radio]:checked + label {
 
 {% block content %}
 
-<div class="container theme-showcase" role="main">
-        <div class="jumbotron">
-                        {% if project %}
-                            <h1>{{ project.name }}, {{ corpus.name }}
-                            </h1>
-                            {% endif %}
-
-                        {% if corpus %}
-                        <p>
-                        Created on {{ corpus.date }} 
-                        </p>
-                        <div id="stats"></div>
-                        {% endif %}
-
-                            <!--                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add file</a> -->
-                        <a class="btn btn-primary btn-lg" role="button" href="/project/{{project.id}}/corpus/{{ corpus.id }}/corpus.csv">Save as</a>
-                        <a class="btn btn-primary btn-lg" role="button" href="/delete/{{ corpus.id }}">Delete</a></p>
-
-                        {% if number == 0 %}
-                        <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>
-                        {% endif %}
-    
-        </div>
-</div>
-
                 <div class="container">
                         <div class="container">
 
@@ -205,51 +179,6 @@ input[type=radio]:checked + label {
 </div>
 
 
-<div class="container">
-		<div class="row">
-				<div class="col-md-4">
-						<div class="jumbotron">
-						<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/chart">Advanced charts</a></h3>
-						<ol>
-								<li>Count</li> <!-- read, compute -->
-								<li>Filter</li> <!-- count, compute -->
-								<li>Compare</li> <!-- select, cut -->
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-					</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-										<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3>
-						<ol>
-								<li>Sort</li>
-								<li>Group</li>
-								<li>Cluster</li>
-						</ol>
-						<h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-						</div>
-				</div>
-
-				<div class="col-md-4">
-						<div class="jumbotron">
-								{% if processing > 0 %}
-                <h3> <img width="20px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img> Graph (later)</h3>
-                {% else %}
-                                <h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
-                {% endif %}
-                        <ol>
-                                <li>Visualize</li>
-                                <li>Explore</li>
-                                <li>Read</li>
-                        </ol>
-                        <h4><a href="/project/{{project.id}}/corpus/{{corpus.id}}/">Back to corpus</a></h3>
-                        </div>
-                </div>
-        </div>
-</div>
-
-
 <div id="savemodal" class="modal fade">
   <div class="modal-dialog">
     <div class="modal-content">

templates/menu.html

@@ -59,9 +59,18 @@
     </div>
 <!--/.nav-collapse -->
 
+{% block corpusBannerTop %}
+{% endblock %}
+
+
 {% block content %}
 {% endblock %}
 
+{% block corpusBannerBottom %}
+{% endblock %}
+
+
+
 
 <hr>