Merge pull request #7277 from bgeuken/groups_tab

Make group members tab the main tab on the group show view
openSUSE · Mar 29, 2019 · 40d25a8 · 40d25a8
2 parents c6f1695 + d850990
commit 40d25a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...ws/webui2/shared/_group_members.html.haml → ...ui2/webui/groups/_group_members.html.haml b/...ws/webui2/shared/_group_members.html.haml → ...ui2/webui/groups/_group_members.html.haml
diff --git a/src/api/app/views/webui2/webui/groups/show.html.haml b/src/api/app/views/webui2/webui/groups/show.html.haml
@@ -4,7 +4,13 @@
   .bg-light
     %ul.nav.nav-tabs.pt-2.px-3.flex-nowrap.collapsible{ 'role': 'tablist' }
       %li.nav-item
-        %a.active.nav-link.text-nowrap#reviews-in-tab{ aria: { controls: 'reviews-in', selected: 'true' },
+        %a.active.nav-link.text-nowrap#group-members-tab{ aria: { controls: 'group-members' },
+          data: { toggle: 'tab' }, href: '#group-members', role: 'tab' }
+          Group Members
+          %span.badge.badge-primary
+            = @group.users.size
+      %li.nav-item
+        %a.nav-link.text-nowrap#reviews-in-tab{ aria: { controls: 'reviews-in', selected: 'true' },
         data: { toggle: 'tab' }, href: '#reviews-in', role: 'tab' }
           Incoming Reviews
           %span.badge.badge-primary
@@ -19,18 +25,17 @@
           All Requests
           %span.badge.badge-primary
             = @group.requests.size
-      %li.nav-item
-        %a.nav-link.text-nowrap#group-members-tab{ aria: { controls: 'group-members' }, data: { toggle: 'tab' }, href: '#group-members', role: 'tab' }
-          Group Members
-          %span.badge.badge-primary
-            = @group.users.size
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{ href: '#', 'data-toggle': 'dropdown', 'role': 'button', 'aria-expanded': 'false', 'aria-haspopup': 'true' }
         .dropdown-menu.dropdown-menu-right
 
   .card-body
     .tab-content
-      .tab-pane.show.active#reviews-in{ aria: { controls: 'reviews-in' }, role: 'tabpanel' }
+      .tab-pane.show.active#group-members{ aria: { controls: 'group-members' }, role: 'tabpanel' }
+        %h3 Group Members
+        = render(partial: 'group_members', locals: { group: @group })
+
+      .tab-pane#reviews-in{ aria: { controls: 'reviews-in' }, role: 'tabpanel' }
         %h3 Incoming Reviews
         = render(partial: 'webui2/shared/requests_table', locals: { id: 'reviews_in_table', source_url: group_requests_path(@group) })
 
@@ -41,11 +46,6 @@
       .tab-pane#all-requests{ aria: { controls: 'all-requests' }, role: 'tabpanel' }
         %h3 All Requests
         = render(partial: 'webui2/shared/requests_table', locals: { id: 'all_requests_table', source_url: group_requests_path(@group) })
-
-      .tab-pane#group-members{ aria: { controls: 'group-members' }, role: 'tabpanel' }
-        %h3 Group Members
-        = render(partial: 'webui2/shared/group_members', locals: { group: @group })
-
 = content_for :ready_function do
   :plain
     var hash = document.location.hash;