Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
09c2f8c7
Commit
09c2f8c7
authored
Jan 04, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve group views
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b765d7d7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
24 deletions
+22
-24
app/views/groups/_new_group_member.html.haml
app/views/groups/_new_group_member.html.haml
+15
-17
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+3
-3
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+2
-2
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
No files found.
app/views/groups/_new_group_member.html.haml
View file @
09c2f8c7
=
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"
app/views/groups/edit.html.haml
View file @
09c2f8c7
...
@@ -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
...
...
app/views/groups/issues.html.haml
View file @
09c2f8c7
%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
...
...
app/views/groups/merge_requests.html.haml
View file @
09c2f8c7
...
@@ -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
...
...
app/views/groups/show.html.haml
View file @
09c2f8c7
.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
←
To dashboard
←
To dashboard
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment