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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
010a770b
Commit
010a770b
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate forms and inputs pt1
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
16eb3ac3
Changes
42
Show whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
102 additions
and
129 deletions
+102
-129
app/assets/javascripts/behaviors/toggler_behavior.coffee
app/assets/javascripts/behaviors/toggler_behavior.coffee
+3
-3
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+0
-6
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+5
-37
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+1
-1
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+3
-2
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+1
-0
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/nav.scss
+1
-0
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+2
-3
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+6
-1
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+2
-2
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+1
-1
app/views/admin/groups/edit.html.haml
app/views/admin/groups/edit.html.haml
+3
-3
app/views/admin/groups/new.html.haml
app/views/admin/groups/new.html.haml
+2
-2
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+1
-1
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+1
-1
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+1
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+2
-2
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+2
-2
app/views/kaminari/gitlab/_paginator.html.haml
app/views/kaminari/gitlab/_paginator.html.haml
+2
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+4
-3
app/views/profiles/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+5
-7
app/views/profiles/keys/new.html.haml
app/views/profiles/keys/new.html.haml
+2
-0
app/views/profiles/notifications/_settings.html.haml
app/views/profiles/notifications/_settings.html.haml
+4
-4
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+3
-3
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+7
-7
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+7
-7
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+2
-2
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+1
-1
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+3
-3
app/views/projects/issues/_head.html.haml
app/views/projects/issues/_head.html.haml
+4
-3
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+2
-2
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+2
-2
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+3
-3
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+2
-2
app/views/projects/snippets/_form.html.haml
app/views/projects/snippets/_form.html.haml
+1
-1
app/views/projects/team_members/import.html.haml
app/views/projects/team_members/import.html.haml
+1
-1
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+1
-1
app/views/projects/wikis/git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+1
-1
app/views/search/show.html.haml
app/views/search/show.html.haml
+1
-1
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+5
-3
app/views/snippets/_form.html.haml
app/views/snippets/_form.html.haml
+1
-1
No files found.
app/assets/javascripts/behaviors/toggler_behavior.coffee
View file @
010a770b
...
...
@@ -9,7 +9,7 @@ $ ->
toggleClass
(
'icon-chevron-down'
).
toggleClass
(
'icon-chevron-up'
)
container
=
$
(
".js-toggle-visibility-container"
)
container
.
toggleClass
(
"hide"
)
container
.
toggleClass
(
"
gl-
hide"
)
e
.
preventDefault
()
$
(
"body"
).
on
"click"
,
".js-toggle-button"
,
(
e
)
->
...
...
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
010a770b
...
...
@@ -69,12 +69,6 @@
}
}
.pagination
ul
>
li
>
a
,
.pagination
ul
>
li
>
span
{
@include
linear-gradient
(
#f1f1f1
,
#e1e1e1
);
color
:
#333
;
text-shadow
:
0
1px
1px
#FFF
;
}
pre
.well-pre
{
border
:
1px
solid
#EEE
;
background
:
#f9f9f9
;
...
...
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
010a770b
input
[
type
=
"text"
],
input
[
type
=
"password"
],
input
[
type
=
"search"
],
input
[
type
=
"email"
]
{
@extend
.form-control
;
}
form
{
@extend
.form-horizontal
;
label
{
@extend
.control-label
;
@extend
.col-sm-2
;
&
.radio-label
{
text-align
:
left
;
width
:
100%
;
margin-left
:
0
;
input
[
type
=
"radio"
]
{
margin-top
:
1px
!
important
;
}
}
&
.list-label
{
float
:
none
;
padding
:
0
!
important
;
margin
:
0
;
text-align
:
left
;
}
}
&
.form-tiny
{
margin
:
0
;
}
}
input
[
type
=
'search'
]
.search-text-input
{
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
padding-left
:
25px
;
@include
border-radius
(
4px
);
border
:
1px
solid
#ccc
;
}
input
[
type
=
'text'
]
.danger
{
...
...
@@ -63,5 +27,9 @@ fieldset legend {
margin-bottom
:
18px
;
background-color
:
whitesmoke
;
border-top
:
1px
solid
#e5e5e5
;
padding-left
:
180px
;
padding-left
:
17%
;
}
label
.control-label
{
@extend
.col-sm-2
;
}
app/assets/stylesheets/sections/commits.scss
View file @
010a770b
...
...
@@ -80,7 +80,7 @@
border-right
:
1px
solid
#ccc
;
text-align
:
right
;
min-width
:
35px
;
max-width
:
35
px
;
max-width
:
50
px
;
width
:
35px
;
@include
user-select
(
none
);
a
{
...
...
app/assets/stylesheets/sections/dashboard.scss
View file @
010a770b
...
...
@@ -32,14 +32,15 @@
.dash-filter
{
margin
:
7px
0
;
padding
:
4px
6px
;
width
:
2
02
px
;
width
:
2
20
px
;
float
:
left
;
height
:
inherit
;
}
}
@media
(
max-width
:
1200px
)
{
.dashboard
.dash-filter
{
width
:
1
32
px
;
width
:
1
50
px
;
}
}
...
...
app/assets/stylesheets/sections/header.scss
View file @
010a770b
...
...
@@ -99,6 +99,7 @@ header {
form
{
margin
:
0
;
padding
:
0
;
}
.search-input
{
...
...
app/assets/stylesheets/sections/nav.scss
View file @
010a770b
...
...
@@ -6,6 +6,7 @@
border-bottom
:
1px
solid
#E1E1E1
;
ul
{
padding
:
0
;
margin
:
auto
;
height
:
40px
;
overflow
:
hidden
;
...
...
app/assets/stylesheets/sections/profile.scss
View file @
010a770b
.update-notifications
{
margin-bottom
:
0
;
label
{
margin-bottom
:
0
;
.radio-inline
{
margin-right
:
30px
;
}
}
...
...
app/assets/stylesheets/sections/projects.scss
View file @
010a770b
...
...
@@ -67,7 +67,7 @@
}
.git-clone-holder
{
float
:
right
;
margin-right
:
45px
;
border
:
1px
solid
#E1E1E1
;
@include
border-radius
(
4px
);
...
...
@@ -100,6 +100,11 @@
cursor
:
auto
;
@extend
.monospace
;
background
:
#FAFAFA
;
width
:
100%
;
}
.protocol-clone
{
overflow
:
hidden
;
}
}
...
...
app/assets/stylesheets/sections/tree.scss
View file @
010a770b
...
...
@@ -24,10 +24,10 @@
th
{
font-weight
:
normal
;
font-size
:
15px
;
border-bottom
:
1px
solid
#CCC
;
border-bottom
:
1px
solid
#CCC
!
important
;
}
td
{
border-color
:
#F1F1F1
;
border-color
:
#F1F1F1
!
important
;
}
&
:hover
{
td
{
...
...
app/views/admin/broadcast_messages/index.html.haml
View file @
010a770b
...
...
@@ -14,7 +14,7 @@
.form-group
=
f
.
label
:message
.col-sm-10
=
f
.
text_area
:message
,
class:
"input-
xxlarge
"
,
rows:
2
,
required:
true
=
f
.
text_area
:message
,
class:
"input-
lg
"
,
rows:
2
,
required:
true
%div
=
link_to
'#'
,
class:
'js-toggle-colors-link'
do
Customize colors
...
...
app/views/admin/groups/edit.html.haml
View file @
010a770b
...
...
@@ -8,18 +8,18 @@
=
f
.
label
:name
do
Group name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Group"
,
class:
"input-
xxlarge
"
=
f
.
text_field
:name
,
placeholder:
"Example Group"
,
class:
"input-
lg
"
.form-group.group-description-holder
=
f
.
label
:description
,
"Details"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
lg
js-gfm-input"
,
rows:
4
.form-group.group_name_holder
=
f
.
label
:path
do
%span
.cred
Group path
.col-sm-10
=
f
.
text_field
:path
,
placeholder:
"example-group"
,
class:
"input-
xxlarge
danger"
=
f
.
text_field
:path
,
placeholder:
"example-group"
,
class:
"input-
lg
danger"
%ul
.cred
%li
Changing group path can have unintended side effects.
%li
Renaming group path will rename directory for all related projects
...
...
app/views/admin/groups/new.html.haml
View file @
010a770b
...
...
@@ -8,11 +8,11 @@
=
f
.
label
:name
do
Group name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
xxlarge
left"
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
lg
left"
.form-group.group-description-holder
=
f
.
label
:description
,
"Details"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
lg
js-gfm-input"
,
rows:
4
.form-actions
=
f
.
submit
'Create group'
,
class:
"btn btn-create"
...
...
app/views/admin/hooks/index.html.haml
View file @
010a770b
...
...
@@ -16,7 +16,7 @@
.form-group
=
f
.
label
:url
,
"URL:"
.col-sm-10
=
f
.
text_field
:url
,
class:
"text_field input-
xxlarge
input-xpadding"
=
f
.
text_field
:url
,
class:
"text_field input-
lg
input-xpadding"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
%hr
...
...
app/views/dashboard/_groups.html.haml
View file @
010a770b
.ui-box
.title.clearfix
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter'
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter
form-control
'
-
if
current_user
.
can_create_group?
%span
.pull-right
=
link_to
new_group_path
,
class:
"btn btn-new"
do
...
...
app/views/dashboard/_projects.html.haml
View file @
010a770b
.ui-box
.title.clearfix
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter'
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter
form-control
'
-
if
current_user
.
can_create_project?
%span
.pull-right
=
link_to
new_project_path
,
class:
"btn btn-new"
do
...
...
app/views/groups/edit.html.haml
View file @
010a770b
...
...
@@ -28,12 +28,12 @@
=
f
.
label
:name
do
Group name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
xxlarge
left"
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
lg
left"
.form-group.group-description-holder
=
f
.
label
:description
,
"Details"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
lg
js-gfm-input"
,
rows:
4
.form-actions
=
f
.
submit
'Save group'
,
class:
"btn btn-save"
...
...
app/views/groups/new.html.haml
View file @
010a770b
...
...
@@ -6,12 +6,12 @@
=
f
.
label
:name
do
Group name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
xxlarge
left"
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-
lg
left"
.form-group.group-description-holder
=
f
.
label
:description
,
"Details"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-
lg
js-gfm-input"
,
rows:
4
.form-group
.col-sm-10
...
...
app/views/kaminari/gitlab/_paginator.html.haml
View file @
010a770b
...
...
@@ -6,8 +6,8 @@
-# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside
=
paginator
.
render
do
%div
.pagination
%ul
%div
.
gl-
pagination
%ul
.pagination
=
prev_page_tag
unless
current_page
.
first?
-
each_page
do
|
page
|
-
if
page
.
left_outer?
||
page
.
right_outer?
||
page
.
inside_window?
...
...
app/views/profiles/accounts/show.html.haml
View file @
010a770b
...
...
@@ -23,8 +23,9 @@
%p
.cgray
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"input-xlarge input-xpadding pull-left"
=
f
.
submit
'Reset'
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-primary btn-build-token prepend-left-10"
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"form-control"
%div
=
f
.
submit
'Reset'
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-primary btn-build-token"
-
else
%span
You don`t have one yet. Click generate to fix it.
=
f
.
submit
'Generate'
,
class:
"btn success btn-build-token"
...
...
@@ -47,7 +48,7 @@
%p
Changing your username will change path to all personal projects!
%div
=
f
.
text_field
:username
,
required:
true
,
class:
'
input-xlarge input-xpadding
'
=
f
.
text_field
:username
,
required:
true
,
class:
'
form-control
'
%span
.loading-gif.gl-hide
=
image_tag
"ajax_loader.gif"
%p
.light
...
...
app/views/profiles/keys/_form.html.haml
View file @
010a770b
%div
=
form_for
[
:profile
,
@key
]
do
|
f
|
=
form_for
[
:profile
,
@key
]
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
-
if
@key
.
errors
.
any?
.alert.alert-error
%ul
...
...
@@ -7,14 +7,12 @@
%li
=
msg
.form-group
=
f
.
label
:title
.col-sm-10
=
f
.
text_field
:title
,
class:
"
input-xlarge
"
=
f
.
label
:title
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:title
,
class:
"
form-control
"
.form-group
=
f
.
label
:key
=
f
.
label
:key
,
class:
'control-label'
.col-sm-10
%p
.light
Paste your public key here. Read more about how to generate a key on
#{
link_to
"the SSH help page"
,
help_ssh_path
}
.
=
f
.
text_area
:key
,
class:
"input-xxlarge thin_area"
=
f
.
text_area
:key
,
class:
"form-control"
,
rows:
8
.form-actions
...
...
app/views/profiles/keys/new.html.haml
View file @
010a770b
%h3
.page-title
Add an SSH Key
%p
.light
Paste your public key here. Read more about how to generate a key on
#{
link_to
"the SSH help page"
,
help_ssh_path
}
.
%hr
=
render
'form'
...
...
app/views/profiles/notifications/_settings.html.haml
View file @
010a770b
...
...
@@ -13,19 +13,19 @@
=
hidden_field_tag
:notification_type
,
type
,
id:
dom_id
(
membership
,
'notification_type'
)
=
hidden_field_tag
:notification_id
,
membership
.
id
,
id:
dom_id
(
membership
,
'notification_id'
)
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_GLOBAL
,
notification
.
global?
,
id:
dom_id
(
membership
,
'notification_level'
),
class:
'trigger-submit'
%span
Use global setting
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_DISABLED
,
notification
.
disabled?
,
id:
dom_id
(
membership
,
'notification_level'
),
class:
'trigger-submit'
%span
Disabled
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_PARTICIPATING
,
notification
.
participating?
,
id:
dom_id
(
membership
,
'notification_level'
),
class:
'trigger-submit'
%span
Participating
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_WATCH
,
notification
.
watch?
,
id:
dom_id
(
membership
,
'notification_level'
),
class:
'trigger-submit'
%span
Watch
app/views/profiles/notifications/show.html.haml
View file @
010a770b
...
...
@@ -26,15 +26,15 @@
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
'global'
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_DISABLED
,
@notification
.
disabled?
,
class:
'trigger-submit'
%span
Disabled
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_PARTICIPATING
,
@notification
.
participating?
,
class:
'trigger-submit'
%span
Participating
=
label_tag
do
=
label_tag
nil
,
class:
'radio-inline'
do
=
radio_button_tag
:notification_level
,
Notification
::
N_WATCH
,
@notification
.
watch?
,
class:
'trigger-submit'
%span
Watch
...
...
app/views/profiles/passwords/edit.html.haml
View file @
010a770b
...
...
@@ -3,7 +3,7 @@
Change your password or recover your current one.
%hr
.update-password
=
form_for
@user
,
url:
profile_password_path
,
method: :put
do
|
f
|
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
%div
%p
.slead
You must provide current password in order to change it.
...
...
@@ -15,18 +15,18 @@
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.form-group
=
f
.
label
:current_password
=
f
.
label
:current_password
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
%div
=
link_to
"Forgot your password?"
,
reset_profile_password_path
,
method: :put
.form-group
=
f
.
label
:password
,
'New password'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
=
f
.
label
:password
,
'New password'
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
.form-group
=
f
.
label
:password_confirmation
=
f
.
label
:password_confirmation
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:password_confirmation
,
required:
true
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control'
.form-actions
=
f
.
submit
'Save password'
,
class:
"btn btn-save"
app/views/profiles/show.html.haml
View file @
010a770b
...
...
@@ -19,18 +19,18 @@
.form-group
=
f
.
label
:name
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:name
,
class:
"
input-xlarge
"
,
required:
true
=
f
.
text_field
:name
,
class:
"
form-control
"
,
required:
true
%span
.help-block
Enter your name, so people you know can recognize you.
.form-group
=
f
.
label
:email
,
class:
"control-label"
.col-sm-10
-
if
@user
.
ldap_user?
=
f
.
text_field
:email
,
class:
"
input-xlarge
"
,
required:
true
,
readonly:
true
=
f
.
text_field
:email
,
class:
"
form-control
"
,
required:
true
,
readonly:
true
%span
.help-block.light
Email is read-only for LDAP user
-
else
=
f
.
text_field
:email
,
class:
"
input-xlarge
"
,
required:
true
=
f
.
text_field
:email
,
class:
"
form-control
"
,
required:
true
-
if
@user
.
unconfirmed_email
.
present?
%span
.help-block
We sent confirmation email to
...
...
@@ -39,17 +39,17 @@
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
.form-group
=
f
.
label
:skype
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:skype
,
class:
"
input-xlarge
"
.col-sm-10
=
f
.
text_field
:skype
,
class:
"
form-control
"
.form-group
=
f
.
label
:linkedin
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:linkedin
,
class:
"
input-xlarge
"
.col-sm-10
=
f
.
text_field
:linkedin
,
class:
"
form-control
"
.form-group
=
f
.
label
:twitter
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:twitter
,
class:
"
input-xlarge
"
.col-sm-10
=
f
.
text_field
:twitter
,
class:
"
form-control
"
.form-group
=
f
.
label
:bio
,
class:
"control-label"
.col-sm-10
=
f
.
text_area
:bio
,
rows:
6
,
class:
"
input-xlarge
"
,
maxlength:
250
=
f
.
text_area
:bio
,
rows:
6
,
class:
"
form-control
"
,
maxlength:
250
%span
.help-block
Tell us about yourself in fewer than 250 characters.
.col-md-5.pull-right
...
...
app/views/projects/deploy_keys/_form.html.haml
View file @
010a770b
...
...
@@ -8,14 +8,14 @@
.form-group
=
f
.
label
:title
.col-sm-10
=
f
.
text_field
:title
,
class:
'input-
xlarge
'
.col-sm-10
=
f
.
text_field
:title
,
class:
'input-
lg
'
.form-group
=
f
.
label
:key
.col-sm-10
%p
.light
Paste a machine public key here. Read more about how to generate it
=
link_to
"here"
,
help_ssh_path
=
f
.
text_area
:key
,
class:
"input-
xxlarge
thin_area"
=
f
.
text_area
:key
,
class:
"input-
lg
thin_area"
.form-actions
=
f
.
submit
'Create'
,
class:
"btn-create btn"
...
...
app/views/projects/hooks/index.html.haml
View file @
010a770b
...
...
@@ -15,7 +15,7 @@
.form-group
=
f
.
label
:url
,
"URL"
.col-sm-10
=
f
.
text_field
:url
,
class:
"text_field input-
xxlarge
input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
text_field
:url
,
class:
"text_field input-
lg
input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
.form-group
...
...
app/views/projects/issues/_form.html.haml
View file @
010a770b
...
...
@@ -12,7 +12,7 @@
=
f
.
label
:title
do
%strong
=
"Subject *"
.col-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-
xxlarge
js-gfm-input"
,
autofocus:
true
,
required:
true
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-
lg
js-gfm-input"
,
autofocus:
true
,
required:
true
.context
.form-group
.issue_assignee.pull-left
...
...
@@ -37,13 +37,13 @@
%i
.icon-tag
Labels
.col-sm-10
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"input-
xxlarge
"
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"input-
lg
"
%p
.hint
Separate labels with commas.
.form-group
=
f
.
label
:description
,
"Details"
.col-sm-10
=
f
.
text_area
:description
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
14
=
f
.
text_area
:description
,
class:
"input-
lg
js-gfm-input"
,
rows:
14
%p
.hint
Issues are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
...
...
app/views/projects/issues/_head.html.haml
View file @
010a770b
...
...
@@ -17,9 +17,10 @@
%li
.pull-right
.pull-right
=
form_tag
project_issues_path
(
@project
),
method: :get
,
id:
"issue_search_form"
,
class:
'inline issue-search-form'
do
.append-right-10
=
search_field_tag
:issue_search
,
nil
,
{
placeholder:
'Filter by title or description'
,
class:
'form-control issue_search search-text-input'
}
-
if
can?
current_user
,
:write_issue
,
@project
=
link_to
new_project_issue_path
(
@project
,
issue:
{
assignee_id:
params
[
:assignee_id
],
milestone_id:
params
[
:milestone_id
]}),
class:
"btn btn-new
pull-right
"
,
title:
"New Issue"
,
id:
"new_issue_link"
do
=
link_to
new_project_issue_path
(
@project
,
issue:
{
assignee_id:
params
[
:assignee_id
],
milestone_id:
params
[
:milestone_id
]}),
class:
"btn btn-new"
,
title:
"New Issue"
,
id:
"new_issue_link"
do
%i
.icon-plus
New Issue
=
form_tag
project_issues_path
(
@project
),
method: :get
,
id:
"issue_search_form"
,
class:
'pull-right issue-search-form'
do
=
search_field_tag
:issue_search
,
nil
,
{
placeholder:
'Filter by title or description'
,
class:
'input-xpadding issue_search input-xlarge append-right-10 search-text-input'
}
app/views/projects/merge_requests/_form.html.haml
View file @
010a770b
...
...
@@ -33,7 +33,7 @@
.form-group
=
f
.
label
:title
do
%strong
=
"Title *"
.col-sm-10
=
f
.
text_field
:title
,
class:
"input-
xxlarge
pad js-gfm-input"
,
maxlength:
255
,
rows:
5
,
required:
true
.col-sm-10
=
f
.
text_field
:title
,
class:
"input-
lg
pad js-gfm-input"
,
maxlength:
255
,
rows:
5
,
required:
true
.form-group
.left
=
f
.
label
:assignee_id
do
...
...
@@ -48,7 +48,7 @@
.form-group
=
f
.
label
:description
,
"Description"
.col-sm-10
=
f
.
text_area
:description
,
class:
"input-
xxlarge
js-gfm-input"
,
rows:
14
=
f
.
text_area
:description
,
class:
"input-
lg
js-gfm-input"
,
rows:
14
%p
.hint
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
...
...
app/views/projects/milestones/_form.html.haml
View file @
010a770b
...
...
@@ -16,12 +16,12 @@
.form-group
=
f
.
label
:title
,
"Title"
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-
xlarge
"
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-
lg
"
%p
.hint
Required
.form-group
=
f
.
label
:description
,
"Description"
,
class:
"control-label"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
2000
,
class:
"input-
xlarge
"
,
rows:
10
=
f
.
text_area
:description
,
maxlength:
2000
,
class:
"input-
lg
"
,
rows:
10
%p
.hint
Milestones are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
.col-md-6
.form-group
...
...
app/views/projects/network/_head.html.haml
View file @
010a770b
...
...
@@ -15,7 +15,7 @@
.form-group
=
label_tag
:search
,
"Looking for commit:"
,
class:
'control-label light'
.col-sm-10
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
"search-input input-
xlarge
"
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
"search-input input-
lg
"
=
button_tag
type:
'submit'
,
class:
'btn vtop'
do
%i
.icon-search
-
@options
.
each
do
|
key
,
value
|
...
...
app/views/projects/new.html.haml
View file @
010a770b
...
...
@@ -8,7 +8,7 @@
=
f
.
label
:name
do
%strong
Project name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"input-
xlarge
"
,
tabindex:
1
,
autofocus:
true
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"input-
lg
"
,
tabindex:
1
,
autofocus:
true
%span
.help-inline
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
%span
Customize repository name?
...
...
@@ -38,7 +38,7 @@
=
f
.
label
:import_url
do
%span
Import existing repo
.col-sm-10
=
f
.
text_field
:import_url
,
class:
'input-
xlarge
'
,
placeholder:
'https://github.com/randx/six.git'
=
f
.
text_field
:import_url
,
class:
'input-
lg
'
,
placeholder:
'https://github.com/randx/six.git'
.light
URL must be cloneable
.form-group
...
...
@@ -46,7 +46,7 @@
Description
%span
.light
(optional)
.col-sm-10
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"input-
xlarge
"
,
rows:
3
,
maxlength:
250
,
tabindex:
3
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"input-
lg
"
,
rows:
3
,
maxlength:
250
,
tabindex:
3
=
render
"visibility_level"
,
f:
f
,
visibility_level:
gitlab_config
.
default_projects_features
.
visibility_level
,
can_change_visibility_level:
true
.form-actions
...
...
app/views/projects/services/_form.html.haml
View file @
010a770b
...
...
@@ -32,9 +32,9 @@
=
f
.
label
name
,
class:
"control-label"
.col-sm-10
-
if
type
==
'text'
=
f
.
text_field
name
,
class:
"input-
xlarge
"
,
placeholder:
placeholder
=
f
.
text_field
name
,
class:
"input-
lg
"
,
placeholder:
placeholder
-
elsif
type
==
'textarea'
=
f
.
text_area
name
,
rows:
5
,
class:
"input-
xxlarge
"
,
placeholder:
placeholder
=
f
.
text_area
name
,
rows:
5
,
class:
"input-
lg
"
,
placeholder:
placeholder
-
elsif
type
==
'checkbox'
=
f
.
check_box
name
...
...
app/views/projects/snippets/_form.html.haml
View file @
010a770b
...
...
@@ -11,7 +11,7 @@
.form-group
=
f
.
label
:title
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-
xlarge
'
,
required:
true
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-
lg
'
,
required:
true
.form-group
=
f
.
label
"Lifetime"
.col-sm-10
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
...
...
app/views/projects/team_members/import.html.haml
View file @
010a770b
...
...
@@ -6,7 +6,7 @@
=
form_tag
apply_import_project_team_members_path
(
@project
),
method:
'post'
do
.padded
=
label_tag
:source_project_id
,
"Project"
.col-sm-10
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen
xxlarge
"
,
required:
true
)
.col-sm-10
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen
lg
"
,
required:
true
)
.form-actions
=
submit_tag
'Import project members'
,
class:
"btn btn-create"
...
...
app/views/projects/wikis/_new.html.haml
View file @
010a770b
...
...
@@ -5,7 +5,7 @@
.modal-body
=
label_tag
:new_wiki_path
do
%span
Page slug
=
text_field_tag
:new_wiki_path
,
nil
,
placeholder:
'how-to-setup'
,
class:
'input-
xlarge
'
,
required:
true
,
:'data-wikis-path'
=>
project_wikis_path
(
@project
)
=
text_field_tag
:new_wiki_path
,
nil
,
placeholder:
'how-to-setup'
,
class:
'input-
lg
'
,
required:
true
,
:'data-wikis-path'
=>
project_wikis_path
(
@project
)
%p
.hint
Please don't use spaces and slashes
.modal-footer
...
...
app/views/projects/wikis/git_access.html.haml
View file @
010a770b
...
...
@@ -7,7 +7,7 @@
.git-clone-holder
%button
{
class:
"btn active"
,
:"data-clone"
=>
@gollum_wiki
.
ssh_url_to_repo
}
SSH
%button
{
class:
"btn"
,
:"data-clone"
=>
@gollum_wiki
.
http_url_to_repo
}=
gitlab_config
.
protocol
.
upcase
=
text_field_tag
:project_clone
,
@gollum_wiki
.
url_to_repo
,
class:
"one_click_select input-
xxlarge
"
,
readonly:
true
=
text_field_tag
:project_clone
,
@gollum_wiki
.
url_to_repo
,
class:
"one_click_select input-
lg
"
,
readonly:
true
.git-empty
%fieldset
...
...
app/views/search/show.html.haml
View file @
010a770b
...
...
@@ -3,7 +3,7 @@
=
label_tag
:search
do
%span
Looking for
.col-sm-10
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"issue 143"
,
class:
"input-
xxlarge
search-text-input"
,
id:
"dashboard_search"
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"issue 143"
,
class:
"input-
lg
search-text-input"
,
id:
"dashboard_search"
=
hidden_field_tag
:project_id
,
params
[
:project_id
]
=
hidden_field_tag
:group_id
,
params
[
:group_id
]
=
hidden_field_tag
:search_code
,
params
[
:search_code
]
...
...
app/views/shared/_clone_panel.html.haml
View file @
010a770b
.git-clone-holder
.protocol-btns
%button
{
class:
"btn #{ 'active' if default_clone_protocol == 'ssh' }"
,
:"data-clone"
=>
@project
.
ssh_url_to_repo
}
SSH
%button
{
class:
"btn #{ 'active' if default_clone_protocol == 'http' }"
,
:"data-clone"
=>
@project
.
http_url_to_repo
}=
gitlab_config
.
protocol
.
upcase
.protocol-clone
=
text_field_tag
:project_clone
,
default_url_to_repo
,
class:
"one_click_select span4"
,
readonly:
true
app/views/snippets/_form.html.haml
View file @
010a770b
...
...
@@ -11,7 +11,7 @@
.form-group
=
f
.
label
:title
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-
xlarge
'
,
required:
true
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-
lg
'
,
required:
true
.form-group
=
f
.
label
"Access"
.col-sm-10
...
...
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