Commit 24f5f071 authored by Phil Hughes's avatar Phil Hughes

Added description to custom option in notification dropdown

Always shows the custom option in the dropdown
parent 89a2c873
...@@ -34,7 +34,7 @@ module NotificationsHelper ...@@ -34,7 +34,7 @@ module NotificationsHelper
def notification_description(level) def notification_description(level)
case level.to_sym case level.to_sym
when :participating when :participating
'You will only receive notifications from related resources' 'You will only receive notifications for threads you have participated in'
when :mention when :mention
'You will receive notifications only for comments in which you were @mentioned' 'You will receive notifications only for comments in which you were @mentioned'
when :watch when :watch
...@@ -43,6 +43,8 @@ module NotificationsHelper ...@@ -43,6 +43,8 @@ module NotificationsHelper
'You will not get any notifications via email' 'You will not get any notifications via email'
when :global when :global
'Use your global notification setting' 'Use your global notification setting'
when :custom
'You will only receive notifications for the events you choose'
end end
end end
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
- NotificationSetting.levels.each do |level| - NotificationSetting.levels.each do |level|
- if level.first != "custom" - if level.first != "custom"
= notification_list_item(level.first, @notification_setting) = notification_list_item(level.first, @notification_setting)
- unless @notification_setting.custom?
%li.divider %li.divider
%li %li
%a.update-notification{ href: "#", role: "button", data: { toggle: "modal", target: "#custom-notifications-modal", notification_level: "custom", notification_title: "Custom" } } %a.update-notification{ href: "#", role: "button", data: { toggle: "modal", target: "#custom-notifications-modal", notification_level: "custom", notification_title: "Custom" } }
Custom %strong.dropdown-menu-inner-title Custom
%span.dropdown-menu-inner-content= notification_description("custom")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment