Download as
Browse Code »

Commit 09c2f8c7b10fe78a0e3feead06b6010f88238c79

Authored by Dmitriy Zaporozhets
1 parent b765d7d7
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Improve group views 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 22 additions and 24 deletions   Show diff stats
app/views/groups/_new_group_member.html.haml
  Diff comments   View file @09c2f8c
1 -= form_for @users_group, url: group_users_groups_path(@group) do |f|  
2 - %fieldset  
3 - %legend  
4 - New member(s) for  
5 - %strong #{@group.name}  
6 - group 1 += form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal' } do |f|
  2 + %h4.append-bottom-20
  3 + New member(s) for
  4 + %strong #{@group.name}
  5 + group
7 6
8 - %p 1. Choose users you want in the group  
9 - .form-group  
10 - = f.label :user_ids, "People"  
11 - .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large') 7 + %p 1. Choose users you want in the group
  8 + .form-group
  9 + = f.label :user_ids, "People", class: 'control-label'
  10 + .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
12 11
13 - %p 2. Set access level for them  
14 - .form-group  
15 - = f.label :group_access, "Group Access"  
16 - .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"  
17 -  
18 - .form-actions  
19 - = f.submit 'Add users into group', class: "btn btn-create" 12 + %p 2. Set access level for them
  13 + .form-group
  14 + = f.label :group_access, "Group Access", class: 'control-label'
  15 + .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
20 16
  17 + .form-actions
  18 + = f.submit 'Add users into group', class: "btn btn-create"
app/views/groups/edit.html.haml
  Diff comments   View file @09c2f8c
@@ -20,18 +20,18 @@ @@ -20,18 +20,18 @@
20 %strong= @group.name 20 %strong= @group.name
21 group settings: 21 group settings:
22 %div.form-holder 22 %div.form-holder
23 - = form_for @group do |f| 23 + = form_for @group, html: { class: "form-horizontal" } do |f|
24 - if @group.errors.any? 24 - if @group.errors.any?
25 .alert.alert-danger 25 .alert.alert-danger
26 %span= @group.errors.full_messages.first 26 %span= @group.errors.full_messages.first
27 .form-group 27 .form-group
28 - = f.label :name do 28 + = f.label :name, class: 'control-label' do
29 Group name 29 Group name
30 .col-sm-10 30 .col-sm-10
31 = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left" 31 = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
32 32
33 .form-group.group-description-holder 33 .form-group.group-description-holder
34 - = f.label :description, "Details" 34 + = f.label :description, "Details", class: 'control-label'
35 .col-sm-10 35 .col-sm-10
36 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4 36 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
37 37
app/views/groups/issues.html.haml
  Diff comments   View file @09c2f8c
1 %h3.page-title 1 %h3.page-title
2 - Issues assigned to me 2 + Issues
3 %span.pull-right #{@issues.total_count} issues 3 %span.pull-right #{@issues.total_count} issues
4 4
5 %p.light 5 %p.light
app/views/groups/merge_requests.html.haml
  Diff comments   View file @09c2f8c
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 %span.pull-right #{@merge_requests.total_count} merge requests 3 %span.pull-right #{@merge_requests.total_count} merge requests
4 4
5 %p.light 5 %p.light
6 - Authored or assigned to you from 6 + Only merge requests from
7 %strong #{@group.name} 7 %strong #{@group.name}
8 - group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. 8 + group are listed here. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
9 %hr 9 %hr
10 .row 10 .row
11 .col-md-3 11 .col-md-3
app/views/groups/show.html.haml
  Diff comments   View file @09c2f8c
1 .dashboard 1 .dashboard
2 - .activities.col-md-8 2 + .activities.col-md-8.hidden-sm
3 = render "events/event_last_push", event: @last_push 3 = render "events/event_last_push", event: @last_push
4 = link_to dashboard_path, class: 'btn btn-tiny' do 4 = link_to dashboard_path, class: 'btn btn-tiny' do
5 &larr; To dashboard 5 &larr; To dashboard