diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-21 16:50:13 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:38:42 -0300 |
| commit | 92e183542fe0e13930220ba3bbf67b9197cfc026 (patch) | |
| tree | 61c253f761ce80b5c0353c2540c002e8c332a155 /app/views | |
| parent | f82ab42d0534950c1ceb458e0152f329df80ae9d (diff) | |
| download | gitlab-ce-92e183542fe0e13930220ba3bbf67b9197cfc026.tar.gz | |
Insert notification settings dropdown into groups
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/notifications/buttons/_notifications.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 85635bc4616..ffcf8ca5dc0 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -15,10 +15,13 @@ %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, fw: false) + = render 'notifications/buttons/notifications', notification_setting: @notification_setting + - if @group.description.present? .cover-desc.description = markdown(@group.description, pipeline: :description) + %div{ class: container_class } .top-area %ul.nav-links diff --git a/app/views/notifications/buttons/_notifications.html.haml b/app/views/notifications/buttons/_notifications.html.haml index 5e81e6c96b9..9aaa2890bdd 100644 --- a/app/views/notifications/buttons/_notifications.html.haml +++ b/app/views/notifications/buttons/_notifications.html.haml @@ -16,7 +16,7 @@ %button.dropdown-new.btn.btn-default.notifications-btn#notifications-button{ type: "button", data: { toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting) } } = icon("bell", class: "js-notification-loading") = notification_title(notification_setting.level) - %button.btn.btn-danger.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } } + %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } } %span.caret .sr-only Toggle dropdown = render "shared/notifications/notification_dropdown", notification_setting: notification_setting |