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

Merge branch 'feature/Acknowledgements' into 'master'

Browse source 
Setting Acknowledgements on landing page with text from template_environment

See merge request cara/cara!312
This commit is contained in:
Andre Henriques 2022-01-06 17:38:25 +01:00
commit afd5eb9ca9
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/apps/calculator/__init__.py
View file

@ -148,11 +148,13 @@ class StaticModel(BaseRequestHandler):
class LandingPage(BaseRequestHandler):
def get(self):
template_environment = self.settings["template_environment"]
template = self.settings["template_environment"].get_template(
"index.html.j2")
report = template.render(
user=self.current_user,
calculator_prefix=self.settings["calculator_prefix"],
text_blocks=template_environment.globals['common_text']
)
self.finish(report)

9
cara/apps/templates/base/index.html.j2
View file

@ -52,13 +52,8 @@
<br>
<h3 class="paragraph-title">Acknowledgements</h3><br>
<p>
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: Dr. Julian Tang, Prof. Manuel Gameiro, Dr. Linsey Marr, Prof. Jose Jimenez, Prof. Lidia Morawska, Prof. Yuguo Li et al. - their scientific contribution was indispensable for this project.
<span style="height: 3vh; display: block;"></span>
</p>
{{ text_blocks['Acknowledgements'] }}
<span style="height: 3vh; display: block;"></span>
</div>
</div>
{% endblock main %}