diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 52aeb1ea..b8f6ae17 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -226,7 +226,7 @@ p.notes { .split>* { flex-basis: 100%; } - .header-text { + .paragraph-title { text-align: left; } .split>*+* { diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js index e83c8ae1..88cf09e3 100644 --- a/cara/apps/calculator/static/js/form.js +++ b/cara/apps/calculator/static/js/form.js @@ -369,7 +369,7 @@ function validate_form(form) { $("#generate_report").prop("disabled", true); //Add spinner to button $("#generate_report").html( - `Loading...` + `Loading...` ); } @@ -487,12 +487,17 @@ function parseTimeToMins(cTime) { return parseInt(time[1]*60) + parseInt(time[2]); } +// Prevent spinner when clicking on back button +window.onpagehide = function(){ + $('loading_spinner').remove(); + $("#generate_report").prop("disabled", false).html(`Generate report`); +}; + /* -------On Load------- */ $(document).ready(function () { var url = new URL(decodeURIComponent(window.location.href)); //Pre-fill form with known values url.searchParams.forEach((value, name) => { - //If element exists if(document.getElementsByName(name).length > 0) { var elemObj = document.getElementsByName(name)[0]; diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 2e2930ac..705ee449 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -2,7 +2,7 @@ - + Report | CARA (COVID Airborne Risk Assessment) diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index a4649b84..c1c2e935 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -23,7 +23,7 @@
-

CARA - COVID Airborne Risk Assessment Calculator

+

CARA - COVID Airborne Risk Assessment Calculator

diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 1ad02c1b..1009b72c 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -112,16 +112,11 @@ body { padding: 2rem 0; } -.header-text { +.paragraph-title { text-align: center; font-size: 2.75vh; } -.head-center { - text-align: center; - font-size: 3vh; -} - .center { position: relative; display: flex; @@ -198,7 +193,7 @@ footer img { flex-basis: 100%; } - .header-text { + .paragraph-title { text-align: left; } @@ -215,18 +210,14 @@ footer img { height: 6em; } + .paragraph-title { + font-size: 2rem; + } + #nat_vent_image { height: 15em; } - .head-center { - font-size: 2.5rem; - } - - .header-text { - font-size: 2rem; - } - .header_text { font-weight: bold; } @@ -286,6 +277,9 @@ footer img { float:left; font-size:.75rem; } + .h1-text { + font-size: 1.5rem; + } } /* Devices under 768px (md) */ diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index 2f1ad194..e0b517f9 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -2,16 +2,16 @@ {% block main %} -
+
-

Airborne Transmission of SARS-CoV-2


+

Airborne Transmission of SARS-CoV-2


Currently, the existing public health measures point to the importance of proper building and environmental engineering control measures, such as proper Indoor Air Quality (IAQ). This pandemic clearly raised increased awareness on airborne transmission of respiratory viruses in indoor settings. Out of the main modes of viral transmission, the airborne route of SARS-CoV-2 seems to have a significant importance to the spread of COVID-19 infections world-wide, hence proper guidance to building engineers or facility managers, on how to prevent on-site transmission, is essential.
For information on the Airborne Transmission of SARS-CoV-2, feel free to check out the HSE Seminar: https://cds.cern.ch/record/2743403.
Slides available in https://indico.cern.ch/event/968258/.

-

What is CARA?


+

What is CARA?


CARA stands for COVID Airborne Risk Assessment and was developed in the spring of 2020 to better understand and quantify the risk of long-range airborne spread of SARS-CoV-2 virus in workplaces. CARA comes with different applications that allow more or less flexibility in the input parameters: