diff --git a/cara/apps/calculator/README.md b/cara/apps/calculator/README.md index 8450d166..2cd6df60 100644 --- a/cara/apps/calculator/README.md +++ b/cara/apps/calculator/README.md @@ -1,4 +1,4 @@ -# Instructions for use (BETA) +# Instructions for use This is a guide to help you use the calculator tool. If you are using the expert version of the tool, you should look at the expert notes. diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 27484904..c1e03435 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -1,6 +1,6 @@ {% extends "layout.html.j2" %} -{% set MODEL_VERSION="BetaV1.1.0" %} +{% set MODEL_VERSION="v1.1.0" %} {% set DEBUG=False %} {% set active_page="calculator/" %} @@ -21,7 +21,10 @@
{{ MODEL_VERSION }} Please send feedback to CARA-dev@cern.ch -

CARA - COVID Airborne Risk Assessment calculator

+
+ +

CARA - COVID Airborne Risk Assessment calculator

+
{% if DEBUG %}
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 61d3d606..02b2b4b3 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -12,7 +12,10 @@ -

Output from CARA - COVID Airborne Risk Assessment tool

+
+ +

Report

+

Created {{ creation_date }} using model version {{ form.model_version }}


diff --git a/cara/apps/static/images/HES_logo_white.png b/cara/apps/static/images/HSE_logo_white.png similarity index 100% rename from cara/apps/static/images/HES_logo_white.png rename to cara/apps/static/images/HSE_logo_white.png diff --git a/cara/apps/static/images/cara_logo.png b/cara/apps/static/images/cara_logo.png new file mode 100755 index 00000000..c8d3e927 Binary files /dev/null and b/cara/apps/static/images/cara_logo.png differ diff --git a/cara/apps/static/images/cara_logo_text.png b/cara/apps/static/images/cara_logo_text.png new file mode 100755 index 00000000..2e7fb345 Binary files /dev/null and b/cara/apps/static/images/cara_logo_text.png differ diff --git a/cara/apps/static/images/cara_logo_text_cern.png b/cara/apps/static/images/cara_logo_text_cern.png new file mode 100755 index 00000000..5efc1514 Binary files /dev/null and b/cara/apps/static/images/cara_logo_text_cern.png differ diff --git a/cara/apps/static/images/cara_logo_white.png b/cara/apps/static/images/cara_logo_white.png new file mode 100644 index 00000000..b4cec528 Binary files /dev/null and b/cara/apps/static/images/cara_logo_white.png differ diff --git a/cara/apps/static/images/cara_logo_white_text.png b/cara/apps/static/images/cara_logo_white_text.png new file mode 100644 index 00000000..c47b400f Binary files /dev/null and b/cara/apps/static/images/cara_logo_white_text.png differ diff --git a/cara/apps/static/images/tree.png b/cara/apps/static/images/tree.png deleted file mode 100644 index 40e9352e..00000000 Binary files a/cara/apps/static/images/tree.png and /dev/null differ diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index 42001c61..e908fffb 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -10,19 +10,34 @@
+
-
-

+ +

CARA: COVID Airborne Risk Assessment Tools

-
-

- Please try out the CARA COVID calculator here. - Your feedback is most welcome at CARA-dev@cern.ch - -

+
+ +

Please try out the CARA COVID calculator here. + Your feedback is most welcome at CARA-dev@cern.ch

+ +
+ +

Authors:


+
+

+

Andre Henriques¹, Gabriella Azzopardi², James Devine³, Philip Elson⁴, Nicolas Mounet², Markus Kongstein Rognlien²


+ + ¹HSE Unit, Occupational Health & Safety Group, CERN
+ ²Beams Department, Accelerators and Beam Physics Group, CERN
+ ³Experimental Physics Department, Safety Office, CERN
+ ⁴Beams Department, Controls Group, CERN
+ +

+
+
diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index fd0fe090..869acc83 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -97,15 +97,10 @@
-
- -
- - +
+
+ + home
@@ -259,7 +254,9 @@