From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 15 Dec 2023 14:09:34 +0000 (+0000)
Subject: auth: Rename Registering -> Joining
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=268a972beb32ef65850d17432c720a06126bb167;p=ipfire.org.git

auth: Rename Registering -> Joining

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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 %}
+	<section class="section">
+		<div class="container">
+			<div class="columns is-centered">
+				<div class="column is-half">
+					<div class="notification is-success">
+						<h1 class="title">
+							{{ _("Thank you for joining!") }}
+						</h1>
+
+						<h4 class="subtitle">
+							{{ _("Please check your email for next steps.") }}
+						</h4>
+
+						<div class="block has-text-centered">
+							<span class="icon m-5">
+								<i class="fas fa-check fa-5x"></i>
+							</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</section>
+{% 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 %}
 	<section class="section">
@@ -10,15 +10,9 @@
 					<h1 class="title">
 						IPFire<span class="has-text-primary">_</span>
 					</h1>
-					<h4 class="subtitle">{{ _("Register A New Account") }}</h4>
+					<h4 class="subtitle">{{ _("Join Our Community") }}</h4>
 
-					<div class="block">
-						<p class="is-size-5">
-							{{ _("Become a part of our community by registering an account!") }}
-						</p>
-					</div>
-
-					<form id="form-register" action="" method="POST">
+					<form id="form-join" action="" method="POST">
 						{% raw xsrf_form_html() %}
 
 						<input type="hidden" name="next" value="{{ next or "" }}">
@@ -100,7 +94,7 @@
 						<div class="field">
 							<div class="control">
 								<button class="button is-primary is-medium is-fullwidth">
-									{{ _("Register") }}
+									{{ _("Join Now") }}
 								</button>
 							</div>
 						</div>
@@ -113,7 +107,7 @@
 
 {% block javascript %}
 	<script>
-		var form = $("#form-register");
+		var form = $("#form-join");
 		var submit = form.find(":submit");
 
 		// Store the valid status
diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html
index 3a7db4e2..151ba9d1 100644
--- a/src/templates/auth/login.html
+++ b/src/templates/auth/login.html
@@ -48,8 +48,8 @@
 						</div>
 
 						<div class="block has-text-centered">
-							<a href="/register">
-								{{ _("Don't have an account, yet? Register Now") }}
+							<a href="/join">
+								{{ _("Don't have an account, yet? Join Now") }}
 							</a>
 						</div>
 					</div>
diff --git a/src/templates/auth/messages/register.html b/src/templates/auth/messages/join.html
similarity index 52%
rename from src/templates/auth/messages/register.html
rename to src/templates/auth/messages/join.html
index bd3fc299..145bcc72 100644
--- a/src/templates/auth/messages/register.html
+++ b/src/templates/auth/messages/join.html
@@ -3,7 +3,7 @@
 {% block hero %}
 	<tr class="hero">
 		<td>
-			<img class="g-img" src="{{ embed_image("img/auth/register@600.jpg") }}" alt="IPFire">
+			<img class="g-img" src="{{ embed_image("img/auth/join@600.jpg") }}" alt="IPFire">
 		</td>
 	</tr>
 {% end block %}
@@ -11,26 +11,29 @@
 {% block content %}
 	<tr class="section">
 		<td>
-			<h1>{{ _("Hello %s!") % first_name }}</h1>
+			<h1>{{ _("Dear %s!") % first_name }}</h1>
 
 			<p>
-				{{ _("Thank you for registering a new account with us.") }}
+				{{ _("Welcome to our vibrant community! We're thrilled to have you on board.") }}
 			</p>
 
 			<p>
-				{{ _("This account will allow you to take part in our project. Either by joining conversations, writing documentation, or becoming a developer.") }}
-				{{ _("There are many things you can do with your account.") }}
+				{{ _("To activate your membership, please click on the activation link below:") }}
 			</p>
 
 			<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
 				<tr class="button">
 					<td>
 						 <a class="primary" href="https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}">
-							{{ _("Activate Account") }}
+							{{ _("Activate Now") }}
 						 </a>
 					</td>
 				</tr>
 			</table>
+
+			<p>
+				{{ _("We look forward to seeing you actively participate in our community.") }}
+			</p>
 		</td>
 	</tr>
 {% end block %}
