From ff78c1177a180f1b9aec8464734ac3aa1c888874 Mon Sep 17 00:00:00 2001
From: Joshua Wood <josh@joshuawood.net>
Date: Mon, 27 Nov 2017 12:31:58 -0800
Subject: Add Keyboard Shortcuts Legend (#5823)
* Add Keyboard Shortcuts Legend
Adds a "Keyboard Shortcuts" legend (displayed in the rightmost column)
which is toggled via a new "?" hotkey. When subsequently pressed from
the Keyboard Shortcuts legend, "?" will navigate back to the previous
location.
* Add hidden table headings.
Makes the headings available for accessibility but hides them visually.
---
.../mastodon/features/keyboard_shortcuts/index.js | 68 ++++++++++++++++++++++
app/javascript/mastodon/features/ui/index.js | 12 ++++
.../mastodon/features/ui/util/async-components.js | 4 ++
app/javascript/styles/mastodon/components.scss | 21 +++++++
4 files changed, 105 insertions(+)
create mode 100644 app/javascript/mastodon/features/keyboard_shortcuts/index.js
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
new file mode 100644
index 000000000..00771b79c
--- /dev/null
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import Column from '../ui/components/column';
+import { defineMessages, injectIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+
+const messages = defineMessages({
+ heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
+ hotkey: { id: 'keyboard_shortcuts.hotkey', defaultMessage: 'Hotkey' },
+ description: { id: 'keyboard_shortcuts.description', defaultMessage: 'Description' },
+ reply: { id: 'keyboard_shortcuts.reply', defaultMessage: 'to reply' },
+ mention: { id: 'keyboard_shortcuts.mention', defaultMessage: 'to mention author' },
+ favourite: { id: 'keyboard_shortcuts.favourite', defaultMessage: 'to favourite' },
+ boost: { id: 'keyboard_shortcuts.boost', defaultMessage: 'to boost' },
+ enter: { id: 'keyboard_shortcuts.enter', defaultMessage: 'to open status' },
+ profile: { id: 'keyboard_shortcuts.profile', defaultMessage: 'to open author\'s profile' },
+ up: { id: 'keyboard_shortcuts.up', defaultMessage: 'to move up in the list' },
+ down: { id: 'keyboard_shortcuts.down', defaultMessage: 'to move down in the list' },
+ column: { id: 'keyboard_shortcuts.column', defaultMessage: 'to focus a status in one of the columns' },
+ compose: { id: 'keyboard_shortcuts.compose', defaultMessage: 'to focus the compose textarea' },
+ toot: { id: 'keyboard_shortcuts.toot', defaultMessage: 'to start a brand new toot' },
+ back: { id: 'keyboard_shortcuts.back', defaultMessage: 'to navigate back' },
+ search: { id: 'keyboard_shortcuts.search', defaultMessage: 'to focus search' },
+ unfocus: { id: 'keyboard_shortcuts.unfocus', defaultMessage: 'to un-focus compose textarea/search' },
+ legend: { id: 'keyboard_shortcuts.legend', defaultMessage: 'to display this legend' },
+});
+
+@injectIntl
+export default class KeyboardShortcuts extends ImmutablePureComponent {
+
+ static propTypes = {
+ intl: PropTypes.object.isRequired,
+ multiColumn: PropTypes.bool,
+ };
+
+ render () {
+ const { intl } = this.props;
+
+ return (
+ <Column icon='question' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile>
+ <div className='keyboard-shortcuts scrollable optionally-scrollable'>
+ <table>
+ <thead>
+ <tr><th>{intl.formatMessage(messages.hotkey)}</th><th>{intl.formatMessage(messages.description)}</th></tr>
+ </thead>
+ <tbody>
+ <tr><td><code>r</code></td><td>{intl.formatMessage(messages.reply)}</td></tr>
+ <tr><td><code>m</code></td><td>{intl.formatMessage(messages.mention)}</td></tr>
+ <tr><td><code>f</code></td><td>{intl.formatMessage(messages.favourite)}</td></tr>
+ <tr><td><code>b</code></td><td>{intl.formatMessage(messages.boost)}</td></tr>
+ <tr><td><code>enter</code></td><td>{intl.formatMessage(messages.enter)}</td></tr>
+ <tr><td><code>up</code></td><td>{intl.formatMessage(messages.up)}</td></tr>
+ <tr><td><code>down</code></td><td>{intl.formatMessage(messages.down)}</td></tr>
+ <tr><td><code>1</code>-<code>9</code></td><td>{intl.formatMessage(messages.column)}</td></tr>
+ <tr><td><code>n</code></td><td>{intl.formatMessage(messages.compose)}</td></tr>
+ <tr><td><code>alt</code>+<code>n</code></td><td>{intl.formatMessage(messages.toot)}</td></tr>
+ <tr><td><code>backspace</code></td><td>{intl.formatMessage(messages.back)}</td></tr>
+ <tr><td><code>s</code></td><td>{intl.formatMessage(messages.search)}</td></tr>
+ <tr><td><code>esc</code></td><td>{intl.formatMessage(messages.unfocus)}</td></tr>
+ <tr><td><code>?</code></td><td>{intl.formatMessage(messages.legend)}</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </Column>
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 57289f519..361326961 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -19,6 +19,7 @@ import {
Compose,
Status,
GettingStarted,
+ KeyboardShortcuts,
PublicTimeline,
CommunityTimeline,
AccountTimeline,
@@ -56,6 +57,7 @@ const mapStateToProps = state => ({
});
const keyMap = {
+ help: '?',
new: 'n',
search: 's',
forceNew: 'option+n',
@@ -298,6 +300,14 @@ export default class UI extends React.Component {
this.hotkeys = c;
}
+ handleHotkeyToggleHelp = () => {
+ if (this.props.location.pathname === '/keyboard-shortcuts') {
+ this.context.router.history.goBack();
+ } else {
+ this.context.router.history.push('/keyboard-shortcuts');
+ }
+ }
+
handleHotkeyGoToHome = () => {
this.context.router.history.push('/timelines/home');
}
@@ -343,6 +353,7 @@ export default class UI extends React.Component {
const { children } = this.props;
const handlers = {
+ help: this.handleHotkeyToggleHelp,
new: this.handleHotkeyNew,
search: this.handleHotkeySearch,
forceNew: this.handleHotkeyForceNew,
@@ -369,6 +380,7 @@ export default class UI extends React.Component {
<WrappedSwitch>
<Redirect from='/' to='/getting-started' exact />
<WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
+ <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
<WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
<WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
<WrappedRoute path='/timelines/public/local' component={CommunityTimeline} content={children} />
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index ec1630ed6..b741f668e 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -38,6 +38,10 @@ export function GettingStarted () {
return import(/* webpackChunkName: "features/getting_started" */'../../getting_started');
}
+export function KeyboardShortcuts () {
+ return import(/* webpackChunkName: "features/keyboard_shortcuts" */'../../keyboard_shortcuts');
+}
+
export function PinnedStatuses () {
return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses');
}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f4ad66271..80060a00f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2099,6 +2099,27 @@
}
}
+.keyboard-shortcuts {
+ padding: 8px 0 0;
+ overflow: hidden;
+
+ thead {
+ position: absolute;
+ left: -9999px;
+ }
+
+ td {
+ padding: 0 10px 8px;
+ }
+
+ code {
+ display: inline-block;
+ padding: 3px 5px;
+ background-color: lighten($ui-base-color, 8%);
+ border: 1px solid darken($ui-base-color, 4%);
+ }
+}
+
.setting-text {
color: $ui-primary-color;
background: transparent;
--
cgit
From 706e534455e2137c324c0ebb30435e7630ab7c1f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 27 Nov 2017 22:47:06 +0100
Subject: Add UI for setting up account migration (#5832)
---
app/controllers/settings/migrations_controller.rb | 32 +++++++++++++++++++++++
app/models/form/migration.rb | 27 +++++++++++++++++++
app/views/settings/migrations/show.html.haml | 17 ++++++++++++
app/views/settings/profiles/show.html.haml | 5 ++++
config/locales/en.yml | 7 +++++
config/navigation.rb | 2 +-
config/routes.rb | 1 +
7 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 app/controllers/settings/migrations_controller.rb
create mode 100644 app/models/form/migration.rb
create mode 100644 app/views/settings/migrations/show.html.haml
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
new file mode 100644
index 000000000..711ba338f
--- /dev/null
+++ b/app/controllers/settings/migrations_controller.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class Settings::MigrationsController < ApplicationController
+ layout 'admin'
+
+ before_action :authenticate_user!
+
+ def show
+ @migration = Form::Migration.new(account: current_account.moved_to_account)
+ end
+
+ def update
+ @migration = Form::Migration.new(resource_params)
+
+ if @migration.valid?
+ if current_account.moved_to_account_id != @migration.account&.id
+ current_account.update!(moved_to_account: @migration.account)
+ ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+ end
+
+ redirect_to settings_migration_path
+ else
+ render :show
+ end
+ end
+
+ private
+
+ def resource_params
+ params.require(:migration).permit(:acct)
+ end
+end
diff --git a/app/models/form/migration.rb b/app/models/form/migration.rb
new file mode 100644
index 000000000..53cee7ee1
--- /dev/null
+++ b/app/models/form/migration.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Form::Migration
+ include ActiveModel::Validations
+
+ attr_accessor :acct, :account
+
+ validates :acct, presence: true
+
+ def initialize(attrs = {})
+ @account = attrs[:account]
+ @acct = attrs[:account].acct unless @account.nil?
+ @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
+ end
+
+ def valid?
+ return false unless super
+ set_account
+ errors.empty?
+ end
+
+ private
+
+ def set_account
+ self.account = ResolveRemoteAccountService.new.call(acct) if account.nil? && acct.present?
+ end
+end
diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml
new file mode 100644
index 000000000..b7c34761f
--- /dev/null
+++ b/app/views/settings/migrations/show.html.haml
@@ -0,0 +1,17 @@
+- content_for :page_title do
+ = t('settings.migrate')
+
+= simple_form_for @migration, as: :migration, url: settings_migration_path, html: { method: :put } do |f|
+ - if @migration.account
+ %p.hint= t('migrations.currently_redirecting')
+
+ .fields-group
+ = render partial: 'authorize_follows/card', locals: { account: @migration.account }
+
+ = render 'shared/error_messages', object: @migration
+
+ .fields-group
+ = f.input :acct, placeholder: t('migrations.acct')
+
+ .actions
+ = f.button :button, t('migrations.proceed'), type: :submit, class: 'negative'
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 7a06cd014..0fc9db2b9 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -21,3 +21,8 @@
.actions
= f.button :button, t('generic.save_changes'), type: :submit
+
+%hr/
+
+%h6= t('auth.migrate_account')
+%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 36b6981cb..2b7e9f2e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -347,6 +347,8 @@ en:
invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
login: Log in
logout: Logout
+ migrate_account: Move to a different account
+ migrate_account_html: If you wish to redirect this account to a different one, you can <a href="%{path}">configure it here</a>.
register: Sign up
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
@@ -454,6 +456,10 @@ en:
validations:
images_and_video: Cannot attach a video to a status that already contains images
too_many: Cannot attach more than 4 files
+ migrations:
+ acct: username@domain of the new account
+ currently_redirecting: 'Your profile is set to redirect to:'
+ proceed: Save
moderation:
title: Moderation
notification_mailer:
@@ -568,6 +574,7 @@ en:
export: Data export
followers: Authorized followers
import: Import
+ migrate: Account migration
notifications: Notifications
preferences: Preferences
settings: Settings
diff --git a/config/navigation.rb b/config/navigation.rb
index fdfd72b4c..9c7a7d2ec 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -5,7 +5,7 @@ SimpleNavigation::Configuration.run do |navigation|
primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
- settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url
+ settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
diff --git a/config/routes.rb b/config/routes.rb
index 59c3d4fdb..6313a355d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -96,6 +96,7 @@ Rails.application.routes.draw do
end
resource :delete, only: [:show, :destroy]
+ resource :migration, only: [:show, :update]
resources :sessions, only: [:destroy]
end
--
cgit