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
Boxiang Sun
gitlab-ce
Commits
49fa9907
Commit
49fa9907
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 admin area
parent
a43a3803
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
38 deletions
+38
-38
app/views/admin/groups/edit.html.haml
app/views/admin/groups/edit.html.haml
+6
-6
app/views/admin/groups/new.html.haml
app/views/admin/groups/new.html.haml
+4
-4
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+2
-2
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+26
-26
No files found.
app/views/admin/groups/edit.html.haml
View file @
49fa9907
...
@@ -4,21 +4,21 @@
...
@@ -4,21 +4,21 @@
-
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
.group_name_holder
.c
ontrol-group
.group_name_holder
=
f
.
label
:name
do
=
f
.
label
:name
do
Group name is
Group name is
.
input
.
controls
=
f
.
text_field
:name
,
placeholder:
"Example Group"
,
class:
"xxlarge"
=
f
.
text_field
:name
,
placeholder:
"Example Group"
,
class:
"xxlarge"
.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
.group_name_holder
.c
ontrol-group
.group_name_holder
=
f
.
label
:path
do
=
f
.
label
:path
do
%span
.cred
Group path is
%span
.cred
Group path is
.
input
.
controls
=
f
.
text_field
:path
,
placeholder:
"example-group"
,
class:
"xxlarge danger"
=
f
.
text_field
:path
,
placeholder:
"example-group"
,
class:
"xxlarge danger"
%ul
.cred
%ul
.cred
%li
Changing group path can have unintended side effects.
%li
Changing group path can have unintended side effects.
...
...
app/views/admin/groups/new.html.haml
View file @
49fa9907
...
@@ -4,14 +4,14 @@
...
@@ -4,14 +4,14 @@
-
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/admin/hooks/index.html.haml
View file @
49fa9907
...
@@ -10,9 +10,9 @@
...
@@ -10,9 +10,9 @@
.alert.alert-error
.alert.alert-error
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
%p
=
msg
.c
learfix
.c
ontrol-group
=
f
.
label
:url
,
"URL:"
=
f
.
label
:url
,
"URL:"
.
input
.
controls
=
f
.
text_field
:url
,
class:
"text_field xxlarge input-xpadding"
=
f
.
text_field
:url
,
class:
"text_field xxlarge input-xpadding"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
...
...
app/views/admin/users/_form.html.haml
View file @
49fa9907
...
@@ -8,28 +8,28 @@
...
@@ -8,28 +8,28 @@
%fieldset
%fieldset
%legend
Account
%legend
Account
.c
learfix
.c
ontrol-group
=
f
.
label
:name
=
f
.
label
:name
.
input
.
controls
=
f
.
text_field
:name
,
required:
true
,
autocomplete:
"off"
=
f
.
text_field
:name
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
%span
.help-inline
* required
.c
learfix
.c
ontrol-group
=
f
.
label
:username
=
f
.
label
:username
.
input
.
controls
=
f
.
text_field
:username
,
required:
true
,
autocomplete:
"off"
=
f
.
text_field
:username
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
%span
.help-inline
* required
.c
learfix
.c
ontrol-group
=
f
.
label
:email
=
f
.
label
:email
.
input
.
controls
=
f
.
text_field
:email
,
required:
true
,
autocomplete:
"off"
=
f
.
text_field
:email
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
%span
.help-inline
* required
-
if
@user
.
new_record?
-
if
@user
.
new_record?
%fieldset
%fieldset
%legend
Password
%legend
Password
.c
learfix
.c
ontrol-group
=
f
.
label
:password
=
f
.
label
:password
.
input
.
controls
%strong
%strong
A temporary password will be generated and sent to user.
A temporary password will be generated and sent to user.
%br
%br
...
@@ -37,33 +37,33 @@
...
@@ -37,33 +37,33 @@
-
else
-
else
%fieldset
%fieldset
%legend
Password
%legend
Password
.c
learfix
.c
ontrol-group
=
f
.
label
:password
=
f
.
label
:password
.
input
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
.
controls
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
.c
learfix
.c
ontrol-group
=
f
.
label
:password_confirmation
=
f
.
label
:password_confirmation
.
input
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
.
controls
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
%fieldset
%fieldset
%legend
Access
%legend
Access
.row
.row
.span8
.span8
.c
learfix
.c
ontrol-group
=
f
.
label
:projects_limit
=
f
.
label
:projects_limit
.
input
=
f
.
number_field
:projects_limit
.
controls
=
f
.
number_field
:projects_limit
.c
learfix
.c
ontrol-group
=
f
.
label
:can_create_group
=
f
.
label
:can_create_group
.
input
=
f
.
check_box
:can_create_group
.
controls
=
f
.
check_box
:can_create_group
.c
learfix
.c
ontrol-group
=
f
.
label
:can_create_team
=
f
.
label
:can_create_team
.
input
=
f
.
check_box
:can_create_team
.
controls
=
f
.
check_box
:can_create_team
.c
learfix
.c
ontrol-group
=
f
.
label
:admin
do
=
f
.
label
:admin
do
%strong
.cred
Administrator
%strong
.cred
Administrator
.
input
=
f
.
check_box
:admin
.
controls
=
f
.
check_box
:admin
.span4
.span4
-
unless
@user
.
new_record?
-
unless
@user
.
new_record?
.alert.alert-error
.alert.alert-error
...
@@ -75,15 +75,15 @@
...
@@ -75,15 +75,15 @@
=
link_to
'Block User'
,
block_admin_user_path
(
@user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn btn-small btn-remove"
=
link_to
'Block User'
,
block_admin_user_path
(
@user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn btn-small btn-remove"
%fieldset
%fieldset
%legend
Profile
%legend
Profile
.c
learfix
.c
ontrol-group
=
f
.
label
:skype
=
f
.
label
:skype
.
input
=
f
.
text_field
:skype
.
controls
=
f
.
text_field
:skype
.c
learfix
.c
ontrol-group
=
f
.
label
:linkedin
=
f
.
label
:linkedin
.
input
=
f
.
text_field
:linkedin
.
controls
=
f
.
text_field
:linkedin
.c
learfix
.c
ontrol-group
=
f
.
label
:twitter
=
f
.
label
:twitter
.
input
=
f
.
text_field
:twitter
.
controls
=
f
.
text_field
:twitter
.actions
.actions
-
if
@user
.
new_record?
-
if
@user
.
new_record?
...
...
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