GPU and memory in meso card

content/pages/mentions_legales.rst

@@ -78,7 +78,7 @@ Mentions légales
 
       Les pictogrammes proviennent des sources suivantes :
 
-        - `Pawel Rak <https://thenounproject.com/pr3113738/>`_ et `Adi Kurniawan <https://thenounproject.com/kuradn/>`_ sur Noun Project,
+        - `Pawel Rak <https://thenounproject.com/pr3113738/>`_ , `Adi Kurniawan <https://thenounproject.com/kuradn/>`_ , `Edwin PM <https://thenounproject.com/edwin.misran/>`_ et `Template <https://thenounproject.com/paisurangkana>`_ sur Noun Project,
         - Site `iconfinder <https://www.iconfinder.com>`_,
         - `Pierre Digonnet`_ (licence `CC-BY-4.0-FR`_).
 

content/pages/meso-details.rst

@@ -33,4 +33,4 @@ Les mésocentres en |_| France
     :class: description
 
     .. meso_list::
-        :json_url: https://plmbox.math.cnrs.fr/f/91b34c9f48b941288bea/?dl=1
+        :json_url: https://plmbox.math.cnrs.fr/f/99387ff5e39a4efab634/?dl=1

plugins/meso_list/directives.py

@@ -85,7 +85,10 @@ class Meso(Directive):
         'contactaddress': str,
         'totalcorenumber': int,
         'totalstorage': int,
+        'totalgpunumber': int,
+        'totalram': int,
         'accesspolicy': str,
+        'etptnumber': float,
     }
     has_content = True
 

plugins/meso_list/templates/meso.tpl

@@ -54,12 +54,22 @@
         </div>
         <div class="card-footer row">
             {% if meso['totalcorenumber'] %}
-                <p class="col-sm"><img src="../theme/img/cpu.png" alt="Nombre de cœurs" />
+                <p class="col-sm"><img src="../theme/img/cpu.png" alt="Nombre de cœurs" title="Nombre de cœurs" />
                 {{ meso['totalcorenumber'] }} cœurs
                 </p>
             {% endif %}
+            {% if meso['totalram'] %}
+                <p class="col-sm"><img src="../theme/img/memory.png" alt="Mémoire" title="Mémoire" />
+                {{ meso['totalram'] }} Go
+                </p>
+            {% endif %}
+            {% if meso['totalgpunumber'] %}
+                <p class="col-sm"><img src="../theme/img/gpu.png" alt="Nombre de GPUs" title="Nombre de GPUs"/>
+                {{ meso['totalgpunumber'] }}
+                </p>
+            {% endif %}
             {% if meso['totalstorage'] %}
-                <p class="col-sm"><img src="../theme/img/floppy.png" alt="Stockage" />
+                <p class="col-sm"><img src="../theme/img/floppy.png" alt="Stockage" title="Stockage"/>
                 {{ meso['totalstorage'] }} To
                 </p>
             {% endif %}

themes/calcul/static/css/style.css

@@ -1153,8 +1153,9 @@ a.year-toc {
 
 /* mesocenters list */
 
-.meso .card a:hover {
-    color: #5b5b5b;
+.meso .card {
+    margin-bottom: 2em;
+    margin-top: 2em;
 }
 
 .meso .card a:hover .card-header, 
@@ -1218,7 +1219,7 @@ a.year-toc {
     background-size: 100%;
 }
 
-.meso .card img {
+.meso .card-body img {
     height: 15px;
     vertical-align: text-top;
 }
@@ -1245,6 +1246,7 @@ a.year-toc {
     margin: 3em 2em 1em 2em;
 }
 
-.meso .hidden {
-    display: none;
+.meso .card-footer img {
+    height: 20px;
+    vertical-align: text-bottom;
 }