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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
df437f41
Commit
df437f41
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 project area pages
parent
c52f9e1a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
26 deletions
+26
-26
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+6
-6
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+4
-4
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+2
-2
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+1
-1
app/views/projects/snippets/_form.html.haml
app/views/projects/snippets/_form.html.haml
+6
-6
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/_form.html.haml
+4
-4
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+3
-3
No files found.
app/views/profiles/passwords/new.html.haml
View file @
df437f41
...
@@ -10,13 +10,13 @@
...
@@ -10,13 +10,13 @@
-
@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
'Set new password'
,
class:
"btn btn-create"
=
f
.
submit
'Set new password'
,
class:
"btn btn-create"
app/views/projects/deploy_keys/_form.html.haml
View file @
df437f41
...
@@ -6,12 +6,12 @@
...
@@ -6,12 +6,12 @@
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.c
learfix
.c
ontrol-group
=
f
.
label
:title
=
f
.
label
:title
.
input
=
f
.
text_field
:title
.
controls
=
f
.
text_field
:title
.c
learfix
.c
ontrol-group
=
f
.
label
:key
=
f
.
label
:key
.
input
.
controls
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
%p
.hint
%p
.hint
Paste a machine public key here. Read more about how generate it
Paste a machine public key here. Read more about how generate it
...
...
app/views/projects/hooks/index.html.haml
View file @
df437f41
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,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"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
text_field
:url
,
class:
"text_field xxlarge input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
...
...
app/views/projects/milestones/_form.html.haml
View file @
df437f41
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
.span6
.span6
.control-group
.control-group
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.
input
=
f
.
hidden_field
:due_date
.
controls
=
f
.
hidden_field
:due_date
.controls
.controls
.datepicker
.datepicker
...
...
app/views/projects/snippets/_form.html.haml
View file @
df437f41
...
@@ -9,16 +9,16 @@
...
@@ -9,16 +9,16 @@
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.c
learfix
.c
ontrol-group
=
f
.
label
:title
=
f
.
label
:title
.
input
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.
controls
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.c
learfix
.c
ontrol-group
=
f
.
label
"Lifetime"
=
f
.
label
"Lifetime"
.
input
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.
controls
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.c
learfix
.c
ontrol-group
.file-editor
.file-editor
=
f
.
label
:file_name
,
"File"
=
f
.
label
:file_name
,
"File"
.
input
.
controls
.file-holder.snippet
.file-holder.snippet
.file-title
.file-title
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
,
class:
'snippet-file-name'
,
required:
true
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
,
class:
'snippet-file-name'
,
required:
true
...
...
app/views/projects/team_members/_form.html.haml
View file @
df437f41
...
@@ -9,15 +9,15 @@
...
@@ -9,15 +9,15 @@
%li
=
msg
%li
=
msg
%h6
1. Choose people you want in the team
%h6
1. Choose people you want in the team
.c
learfix
.c
ontrol-group
=
f
.
label
:user_ids
,
"People"
=
f
.
label
:user_ids
,
"People"
.
input
.
controls
=
users_select_tag
(
:user_ids
,
multiple:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
)
%h6
2. Set access level for them
%h6
2. Set access level for them
.c
learfix
.c
ontrol-group
=
f
.
label
:project_access
,
"Project Access"
=
f
.
label
:project_access
,
"Project Access"
.
input
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.
controls
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.actions
.actions
=
f
.
submit
'Add users'
,
class:
"btn btn-create"
=
f
.
submit
'Add users'
,
class:
"btn btn-create"
...
...
app/views/projects/wikis/_form.html.haml
View file @
df437f41
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
=
f
.
select
:format
,
options_for_select
(
GollumWiki
::
MARKUPS
,
{
selected:
@wiki
.
format
}),
{},
class:
"pull-right input-medium"
=
f
.
select
:format
,
options_for_select
(
GollumWiki
::
MARKUPS
,
{
selected:
@wiki
.
format
}),
{},
class:
"pull-right input-medium"
=
f
.
label
:format
,
class:
"pull-right"
,
style:
"padding-right: 20px;"
=
f
.
label
:format
,
class:
"pull-right"
,
style:
"padding-right: 20px;"
.ui-box-body
.ui-box-body
.
input
.
controls
%span
.cgray
%span
.cgray
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
To link to a (new) page you can just type
To link to a (new) page you can just type
...
@@ -24,10 +24,10 @@
...
@@ -24,10 +24,10 @@
.ui-box-bottom
.ui-box-bottom
=
f
.
label
:content
=
f
.
label
:content
.
input
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
.
controls
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
.ui-box-bottom
.ui-box-bottom
=
f
.
label
:commit_message
=
f
.
label
:commit_message
.
input
=
f
.
text_field
:message
,
class:
'span8'
.
controls
=
f
.
text_field
:message
,
class:
'span8'
.actions
.actions
-
if
@wiki
&&
@wiki
.
persisted?
-
if
@wiki
&&
@wiki
.
persisted?
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
...
...
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