Merge branch 'group-projects-page' into 'master'

Redesign project tabs on group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


Final step to fix #13480 

See merge request !3209

app/assets/stylesheets/framework/blocks.scss

@@ -120,6 +120,10 @@
   .cover-desc {
     padding: 0 $gl-padding 3px;
     color: $gl-text-color;
+
+    &.username:last-child {
+      padding-bottom: $gl-padding;
+    }
   }
 
   .cover-controls {

app/views/groups/_projects.html.haml

@@ -1,12 +1 @@
-.top-area
-  .nav-controls
-    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      - if @projects.present?
-        = 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
-
-= render 'shared/projects/list', projects: @projects, stars: false, skip_namespace: true
+= render 'shared/projects/list', projects: projects, stars: false, skip_namespace: true

app/views/groups/_shared_projects.html.haml

@@ -1,18 +1 @@
-- if projects.present?
-  .panel.panel-default
-    .panel-heading
-      Projects shared with
-      %strong #{@group.name}
-      (#{projects.count})
-    %ul.well-list
-      - projects.each do |project|
-        %li.project-row
-          = link_to namespace_project_path(project.namespace, project), class: dom_class(project) do
-            %span.namespace-name
-              - if project.namespace
-                = project.namespace.human_name
-                \/
-            %span.project-name
-              = truncate(project.name, length: 25)
-            %span.arrow
-              %i.icon-angle-right
+= render 'shared/projects/list', projects: projects, stars: false, skip_namespace: false

app/views/groups/show.html.haml

@@ -27,22 +27,31 @@
     .cover-desc.description
       = markdown(@group.description, pipeline: :description)
 
-
+- if can?(current_user, :read_group, @group)
+  %div{ class: container_class }
+    .top-area
       %ul.nav-links
         %li.active
           = link_to "#projects", 'data-toggle' => 'tab' do
-        Projects
+            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
 
-- if can?(current_user, :read_group, @group)
-  %div{ class: container_class }
     .tab-content
       .tab-pane.active#projects
         = render "projects", projects: @projects
 
+      - if @shared_projects.present?
         .tab-pane#shared
           = render "shared_projects", projects: @shared_projects