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

Merge branch 'develop/UI-updates' into 'master'

Browse source 
UI updates

See merge request cara/cara!106
This commit is contained in:
Philip James Elson 2020-11-20 19:31:22 +00:00
commit 2a0311eec2
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cara/apps/calculator/static/js/form.js
View file

@ -162,8 +162,9 @@ function require_hepa(option) {
function require_input_field(id, option) {
$(id).prop('required', option);
if (!option)
if (!option) {
removeInvalid(id);
}
}
function disable_input_field(id, option) {
@ -381,8 +382,8 @@ function parseValToNumber(val) {
}
function parseTimeToMins(cTime) {
var time = cTime.match(/(\d+)(:(\d+))/);
return parseInt(time[1]*60) + parseInt(time[3]);
var time = cTime.match(/(\d+):(\d+)/);
return parseInt(time[1]*60) + parseInt(time[2]);
}
/* -------On Load------- */

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

@ -28,12 +28,22 @@
<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>
<h4>Andre Henriques<sup>1</sup>, Gabriella Azzopardi<sup>2</sup>, James Devine<sup>3</sup>, Philip Elson<sup>4</sup>, Nicolas Mounet<sup>2</sup>, Markus Kongstein Rognlien<sup>2</sup></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>
<sup>1</sup>HSE Unit, Occupational Health & Safety Group, CERN<br>
<sup>2</sup>Beams Department, Accelerators and Beam Physics Group, CERN<br>
<sup>3</sup>Experimental Physics Department, Safety Office, CERN<br>
<sup>4</sup>Beams Department, Controls Group, CERN<br>
<span style="height: 10vh; display: block;"></span>
</p>
<h3>Acknowledgements:</h3><br>
<p>
We thank CERN’s HSE Unit, Beams Department and Experimental Physics Department for their continuous support.
Thanks to Doris Forkel-Wirth, Olga Beltramello, Letizia Di Giulio and Evelyne Dho 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, 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.
<span style="height: 10vh; display: block;"></span>
</p>
</div>

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

@ -92,13 +92,11 @@
</div>
<div class="dialog-off-canvas-main-canvas" data-off-canvas-main-canvas="">
<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" style="max-height: 76px;">
<div class="site-info__text col-lg-9 col-md-10 col-sm-9">
<div class="site-info__text col-lg-9 col-md-10 col-sm-9" style="overflow:hidden;">
<a href="/" title="Home" rel="home">
<img src="/static/images/cara_logo_white_text.png" alt="home" style="height: 150pt; margin-top: 7pt;">
</a>
@ -152,6 +150,11 @@
</a>
</li>
</ul>
<li>
<a href="/expert-app" target="_blank">
Expert App (BETA)
</a>
</li>
<li>
<a href="https://hse.cern/covid-19-information">
Covid Information