Merge branch 'refactoring' into refactoring-dev

gargantext/util/parsers/__init__.py

@@ -9,3 +9,4 @@ from .Europress import EuropressParser
 
 from .ISTex import ISTexParser
 from .CSV import CSVParser
+#from .CERN  import CernParser

gargantext/util/toolchain/list_map.py

@@ -94,7 +94,7 @@ def do_maplist(corpus,
     new_hyperdata = { 'corpus': corpus.id,
                       'limit' : limit,
                       'monograms_part' : monograms_part,
-                      'monograms_result' : obtained_mono/obtained_total
+                     'monograms_result' : obtained_mono/obtained_total if obtained_total != 0 else obtained_mono
                     }
     if overwrite_id:
         # overwrite pre-existing node

gargantext/views/generated/img.py

@@ -9,7 +9,7 @@ def logo(request):
         color = '#093558'
     else:
         # color of the css adapted to the logo
-        color = '#AE5C5C'
+        color = '#5A9AFF'
     svg_data = template.render({
         'color': color,
     })

gargantext/views/pages/projects.py

@@ -98,6 +98,16 @@ def project(request, project_id):
         # parse_extract: fileparsing -> ngram extraction -> lists
         scheduled(parse_extract_indexhyperdata)(corpus.id)
 
+        return render(
+            template_name = 'pages/projects/wait.html',
+            request = request,
+            context = {
+                'user'   : request.user,
+                'project': project,
+            },
+        )
+
+
     # corpora within this project
     corpora = project.children('CORPUS').all()
     sourcename2corpora = defaultdict(list)
@@ -161,3 +171,5 @@ def project(request, project_id):
             'query_size': QUERY_SIZE_N_DEFAULT,
         },
     )
+
+

gargantext/views/pages/urls.py

