Merge branch 'testing' into stable

init_accounts.py

@@ -31,6 +31,61 @@ from django.core.mail        import send_mail
 from gargantext.settings     import BASE_URL
 
 drafts = {
+        'partnerOkenglish': '''
+        Hello,
+
+        You have made a request for access to the platform Gargantext.
+        The ISC-PIF team has made every effort to Give you access to
+        this platform in the best Time.
+
+        We recommend that you read the conditions To use the platform
+        at the address below Drawing your attention to the following
+        points:
+
+        1 - The use of this platform is reserved for an academic
+        framework,
+
+        2 - The Gargantext service is a data analysis service, And not
+        storage. It is up to each user To safeguard its own data and
+        results in Downloading them from the platform.
+
+        3 - The re-use of data, graphics, analyzes and Cartographies
+        generated by Gargantext in any publication And communication
+        implies the explicit mention of Gargantext and Of the ISC-PIF
+        CNRS as for example: "these results have been Obtained using
+        Gargantext software developed by ISC-PIF / CNRS ".
+
+        Read the full terms of use (recommended) on:
+        http://gitlab.iscpif.fr/humanities/tofu/tree/master
+        
+        You can log on to:
+                http://%s
+        
+        With the following identifiers:
+        Your login is: %s
+        Your password is: %s
+
+        You are currently on this version stabilized for a
+        unique experience in exploring your research themes.
+
+        Your feedback will be valuable for further development
+        of the platform, do not hesitate to contact us and
+        to contribute!
+
+        If you want to access your old corpuses,
+        access codes remain valid until June 30
+        2017 midnight:
+
+                http://old.gargantext.org
+
+        We remain at your disposal for any further information.
+        
+        With our best regards,
+        -- 
+        The Gargantext Team (CNRS)
+
+
+        ''',
         'partnerOk' : '''
         Bonjour,
 

templates/pages/corpora/myGraphs.html

@@ -389,7 +389,6 @@
             }
 
 
-            // also replace template variables (thx c24b!)
             resultHtml = resultHtml.replace(/%%project_id%%/g, projectId);
             resultHtml = resultHtml.replace(/%%corpus_id%%/g, corpusId);
             resultHtml = resultHtml.replace(/%%cooc_id%%/g, coocId);

templates/pages/corpora/terms.html

@@ -312,7 +312,7 @@ function toggleFormatInfos() {
 }
 
 
-/*                                             merci c24b !
+/*
  * Uses importroute variable from the django template
  * Ex: /api/ngramlists/import?onto_corpus=corpus_id
  *