Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
QOTO
qoto
Commits
4dce57dd
Commit
4dce57dd
authored
Aug 20, 2019
by
Takeshi Umeda
Browse files
Add information links
parent
e56ab22f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
1 deletion
+25
-1
app/javascript/mastodon/features/getting_started/index.js
app/javascript/mastodon/features/getting_started/index.js
+17
-1
app/javascript/mastodon/features/ui/components/navigation_panel.js
...cript/mastodon/features/ui/components/navigation_panel.js
+2
-0
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/en.json
+3
-0
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/ja.json
+3
-0
No files found.
app/javascript/mastodon/features/getting_started/index.js
View file @
4dce57dd
...
...
@@ -37,6 +37,8 @@ const messages = defineMessages({
menu
:
{
id
:
'
getting_started.heading
'
,
defaultMessage
:
'
Getting started
'
},
group_directory
:
{
id
:
'
getting_started.group_directory
'
,
defaultMessage
:
'
Group directory
'
},
profile_directory
:
{
id
:
'
getting_started.directory
'
,
defaultMessage
:
'
Profile directory
'
},
information_acct
:
{
id
:
'
navigation_bar.information_acct
'
,
defaultMessage
:
'
Fedibird info
'
},
hashtag_fedibird
:
{
id
:
'
navigation_bar.hashtag_fedibird
'
,
defaultMessage
:
'
fedibird
'
},
});
const
mapStateToProps
=
state
=>
({
...
...
@@ -119,7 +121,14 @@ class GettingStarted extends ImmutablePureComponent {
}
navItems
.
push
(
<
ColumnSubheading
key
=
'
header-personal
'
text
=
{
intl
.
formatMessage
(
messages
.
personal
)}
/>
,
<
ColumnLink
key
=
'
information_acct
'
icon
=
'
info-circle
'
text
=
{
intl
.
formatMessage
(
messages
.
information_acct
)}
to
=
'
/accounts/2
'
/>
,
<
ColumnLink
key
=
'
hashtag_fedibird
'
icon
=
'
hashtag
'
text
=
{
intl
.
formatMessage
(
messages
.
hashtag_fedibird
)}
to
=
'
/timelines/tag/fedibird
'
/>
,
);
height
+=
34
+
48
*
2
;
navItems
.
push
(
<
ColumnSubheading
key
=
'
header-personal
'
text
=
{
intl
.
formatMessage
(
messages
.
personal
)}
/
>
);
height
+=
34
;
...
...
@@ -137,6 +146,13 @@ class GettingStarted extends ImmutablePureComponent {
height
+=
48
;
}
navItems
.
push
(
<
ColumnLink
key
=
'
information_acct
'
icon
=
'
info-circle
'
text
=
{
intl
.
formatMessage
(
messages
.
information_acct
)}
to
=
'
/accounts/2
'
/>
,
<
ColumnLink
key
=
'
hashtag_fedibird
'
icon
=
'
hashtag
'
text
=
{
intl
.
formatMessage
(
messages
.
hashtag_fedibird
)}
to
=
'
/timelines/tag/fedibird
'
/>
,
);
height
+=
48
*
2
;
}
if
(
multiColumn
&&
!
columns
.
find
(
item
=>
item
.
get
(
'
id
'
)
===
'
HOME
'
))
{
...
...
app/javascript/mastodon/features/ui/components/navigation_panel.js
View file @
4dce57dd
...
...
@@ -16,6 +16,8 @@ const NavigationPanel = () => (
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/notifications
'
data
-
preview
-
title
-
id
=
'
column.notifications
'
data
-
preview
-
icon
=
'
bell
'
><
NotificationsCounterIcon
className
=
'
column-link__icon
'
/><
FormattedMessage
id
=
'
tabs_bar.notifications
'
defaultMessage
=
'
Notifications
'
/><
/NavLink
>
<
FollowRequestsNavLink
/>
<
NavLink
className
=
'
column-link column-link--transparent
'
exact
to
=
'
/timelines/public
'
data
-
preview
-
title
-
id
=
'
column.public
'
data
-
preview
-
icon
=
'
globe
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
globe
'
fixedWidth
/><
FormattedMessage
id
=
'
tabs_bar.federated_timeline
'
defaultMessage
=
'
Federated
'
/><
/NavLink
>
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/accounts/2
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
info-circle
'
fixedWidth
/><
FormattedMessage
id
=
'
navigation_bar.information_acct
'
defaultMessage
=
'
Fedibird info
'
/><
/NavLink
>
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/timelines/tag/fedibird
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
hashtag
'
fixedWidth
/><
FormattedMessage
id
=
'
navigation_bar.hashtag_fedibird
'
defaultMessage
=
'
Fedibird topics
'
/><
/NavLink
>
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/timelines/direct
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
envelope
'
fixedWidth
/><
FormattedMessage
id
=
'
navigation_bar.direct
'
defaultMessage
=
'
Direct messages
'
/><
/NavLink
>
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/favourites
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
star
'
fixedWidth
/><
FormattedMessage
id
=
'
navigation_bar.favourites
'
defaultMessage
=
'
Favourites
'
/><
/NavLink
>
<
NavLink
className
=
'
column-link column-link--transparent
'
to
=
'
/bookmarks
'
><
Icon
className
=
'
column-link__icon
'
id
=
'
bookmark
'
fixedWidth
/><
FormattedMessage
id
=
'
navigation_bar.bookmarks
'
defaultMessage
=
'
Bookmarks
'
/><
/NavLink
>
...
...
app/javascript/mastodon/locales/en.json
View file @
4dce57dd
...
...
@@ -333,7 +333,10 @@
"navigation_bar.filters"
:
"Muted words"
,
"navigation_bar.follow_requests"
:
"Follow requests"
,
"navigation_bar.follows_and_followers"
:
"Follows and followers"
,
"navigation_bar.hashtag_fedibird"
:
"Fedibird topics"
,
"navigation_bar.info"
:
"About this server"
,
"navigation_bar.information"
:
"Information"
,
"navigation_bar.information_acct"
:
"Fedibird info"
,
"navigation_bar.keyboard_shortcuts"
:
"Hotkeys"
,
"navigation_bar.lists"
:
"Lists"
,
"navigation_bar.logout"
:
"Logout"
,
...
...
app/javascript/mastodon/locales/ja.json
View file @
4dce57dd
...
...
@@ -325,7 +325,10 @@
"navigation_bar.filters"
:
"フィルター設定"
,
"navigation_bar.follow_requests"
:
"フォローリクエスト"
,
"navigation_bar.follows_and_followers"
:
"フォロー・フォロワー"
,
"navigation_bar.hashtag_fedibird"
:
"Fedibirdに関する話題"
,
"navigation_bar.info"
:
"このサーバーについて"
,
"navigation_bar.information"
:
"お知らせと情報"
,
"navigation_bar.information_acct"
:
"Fedibirdインフォメーション"
,
"navigation_bar.keyboard_shortcuts"
:
"ホットキー"
,
"navigation_bar.lists"
:
"リスト"
,
"navigation_bar.logout"
:
"ログアウト"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment