consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend notifications to be marked as read and unread

Browse Source
This commit is contained in:
rgarcia
2018-02-27 14:47:52 +01:00
parent c4ad9b940c
commit 09c44ee583
22 changed files with 445 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/devise/menu/_login_items.html.erb
View File

@@ -1,22 +1,11 @@
<% if user_signed_in? %>
<li id="notifications">
<%= link_to notifications_path, rel: "nofollow", class: "notifications" do %>
<span class="show-for-sr"><%= t("layouts.header.notifications") %></span>
<% if current_user.notifications_count > 0 %>
<span class="icon-circle" aria-hidden="true"></span>
<span class="icon-notification" aria-hidden="true" title="<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>">
</span>
<small class="show-for-small-only">
<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>
</small>
<% else %>
<span class="icon-no-notification" aria-hidden="true" title="<%= t('layouts.header.no_notifications') %>"></span>
<small class="show-for-small-only">
<%= t('layouts.header.no_notifications') %>
</small>
<% end %>
<% end %>
</li>
<% if current_budget %>
<li>
<%= link_to(t("layouts.header.delegation"),
new_budget_recommendation_path(budget_id: current_budget.slug),
accesskey: "d") %>
</li>
<% end %>
<li>
<%= layout_menu_link_to t("layouts.header.my_activity_link"),
user_path(current_user),

1
app/views/layouts/_header.html.erb
View File

@@ -30,6 +30,7 @@
<div class="top-bar-right">
<ul class="menu" data-responsive-menu="medium-dropdown">
<%= render "shared/admin_login_items" %>
<%= render "layouts/notification_item" %>
<%= render "devise/menu/login_items" %>
</ul>

30
app/views/layouts/_notification_item.html.erb Normal file
View File

@@ -0,0 +1,30 @@
<% if user_signed_in? %>
<li id="notifications">
<%= link_to notifications_path, rel: "nofollow",
class: "notifications" do %>
<span class="show-for-sr">
<%= t("layouts.header.notification_item.notifications") %>
</span>
<% if current_user.notifications.unread.count > 0 %>
<span class="icon-circle" aria-hidden="true"></span>
<span class="icon-notification" aria-hidden="true"
title="<%= t('layouts.header.notification_item.new_notifications',
count: current_user.notifications_count).html_safe %>">
</span>
<small class="show-for-small-only">
<%= t('layouts.header.notification_item.new_notifications',
count: current_user.notifications_count).html_safe %>
</small>
<% else %>
<span class="icon-no-notification" aria-hidden="true"
title="<%= t('layouts.header.notification_item.no_notifications') %>">
</span>
<small class="show-for-small-only">
<%= t('layouts.header.notification_item.no_notifications') %>
</small>
<% end %>
<% end %>
</li>
<% end %>

26
app/views/notifications/_notification.html.erb
View File

@@ -3,19 +3,37 @@
<%= link_to notification do %>
<p>
<em>
<%= t("notifications.index.#{notification.notifiable_action}",
<%= t("notifications.notification.action.#{notification.notifiable_action}",
count: notification.counter) %>
</em>
<strong><%= notification.notifiable_title %></strong>
<strong id="<%= dom_id(notification) %>_title">
<%= notification.notifiable_title %>
</strong>
</p>
<p class="time"><%= l notification.timestamp, format: :datetime %></p>
<p class="time">
<%= l notification.timestamp, format: :datetime %>
</p>
<% end %>
<% else %>
<p>
<strong>
<%= t("notifications.index.notifiable_hidden") %>
<%= t("notifications.notification.notifiable_hidden") %>
</strong>
</p>
<% end %>
<div>
<% if notification.unread? %>
<%= link_to t("notifications.notification.mark_as_read"),
mark_as_read_notification_path(notification),
method: :put,
remote: true %>
<% else %>
<%= link_to t("notifications.notification.mark_as_unread"),
mark_as_unread_notification_path(notification),
method: :put,
remote: true %>
<% end %>
</div>
</li>

15
app/views/notifications/index.html.erb
View File

@@ -3,15 +3,22 @@
<h1 class="float-left"><%= t("notifications.index.title") %></h1>
<h4>
<%= link_to t("notifications.index.unread"), notifications_path %>
<%= link_to t("notifications.index.read"), read_notifications_path %>
</h4>
<% if @notifications.empty? %>
<div data-alert class="callout primary margin-top clear">
<%= t("notifications.index.empty_notifications") %>
</div>
<% else %>
<div class="float-right margin-top">
<%= link_to t("notifications.index.mark_all_as_read"),
mark_all_as_read_notifications_path, method: :put %>
</div>
<% if action_name == "index" %>
<div class="float-right margin-top">
<%= link_to t("notifications.index.mark_all_as_read"),
mark_all_as_read_notifications_path, method: :put %>
</div>
<% end %>
<ul class="no-bullet clear notifications-list">
<%= render @notifications %>

1
app/views/notifications/mark_as_read.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#notification_<%= @notification.id %>").hide()

1
app/views/notifications/mark_as_unread.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#notification_<%= @notification.id %>").hide()

1
app/views/notifications/read.html.erb Normal file
View File

@@ -0,0 +1 @@
<%= render template: "notifications/index" %>