diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 15:57:13 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 16:12:59 +0100 |
| commit | b70d828f836f58aa9bc1af34fb6019857524619f (patch) | |
| tree | 579ccac6b9d0f12ab5446500fdd5e85b7f42873d /app/views/layouts | |
| parent | 99918be7312b11dd650924e39b2bf8b65a4004d8 (diff) | |
| parent | 37e7fe2cc90de24c563fe70e4eff6f5d954bb630 (diff) | |
| download | gitlab-ce-b70d828f836f58aa9bc1af34fb6019857524619f.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 7408fe3f6d0..17e553aeef0 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -47,17 +47,19 @@ %li = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('hashtag fw') - %span.badge.issues-count - = number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) + - issues_count = cached_assigned_issuables_count(current_user, :issues, :opened) + %span.badge.issues-count{ class: ('hidden' if issues_count.zero?) } + = number_with_delimiter(issues_count) %li = link_to assigned_mrs_dashboard_path, title: 'Merge requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = custom_icon('mr_bold') - %span.badge.merge-requests-count - = number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) + - merge_requests_count = cached_assigned_issuables_count(current_user, :merge_requests, :opened) + %span.badge.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) } + = number_with_delimiter(merge_requests_count) %li = link_to dashboard_todos_path, title: 'Todos', aria: { label: "Todos" }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('check-circle fw') - %span.badge.todos-count + %span.badge.todos-count{ class: ('hidden' if todos_pending_count.zero?) } = todos_count_format(todos_pending_count) %li.header-user.dropdown = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do |