pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/logo' into 'master'

Browse source 
New logo

See merge request cara/cara!99
This commit is contained in:
Philip James Elson 2020-11-20 08:06:52 +00:00
commit da484c57df
12 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/apps/calculator/README.md
View file

@ -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.

7
cara/apps/calculator/templates/calculator.form.html.j2
View file

@ -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 @@
<div style="height: 8em; display: block;"></div>
{{ MODEL_VERSION }} <span style="float:right; font-weight:bold">Please send feedback to <a href="mailto:CARA-dev@cern.ch">CARA-dev@cern.ch</a></span>
<h1> <p><b>CARA - </b> COVID Airborne Risk Assessment calculator</p></h1>
<div>
<img src="/static/images/cara_logo.png" style="height:175px; width:100px; display:inline-block; vertical-align:middle; object-fit:cover;">
<h1 style="display:inline-block; vertical-align:middle;"><b>CARA - </b> COVID Airborne Risk Assessment calculator</h1>
</div>
{% if DEBUG %}
<form id="covid_calculator" name="covid_calculator" onsubmit="return debug_submit(this)">

5
cara/apps/calculator/templates/report.html.j2
View file

@ -12,7 +12,10 @@
<body id="body">
<h1>Output from CARA - COVID Airborne Risk Assessment tool</h1>
<div style="position:relative; text-align:center; margin-left:-200pt; max-height:180pt;">
<img src="/static/images/cara_logo_text.png" style="height:350px; margin-top:-50pt; display:inline-block; vertical-align:middle; object-fit:cover;">
<h1 style="display:inline-block; vertical-align:middle; margin-left:-30pt;">Report</h1>
</div>
<p class=subtitle> Created {{ creation_date }} using model version {{ form.model_version }}</p><br>

0
cara/apps/static/images/HES_logo_white.png → cara/apps/static/images/HSE_logo_white.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
cara/apps/static/images/cara_logo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
cara/apps/static/images/cara_logo_text.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
cara/apps/static/images/cara_logo_text_cern.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
cara/apps/static/images/cara_logo_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
cara/apps/static/images/cara_logo_white_text.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 43 KiB

BIN
cara/apps/static/images/tree.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 42 KiB

31
cara/apps/templates/index.html.j2
View file

@ -10,19 +10,34 @@
<div class="component-row__column component-row__center section-has-no-column col-md-12 col-sm-12 col-xs-12">
<div class="box-effects-wrapper ">
<div class="text-component text-component-page clearfix" style="position:relative; " >
<div class="text-component text-component-page clearfix">
<h2 class="text-component-title">
<img src="/static/images/cara_logo.png" style="width:100px; height:200px; display:inline-block; vertical-align:middle; object-fit:cover;">
<h2 class="text-component-title" style="display:inline-block; vertical-align:middle; align:center;">
CARA: COVID Airborne Risk Assessment Tools
</h2>
<div class="text-component-text cern_full_html">
<p>
Please try out the CARA COVID calculator <a href="/calculator">here</a>.
Your feedback is most welcome at <a href="mailto:CARA-dev@cern.ch">CARA-dev@cern.ch</a>
<span style="height: 35vh; display: block;"></span>
</p>
<div class="text-component-text cern_full_html" style="align:center;">
<h4>Please try out the CARA COVID calculator <a href="/calculator">here</a>.
Your feedback is most welcome at <a href="mailto:CARA-dev@cern.ch">CARA-dev@cern.ch</a></h4>
<span style="height: 5vh; display: block;"></span>
<span style="min-height: 50vh; height: 100%;"></span>
</div>
<h2>Authors:</h2><br>
<div class="text-component-text cern_full_html" >
<p>
<h4>Andre Henriques¹, Gabriella Azzopardi², James Devine³, Philip Elson⁴, Nicolas Mounet², Markus Kongstein Rognlien²</h4><br>
¹HSE Unit, Occupational Health & Safety Group, CERN<br>
²Beams Department, Accelerators and Beam Physics Group, CERN<br>
³Experimental Physics Department, Safety Office, CERN<br>
⁴Beams Department, Controls Group, CERN<br>
<span style="height: 10vh; display: block;"></span>
</p>
</div>
</div>
</div>

17
cara/apps/templates/layout.html.j2
View file

@ -97,15 +97,10 @@
<header role="banner" style="display: block;">
<img src="/static/images/hse_triangle_right_1.png" style="float:left; height: 65pt; margin-top: 7pt">
<div class="header-wrapper" style="background: rgb(47, 52, 66); clear: none;">
<div class="site-info col-sm-2">
<div class="site-info__logo col-lg-3 col-md-2 col-sm-3">
<a href="https://hse.cern/" title="Home" rel="home">
<img src="/static/images/tree.png" alt="home">
</a>
</div>
<div class="site-info__text col-lg-9 col-md-10 col-sm-9" style="margin-left: 60pt;">
<a href="https://hse.cern/" title="Home" rel="home">
<img src="/static/images/HES_logo_white.png" style="height: 40pt; margin-top: 7pt">
<div class="site-info col-sm-2" style="max-height: 76px;">
<div class="site-info__text col-lg-9 col-md-10 col-sm-9">
<a href="/" title="Home" rel="home">
<img src="/static/images/cara_logo_white_text.png" alt="home" style="height: 150pt; margin-top: 7pt;">
</a>
</div>
</div>
@ -259,7 +254,9 @@
</div>
</div>
<div class="col-xs-1 col-sm-1 col-md-1 col-lg-1 footer-last-logo">
<a href="https://home.cern/" title="CERN" target="_blank"><img src="/static/logo.svg" alt="CERN"></a>
<a href="https://hse.cern/" title="HSE home" target="_blank">
<img src="/static/images/HSE_logo_white.png" alt="HSE home" style="width:450px; margin-left:-300px;">
</a>
</div>
</div>