[FEAT] adding laboratories to page support, reordering versions numbers.

gargantext_web/about.py

@@ -59,7 +59,7 @@ def get_partners():
     Function to get list of each sponsor as dict of institutional informations.
 
     '''
-    sponsors = [
+    institutions = [
             { 'name' : 'Mines ParisTech', 'website' : 'http://mines-paristech.fr', 'picture' : 'mines.png', 'funds':''},
             { 'name' : 'Institut Pasteur', 'website' : 'http://www.pasteur.fr', 'picture' : 'pasteur.png', 'funds':''},
             { 'name' : 'ADEME', 'website' : 'http://www.ademe.fr', 'picture' : 'ademe.png', 'funds':''},
@@ -68,6 +68,12 @@ def get_partners():
             # copy paste the line above and write your informations please
             ]
     
+    labos = [
+            { 'name' : 'Centre de Sociologie de l\'innovation', 'website' : 'http://www.csi.mines-paristech.fr/en/', 'picture' : 'csi.png', 'funds':''},
+            #{ 'name' : '', 'website' : '', 'picture' : '', 'funds':''},
+            # copy paste the line above and write your informations please
+            ]
+    
     grants = [
             { 'name' : 'Forccast', 'website' : 'http://forccast.hypotheses.org/', 'picture' : 'forccast.png', 'funds':''},
             #{ 'name' : '', 'website' : '', 'picture' : '', 'funds':''},
@@ -75,9 +81,9 @@ def get_partners():
             ]
 
 
-    random.shuffle(sponsors)
+    random.shuffle(institutions)
     #random.shuffle(grants)
-    return(sponsors,grants)
+    return(institutions,labos,grants)
 
 
 

gargantext_web/views.py

@@ -165,13 +165,14 @@ def get_about(request):
     date        = datetime.datetime.now()
 
     members     = about.get_team()
-    sponsors,grants    = about.get_partners()
+    institutions,labos,grants    = about.get_partners()
 
     html = template.render(Context({\
             'user': user,\
             'date': date,\
             'team': members,\
-            'sponsors':sponsors,\
+            'institutions': institutions,\
+            'labos': labos,\
             'grants': grants,\
             }))
 

templates/about.html

@@ -35,13 +35,18 @@
 						<div class="panel-body">
 								<div class="container">
 										<ul>
-                        <li>Versions from 0.1 to 0.9</li>
+
+                        <li>Version 2.0</li>
 														<ul>
-                                <li>[NAME] Black Salade</li>
-																<li>[Law] Licence of Gargantext is GPL v3+ </li>
-																<li>[NLP] NLTK, TreeTagger</li>
-																<li>[FEATURE] Graph Explorer</li>
+                                <li>[NAME] Red Lemon</li>
+																<li>[NLP] Turbo Parser, MELT</li>
+                                <li>[FEATURE] Ngrams Table management</li>
+                                <li>[FEATURE] Annotation local view</li>
+                                <li>[FEATURE] Lexical Graph with temporal filter</li>
+                                <li>[FEATURE] Graph bi-Partite</li>
 														</ul>
+
+    
                         <li>Versions from 1.0 to 1.9</li>
 														<ul>
                                 <li>[NAME] Rose Bonbon</li>
@@ -50,16 +55,19 @@
                                 <li>[FEATURE] Advanced Chart</li>
                                 <li>[FEATURE] Remove duplicates</li>
 														</ul>
-                        <li>Version 2.0</li>
+
+    
+                        <li>Versions from 0.1 to 0.9</li>
 														<ul>
-                                <li>[NAME] Red Lemon</li>
-																<li>[NLP] Turbo Parser, MELT</li>
-                                <li>[FEATURE] Ngrams Table management</li>
-                                <li>[FEATURE] Annotation local view</li>
-                                <li>[FEATURE] Lexical Graph with temporal filter</li>
-                                <li>[FEATURE] Graph bi-Partite</li>
+                                <li>[NAME] Black Salade</li>
+																<li>[Law] Licence of Gargantext is GPL v3+ </li>
+																<li>[NLP] NLTK, TreeTagger</li>
+																<li>[FEATURE] Graph Explorer</li>
 														</ul>
-										</ul>
+
+
+
+                    </ul>
 								</div>
 						</div>
 				</div>
@@ -157,7 +165,7 @@
 				<div class="panel-heading">
 						<h2 class="panel-title">
 										<center>
-										<h2>Institutional and financial support</h2>
+										<h2>Institutional, research and financial support</h2>
 										<h3>Host institutions</h3>
 										<a href="http://www.cnrs.fr" target="_blank" >
 										<img src="{% static "img/sponsors/cnrs.png"%}" alt="CNRS"  style="height:100px">
@@ -169,14 +177,27 @@
 										<img src="{% static "img/sponsors/cams.jpg"%}" style="height:100px">
 										</a>
 										
-                    <h3>Partners</h3>
-										{% for sponsor in sponsors %}
-										<a href="{{ sponsor.website }}" target="_blank" >
-										<img src="{% static "img/sponsors/"%}{{ sponsor.picture }}" style="height:100px">
+                    <h3>Institutional Partners</h3>
+                    <p>
+										{% for institution in institutions %}
+										<a href="{{ institution.website }}" target="_blank" >
+										<img src="{% static "img/sponsors/"%}{{ institution.picture }}" style="height:100px">
 										</a>
 										{% endfor %}
+                    </p>
 										
-                    <h3>Grants</h3>
+
+                    <h4>Laboratory Partners</h4>
+                    <p>
+										{% for labo in labos %}
+										<a href="{{ labo.website }}" target="_blank" >
+										<img src="{% static "img/sponsors/"%}{{ labo.picture }}" style="height:50px">
+										</a>
+										{% endfor %}
+                    </p>
+										
+
+                    <h4>Grants</h4>
                     {% for grant in grants %}
 										<a href="{{ grant.website }}" target="_blank" >
 										<img src="{% static "img/sponsors/"%}{{ grant.picture }}" style="height:100px">