Commit 09c2f8c7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve group views

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b765d7d7
= form_for @users_group, url: group_users_groups_path(@group) do |f| = form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal' } do |f|
%fieldset %h4.append-bottom-20
%legend
New member(s) for New member(s) for
%strong #{@group.name} %strong #{@group.name}
group group
%p 1. Choose users you want in the group %p 1. Choose users you want in the group
.form-group .form-group
= f.label :user_ids, "People" = f.label :user_ids, "People", class: 'control-label'
.col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large') .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
%p 2. Set access level for them %p 2. Set access level for them
.form-group .form-group
= f.label :group_access, "Group Access" = f.label :group_access, "Group Access", class: 'control-label'
.col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen" .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
.form-actions .form-actions
= f.submit 'Add users into group', class: "btn btn-create" = f.submit 'Add users into group', class: "btn btn-create"
...@@ -20,18 +20,18 @@ ...@@ -20,18 +20,18 @@
%strong= @group.name %strong= @group.name
group settings: group settings:
%div.form-holder %div.form-holder
= form_for @group do |f| = form_for @group, html: { class: "form-horizontal" } do |f|
- if @group.errors.any? - if @group.errors.any?
.alert.alert-danger .alert.alert-danger
%span= @group.errors.full_messages.first %span= @group.errors.full_messages.first
.form-group .form-group
= f.label :name do = f.label :name, class: 'control-label' do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details", class: 'control-label'
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
......
%h3.page-title %h3.page-title
Issues assigned to me Issues
%span.pull-right #{@issues.total_count} issues %span.pull-right #{@issues.total_count} issues
%p.light %p.light
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
%span.pull-right #{@merge_requests.total_count} merge requests %span.pull-right #{@merge_requests.total_count} merge requests
%p.light %p.light
Authored or assigned to you from Only merge requests from
%strong #{@group.name} %strong #{@group.name}
group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. group are listed here. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
%hr %hr
.row .row
.col-md-3 .col-md-3
......
.dashboard .dashboard
.activities.col-md-8 .activities.col-md-8.hidden-sm
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= link_to dashboard_path, class: 'btn btn-tiny' do = link_to dashboard_path, class: 'btn btn-tiny' do
&larr; To dashboard &larr; To dashboard
......
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