From 39f51ec33dbc33d860faf5e56aff93b62c945f47 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 21 Jun 2020 20:13:59 +0200 Subject: [PATCH] stages/email: fix email account confirmation email template --- .../templates/administration/stage_binding/list.html | 8 ++++---- passbook/stages/email/models.py | 2 +- .../{account_confirm.html => account_confirmation.html} | 4 ++-- .../templates/stages/email/for_email/generic_email.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename passbook/stages/email/templates/stages/email/for_email/{account_confirm.html => account_confirmation.html} (92%) diff --git a/passbook/admin/templates/administration/stage_binding/list.html b/passbook/admin/templates/administration/stage_binding/list.html index efdf7f235..a4342cf0e 100644 --- a/passbook/admin/templates/administration/stage_binding/list.html +++ b/passbook/admin/templates/administration/stage_binding/list.html @@ -39,8 +39,8 @@ {% for flow in grouped_bindings %} - {% blocktrans with name=flow.grouper.name %} - Flow {{ name }} + {% blocktrans with slug=flow.grouper.slug %} + Flow {{ slug }} {% endblocktrans %} @@ -56,9 +56,9 @@
-
{{ binding.flow.name }}
+
{{ binding.flow.slug }}
- {{ binding.flow }} + {{ binding.flow.name }}
diff --git a/passbook/stages/email/models.py b/passbook/stages/email/models.py index bcdec174e..ddfe0f45a 100644 --- a/passbook/stages/email/models.py +++ b/passbook/stages/email/models.py @@ -21,7 +21,7 @@ class EmailTemplates(models.TextChoices): class EmailStage(Stage): - """email stage""" + """Email-based verification.""" host = models.TextField(default="localhost") port = models.IntegerField(default=25) diff --git a/passbook/stages/email/templates/stages/email/for_email/account_confirm.html b/passbook/stages/email/templates/stages/email/for_email/account_confirmation.html similarity index 92% rename from passbook/stages/email/templates/stages/email/for_email/account_confirm.html rename to passbook/stages/email/templates/stages/email/for_email/account_confirmation.html index 4c38ccf38..598601226 100644 --- a/passbook/stages/email/templates/stages/email/for_email/account_confirm.html +++ b/passbook/stages/email/templates/stages/email/for_email/account_confirmation.html @@ -1,6 +1,6 @@ -{% extends 'email/base.html' %} +{% extends 'stages/email/for_email/base.html' %} -{% load inline %} +{% load passbook_stages_email %} {% load i18n %} {% block content %} diff --git a/passbook/stages/email/templates/stages/email/for_email/generic_email.html b/passbook/stages/email/templates/stages/email/for_email/generic_email.html index 915e16398..8246f93b6 100644 --- a/passbook/stages/email/templates/stages/email/for_email/generic_email.html +++ b/passbook/stages/email/templates/stages/email/for_email/generic_email.html @@ -1,4 +1,4 @@ -{% extends "email/base.html" %} +{% extends "stages/email/for_email/base.html" %} {% block content %}