From 19145b923dc6b81c47eb400e671b12cecf7b3086 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Mon, 4 Sep 2017 13:42:58 +0100 Subject: [PATCH] Updates settings sections to: - create labels for each radio button - remove elements from form section - visually match the mockups --- .../pipelines_settings/_show.html.haml | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml index f4a6ecde0a4..c5554589ab8 100644 --- a/app/views/projects/pipelines_settings/_show.html.haml +++ b/app/views/projects/pipelines_settings/_show.html.haml @@ -6,42 +6,39 @@ = form_for @project, url: project_pipelines_settings_path(@project) do |f| %fieldset.builds-feature .form-group - %p Pipelines need to have AutoDevOps enabled or have a .gitlab-ci.yml configured before you can begin using Continious Integration and Delivery. - = f.label :auto_devops_enabled, 'Auto DevOps (Beta)', class: 'label-light' + %p Pipelines need to have Auto DevOps enabled or have a .gitlab-ci.yml configured before you can begin using Continuous Integration and Delivery. + %h5 Auto DevOps (Beta) %p - Auto DevOps will automatically build, test, and deploy your application based on a predefined CI/CD configuration. - = link_to 'Learn more about Auto DevOps', help_page_path('ci/quick_start/README') #TODO fix the link + Auto DevOps will automatically build, test, and deploy your application based on a predefined Continious Integration and Delivery configuration. + = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md') = f.fields_for :auto_devops_attributes, @auto_devops do |form| .radio - = form.radio_button :enabled, true - %strong Enable Auto DevOps - %br - %span.descr - The Auto DevOps pipeline configuration will be used when ther is no .gitlab-ci.yml - in the repository. + = form.label :enabled_true do + = form.radio_button :enabled, 'true' + %strong Enable Auto DevOps + %br + %span.descr + The Auto DevOps pipeline configuration will be used when there is no .gitlab-ci.yml + in the project. .radio - = form.radio_button :enabled, false - %strong Disable Auto DevOps - %br - %span.descr - A specific .gitlab-ci.yml file needs to be specified before you can begin using Continious Integration and Delivery + = form.label :enabled_false do + = form.radio_button :enabled, 'false' + %strong Disable Auto DevOps + %br + %span.descr + A specific .gitlab-ci.yml file needs to be specified before you can begin using Continious Integration and Delivery. .radio - = form.radio_button :enabled, nil - %strong - Instance default (status: #{current_application_settings.auto_devops_enabled?}) - %br - %span.descr - Follow the instance default to either have Auto DevOps enabled or disabled when there is no .gitlab-ci.yml file specified - %br + = form.label :enabled do + = form.radio_button :enabled, nil + %strong + Instance default (status: #{current_application_settings.auto_devops_enabled?}) + %br + %span.descr + Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific .gitlab-ci.yml file specified. + %br %p Define a domain used by Auto DevOps to deploy towards, this is required for deploys to succeed. - = link_to 'Learn more about deploying with Auto DevOps', help_page_path('ci/quick_start/README') #TODO fix the link = form.text_field :domain, class: 'form-control', placeholder: 'domain.com' - %br - %p - %strong Project specific pipeline configuration - Define a project specific pipeline configuration by creating a .gitlab-ci.yml file. - = link_to 'Learn more about pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info' %hr .form-group.append-bottom-default