1 files changed, 36 insertions, 27 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index c2c7c581b3e..23a34ac36dd 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,5 @@
+- @no_container = true
+
 - unless can?(current_user, :read_group, @group)
   - @disable_search_panel = true
 
@@ -6,6 +8,12 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block
+  .cover-controls
+    - if @group && can?(current_user, :admin_group, @group)
+      = link_to icon('pencil'), edit_group_path(@group), class: 'btn'
+    - if current_user
+      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn'
+
   .avatar-holder
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
@@ -20,32 +28,33 @@
       = markdown(@group.description, pipeline: :description)
 
 - if can?(current_user, :read_group, @group)
-  %ul.center-top-menu.no-top
-    %li.active
-      = link_to "#activity", 'data-toggle' => 'tab' do
-        Activity
-    - if @projects.present?
-      %li
-        = link_to "#projects", 'data-toggle' => 'tab' do
-          Projects
-
-  .tab-content
-    .tab-pane.active#activity
-      .gray-content-block.activity-filter-block
-        - if current_user
-          = render "events/event_last_push", event: @last_push
-          .pull-right
-            = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn' do
-              %i.fa.fa-rss
-
-          = render 'shared/event_filter'
-
-      .content_list
-      = spinner
-
-    .tab-pane#projects
-      = render "projects", projects: @projects
+  %div{ class: container_class }
+    .top-area
+      %ul.nav-links
+        %li.active
+          = link_to "#projects", 'data-toggle' => 'tab' do
+            All Projects
+        - if @shared_projects.present?
+          %li
+            = link_to "#shared", 'data-toggle' => 'tab' do
+              Shared Projects
+      .nav-controls
+        = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
+          = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
+        = render 'shared/projects/dropdown'
+        - if can? current_user, :create_projects, @group
+          = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
+            = icon('plus')
+            New Project
+
+    .tab-content
+      .tab-pane.active#projects
+        = render "projects", projects: @projects
+
+      - if @shared_projects.present?
+        .tab-pane#shared
+          = render "shared_projects", projects: @shared_projects
 
 - else
-  %p
-    This group does not have public projects
+  %p.nav-links.no-top
+    No projects to show