nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make notifications/read_all non-ajax, link back to index page

Browse source
This commit is contained in:
Raphael 2011-01-31 12:12:06 -08:00
parent a2bb8515f9
commit 906de27922
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/notifications_controller.rb
View file

@ -26,6 +26,6 @@ class NotificationsController < ApplicationController
def read_all def read_all
Notification.where(:recipient_id => current_user.id).update_all(:unread => false) Notification.where(:recipient_id => current_user.id).update_all(:unread => false)
redirect_to :back redirect_to aspects_path
end end
end end

12
app/views/notifications/index.html.haml
View file

@ -1,14 +1,4 @@
:javascript :javascript
$('.mark_all_read').live('click', function(){
$.ajax({
url: 'notifications/read_all',
success: function(data, status, xhr) {
$('.stream_element').removeClass('unread');
$("#notification_badge_number").addClass("hidden");
}
});
});
$('.stream_element').live('mousedown', function(evt){ $('.stream_element').live('mousedown', function(evt){
var note = $(this).closest('.stream_element'), var note = $(this).closest('.stream_element'),
note_id = note.attr('data-guid'), note_id = note.attr('data-guid'),
@ -37,7 +27,7 @@
%h2 %h2
= t('.notifications') = t('.notifications')
.span-13.last.left .span-13.last.left
= link_to t('.mark_all_as_read'), "#", :class => "button mark_all_read" = link_to t('.mark_all_as_read'), notifications_read_all_path, :class => 'button'
.span-24.last .span-24.last
%ul.stream.notifications %ul.stream.notifications