Merge branch 'unstable' into testing

gargantext_web/team.py

@@ -35,9 +35,12 @@ def get_sponsors():
 
     '''
     sponsors = [
-            { 'name' : 'Mines ParisTech', 'website' : 'http://mines-paristech.fr', 'picture' : 'mines.png'},
-            { 'name' : 'Institut Pasteur', 'website' : 'http://www.pasteur.fr', 'picture' : 'pasteur.png'},
-            { 'name' : 'Forccast', 'website' : 'http://forccast.hypotheses.org/', 'picture' : 'forccast.png'},
+            { '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
             ]
 

templates/about.html

@@ -152,18 +152,18 @@
 						<h2 class="panel-title">
 										<center>
 										<h2>Sponsors</h2>
-										</center>
 										<a href="http://www.cnrs.fr" target="_blank" >
-										<img src="{% static "img/sponsors/cnrs.png"%}" alt="CNRS"  style="100px; height:150px">
+										<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="100px; height:150px">
+										<img src="{% static "img/sponsors/iscpif.svg"%}" style="height:100px">
 										</a>
 										{% for sponsor in sponsors %}
 										<a href="{{ sponsor.website }}" target="_blank" >
-										<img src="{% static "img/sponsors/"%}{{ sponsor.picture }}" style="100px; height:150px">
+										<img src="{% static "img/sponsors/"%}{{ sponsor.picture }}" style="height:100px">
 										</a>
 										{% endfor %}
+										</center>
 </div>
 </div>
 </div>

templates/menu.html

@@ -66,7 +66,8 @@
 <hr>
 
 <footer>
-        <p>Gargantext, version 1.0.6, Copyrights CNRS {{ date.year }}.</p>
+		<p>Gargantext, version 1.0.6, <a href="http://www.cnrs.fr" target="blank">Copyrights CNRS {{ date.year }}</a>, 
+		<a href="http://www.gnu.org/licenses/agpl-3.0.html" target="blank">Licence aGPLCV3</a>.</p>
 </footer>