From 90b9c88121dc10119b588d5c521dc4002a3ea5b2 Mon Sep 17 00:00:00 2001
From: Peter Sanchez <peter@netlandish.com>
Date: Sat, 9 Mar 2024 08:32:12 -0600
Subject: [PATCH] Fixing all page titles

---
 accounts/routes.go                         |  2 +-
 admin/routes.go                            | 10 +++---
 billing/routes.go                          |  6 ++--
 core/routes.go                             | 16 ++++++----
 list/routes.go                             | 36 ++++++++++++----------
 mattermost/routes.go                       |  2 +-
 short/routes.go                            |  2 +-
 slack/routes.go                            |  2 +-
 templates/admin_billing_list.html          |  2 +-
 templates/admin_dashboard.html             |  2 +-
 templates/admin_domain_create.html         |  2 +-
 templates/admin_domain_detail.html         |  2 +-
 templates/admin_invite_user.html           |  2 +-
 templates/admin_org_detail.html            |  2 +-
 templates/admin_organization_list.html     |  2 +-
 templates/admin_user_detail.html           |  2 +-
 templates/admin_user_edit.html             |  2 +-
 templates/admin_user_list.html             |  2 +-
 templates/admin_user_lock.html             |  2 +-
 templates/analytics_detail.html            |  2 +-
 templates/billing_cancel_subscription.html |  2 +-
 templates/billing_checkout.html            |  2 +-
 templates/billing_create_subscription.html |  2 +-
 templates/billing_history.html             |  2 +-
 templates/billing_manage_subscription.html |  2 +-
 templates/complete_register.html           |  2 +-
 templates/connect_mattermost.html          |  2 +-
 templates/connect_mm_user.html             |  2 +-
 templates/connect_slack.html               |  2 +-
 templates/connect_user.html                |  2 +-
 templates/disconnect_mattermost.html       |  2 +-
 templates/disconnect_slack.html            |  2 +-
 templates/domain_create.html               |  2 +-
 templates/domain_list.html                 |  2 +-
 templates/element_delete.html              |  2 +-
 templates/export_data.html                 |  2 +-
 templates/feature_tour.html                |  2 +-
 templates/feed.html                        |  2 +-
 templates/feed_following.html              |  2 +-
 templates/graphql.html                     |  2 +-
 templates/inactive_domain.html             |  2 +-
 templates/index.html                       |  2 +-
 templates/link_create.html                 |  2 +-
 templates/link_detail.html                 |  1 +
 templates/link_short_create.html           |  2 +-
 templates/link_short_list.html             |  2 +-
 templates/listing_create.html              |  2 +-
 templates/listing_detail.html              |  2 +-
 templates/listing_link_create.html         |  2 +-
 templates/listing_link_list.html           |  2 +-
 templates/listing_list.html                |  2 +-
 templates/note_create.html                 |  2 +-
 templates/org_list.html                    |  2 +-
 templates/profile_edit.html                |  2 +-
 templates/qrcode_detail.html               |  2 +-
 templates/qrcodes_list.html                |  2 +-
 templates/register.html                    |  2 +-
 templates/restricted.html                  |  2 +-
 templates/restriction_redirect.html        |  6 ++--
 templates/settings.html                    |  2 +-
 60 files changed, 95 insertions(+), 88 deletions(-)

diff --git a/accounts/routes.go b/accounts/routes.go
index 80af174..fc098b9 100644
--- a/accounts/routes.go
+++ b/accounts/routes.go
@@ -255,7 +255,7 @@ func (s *Service) CompleteRegister(c echo.Context) error {
 	}
 	gctx := c.(*server.Context)
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Complete Register"))
+	pd := localizer.NewPageData(lt.Translate("Complete Registration"))
 	pd.Data["save"] = lt.Translate("Save")
 	pd.Data["full_name"] = lt.Translate("Full Name")
 	pd.Data["username"] = lt.Translate("Username")
diff --git a/admin/routes.go b/admin/routes.go
index 8146383..21a2583 100644
--- a/admin/routes.go
+++ b/admin/routes.go
@@ -208,7 +208,7 @@ func (s *Service) OrgDetail(c echo.Context) error {
 		return echo.NotFoundHandler(c)
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("User Detail"))
+	pd := localizer.NewPageData(lt.Translate("Organization Detail"))
 	pd.Data["email"] = lt.Translate("Email")
 	pd.Data["created_on"] = lt.Translate("Created On")
 	pd.Data["is_active"] = lt.Translate("Is Active")
@@ -384,7 +384,7 @@ func (s *Service) DomainDetail(c echo.Context) error {
 		return echo.NotFoundHandler(c)
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("User Detail"))
+	pd := localizer.NewPageData(lt.Translate("Domain Detail"))
 	pd.Data["created_on"] = lt.Translate("Created On")
 	pd.Data["is_active"] = lt.Translate("Is Active")
 	pd.Data["name"] = lt.Translate("Name")
@@ -712,7 +712,7 @@ func (s *Service) DomainCreate(c echo.Context) error {
 
 func (s *Service) BillingList(c echo.Context) error {
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Admin Dashboard"))
+	pd := localizer.NewPageData(lt.Translate("Admin Billing"))
 	pd.Data["billing_stats"] = lt.Translate("Billing Stats")
 	pd.Data["active_subscriptions"] = lt.Translate("Active Subscriptions")
 	pd.Data["pending_cancel_subscriptions"] = lt.Translate("Subscriptions to be canceled")
@@ -1390,7 +1390,7 @@ func (s *Service) UserUpdate(c echo.Context) error {
 
 func (s *Service) UserInvitation(c echo.Context) error {
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Register Invitation"))
+	pd := localizer.NewPageData(lt.Translate("Account Invitation"))
 	pd.Data["cancel"] = lt.Translate("Cancel")
 	pd.Data["send_invitation"] = lt.Translate("Send Invitation")
 	pd.Data["email"] = lt.Translate("Email")
@@ -1439,7 +1439,7 @@ func (s *Service) UserInvitation(c echo.Context) error {
 func (s *Service) UserList(c echo.Context) error {
 	query := c.QueryParam("q")
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Admin Dashboard"))
+	pd := localizer.NewPageData(lt.Translate("User List"))
 	pd.Data["user_list"] = lt.Translate("User List")
 	pd.Data["is_active"] = lt.Translate("Is Active")
 	pd.Data["name"] = lt.Translate("Name")
diff --git a/billing/routes.go b/billing/routes.go
index a14d5be..82b5c19 100644
--- a/billing/routes.go
+++ b/billing/routes.go
@@ -152,7 +152,7 @@ func (s *Service) StripeWebhook(c echo.Context) error {
 func (s *Service) CheckoutSuccess(c echo.Context) error {
 	gctx := c.(*server.Context)
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Checkout Succeed"))
+	pd := localizer.NewPageData(lt.Translate("Checkout Succeeded"))
 	pd.Data["message"] = lt.Translate("Thanks for subscribing!")
 	pd.Data["your_subscription"] = lt.Translate("Your subscription invoice number is")
 	pd.Data["you_can_click"] = lt.Translate("You can click on this link to see the invoice detail.")
@@ -222,7 +222,7 @@ func (s *Service) SubscriptionHistory(c echo.Context) error {
 	}
 	org := orgs[0]
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("History"))
+	pd := localizer.NewPageData(lt.Translate("Billing History"))
 	pd.Data["type"] = lt.Translate("Type")
 	pd.Data["end_date"] = lt.Translate("Renewal Data")
 	pd.Data["payment_history"] = lt.Translate("Payment History")
@@ -447,7 +447,7 @@ func (s *Service) CreateSubscription(c echo.Context) error {
 			BusinessPlanID = p.ID
 		}
 	}
-	pd := localizer.NewPageData(lt.Translate("New Subscription"))
+	pd := localizer.NewPageData(lt.Translate("Create Subscription"))
 	pd.Data["select"] = lt.Translate("Select")
 	pd.Data["business"] = lt.Translate("Business")
 	pd.Data["personal"] = lt.Translate("Personal")
diff --git a/core/routes.go b/core/routes.go
index 7ac691a..8bb07f7 100644
--- a/core/routes.go
+++ b/core/routes.go
@@ -238,7 +238,7 @@ func (s *Service) InvalidDomain(c echo.Context) error {
 	}
 
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Invalid Domain"))
+	pd := localizer.NewPageData(lt.Translate("Inactive Domain"))
 	pd.Data["msg"] = lt.Translate("The %s domain is currently inactive", d)
 	pd.Data["please_upgrade"] = lt.Translate("Please upgrade your account to reactivate it")
 
@@ -614,7 +614,7 @@ func (s *Service) OrgList(c echo.Context) error {
 	}
 
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Organizations"))
+	pd := localizer.NewPageData(lt.Translate("Your Organizations"))
 	pd.Data["name"] = lt.Translate("Name")
 	pd.Data["slug"] = lt.Translate("Slug")
 	pd.Data["subscription"] = lt.Translate("Subscription")
@@ -1428,7 +1428,7 @@ func (s *Service) UserFeedFollowing(c echo.Context) error {
 		return err
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Feed Following"))
+	pd := localizer.NewPageData(lt.Translate("Following"))
 	pd.Data["back"] = lt.Translate("Back")
 	pd.Data["unfollow"] = lt.Translate("Unfollow")
 	pd.Data["no_orgs"] = lt.Translate("No organizations")
@@ -2038,7 +2038,7 @@ func (s *Service) OrgLinkDelete(c echo.Context) error {
 	}
 	gctx := c.(*server.Context)
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Delete"))
+	pd := localizer.NewPageData(lt.Translate("Delete Bookmark"))
 
 	req := c.Request()
 	if req.Method == http.MethodPost {
@@ -2324,7 +2324,11 @@ func (s *Service) QRRedirect(c echo.Context) error {
 	org := orgs[0]
 	if links.BillingEnabled(gctx.Server.Config) && org.IsRestricted([]int{
 		models.BillingStatusFree, models.BillingStatusOpenSource}) {
+		lt := localizer.GetSessionLocalizer(c)
+		pd := localizer.NewPageData(lt.Translate("QR Codes Powered by Link Taco!"))
+		pd.Data["redirected"] = lt.Translate("You will be redirected in 10 seconds.")
 		gmap := gobwebs.Map{
+			"pd":      pd,
 			"url":     QRCode.URL,
 			"hideNav": true,
 		}
@@ -2397,7 +2401,7 @@ func (s *Service) QRManageDetail(c echo.Context) error {
 		return err
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("QR Code"))
+	pd := localizer.NewPageData(lt.Translate("QR Code Details"))
 	pd.Data["download"] = lt.Translate("Download Image")
 	pd.Data["back"] = lt.Translate("Back")
 	qrCode := result.QRCode
@@ -2434,7 +2438,7 @@ func (s *Service) QRManageDelete(c echo.Context) error {
 	}
 	gctx := c.(*server.Context)
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Delete QR"))
+	pd := localizer.NewPageData(lt.Translate("Delete QR Code"))
 
 	req := c.Request()
 	if req.Method == http.MethodPost {
diff --git a/list/routes.go b/list/routes.go
index 24210c8..20e5060 100644
--- a/list/routes.go
+++ b/list/routes.go
@@ -128,7 +128,7 @@ func (s *Service) ListingLinksUpdate(c echo.Context) error {
 		LinkOrder:   listingLink.LinkOrder,
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Links"))
+	pd := localizer.NewPageData(lt.Translate("Update Links"))
 	pd.Data["save"] = lt.Translate("Save")
 	pd.Data["url"] = lt.Translate("URL")
 	pd.Data["description"] = lt.Translate("Description")
@@ -365,7 +365,7 @@ func (s *Service) ListingLinksCreate(c echo.Context) error {
 	listing := listings[0]
 	form := &ListingLinkForm{}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Links"))
+	pd := localizer.NewPageData(lt.Translate("Create Links"))
 	pd.Data["save"] = lt.Translate("Save")
 	pd.Data["url"] = lt.Translate("URL")
 	pd.Data["description"] = lt.Translate("Description")
@@ -480,19 +480,6 @@ func (s *Service) ListingLinksManage(c echo.Context) error {
 		return echo.NotFoundHandler(c)
 	}
 	listing := listings[0]
-	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Links"))
-	pd.Data["edit"] = lt.Translate("Edit")
-	pd.Data["prev"] = lt.Translate("Previous")
-	pd.Data["next"] = lt.Translate("Next")
-	pd.Data["no_links"] = lt.Translate("No Links")
-	pd.Data["add"] = lt.Translate("Add")
-	pd.Data["title"] = lt.Translate("Title")
-	pd.Data["action"] = lt.Translate("Action")
-	pd.Data["order"] = lt.Translate("Order")
-	pd.Data["actions"] = lt.Translate("Actions")
-	pd.Data["delete"] = lt.Translate("Delete")
-	pd.Data["back"] = lt.Translate("Back")
 
 	type GraphQLResponse struct {
 		Listing struct {
@@ -553,6 +540,21 @@ func (s *Service) ListingLinksManage(c echo.Context) error {
 		}
 		return err
 	}
+
+	lt := localizer.GetSessionLocalizer(c)
+	pd := localizer.NewPageData(lt.Translate("%s Links", result.Listing.Result.Title))
+	pd.Data["edit"] = lt.Translate("Edit")
+	pd.Data["prev"] = lt.Translate("Previous")
+	pd.Data["next"] = lt.Translate("Next")
+	pd.Data["no_links"] = lt.Translate("No Links")
+	pd.Data["add"] = lt.Translate("Add")
+	pd.Data["title"] = lt.Translate("Title")
+	pd.Data["action"] = lt.Translate("Action")
+	pd.Data["order"] = lt.Translate("Order")
+	pd.Data["actions"] = lt.Translate("Actions")
+	pd.Data["delete"] = lt.Translate("Delete")
+	pd.Data["back"] = lt.Translate("Back")
+
 	gmap := gobwebs.Map{
 		"pd":           pd,
 		"listingLinks": result.Listing.Links,
@@ -1389,7 +1391,7 @@ func (s *Service) ListingQRCodeList(c echo.Context) error {
 	}
 
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("QR Codes List"))
+	pd := localizer.NewPageData(lt.Translate("QR Code Listing"))
 	pd.Data["add"] = lt.Translate("Add")
 	pd.Data["title"] = lt.Translate("Title")
 	pd.Data["delete"] = lt.Translate("Delete")
@@ -1570,7 +1572,7 @@ func (r *DetailService) ListDetail(c echo.Context) error {
 		return err
 	}
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Links"))
+	pd := localizer.NewPageData(lt.Translate("%s Links", result.Listing.Result.Title))
 	pd.Data["prev"] = lt.Translate("Previous")
 	pd.Data["next"] = lt.Translate("Next")
 	pd.Data["no_links"] = lt.Translate("No Links")
diff --git a/mattermost/routes.go b/mattermost/routes.go
index 80353a5..19d817d 100644
--- a/mattermost/routes.go
+++ b/mattermost/routes.go
@@ -111,7 +111,7 @@ func (s *Service) Connect(c echo.Context) error {
 	teamID := c.Param("id")
 
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Connect to mattermost"))
+	pd := localizer.NewPageData(lt.Translate("Connect Mattermost"))
 	pd.Data["organization"] = lt.Translate("Organization")
 	pd.Data["connect"] = lt.Translate("Connect")
 	pd.Data["already_connected"] = lt.Translate("This team is already tied to an organization")
diff --git a/short/routes.go b/short/routes.go
index c0e4de4..a8368ef 100644
--- a/short/routes.go
+++ b/short/routes.go
@@ -664,7 +664,7 @@ func (s *Service) LinkShortQRCodeList(c echo.Context) error {
 	}
 
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("QR Codes List"))
+	pd := localizer.NewPageData(lt.Translate("QR Code Listing"))
 	pd.Data["add"] = lt.Translate("Add")
 	pd.Data["delete"] = lt.Translate("Delete")
 	pd.Data["creation_date"] = lt.Translate("Creation Date")
diff --git a/slack/routes.go b/slack/routes.go
index cbc8d44..cc3864b 100644
--- a/slack/routes.go
+++ b/slack/routes.go
@@ -278,7 +278,7 @@ func (s *Service) SlashCommand(c echo.Context) error {
 func (s *Service) ConnectSlack(c echo.Context) error {
 	gctx := c.(*server.Context)
 	lt := localizer.GetSessionLocalizer(c)
-	pd := localizer.NewPageData(lt.Translate("Connect to slack workspace"))
+	pd := localizer.NewPageData(lt.Translate("Connect to Slack Workspace"))
 	pd.Data["organization"] = lt.Translate("Organization")
 	pd.Data["connect"] = lt.Translate("Connect")
 	pd.Data["invalid_slack"] = lt.Translate("Invalid slack response")
diff --git a/templates/admin_billing_list.html b/templates/admin_billing_list.html
index 071b384..61b62af 100644
--- a/templates/admin_billing_list.html
+++ b/templates/admin_billing_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Billing Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a href="{{reverse "admin:dashboard"}}" class="primary button is-small">{{.pd.Data.back}}</a>
diff --git a/templates/admin_dashboard.html b/templates/admin_dashboard.html
index 21f9ef9..9b1af55 100644
--- a/templates/admin_dashboard.html
+++ b/templates/admin_dashboard.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Admin Dashboard{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <form class="app-header__search app-header__search--inline" method="GET" action="{{reverse "admin:dashboard"}}">
diff --git a/templates/admin_domain_create.html b/templates/admin_domain_create.html
index 7e69143..05baa2d 100644
--- a/templates/admin_domain_create.html
+++ b/templates/admin_domain_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Domain Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   {{if .domain.ID}}
diff --git a/templates/admin_domain_detail.html b/templates/admin_domain_detail.html
index a78407f..cb0b2c1 100644
--- a/templates/admin_domain_detail.html
+++ b/templates/admin_domain_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Domain Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.domain.Name}}</h1>
   <div>
diff --git a/templates/admin_invite_user.html b/templates/admin_invite_user.html
index c68fa1e..9852074 100644
--- a/templates/admin_invite_user.html
+++ b/templates/admin_invite_user.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}User Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "admin:user_list"}}">{{.pd.Data.back}}</a>
diff --git a/templates/admin_org_detail.html b/templates/admin_org_detail.html
index dd17dc6..c26684c 100644
--- a/templates/admin_org_detail.html
+++ b/templates/admin_org_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Organization Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.org.Name}}</h1>
   <div>
diff --git a/templates/admin_organization_list.html b/templates/admin_organization_list.html
index d54544d..f0978fa 100644
--- a/templates/admin_organization_list.html
+++ b/templates/admin_organization_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Organization Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "admin:dashboard"}}">{{.pd.Data.back}}</a>
diff --git a/templates/admin_user_detail.html b/templates/admin_user_detail.html
index 146db50..ee74abd 100644
--- a/templates/admin_user_detail.html
+++ b/templates/admin_user_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}User Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.user.Name}}</h1>
   <div>
diff --git a/templates/admin_user_edit.html b/templates/admin_user_edit.html
index 3840443..0e387ed 100644
--- a/templates/admin_user_edit.html
+++ b/templates/admin_user_edit.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}User Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.user.Name}}</h1>
   <a class="button primary is-small" href="{{reverse "admin:user_detail" .user.ID}}">{{.pd.Data.back}}</a>
diff --git a/templates/admin_user_list.html b/templates/admin_user_list.html
index 3f83c57..b9a32a6 100644
--- a/templates/admin_user_list.html
+++ b/templates/admin_user_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Users Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <div>
diff --git a/templates/admin_user_lock.html b/templates/admin_user_lock.html
index b11d6c5..18ef964 100644
--- a/templates/admin_user_lock.html
+++ b/templates/admin_user_lock.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}User Admin{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.user.Name}}</h1>
   <a class="button primary is-small" href="{{reverse "admin:user_detail" .user.ID}}">{{.pd.Data.back}}</a>
