diff --git a/app/views/projects/pages_domains/_dns.html.haml b/app/views/projects/pages_domains/_dns.html.haml index afe98a4b79c80d0a7afee15cb4021a622f81acf4..a16886a17892d604dae89c96e7cdf015b984d8e3 100644 --- a/app/views/projects/pages_domains/_dns.html.haml +++ b/app/views/projects/pages_domains/_dns.html.haml @@ -24,9 +24,22 @@ = gl_badge_tag text, variant: status = link_button_to sprite_icon("redo"), verify_project_pages_domain_path(@project, domain_presenter), method: :post, class: 'gl-ml-2 has-tooltip', title: _("Retry verification"), size: :small .input-group - = text_field_tag :domain_verification, domain_presenter.verification_record, class: "monospace js-select-on-focus form-control", readonly: true + = text_field_tag :domain_verification, domain_presenter.keyed_verification_code, class: "monospace js-select-on-focus form-control", readonly: true .input-group-append = clipboard_button(target: '#domain_verification', category: :primary, size: :medium) %p.form-text.gl-text-subtle - - link_to_help = link_to(_('verify ownership'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: '4-verify-the-domains-ownership')) - = _("To %{link_to_help} of your domain, add the above key to a TXT record within your DNS configuration within seven days.").html_safe % { link_to_help: link_to_help } + = _("To verify ownership of your domain, add the above TXT record value to your DNS configuration within seven days. You can implement this in two ways:") + %ul.form-text.gl-text-subtle.gl-mt-2.gl-mb-0 + %li + %strong= _("Subdomain method (recommended):") + = _("Create a TXT record for") + %code= domain_presenter.verification_domain + = _("with the value above") + %li + %strong= _("Primary domain method:") + = _("Add the TXT record directly to") + %code= domain_presenter.domain + = _("with the value above") + %p.form-text.gl-text-subtle.gl-mt-2 + - link_to_help = link_to(_('How to set up DNS records?'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: '4-verify-the-domains-ownership')) + = _("Need help? %{link_to_help}").html_safe % { link_to_help: link_to_help } \ No newline at end of file diff --git a/ee/app/views/groups/settings/domain_verification/_dns.html.haml b/ee/app/views/groups/settings/domain_verification/_dns.html.haml index 8295320dc7d0809403284fb8e0b73d25d49c5efc..642fad14df309f5b604da4fd1beb4281218c8f61 100644 --- a/ee/app/views/groups/settings/domain_verification/_dns.html.haml +++ b/ee/app/views/groups/settings/domain_verification/_dns.html.haml @@ -6,5 +6,18 @@ .input-group-append = clipboard_button(target: '#domain_verification', category: :primary, size: :medium) %p.form-text.gl-text-subtle + = s_("DomainVerification|To verify ownership of your domain, add the above TXT record value to your DNS configuration within seven days. You can implement this in two ways:") + %ul.form-text.gl-text-subtle.gl-mt-2.gl-mb-0 + %li + %strong= s_("DomainVerification|Subdomain method (recommended):") + = s_("DomainVerification|Create a TXT record for") + %code= domain_presenter.verification_domain + = s_("DomainVerification|with the value above") + %li + %strong= s_("DomainVerification|Primary domain method:") + = s_("DomainVerification|Add the TXT record directly to") + %code= domain_presenter.domain + = s_("DomainVerification|with the value above") + %p.form-text.gl-text-subtle.gl-mt-2 - link_to_help = link_to(s_('DomainVerification|How to set up DNS records?'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/_index.md', anchor: '3-set-up-dns-records')) - = s_("DomainVerification|To verify ownership of your domain, add the above key to a TXT record within your DNS configuration within seven days. %{link_to_help}").html_safe % { link_to_help: link_to_help } + = s_("DomainVerification|Need help? %{link_to_help}").html_safe % { link_to_help: link_to_help } \ No newline at end of file