From b62ecf2c6f689bb70c4c567495c6004318f86cfa Mon Sep 17 00:00:00 2001 From: Tom Houston Date: Fri, 25 Jul 2025 23:25:10 -0500 Subject: [PATCH 1/2] Update 2 files - /app/views/projects/pages_domains/_dns.html.haml - /ee/app/views/groups/settings/domain_verification/_dns.html.haml --- app/views/projects/pages_domains/_dns.html.haml | 14 ++++++++++++-- .../settings/domain_verification/_dns.html.haml | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/views/projects/pages_domains/_dns.html.haml b/app/views/projects/pages_domains/_dns.html.haml index afe98a4b79c80d..a600c99227ea26 100644 --- a/app/views/projects/pages_domains/_dns.html.haml +++ b/app/views/projects/pages_domains/_dns.html.haml @@ -24,9 +24,19 @@ = 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 %{link_to_help} of your domain, add the above TXT record value to your DNS configuration within seven days. You can implement this in two ways:").html_safe % { link_to_help: link_to_help } + %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) + %strong= _("Primary domain method:") + = _("Add the TXT record directly to") + %code= domain_presenter.domain + = _("with the value above") \ 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 8295320dc7d080..2da4eb7bb19e20 100644 --- a/ee/app/views/groups/settings/domain_verification/_dns.html.haml +++ b/ee/app/views/groups/settings/domain_verification/_dns.html.haml @@ -2,9 +2,20 @@ %label = _("TXT") .input-group.gl-max-w-80 - = 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(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|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: %{link_to_help}").html_safe % { link_to_help: link_to_help } + %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") \ No newline at end of file -- GitLab From 1e42d142c08d3108cb6c162a0e09c4c424a37eb5 Mon Sep 17 00:00:00 2001 From: Tom Houston Date: Sat, 26 Jul 2025 01:27:24 -0500 Subject: [PATCH 2/2] Update 2 files - /ee/app/views/groups/settings/domain_verification/_dns.html.haml - /app/views/projects/pages_domains/_dns.html.haml --- .../projects/pages_domains/_dns.html.haml | 21 +++++++++++-------- .../domain_verification/_dns.html.haml | 12 ++++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/views/projects/pages_domains/_dns.html.haml b/app/views/projects/pages_domains/_dns.html.haml index a600c99227ea26..a16886a17892d6 100644 --- a/app/views/projects/pages_domains/_dns.html.haml +++ b/app/views/projects/pages_domains/_dns.html.haml @@ -28,15 +28,18 @@ .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 TXT record value to your DNS configuration within seven days. You can implement this in two ways:").html_safe % { link_to_help: link_to_help } - %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) + = _("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") \ No newline at end of file + = _("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 2da4eb7bb19e20..642fad14df309f 100644 --- a/ee/app/views/groups/settings/domain_verification/_dns.html.haml +++ b/ee/app/views/groups/settings/domain_verification/_dns.html.haml @@ -2,15 +2,14 @@ %label = _("TXT") .input-group.gl-max-w-80 - = text_field_tag :domain_verification, domain_presenter.keyed_verification_code, class: "monospace js-select-on-focus form-control", readonly: true + = text_field_tag :domain_verification, domain_presenter.verification_record, 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(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 TXT record value to your DNS configuration within seven days. You can implement this in two ways: %{link_to_help}").html_safe % { link_to_help: link_to_help } + = 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):") + %strong= s_("DomainVerification|Subdomain method (recommended):") = s_("DomainVerification|Create a TXT record for") %code= domain_presenter.verification_domain = s_("DomainVerification|with the value above") @@ -18,4 +17,7 @@ %strong= s_("DomainVerification|Primary domain method:") = s_("DomainVerification|Add the TXT record directly to") %code= domain_presenter.domain - = s_("DomainVerification|with the value above") \ No newline at end of file + = 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|Need help? %{link_to_help}").html_safe % { link_to_help: link_to_help } \ No newline at end of file -- GitLab