This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit e5dba0c0c0cf7888e81b30933985be1e94df8d08 Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 24 09:24:36 2020 +0100 :memo: Update site and site generation --- .gitlab-ci.yml | 21 +++++++++++++++++++++ src/site/rst/importData.rst | 34 +++++++++++++++++----------------- src/site/site_en.xml | 18 ++++++++++++++---- src/site/site_fr.xml | 17 +++++++++++------ 4 files changed, 63 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e9e038b..a5b25f01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,11 @@ +variables: + PAGES_TARGET: "infracl" + PAGES_DOMAIN: "echobase.codelutin.com, echobase.cloud.codelutin.com" + +include: + - project: 'codelutin/ci' + file: '/cloudpages.yml' + stages: - build - check-releasable @@ -37,3 +45,16 @@ sonar_job: - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=fr.ifremer:echobase -Dsonar.binaries='**/target/classes' -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' only: - schedules + +pages: + image: registry.nuiton.org/codelutin/dockerfiles:maven-release + stage: pages + when: manual + + artifacts: + paths: + - public + + script: + - mvn site + - mv target/site public diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index b26b03e3..aa4234cc 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -729,21 +729,21 @@ Colonnes requises Format des colonnes ------------------- -+-----------------+-------------------------------+ -| Colonne | Type | -+=================+===============================+ -| echotypeName |text | -+-----------------+-------------------------------+ -| meaning |text | -+-----------------+-------------------------------+ -| voyage |FK(Voyage#name) | -+-----------------+-------------------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------+-------------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+-----------------+-------------------------------+ -| id |integer (species category code | -+-----------------+-------------------------------+ ++-----------------+--------------------------------+ +| Colonne | Type | ++=================+================================+ +| echotypeName |text | ++-----------------+--------------------------------+ +| meaning |text | ++-----------------+--------------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+--------------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+--------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------------+ +| id |integer (species category code) | ++-----------------+--------------------------------+ Exemple ------- @@ -751,7 +751,7 @@ Exemple :: voyage;echotypeName;depthStratumId;meaning;baracoudaCode;id - PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM;& + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM;0 LengthWeightKey ~~~~~~~~~~~~~~~ @@ -934,7 +934,7 @@ Format des colonnes +----------------------+--------------------------------------------------------+ | sizeCategory |text | +----------------------+--------------------------------------------------------+ -| lengthClassMeaning|text | +| lengthClassMeaning |text | +----------------------+--------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+--------------------------------------------------------+ diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 0762b714..0a2f2245 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -25,10 +25,16 @@ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> <bannerLeft> + <alt>${project.name}</alt> <name>${project.name}</name> - <src>${project.url}/v/${siteDeployClassifier}/images/echobase-logo.png</src> + <src>images/echobase-logo.png</src> <href>${project.url}</href> </bannerLeft> + <bannerRight> + <alt>Code Lutin</alt> + <src>https://www.codelutin.com/img/icons/icon-logo-big.png</src> + <href>https://www.codelutin.com</href> + </bannerRight> <poweredBy> <logo href="http://maven.apache.org" name="Maven" @@ -93,6 +99,11 @@ <item name="Delete data" href="removeData.html"/> </item> + <item name="Export data" href="#"> + <item name="COSER" href="exportCoser.html"/> + <item name="Atlantos/ICES" href="exportAtlantos.html"/> + </item> + <item name="Portable Application" href="embedded.html"/> </menu> @@ -106,11 +117,10 @@ <menu ref="reports"/> <footer> - <div id='mavenProjectProperties' locale='en' + <!--div id='mavenProjectProperties' locale='en' projectId='${project.projectId}' version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=",install,update,usage,configure,"/> + sourcesType='${project.siteSourcesType}'/--> </footer> </body> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 8acc124a..d39841c2 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -27,13 +27,13 @@ <bannerLeft> <alt>${project.name}</alt> <name>${project.name}</name> - <src>${project.url}/v/${siteDeployClassifier}/images/echobase-logo.png</src> + <src>images/echobase-logo.png</src> <href>${project.url}</href> </bannerLeft> <bannerRight> <alt>Code Lutin</alt> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> + <src>https://www.codelutin.com/img/icons/icon-logo-big.png</src> + <href>https://www.codelutin.com</href> </bannerRight> <poweredBy> @@ -100,6 +100,12 @@ <item name="Supprimer" href="removeData.html"/> </item> + <item name="Export données" href="#"> + <item name="COSER" href="exportCoser.html"/> + <item name="Atlantos/CIEM" href="exportAtlantos.html"/> + </item> + + <item name="Application embarquée" href="embedded.html"/> </menu> @@ -113,11 +119,10 @@ <menu ref="reports"/> <footer> - <div id='mavenProjectProperties' locale='fr' + <!--div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=",install,update,usage,configure,"/> + sourcesType='${project.siteSourcesType}'/--> </footer> </body> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.