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
Léo-Paul Géneau
gitlab-ce
Commits
16eb3ac3
Commit
16eb3ac3
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update form classes
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2ecf8319
No related merge requests found
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
231 additions
and
260 deletions
+231
-260
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+0
-29
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+1
-1
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+10
-10
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/projects/index.html.haml
app/views/admin/projects/index.html.haml
+10
-10
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+4
-4
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+24
-24
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/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+4
-4
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+6
-6
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+6
-6
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+12
-12
app/views/projects/_visibility_level.html.haml
app/views/projects/_visibility_level.html.haml
+4
-4
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+4
-4
app/views/projects/branches/new.html.haml
app/views/projects/branches/new.html.haml
+4
-4
app/views/projects/commits/_image.html.haml
app/views/projects/commits/_image.html.haml
+1
-1
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+2
-2
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+4
-4
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+28
-28
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+2
-2
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+4
-4
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+9
-9
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+7
-7
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+7
-7
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+4
-4
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+13
-13
app/views/projects/new_tree/show.html.haml
app/views/projects/new_tree/show.html.haml
+4
-4
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+4
-4
app/views/projects/snippets/_form.html.haml
app/views/projects/snippets/_form.html.haml
+6
-6
app/views/projects/tags/new.html.haml
app/views/projects/tags/new.html.haml
+4
-4
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/_form.html.haml
+4
-4
app/views/projects/team_members/import.html.haml
app/views/projects/team_members/import.html.haml
+1
-1
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+5
-5
app/views/search/show.html.haml
app/views/search/show.html.haml
+1
-1
app/views/snippets/_form.html.haml
app/views/snippets/_form.html.haml
+6
-6
No files found.
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
16eb3ac3
...
...
@@ -32,34 +32,6 @@ form {
}
}
input
.input-xpadding
,
.add-on.input-xpadding
{
padding
:
6px
10px
;
}
.control-group
{
@extend
.form-group
;
.control-label
{
padding-top
:
6px
;
}
.controls
{
@extend
.col-sm-10
;
input
,
textarea
{
padding
:
6px
10px
;
}
input
[
type
=
"radio"
],
input
[
type
=
"checkbox"
]
{
margin-top
:
6px
;
}
.add-on
{
padding
:
6px
;
}
}
}
input
[
type
=
'search'
]
.search-text-input
{
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
...
...
@@ -77,7 +49,6 @@ input[type='text'].danger {
fieldset
legend
{
font-size
:
16px
;
margin-bottom
:
10px
;
}
.datetime-controls
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/profile.scss
View file @
16eb3ac3
...
...
@@ -17,7 +17,7 @@
legend
{
border
:
none
;
margin
:
0
;
margin
-bottom
:
10px
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/broadcast_messages/index.html.haml
View file @
16eb3ac3
...
...
@@ -11,30 +11,30 @@
.alert.alert-error
-
@broadcast_message
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.
control
-group
.
form
-group
=
f
.
label
:message
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:message
,
class:
"input-xxlarge"
,
rows:
2
,
required:
true
%div
=
link_to
'#'
,
class:
'js-toggle-colors-link'
do
Customize colors
.
control
-group.js-toggle-colors-container.gl-hide
.
form
-group.js-toggle-colors-container.gl-hide
=
f
.
label
:color
,
"Background Color"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:color
,
placeholder:
"#AA33EE"
.light
Hex values as 3 double digit numbers, starting with a # sign.
.
control
-group.js-toggle-colors-container.gl-hide
.
form
-group.js-toggle-colors-container.gl-hide
=
f
.
label
:font
,
"Font Color"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:font
,
placeholder:
"#224466"
.light
Hex values as 3 double digit numbers, starting with a # sign.
.
control
-group
.
form
-group
=
f
.
label
:starts_at
.co
ntrols
.datetime-controls
.co
l-sm-10
.datetime-controls
=
f
.
datetime_select
:starts_at
.
control
-group
.
form
-group
=
f
.
label
:ends_at
.co
ntrols
.datetime-controls
.co
l-sm-10
.datetime-controls
=
f
.
datetime_select
:ends_at
.form-actions
=
f
.
submit
"Add broadcast message"
,
class:
"btn btn-create"
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/groups/edit.html.haml
View file @
16eb3ac3
...
...
@@ -4,21 +4,21 @@
-
if
@group
.
errors
.
any?
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
.
control
-group.group_name_holder
.
form
-group.group_name_holder
=
f
.
label
:name
do
Group name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Group"
,
class:
"input-xxlarge"
.
control
-group.group-description-holder
.
form
-group.group-description-holder
=
f
.
label
:description
,
"Details"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-xxlarge js-gfm-input"
,
rows:
4
.
control
-group.group_name_holder
.
form
-group.group_name_holder
=
f
.
label
:path
do
%span
.cred
Group path
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:path
,
placeholder:
"example-group"
,
class:
"input-xxlarge danger"
%ul
.cred
%li
Changing group path can have unintended side effects.
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/groups/new.html.haml
View file @
16eb3ac3
...
...
@@ -4,14 +4,14 @@
-
if
@group
.
errors
.
any?
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
.
control
-group
.
form
-group
=
f
.
label
:name
do
Group name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-xxlarge left"
.
control
-group.group-description-holder
.
form
-group.group-description-holder
=
f
.
label
:description
,
"Details"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-xxlarge js-gfm-input"
,
rows:
4
.form-actions
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/hooks/index.html.haml
View file @
16eb3ac3
...
...
@@ -13,9 +13,9 @@
.alert.alert-error
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.
control
-group
.
form
-group
=
f
.
label
:url
,
"URL:"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:url
,
class:
"text_field input-xxlarge input-xpadding"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/projects/index.html.haml
View file @
16eb3ac3
...
...
@@ -2,32 +2,32 @@
.col-md-4
.admin-filter
=
form_tag
admin_projects_path
,
method: :get
,
class:
'form-inline'
do
.
control
-group
.
form
-group
=
label_tag
:name
,
'Name:'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:name
,
params
[
:name
],
class:
"span2"
.
control
-group
.
form
-group
=
label_tag
:owner_id
,
'Owner:'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
users_select_tag
:owner_id
,
selected:
params
[
:owner_id
],
class:
'input-large input-clamp'
.
control
-group.visibility-levels
.
form
-group.visibility-levels
=
label_tag
:visibility_level
,
'Visibility Levels'
,
class:
'control-label'
-
Project
.
visibility_levels
.
each
do
|
label
,
level
|
.co
ntrols
.co
l-sm-10
=
check_box_tag
'visibility_levels[]'
,
level
,
params
[
:visibility_levels
].
present?
&&
params
[
:visibility_levels
].
include?
(
level
.
to_s
)
%span
.descr
=
visibility_level_icon
(
level
)
=
label
.
control
-group
.
form
-group
=
label_tag
:with_push
,
'Not empty'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
check_box_tag
:with_push
,
1
,
params
[
:with_push
]
%span
.light
Projects with push events
.
control
-group
.
form
-group
=
label_tag
:abandoned
,
'Abandoned'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
check_box_tag
:abandoned
,
1
,
params
[
:abandoned
]
%span
.light
No activity over 6 month
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/projects/show.html.haml
View file @
16eb3ac3
...
...
@@ -80,13 +80,13 @@
Transfer project
.body
=
form_for
@project
,
url:
transfer_admin_project_path
(
@project
),
method: :put
do
|
f
|
.
control
-group
.
form
-group
=
f
.
label
:namespace_id
,
"Namespace"
.co
ntrols
.co
l-sm-10
=
namespace_select_tag
:namespace_id
,
selected:
params
[
:namespace_id
],
class:
'input-large'
.
control
-group
.co
ntrols
.
form
-group
.co
l-sm-10
=
f
.
submit
'Transfer'
,
class:
'btn btn-primary'
.col-md-6
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/users/_form.html.haml
View file @
16eb3ac3
...
...
@@ -8,28 +8,28 @@
%fieldset
%legend
Account
.
control
-group
.
form
-group
=
f
.
label
:name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
.
control
-group
.
form
-group
=
f
.
label
:username
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:username
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
.
control
-group
.
form
-group
=
f
.
label
:email
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:email
,
required:
true
,
autocomplete:
"off"
%span
.help-inline
* required
-
if
@user
.
new_record?
%fieldset
%legend
Password
.
control
-group
.
form
-group
=
f
.
label
:password
.co
ntrols
.co
l-sm-10
%strong
A temporary password will be generated and sent to user.
%br
...
...
@@ -37,29 +37,29 @@
-
else
%fieldset
%legend
Password
.
control
-group
.
form
-group
=
f
.
label
:password
.co
ntrols
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
.
control
-group
.co
l-sm-10
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
.
form
-group
=
f
.
label
:password_confirmation
.co
ntrols
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
.co
l-sm-10
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
%fieldset
%legend
Access
.row
.col-md-8
.
control
-group
.
form
-group
=
f
.
label
:projects_limit
.co
ntrols
=
f
.
number_field
:projects_limit
.co
l-sm-10
=
f
.
number_field
:projects_limit
.
control
-group
.
form
-group
=
f
.
label
:can_create_group
.co
ntrols
=
f
.
check_box
:can_create_group
.co
l-sm-10
=
f
.
check_box
:can_create_group
.
control
-group
.
form
-group
=
f
.
label
:admin
do
%strong
.cred
Administrator
.co
ntrols
=
f
.
check_box
:admin
.co
l-sm-10
=
f
.
check_box
:admin
.col-md-4
-
unless
@user
.
new_record?
.alert.alert-error
...
...
@@ -71,15 +71,15 @@
=
link_to
'Block User'
,
block_admin_user_path
(
@user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
,
class:
"btn btn-small btn-remove"
%fieldset
%legend
Profile
.
control
-group
.
form
-group
=
f
.
label
:skype
.co
ntrols
=
f
.
text_field
:skype
.
control
-group
.co
l-sm-10
=
f
.
text_field
:skype
.
form
-group
=
f
.
label
:linkedin
.co
ntrols
=
f
.
text_field
:linkedin
.
control
-group
.co
l-sm-10
=
f
.
text_field
:linkedin
.
form
-group
=
f
.
label
:twitter
.co
ntrols
=
f
.
text_field
:twitter
.co
l-sm-10
=
f
.
text_field
:twitter
.form-actions
-
if
@user
.
new_record?
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/_new_group_member.html.haml
View file @
16eb3ac3
...
...
@@ -6,14 +6,14 @@
group
%p
1. Choose users you want in the group
.
control
-group
.
form
-group
=
f
.
label
:user_ids
,
"People"
.co
ntrols
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-large'
)
.co
l-sm-10
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-large'
)
%p
2. Set access level for them
.
control
-group
.
form
-group
=
f
.
label
:group_access
,
"Group Access"
.co
ntrols
=
select_tag
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
@users_group
.
group_access
),
class:
"project-access-select chosen"
.co
l-sm-10
=
select_tag
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
@users_group
.
group_access
),
class:
"project-access-select chosen"
.form-actions
=
f
.
submit
'Add users into group'
,
class:
"btn btn-create"
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/edit.html.haml
View file @
16eb3ac3
...
...
@@ -24,15 +24,15 @@
-
if
@group
.
errors
.
any?
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
.
control
-group
.
form
-group
=
f
.
label
:name
do
Group name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-xxlarge left"
.
control
-group.group-description-holder
.
form
-group.group-description-holder
=
f
.
label
:description
,
"Details"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-xxlarge js-gfm-input"
,
rows:
4
.form-actions
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/new.html.haml
View file @
16eb3ac3
...
...
@@ -2,19 +2,19 @@
-
if
@group
.
errors
.
any?
.alert.alert-error
%span
=
@group
.
errors
.
full_messages
.
first
.
control
-group
.
form
-group
=
f
.
label
:name
do
Group name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Ex. OpenSource"
,
class:
"input-xxlarge left"
.
control
-group.group-description-holder
.
form
-group.group-description-holder
=
f
.
label
:description
,
"Details"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"input-xxlarge js-gfm-input"
,
rows:
4
.
control
-group
.co
ntrols
.
form
-group
.co
l-sm-10
%ul
%li
A group is a collection of several projects
%li
Groups are private by default
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/keys/_form.html.haml
View file @
16eb3ac3
...
...
@@ -6,12 +6,12 @@
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:title
.co
ntrols
=
f
.
text_field
:title
,
class:
"input-xlarge"
.
control
-group
.co
l-sm-10
=
f
.
text_field
:title
,
class:
"input-xlarge"
.
form
-group
=
f
.
label
:key
.co
ntrols
.co
l-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"
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/passwords/edit.html.haml
View file @
16eb3ac3
...
...
@@ -14,19 +14,19 @@
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:current_password
.co
ntrols
.co
l-sm-10
=
f
.
password_field
:current_password
,
required:
true
%div
=
link_to
"Forgot your password?"
,
reset_profile_password_path
,
method: :put
.
control
-group
.
form
-group
=
f
.
label
:password
,
'New password'
.co
ntrols
=
f
.
password_field
:password
,
required:
true
.
control
-group
.co
l-sm-10
=
f
.
password_field
:password
,
required:
true
.
form
-group
=
f
.
label
:password_confirmation
.co
ntrols
.co
l-sm-10
=
f
.
password_field
:password_confirmation
,
required:
true
.form-actions
=
f
.
submit
'Save password'
,
class:
"btn btn-save"
This diff is collapsed.
Click to expand it.
app/views/profiles/passwords/new.html.haml
View file @
16eb3ac3
...
...
@@ -10,13 +10,13 @@
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:password
.co
ntrols
=
f
.
password_field
:password
,
required:
true
.
control
-group
.co
l-sm-10
=
f
.
password_field
:password
,
required:
true
.
form
-group
=
f
.
label
:password_confirmation
.co
ntrols
.co
l-sm-10
=
f
.
password_field
:password_confirmation
,
required:
true
.
control
-group
.co
ntrols
.
form
-group
.co
l-sm-10
=
f
.
submit
'Set new password'
,
class:
"btn btn-create"
This diff is collapsed.
Click to expand it.
app/views/profiles/show.html.haml
View file @
16eb3ac3
...
...
@@ -16,15 +16,15 @@
%li
=
msg
.row
.col-md-7
.
control
-group
.
form
-group
=
f
.
label
:name
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
class:
"input-xlarge"
,
required:
true
%span
.help-block
Enter your name, so people you know can recognize you.
.
control
-group
.
form
-group
=
f
.
label
:email
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
-
if
@user
.
ldap_user?
=
f
.
text_field
:email
,
class:
"input-xlarge"
,
required:
true
,
readonly:
true
%span
.help-block.light
...
...
@@ -37,18 +37,18 @@
%strong
#{
@user
.
unconfirmed_email
}
-
else
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
.
control
-group
.
form
-group
=
f
.
label
:skype
,
class:
"control-label"
.co
ntrols
=
f
.
text_field
:skype
,
class:
"input-xlarge"
.
control
-group
.co
l-sm-10
=
f
.
text_field
:skype
,
class:
"input-xlarge"
.
form
-group
=
f
.
label
:linkedin
,
class:
"control-label"
.co
ntrols
=
f
.
text_field
:linkedin
,
class:
"input-xlarge"
.
control
-group
.co
l-sm-10
=
f
.
text_field
:linkedin
,
class:
"input-xlarge"
.
form
-group
=
f
.
label
:twitter
,
class:
"control-label"
.co
ntrols
=
f
.
text_field
:twitter
,
class:
"input-xlarge"
.
control
-group
.co
l-sm-10
=
f
.
text_field
:twitter
,
class:
"input-xlarge"
.
form
-group
=
f
.
label
:bio
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:bio
,
rows:
6
,
class:
"input-xlarge"
,
maxlength:
250
%span
.help-block
Tell us about yourself in fewer than 250 characters.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_visibility_level.html.haml
View file @
16eb3ac3
.
control
-group.project-visibility-level-holder
.
form
-group.project-visibility-level-holder
=
f
.
label
:visibility_level
do
Visibility Level
=
link_to
"(?)"
,
help_public_access_path
-
if
can_change_visibility_level
-
Gitlab
::
VisibilityLevel
.
values
.
each
do
|
level
|
-
restricted
=
restricted_visibility_levels
.
include?
(
level
)
.co
ntrols
.co
l-sm-10
=
f
.
radio_button
:visibility_level
,
level
,
checked:
(
visibility_level
==
level
),
disabled:
restricted
%span
.descr
{
:class
=>
(
"restricted"
if
restricted
)}
=
label
:project_visibility_level
,
level
do
...
...
@@ -14,11 +14,11 @@
=
visibility_level_label
(
level
)
.light
=
visibility_level_description
(
level
)
-
unless
restricted_visibility_levels
.
empty?
.co
ntrols
.co
l-sm-10
%span
.info
Some visibility level settings have been restricted by the administrator.
-
else
.co
ntrols
.co
l-sm-10
%span
.info
=
visibility_level_icon
(
visibility_level
)
%strong
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/blob/_remove.html.haml
View file @
16eb3ac3
...
...
@@ -8,12 +8,12 @@
.modal-body
=
form_tag
project_blob_path
(
@project
,
@id
),
method: :delete
do
.
control
-group.commit_message-group
.
form
-group.commit_message-group
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
.co
ntrols
.co
l-sm-10
=
text_area_tag
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Removed this file because..."
,
required:
true
,
rows:
3
.
control
-group
.co
ntrols
.
form
-group
.co
l-sm-10
=
submit_tag
'Remove file'
,
class:
'btn btn-remove'
=
link_to
"Cancel"
,
'#'
,
class:
"btn btn-cancel"
,
"data-dismiss"
=>
"modal"
This diff is collapsed.
Click to expand it.
app/views/projects/branches/new.html.haml
View file @
16eb3ac3
...
...
@@ -2,13 +2,13 @@
%i
.icon-code-fork
New branch
=
form_tag
project_branches_path
,
method: :post
do
.
control
-group
.
form
-group
=
label_tag
:branch_name
,
'Name for new branch'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:branch_name
,
nil
,
placeholder:
'feature/dashboard'
,
required:
true
,
tabindex:
1
.
control
-group
.
form
-group
=
label_tag
:ref
,
'Create from'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:ref
,
nil
,
placeholder:
'master'
,
required:
true
,
tabindex:
2
.light
branch name or commit SHA
.form-actions
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commits/_image.html.haml
View file @
16eb3ac3
...
...
@@ -49,7 +49,7 @@
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
.frame.added
%img
{
src:
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
.co
ntrols
.co
l-sm-10
.transparent
.drag-track
.dragger
{
:style
=>
"left: 0px;"
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/compare/_form.html.haml
View file @
16eb3ac3
...
...
@@ -4,11 +4,11 @@
-
if
params
[
:to
]
&&
params
[
:from
]
=
link_to
'switch'
,
{
from:
params
[
:to
],
to:
params
[
:from
]},
{
class:
'commits-compare-switch has_tooltip'
,
title:
'Switch base of comparison'
}
.input-prepend
%span
.add-on
.input-xpadding
from
%span
.add-on
from
=
text_field_tag
:from
,
params
[
:from
],
class:
"span3 input-xpadding"
=
"..."
.input-prepend
%span
.add-on
.input-xpadding
to
%span
.add-on
to
=
text_field_tag
:to
,
params
[
:to
],
class:
"span3 input-xpadding"
.pull-left
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/deploy_keys/_form.html.haml
View file @
16eb3ac3
...
...
@@ -6,12 +6,12 @@
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:title
.co
ntrols
=
f
.
text_field
:title
,
class:
'input-xlarge'
.
control
-group
.co
l-sm-10
=
f
.
text_field
:title
,
class:
'input-xlarge'
.
form
-group
=
f
.
label
:key
.co
ntrols
.co
l-sm-10
%p
.light
Paste a machine public key here. Read more about how to generate it
=
link_to
"here"
,
help_ssh_path
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/edit.html.haml
View file @
16eb3ac3
...
...
@@ -9,24 +9,24 @@
.form-holder
=
form_for
(
@project
,
remote:
true
)
do
|
f
|
%fieldset
.
control
-group.project_name_holder
.
form
-group.project_name_holder
=
f
.
label
:name
do
Project name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"span5"
.
control
-group
.
form
-group
=
f
.
label
:description
do
Project description
%span
.light
(optional)
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"span5"
,
rows:
3
,
maxlength:
250
-
if
@project
.
repository
.
exists?
&&
@project
.
repository
.
branch_names
.
any?
.
control
-group
.
form
-group
=
f
.
label
:default_branch
,
"Default Branch"
.co
ntrols
=
f
.
select
(
:default_branch
,
@repository
.
branch_names
,
{},
{
class:
'chosen'
})
.co
l-sm-10
=
f
.
select
(
:default_branch
,
@repository
.
branch_names
,
{},
{
class:
'chosen'
})
=
render
"visibility_level"
,
f:
f
,
visibility_level:
@project
.
visibility_level
,
can_change_visibility_level:
can?
(
current_user
,
:change_visibility_level
,
@project
)
...
...
@@ -34,51 +34,51 @@
%fieldset
.features
%legend
Labels:
.
control
-group
.
form
-group
=
f
.
label
:label_list
,
"Labels"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"span5"
%p
.hint
Separate labels with commas.
%fieldset
.features
%legend
Features:
.
control
-group
.
form
-group
=
f
.
label
:issues_enabled
,
"Issues"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:issues_enabled
%span
.descr
Lightweight issue tracking system for this project
-
if
Project
.
issues_tracker
.
values
.
count
>
1
.
control
-group
.
form
-group
=
f
.
label
:issues_tracker
,
"Issues tracker"
,
class:
'control-label'
.co
ntrols
=
f
.
select
(
:issues_tracker
,
project_issues_trackers
(
@project
.
issues_tracker
),
{},
{
disabled:
!
@project
.
issues_enabled
})
.co
l-sm-10
=
f
.
select
(
:issues_tracker
,
project_issues_trackers
(
@project
.
issues_tracker
),
{},
{
disabled:
!
@project
.
issues_enabled
})
.
control
-group
.
form
-group
=
f
.
label
:issues_tracker_id
,
"Project name or id in issues tracker"
,
class:
'control-label'
.co
ntrols
=
f
.
text_field
:issues_tracker_id
,
disabled:
!
@project
.
can_have_issues_tracker_id?
.co
l-sm-10
=
f
.
text_field
:issues_tracker_id
,
disabled:
!
@project
.
can_have_issues_tracker_id?
.
control
-group
.
form
-group
=
f
.
label
:merge_requests_enabled
,
"Merge Requests"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:merge_requests_enabled
%span
.descr
Submit changes to be merged upstream.
.
control
-group
.
form
-group
=
f
.
label
:wiki_enabled
,
"Wiki"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:wiki_enabled
%span
.descr
Pages for project documentation
.
control
-group
.
form
-group
=
f
.
label
:wall_enabled
,
"Wall"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:wall_enabled
%span
.descr
Simple chat system for broadcasting inside project
.
control
-group
.
form
-group
=
f
.
label
:snippets_enabled
,
"Snippets"
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:snippets_enabled
%span
.descr
Share code pastes with others out of git repository
...
...
@@ -135,11 +135,11 @@
.errors-holder
.form-holder
=
form_for
(
@project
,
url:
transfer_project_path
(
@project
),
method: :put
,
remote:
true
,
html:
{
class:
'transfer-project'
})
do
|
f
|
.
control
-group
.
form
-group
=
f
.
label
:namespace_id
do
%span
Namespace
.co
ntrols
.
control
-group
.co
l-sm-10
.
form
-group
=
f
.
select
:namespace_id
,
namespaces_options
(
@project
.
namespace_id
),
{
prompt:
'Choose a project namespace'
},
{
class:
'chosen'
}
%ul
%li
Be careful. Changing the project's namespace can have unintended side effects.
...
...
@@ -155,11 +155,11 @@
.errors-holder
.form-holder
=
form_for
(
@project
)
do
|
f
|
.
control
-group
.
form
-group
=
f
.
label
:path
do
%span
Path
.co
ntrols
.
control
-group
.co
l-sm-10
.
form
-group
.input-append
=
f
.
text_field
:path
%span
.add-on
.git
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/edit_tree/show.html.haml
View file @
16eb3ac3
...
...
@@ -15,10 +15,10 @@
.file-content.code
%pre
#editor
=
@blob
.
data
.
control
-group.commit_message-group
.
form
-group.commit_message-group
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
.co
ntrols
.co
l-sm-10
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
.form-actions
=
hidden_field_tag
'last_commit'
,
@last_commit
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/hooks/index.html.haml
View file @
16eb3ac3
...
...
@@ -12,15 +12,15 @@
.alert.alert-error
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.
control
-group
.
form
-group
=
f
.
label
:url
,
"URL"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:url
,
class:
"text_field input-xxlarge input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
.
control
-group
.
form
-group
=
f
.
label
:url
,
"Trigger"
.co
ntrols
.co
l-sm-10
%div
=
f
.
check_box
:push_events
,
class:
'pull-left'
.prepend-left-20
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/issues/_form.html.haml
View file @
16eb3ac3
...
...
@@ -8,18 +8,18 @@
%br
.issue-box
.title
.
control
-group
.
form
-group
=
f
.
label
:title
do
%strong
=
"Subject *"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-xxlarge js-gfm-input"
,
autofocus:
true
,
required:
true
.context
.
control
-group
.
form
-group
.issue_assignee.pull-left
=
f
.
label
:assignee_id
do
%i
.icon-user
Assign to
.co
ntrols
.co
l-sm-10
.pull-left
=
f
.
select
(
:assignee_id
,
assignee_options
(
@issue
),
{
include_blank:
"Select a user"
},
{
class:
'chosen'
})
.pull-right
...
...
@@ -29,20 +29,20 @@
=
f
.
label
:milestone_id
do
%i
.icon-time
Milestone
.co
ntrols
=
f
.
select
(
:milestone_id
,
milestone_options
(
@issue
),
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.co
l-sm-10
=
f
.
select
(
:milestone_id
,
milestone_options
(
@issue
),
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.description
.
control
-group
.
form
-group
=
f
.
label
:label_list
do
%i
.icon-tag
Labels
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"input-xxlarge"
%p
.hint
Separate labels with commas.
.
control
-group
.
form
-group
=
f
.
label
:description
,
"Details"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
class:
"input-xxlarge js-gfm-input"
,
rows:
14
%p
.hint
Issues are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_form.html.haml
View file @
16eb3ac3
...
...
@@ -30,24 +30,24 @@
%hr
.merge-request-form-info
.
control
-group
.
form
-group
=
f
.
label
:title
do
%strong
=
"Title *"
.co
ntrols
=
f
.
text_field
:title
,
class:
"input-xxlarge pad js-gfm-input"
,
maxlength:
255
,
rows:
5
,
required:
true
.
control
-group
.co
l-sm-10
=
f
.
text_field
:title
,
class:
"input-xxlarge pad js-gfm-input"
,
maxlength:
255
,
rows:
5
,
required:
true
.
form
-group
.left
=
f
.
label
:assignee_id
do
%i
.icon-user
Assign to
.co
ntrols
=
f
.
select
(
:assignee_id
,
assignee_options
(
@merge_request
),
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.co
l-sm-10
=
f
.
select
(
:assignee_id
,
assignee_options
(
@merge_request
),
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.left
=
f
.
label
:milestone_id
do
%i
.icon-time
Milestone
.co
ntrols
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.
control
-group
.co
l-sm-10
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.
form
-group
=
f
.
label
:description
,
"Description"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
class:
"input-xxlarge js-gfm-input"
,
rows:
14
%p
.hint
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/milestones/_form.html.haml
View file @
16eb3ac3
...
...
@@ -13,21 +13,21 @@
%li
=
msg
.row
.col-md-6
.
control
-group
.
form
-group
=
f
.
label
:title
,
"Title"
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"input-xlarge"
%p
.hint
Required
.
control
-group
.
form
-group
=
f
.
label
:description
,
"Description"
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
maxlength:
2000
,
class:
"input-xlarge"
,
rows:
10
%p
.hint
Milestones are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
.col-md-6
.
control
-group
.
form
-group
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.co
ntrols
=
f
.
hidden_field
:due_date
.co
ntrols
.co
l-sm-10
=
f
.
hidden_field
:due_date
.co
l-sm-10
.datepicker
.form-actions
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/network/_head.html.haml
View file @
16eb3ac3
...
...
@@ -3,18 +3,18 @@
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'graph'
}
.pull-left
=
form_tag
project_network_path
(
@project
,
@id
),
method: :get
do
|
f
|
.
control
-group
.
form
-group
=
label_tag
:filter_ref
,
"Begin with the selected commit"
,
class:
'control-label light'
.co
ntrols
.co
l-sm-10
=
check_box_tag
:filter_ref
,
1
,
@options
[
:filter_ref
]
-
@options
.
each
do
|
key
,
value
|
=
hidden_field_tag
(
key
,
value
,
id:
nil
)
unless
key
==
"filter_ref"
.search.pull-right
=
form_tag
project_network_path
(
@project
,
@id
),
method: :get
do
|
f
|
.
control
-group
.
form
-group
=
label_tag
:search
,
"Looking for commit:"
,
class:
'control-label light'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
"search-input input-xlarge"
=
button_tag
type:
'submit'
,
class:
'btn vtop'
do
%i
.icon-search
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/new.html.haml
View file @
16eb3ac3
...
...
@@ -4,48 +4,48 @@
.project-edit-content
=
form_for
@project
,
remote:
true
do
|
f
|
.
control
-group.project-name-holder
.
form
-group.project-name-holder
=
f
.
label
:name
do
%strong
Project name
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"input-xlarge"
,
tabindex:
1
,
autofocus:
true
%span
.help-inline
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
%span
Customize repository name?
.
control
-group.js-toggle-visibility-container.gl-hide
.
form
-group.js-toggle-visibility-container.gl-hide
=
f
.
label
:path
do
%span
Repository name
.co
ntrols
.co
l-sm-10
.input-append
=
f
.
text_field
:path
%span
.add-on
.git
-
if
current_user
.
can_select_namespace?
.
control
-group
.
form
-group
=
f
.
label
:namespace_id
do
%span
Namespace
.co
ntrols
.co
l-sm-10
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'chosen'
,
tabindex:
2
}
.
control
-group
.co
ntrols
.
form
-group
.co
l-sm-10
=
link_to
"#"
,
class:
'appear-link'
do
%i
.icon-upload-alt
%span
Import existing repository?
.
control
-group.appear-data.import-url-data
.
form
-group.appear-data.import-url-data
=
f
.
label
:import_url
do
%span
Import existing repo
.co
ntrols
.co
l-sm-10
=
f
.
text_field
:import_url
,
class:
'input-xlarge'
,
placeholder:
'https://github.com/randx/six.git'
.light
URL must be cloneable
.
control
-group
.
form
-group
=
f
.
label
:description
do
Description
%span
.light
(optional)
.co
ntrols
.co
l-sm-10
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"input-xlarge"
,
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
...
...
@@ -54,7 +54,7 @@
-
if
current_user
.
can_create_group?
.pull-right
.co
ntrols
.light
.co
l-sm-10
.light
Need a group for several dependent projects?
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
Create a group
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/new_tree/show.html.haml
View file @
16eb3ac3
...
...
@@ -2,10 +2,10 @@
%hr
.file-editor
=
form_tag
(
project_new_tree_path
(
@project
,
@id
),
method: :put
,
class:
"form-horizontal"
)
do
.
control
-group.commit_message-group
.
form
-group.commit_message-group
=
label_tag
'file_name'
,
class:
"control-label"
do
File name
.co
ntrols
.co
l-sm-10
%span
.monospace
=
@path
[
-
1
]
==
"/"
?
@path
:
@path
+
"/"
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
"sample.rb"
,
required:
true
...
...
@@ -14,10 +14,10 @@
on
%span
.label-branch
=
@ref
.
control
-group.commit_message-group
.
form
-group.commit_message-group
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
.co
ntrols
.co
l-sm-10
=
text_area_tag
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Added new file"
,
required:
true
,
rows:
3
.file-holder
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/services/_form.html.haml
View file @
16eb3ac3
...
...
@@ -18,9 +18,9 @@
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:active
,
"Active"
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
=
f
.
check_box
:active
-
@service
.
fields
.
each
do
|
field
|
...
...
@@ -28,9 +28,9 @@
-
type
=
field
[
:type
]
-
placeholder
=
field
[
:placeholder
]
.
control
-group
.
form
-group
=
f
.
label
name
,
class:
"control-label"
.co
ntrols
.co
l-sm-10
-
if
type
==
'text'
=
f
.
text_field
name
,
class:
"input-xlarge"
,
placeholder:
placeholder
-
elsif
type
==
'textarea'
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/snippets/_form.html.haml
View file @
16eb3ac3
...
...
@@ -9,16 +9,16 @@
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:title
.co
ntrols
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.
control
-group
.co
l-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.
form
-group
=
f
.
label
"Lifetime"
.co
ntrols
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.
control
-group
.co
l-sm-10
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.
form
-group
.file-editor
=
f
.
label
:file_name
,
"File"
.co
ntrols
.co
l-sm-10
.file-holder.snippet
.file-title
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
,
class:
'snippet-file-name'
,
required:
true
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/tags/new.html.haml
View file @
16eb3ac3
...
...
@@ -2,13 +2,13 @@
%i
.icon-code-fork
New tag
=
form_tag
project_tags_path
,
method: :post
do
.
control
-group
.
form
-group
=
label_tag
:tag_name
,
'Name for new tag'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:tag_name
,
nil
,
placeholder:
'v3.0.1'
,
required:
true
,
tabindex:
1
.
control
-group
.
form
-group
=
label_tag
:ref
,
'Create from'
,
class:
'control-label'
.co
ntrols
.co
l-sm-10
=
text_field_tag
:ref
,
nil
,
placeholder:
'master'
,
required:
true
,
tabindex:
2
.light
Branch name or commit SHA
.form-actions
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/team_members/_form.html.haml
View file @
16eb3ac3
...
...
@@ -9,15 +9,15 @@
%li
=
msg
%p
1. Choose people you want in the project
.
control
-group
.
form
-group
=
f
.
label
:user_ids
,
"People"
.co
ntrols
.co
l-sm-10
=
users_select_tag
(
:user_ids
,
multiple:
true
)
%p
2. Set access level for them
.
control
-group
.
form
-group
=
f
.
label
:project_access
,
"Project Access"
.co
ntrols
=
select_tag
:project_access
,
options_for_select
(
Gitlab
::
Access
.
options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.co
l-sm-10
=
select_tag
:project_access
,
options_for_select
(
Gitlab
::
Access
.
options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.form-actions
=
f
.
submit
'Add users'
,
class:
"btn btn-create"
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/team_members/import.html.haml
View file @
16eb3ac3
...
...
@@ -6,7 +6,7 @@
=
form_tag
apply_import_project_team_members_path
(
@project
),
method:
'post'
do
.padded
=
label_tag
:source_project_id
,
"Project"
.co
ntrols
=
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
)
.co
l-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
)
.form-actions
=
submit_tag
'Import project members'
,
class:
"btn btn-create"
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/_form.html.haml
View file @
16eb3ac3
...
...
@@ -14,7 +14,7 @@
=
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;"
.context
.co
ntrols
.co
l-sm-10
%span
.cgray
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
...
...
@@ -22,13 +22,13 @@
\.
.description
.
control
-group
.
form
-group
=
f
.
label
:content
.co
ntrols
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
,
rows:
18
.co
l-sm-10
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
,
rows:
18
.description
.
control
-group
.
form
-group
=
f
.
label
:commit_message
.co
ntrols
=
f
.
text_field
:message
,
class:
'span8'
,
rows:
18
.co
l-sm-10
=
f
.
text_field
:message
,
class:
'span8'
,
rows:
18
.form-actions
-
if
@wiki
&&
@wiki
.
persisted?
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
...
...
This diff is collapsed.
Click to expand it.
app/views/search/show.html.haml
View file @
16eb3ac3
...
...
@@ -2,7 +2,7 @@
.search-holder
=
label_tag
:search
do
%span
Looking for
.co
ntrols
.co
l-sm-10
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"issue 143"
,
class:
"input-xxlarge search-text-input"
,
id:
"dashboard_search"
=
hidden_field_tag
:project_id
,
params
[
:project_id
]
=
hidden_field_tag
:group_id
,
params
[
:group_id
]
...
...
This diff is collapsed.
Click to expand it.
app/views/snippets/_form.html.haml
View file @
16eb3ac3
...
...
@@ -9,12 +9,12 @@
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.
control
-group
.
form
-group
=
f
.
label
:title
.co
ntrols
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.
control
-group
.co
l-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'input-xlarge'
,
required:
true
.
form
-group
=
f
.
label
"Access"
.co
ntrols
.co
l-sm-10
=
f
.
label
:private_true
,
class:
'radio-label'
do
=
f
.
radio_button
:private
,
true
%span
...
...
@@ -27,10 +27,10 @@
%strong
Public
(GitLab users can see this snippet)
.
control
-group
.
form
-group
.file-editor
=
f
.
label
:file_name
,
"File"
.co
ntrols
.co
l-sm-10
.file-holder.snippet
.file-title
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
,
class:
'snippet-file-name'
,
required:
true
...
...
This diff is collapsed.
Click to expand it.
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