From 71db616fed817893d0efa363f0e7dbfcf23866a0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 13 Jul 2023 17:59:15 +0200
Subject: [PATCH] =?UTF-8?q?Change=20=E2=80=9CAbout=E2=80=9D=20and=20?=
=?UTF-8?q?=E2=80=9CPrivacy=20policy=E2=80=9D=20links=20to=20open=20in=20a?=
=?UTF-8?q?=20new=20tab=20in=20advanced=20interface=20(#25973)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/javascript/mastodon/features/getting_started/index.jsx | 2 +-
.../mastodon/features/ui/components/link_footer.jsx | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index e31ca79af1..85fd6f1209 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -142,7 +142,7 @@ class GettingStarted extends ImmutablePureComponent {
{!multiColumn && <div className='flex-spacer' />}
- <LinkFooter />
+ <LinkFooter multiColumn />
</div>
{(multiColumn && showTrends) && <TrendsContainer />}
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index b025174409..7aaa887ac6 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -38,6 +38,7 @@ class LinkFooter extends PureComponent {
};
static propTypes = {
+ multiColumn: PropTypes.bool,
onLogout: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
};
@@ -53,6 +54,7 @@ class LinkFooter extends PureComponent {
render () {
const { signedIn, permissions } = this.context.identity;
+ const { multiColumn } = this.props;
const canInvite = signedIn && ((permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS);
const canProfileDirectory = profileDirectory;
@@ -64,7 +66,7 @@ class LinkFooter extends PureComponent {
<p>
<strong>{domain}</strong>:
{' '}
- <Link to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
+ <Link to='/about' target={multiColumn ? '_blank' : undefined}><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
{statusPageUrl && (
<>
{DividingCircle}
@@ -84,7 +86,7 @@ class LinkFooter extends PureComponent {
</>
)}
{DividingCircle}
- <Link to='/privacy-policy'><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
+ <Link to='/privacy-policy' target={multiColumn ? '_blank' : undefined}><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
</p>
<p>
--
GitLab