Remove/disable user preferences links
This commit is contained in:
parent
b6c52750a3
commit
56c94f16bf
7 changed files with 6 additions and 15 deletions
|
@ -117,7 +117,7 @@ export default class ErrorBoundary extends React.PureComponent {
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='web_app_crash.change_your_settings'
|
id='web_app_crash.change_your_settings'
|
||||||
defaultMessage='Change your {settings}'
|
defaultMessage='Change your {settings}'
|
||||||
values={{ settings: <a href={preferencesLink}><FormattedMessage id='web_app_crash.settings' defaultMessage='settings' /></a> }}
|
values={{ settings: <span><FormattedMessage id='web_app_crash.settings' defaultMessage='settings' /></span> }}
|
||||||
/>
|
/>
|
||||||
</li>
|
</li>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -39,7 +39,6 @@ class ActionBar extends React.PureComponent {
|
||||||
let menu = [];
|
let menu = [];
|
||||||
|
|
||||||
menu.push({ text: intl.formatMessage(messages.edit_profile), href: profileLink });
|
menu.push({ text: intl.formatMessage(messages.edit_profile), href: profileLink });
|
||||||
menu.push({ text: intl.formatMessage(messages.preferences), href: preferencesLink });
|
|
||||||
menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
|
menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
|
||||||
menu.push(null);
|
menu.push(null);
|
||||||
menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
|
menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
|
||||||
|
|
|
@ -71,15 +71,8 @@ class LocalSettingsNavigation extends React.PureComponent {
|
||||||
/>
|
/>
|
||||||
<LocalSettingsNavigationItem
|
<LocalSettingsNavigationItem
|
||||||
active={index === 5}
|
active={index === 5}
|
||||||
href={preferencesLink}
|
|
||||||
index={5}
|
|
||||||
icon='cog'
|
|
||||||
title={intl.formatMessage(messages.preferences)}
|
|
||||||
/>
|
|
||||||
<LocalSettingsNavigationItem
|
|
||||||
active={index === 6}
|
|
||||||
className='close'
|
className='close'
|
||||||
index={6}
|
index={5}
|
||||||
onNavigate={onClose}
|
onNavigate={onClose}
|
||||||
icon='times'
|
icon='times'
|
||||||
title={intl.formatMessage(messages.close)}
|
title={intl.formatMessage(messages.close)}
|
||||||
|
|
|
@ -299,12 +299,12 @@ class LocalSettingsPage extends React.PureComponent {
|
||||||
defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}"
|
defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}"
|
||||||
values={{
|
values={{
|
||||||
settings_page_link: (
|
settings_page_link: (
|
||||||
<a href={preferenceLink('user_setting_expand_spoilers')}>
|
<span>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='settings.shared_settings_link'
|
id='settings.shared_settings_link'
|
||||||
defaultMessage='user preferences'
|
defaultMessage='user preferences'
|
||||||
/>
|
/>
|
||||||
</a>
|
</span>
|
||||||
),
|
),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -65,7 +65,7 @@ class DeprecatedSettingsModal extends React.PureComponent {
|
||||||
<ul>
|
<ul>
|
||||||
{ settings.map((setting_name) => (
|
{ settings.map((setting_name) => (
|
||||||
<li>
|
<li>
|
||||||
<a href={preferenceLink(setting_name)}><FormattedMessage {...messages[setting_name]} /></a>
|
<span><FormattedMessage {...messages[setting_name]} /></span>
|
||||||
</li>
|
</li>
|
||||||
)) }
|
)) }
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -85,7 +85,6 @@ class NavigationPanel extends React.Component {
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
{!!preferencesLink && <ColumnLink transparent href={preferencesLink} icon='cog' text={intl.formatMessage(messages.preferences)} />}
|
|
||||||
<ColumnLink transparent onClick={onOpenSettings} icon='cogs' text={intl.formatMessage(messages.app_settings)} />
|
<ColumnLink transparent onClick={onOpenSettings} icon='cogs' text={intl.formatMessage(messages.app_settings)} />
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
export const preferencesLink = '/settings/preferences';
|
export const preferencesLink = undefined;
|
||||||
export const profileLink = '/settings/profile';
|
export const profileLink = '/settings/profile';
|
||||||
export const signOutLink = '/logout.html';
|
export const signOutLink = '/logout.html';
|
||||||
export const privacyPolicyLink = '/privacy-policy';
|
export const privacyPolicyLink = '/privacy-policy';
|
||||||
|
|
Loading…
Reference in a new issue