[CSS] Corpora views, submenu completed. Div cleaned for corpus by titles.

gargantext/views/pages/corpora.py

@@ -24,7 +24,7 @@ def _get_user_project_corpus(request, project_id, corpus_id):
 
 
 @requires_auth
-def corpus(request, project_id, corpus_id):
+def docs_by_titles(request, project_id, corpus_id):
     authorized, user, project, corpus = _get_user_project_corpus(request, project_id, corpus_id)
     if not authorized:
         return HttpResponseForbidden()
@@ -34,13 +34,10 @@ def corpus(request, project_id, corpus_id):
         request = request,
         context = {
             'debug': DEBUG,
-            'user': user,
             'date': datetime.now(),
             'project': project,
             'corpus': corpus,
-            # 'processing': corpus['extracted'],
-            # 'number': number,
-            'view': 'documents'
+            'view': 'titles'
         },
     )
 

gargantext/views/pages/urls.py

@@ -20,7 +20,7 @@ urlpatterns = [
     url(r'^projects/(\d+)/?$', projects.project),
 
     # corpora
-    url(r'^projects/(\d+)/corpora/(\d+)/?$', corpora.corpus),
+    url(r'^projects/(\d+)/corpora/(\d+)/?$', corpora.docs_by_titles),
     url(r'^projects/(\d+)/corpora/(\d+)/chart/?$', corpora.chart),
 
     # corpus by journals

templates/pages/corpora/journals.html

@@ -50,10 +50,9 @@
 
                 <div class="panel-heading">
                   <h4 class="panel-title">
-                    <a data-toggle="collapse" data-target="#journal_table" href="#">
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
                         <!-- Final_UpdateTable redraws the dynatable if necessary -->
-                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg">
-                          Open Folder
+                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg"> Journals
                         </p>
                     </a>
                   </h4>

templates/pages/corpora/terms.html

@@ -48,7 +48,7 @@
 
                 <div class="panel-heading">
                   <h4 class="panel-title">
-                    <a data-toggle="collapse" data-target="#terms_table" href="#">
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
                         <!-- Final_UpdateTable redraws the dynatable if necessary -->
                         <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg">
                           Close term list
@@ -73,11 +73,13 @@
             </div> <!-- /div panel -->
         </div> <!-- /row with the dynatable panels -->
 
-    </div> <!-- /jumbotron -->
-
+    </div> 
+    
+    <!-- /jumbotron 
     <button id="ImportList" onclick="GetUserPortfolio();" class="btn btn-warning">
         Import a Corpus-List
     </button>
+    -->
 
 </div> <!-- /container -->
 

templates/pages/corpora/titles.html

@@ -4,28 +4,21 @@
 {% load staticfiles %}
 
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.css" %}">
-<!-- here goes import stylesheet js/bootstrap/bootstrap-multiselect.css, mais ca marche pas-->
-
-<link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
-
 <link rel="stylesheet" type="text/css" href="{% static "css/d3/dc.css"%}"/>
-
-<link rel="stylesheet" type="text/css" href="{% static "css/jquery/jquery.easy-pie-chart.css"%}">
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery/jquery.dynatable.css"%}"/>
+
 <link rel="stylesheet" type="text/css" href="{% static "css/gargantext/tables.css"%}"/>
 
 <script type="text/javascript" src="{% static "js/d3/d3.js"%}"></script>
-<script type="text/javascript" src="{% static "js/d3/dc.js"%}"></script>
 <script type="text/javascript" src="{% static "js/d3/crossfilter.js"%}"></script>
+<script type="text/javascript" src="{% static "js/d3/dc.js"%}"></script>
 
 {% endblock %}
 
 
-
 {% block content %}
 
 <div class="container">
-    <div class="container">
         <div class="jumbotron">
             <div class="row">
                 <div id="monthly-move-chart">
@@ -51,22 +44,18 @@
           <br>
         </div>
 
-    </div>
-</div>
 
 
 <input type="hidden" id="list_id" value="{{ list_id }}"></input>
 
 <div class="container">
-
-
     <div class="jumbotron">
         <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             <div class="panel panel-body">
                 <div class="panel-heading">
                     <h4 class="panel-title">
                         <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Open Folder</h2></p>
+                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Titles</h2></p>
                         </a>
                     </h4>
                 </div>
@@ -76,7 +65,6 @@
                             <p align="right">
                                 <button id="move2trash" class="btn btn-primary btn-lg" >Trash It!</button>
                             </p>
-
                   </div>
                 </div>
             </div>
@@ -105,6 +93,7 @@
 
 </div>
 
+</div>
 <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 <script src="{% static "js/bootstrap/bootstrap.min.js" %}"></script>
 <!-- here goes import script js/bootstrap/bootstrap-multiselect.js, mais ca marche pas-->

templates/pages/menu.html

@@ -63,19 +63,43 @@
         <div class="container theme-showcase">
             <div class="jumbotron" style="margin-bottom:0">
                 <div id="corpusbar" class="row">
-                    <div class="col-md-6">
+                    <div class="col-md-12">
                         <div class="btn-group btn-group-justified">
                             <center>
-                                <a type="button" class="btn btn-default {% if view == "documents" %}active{%endif%}" href="/projects/{{project.id}}/corpora/{{ corpus.id }}/">Documents</a>
-                                <a type="button" class="btn btn-default {% if view == "journals" %}active{%endif%}" href="/projects/{{project.id}}/corpora/{{ corpus.id }}/journals">Journals</a>
-                                <a type="button" class="btn btn-default {% if view == "terms" %}active{%endif%}" href="/projects/{{project.id}}/corpora/{{ corpus.id }}/terms">Terms</a>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "titles" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/">By titles</a>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "journals" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/journals">By journals</a>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "terms" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/terms">By terms</a>
+                                
+                                <!-- FIXME put a separator here --!>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "charts" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/terms">Advanced Charts</a>
+                                
+                                <!-- FIXME a pop up for advanced mode of graphs --!>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "conditional" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/graph">Graphs (Conditional)</a>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "distributional" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/graph">Graphs (Distributional)</a>
+                                <a type="button" class="btn btn-default 
+                                    {% if view == "journalTerms" %}active{%endif%}" 
+                                        href="/projects/{{project.id}}/corpora/{{ corpus.id }}/graph">Graphs Journal/Terms</a>
                             </center>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+
         {% endif %}
+        
         {% endblock %}