Merge branch 'unstable' into testing

gargantext_web/team.py

@@ -21,7 +21,7 @@ def get_team():
             { 'first_name' : 'David', 'last_name' : 'Chavalarias', 'mail' : '', 'website' : 'http://chavalarias.com', 'picture' : 'david.jpg'},
             { 'first_name' : 'Mathieu', 'last_name' : 'Rodic', 'mail' : '', 'website'  : 'http://rodic.fr', 'picture' : 'mathieu.jpg'},
             { 'first_name' : 'Samuel', 'last_name' : 'Castillo J.', 'mail' : 'kaisleanATgmail.com', 'website'  : 'http://www.pksm3.droppages.com', 'picture' : 'samuel.jpg'},
-            { 'first_name' : 'Elias', 'last_name' : 'Showk', 'mail' : '', 'website' : '', 'picture' : 'logo.svg'},
+            { 'first_name' : 'Elias', 'last_name' : 'Showk', 'mail' : '', 'website' : 'https://github.com/elishowk', 'picture' : 'logo.svg'},
             #{ 'first_name' : '', 'name' : '', 'mail' : '', 'website' : '', 'picture' : ''},
             # copy paste the line above and write your informations please
             ]

parsing/FileParsers/FileParser.py

@@ -102,10 +102,16 @@ class FileParser:
         if zipfile.is_zipfile(file):
             zipArchive = zipfile.ZipFile(file)
             for filename in zipArchive.namelist():
-                metadata_list += self.parse(zipArchive.open(filename, "r"))
+                try:
+                    metadata_list += self.parse(zipArchive.open(filename, "r"))
+                except Exception as error:
+                    print(error)
         # ...otherwise, let's parse it directly!
         else:
-            metadata_list += self._parse(file)
+            try:
+                metadata_list += self._parse(file)
+            except Exception as error:
+                print(error)
         # return the list of formatted metadata
         return map(self.format_metadata, metadata_list)
 

templates/about.html

@@ -18,9 +18,11 @@
 				<h1>About Gargantext</h1>
 		</div>
 
-{% if team %}
+
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
 		<div class="panel panel-default">
+
+{% if team %}
 				<div class="panel-heading">
 						<h2 class="panel-title">
 								<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
@@ -28,13 +30,13 @@
 								</a>
 						</h2>
 				</div>
-				<div id="collapseOne" class="panel-collapse collapse" role="tabpanel">
+				<div id="collapseOne" class="panel-collapse show" role="tabpanel">
 						<div class="panel-body">
 								<div class="container">
 										<div class="row">
 												<div class="thumbnails">
 												{% for member in team %}
-												<div class="col-md-4">
+												<div class="col-md-3 ">
 														<div class="thumbnail">
 															{% if member.picture %}
 																<img src="{% static "img/team/"%}{{ member.picture }}" style="100px; height:150px">
@@ -44,11 +46,9 @@
 																				{% if member.role %}
 																						<p class="description">{{ member.role }}</p>
 																				{% endif %}
-																				
 																				{% if member.mail %}
 																					<a href="mailto:{{ member.mail }}" class="btn btn-primary btn-xs">Mail</a>
 																				{% endif %}
-																						
 																				{% if member.website %}
 																					<a href="{{ member.website }}" class="btn btn-primary btn-xs">Website</a>
 																				{% endif %}
@@ -60,9 +60,12 @@
 								</div>
 						</div>
 				</div>
+
+{% endif %}
+
 		</div>
 </div>
-{% endif %}
+
 
 
 </div>