Image rename and last UI updates on CAiMIRA

README.md

@@ -45,7 +45,7 @@ CAiMIRA – CERN Airborne Model for Indoor Risk Assessment tool
 
 © Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
 
-**For use of the CARA model**
+**For use of the CAiMIRA model**
 
 Henriques A, Mounet N, Aleixo L, Elson P, Devine J, Azzopardi G, Andreini M, Rognlien M, Tarocco N, Tang J. (2022). Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces. _Interface Focus 20210076_. https://doi.org/10.1098/rsfs.2021.0076
 
@@ -114,7 +114,7 @@ python -m cara.apps.calculator --prefix=/mycalc
 
 ### How to compile and read the documentation
 
-In order to generate the documentation, CARA must be installed first with the `doc` dependencies:
+In order to generate the documentation, CAiMIRA must be installed first with the `doc` dependencies:
 
 ```
 pip install -e .[doc]
@@ -125,7 +125,7 @@ If any of the `.rst` files under the `cara/docs` folder is changed, this command
 
 Then, right click on `cara/docs/_build/html/index.html` and select `Open with` your preferred web browser.
 
-### Running the CARA Expert-App app in development mode
+### Running the CAiMIRA Expert-App app in development mode
 
 ```
 voila cara/apps/expert/cara.ipynb --port=8080

cara/apps/calculator/static/css/report.css

@@ -81,11 +81,7 @@ p.notes {
     border-radius: 5px;
 }
 
-/* @media (width: 1200px) { */
 @media print {
-    /* #body {
-        min-width: 1200px;
-    } */
     #results,
     #rules,
     #data {

cara/apps/expert/cara.ipynb

@@ -7,7 +7,7 @@
     "<div style=\"text-align: center;\" align=\"center\" >\n",
     "<img src=\"./files/static/images/header_image.png\" style=\"height:5em\"></img></div>\n",
     "<p style=\"text-align: center;\">\n",
-    "Please see the <a href=\"https://cara.web.cern.ch/\">CARA homepage</a> for details on the methodology, assumptions and limitations of CARA.</p>"
+    "Please see the <a href=\"https://cara.web.cern.ch/\">CAiMIRA homepage</a> for details on the methodology, assumptions and limitations of CAiMIRA.</p>"
    ]
   },
   {

cara/apps/templates/base/calculator.form.html.j2

@@ -19,7 +19,7 @@
 {% block main %}
 
 <span class="cara_version">v{{ calculator_version }}</span>
-<span class="feedback">Please send feedback to <a href="mailto:CARA-dev@cern.ch">CARA-dev@cern.ch</a></span>
+<span class="feedback">Please send feedback to <a href="mailto:CAiMIRA-dev@cern.ch">CAiMIRA-dev@cern.ch</a></span>
 <header class= "bg-light">
   <div class="container container--padding">
     <div class="d-flex header-height">

cara/apps/templates/base/index.html.j2

@@ -4,8 +4,8 @@
 {% block main %}
 <header class= "bg-light">
   <div class="container container--padding">
-    <img src="/static/images/cara_full_text.png" class="logo d-block m-auto" id="desktop_logo">
-    <img src="/static/images/cara_full_logo.png" class="logo d-none m-auto" id="mobile_logo">
+    <img src="/static/images/caimira_full_text.png" class="logo d-block m-auto" id="desktop_logo">
+    <img src="/static/images/caimira_full_logo.png" class="logo d-none m-auto" id="mobile_logo">
   </div>
 </header>
    
@@ -20,7 +20,7 @@
           <p>
           CAiMIRA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions.
           It does this by simulating the airborne spread SARS-CoV-2 virus in a finite volume, assuming homogenous mixing for the long-range component and a two-stage jet model for short-range, and estimates the risk of COVID-19 airborne transmission therein.
-          Please see the <a href="/about">About</a> page for more details on the methodology, assumptions and limitations of CARA.
+          Please see the <a href="/about">About</a> page for more details on the methodology, assumptions and limitations of CAiMIRA.
           </p>
           <p>
           The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our <a href="https://gitlab.cern.ch/cara/cara">code repository</a>.
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="align-self-center">
-      <img src="static/images/CARA_1_Vs3_Colour.jpg" class="cara_home_image">
+      <img src="static/images/CAiMIRA_1_Vs3_Colour.jpg" class="cara_home_image">
     </div>
   </div>
   <br>

cara/apps/templates/base/layout.html.j2

@@ -26,7 +26,7 @@
   <nav class="navbar navbar-dark navbar-expand-lg">
     <div class="container">
 
-      <a href="/" class="navbar-brand"><img src="/static/images/cara_logo_white_text.png" alt="Logo" title="Logo"></a>
+      <a href="/" class="navbar-brand"><img src="/static/images/caimira_logo_white_text.png" alt="Logo" title="Logo"></a>
       
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -83,7 +83,7 @@
       <div class="row text-light text-center py-4 justify-content-center">
 
         <div class="col-sm-10 col-md-8 col-lg-6">
-          <img src="/static/images/cara_logo_white_text.png" alt="Logo">
+          <img src="/static/images/caimira_logo_white_text.png" alt="Logo">
           <p><span style="font-size:10px;"><em>CERN strives to deploy its know-how and technologies to help solve
                     the challenges arising in the local and global fight against COVID-19. As a particle physics
                     research organisation, CERN is not in a position to advise on medical research, health or health

cara/apps/templates/base/userguide.html.j2

@@ -223,8 +223,8 @@ This allows for:</p>
 <br>
 <h1>Conclusion</h1>
 <br>
-<p>This tool provides informative comparisons for COVID-19 airborne risk only - see Disclaimer
-If you have any comments on your experience with the app, or feedback for potential improvements, please share them with the development team <a href="mailto:cara-dev@cern.ch">Send email</a>.</p>
+<p>This tool provides informative comparisons for COVID-19 airborne risk only - see Disclaimer.
+If you have any comments on your experience with the app, or feedback for potential improvements, please share them with the development team - <a href="mailto:caimira-dev@cern.ch">send email</a>.</p>
 </div>
 
 {% endblock main %}