From 93d91e0d4d24764cbd4a60e4105045e5fcf3a971 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Thu, 29 Apr 2021 23:47:47 +0200 Subject: [PATCH] Review actions. --- .../templates/base/calculator.report.html.j2 | 5 +++++ .../apps/calculator/templates/calculator.form.html.j2 | 4 ++++ cara/apps/calculator/templates/userguide.html.j2 | 4 ++++ cara/apps/static/css/colors.css | 4 ++-- cara/apps/templates/index.html.j2 | 11 +++++------ cara/apps/templates/layout.html.j2 | 2 +- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 1471e6b4..27bdacf9 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -323,6 +323,11 @@ While the SARS-CoV-2 virus is in circulation among the population, the notion of 'zero risk' or 'completely safe scenario' does not exist. Each event modelled is unique, and the results generated therein are only as accurate as the inputs and assumptions.

+

+ CARA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered + as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled. +

+ {% endblock disclaimer %} {% endblock disclaimer_container %} diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index c551eb77..063a1c46 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -349,6 +349,10 @@ v{{ calculator_version }} Please sen While the SARS-CoV-2 virus is in circulation among the population, the notion of 'zero risk' or 'completely safe scenario' does not exist. Each event modelled is unique, and the results generated therein are only as accurate as the inputs and assumptions.

+

+ CARA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered + as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled. +

diff --git a/cara/apps/calculator/templates/userguide.html.j2 b/cara/apps/calculator/templates/userguide.html.j2 index 3d59ab5f..b434365a 100644 --- a/cara/apps/calculator/templates/userguide.html.j2 +++ b/cara/apps/calculator/templates/userguide.html.j2 @@ -39,6 +39,10 @@ If you are using the expert version of the tool, you should look at the expert While the SARS-CoV-2 virus is in circulation among the population, the notion of 'zero risk' or 'completely safe scenario' does not exist. Each event modelled is unique, and the results generated therein are only as accurate as the inputs and assumptions.

+

+ CARA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered + as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled. +

How to use this tool

Simulation Name & Room number

diff --git a/cara/apps/static/css/colors.css b/cara/apps/static/css/colors.css index 73c62e29..c7ced46d 100644 --- a/cara/apps/static/css/colors.css +++ b/cara/apps/static/css/colors.css @@ -136,9 +136,9 @@ body > footer { color: #fffeee !important; } body > footer h2:after { background: #fffeee !important; } - body > footer nav ul.menu.nav li a { + body > footer a, footer a { color: #fffefe; } - body > footer nav ul.menu.nav li a:hover, body > footer nav ul.menu.nav li a.is-active { + body > footer a:hover, body > footer a.is-active { color: #fffefe; } body > footer nav ul.menu.nav li a:hover:before, body > footer nav ul.menu.nav li a.is-active:before { color: #2d8af1; } diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index a5e4fc3c..2e814fd1 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -43,7 +43,7 @@

Authors

-

Andre Henriques1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2, Nicola Tarocco5


+

Andre Henriques1, Marco Andreini1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2, Nicola Tarocco5


1HSE Unit, Occupational Health & Safety Group, CERN
2Beams Department, Accelerators and Beam Physics Group, CERN
@@ -55,11 +55,10 @@

Acknowledgements:

- We thank CERN’s HSE Unit, Beams Department, Experimental Physics Department and Information Technology Department for their continuous support. - Thanks to Doris Forkel-Wirth, Olga Beltramello, Letizia Di Giulio, Evelyne Dho and the other members of the office occupancy working group for providing expert advice and extensively testing the tool. - We thank Fabienne Landua and the Design and Visual Identity Service for preparing the logo. - Thanks also to colleagues like Oriol Rios, Marco Andreini, Lina Dimovasili for the technical discussions and advice. - Many thanks to the work and research performed by world leading scientists in this domain: Prof. Manuel Gameiro, Prof. Shelly Miller, Prof. Linsey Marr, Prof. Jose Jimenez, Dr. Lidia Morawska, Prof Yuguo Li – their contribution was indispensable for this project. + We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. + Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. + Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo, Ana Padua and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. + Our compliments towards the work and research performed by world leading scientists in this domain: Prof. Manuel Gameiro, Prof. Shelly Miller, Prof. Linsey Marr, Prof. Jose Jimenez, Dr. Lidia Morawska, Prof Yuguo Li et al. – their scientific contribution was indispensable for this project.

diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index d668b3ee..be46f836 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -240,7 +240,7 @@

- CARA is Apache 2.0 licensed open-source + CARA is Apache 2.0 licensed open-source software developed at CERN. You can find the source code at https://gitlab.cern.ch/cara/cara, where we welcome contributions, feature requests and issue reports.