diff --git a/app/escriptorium/templates/base.html b/app/escriptorium/templates/base.html index 22152b9cf57528b7f4e43d113fd86adf989c7fcc..5f4d93613996f2eff995f329ff65a46162f1aa02 100644 --- a/app/escriptorium/templates/base.html +++ b/app/escriptorium/templates/base.html @@ -27,8 +27,9 @@ <body class="{% block bodyclass %}{% endblock %}"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <a class="navbar-brand" href="{% url 'home' %}"> - <img src="{% static "images/favicon.ico" %}" width="20" height="20" class="mb-1"> - eScriptorium</a> + <img src="{% static "images/favicon.ico" %}" width="30" height="30" class="mb-1"> + eScriptorium + </a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> diff --git a/app/escriptorium/templates/core/home.html b/app/escriptorium/templates/core/home.html index e06dca6ba274e36bfa1605325c1127a6f6d21d55..99ae44ea2977a2f3705058af1f80160ce15eab84 100644 --- a/app/escriptorium/templates/core/home.html +++ b/app/escriptorium/templates/core/home.html @@ -6,11 +6,12 @@ {% block body %} <div class="jumbotron text-center bg-light"> - <h1 class="jumbotron-heading">eScriptorium</h1> - <p class="lead text-muted">{% trans "A project providing digital recognition of handwritten documents using machine learning techniques." %}</p> - {% if CUSTOM_HOME %} - {% include "additional_heading.html" %} - {% endif %} + {% if CUSTOM_HOME %} + {% include "additional_heading.html" %} + {% else %} + <h1 class="jumbotron-heading">eScriptorium</h1> + <p class="lead text-muted">{% trans "A project providing digital recognition of handwritten documents using machine learning techniques." %}</p> + {% endif %} </div> <div class="container my-5"> @@ -41,25 +42,21 @@ <a href="https://www.ephe.psl.eu" target="_blank"> <img src="{% static "images/ephe.png" "%}" alt="EPHE logo" height="100"> </a> + <a href="https://www.resilience-ri.eu/" class="pl-4" target="_blank"> + <img src="{% static "images/resilience.png" "%}" alt="Resilience logo" height="60"> + </a> <a href="https://scripta.psl.eu/en/" class="pl-4" target="_blank"> - <img src="{% static "images/pslscripta.png" "%}" alt="Scripta PSL logo" height="60"> + <img src="{% static "images/pslscripta.png" "%}" alt="Scripta PSL logo" height="50"> </a> - <a href="https://ec.europa.eu/programmes/horizon2020/" class="pl-4" target="_blank"> - <img src="{% static "images/h2020.jpg" "%}" alt="Horizon 2020 logo" height="100"> - </a> - - <a href="https://www.openiti.org/" class="pl-4" target="_blank"> - <img src="{% static "images/openiti.png" "%}" alt="DIM Region ile de france logo" height="90"> - </a> - - <a href="https://www.iledefrance.fr/des-aides-la-recherche-pour-13-domaines-dinteret-majeur" class="pl-4" target="_blank"> - <img src="{% static "images/regionidf.jpg" "%}" alt="DIM Region ile de france logo" height="100"> + <img src="{% static "images/h2020.jpg" "%}" alt="Horizon 2020 logo" height="80"> </a> - <a href="https://inria.fr/fr" class="pl-4" target="_blank"> <img src="{% static "images/inria.png" "%}" alt="INRIA logo" height="60"> </a> + <a href="https://www.openiti.org/" class="pl-4" target="_blank"> + <img src="{% static "images/openiti.png" "%}" alt="DIM Region ile de france logo" height="90"> + </a> </div> {% if CUSTOM_HOME %} diff --git a/app/homepage_example/additional_heading.html b/app/homepage_example/additional_heading.html index 8eb1c6a8ff5174d9e1d9ec129933392396793610..7895815b24315554e859aca654f9dc4e61621a50 100644 --- a/app/homepage_example/additional_heading.html +++ b/app/homepage_example/additional_heading.html @@ -1 +1,3 @@ +<h1 class="jumbotron-heading">eScriptorium</h1> +<p class="lead text-muted">A project providing digital recognition of handwritten documents using machine learning techniques.</p> <p>eScriptorium accounts are created on invitation only for now. If your institution doesn't provide it, you can use the contact form to ask for access.</p> diff --git a/docker-compose.yml b/docker-compose.yml index c03c026a7166a0415ad80eb14d3c801c701f61e0..b53d62bb3c99c0051397e7ec928f0527ca05d20f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: web: <<: *app command: uwsgi --ini /usr/src/app/uwsgi.ini + volumes: + - logs:/user/src/app/escriptorium/logs expose: - 8000 @@ -114,3 +116,4 @@ volumes: media: postgres: esdata: + logs: