activity_notification 1.4.4 → 2.2.4

data/app/views/activity_notification/notifications/default/_default.html.erb

@@ -7,20 +7,20 @@
         <strong><%= notification.notifier.present? ? notification.notifier.printable_notifier_name : 'Someone' %></strong>
         <% if notification.group_member_notifier_exists? %>
           <%= " and #{notification.group_member_notifier_count} other" %>
-          <%= notification.notifier.present? ? notification.notifier.printable_type.pluralize.downcase : 'people' %>
+          <%= notification.notifier.present? ? notification.notifier.printable_type.downcase.pluralize(notification.group_member_notifier_count) : 'people' %>
         <% end %>
         notified you of
         <% if notification.notifiable.present? %>
           <% if notification.group_member_exists? %>
-            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.pluralize.downcase} including" %>
+            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.downcase.pluralize(notification.group_notification_count)} including" %>
           <% end %>
           <%= notification.notifiable.printable_notifiable_name(notification.target) %>
           <%= "in #{notification.group.printable_group_name}" if notification.group.present? %>
         <% else %>
           <% if notification.group_member_exists? %>
-            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.pluralize.downcase}" %>
+            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.downcase.pluralize(notification.group_notification_count)}" %>
           <% else %>
-            <%= " a #{notification.notifiable_type.humanize.singularize.downcase}" %>
+            <%= " a #{notification.notifiable_type.humanize.downcase.singularize}" %>
           <% end %>
           <%= "in #{notification.group.printable_group_name}" if notification.group.present? %>
           but the notifiable is not found. It may have been deleted.
@@ -34,42 +34,42 @@
 
 <div class='<%= "notification_#{notification.id}" %>'>
   <% if notification.unopened? %>
-    <%= link_to open_notification_path_for(notification, reload: false), method: :post, remote: true, class: "unopened_wrapper" do %>
-      <div class="unopned_circle"></div>
-      <div class="unopned_description_wrapper">
-        <p class="unopned_description">Open</p>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true, class: "unopened_wrapper" do %>
+      <div class="unopened_circle"></div>
+      <div class="unopened_description_wrapper">
+        <p class="unopened_description">Open</p>
       </div>
     <% end %>
-    <%= link_to open_notification_path_for(notification, move: true), method: :post do %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put do %>
       <%= yield :notification_content %>
     <% end %>
     <div class="unopened_wrapper"></div>
   <% else %>
-    <%= link_to move_notification_path_for(notification) do %>
+    <%= link_to move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) do %>
       <%= yield :notification_content %>
     <% end %>
   <% end %>
 
-  <%#= link_to "Move", move_notification_path_for(notification) %>
+  <%#= link_to "Move", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) %>
   <%# if notification.unopened? %>
-    <%#= link_to "Open and move (GET)", move_notification_path_for(notification, open: true) %>
-    <%#= link_to "Open and move (POST)", open_notification_path_for(notification, move: true), method: :post %>
-    <%#= link_to "Open", open_notification_path_for(notification, index_options: @index_options), method: :post %>
-    <%#= link_to "Open (Ajax)", open_notification_path_for(notification, reload: false), method: :post, remote: true %>
+    <%#= link_to "Open and move (GET)", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>
+    <%#= link_to "Open and move (PUT)", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put %>
+    <%#= link_to "Open", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options))), method: :put %>
+    <%#= link_to "Open (Ajax)", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true %>
   <%# end %>
-  <%#= link_to "Destroy", notification_path_for(notification, index_options: @index_options), method: :delete %>
-  <%#= link_to "Destroy (Ajax)", notification_path_for(notification, reload: false), method: :delete, remote: true %>
+  <%#= link_to "Destroy", notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options)), method: :delete %>
+  <%#= link_to "Destroy (Ajax)", notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :delete, remote: true %>
 
 </div>
 
 <style>
-  /* unopned_circle */
+  /* unopened_circle */
   .unopened_wrapper{
     position: absolute;
     margin-top: 20px;
     margin-left: 56px;
   }