diff --git a/templates/analytics_detail.html b/templates/analytics_detail.html
index db8996e..9ea7ac6 100644
--- a/templates/analytics_detail.html
+++ b/templates/analytics_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Analytics{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.pd.Title}} | {{.title}}</h1>
     {{if .back}}
diff --git a/templates/billing_cancel_subscription.html b/templates/billing_cancel_subscription.html
index 7154b10..08cabe3 100644
--- a/templates/billing_cancel_subscription.html
+++ b/templates/billing_cancel_subscription.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Cancel Subscription{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.org.Name}} {{.pd.Title}}</h1>
   {{if .back}}
diff --git a/templates/billing_checkout.html b/templates/billing_checkout.html
index fdaaba7..c8838cf 100644
--- a/templates/billing_checkout.html
+++ b/templates/billing_checkout.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Billing Checkout{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/billing_create_subscription.html b/templates/billing_create_subscription.html
index db4f432..6dd9003 100644
--- a/templates/billing_create_subscription.html
+++ b/templates/billing_create_subscription.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Create Subscription{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.org.Name}} {{.pd.Title}}</h1>
   <a href="{{.back}}" class="button primary is-small">{{.pd.Data.back}}</a>
diff --git a/templates/billing_history.html b/templates/billing_history.html
index 2b3d4c0..1019351 100644
--- a/templates/billing_history.html
+++ b/templates/billing_history.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Billing History{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.org.Name}} {{.pd.Data.payment_history}}</h1>
     <a href="{{.back}}" class="button primary is-small">{{.pd.Data.back}}</a>
