diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-08 21:12:04 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-08 21:12:04 +0300 |
commit | 4b1c49171dcdac5ba78a81bad94776644d9dbed5 (patch) | |
tree | b355dc30190a3c0bdfccd6746e8e56c23417eb99 /app/views | |
parent | 7b6df851209f5845be6a2b2d3a3865510ca540aa (diff) | |
parent | b55bd9ef95734a6805b11a8a8322149e885425a6 (diff) |
Merge branch '25426-group-dashboard-ui' into 'master'
Resolve "Group dashboard UI"
Closes #25426
See merge request !11098
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/dashboard/groups/_groups.html.haml | 13 | ||||
-rw-r--r-- | app/views/dashboard/groups/index.html.haml | 5 | ||||
-rw-r--r-- | app/views/shared/groups/_dropdown.html.haml | 12 |
3 files changed, 18 insertions, 12 deletions
diff --git a/app/views/dashboard/groups/_groups.html.haml b/app/views/dashboard/groups/_groups.html.haml index 6c3bf1a2b3b..168e6272d8e 100644 --- a/app/views/dashboard/groups/_groups.html.haml +++ b/app/views/dashboard/groups/_groups.html.haml @@ -1,6 +1,9 @@ .js-groups-list-holder - %ul.content-list - - @group_members.each do |group_member| - = render 'shared/groups/group', group: group_member.group, group_member: group_member - - = paginate @group_members, theme: 'gitlab' + #dashboard-group-app{ data: { endpoint: dashboard_groups_path(format: :json), path: dashboard_groups_path } } + .groups-list-loading + = icon('spinner spin', 'v-show' => 'isLoading') + %template{ 'v-if' => '!isLoading && isEmpty' } + %div{ 'v-cloak' => true } + = render 'empty_state' + %template{ 'v-else-if' => '!isLoading && !isEmpty' } + %groups-component{ ':groups' => 'state.groups', ':page-info' => 'state.pageInfo' } diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index 73ab2c95ff9..f9b45a539a1 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -2,7 +2,10 @@ - header_title "Groups", dashboard_groups_path = render 'dashboard/groups_head' -- if @group_members.empty? += webpack_bundle_tag 'common_vue' += webpack_bundle_tag 'groups' + +- if @groups.empty? = render 'empty_state' - else = render 'groups' diff --git a/app/views/shared/groups/_dropdown.html.haml b/app/views/shared/groups/_dropdown.html.haml index 37589b634fa..760370a6984 100644 --- a/app/views/shared/groups/_dropdown.html.haml +++ b/app/views/shared/groups/_dropdown.html.haml @@ -1,10 +1,10 @@ -.dropdown.inline +.dropdown.inline.js-group-filter-dropdown-wrap %button.dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' } - %span.light - - if @sort.present? - = sort_options_hash[@sort] - - else - = sort_title_recently_created + %span.dropdown-label + - if @sort.present? + = sort_options_hash[@sort] + - else + = sort_title_recently_created = icon('chevron-down') %ul.dropdown-menu.dropdown-menu-align-right %li |