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
a3b0dc2e
Commit
a3b0dc2e
authored
Aug 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use control-group classes for inline forms in profile and group pages
parent
f2082edb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
22 deletions
+22
-22
app/views/groups/_new_group_member.html.haml
app/views/groups/_new_group_member.html.haml
+4
-4
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+4
-4
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+6
-6
app/views/profiles/account.html.haml
app/views/profiles/account.html.haml
+8
-8
No files found.
app/views/groups/_new_group_member.html.haml
View file @
a3b0dc2e
...
@@ -6,14 +6,14 @@
...
@@ -6,14 +6,14 @@
group
group
%p
1. Choose users you want in the group
%p
1. Choose users you want in the group
.c
learfix
.c
ontrol-group
=
f
.
label
:user_ids
,
"People"
=
f
.
label
:user_ids
,
"People"
.
input
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-large'
)
.
controls
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-large'
)
%p
2. Set access level for them
%p
2. Set access level for them
.c
learfix
.c
ontrol-group
=
f
.
label
:group_access
,
"Group Access"
=
f
.
label
:group_access
,
"Group Access"
.
input
=
select_tag
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
@users_group
.
group_access
),
class:
"project-access-select chosen"
.
controls
=
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 @
a3b0dc2e
...
@@ -26,15 +26,15 @@
...
@@ -26,15 +26,15 @@
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
.alert.alert-error
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
%span
=
@group
.
errors
.
full_messages
.
first
.c
learfix
.c
ontrol-group
=
f
.
label
:name
do
=
f
.
label
:name
do
Group name is
Group name is
.
input
.
controls
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"xxlarge left"
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"xxlarge left"
.c
learfix
.group-description-holder
.c
ontrol-group
.group-description-holder
=
f
.
label
:description
,
"Details"
=
f
.
label
:description
,
"Details"
.
input
.
controls
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
.form-actions
.form-actions
...
...
app/views/groups/new.html.haml
View file @
a3b0dc2e
...
@@ -2,19 +2,19 @@
...
@@ -2,19 +2,19 @@
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
.alert.alert-error
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
%span
=
@group
.
errors
.
full_messages
.
first
.c
learfix
.c
ontrol-group
=
f
.
label
:name
do
=
f
.
label
:name
do
Group name is
Group name is
.
input
.
controls
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"xxlarge left"
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"xxlarge left"
.c
learfix
.group-description-holder
.c
ontrol-group
.group-description-holder
=
f
.
label
:description
,
"Details"
=
f
.
label
:description
,
"Details"
.
input
.
controls
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
.c
learfix
.c
ontrol-group
.
input
.
controls
%ul
%ul
%li
Group is kind of directory for several projects
%li
Group is kind of directory for several projects
%li
All created groups are private
%li
All created groups are private
...
...
app/views/profiles/account.html.haml
View file @
a3b0dc2e
...
@@ -27,15 +27,15 @@
...
@@ -27,15 +27,15 @@
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.c
learfix
.c
ontrol-group
=
f
.
label
:password
=
f
.
label
:password
.
input
=
f
.
password_field
:password
,
required:
true
.
controls
=
f
.
password_field
:password
,
required:
true
.c
learfix
.c
ontrol-group
=
f
.
label
:password_confirmation
=
f
.
label
:password_confirmation
.
input
.
controls
=
f
.
password_field
:password_confirmation
,
required:
true
=
f
.
password_field
:password_confirmation
,
required:
true
.c
learfix
.c
ontrol-group
.
input
.
controls
=
f
.
submit
'Save password'
,
class:
"btn btn-save"
=
f
.
submit
'Save password'
,
class:
"btn btn-save"
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
=
form_for
@user
,
url:
update_username_profile_path
,
method: :put
,
remote:
true
do
|
f
|
=
form_for
@user
,
url:
update_username_profile_path
,
method: :put
,
remote:
true
do
|
f
|
.padded
.padded
=
f
.
label
:username
=
f
.
label
:username
.
input
.
controls
=
f
.
text_field
:username
,
required:
true
=
f
.
text_field
:username
,
required:
true
%span
.loading-gif.hide
=
image_tag
"ajax_loader.gif"
%span
.loading-gif.hide
=
image_tag
"ajax_loader.gif"
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
%ul
.cred
%ul
.cred
%li
It will change web url for personal projects.
%li
It will change web url for personal projects.
%li
It will change the git path to repositories for personal projects.
%li
It will change the git path to repositories for personal projects.
.
input
.
controls
=
f
.
submit
'Save username'
,
class:
"btn btn-save"
=
f
.
submit
'Save username'
,
class:
"btn btn-save"
-
if
gitlab_config
.
signup_enabled
-
if
gitlab_config
.
signup_enabled
...
...
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