diff --git a/templates/billing_manage_subscription.html b/templates/billing_manage_subscription.html
index f42458d..eff6c1b 100644
--- a/templates/billing_manage_subscription.html
+++ b/templates/billing_manage_subscription.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Billing Manage{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.pd.Title}}</h1>
     <div>
diff --git a/templates/complete_register.html b/templates/complete_register.html
index ae3c8e7..e4ca80c 100644
--- a/templates/complete_register.html
+++ b/templates/complete_register.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Complete Register{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/connect_mattermost.html b/templates/connect_mattermost.html
index 1e94aea..953f102 100644
--- a/templates/connect_mattermost.html
+++ b/templates/connect_mattermost.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Connect Mattermost{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/connect_mm_user.html b/templates/connect_mm_user.html
index 61daa37..ad4ca0b 100644
--- a/templates/connect_mm_user.html
+++ b/templates/connect_mm_user.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Connect Mattermost User{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/connect_slack.html b/templates/connect_slack.html
index 7c821f6..22dca94 100644
--- a/templates/connect_slack.html
+++ b/templates/connect_slack.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Connect Slack{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.pd.Title}}: {{.workspace}}</h1>
 </section>
diff --git a/templates/connect_user.html b/templates/connect_user.html
index fe5b4b8..ed9bdb6 100644
--- a/templates/connect_user.html
+++ b/templates/connect_user.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Connect User{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/disconnect_mattermost.html b/templates/disconnect_mattermost.html
index f3457d6..599aeb9 100644
--- a/templates/disconnect_mattermost.html
+++ b/templates/disconnect_mattermost.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Disconnect Mattermost{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="card shadow-card">
   <form id="disconnect-mm-form" action="{{reverse "mattermost:disconnect_post" .conn.ID}}" method="POST">
     <input type="hidden" name="csrf" value="{{ .CSRF }}"/>
diff --git a/templates/disconnect_slack.html b/templates/disconnect_slack.html
index 490be51..a3b5d7f 100644
--- a/templates/disconnect_slack.html
+++ b/templates/disconnect_slack.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Disconnect Slack{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="card shadow-card">
   <form id="disconnect-slack-form" action="{{reverse "slack:slack_disconnect_post" .conn.ID}}" method="POST">
     <input type="hidden" name="csrf" value="{{ .CSRF }}">
diff --git a/templates/domain_create.html b/templates/domain_create.html
index 59e8277..18c7867 100644
--- a/templates/domain_create.html
+++ b/templates/domain_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Create Domain{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} {{.pd.Data.for}} {{.org.Name}}</h1>
   <a class="button primary is-small" href="{{reverse "core:domain_list" .org.Slug}}">{{.pd.Data.back}}</a>
diff --git a/templates/domain_list.html b/templates/domain_list.html
index 30f18d4..8072486 100644
--- a/templates/domain_list.html
+++ b/templates/domain_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Domain List{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} {{.pd.Data.for}} {{.org.Name}}</h1>
   <div>
diff --git a/templates/element_delete.html b/templates/element_delete.html
index c1fbd24..ce4de91 100644
--- a/templates/element_delete.html
+++ b/templates/element_delete.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Delete element{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="card shadow-card">
     <form action="{{.url}}" method="POST">
         <input type="hidden" name="csrf" value="{{ .CSRF }}">
diff --git a/templates/export_data.html b/templates/export_data.html
index f07f847..72adef6 100644
--- a/templates/export_data.html
+++ b/templates/export_data.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Export Data{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.pd.Title}}</h1>
     <a href="{{reverse "core:org_list"}}" class="button primary is-small">{{.pd.Data.back}}</a>
diff --git a/templates/feature_tour.html b/templates/feature_tour.html
index e4aadc7..ebd39bf 100644
--- a/templates/feature_tour.html
+++ b/templates/feature_tour.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Feature Tour{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/feed.html b/templates/feed.html
index e7e6cfc..73f8eb9 100644
--- a/templates/feed.html
+++ b/templates/feed.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}{{ .Title }}{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <form method="GET" action="{{reverse "core:user_feed"}}" id="advanced-search-form">
     <section class="app-header app-header-advanced-search">
         <h1 class="app-header__title">{{ .user.Name }} {{.pd.Title}}</h1>
diff --git a/templates/feed_following.html b/templates/feed_following.html
index 1d8a4bf..fa1b619 100644
--- a/templates/feed_following.html
+++ b/templates/feed_following.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}{{ .Title }}{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
     <h1 class="app-header__title">{{.user.Name}} {{.pd.Title}}</h1>
     <a class="button primary is-small" href="{{reverse "core:user_feed"}}">{{.pd.Data.back}}</a>
diff --git a/templates/graphql.html b/templates/graphql.html
index 08adb8d..fbdbfbe 100644
--- a/templates/graphql.html
+++ b/templates/graphql.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}GraphQL Playground{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 {{ define "extrahead" }}
 <link rel="stylesheet" href="{{ staticURL "css/codemirror.css" }}">
 {{ end }}
diff --git a/templates/inactive_domain.html b/templates/inactive_domain.html
index 9bf38f2..dc2e911 100644
--- a/templates/inactive_domain.html
+++ b/templates/inactive_domain.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Inactive Domain{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
 </section>
diff --git a/templates/index.html b/templates/index.html
index 0361234..afea0eb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Index{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 {{if .isAuthorized}}
 <section class="card shadow-card">
   <h1>{{.pd.Title}}</h1>
diff --git a/templates/link_create.html b/templates/link_create.html
index a46eea8..f4abc4a 100644
--- a/templates/link_create.html
+++ b/templates/link_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Link Create{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}{{if .selectedOrg}} | {{.selectedOrg.Name}}{{end}}</h1>
   <a class="button primary is-small" href="{{reverse "core:home_link_list"}}">{{.pd.Data.back}}</a>
diff --git a/templates/link_detail.html b/templates/link_detail.html
index abab34f..4829ae5 100644
--- a/templates/link_detail.html
+++ b/templates/link_detail.html
@@ -1,4 +1,5 @@
 {{template "base" .}}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   {{if .IsAuth}}
diff --git a/templates/link_short_create.html b/templates/link_short_create.html
index e520c6f..64d5ea2 100644
--- a/templates/link_short_create.html
+++ b/templates/link_short_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Link Short Create{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} | {{.org.Name}}</h1>
   <a class="button primary is-small" href="{{reverse "short:link_short_list" .org.Slug}}">{{.pd.Data.back}}</a>
diff --git a/templates/link_short_list.html b/templates/link_short_list.html
index 13d52dd..b1bcfdc 100644
--- a/templates/link_short_list.html
+++ b/templates/link_short_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Short Link List{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header app-header-advanced-search{{if .advancedSearch}} mb-0{{end}}">
   <h1 class="app-header__title">{{ .org.Name }} {{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "short:link_short_create" .org.Slug}}">{{.pd.Data.add}}</a>
diff --git a/templates/listing_create.html b/templates/listing_create.html
index 1339e7d..dc990bc 100644
--- a/templates/listing_create.html
+++ b/templates/listing_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}List Create{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} | {{.org.Name}}</h1>
   <a class="button primary is-small" href="{{reverse "list:listing_list" .org.Slug}}">{{.pd.Data.back}}</a>
diff --git a/templates/listing_detail.html b/templates/listing_detail.html
index c312adf..d3c287c 100644
--- a/templates/listing_detail.html
+++ b/templates/listing_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}List Detail{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 {{if .listing.Image}}
 <section class="app-header app-header--centered">
   <img class="mb-2" width="100" src="{{mediaURL .listing.Image}}">
diff --git a/templates/listing_link_create.html b/templates/listing_link_create.html
index 26709dc..166e1cd 100644
--- a/templates/listing_link_create.html
+++ b/templates/listing_link_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Create List Link{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} | {{.listing.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "list:listing_links" .org.Slug .listing.ID}}">{{.pd.Data.back}}</a>
diff --git a/templates/listing_link_list.html b/templates/listing_link_list.html
index 0ee97e3..0bc4b4b 100644
--- a/templates/listing_link_list.html
+++ b/templates/listing_link_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}List Links{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.listing.Title}} {{.pd.Title}}</h1>
   <div>
diff --git a/templates/listing_list.html b/templates/listing_list.html
index 733e7d4..fc93abe 100644
--- a/templates/listing_list.html
+++ b/templates/listing_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Lists List{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header app-header-advanced-search{{if .advancedSearch}} mb-0{{end}}">
   <h1 class="app-header__title">{{.org.Name}} {{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "list:listing_create" .org.Slug}}">{{.pd.Data.add}}</a>
diff --git a/templates/note_create.html b/templates/note_create.html
index 6a9fa15..23519b3 100644
--- a/templates/note_create.html
+++ b/templates/note_create.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Create Note{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}{{if .selectedOrg}} | {{.selectedOrg.Name}}{{end}}</h1>
   <a class="button primary is-small" href="{{reverse "core:home_link_list"}}">{{.pd.Data.back}}</a>
diff --git a/templates/org_list.html b/templates/org_list.html
index 678e6a3..45d1488 100644
--- a/templates/org_list.html
+++ b/templates/org_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Your Organizations{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a href="{{reverse "core:org_create"}}" class="button primary is-small">{{.pd.Data.add}}</a>
diff --git a/templates/profile_edit.html b/templates/profile_edit.html
index 24edd34..c626a2d 100644
--- a/templates/profile_edit.html
+++ b/templates/profile_edit.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Profile{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{reverse "accounts:settings"}}">{{.pd.Data.back}}</a>
diff --git a/templates/qrcode_detail.html b/templates/qrcode_detail.html
index 12a42d0..3433935 100644
--- a/templates/qrcode_detail.html
+++ b/templates/qrcode_detail.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}QR Detail{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}}</h1>
   <a class="button primary is-small" href="{{.backURL}}">{{.pd.Data.back}}</a>
diff --git a/templates/qrcodes_list.html b/templates/qrcodes_list.html
index 4ddadf0..3c13291 100644
--- a/templates/qrcodes_list.html
+++ b/templates/qrcodes_list.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}QR List{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.object.Title}} {{.pd.Title}}</h1>
   <div>
diff --git a/templates/register.html b/templates/register.html
index d99d892..ee5701d 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Register{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Data.welcome}}</h1>
 </section>
diff --git a/templates/restricted.html b/templates/restricted.html
index 4910407..f27d2c5 100644
--- a/templates/restricted.html
+++ b/templates/restricted.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Restricted{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="card shadow-card">
     <p class="text-center">{{.pd.Data.message}}</p>
     {{if .orgSlug}}
diff --git a/templates/restriction_redirect.html b/templates/restriction_redirect.html
index a213d86..ff5701c 100644
--- a/templates/restriction_redirect.html
+++ b/templates/restriction_redirect.html
@@ -1,9 +1,9 @@
 {{template "base" .}}
-{{ define "title" }}Domain Restricted{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="card shadow-card">
-    <h1 class="text-center">QR Code powered by Link Taco!</h1>
+    <h1 class="text-center">{{ .pd.Title }}</h1>
     <p class="text-center"><a target="_blank" href="{{reverse "accounts:register"}}">Click here to make your own free account.</a></p>
-    <p class="text-center">You will be redirected in 10 (countdown timer) seconds.</p>
+    <p class="text-center">{{ .pd.Data.redirected }}</p>
 </section>
 <script>
     setTimeout(function() {
diff --git a/templates/settings.html b/templates/settings.html
index 6efc253..5e6cd4c 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -1,5 +1,5 @@
 {{template "base" .}}
-{{ define "title" }}Settings{{ end }}
+{{ define "title" }}{{ .pd.Title }}{{ end }}
 <section class="app-header">
   <h1 class="app-header__title">{{.pd.Title}} </h1>
 </section>
-- 
2.43.0