Commit 88653d44 authored by Fabrice Roy's avatar Fabrice Roy

modifs pour suivre les modifs dans descriptions

reduction de marge dans le css
parent 083911f3
Pipeline #9479 failed with stages
in 10 seconds
......@@ -122,10 +122,10 @@ class Meso(Directive):
'gpscoordinates': multiline_list(float),
'contactname': str,
'contactaddress': str,
'totalcorenumber': int,
'totalstorage': float,
'totalgpunumber': int,
'totalram': int,
'mesocorenumber': int,
'mesostoragesize': float,
'mesogpunumber': int,
'mesoramsize': int,
'distributedinfra': multiline_list(str),
'servicename': multiline_list(str),
'etptnumber': float,
......@@ -179,11 +179,14 @@ class Cluster(Directive):
final_argument_whitespace = True
option_spec = { # Option name in lowercase!
'clustercorenumber': int,
'clustergpunumber': int,
'clusternodenumber' : int,
'clusterramsize': int,
'networktype': str,
'networkbandwidth': float,
'networktopology': str,
'jobshedulername': str,
'vendorname': str,
'vendorname': multiline_list(str),
}
has_content = True
......@@ -295,12 +298,12 @@ class NodeType(Directive):
final_argument_whitespace = True
option_spec = { # Option name in lowercase!
'gputype': str,
'gpunumber': int,
'nodegpunumber': int,
'cputype': str,
'corenumber': int,
'cpunumber': int,
'memory': float,
'localdisk': float,
'cpucorenumber': int,
'nodecpunumber': int,
'noderamsize': float,
'nodestoragesize': float,
'nodenumber': int,
}
has_content = True
......
......@@ -12,9 +12,9 @@
{{ cluster['clustercorenumber'] }}
</p>
{% endif %}
{% if cluster['clusternodenumber'] %}
<p class="col-sm"><img src="../theme/img/node.png" alt="Nombre de nœuds" title="Nombre de nœuds" />
{{ cluster['clusternodenumber'] }}
{% if cluster['clusterramsize'] %}
<p class="col-sm"><img src="../theme/img/memory.png" alt="RAM" title="RAM" />
{{ cluster['clusterramsize'] | format_storage(3)}}
</p>
{% endif %}
{% if cluster['clustergpunumber'] %}
......@@ -22,6 +22,11 @@
{{ cluster['clustergpunumber'] }}
</p>
{% endif %}
{% if cluster['clusternodenumber'] %}
<p class="col-sm"><img src="../theme/img/node.png" alt="Nombre de nœuds" title="Nombre de nœuds" />
{{ cluster['clusternodenumber'] }}
</p>
{% endif %}
{% if cluster['jobshedulername'] %}
<p class="col-sm"><img src="../theme/img/scheduler.png" alt="Gestionnaire de tâches" title="Gestionnaire de tâches" />
{{ cluster['jobshedulername'] }}
......@@ -46,7 +51,7 @@
{% endif %}
{% if cluster['vendorname'] %}
<p class="col-sm"><img src="../theme/img/brand.png" alt="Constructeur" title="Constructeur"/>
{{ cluster['vendorname'] }}
{{ cluster['vendorname'] | join_names }}
</p>
{% endif %}
</div>
......
......@@ -59,24 +59,24 @@
</div>
<div class="card-body row">
{% if meso['totalcorenumber'] %}
{% if meso['mesocorenumber'] %}
<p class="col-sm"><img src="../theme/img/cpu.png" alt="Nombre de cœurs" title="Nombre de cœurs" />
{{ meso['totalcorenumber'] }} cœurs
{{ meso['mesocorenumber'] }} cœurs
</p>
{% endif %}
{% if meso['totalram'] %}
{% if meso['mesoramsize'] %}
<p class="col-sm"><img src="../theme/img/memory.png" alt="Mémoire" title="Mémoire" />
{{ meso['totalram'] | format_storage(3) }}
{{ meso['mesoramsize'] | format_storage(3) }}
</p>
{% endif %}
{% if meso['totalgpunumber'] %}
{% if meso['mesogpunumber'] %}
<p class="col-sm"><img src="../theme/img/gpu.png" alt="Nombre de GPUs" title="Nombre de GPUs"/>
{{ meso['totalgpunumber'] }}
{{ meso['mesogpunumber'] }}
</p>
{% endif %}
{% if meso['totalstorage'] %}
{% if meso['mesostoragesize'] %}
<p class="col-sm"><img src="../theme/img/storage.png" alt="Stockage" title="Stockage"/>
{{ meso['totalstorage'] | format_storage(4) }}
{{ meso['mesostoragesize'] | format_storage(4) }}
</p>
{% endif %}
</div>
......
......@@ -1262,7 +1262,7 @@ a.year-toc {
border-bottom: 10px solid black;
margin-left: 0;
margin-right: 0;
margin-bottom: 3em;
margin-bottom: 2em;
padding-bottom: 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment