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

Corrected an issue with using the same ID for the header/footer of the buttons

This commit is contained in:
cpradio 2014-08-29 08:33:45 -04:00
parent e4ce995369
commit 9e72b97a75
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
View File

@ -35,8 +35,8 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular 'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular
'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking 'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking
'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching 'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching
'd r': '#dismiss-new, #dismiss-posts', // dismiss new/posts 'd r': '#dismiss-new,#dismiss-new-top,#dismiss-posts,#dismiss-posts-top', // dismiss new/posts
'd t': '#dismiss-topics', // dismiss topics 'd t': '#dismiss-topics,#dismiss-topics-top', // dismiss topics
'n': '#user-notifications', // open notifications menu 'n': '#user-notifications', // open notifications menu
'o,enter': '.topic-list tr.selected a.title', // open selected topic 'o,enter': '.topic-list tr.selected a.title', // open selected topic
'shift+r': '#topic-footer-buttons button.create', // reply to topic 'shift+r': '#topic-footer-buttons button.create', // reply to topic

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

@ -1,11 +1,11 @@
{{#if showDismissAtTop}} {{#if showDismissAtTop}}
<div class="row"> <div class="row">
{{#if showDismissRead}} {{#if showDismissRead}}
<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_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' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</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}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new' 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}} {{/if}}
</div> </div>
{{/if}} {{/if}}