diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 12:19:32 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 12:19:32 +0300 |
| commit | 183892fde98308c0d77f5ba7a9bdb23d79eebe43 (patch) | |
| tree | 9cc63e2422b514e33337e9c3288c965a22bf7f97 /app/assets | |
| parent | 2460d290af892a24996b348c786757eb5398adc1 (diff) | |
| parent | 47e926bec0a9da28daaca7dc92415b25f2301daf (diff) | |
Merge branch 'notification-levels' into 'master'
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/project.js.coffee | 16 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee index 39a433dfc91..0ea8fffce07 100644 --- a/app/assets/javascripts/project.js.coffee +++ b/app/assets/javascripts/project.js.coffee @@ -24,3 +24,19 @@ class @Project $.cookie('hide_no_password_message', 'false', { path: path }) $(@).parents('.no-password-message').remove() e.preventDefault() + + $('.update-notification').on 'click', (e) -> + e.preventDefault() + notification_level = $(@).data 'notification-level' + $('#notification_level').val(notification_level) + $('#notification-form').submit() + label = null + switch notification_level + when 0 then label = ' Disabled ' + when 1 then label = ' Participating ' + when 2 then label = ' Watching ' + when 3 then label = ' Global ' + when 4 then label = ' On Mention ' + $('#notifications-button').empty().append("<i class='fa fa-bell'></i>" + label + "<i class='fa fa-angle-down'></i>") + $(@).parents('ul').find('li.active').removeClass 'active' + $(@).parent().addClass 'active'
\ No newline at end of file diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 53004fca350..a986fafff07 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -329,3 +329,7 @@ pre.light-well { margin-top: -1px; } } + +.inline-form { + display: inline-block; +} |