tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

⚡ add link to moderation hashtags

Browse Source
This commit is contained in:
Baptiste Lemoine 2019-12-15 22:42:42 +01:00
parent 6fb8899c56
commit acdac0c88a
2 changed files with 85 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
app/javascript/mastodon/features/ui/components/link_footer.js
View File

@ -1,9 +1,9 @@
import { connect } from 'react-redux';
import React from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import { invitesEnabled, version, repository, source_url } from 'mastodon/initial_state';
import { invitesEnabled, repository, source_url, version } from 'mastodon/initial_state';
import { logOut } from 'mastodon/utils/log_out';
import { openModal } from 'mastodon/actions/modal';
@ -13,10 +13,10 @@ const messages = defineMessages({
});
const mapDispatchToProps = (dispatch, { intl }) => ({
onLogout () {
onLogout() {
dispatch(openModal('CONFIRM', {
message: intl.formatMessage(messages.logoutMessage),
confirm: intl.formatMessage(messages.logoutConfirm),
message : intl.formatMessage(messages.logoutMessage),
confirm : intl.formatMessage(messages.logoutConfirm),
onConfirm: () => logOut(),
}));
},
@ -28,8 +28,8 @@ class LinkFooter extends React.PureComponent {
static propTypes = {
withHotkeys: PropTypes.bool,
onLogout: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
onLogout : PropTypes.func.isRequired,
intl : PropTypes.object.isRequired,
};
handleLogoutClick = e => {
@ -39,30 +39,79 @@ class LinkFooter extends React.PureComponent {
this.props.onLogout();
return false;
}
};
render () {
render() {
const { withHotkeys } = this.props;
return (
<div className='getting-started__footer'>
<ul>
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
{withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
<li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
<li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
<li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
<li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
<li>
<a href="https://liberapay.com/cipherbliss">Supportez Cipherbliss</a>
</li>
<li>
<a href="/@tykayn">
<i className="fa fa-envelope"></i>
contactez Cipherbliss</a>
</li>
<li>
<a href='/admin/tags?pending_review=1'>
<i className="fa fa-fire"></i>
Trending hashtags</a>
<hr/>
</li>
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage
id='getting_started.invite'
defaultMessage='Invite people'
/></a> ·
</li>}
{withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage
id='navigation_bar.keyboard_shortcuts'
defaultMessage='Hotkeys'
/></Link> ·
</li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security'/></a> ·
</li>
<li><a href='/about/more' target='_blank'><FormattedMessage
id='navigation_bar.info'
defaultMessage='About this server'
/></a> ·
</li>
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage
id='navigation_bar.apps'
defaultMessage='Mobile apps'
/></a> ·
</li>
<li><a href='/terms' target='_blank'><FormattedMessage
id='getting_started.terms'
defaultMessage='Terms of service'
/></a> ·
</li>
<li><a href='/settings/applications' target='_blank'><FormattedMessage
id='getting_started.developers'
defaultMessage='Developers'
/></a> ·
</li>
<li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage
id='getting_started.documentation' defaultMessage='Documentation'
/></a> ·
</li>
<li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage
id='navigation_bar.logout'
defaultMessage='Logout'
/></a>
</li>
</ul>
<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
values={{
github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span>,
}}
/>
</p>
</div>

17
app/javascript/styles/bliss/footer.scss
View File

@ -135,3 +135,20 @@
}
}
}
.getting-started__footer {
text-align: justify;
ul {
list-style-type: none;
}
li {
margin: 0.15rem 0;
display: inline-block
}
i {
margin: 0.5ch;
}
}