New UI for group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-12-22 16:37:29 +01:00
parent 34653e10aa
commit 8516b20571
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
3 changed files with 43 additions and 32 deletions

View file

@ -1,6 +1,7 @@
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)

View file

@ -1,5 +1,5 @@
.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

View file

@ -5,37 +5,47 @@
- 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
= image_tag group_icon(@group), class: "avatar group-avatar s90" = link_to group_icon(@group), target: '_blank' do
%h3 = image_tag group_icon(@group), class: "avatar group-avatar s90"
= @group.name .cover-title
.username = @group.name
@#{@group.path}
- if @group.description.present?
.description
= markdown(@group.description, pipeline: :description)
%hr
= render 'shared/show_aside' .cover-desc.username
@#{@group.path}
- if can?(current_user, :read_group, @group) - if @group.description.present?
.row .cover-desc.description
%section.activities.col-md-7 = markdown(@group.description, pipeline: :description)
.hidden-xs
- 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' - if can?(current_user, :read_group, @group)
%hr %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
.content_list .tab-content
= spinner .tab-pane.active#activity
%aside.side.col-md-5 .gray-content-block.activity-filter-block
= render "projects", projects: @projects - if current_user
- else = render "events/event_last_push", event: @last_push
%p .pull-right
This group does not have public projects = 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
- else
%p
This group does not have public projects