[FIX] Institutional description.

gargantext_web/about.py

@@ -17,11 +17,6 @@ def get_team():
 
     '''
     team = [
-            { 'first_name' : 'Alexandre', 'last_name' : 'Delanoë',
-             'mail' : 'alexandre+gargantextATdelanoe.org',
-             'website' : 'http://alexandre.delanoe.org',
-             'picture' : 'alexandre.jpg',
-             'role' : 'principal investigator, developer'},
 
             { 'first_name' : 'David', 'last_name' : 'Chavalarias',
              'mail' : 'david.chavalariasATiscpif.fr',
@@ -46,6 +41,12 @@ def get_team():
              'picture' : 'samuel.jpg',
              'role' : 'developer'},
 
+            { 'first_name' : 'Alexandre', 'last_name' : 'Delanoë',
+             'mail' : 'alexandre+gargantextATdelanoe.org',
+             'website' : 'http://alexandre.delanoe.org',
+             'picture' : 'alexandre.jpg',
+             'role' : 'principal investigator, developer'},
+
             #{ 'first_name' : '', 'name' : '', 'mail' : '', 'website' : '', 'picture' : ''},
             # copy paste the line above and write your informations please
             ]
@@ -53,7 +54,7 @@ def get_team():
     random.shuffle(team)
     return(team)
 
-def get_sponsors():
+def get_partners():
     '''
     Function to get list of each sponsor as dict of institutional informations.
 
@@ -61,13 +62,22 @@ def get_sponsors():
     sponsors = [
             { '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' : 'Forccast', 'website' : 'http://forccast.hypotheses.org/', 'picture' : 'forccast.png', 'funds':''},
             { 'name' : 'ADEME', 'website' : 'http://www.ademe.fr', 'picture' : 'ademe.png', 'funds':''},
             { 'name' : 'EHESS', 'website' : 'http://www.ehess.fr', 'picture' : 'ehess.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':''},
+            # copy paste the line above and write your informations please
+            ]
+
 
     random.shuffle(sponsors)
-    return(sponsors)
+    #random.shuffle(grants)
+    return(sponsors,grants)
+
+
 

gargantext_web/views.py

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

templates/about.html

@@ -35,22 +35,26 @@
 						<div class="panel-body">
 								<div class="container">
 										<ul>
-												<li>Version 1.0</li>
+                        <li>Versions from 0.1 to 0.9</li>
 														<ul>
-																<li>[Start] Beta Version </li>
 																<li>[Law] Licence of Gargantext is GPL v3+ </li>
+																<li>[NLP] NLTK, TreeTagger</li>
+																<li>[FEATURE] Graph Explorer</li>
 														</ul>
-												<li>Version 1.0.5</li>
+                        <li>Versions from 1.0 to 1.9</li>
 														<ul>
-																<li>Bug resolution: [Import] xml zipped from Mac</li>
-																<li>Bug resolution: [Import] french accents in filenames</li>
-																<li>New features: [Advanced chart] ngrams completion</li>
-																<li>New features: [Duplicates management] button to delete all duplicates</li>
+																<li>[Law] Licence of Gargantext is (and will be for next versions) AGPL</li>
+																<li>[NLP] Turbo Parser, TreeTagger</li>
+                                <li>[FEATURE] Advanced Chart</li>
+                                <li>[FEATURE] Remove duplicates</li>
 														</ul>
-												<li>Version 1.0.6</li>
+                        <li>Version 2.0</li>
 														<ul>
-																<li>Bug resolution: [Advanced chart] one can make comparisons with different corpora at different scales</li>
-																<li>Bug resolution: [Graph] Graph link can not be executed until workflow is finished.</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>
 										</ul>
 								</div>
@@ -146,28 +150,39 @@
 		</div>
 </div>
 
-{% if sponsors %}
 <div class="panel panel-default">
 				<div class="panel-heading">
 						<h2 class="panel-title">
 										<center>
-										<h2>Sponsors</h2>
+										<h2>Institutional 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">
 										</a>
 										<a href="http://www.iscpif.fr" target="_blank" >
 										<img src="{% static "img/sponsors/iscpif.svg"%}" style="height:100px">
 										</a>
+										<a href="http://cams.fr" target="_blank" >
+										<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">
 										</a>
 										{% endfor %}
+										
+                    <h3>Grants</h3>
+                    {% for grant in grants %}
+										<a href="{{ grant.website }}" target="_blank" >
+										<img src="{% static "img/sponsors/"%}{{ grant.picture }}" style="height:100px">
+										</a>
+										{% endfor %}
 										</center>
 </div>
 </div>
 </div>
-{% endif %}