From 4099d2c25c8845baee97fde0f8119a6d0736393b Mon Sep 17 00:00:00 2001
From: Taras Tadai <ttaday@softserveinc.com>
Date: Mon, 19 Feb 2024 17:22:01 +0000
Subject: [PATCH] Migrate bs-callout to alert components in
lets_encrypt_callout
---
.../_lets_encrypt_callout.html.haml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/app/views/projects/pages_domains/_lets_encrypt_callout.html.haml b/app/views/projects/pages_domains/_lets_encrypt_callout.html.haml
index 6b09fa9b9a4a1..8d4aa86173692 100644
--- a/app/views/projects/pages_domains/_lets_encrypt_callout.html.haml
+++ b/app/views/projects/pages_domains/_lets_encrypt_callout.html.haml
@@ -4,21 +4,22 @@
.form-group.border-section.js-shown-if-auto-ssl{ class: ("d-none" unless auto_ssl_available_and_enabled) }
.row
.col-sm-10.offset-sm-2
- .bs-callout.bs-callout-warning.mt-0
- .row.gl-align-items-center.mx-2
- = sprite_icon('warning-solid', css_class: ' mr-2 gl-text-orange-600')
+ = render Pajamas::AlertComponent.new(dismissible: false, variant: :warning) do |c|
+ - c.with_body do
= _("Something went wrong while obtaining the Let's Encrypt certificate.")
- .row.mx-0.mt-3
- = link_button_to s_('GitLabPagesDomains|Retry'), retry_auto_ssl_project_pages_domain_path(@project, domain_presenter), class: 'btn-grouped', method: :post, size: :small
+ - c.with_actions do
+ = link_button_to s_('GitLabPagesDomains|Retry'), retry_auto_ssl_project_pages_domain_path(@project, domain_presenter), method: :post, size: :small
- elsif !domain_presenter.certificate_gitlab_provided?
.form-group.border-section.js-shown-if-auto-ssl{ class: ("d-none" unless auto_ssl_available_and_enabled) }
.row
.col-sm-10.offset-sm-2
- .bs-callout.bs-callout-info.mt-0
- = _("GitLab is obtaining a Let's Encrypt SSL certificate for this domain. This process can take some time. Please try again later.")
+ = render Pajamas::AlertComponent.new(dismissible: false, show_icon: false) do |c|
+ - c.with_body do
+ = _("GitLab is obtaining a Let's Encrypt SSL certificate for this domain. This process can take some time. Please try again later.")
- else
.form-group.border-section.js-shown-if-auto-ssl{ class: ("d-none" unless auto_ssl_available_and_enabled) }
.row
.col-sm-10.offset-sm-2
- .bs-callout.bs-callout-warning.mt-0
- = _("A Let's Encrypt SSL certificate can not be obtained until your domain is verified.")
+ = render Pajamas::AlertComponent.new(dismissible: false, variant: :warning, show_icon: false) do |c|
+ - c.with_body do
+ = _("A Let's Encrypt SSL certificate can not be obtained until your domain is verified.")
--
GitLab