Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2722 from cpradio/dismiss-keyboard-bindings 

UX: Add key-bindings for Dismiss New, Dismiss Posts, and Dismiss Topics
This commit is contained in:
Jeff Atwood 2014-08-29 16:28:25 -07:00
parent 68a3fd5ef0 bc07bc4819
commit d74f94afa1
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
View File

@ -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}}

6
app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars
View File

@ -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}}

7
app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
View File

@ -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>
@ -27,7 +27,10 @@
<li>{{{i18n keyboard_shortcuts_help.application.site_map_menu}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</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">

3
config/locales/client.en.yml
View File

@ -2056,8 +2056,11 @@ en:
notifications: '<b>n</b> Open notifications'
site_map_menu: '<b>=</b> Open site map menu'
user_profile_menu: '<b>p</b> Open user profile menu'
show_incoming_updated: '<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'

2
test/javascripts/components/keyboard-shortcuts-test.js.es6
View File

@ -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>",
"<button id='create-topic'></button>",
"<div id='user-notifications'></div>",