Commit 67a628cc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Improve group views


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