Merge branch 'testing' into stable

gargantext/constants.py

@@ -2,33 +2,30 @@
 # WARNING: to ensure consistency and retrocompatibility, lists should keep the
 #   initial order (ie., new elements should be appended at the end of the lists)
 
-
 abstract:
 ---------
          something between global params, constants,
          configuration variables, ini file...
 
-
 contents:
 ---------
-
-      + db constants/ontology
+      + database constants/ontology
          - nodetypes
             (db int <=> named types <=> python code)
 
-      + input low-level limits
+      + low-level limits
          - query size
          - max upload size
          - doc parsing batch size
          - word extraction batch size
 
-      + process config
+      + main process config
          - resourcetypes config (~ input ontology)
          - wordlist generation params
          - graph creation params
          - £TODO sequence of transformations "custom pipeline"
 
-      + input process subclasses/subroutines
+      + subprocess config
          - crawling, import
          - tagger services and functions
          - parser services
@@ -83,6 +80,7 @@ NODETYPES = [
     # docs subset
     'FAVORITES',             # 15
     # more scores (sorry!)
+
     'TIRANK-LOCAL',          # 16
     'TIRANK-GLOBAL',         # 17
 
@@ -90,6 +88,13 @@ NODETYPES = [
     'RESOURCE',              # 19
 ]
 
+
+def get_nodetype_id_by_name(nodetype):
+    '''resource :: name => resource dict'''
+    for n in NODETYPES :
+        if str(n["name"]) == str(sourcename):
+            return n
+
 INDEXED_HYPERDATA = {
     # TODO use properties during toolchain.hyperdata_indexing
     # (type, convert_to_db, convert_from_db)
@@ -154,7 +159,6 @@ INDEXED_HYPERDATA = {
 # user parameters----------------------------------------
 USER_LANG = ["fr", "en"]
 
-
 # resources ---------------------------------------------
 def get_resource(sourcetype):
     '''resource :: type => resource dict'''

graph/distances.py

@@ -63,10 +63,10 @@ def clusterByDistances( cooc_matrix
         n = n.sort_index(inplace=False)
         m = m.sort_index(inplace=False)
 
-        nodes_included = 500 #int(round(size/20,0))
+        nodes_included = 10000 #int(round(size/20,0))
         #nodes_excluded = int(round(size/10,0))
 
-        nodes_specific = 500 #int(round(size/10,0))
+        nodes_specific = 10000 #int(round(size/10,0))
         #nodes_generic = int(round(size/10,0))
 
         # TODO use the included score for the node size

templates/pages/main/home.html

@@ -14,25 +14,40 @@
 <div class="container">
     <div class="jumbotron">
         <div class="row">
-            <div class="col-md-4 content">
+            <div class="col-md-8 content">
                 <h1>Gargantext</h1>
                 <p>A web platform to explore text-mining</p>
 
+                <p>
                 <a class="btn btn-primary btn-lg" href="/projects" title="Click and test by yourself">
                     <span class="glyphicon glyphicon-hand-right" aria-hidden="true"></span>
-                    Enter in
+                    Log in
                 </a>
-                <p>
+
+                <a class="btn btn-warning btn-lg" target="blank" href="https://iscpif.fr/services/applyforourservices/" title="Fill the form to sign up">
+                    <span class="glyphicon glyphicon-hand-right" aria-hidden="true"></span>
+                    Sign Up
+                </a>
+
+                              
+                <a class="btn btn-success btn-lg" target="blank" href="https://iscpif.fr/gargantext/your-first-map/" title="Fill the form to sign up">
+                    <span class="glyphicon glyphicon-hand-right" aria-hidden="true"></span>
+                    Documentation
+                </a>
+
+
+
+                </p>
                     <span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
-                    <small>
                         <i>
                             Some features may not work without a javascript optimized browser (Chromium for instance).
                         </i>
-                    </small>
                 </p>
+
+
+
             </div>
-            <div class="col-md-2 content"></div>
-            <div class="col-md-2 content"></div>
+
             <div class="col-md-2 content">
                 <p class="right">
                     <div style="border:15px">
@@ -62,8 +77,6 @@
     </div>
 </div>
 
-
-
 <div class="container">
     <div class="row">
         <div class="col-md-4 content">
@@ -89,6 +102,5 @@
 
     </div>
 
-
 {% endblock %}
 <script type="text/javascript" src="{% static "lib/gargantext/help.js" %}"></script>