From 7149bec458816cb4c65e6f1b37e8f2452bf1eb21 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 15 Oct 2021 16:48:21 +0200 Subject: [PATCH] Moved Authors (Code contributors and Main developers) to "About" page --- cara/apps/templates/about.html.j2 | 7 +++++-- cara/apps/templates/common_text.md.j2 | 10 ++++++++-- cara/apps/templates/index.html.j2 | 23 ----------------------- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2 index 8bb5cde9..41ce45c2 100644 --- a/cara/apps/templates/about.html.j2 +++ b/cara/apps/templates/about.html.j2 @@ -40,8 +40,11 @@ Although the user is able to calculate the infection probability of a stand-alon
  • Etc…
    • -

    Authors:


    -{{ text_blocks['Authors'] }} +

    Main Developers:


    +{{ text_blocks['Main Developers'] }} + +

    Code Contributors:


    +{{ text_blocks['Code Contributors'] }}

    Acknowledgements:


    {{ text_blocks['Acknowledgements'] }} diff --git a/cara/apps/templates/common_text.md.j2 b/cara/apps/templates/common_text.md.j2 index ac8829d7..826eb91e 100644 --- a/cara/apps/templates/common_text.md.j2 +++ b/cara/apps/templates/common_text.md.j2 @@ -1,6 +1,6 @@ -## Authors +## Main Developers -

    Andre Henriques1, Marco Andreini1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2,6, Nicola Tarocco5


    +

    Andre Henriques1, Luis Aleixo1, Marco Andreini1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2,6, Nicola Tarocco5


    1HSE Unit, Occupational Health & Safety Group, CERN
    2Beams Department, Accelerators and Beam Physics Group, CERN
    @@ -9,6 +9,12 @@ 5Information Technology Department, Collaboration, Devices & Applications Group, CERN
    6Norwegian University of Science and Technology (NTNU)
    +## Code Contributors + +

    Anna Efimova1, Anel Massalimova1, Cole Austin Coughlin1

    + +1Summer Students, CERN
    + ## Acknowledgements We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo, Ana Padua and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. Our compliments towards 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 et al. – their scientific contribution was indispensable for this project. diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index c774420c..5bcec3d2 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -40,29 +40,6 @@
    -

    Authors

    -
    -

    -

    Andre Henriques1, Luis Aleixo1, Marco Andreini1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2,6, Nicola Tarocco5


    - - 1HSE Unit, Occupational Health & Safety Group, CERN
    - 2Beams Department, Accelerators and Beam Physics Group, CERN
    - 3Experimental Physics Department, Safety Office, CERN
    - 4Beams Department, Controls Group, CERN
    - 5Information Technology Department, Collaboration, Devices & Applications Group, CERN
    - 6Norwegian University of Science and Technology (NTNU)
    -

    - -
    -

    Acknowledgements:

    -

    - We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Department, Information Technology Department, Industry, Procurement and Knowledge Transfer Department and International Relations Sector for their support to the study. - Thanks to Doris Forkel-Wirth, Benoit Delille, Walid Fadel, Olga Beltramello, Letizia Di Giulio, Evelyne Dho, Wayne Salter, Benoit Salvant and colleagues from the COVID working group for providing expert advice and extensively testing the model. - Finally, we wish to thank Fabienne Landua and the design service for preparing the illustrations and Alessandro Raimondo, Ana Padua and Manuela Cirilli from the Knowledge Transfer Group for their continuous support. - Our compliments towards 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 et al. – their scientific contribution was indispensable for this project. - -

    -