Merge branch 'alex'

Modifications from Alex (design mainly)

gargantext_web/views.py

@@ -249,7 +249,13 @@ def corpus(request, project_id, corpus_id):
         sources_donut = []
 
     try:
-        histo = [{'2001':12}, {'2002': 13}]
+        histo = [
+                {'to_char': 2000, 'count': 13},
+                {'to_char': 2001, 'count': 20},
+                {'to_char': 2002, 'count': 5},
+                {'to_char': 2003, 'count': 130},
+                {'to_char': 2004, 'count': 300},
+                ]
 
         first = parse(documents.first().metadata['publication_date'])
         last  = parse(documents.last().metadata['publication_date'])

parsing/FileParsers/RisFileParser.py

@@ -5,10 +5,10 @@ from parsing.FileParsers.FileParser import FileParser
 class RisFileParser(FileParser):
 
     _parameters = {
-        b"TY":  {"type": "delimiter"},
+        b"ER":  {"type": "delimiter"},
         b"TI":  {"type": "metadata", "key": "title", "separator": " "},
         b"AU":  {"type": "metadata", "key": "authors", "separator": ", "},
-        b"DI":  {"type": "metadata", "key": "doi"},
+        b"UR":  {"type": "metadata", "key": "doi"},
         b"PY":  {"type": "metadata", "key": "publication_year"},
         b"PD":  {"type": "metadata", "key": "publication_month"},
         b"LA":  {"type": "metadata", "key": "language"},
@@ -32,8 +32,16 @@ class RisFileParser(FileParser):
                             metadata[parameter["key"]] = separator.join(last_values)
                         elif parameter["type"] == "delimiter":
                             #language = self._languages_fullname[metadata["language"].lower()]
+                            try:
                                 metadata_list.append(metadata)
+                            except:
+                                pass
                     last_key = parameter_key
                     last_values = []
+                try:
                     last_values.append(line[3:-1].decode())
+                except Exception as error:
+                    print(error)
+                    pass
+
         return metadata_list

templates/exploration.html

@@ -17,6 +17,7 @@
 
 
 <div class="container content">
+		<div class="graph">
         <div class="graphWidget">
             <h1>Bees vs. Honey</h1>
             <select name="x">
@@ -31,6 +32,7 @@
             </select>
             <div class="graph"></div>
         </div>
+    </div>
 </div>
 
 

templates/project.html

@@ -72,7 +72,7 @@
 										{% for corpus in board %}
 										<div class="col-md-4">
                         <h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}">{{corpus.name}}</a>
-												<button type="button" class="btn btn-xs btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<a href="/project/{{ project.id }}/corpus/{{ corpus.id}}/delete">Delete it!</a>'>Manage</button>
+												<button type="button" class="btn btn-xs btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<a href="/project/{{ project.id }}/corpus/{{ corpus.id}}/delete">Yes, I am sure!</a>'>Delete</button>
 
 												
 												

templates/projects.html

@@ -45,7 +45,7 @@
 										<!--<div class="col-md-offset-7 col-md-4 content" style="background-color:grey">!-->
 										<div class="col-md-3 content">
 												<h3><a href="/project/{{ project.id }}">{{ project.name }}</a>
-														<button type="button" class="btn btn-xs btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<a href="/project/{{ project.id }}/delete">Delete it!</a>'>Manage</button>
+														<button type="button" class="btn btn-xs btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<a href="/project/{{ project.id }}/delete">Yes, I am sure!</a>'>Delete</button>
 												</h3>
 
 												<h4>{{ project.subtitle }}<h4>