-  .unopened_wrapper .unopned_circle {
+  .unopened_wrapper .unopened_circle {
     display: block;
     width: 10px;
     height: 10px;
@@ -78,16 +78,16 @@
     background-color: #27a5eb;
     z-index: 2;
   }
-  .unopened_wrapper:hover > .unopned_description_wrapper{
+  .unopened_wrapper:hover > .unopened_description_wrapper{
     display: block;
   }
-  .unopened_wrapper .unopned_description_wrapper {
+  .unopened_wrapper .unopened_description_wrapper {
     display: none;
     position: absolute;
     margin-top: 26px;
     margin-left: -24px;
   }
-  .unopened_wrapper .unopned_description_wrapper .unopned_description {
+  .unopened_wrapper .unopened_description_wrapper .unopened_description {
     position: absolute;
     color: #fff;
     font-size: 12px;
@@ -98,7 +98,7 @@
     padding: 4px 12px;
     z-index: 999;
   }
-  .unopened_wrapper .unopned_description_wrapper .unopned_description:before {
+  .unopened_wrapper .unopened_description_wrapper .unopened_description:before {
      border: solid transparent;
      border-top-width: 0;
      content: "";

data/app/views/activity_notification/notifications/default/_default_without_grouping.html.erb

@@ -23,42 +23,42 @@
 
 <div class='<%= "notification_#{notification.id}" %>'>
   <% if notification.unopened? %>
-    <%= link_to open_notification_path_for(notification, reload: false, without_grouping: parameters[:with_group_members]), method: :post, remote: true, class: "unopened_wrapper" do %>
-      <div class="unopned_circle"></div>
-      <div class="unopned_description_wrapper">
-        <p class="unopned_description">Open</p>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:with_group_members, :routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true, class: "unopened_wrapper" do %>
+      <div class="unopened_circle"></div>
+      <div class="unopened_description_wrapper">
+        <p class="unopened_description">Open</p>
       </div>
     <% end %>
-    <%= link_to open_notification_path_for(notification, move: true), method: :post do %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put do %>
       <%= yield :notification_content %>
     <% end %>
     <div class="unopened_wrapper"></div>
   <% else %>
-    <%= link_to move_notification_path_for(notification) do %>
+    <%= link_to move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) do %>
       <%= yield :notification_content %>
     <% end %>
   <% end %>
 
-  <%#= link_to "Move", move_notification_path_for(notification) %>
+  <%#= link_to "Move", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) %>
   <%# if notification.unopened? %>
-    <%#= link_to "Open and move (GET)", move_notification_path_for(notification, open: true) %>
-    <%#= link_to "Open and move (POST)", open_notification_path_for(notification, move: true), method: :post %>
-    <%#= link_to "Open", open_notification_path_for(notification, index_options: @index_options), method: :post %>
-    <%#= link_to "Open (Ajax)", open_notification_path_for(notification, reload: false, with_group_members: parameters[:with_group_members]), method: :post, remote: true %>
+    <%#= link_to "Open and move (GET)", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>
+    <%#= link_to "Open and move (PUT)", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put %>
+    <%#= link_to "Open", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options)), method: :put %>
+    <%#= link_to "Open (Ajax)", open_notification_path_for(notification, parameters.slice(with_group_members:, :routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true %>
   <%# end %>
-  <%#= link_to "Destroy", notification_path_for(notification, index_options: @index_options), method: :delete %>
-  <%#= link_to "Destroy (Ajax)", notification_path_for(notification, reload: false, with_group_members: parameters[:with_group_members]), method: :delete, remote: true %>
+  <%#= link_to "Destroy", notification_path_for(notification, index_options: parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options)), method: :delete %>
+  <%#= link_to "Destroy (Ajax)", notification_path_for(notification, parameters.slice(with_group_members:, :routing_scope, :devise_default_routes).merge(reload: false)), method: :delete, remote: true %>
 
 </div>
 
 <style>
-  /* unopned_circle */
+  /* unopened_circle */
   .unopened_wrapper{
     position: absolute;
     margin-top: 20px;
     margin-left: 56px;
   }
-  .unopened_wrapper .unopned_circle {
+  .unopened_wrapper .unopened_circle {
     display: block;
     width: 10px;
     height: 10px;
@@ -67,16 +67,16 @@
     background-color: #27a5eb;
     z-index: 2;
   }
-  .unopened_wrapper:hover > .unopned_description_wrapper{
+  .unopened_wrapper:hover > .unopened_description_wrapper{
     display: block;
   }
-  .unopened_wrapper .unopned_description_wrapper {
+  .unopened_wrapper .unopened_description_wrapper {
     display: none;
     position: absolute;
     margin-top: 26px;
     margin-left: -24px;
   }
-  .unopened_wrapper .unopned_description_wrapper .unopned_description {
+  .unopened_wrapper .unopened_description_wrapper .unopened_description {
     position: absolute;
     color: #fff;
     font-size: 12px;
@@ -87,7 +87,7 @@
     padding: 4px 12px;
     z-index: 999;
   }
-  .unopened_wrapper .unopned_description_wrapper .unopned_description:before {
+  .unopened_wrapper .unopened_description_wrapper .unopened_description:before {
      border: solid transparent;
      border-top-width: 0;
      content: "";

data/app/views/activity_notification/notifications/default/_index.html.erb

@@ -12,16 +12,16 @@
         Notifications
       </p>
       <p class="notification_header_menu">
-        <%= link_to "Open all", open_all_notifications_path_for(@target, parameters), method: :post, remote: true %>
+        <%= link_to "Open all", open_all_notifications_path_for(@target, parameters.slice(:routing_scope, :devise_default_routes)), method: :post, remote: true %>
         <% if @target.class.subscription_enabled? %>
-          <%= link_to "Subscriptions", subscriptions_path_for(@target) %>
+          <%= link_to "Subscriptions", subscriptions_path_for(@target, parameters.slice(:routing_scope, :devise_default_routes)) %>
         <% end %>
       </p>
     </div>
     <div class="notifications">
       <%= yield :notification_index %>
     </div>
-    <%= link_to notifications_path_for(@target) do %>
+    <%= link_to notifications_path_for(@target, parameters.slice(:routing_scope, :devise_default_routes)) do %>
       <div class="notification_link_wrapper">
         <p class="notification_link">
           See notifications

data/app/views/activity_notification/notifications/default/index.html.erb

@@ -1,20 +1,30 @@
 <div class="notification_wrapper">
   <div class="notification_header">
-    <h1>Notifications to <%= @target.printable_target_name %> <%= link_to open_all_notifications_path_for(@target, @index_options), method: :post, remote: true do %><span class="notification_count"><span class="<%= 'unopened' if @target.has_unopened_notifications?(@index_options) %>"><%= @target.unopened_notification_count(@index_options) %></span></span><% end %></h1>
+    <h1>
+      Notifications to <%= @target.printable_target_name %>
+      <%= link_to open_all_notifications_path_for(@target, @index_options.slice(:routing_scope, :devise_default_routes)), method: :post, remote: true do %>
+        <span class="notification_count"><span class="<%= 'unopened' if @target.has_unopened_notifications?(@index_options) %>">
+          <%= @target.unopened_notification_count(@index_options) %>
+        </span></span>
+      <% end %>
+    </h1>
+    <h3>
+      <span class="action_cable_status">Disabled</span>
+    </h3>
   </div>
   <div class="notifications">
     <% if @index_options[:with_group_members] %>
-      <%= render_notification @notifications, fallback: :default_without_grouping, with_group_members: true %>
+      <%= render_notification @notifications, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default_without_grouping, with_group_members: true) %>
     <% else %>
-      <%= render_notification @notifications, fallback: :default %>
-      <%#= render_notification @notifications, fallback: :text %>
+      <%= render_notification @notifications, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default) %>
+      <%#= render_notification @notifications, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :text) %>
     <% end %>
   </div>
 </div>
 
-<%#= render_notifications_of @target, fallback: :default, index_content: :with_attributes %>
-<%#= render_notifications_of @target, fallback: :default, index_content: :unopened_with_attributes, reverse: true %>
-<%#= render_notifications_of @target, fallback: :default_without_grouping, index_content: :with_attributes, with_group_members: true %>
+<%#= render_notifications_of @target, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default, index_content: :with_attributes) %>
+<%#= render_notifications_of @target, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default, index_content: :unopened_with_attributes, reverse: true) %>
+<%#= render_notifications_of @target, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default_without_grouping, index_content: :with_attributes, with_group_members: true) %>
 
 <style>
   .notification_wrapper .notification_header h1 span span{
@@ -28,3 +38,46 @@
     background-color: #f87880;
   }
 </style>
+
+<% if @target.notification_action_cable_allowed? %>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/push.js/1.0.9/push.min.js"></script>
+  <script>
+    App.activity_notification = App.cable.subscriptions.create(
+      {
+        channel: "<%= @target.notification_action_cable_channel_class_name %>",
+        target_type: "<%= @target.to_class_name %>", target_id: "<%= @target.id %>"
+      },
+      {
+        connected: function() {
+          $(".action_cable_status").html("Online<%= " (authorized)" if @target.notification_action_cable_with_devise? %>");
+        },
+        disconnected: function() {
+          $(".action_cable_status").html("Offline");
+        },
+        rejected: function() {
+          $(".action_cable_status").html("Offline (unauthorized)");
+        },
+        received: function(notification) {
+          // Display notification
+          if (notification.group_owner_id == null) {
+            $(".notifications").prepend(notification.view);
+            $(".notification_count").html("<span class=unopened>" + notification.unopened_notification_count + "</span>");
+          } else {
+            $(".notification_" + notification.group_owner_id).remove();
+            $(".notifications").prepend(notification.group_owner_view);
+            $(".notification_count").html("<span class=unopened>" + notification.unopened_notification_count + "</span>");
+          }
+          // Push notificaion using Web Notification API by Push.js
+          Push.create('ActivityNotification', {
+            body: notification.text,
+            timeout: 5000,
+            onClick: function () {
+              location.href = notification.notifiable_path;
+              this.close();
+            }
+          });
+        }
+      }
+    );
+  </script>
+<% end %>

data/app/views/activity_notification/notifications/default/open.js.erb

@@ -1,6 +1,6 @@
 $(".notification_count").html("<span class=\"<%= 'unopened' if @target.has_unopened_notifications?(@index_options) %>\"><%= @target.unopened_notification_count(@index_options) %></span>");
 <% if @index_options[:with_group_members] %>
-  $('<%= ".notification_#{@notification.id}" %>').html("<%= escape_javascript( render_notification(@notification, fallback: :default_without_grouping, with_group_members: true) ) %>");
+  $('<%= ".notification_#{@notification.id}" %>').html("<%= escape_javascript( render_notification(@notification, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default_without_grouping, with_group_members: true)) ) %>");
 <% else %>
-  $('<%= ".notification_#{@notification.id}" %>').html("<%= escape_javascript( render_notification(@notification, fallback: :default) ) %>");
+  $('<%= ".notification_#{@notification.id}" %>').html("<%= escape_javascript( render_notification(@notification, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default)) ) %>");
 <% end %>

data/app/views/activity_notification/notifications/default/open_all.js.erb

@@ -1,6 +1,6 @@
 $(".notification_count").html("<span class=\"<%= 'unopened' if @target.has_unopened_notifications?(@index_options) %>\"><%= @target.unopened_notification_count(@index_options) %></span>");
 <% if @index_options[:with_group_members] %>
-  $(".notifications").html("<%= escape_javascript( render_notification(@notifications, fallback: :default_without_grouping, with_group_members: true) ) %>");
+  $(".notifications").html("<%= escape_javascript( render_notification(@notifications, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default_without_grouping, with_group_members: true)) ) %>");
 <% else %>
-  $(".notifications").html("<%= escape_javascript( render_notification(@notifications, fallback: :default) ) %>");
+  $(".notifications").html("<%= escape_javascript( render_notification(@notifications, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default)) ) %>");
 <% end %>

data/app/views/activity_notification/notifications/default/show.html.erb

@@ -4,8 +4,8 @@
   </div>
   <ul>
     <div class="notifications">
-      <%= render_notification(@notification, fallback: :default) %>
-      <%#= render_notification @notification, fallback: :text %>
+      <%= render_notification @notification, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :default) %>
+      <%#= render_notification @notification, @index_options.slice(:routing_scope, :devise_default_routes).merge(fallback: :text) %>
     </div>
   </ul>
 </div>

data/app/views/activity_notification/optional_targets/default/action_cable_channel/_default.html.erb

@@ -0,0 +1,176 @@
+<% content_for :notification_content, flush: true do %>
+  <div class='notification_list <%= notification.opened? ? "opened" : "unopened" %>'>
+    <div class="notification_list_cover"></div>
+    <div class="list_image"></div>
+    <div class="list_text_wrapper">
+      <p class="list_text">
+        <strong><%= notification.notifier.present? ? notification.notifier.printable_notifier_name : 'Someone' %></strong>
+        <% if notification.group_member_notifier_exists? %>
+          <%= " and #{notification.group_member_notifier_count} other" %>
+          <%= notification.notifier.present? ? notification.notifier.printable_type.pluralize.downcase : 'people' %>
+        <% end %>
+        notified you of
+        <% if notification.notifiable.present? %>
+          <% if notification.group_member_exists? %>
+            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.pluralize.downcase} including" %>
+          <% end %>
+          <%= notification.notifiable.printable_notifiable_name(notification.target) %>
+          <%= "in #{notification.group.printable_group_name}" if notification.group.present? %>
+        <% else %>
+          <% if notification.group_member_exists? %>
+            <%= " #{notification.group_notification_count} #{notification.notifiable_type.humanize.pluralize.downcase}" %>
+          <% else %>
+            <%= " a #{notification.notifiable_type.humanize.singularize.downcase}" %>
+          <% end %>
+          <%= "in #{notification.group.printable_group_name}" if notification.group.present? %>
+          but the notifiable is not found. It may have been deleted.
+        <% end %>
+        <br>
+        <span><%= notification.created_at.strftime("%b %d %H:%M") %></span>
+      </p>
+    </div>
+  </div>
+<% end %>
+
+<div class='<%= "notification_#{notification.id}" %>'>
+  <% if notification.unopened? %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true, class: "unopened_wrapper" do %>
+      <div class="unopened_circle"></div>
+      <div class="unopened_description_wrapper">
+        <p class="unopened_description">Open</p>
+      </div>
+    <% end %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put do %>
+      <%= yield :notification_content %>
+    <% end %>
+    <div class="unopened_wrapper"></div>
+  <% else %>
+    <%= link_to move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) do %>
+      <%= yield :notification_content %>
+    <% end %>
+  <% end %>
+
+  <%#= link_to "Move", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) %>
+  <%# if notification.unopened? %>
+    <%#= link_to "Open and move (GET)", move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>
+    <%#= link_to "Open and move (PUT)", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put %>
+    <%#= link_to "Open", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options))), method: :put %>
+    <%#= link_to "Open (Ajax)", open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true %>
+  <%# end %>
+  <%#= link_to "Destroy", notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(index_options: @index_options)), method: :delete %>
+  <%#= link_to "Destroy (Ajax)", notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :delete, remote: true %>
+
+</div>
+
+<style>
+  /* unopened_circle */
+  .unopened_wrapper{
+    position: absolute;
+    margin-top: 20px;
+    margin-left: 56px;
+  }
+  .unopened_wrapper .unopened_circle {
+    display: block;
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    border-radius: 50%;
+    background-color: #27a5eb;
+    z-index: 2;
+  }
+  .unopened_wrapper:hover > .unopened_description_wrapper{
+    display: block;
+  }
+  .unopened_wrapper .unopened_description_wrapper {
+    display: none;
+    position: absolute;
+    margin-top: 26px;
+    margin-left: -24px;
+  }
+  .unopened_wrapper .unopened_description_wrapper .unopened_description {
+    position: absolute;
+    color: #fff;
+    font-size: 12px;
+    text-align: center;
+
+    border-radius: 4px;
+    background: rgba(0, 0, 0, 0.8);
+    padding: 4px 12px;
+    z-index: 999;
+  }
+  .unopened_wrapper .unopened_description_wrapper .unopened_description:before {
+     border: solid transparent;
+     border-top-width: 0;
+     content: "";
+     display: block;
+     position: absolute;
+     width: 0;
+     left: 50%;
+     top: -5px;
+     margin-left: -5px;
+     height: 0;
+     border-width: 0 5px 5px 5px;
+     border-color: transparent transparent rgba(0, 0, 0, 0.8) transparent;
+     z-index: 0;
+  }
+
+  /* list */
+  .notification_list {
+    padding: 15px 10px;
+    position: relative;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .notification_list.unopened {
+    background-color: #eeeff4;
+  }
+  .notification_list:hover {
+    background-color: #f8f9fb;
+  }
+  .notification_list:last-child {
+    border-bottom: none;
+  }
+  .notification_list:after{
+    content: "";
+    clear: both;
+    display: block;
+  }
+  .notification_list .notification_list_cover{
+    position: absolute;
+    opacity: 0;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+
+  }
+  .notification_list .list_image {
+    float: left;
+    width: 40px;
+    height: 40px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-color: #979797;
+  }
+  .notification_list .list_text_wrapper {
+    float: left;
+    width: calc(100% - 60px);
+    margin-left: 20px;
+  }
+  .notification_list .list_text_wrapper .list_text {
+    color: #4f4f4f;
+    font-size: 14px;
+    line-height: 1.4;
+    margin-top: 0;
+    height: auto;
+    font-weight: normal;
+  }
+  .notification_list .list_text_wrapper .list_text strong{
+    font-weight: bold;
+  }
+  .notification_list .list_text_wrapper .list_text span {
+    color: #979797;
+    font-size: 13px;
+  }
+</style>

data/app/views/activity_notification/optional_targets/default/base/_default.text.erb

@@ -3,7 +3,7 @@ Dear <%= @target.printable_target_name %>
 <%= @notification.notifier.present? ? @notification.notifier.printable_notifier_name : 'Someone' %> notified you of <%= @notification.notifiable.printable_notifiable_name(@notification.target) %><%= " in #{@notification.group.printable_group_name}" if @notification.group.present? %>.
 
 <%= "Move to notified #{@notification.notifiable.printable_type.downcase}:" %>
-  <%= move_notification_url_for(@notification, open: true) %>
+  <%= move_notification_url_for(@notification, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>
 
 Thank you!
 

data/app/views/activity_notification/optional_targets/default/slack/_default.text.erb

@@ -3,4 +3,4 @@
 <%= @notification.notifier.present? ? @notification.notifier.printable_notifier_name : 'Someone' %> notified you of <%= @notification.notifiable.printable_notifiable_name(@notification.target) %><%= " in #{@notification.group.printable_group_name}" if @notification.group.present? %>.
 
 <%= "Move to notified #{@notification.notifiable.printable_type.downcase}:" %>
-  <%= move_notification_url_for(@notification, open: true) %>
+  <%= move_notification_url_for(@notification, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>

data/app/views/activity_notification/subscriptions/default/_form.html.erb

@@ -1,6 +1,6 @@
 <div class="fields_area">
   <div class="fields_wrapper">
-    <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }) do |f| %>
+    <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }, namespace: :new) do |f| %>
       <div class="field_wrapper">
         <div class="field_label">
           <%= f.label :key, "Notification key" %>
@@ -37,7 +37,7 @@
         <div class="field">
           <div class="ui checkbox">
             <label>
-              <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+              <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_to_email_as_default }, 'true', 'false' %>
               <div class="slider"></div>
             </label>
           </div>

data/app/views/activity_notification/subscriptions/default/_notification_keys.html.erb

@@ -2,14 +2,14 @@
   <div class="fields_area">
     <% notification_keys.each do |key| %>
       <div class="fields_wrapper">
-        <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }) do |f| %>
+        <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }, namespace: key) do |f| %>
           <%= f.hidden_field :key, value: key %>
           <div class="fields_title_wrapper">
             <h3 class="fields_title">
               <%= key %>
             </h3>
             <p>
-              <%= link_to "Notifications", notifications_path_for(target, filtered_by_key: key) %>
+              <%= link_to "Notifications", notifications_path_for(target, option_params.merge(filtered_by_key: key)) %>
             </p>
           </div>
           <div class="field_wrapper subscribing">
@@ -38,7 +38,7 @@
             <div class="field">
               <div class="ui checkbox">
                 <label>
-                  <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+                  <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_to_email_as_default }, 'true', 'false' %>
                   <div class="slider"></div>
                 </label>
               </div>
@@ -55,8 +55,8 @@
               <div class="field">
                 <div class="ui checkbox">
                   <label>
-                    <%= hidden_field_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'false' %>
-                    <%= check_box_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'true', ActivityNotification.config.subscribe_as_default %>
+                    <%= hidden_field_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'false', id: "#{key}_subscription_optional_targets_subscribing_to_#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}_hidden" %>
+                    <%= check_box_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'true', ActivityNotification.config.subscribe_to_optional_targets_as_default, id: "#{key}_subscription_optional_targets_subscribing_to_#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}_check_box" %>
                     <div class="slider"></div>
                   </label>
                 </div>
@@ -78,31 +78,3 @@
     </div>
   </div>
 <% end %>
-
-<!--
-<%# if notification_keys.present? %>
-<%# notification_keys.each do |key| %>
-    Key: <%#= key %>
-<%#= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: {remote: true}) do |f| %>
-<%#= f.hidden_field :key, value: key %>
-      <div class="field">
-        <%#= f.label :subscribing, "Subscribe to this notification?" %>
-<%#= f.check_box :subscribing, {checked: true}, 'true', 'false' %>
-      </div>
-      <div class="field">
-        <%#= f.label :subscribing_to_email, "Subscribe to this notification email?" %>
-<%#= f.check_box :subscribing_to_email, {checked: true}, 'true', 'false' %>
-      </div>
-      <div class="actions">
-        <%#= f.submit "Save" %>
-      </div>
-    <%# end %>
-<%#= link_to "See notifications", notifications_path_for(target, filtered_by_key: key) %>
-    <br/><br/>
-  <%# end %>
-<%# else %>
-  No notification keys are available.
-<%# end %>
-<br/><br/>
--->
-