kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rs-issue-1626' into 'master'

Browse source 
Fix labels for project/snippet visibility selection

Closes #1626

See merge request !671
This commit is contained in:
Dmitriy Zaporozhets 2015-05-18 08:41:12 +00:00
commit f931904297
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/pages/projects.scss
View file

@ -129,7 +129,7 @@
} }
.option-descr { .option-descr {
margin-left: 24px; margin-left: 36px;
color: $gray; color: $gray;
} }
} }

2
app/views/shared/_visibility_radios.html.haml
View file

@ -1,7 +1,7 @@
- Gitlab::VisibilityLevel.values.each do |level| - Gitlab::VisibilityLevel.values.each do |level|
.radio .radio
- restricted = restricted_visibility_levels.include?(level) - restricted = restricted_visibility_levels.include?(level)
= label model_method, level do = form.label "#{model_method}_#{level}" do
= form.radio_button model_method, level, checked: (selected_level == level), disabled: restricted = form.radio_button model_method, level, checked: (selected_level == level), disabled: restricted
= visibility_level_icon(level) = visibility_level_icon(level)
.option-title .option-title

2
app/views/shared/snippets/_form.html.haml
View file

@ -11,7 +11,7 @@
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
= render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet
.form-group .form-group
.file-editor .file-editor
= f.label :file_name, "File", class: 'control-label' = f.label :file_name, "File", class: 'control-label'