From 57ea35db6eecd6908c90c4869cd70ed858c03aa1 Mon Sep 17 00:00:00 2001 From: Guairden <valentin.hoyet@gmail.com> Date: Tue, 14 Jan 2020 16:03:22 +0100 Subject: [PATCH] test 1 modify json tag with .yml --- .gitlab-ci.yml | 8 ++++++++ web-pages/static-components/index.html | 2 +- web-pages/static-components/style.css | 12 +++++++++++- xml/{test.xml => test2yml.xml} | 0 xml/testyml.xml | 0 5 files changed, 20 insertions(+), 2 deletions(-) rename xml/{test.xml => test2yml.xml} (100%) create mode 100644 xml/testyml.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dcd505..d515c72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: node:latest stages: - pages - production + - xmls pages: stage: pages @@ -15,6 +16,13 @@ pages: - public only: - master + +xmls: + - new_xmls=`git status --porcelain | grep "^A" | cut -c 4- | grep xml/` + - cd parser + - npm install + - node parseXML.js $new_xmls + - cd .. production: type: deploy diff --git a/web-pages/static-components/index.html b/web-pages/static-components/index.html index dbca64d..9991958 100644 --- a/web-pages/static-components/index.html +++ b/web-pages/static-components/index.html @@ -29,7 +29,6 @@ </select> </div> <div id="completion-list" class="invisible"></div> - <p id="search-legend">These XMLs may be given to hwloc to test platforms you don't have immediate access to.</p> <div id="filter"> <div id="filter-element1" class="animated fadeInRight"> @@ -77,6 +76,7 @@ <div id="content"> </div> + <p id="left-footer">These XMLs may be given to hwloc to test platforms you don't have immediate access to.</p> <a id="right-footer"href="https://gitlab.inria.fr/hwloc/xmls/tree/master/xml">Raw access to the XML repository →</a> </body> diff --git a/web-pages/static-components/style.css b/web-pages/static-components/style.css index 351c461..94376fb 100644 --- a/web-pages/static-components/style.css +++ b/web-pages/static-components/style.css @@ -12,6 +12,7 @@ body { padding: 20px; width: 35%; height: 60px; + margin-bottom: 1%; border-style: solid; border-radius: 30px; @@ -26,7 +27,7 @@ body { position: absolute; padding-top: 5px; left: 53%; - margin-top: -0.1%; + margin-top: -1.1%; margin-left: -16%; width: 25%; min-width: 20px; @@ -289,6 +290,15 @@ select { color: black; } +#left-footer{ + font-size: small; + color: black; + + position:fixed; + bottom: 1%; + left: 1%; +} + #right-footer{ font-size: small; font-style: italic; diff --git a/xml/test.xml b/xml/test2yml.xml similarity index 100% rename from xml/test.xml rename to xml/test2yml.xml diff --git a/xml/testyml.xml b/xml/testyml.xml new file mode 100644 index 0000000..e69de29 -- GitLab