diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-10 18:36:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-10 18:36:31 +0000 |
| commit | b5e10e71ed0fc98c6add3d20f1d18359167d1eac (patch) | |
| tree | 0c47cbd40252da662c4fc58cb5b32a0dfe78ffb8 | |
| parent | 6c62ec76c0bc7a15005c8add04dc1700d471b80b (diff) | |
| parent | c601c8a3a46eb530e2ca6472ee5fdcda42f3090f (diff) | |
| download | gitlab-ce-b5e10e71ed0fc98c6add3d20f1d18359167d1eac.tar.gz | |
Merge branch 'issue-newproj-layout' into 'master'
Removed duplicate "Visibility Level" label on New Project page
See merge request !8272
| -rw-r--r-- | app/views/projects/new.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/_visibility_level.html.haml | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/issue-newproj-layout.yml | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index cd685f7d0eb..41473fae4de 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -94,9 +94,8 @@ .form-group.project-visibility-level-holder = f.label :visibility_level, class: 'label-light' do Visibility Level - = link_to "(?)", help_page_path("public_access/public_access") - = render 'shared/visibility_level', f: f, visibility_level: default_project_visibility, can_change_visibility_level: true, form_model: @project - + = link_to icon('question-circle'), help_page_path("public_access/public_access") + = render 'shared/visibility_level', f: f, visibility_level: default_project_visibility, can_change_visibility_level: true, form_model: @project, with_label: false = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4 = link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel' diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml index b11257ee0e6..73efec88bb1 100644 --- a/app/views/shared/_visibility_level.html.haml +++ b/app/views/shared/_visibility_level.html.haml @@ -1,8 +1,11 @@ +- with_label = local_assigns.fetch(:with_label, true) + .form-group.project-visibility-level-holder - = f.label :visibility_level, class: 'control-label' do - Visibility Level - = link_to icon('question-circle'), help_page_path("public_access/public_access") - .col-sm-10 + - if with_label + = f.label :visibility_level, class: 'control-label' do + Visibility Level + = link_to icon('question-circle'), help_page_path("public_access/public_access") + %div{ :class => ("col-sm-10" if with_label) } - if can_change_visibility_level = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model) - else diff --git a/changelogs/unreleased/issue-newproj-layout.yml b/changelogs/unreleased/issue-newproj-layout.yml new file mode 100644 index 00000000000..d15e8b7d1e5 --- /dev/null +++ b/changelogs/unreleased/issue-newproj-layout.yml @@ -0,0 +1,4 @@ +--- +title: Removed duplicate "Visibility Level" label on New Project page +merge_request: +author: Robert Marcano |