mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 09:26:54 -06:00
Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics
Conflicts: config/locales/client.en.yml
This commit is contained in:
cpradio
commit
2e200ffbf0
@ -22,7 +22,8 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
|
||||
'e': 'editPost',
|
||||
'l': 'toggleLike',
|
||||
'r': 'replyToPost',
|
||||
'!': 'showFlags'
|
||||
'!': 'showFlags',
|
||||
't': 'replyAsNewTopic'
|
||||
},
|
||||
|
||||
CLICK_BINDINGS: {
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
{{#if showDismissAtTop}}
|
||||
<div class="row">
|
||||
{{#if showDismissRead}}
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics-top' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts-top' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
{{/if}}
|
||||
{{#if showResetNew}}
|
||||
<button class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
<button id='dismiss-new-top' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
@ -87,11 +87,11 @@
|
||||
{{/if}}
|
||||
{{#if allLoaded}}
|
||||
{{#if showDismissRead}}
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
{{/if}}
|
||||
{{#if showResetNew}}
|
||||
<button class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
<button id='dismiss-new' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
{{/if}}
|
||||
|
||||
{{#if latest}}
|
||||
|
||||
@ -29,11 +29,11 @@
|
||||
{{/if}}
|
||||
{{#if allLoaded}}
|
||||
{{#if showDismissRead}}
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
|
||||
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
|
||||
{{/if}}
|
||||
{{#if showResetNew}}
|
||||
<button class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
<button id='dismiss-new' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button>
|
||||
{{/if}}
|
||||
|
||||
{{#if latest}}
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
<li>{{{i18n keyboard_shortcuts_help.jump_to.starred}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.jump_to.categories}}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span6">
|
||||
<h4>{{i18n keyboard_shortcuts_help.navigation.title}}</h4>
|
||||
<ul>
|
||||
<li>{{{i18n keyboard_shortcuts_help.navigation.back}}}</li>
|
||||
@ -20,6 +18,8 @@
|
||||
<li>{{{i18n keyboard_shortcuts_help.navigation.open}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.navigation.next_prev}}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span6">
|
||||
<h4>{{i18n keyboard_shortcuts_help.application.title}}</h4>
|
||||
<ul>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.create}}}</li>
|
||||
@ -28,7 +28,10 @@
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated_topics}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.search}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.help}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.dismiss_new_posts}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.application.dismiss_topics}}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span6">
|
||||
@ -37,6 +40,7 @@
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.star}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.share_topic}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.share_post}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.reply_as_new_topic}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.reply_topic}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.reply_post}}}</li>
|
||||
<li>{{{i18n keyboard_shortcuts_help.actions.quote_post}}}</li>
|
||||
|
||||
@ -47,7 +47,7 @@ Discourse::Application.configure do
|
||||
require 'rbtrace'
|
||||
|
||||
if emails = GlobalSetting.developer_emails
|
||||
config.developer_emails = emails.split(",").map(&:strip!)
|
||||
config.developer_emails = emails.split(",").map(&:strip)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ Discourse::Application.configure do
|
||||
# developers have god like rights and may impersonate anyone in the system
|
||||
# normal admins may only impersonate other moderators (not admins)
|
||||
if emails = GlobalSetting.developer_emails
|
||||
config.developer_emails = emails.split(",").map(&:strip!)
|
||||
config.developer_emails = emails.split(",").map(&:strip)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -1833,7 +1833,7 @@ en:
|
||||
newuser: 'Users at Trust Level 0 (New User)'
|
||||
basic: 'Users at Trust Level 1 (Basic User)'
|
||||
regular: 'Users at Trust Level 2 (Regular User)'
|
||||
leader: 'Users at Trust Level 3 (Leader)'
|
||||
leader: 'Users at Trust Level 3 (Veteran)'
|
||||
elder: 'Users at Trust Level 4 (Elder)'
|
||||
admins: 'Admin Users'
|
||||
moderators: 'Moderators'
|
||||
@ -2059,11 +2059,14 @@ en:
|
||||
show_incoming_updated_topics: '<b>.</b> Show incoming/updated topics'
|
||||
search: '<b>/</b> Search'
|
||||
help: '<b>?</b> Open keyboard shortcuts help'
|
||||
dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
|
||||
dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
|
||||
actions:
|
||||
title: 'Actions'
|
||||
star: '<b>f</b> Star topic'
|
||||
share_topic: '<b>shift s</b> Share topic'
|
||||
share_post: '<b>s</b> Share post'
|
||||
reply_as_new_topic: '<b>t</b> Reply as new topic'
|
||||
reply_topic: '<b>shift r</b> Reply to topic'
|
||||
reply_post: '<b>r</b> Reply to post'
|
||||
quote_post: '<b>q</b> Quote post'
|
||||
|
||||
@ -1267,7 +1267,7 @@ en:
|
||||
|
||||
usage_tips:
|
||||
text_body_template: |
|
||||
This private message has a few quick tips to get you started:
|
||||
This private message has a few quick tips to get you started.
|
||||
|
||||
## Keep scrolling
|
||||
|
||||
@ -1279,11 +1279,13 @@ en:
|
||||
|
||||
- For search, your user page, or the menu, use the **icon buttons at the upper right**.
|
||||
|
||||
- While reading a topic, move back to the top ↑ by clicking the topic title. Click the green progress bar at the bottom right to see full navigation controls, or use the <kbd>home</kbd> and <kbd>end</kbd> keys.
|
||||
- In a list of topics, the title will always take you to your next unread post. Use the last activity time to jump to the last post.
|
||||
|
||||
- While reading a topic, jump to the top ↑ by selecting the topic title. Select the green progress bar at the bottom right for full navigation controls, or use the <kbd>home</kbd> and <kbd>end</kbd> keys.
|
||||
|
||||
<img src="http://www.discourse.org/images/welcome/progress-bar.png" width="190" height="52">
|
||||
|
||||
- The topic title will always take you to your next unread post. Use the last activity time to quickly jump to the first or last post in a topic.
|
||||
|
||||
|
||||
## How do I reply?
|
||||
|
||||
@ -1299,19 +1301,22 @@ en:
|
||||
|
||||
(To quote an entire post, use the Import Quote button on the editor toolbar.)
|
||||
|
||||
To mention someone's name in your reply, start typing `@` and an autocompleter will pop up.
|
||||
To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up.
|
||||
|
||||
<img src="http://www.discourse.org/images/welcome/username-completion.png" width="307" height="174">
|
||||
|
||||
For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
|
||||
|
||||
## What else can I do?
|
||||
|
||||
<img src="http://www.discourse.org/images/welcome/like-link-flag-bookmark.png" width="225" height="61">
|
||||
|
||||
To let someone know that you enjoyed their post, use the **like** button at the bottom of the post. If you see a problem with a post, don't hesitate to use the **flag** button and privately let them, or our staff, know about it.
|
||||
There are action buttons at the bottom of each post.
|
||||
|
||||
You can also share a link to a post, or bookmark a post for later reference on your user page.
|
||||
To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button.
|
||||
|
||||
You can also **share** a link to a post, or **bookmark** it for later reference on your user page.
|
||||
|
||||
For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
|
||||
|
||||
## Who is talking to me?
|
||||
|
||||
@ -1323,7 +1328,7 @@ en:
|
||||
|
||||
## When are conversations new?
|
||||
|
||||
By default all conversations less than two days old are considered new, and any conversation you've participated in will automatically be tracked.
|
||||
By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked.
|
||||
|
||||
You will see the blue new and number indicators next to these topics:
|
||||
|
||||
|
||||
@ -67,7 +67,7 @@ Fabricator(:active_user, from: :user) do
|
||||
end
|
||||
|
||||
Fabricator(:leader, from: :user) do
|
||||
name 'Leader McLeaderman'
|
||||
name 'Veteran McVeteranish'
|
||||
username { sequence(:username) { |i| "leader#{i}" } }
|
||||
email { sequence(:email) { |i| "leader#{i}@leaderfun.com" } }
|
||||
trust_level TrustLevel.levels[:leader]
|
||||
|
||||
@ -46,6 +46,8 @@ module("Discourse.KeyboardShortcuts", {
|
||||
" <button class='star'></button>",
|
||||
" <button class='create'></button>",
|
||||
" <button class='share'></button>",
|
||||
" <button id='dismiss-new-top'></button>",
|
||||
" <button id='dismiss-topics-top'></button>",
|
||||
"</div>",
|
||||
"<div class='alert alert-info clickable'></div>",
|
||||
"<button id='create-topic'></button>",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user