@@ -16,8 +16,8 @@ urlpatterns = [
     url(r'^auth/logout/?$', auth.logout),
 
     # projects
-    url(r'^projects/?$', projects.overview),
-    url(r'^projects/(\d+)/?$', projects.project),
+    url(r'^projects/?$'         , projects.overview),
+    url(r'^projects/(\d+)/?$'   , projects.project),
 
     # corpora
     url(r'^projects/(\d+)/corpora/(\d+)/?$', corpora.docs_by_titles),
@@ -28,5 +28,5 @@ urlpatterns = [
 
     # terms table for the corpus
     url(r'^projects/(\d+)/corpora/(\d+)/terms/?$', terms.ngramtable),
-    
+
 ]

install/docker/dev/Dockerfile

@@ -59,16 +59,16 @@ VOLUME ["/srv","/var"]
 
 # Create directories in /srv
 # FIXME: not tested
-RUN     for dir in "/srv/gargantext"\
-               "/srv/gargantext_lib"\
-               "/srv/gargantext_static"\
-               "/srv/gargantext_media"\
-               "/srv/env_3-5"\
-               "/var/www/gargantext"; do \
-        mkdir -p $dir \
-        chown gargantua:gargantua $dir \
-    done \
-    echo "Root: END of the installation of Gargantext by Root."
+RUN for dir in "/srv/gargantext"\
+           "/srv/gargantext_lib"\
+           "/srv/gargantext_static"\
+           "/srv/gargantext_media"\
+           "/srv/env_3-5"\
+           "/var/www/gargantext"; do \
+    mkdir -p $dir ;\
+    chown gargantua:gargantua $dir ; \
+    done ;\
+    echo "Root: END of the installation of Gargantext by Root." ;
 
 
 ######################################################################
@@ -85,37 +85,39 @@ RUN /etc/init.d/postgresql start &&\
 ######################################################################
 ## INSTALL MAIN DEPENDENCIES
 ######################################################################
-USER gargantua
-
-# TODO (soon) : git clone https://gogs.iscpif.fr/gargantext.git
-RUN git clone ssh://gitolite@delanoe.org:1979/gargantext /srv/gargantext \
-	&& cd /srv/gargantext \
-	&& git fetch origin refactoring \
-	&& git checkout refactoring
-
-
-# Possible FIXME : if `pip install -r requirements.txt` fails
-#                  then: fixme >> maybe (split the list)
-#                  else: enjoy
-
-# # Installing pip version of python libs
-# TODO: user local file requirements with docker (and not wget)
-
-RUN wget http://dl.delanoe.org/requirements.txt -o /tmp/requirements.txt \
-      && /usr/bin/virtualenv --py=/usr/bin/python3.5 env_3-5 \
-      && /bin/bash -c 'source env_3-5/bin/activate' \
-      && /bin/bash -c 'env_3-5/bin/pip install git+https://github.com/zzzeek/sqlalchemy.git@rel_1_1' \
-      && /bin/bash -c 'env_3-5/bin/pip install -r /tmp/requirements.txt'
-
-
-# GET CONFIG FILES
-WORKDIR /tmp
-RUN wget http://dl.gargantext.org/gargantext_lib.tar.bz2 \
-     && tar xvjf gargantext_lib.tar.bz2 -o /srv/gargantext_lib \
-     && chown -R gargantua:gargantua /srv/gargantext_lib \
-     && echo "Root: END of the installation of Gargantexts Database by postgres."
+#USER gargantua
+#
+#
+## Installing pip version of python libs
+## Possible FIXME : if `pip install -r requirements.txt` fails
+##                  then: fixme >> maybe (split the list)
+##                  else: enjoy
+#
+## TODO: user local file requirements with docker (and not wget)
+#
+#RUN wget http://dl.delanoe.org/requirements.txt -o /tmp/requirements.txt \
+#      && /usr/bin/virtualenv --py=/usr/bin/python3.5 env_3-5 \
+#      && /bin/bash -c 'source env_3-5/bin/activate' \
+#      && /bin/bash -c 'env_3-5/bin/pip install git+https://github.com/zzzeek/sqlalchemy.git@rel_1_1' \
+#      && /bin/bash -c 'env_3-5/bin/pip install -r /tmp/requirements.txt'
+#
+
+## GET CONFIG FILES (need update)
+#WORKDIR /tmp
+#RUN wget http://dl.gargantext.org/gargantext_lib.tar.bz2 \
+#     && tar xvjf gargantext_lib.tar.bz2 -o /srv/gargantext_lib \
+#     && chown -R gargantua:gargantua /srv/gargantext_lib \
+#     && echo "Root: END of the installation of Gargantexts Database by postgres."
 
 # TODO script pour peupler la base 
 
 ######################################################################
+# Last step as user:
+## TODO (soon) : git clone https://gogs.iscpif.fr/gargantext.git
+#RUN git clone ssh://gitolite@delanoe.org:1979/gargantext /srv/gargantext \
+#	&& cd /srv/gargantext \
+#	&& git fetch origin refactoring \
+#	&& git checkout refactoring
+
+
 ######################################################################

static/img/credits/logo.svg

@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="640"
-   height="480"
+   width="48px"
+   height="48px"
    id="svg3041"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="logo.svg">
   <defs
      id="defs3043" />
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.86750285"
-     inkscape:cx="574.44134"
-     inkscape:cy="214.55006"
+     inkscape:zoom="0.86750283"
+     inkscape:cx="67.094122"
+     inkscape:cy="-140.10669"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -34,7 +34,8 @@
      inkscape:window-height="762"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="0"
+     showborder="false" />
   <metadata
      id="metadata3046">
     <rdf:RDF>
@@ -53,64 +54,64 @@
      id="layer1"
      transform="translate(0,-572.36218)">
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect2998"
-       width="410.37329"
-       height="315.84909"
-       x="102.59332"
-       y="641.98889"
+       inkscape:export-ydpi="100"
+       inkscape:export-xdpi="100"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
-       inkscape:export-xdpi="200"
-       inkscape:export-ydpi="200" />
+       y="649.13409"
+       x="94.363609"
+       height="320.2265"
+       width="441.92203"
+       id="rect3019-6"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
-       inkscape:export-ydpi="200"
-       inkscape:export-xdpi="200"
+       inkscape:export-ydpi="100"
+       inkscape:export-xdpi="100"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
        id="path3950"
-       d="m 202.38568,655.35804 0,249.27214 130.47086,0 0,-16.6021 c -18.98946,-0.90974 -35.76303,-5.06743 -49.20478,-12.09066 -35.91671,-18.75291 -57.50584,-54.40745 -57.50584,-94.68011 0,-61.05225 40.65113,-101.66242 106.71062,-106.22939 l 0,-19.66988 -130.47086,0 z m 130.47086,19.66988 0,16.36149 c 3.35297,-0.31508 6.80528,-0.54137 10.34622,-0.54137 13.30249,0 25.59129,2.77406 37.8961,8.00029 l 4.63174,5.53403 4.99267,27.97093 18.64728,0 0,-48.84386 c -21.94909,-5.84107 -43.53556,-8.96273 -63.82184,-8.96273 -4.32186,0 -8.56494,0.19589 -12.69217,0.48122 z m 0,16.36149 c -44.82787,4.21264 -72.48382,36.2169 -72.48382,87.70241 0,53.1268 27.8084,86.66863 72.48382,92.03339 l 0,-179.7358 z m 0,179.7358 0,16.90287 c 2.62215,0.12569 5.29683,0.18036 8.00027,0.18036 19.62116,0 42.60224,-3.63639 68.87466,-10.70715 l 0,-73.50641 5.65434,-4.27083 18.28637,-1.56397 0,-12.63203 -83.19097,0 0,12.63203 23.63995,1.56397 5.65434,4.27083 0,63.94215 c -12.96993,2.76683 -24.28172,4.03022 -33.92603,4.03022 -4.47193,0 -8.80811,-0.3396 -12.99293,-0.84213 z"
-       style="font-size:166.11251831px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#800000;fill-opacity:1;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+       d="m 204.6879,655.63728 0,260.45538 133.2515,0 0,-17.34693 c -19.39418,-0.95055 -36.52522,-5.29477 -50.25345,-12.63309 -36.68218,-19.59423 -58.73143,-56.84838 -58.73143,-98.9278 0,-63.79128 41.51751,-106.22337 108.98488,-110.99523 l 0,-20.55233 -133.2515,0 z m 133.2515,20.55233 0,17.09554 c 3.42443,-0.32923 6.95031,-0.56568 10.56673,-0.56568 13.586,0 26.13669,2.89852 38.70375,8.35922 l 4.73046,5.78231 5.09906,29.22581 19.0447,0 0,-51.03518 c -22.41687,-6.10311 -44.4634,-9.36483 -65.18204,-9.36483 -4.41396,0 -8.74746,0.20467 -12.96266,0.50281 z m 0,17.09554 c -45.78326,4.40161 -74.02864,37.84171 -74.02864,91.63704 0,55.51026 28.40107,90.55691 74.02864,96.16235 l 0,-187.79939 z m 0,187.79939 0,17.66119 c 2.67804,0.13123 5.4097,0.18851 8.17077,0.18851 20.03933,0 43.51019,-3.79954 70.34254,-11.18751 l 0,-76.80418 5.77486,-4.46244 18.6761,-1.63413 0,-13.19875 -84.96397,0 0,13.19875 24.14376,1.63413 5.77484,4.46244 0,66.81083 c -13.24635,2.89097 -24.79921,4.21104 -34.64906,4.21104 -4.56724,0 -8.99584,-0.35485 -13.26984,-0.87992 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:166.11251831px;line-height:125%;font-family:'Bitstream Charter';-inkscape-font-specification:'Bitstream Charter';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#005a9a;fill-opacity:1;stroke:none"
        inkscape:connector-curvature="0" />
     <path
-       inkscape:export-ydpi="200"
-       inkscape:export-xdpi="200"
+       inkscape:export-ydpi="100"
+       inkscape:export-xdpi="100"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
-       transform="matrix(1.9248814,0,0,1.9248814,982.68611,-182.71269)"
        sodipodi:open="true"
        sodipodi:end="6.1660663"
        sodipodi:start="0"
-       d="m -312.87112,480.17926 a 9.0149298,9.0149298 0 1 1 -0.0618,-1.05341"
-       sodipodi:ry="9.0149298"
-       sodipodi:rx="9.0149298"
-       sodipodi:cy="480.17926"
-       sodipodi:cx="-321.88605"
+       d="m 386.54342,745.72272 a 17.722498,18.131174 0 0 1 -17.20366,18.1234 17.722498,18.131174 0 0 1 -18.21096,-17.06226 17.722498,18.131174 0 0 1 16.13739,-19.12241 17.722498,18.131174 0 0 1 19.15582,15.94261"
+       sodipodi:ry="18.131174"
+       sodipodi:rx="17.722498"
+       sodipodi:cy="745.72272"
+       sodipodi:cx="368.82092"
        id="path3952"
-       style="fill:#ffcc00;fill-opacity:1;stroke:none"
+       style="fill:#e5a400;fill-opacity:1;stroke:none"
        sodipodi:type="arc" />
     <flowRoot
        xml:space="preserve"
        id="flowRoot3130"
-       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Sans"
-       transform="translate(-222.82792,732.12538)"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#005a9a;fill-opacity:1;stroke:none"
+       transform="matrix(1.0213124,0,0,1.0448636,-229.58803,735.84868)"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
-       inkscape:export-xdpi="200"
-       inkscape:export-ydpi="200"><flowRegion
+       inkscape:export-xdpi="100"
+       inkscape:export-ydpi="100"><flowRegion
          id="flowRegion3132"><rect
            id="rect3134"
            width="1090.0853"
            height="476.31992"
            x="327.0256"
            y="148.23489"
-           style="fill:#800000" /></flowRegion><flowPara
+           style="fill:#005a9a;fill-opacity:1" /></flowRegion><flowPara
          id="flowPara3136"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#800000;font-family:Sawasdee;-inkscape-font-specification:Sawasdee">Gargan<flowSpan
-   style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;fill:#800000"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:64px;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;fill:#005a9a;fill-opacity:1">Gargan<flowSpan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:72px;font-family:Courier;-inkscape-font-specification:Courier;fill:#005a9a;fill-opacity:1"
    id="flowSpan3019">text</flowSpan></flowPara></flowRoot>    <flowRoot
        xml:space="preserve"
        id="flowRoot3138"
-       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:12px;line-height:125%;letter-spacing:0px;word-spacing:0px"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
-       inkscape:export-xdpi="200"
-       inkscape:export-ydpi="200"><flowRegion
+       inkscape:export-xdpi="100"
+       inkscape:export-ydpi="100"
+       transform="matrix(1.0213124,0,0,1.0448636,-2.0111141,-29.122501)"><flowRegion
          id="flowRegion3140"><rect
            id="rect3142"
            width="127.96654"
@@ -120,10 +121,11 @@
          id="flowPara3144" /></flowRoot>    <flowRoot
        xml:space="preserve"
        id="flowRoot3021"
-       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:12px;line-height:125%;letter-spacing:0px;word-spacing:0px"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        inkscape:export-filename="/srv/gargantext/static/img/logo.png"
-       inkscape:export-xdpi="200"
-       inkscape:export-ydpi="200"><flowRegion
+       inkscape:export-xdpi="100"
+       inkscape:export-ydpi="100"
+       transform="matrix(1.0213124,0,0,1.0448636,-2.0111141,-29.122501)"><flowRegion
          id="flowRegion3023"><rect
            id="rect3025"
            width="3.9310031"

templates/pages/main/about.html

@@ -37,7 +37,15 @@
                     <div class="container">
                         <ul>
                             <li>
-                                Version 2.0
+                                Version 3.0.0
+                                <ul>
+                                    <li>[NAME] Blue Mustard</li>
+                                    <li>[CODE] Refactored</li>
+                                    <li>[DATABASE] New schema</li>
+                                </ul>
+                            </li>
+                            <li>
+                                Version 2.0.0
                                 <ul>
                                     <li>[NAME] Red Lemon</li>
                                     <li>[NLP] Turbo Parser, MELT</li>

templates/pages/menu.html

@@ -16,7 +16,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" style="line-height:15px; height:10px; padding: 10px 10px;" href="/"><img src="/generated/img/logo.svg" title="Back to home."></a>
+                    <a class="navbar-brand" style="line-height:15px; height:10px; padding: 10px 10px;" href="/"><img src="{% static "img/logoSmall.png"%}" title="Back to home."></a>
                 </div>
 
                 <div class="navbar-collapse collapse">

templates/pages/projects/project.html

@@ -288,7 +288,7 @@
                                     $("#submit_thing").prop('onclick',null);
 
                                     var theType = $("#id_type option:selected").html();
-                                    console.log("consoling the typeeee: ")
+                                    console.log("consoling the type: ")
                                     console.log(theType)
                                     if(theType=="Pubmed (XML format)") doTheQuery();
                                     if(theType=="ISTex") {

templates/pages/projects/wait.html

+
+{% extends "pages/menu.html" %}
+
+{% block css %}
+{% load staticfiles %}
+<link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
+
+<script src="{% static "js/jquery/jquery.min.js" %}" type="text/javascript"></script>
+
+{% endblock %}
+
+
+
+{% block content %}
+
+<div class="container theme-showcase" role="main">
+	<div class="jumbotron">
+      <h2>Your file has been uploaded ! </h2>
+      <h2>Gargantext need some time to eat it.</h2>
+      <h2>Duration depends on the size of the plate of texts you gave him.</h2>
+          
+    <a class="btn btn-primary btn-lg" href="/projects/{{ project.id }}" title="Click and test by yourself">Continue on Gargantext</a>
+	</div>
+</div>
+
+{% endblock %}