Addition - Secondary account disclaimer (#535)

* Add disclaimer to register page about alternate accounts * remove unused class * lint * fix issue lint added * Add links, shorten some of the wording * change order of recovery steps * change discord and forum urls to global locales * linting * final iteration. * make header bold * found extra space * simplify and move stuff around * move stuff so line height isnt awful * remove hr to match other forms * more input from the mostlostnoob
FAForever · Jan 15, 2024 · 255241f · 255241f
1 parent fb9b90a
commit 255241f
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 26 deletions.
diff --git a/src/backend/AppKernel.js b/src/backend/AppKernel.js
@@ -45,7 +45,8 @@ class AppKernel {
 
     bootstrapExpress() {
         this.expressApp = express()
-
+        this.expressApp.locals.discordUrl = 'https://discord.gg/mXahVSKGVb'
+        this.expressApp.locals.forumUrl = 'https://forum.faforever.com/'
         this.expressApp.locals.clanInvitations = {}
         this.expressApp.use((req, res, next) => {
             res.locals.navLinks = []

diff --git a/src/backend/templates/layouts/default.pug b/src/backend/templates/layouts/default.pug
@@ -57,11 +57,11 @@ html(lang='en')
             .topNavContainer
                 a.topnav_item(href='/donation') Support FAF
             .topNavContainer
-                a.topnav_item(href='https://forum.faforever.com/') Forums
+                a.topnav_item(href=forumUrl) Forums
             .topNavContainer
                 a.topnav_item(href='https://wiki.faforever.com/en/home') Wiki
             .topNavContainer
-                a(href='https://discord.gg/mXahVSKGVb')
+                a(href=discordUrl)
                     img(src='/images/fontAwesomeIcons/discord.svg')
             .topNavContainer
                 a(href='https://www.youtube.com/c/ForgedAllianceForever')
@@ -211,7 +211,7 @@ html(lang='en')
                         a(href='/logout') Log Out
 
                 .mobileSocialMedia
-                    a(href='https://discord.gg/mXahVSKGVb')
+                    a(href=discordUrl)
                         img(src='/images/fontAwesomeIcons/discord.svg')
                     a(href='https://www.twitch.tv/faflive')
                         img(src='/images/fontAwesomeIcons/twitch.svg')
@@ -220,7 +220,7 @@ html(lang='en')
                     a(href='https://github.com/FAForever')
                         img(src='/images/fontAwesomeIcons/github.svg')
                 .mobileOtherLinks
-                    a(href='https://forum.faforever.com/') Forums
+                    a(href=forumUrl) Forums
                     a(href='https://wiki.faforever.com/en/home') FAF Wiki
             .splatForgedBorder.transformationReverse.absoluteBottom
                 .movingBackground1
@@ -288,9 +288,9 @@ html(lang='en')
 
                     ul CONTACT US
                         li
-                            a(href='https://discord.gg/mXahVSKGVb') DISCORD
+                            a(href=discordUrl) DISCORD
                         li
-                            a(href='https://forum.faforever.com/') FORUMS
+                            a(href=forumUrl) FORUMS
 
             script(src=webpackAssetJS('navigation'))
             script(

diff --git a/src/backend/templates/views/account/register.pug b/src/backend/templates/views/account/register.pug
@@ -13,11 +13,20 @@ block content
                 br
                 +flash-messages(flash)
 
+                h3
+                    strong
+                        a(
+                            href='/account/requestPasswordReset',
+                            target='_blank'
+                        ) Lost Account or Returning Player
+                    p Creating and operating multiple accounts is prohibited.
                 form(
                     method='post',
                     action='/account/register',
                     data-toggle='validator'
                 )
+                    h2
+                        strong New Players
                     +username
                     br
                     br

diff --git a/src/backend/templates/views/account/requestPasswordReset.pug b/src/backend/templates/views/account/requestPasswordReset.pug
@@ -7,7 +7,7 @@ block bannerData
     - var bannerSubTitle = ''
 
 block content
-    .passResetContainer
+    .containerCenter
         .flashMessage.column12
             +flash-error(errors)
         .passResetEmail.column12
@@ -42,18 +42,18 @@ block content
                         type='submit'
                     ) Reset via email
                     br
-                    br
-
-        br
-        br
-
         .passResetSteam.column12
             h1 Reset password via Steam
             p Click on the button below to get to the Steam login page.
             a(href=steamReset)
                 button Reset via Steam
         br
-        br
+        p If you can't reset your password or regain access to your FAF account via the provided methods above, then please contact the moderation team via&nbsp;
+            a(href=discordUrl, target='_blank') Discord
+            |
+            | or the
+            |
+            a(href=forumUrl, target='_blank') Forums.
 
 block js
     script(src='//www.google.com/recaptcha/api.js')
diff --git a/src/backend/templates/views/campaign-missions.pug b/src/backend/templates/views/campaign-missions.pug
@@ -13,7 +13,7 @@ block content
             p FAF has implemented the co-op feature into the campaign. This means now you can play either of the four original campaigns with up to three friends (four players)! But! That's not all, FAF contributors are also working on creating two new campaigns! One for Seraphim and another one for the coalition! However, be warned that the new campaigns are meant to present a real challenge to seasoned players. If you need some help or have questions, feel free joining the FAF Campaign Development Discord or the FAF Discord!
             a(href='https://discord.gg/ayzAVr9JUV')
                 button Campaign Discord
-            a(href='https://discord.gg/mXahVSKGVb')
+            a(href=discordUrl)
                 button Official Discord
     .mainShowcase
         .showcaseContainer.column6

diff --git a/src/backend/templates/views/contribution.pug b/src/backend/templates/views/contribution.pug
@@ -16,7 +16,7 @@ block content
                 h2.highlightText Fixing bugs, killing lag
                 h1 Game development
                 p Want to help fix a game issue? Create your own Co-op mission? Then you can help with development on Github. To start, join our discord so that you can talk with the correct dev and invite you to our Zulip. It is recommended (but not necessary!) knowing some Lua for game developlment, Python for the server work or Java for the FAF client.
-                a(target='_blank', href='https://discord.gg/mXahVSKGVb')
+                a(target='_blank', href=discordUrl)
                     button Join our Discord
                 a(target='_blank', href='https://github.com/faforever/')
                     button FAF repository

diff --git a/src/backend/templates/views/index.pug b/src/backend/templates/views/index.pug
@@ -47,9 +47,9 @@ block content
                 h2.highlightText Thriving community
                 h1 Make new friends or foes
                 p Our diverse playerbase makes sure you have a spot in our community. Whether you want to experience surviving against waves of enemy AI, play custom games, rise in the matchmaking ladder or just have fun with friends, FAF has a space for you.
-                a(href='https://discord.gg/kTsxKu52WU')
+                a(href=discordUrl)
                     button Join our Discord
-                a(href='https://forum.faforever.com')
+                a(href=forumUrl)
                     button FAF forums
         .mainShowcase
             .showcaseContainer.column6
@@ -114,5 +114,5 @@ block content
         .bannerContainer.column12
             a(href='/play')
                 button PLAY NOW
-            a(href='https://discord.gg/mXahVSKGVb')
+            a(href=discordUrl)
                 button Join our Discord
diff --git a/src/backend/templates/views/newshub.pug b/src/backend/templates/views/newshub.pug
@@ -42,10 +42,7 @@ body
             .featureSubGrid.column3.featureLink
                 .featureSocial.column12
                     .featureLink.featureDiscord.column4
-                        a(
-                            target='_blank',
-                            href='https://discord.gg/mXahVSKGVb'
-                        )
+                        a(target='_blank', href=discordUrl)
                             img(src='/../../images/logos/discord.svg', alt='')
                     .featureLink.featureTwitch.column4
                         a(
@@ -102,7 +99,7 @@ body
                 ) Community Guides
             .clientMenuContainer.column2
                 ul COMMUNITY
-                a(target='_blank', href='https://forum.faforever.com/') Forums
+                a(target='_blank', href=forumUrl) Forums
                 a(
                     target='_blank',
                     href='https://kazbek.github.io/FAF-Analytics/'

diff --git a/src/backend/templates/views/play.pug b/src/backend/templates/views/play.pug
@@ -62,9 +62,9 @@ block content
                     button Download FAF
                 br
                 br
-                a(href='https://discord.gg/mXahVSKGVb')
+                a(href=discordUrl)
                     button Discord
-                a(href='https://forum.faforever.com/')
+                a(href=forumUrl)
                     button Forum
                 a(href='https://wiki.faforever.com/en/Play/Linux-Install')
                     button Linux Installation