UX review: move explanation text above text field45560-provide-zero-configuration-domain-name-for-auto-devops-using-nip-io

2 files changed, 27 insertions, 11 deletions

diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index f4462b87cba..8da74da7a20 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -24,17 +24,24 @@
               .card-footer.js-extra-settings{ class: @project.auto_devops_enabled? || 'hidden' }
                 = form.label :domain do
                   %strong= _('Domain')
+                %p.form-text
+                  = s_('CICD|Add a domain where deployed apps will be served.')
+                %ul
+                  %li
+                    = s_('CICD|A wildcard DNS record matching the base domain is required.')
+                    - if cluster_ingress_domain = cluster_ingress_domain(@project)
+                      %li
+                        - cluster_ingress_domain_link = link_to cluster_ingress_domain, 'http://' + cluster_ingress_domain, target: '_blank', rel: 'noopener noreferrer'
+                        = s_('CICD|If no domain is specified, %{nip_domain} will be used as a default alternative.').html_safe % { nip_domain: cluster_ingress_domain_link }
+                    - else
+                      %li
+                        - project_clusters_link = link_to('Kubernetes cluster', project_clusters_path(@project))
+                        = s_('CICD|Alternatively, create a %{kubernetes} with Ingress installed to automatically use a wildcard domain.').html_safe % { kubernetes: project_clusters_link }
+                %p.form-text
+                  - auto_devops_help_link = link_to s_('Auto DevOps domain configuration'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
+                  = s_('CICD|Read more about %{auto_devops_help_link}.').html_safe % { auto_devops_help_link: auto_devops_help_link }
+
                 = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
-                .form-text.text-muted
-                  = s_('CICD|Add a domain where deployed apps will be served. A wildcard DNS record matching the base domain is required.')
-                .form-text.text-muted
-                  - if cluster_ingress_domain = cluster_ingress_domain(@project)
-                    - cluster_ingress_domain_link = link_to cluster_ingress_domain, 'http://' + cluster_ingress_domain, target: '_blank', rel: 'noopener noreferrer'
-                    = s_('CICD|If no domain is specified, %{nip_domain} will be used as a default alternative.').html_safe % { nip_domain: cluster_ingress_domain_link }
-                  - else
-                    - project_clusters_link = link_to('Kubernetes cluster', project_clusters_path(@project))
-                    = s_('CICD|Alternatively, create a %{kubernetes} with Ingress installed to automatically use a wildcard domain.').html_safe % { kubernetes: project_clusters_link }
-                  = link_to s_('More information'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
 
                 %label.prepend-top-10
                   %strong= s_('CICD|Deployment strategy')
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 06c2a4ba349..13692abc42d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -682,6 +682,9 @@ msgstr ""
 msgid "Auto DevOps"
 msgstr ""
 
+msgid "Auto DevOps domain configuration"
+msgstr ""
+
 msgid "Auto DevOps enabled"
 msgstr ""
 
@@ -1008,7 +1011,10 @@ msgstr ""
 msgid "CI/CD settings"
 msgstr ""
 
-msgid "CICD|Add a domain where deployed apps will be served. A wildcard DNS record matching the base domain is required."
+msgid "CICD|A wildcard DNS record matching the base domain is required."
+msgstr ""
+
+msgid "CICD|Add a domain where deployed apps will be served."
 msgstr ""
 
 msgid "CICD|Alternatively, create a %{kubernetes} with Ingress installed to automatically use a wildcard domain."
@@ -1044,6 +1050,9 @@ msgstr ""
 msgid "CICD|Learn more about Auto DevOps"
 msgstr ""
 
+msgid "CICD|Read more about %{auto_devops_help_link}."
+msgstr ""
+
 msgid "CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found."
 msgstr ""