diff --git a/src/templates/auth/messages/join.txt b/src/templates/auth/messages/join.txt
new file mode 100644
index 00000000..d6674b4d
--- /dev/null
+++ b/src/templates/auth/messages/join.txt
@@ -0,0 +1,16 @@
+From: IPFire Project <no-reply@ipfire.org>
+To: {{ first_name }} {{ last_name }} <{{ email }}>
+Subject: {{ _("Activate Your Community Membership Now!") }}
+X-Auto-Response-Suppress: OOF
+
+{{ _("Dear %s!") % first_name }}
+
+{{ _("Welcome to our vibrant community! We're thrilled to have you on board.") }}
+
+{{ _("To activate your membership, please click on the activation link below:") }}
+
+  https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}
+
+{{ _("If the link doesn't work, copy and paste it into your browser.") }}
+
+{{ _("We look forward to seeing you actively participate in our community.") }}
diff --git a/src/templates/auth/messages/register.txt b/src/templates/auth/messages/register.txt
deleted file mode 100644
index 9fafa9b2..00000000
--- a/src/templates/auth/messages/register.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-From: IPFire Project <no-reply@ipfire.org>
-To: {{ first_name }} {{ last_name }} <{{ email }}>
-Subject: {{ _("Please activate your account for the IPFire Project") }}
-X-Auto-Response-Suppress: OOF
-
-{{ _("Hello %s!") % first_name }}
-
-{{ _("Thank you for registering a new account with us.") }}
-
-{{ _("This account will allow you to take part in our project. Either by joining conversations, writing documentation, or becoming a developer.") }} {{ _("There are many things you can do with your account.") }}
-
-{{ _("To activate it, please click on this link:") }}
-
-  https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}
diff --git a/src/templates/auth/register-success.html b/src/templates/auth/register-success.html
deleted file mode 100644
index c3726bcd..00000000
--- a/src/templates/auth/register-success.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Thank You") }}{% end block %}
-
-{% block content %}
-<section class="section">
-	<div class="container">
-		<div class="columns is-centered">
-			<div class="column is-one-third">
-				<h1 class="title">
-					IPFire<span class="has-text-primary">_</span>
-				</h1>
-				<h4 class="subtitle">
-					{{ _("Your account has been created.") }}
-					{{ _("Please check your email for next steps.") }}
-				</h4>
-
-				<div class="block">
-					<p class="is-size-5">
-						<span class="fas fa-check fa-5x my-4"></span>
-					</p>
-				</div>
-			</div>
-		</div>
-	</div>
-</section>
-{% end block %}
diff --git a/src/templates/blog/index.html b/src/templates/blog/index.html
index 678f9e84..20e5efb9 100644
--- a/src/templates/blog/index.html
+++ b/src/templates/blog/index.html
@@ -70,11 +70,11 @@
 					{# Show a button to sign up for anonymous users #}
 					{% if not current_user %}
 						<div class="block">
-							<a class="button is-primary is-large is-fullwidth wrap-text" href="/register">
+							<a class="button is-primary is-large is-fullwidth wrap-text" href="/join">
 								<span class="icon">
 									<i class="fa-solid fa-envelope"></i>
 								</span>
-								<span>{{ _("Sign Up & Subscribe to our Newsletter") }}</span>
+								<span>{{ _("Join Now & Subscribe to our Newsletter") }}</span>
 							</a>
 						</div>
 
diff --git a/src/templates/blog/post.html b/src/templates/blog/post.html
index f057fe5e..fd143eb6 100644
--- a/src/templates/blog/post.html
+++ b/src/templates/blog/post.html
@@ -93,7 +93,7 @@
 					&nbsp;
 
 					{% if not current_user %}
-						<a class="has-text-weight-bold" href="/register">
+						<a class="has-text-weight-bold" href="/join">
 							{{ _("Join Now") }}
 						</a>
 					{% else %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 1b7dbfb9..cdb534c1 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -119,9 +119,9 @@ class Application(tornado.web.Application):
 			(r"/", IndexHandler),
 
 			# Authentication
+			(r"/join", auth.JoinHandler),
 			(r"/login", auth.LoginHandler),
 			(r"/logout", auth.LogoutHandler),
-			(r"/register", auth.RegisterHandler),
 			(r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
 
 			# Blog
@@ -342,7 +342,7 @@ class Application(tornado.web.Application):
 		# people.ipfire.org
 		self.add_handlers(r"people\.([a-z]+\.dev\.)?ipfire\.org", [
 			(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users" }),
-			(r"/register", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/register" }),
+			(r"/register", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/join" }),
 			(r"/users", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users" }),
 			(r"/users/([a-z_][a-z0-9_-]{0,31})", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users/{0}" }),
 			(r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users/{0}.jpg" }),
diff --git a/src/web/auth.py b/src/web/auth.py
index f14a184c..023ca6e8 100644
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -74,14 +74,14 @@ class LogoutHandler(AuthenticationMixin, base.BaseHandler):
 		self.redirect("/")
 
 
-class RegisterHandler(base.BaseHandler):
+class JoinHandler(base.BaseHandler):
 	def get(self):
 		# Redirect logged in users away
 		if self.current_user:
 			self.redirect("/")
 			return
 
-		self.render("auth/register.html")
+		self.render("auth/join.html")
 
 	@base.ratelimit(minutes=15, requests=5)
 	async def post(self):
@@ -94,13 +94,13 @@ class RegisterHandler(base.BaseHandler):
 		# Register account
 		try:
 			with self.db.transaction():
-				self.backend.accounts.register(uid, email,
+				self.backend.accounts.join(uid, email,
 					first_name=first_name, last_name=last_name,
 					country_code=self.current_country_code)
 		except ValueError as e:
 			raise tornado.web.HTTPError(400, "%s" % e) from e
 
-		self.render("auth/register-success.html")
+		self.render("auth/join-success.html")
 
 
 class ActivateHandler(AuthenticationMixin, base.BaseHandler):