Commit 1cf45407 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

New group page

Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988

cc @skyruler 

For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480

See merge request !2174
parents 2309f339 8516b205
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.4.0 (unreleased) v 8.4.0 (unreleased)
- Implement new UI for group page
v 8.3.0 v 8.3.0
- Add CAS support (tduehr) - Add CAS support (tduehr)
......
8.3.0.pre 8.4.0.pre
.panel.panel-default.projects-list-holder .projects-list-holder
.panel-heading.clearfix .projects-search-form
.input-group .input-group
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
- if can? current_user, :create_projects, @group - if can? current_user, :create_projects, @group
......
...@@ -5,24 +5,33 @@ ...@@ -5,24 +5,33 @@
- if current_user - if current_user
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
.dashboard .cover-block
.header-with-avatar.clearfix .avatar-holder
= link_to group_icon(@group), target: '_blank' do
= image_tag group_icon(@group), class: "avatar group-avatar s90" = image_tag group_icon(@group), class: "avatar group-avatar s90"
%h3 .cover-title
= @group.name = @group.name
.username
.cover-desc.username
@#{@group.path} @#{@group.path}
- if @group.description.present? - if @group.description.present?
.description .cover-desc.description
= markdown(@group.description, pipeline: :description) = markdown(@group.description, pipeline: :description)
%hr
= render 'shared/show_aside' - 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
- if can?(current_user, :read_group, @group) .tab-content
.row .tab-pane.active#activity
%section.activities.col-md-7 .gray-content-block.activity-filter-block
.hidden-xs
- if current_user - if current_user
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
.pull-right .pull-right
...@@ -30,12 +39,13 @@ ...@@ -30,12 +39,13 @@
%i.fa.fa-rss %i.fa.fa-rss
= render 'shared/event_filter' = render 'shared/event_filter'
%hr
.content_list .content_list
= spinner = spinner
%aside.side.col-md-5
.tab-pane#projects
= render "projects", projects: @projects = render "projects", projects: @projects
- else
- else
%p %p
This group does not have public projects This group does not have public projects
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment