Merge branch 'alex'

Intégration des dernières modifs d'Alexandre.

gargantext_web/views.py

@@ -21,7 +21,7 @@ from django import forms
 
 from collections import defaultdict
 
-from parsing.FileParsers import *
+#from parsing.FileParsers import *
 
 # SOME FUNCTIONS
 
@@ -91,6 +91,7 @@ def projects(request):
     projects = Node.objects.filter(user=user, type_id = project_type.id).order_by("-date")
     number = len(projects)
  
+    form = ProjectForm()
     if request.method == 'POST':
         # form = ProjectForm(request.POST)
         # TODO : protect from sql injection here
@@ -103,7 +104,7 @@ def projects(request):
 
     return render(request, 'projects.html', {
         'date': date,
-        'form': form, 
+        'form': form,
         'number': number,
         'projects': projects
         })
@@ -156,8 +157,11 @@ def project(request, project_id):
             resource.save()
             node_type   = NodeType.objects.get(name='Corpus')
             parent      = Node.objects.get(id=project_id)
-            Node(parent=parent, type=node_type, name=name, user=request.user, language=language).save()
-            #Node(parent=parent, type=node_type, name=name, user=request.user, language=language, resource=[resource,]).save()
+            
+            node = Node(parent=parent, type=node_type, name=name, user=request.user, language=language)
+            node.save()
+            node.resource.add(resource)
+
 #            try:
 #                for resource in node.resource.all():
 #                    fileparser = PubmedFileParser.PubmedFileParser(file='/var/www/gargantext/media/' + str(resource.file))

templates/menu.html

@@ -75,7 +75,15 @@ $(function() {
 </script>
 
 <script src="{% static "js/bootstrap.min.js" %}"></script>
-<script>$(function () { $("[data-toggle='popover']").popover({html:true});});</script>
+<script>$(function () { $("[data-toggle='popover']").popover({
+		html:true,
+		title: function() {
+				return $("#popover-head").html();
+		},
+		content: function() {
+				return $("#popover-content").html();
+		}
+});});</script>
 
 </body>
 </html>

templates/project.html

@@ -20,21 +20,35 @@
             {% if project %}
             <h1>{{ project.name }}</h1>
             <h3> {{number}} corpora </h3>
-            <p>
+            {% endif %}
         </div>
-            <a class="btn btn-primary btn-lg" role="button" href="/add/corpus/">Add a corpus</a></p>
-    <div class="col-md-4">
-				<form enctype="multipart/form-data" action="/project/{{project.id}}/" method="post">
+
+        <div class="col-md-4">
+				<button 
+								type="button" 
+								class="btn btn-primary btn-lg" 
+								data-container="body" 
+								data-toggle="popover" 
+								data-placement="bottom"
+				>Add a corpus</button>
+								<div id="popover-content" class="hide">
+
+					<form enctype="multipart/form-data" action="/project/{{project.id}}/" method="post">
     {% csrf_token %}
 		{{ form.non_field_errors }}
 		{{ form.as_p}}
 		
 		{{ formResource.non_field_errors }}
 		{{ formResource.as_p}}
-		<input type="submit" value="Add Corpus" />
+		<input type="submit" class="btn" value="Add this corpus" />
 </form>
 
-            {% endif %}
+
+								</div>
+		        </div>
+        </div>
+
+
         </div>
         </div>
 </div>

templates/projects.html

@@ -19,16 +19,18 @@
 						<p>Template showing my working space</p>
         </div>
 						<div class="col-md-4"></div>
-						<div class="col-md-4"></div>
-						<div class="col-md-4"></div>
         <div class="col-md-4">
-		<form enctype="multipart/form-data" action="/projects/" method="post">
-    {% csrf_token %}
-		{{ form.non_field_errors }}
-		{{ form.as_p}}
-		<input type="submit" value="Add project" />
-</form>
-        </div>
+				<button 
+								type="button" 
+								class="btn btn-primary btn-lg" 
+								data-container="body" 
+								data-toggle="popover" 
+								data-placement="bottom"
+				>Add a project</button>
+								<div id="popover-content" class="hide">
+										<form enctype='multipart/form-data' action='/projects/' method='post'>{% csrf_token %}{{ form.non_field_errors }}{{ form.as_p}}<input type='submit' class="btn" value='Add this project !'/></form>
+								</div>
+		        </div>
         </div>
         </div>
         </div>

test_parser.ipynb

 {
  "metadata": {
   "name": "",
-  "signature": "sha256:6df2ce47b09a6203b244f7b4dc27f3346901261b85922dd46bc54d669d6469a6"
+  "signature": "sha256:471ecc2290c2a84d75008cf33cc7db2b8c74f4bea96be0f180e58bedfabceaa8"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -833,6 +833,37 @@
      ],
      "prompt_number": 26
     },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "from autoslug import AutoSlugField"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 33
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "AutoSlugField()"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 34,
+       "text": [
+        "<autoslug.fields.AutoSlugField>"
+       ]
+      }
+     ],
+     "prompt_number": 34
+    },
     {
      "cell_type": "code",
      "collapsed": false,