From 268a972beb32ef65850d17432c720a06126bb167 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 15 Dec 2023 14:09:34 +0000 Subject: [PATCH] auth: Rename Registering -> Joining Signed-off-by: Michael Tremer --- Makefile.am | 18 +++++------ src/backend/accounts.py | 6 ++-- .../img/auth/{register.jpg => join.jpg} | Bin src/templates/auth/join-success.html | 29 ++++++++++++++++++ .../auth/{register.html => join.html} | 16 +++------- src/templates/auth/login.html | 4 +-- .../messages/{register.html => join.html} | 15 +++++---- src/templates/auth/messages/join.txt | 16 ++++++++++ src/templates/auth/messages/register.txt | 14 --------- src/templates/auth/register-success.html | 27 ---------------- src/templates/blog/index.html | 4 +-- src/templates/blog/post.html | 2 +- src/web/__init__.py | 4 +-- src/web/auth.py | 8 ++--- 14 files changed, 82 insertions(+), 81 deletions(-) rename src/static/img/auth/{register.jpg => join.jpg} (100%) create mode 100644 src/templates/auth/join-success.html rename src/templates/auth/{register.html => join.html} (93%) rename src/templates/auth/messages/{register.html => join.html} (52%) create mode 100644 src/templates/auth/messages/join.txt delete mode 100644 src/templates/auth/messages/register.txt delete mode 100644 src/templates/auth/register-success.html diff --git a/Makefile.am b/Makefile.am index 28e0b294..37a6c084 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,26 +116,26 @@ templatesdir = $(datadir)/templates templates_auth_DATA = \ src/templates/auth/activate.html \ src/templates/auth/activated.html \ + src/templates/auth/join.html \ + src/templates/auth/join-success.html \ src/templates/auth/login.html \ src/templates/auth/password-reset.html \ src/templates/auth/password-reset-initiation.html \ - src/templates/auth/password-reset-successful.html \ - src/templates/auth/register.html \ - src/templates/auth/register-success.html + src/templates/auth/password-reset-successful.html templates_authdir = $(templatesdir)/auth templates_auth_messages_DATA = \ src/templates/auth/messages/donation-reminder.html \ src/templates/auth/messages/donation-reminder.txt \ + src/templates/auth/messages/join.html \ + src/templates/auth/messages/join.txt \ src/templates/auth/messages/password-reset.html \ src/templates/auth/messages/password-reset.txt \ src/templates/auth/messages/profile-setup.html \ src/templates/auth/messages/profile-setup.txt \ src/templates/auth/messages/profile-setup-2.html \ - src/templates/auth/messages/profile-setup-2.txt \ - src/templates/auth/messages/register.html \ - src/templates/auth/messages/register.txt + src/templates/auth/messages/profile-setup-2.txt templates_auth_messagesdir = $(templates_authdir)/messages @@ -975,13 +975,13 @@ static_imgdir = $(staticdir)/img # From https://www.pexels.com/photo/123-let-s-go-imaginary-text-704767/ dist_static_img_auth_DATA = \ - src/static/img/auth/register.jpg + src/static/img/auth/join.jpg static_img_auth_DATA = \ - src/static/img/auth/register@600.jpg + src/static/img/auth/join@600.jpg CLEANFILES += \ - src/static/img/auth/register@600.jpg + src/static/img/auth/join@600.jpg static_img_authdir = $(static_imgdir)/auth diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 9242f4b0..6310d4d3 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -442,9 +442,9 @@ class Accounts(Object): if account and account.check_password(password): return account - # Registration + # Join - def register(self, uid, email, first_name, last_name, country_code=None): + def join(self, uid, email, first_name, last_name, country_code=None): # Convert all uids to lowercase uid = uid.lower() @@ -474,7 +474,7 @@ class Accounts(Object): uid, activation_code, email, first_name, last_name, country_code) # Send an account activation email - self.backend.messages.send_template("auth/messages/register", + self.backend.messages.send_template("auth/messages/join", priority=100, uid=uid, activation_code=activation_code, email=email, first_name=first_name, last_name=last_name) diff --git a/src/static/img/auth/register.jpg b/src/static/img/auth/join.jpg similarity index 100% rename from src/static/img/auth/register.jpg rename to src/static/img/auth/join.jpg diff --git a/src/templates/auth/join-success.html b/src/templates/auth/join-success.html new file mode 100644 index 00000000..a6da052d --- /dev/null +++ b/src/templates/auth/join-success.html @@ -0,0 +1,29 @@ +{% extends "../base.html" %} + +{% block title %}{{ _("Thank You") }}{% end block %} + +{% block content %} +
+
+
+
+
+

+ {{ _("Thank you for joining!") }} +

+ +

+ {{ _("Please check your email for next steps.") }} +

+ +
+ + + +
+
+
+
+
+
+{% end block %} diff --git a/src/templates/auth/register.html b/src/templates/auth/join.html similarity index 93% rename from src/templates/auth/register.html rename to src/templates/auth/join.html index 9cf067ea..4a6dc1e1 100644 --- a/src/templates/auth/register.html +++ b/src/templates/auth/join.html @@ -1,6 +1,6 @@ {% extends "../base.html" %} -{% block title %}{{ _("Register") }}{% end block %} +{% block title %}{{ _("Join Our Community") }}{% end block %} {% block content %}
@@ -10,15 +10,9 @@

IPFire_

-

{{ _("Register A New Account") }}

+

{{ _("Join Our Community") }}

-
-

- {{ _("Become a part of our community by registering an account!") }} -

-
- -
+ {% raw xsrf_form_html() %} @@ -100,7 +94,7 @@
@@ -113,7 +107,7 @@ {% block javascript %}