meso-web

commit 40a6e319ed4693aad44140d6ec2cfcdf4dd59f01
parent 78ffe04da1c3fcf466c09d7c7a502ec054d0b61f
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  8 Jan 2024 14:33:54 +0100

stardis: Airbus added as consortium member

The insert highlighting the consortium in the "Overview" section has
also been updated. It now only gives a brief summary of its scope.

Diffstat:
M
stardis/Makefile
 | 
15
++++++++-------
M
stardis/consortium-en.html.in
 | 
8
++++++--
M
stardis/consortium-fr.html.in
 | 
9
++++++---
M
stardis/stardis.html.in
 | 
12
+++++-------

4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/stardis/Makefile b/stardis/Makefile
@@ -80,6 +80,10 @@ VALIDATION_IMG=\
  TprofX.png\
  TprofY.png
 
+CONSORTIUM_IMG=\
+ airbus_logo.svg\
+ edf_logo.svg
+
 HTML=\
  consortium-fr.html\
  consortium-en.html\
@@ -119,6 +123,7 @@ install: build
 	@rsync -avzrR --delete-after --progress\
 		$(HTML)\
 		$(OVERVIEW_IMG)\
+		$(CONSORTIUM_IMG)\
 		$(STARTER_PACK_IMG)\
 		$(STARDIS_PKG)\
 		$(STARDIS_SIG)\
@@ -134,11 +139,7 @@ stardis_build.sh: ../meso-menu.sh
 ################################################################################
 # Stardis web page
 ################################################################################
-stardis.html:\
-		stardis.html.in \
-		$(OVERVIEW_IMG) \
-		stardis_build.sh \
-		Makefile
+stardis.html: stardis.html.in $(OVERVIEW_IMG) stardis_build.sh Makefile
 	@echo "Building $@"
 	@$(SHELL) stardis_build.sh overview $(STARDIS_VERSION) > $@
 
@@ -152,11 +153,11 @@ validation.html: validation.html.in $(VALIDATION_IMG) stardis_build.sh Makefile
 ################################################################################
 # Consortium web pages
 ################################################################################
-consortium-fr.html: consortium-fr.html.in edf_logo.svg stardis_build.sh
+consortium-fr.html: consortium-fr.html.in $(CONSORTIUM_IMG) stardis_build.sh Makefile
 	@echo "Building $@"
 	@$(SHELL) stardis_build.sh consortium fr > $@
 
-consortium-en.html: consortium-en.html.in edf_logo.svg stardis_build.sh
+consortium-en.html: consortium-en.html.in $(CONSORTIUM_IMG) stardis_build.sh Makefile
 	@echo "Building $@"
 	@$(SHELL) stardis_build.sh consortium en > $@
 
diff --git a/stardis/consortium-en.html.in b/stardis/consortium-en.html.in
@@ -86,7 +86,11 @@ functioning of the consortium.</p>
 <h2>List of consortium members</h2>
 
 <ul style="list-style-type: none;">
-  <li><img alt="EDF logo" src="edf_logo.svg" style="vertical-align: middle;
-  padding-right: 1em;" />&Eacute;lectricité de France Research &amp;
+  <li style="padding-bottom: 1.0em;"><img alt="Airbus logo"
+  src="airbus_logo.svg" style="vertical-align: middle; padding-right:
+  1em; width: 4em;"/>Airbus SAS</li>
+  <li style="padding-bottom: 1.0em;"><img alt="EDF logo"
+  src="edf_logo.svg" style="vertical-align: middle; padding-right: 1em;
+  width: 4em;" />&Eacute;lectricité de France Research &amp;
   Dévelopment</li>
 </ul>
diff --git a/stardis/consortium-fr.html.in b/stardis/consortium-fr.html.in
@@ -87,7 +87,10 @@ fonctionnement du consortium.</p>
 <h2>Liste des membres du consortium</h2>
 
 <ul style="list-style-type: none;">
-  <li><img alt="EDF logo" src="edf_logo.svg" style="vertical-align: middle;
-  padding-right: 1em;" />&Eacute;lectricité de France Recherche &amp;
-  Développement</li>
+  <li style="padding-bottom: 1.0em;"><img alt="Airbus logo"
+  src="airbus_logo.svg" style="vertical-align: middle; padding-right:
+  1em; width: 4em;"/>Airbus SAS</li>
+  <li style="padding-bottom: 1.0em"><img alt="EDF logo" src="edf_logo.svg"
+  style="vertical-align: middle; padding-right: 1em; width: 4em;"
+  />&Eacute;lectricité de France Recherche &amp; Développement</li>
 </ul>
diff --git a/stardis/stardis.html.in b/stardis/stardis.html.in
@@ -26,13 +26,11 @@ here is that heat transfer phenomena are not considered separately but are
 <b>naturally coupled</b> via the cross-recursion of the various Monte-Carlo
 algorithms.</p>
 
-<div class="news" style="width: 20em">
-  <p>Refer to the <a href=consortium-fr.html>Stardis consortium</a> service
-  offer to <b>learn</b> how to use it, <b>influence</b> its orientation choices
-  and <b>interact</b> with its developers and other users.</p>
-
-  <p>In 2021, &Eacute;lectricité de France R&amp;D became the first member of
-  the Stardis consortium.</p>
+<div class="news">
+  <p>Refer to the <a href=consortium-fr.html>Stardis consortium's</a>
+  service offer for long-term <b>advices</b> on its use,
+  <b>contribute</b> to orientation choices and <b>interact</b> with its
+  developers and other users.</p>
 </div>
 
 <p>Beyond its use as a regular thermal simulation tool, the Stardis framework