diff --git a/back/api/templates/email_admin_fr-ch.html b/back/api/templates/email_admin_fr-ch.html index fafd96d9..ceec5e6f 100644 --- a/back/api/templates/email_admin_fr-ch.html +++ b/back/api/templates/email_admin_fr-ch.html @@ -16,7 +16,7 @@ {% endif %} {% if admin_url %}

- + {% url admin_url admin_url_params %}

diff --git a/back/api/templates/email_password_reset.html b/back/api/templates/email_password_reset.html index ff2ea1c6..37f404f0 100644 --- a/back/api/templates/email_password_reset.html +++ b/back/api/templates/email_password_reset.html @@ -1,11 +1,11 @@ {% extends "email_base_template.html" %} {% load i18n %} {% block content %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} +{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}

-{% trans "Please go to the following page and choose a new password:" %} +{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %} {{ protocol }}://{{ domain }}/auth/reset/{{ uid }}/{{ token }} -{% endblock %} -{% trans 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} +{% endblock %}

+{% trans 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} {% endblock %} \ No newline at end of file diff --git a/back/api/templates/registration/password_reset_email.html b/back/api/templates/registration/password_reset_email.html deleted file mode 100644 index 13e34fcd..00000000 --- a/back/api/templates/registration/password_reset_email.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}

- -{% trans "Please go to the following page and choose a new password:" %}
-{% block reset_link %} -{{ protocol }}://{{ domain }}/auth/reset/{{ uid }}/{{ token }} -{% endblock %}

-{% trans 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} -

-{% trans "Le SITN" %}
- -{% endautoescape %} diff --git a/front/angular.json b/front/angular.json index fcbca744..c70b75ee 100644 --- a/front/angular.json +++ b/front/angular.json @@ -24,7 +24,7 @@ "tsConfig": "tsconfig.app.json", "aot": true, "assets": [ - "src/favicon.png", + "src/favicon.ico", "src/assets" ], "styles": [ @@ -92,7 +92,7 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "assets": [ - "src/favicon.png", + "src/favicon.ico", "src/assets" ], "styles": [ diff --git a/front/src/app/_components/help-overlay/help-overlay.component.html b/front/src/app/_components/help-overlay/help-overlay.component.html index 3c25710b..34bc4ad8 100644 --- a/front/src/app/_components/help-overlay/help-overlay.component.html +++ b/front/src/app/_components/help-overlay/help-overlay.component.html @@ -4,7 +4,10 @@ Voir l'aide - + + Informations sur la tarification + +
Avez-vous des questions ? diff --git a/front/src/app/app.component.html b/front/src/app/app.component.html index 78d6cb2f..cb5b4282 100644 --- a/front/src/app/app.component.html +++ b/front/src/app/app.component.html @@ -1,7 +1,7 @@
- GeoShop + GeoShop du système d'information du territoire neuchâtelois {{subTitle}}
@@ -10,7 +10,7 @@
diff --git a/front/src/app/welcome/catalog/catalog.component.html b/front/src/app/welcome/catalog/catalog.component.html index 7e7e5318..eeac010a 100644 --- a/front/src/app/welcome/catalog/catalog.component.html +++ b/front/src/app/welcome/catalog/catalog.component.html @@ -22,6 +22,7 @@ src="{{mediaUrl}}/{{product.thumbnail_link}}">
{{product.label}}
+