diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 18:18:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 18:18:11 +0300 |
commit | dcc56fe601580b5d8f6c3da32550c6523f2baff3 (patch) | |
tree | f68c28bf7c8715de7242464b344620ae5c394036 /app/views/projects/pages | |
parent | 571b02efc9442e73538c3438eb593a83d7807779 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pages')
-rw-r--r-- | app/views/projects/pages/_access.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/pages/_destroy.haml | 17 | ||||
-rw-r--r-- | app/views/projects/pages/_header.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/pages/_list.html.haml | 76 | ||||
-rw-r--r-- | app/views/projects/pages/_no_domains.html.haml | 5 |
5 files changed, 56 insertions, 53 deletions
diff --git a/app/views/projects/pages/_access.html.haml b/app/views/projects/pages/_access.html.haml index 7f2588134ba..33e0e45350a 100644 --- a/app/views/projects/pages/_access.html.haml +++ b/app/views/projects/pages/_access.html.haml @@ -6,10 +6,6 @@ = s_('GitLabPages|Access pages') - c.body do %p - %strong - = s_('GitLabPages|Your pages are served under:') - - %p = external_link(pages_url, pages_url) - @project.pages_domains.each do |domain| diff --git a/app/views/projects/pages/_destroy.haml b/app/views/projects/pages/_destroy.haml index ff30c9ce1ea..3d95fa8a655 100644 --- a/app/views/projects/pages/_destroy.haml +++ b/app/views/projects/pages/_destroy.haml @@ -1,16 +1,13 @@ - if @project.pages_deployed? - if can?(current_user, :remove_pages, @project) - = render Pajamas::CardComponent.new(card_options: { class: 'border-danger' }, header_options: {class: 'bg-danger text-white'}) do |c| - - c.with_header do + .gl-bg-red-50.gl-inset-border-l-3-red-600.gl-py-5.gl-px-6 + %h4.gl-font-lg.gl-mt-0= s_('GitLabPages|Remove pages') + %p= s_('GitLabPages|Removing pages will prevent them from being exposed to the outside world.') + = render Pajamas::ButtonComponent.new(href: project_pages_path(@project), + variant: :danger, + method: :delete, + button_options: {data: { confirm: s_('GitLabPages|Are you sure?'), 'confirm-btn-variant': 'danger'}, "aria-label": s_('GitLabPages|Remove pages')}) do = s_('GitLabPages|Remove pages') - - c.with_body do - = s_('GitLabPages|Removing pages will prevent them from being exposed to the outside world.') - - c.with_footer do - = render Pajamas::ButtonComponent.new(href: project_pages_path(@project), - variant: :danger, - method: :delete, - button_options: {data: { confirm: s_('GitLabPages|Are you sure?'), 'confirm-btn-variant': 'danger'}, "aria-label": s_('GitLabPages|Remove pages')}) do - = s_('GitLabPages|Remove pages') - else .nothing-here-block = s_('GitLabPages|Only project maintainers can remove pages') diff --git a/app/views/projects/pages/_header.html.haml b/app/views/projects/pages/_header.html.haml index cf51796e878..c34034ccafc 100644 --- a/app/views/projects/pages/_header.html.haml +++ b/app/views/projects/pages/_header.html.haml @@ -1,10 +1,7 @@ -- can_add_new_domain = can_create_pages_custom_domains?(current_user, @project) +- @content_class = 'limit-container-width' -%h1.page-title.gl-font-size-h-display.with-button +%h4.page-title = s_('GitLabPages|Pages') - - if can_add_new_domain - = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { class: 'float-right'}, href: new_project_pages_domain_path(@project)) do - = s_('GitLabPages|New Domain') %p - docs_link_start = "<a href='#{help_page_path('user/project/pages/index')}' target='_blank' rel='noopener noreferrer'>".html_safe - docs_link_end = '</a>'.html_safe diff --git a/app/views/projects/pages/_list.html.haml b/app/views/projects/pages/_list.html.haml index 32e67fdadb8..4cf9efcf519 100644 --- a/app/views/projects/pages/_list.html.haml +++ b/app/views/projects/pages/_list.html.haml @@ -1,39 +1,47 @@ +- can_add_new_domain = can_create_pages_custom_domains?(current_user, @project) - verification_enabled = Gitlab::CurrentSettings.pages_domain_verification_enabled? -- if can?(current_user, :update_pages, @project) && @domains.any? - = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5'}) do |c| +- if can?(current_user, :update_pages, @project) + = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5'}, header_options: { class: 'gl-display-flex gl-align-items-center gl-justify-content-space-between' }) do |c| - c.header do Domains (#{@domains.size}) + - if can_add_new_domain + = render Pajamas::ButtonComponent.new(variant: :confirm, href: new_project_pages_domain_path(@project)) do + = s_('GitLabPages|New Domain') - c.body do - %ul.list-group.list-group-flush - - @domains.each do |domain| - %li.list-group-item.gl-display-flex.gl-justify-content-space-between.gl-align-items-center.gl-p-0 - .gl-display-flex.gl-align-items-center - - if verification_enabled - - tooltip, status = domain.unverified? ? [s_('GitLabPages|Unverified'), 'failed'] : [s_('GitLabPages|Verified'), 'success'] - .domain-status.ci-status-icon.has-tooltip{ class: "gl-mr-5 ci-status-icon-#{status}", title: tooltip } - = sprite_icon("status_#{status}") - .domain-name - = external_link(domain.url, domain.url) - - if domain.certificate - %div - = gl_badge_tag(s_('GitLabPages|Certificate: %{subject}') % { subject: domain.pages_domain.subject }) - - if domain.expired? - = gl_badge_tag s_('GitLabPages|Expired'), variant: :danger - %div - = link_to s_('GitLabPages|Edit'), project_pages_domain_path(@project, domain), class: "btn gl-button btn-sm btn-grouped btn-confirm btn-inverted" - = link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?'), 'confirm-btn-variant': 'danger'}, "aria-label": s_("GitLabPages|Remove domain"), method: :delete, class: "btn gl-button btn-danger btn-sm btn-grouped" - - if domain.needs_verification? - %li.list-group-item.bs-callout-warning - - details_link_start = "<a href='#{project_pages_domain_path(@project, domain)}'>".html_safe - - details_link_end = '</a>'.html_safe - = s_('GitLabPages|%{domain} is not verified. To learn how to verify ownership, visit your %{link_start}domain details%{link_end}.').html_safe % { domain: domain.domain, - link_start: details_link_start, - link_end: details_link_end } - - if domain.show_auto_ssl_failed_warning? - %li.list-group-item.bs-callout-warning - - details_link_start = "<a href='#{project_pages_domain_path(@project, domain)}'>".html_safe - - details_link_end = '</a>'.html_safe - = s_("GitLabPages|Something went wrong while obtaining the Let's Encrypt certificate for %{domain}. To retry visit your %{link_start}domain details%{link_end}.").html_safe % { domain: domain.domain, - link_start: details_link_start, - link_end: details_link_end } + - if @domains.any? + %ul.list-group.list-group-flush + - @domains.each do |domain| + %li.list-group-item.gl-display-flex.gl-justify-content-space-between.gl-align-items-center.gl-p-0 + .gl-display-flex.gl-align-items-center + - if verification_enabled + - tooltip, status = domain.unverified? ? [s_('GitLabPages|Unverified'), 'failed'] : [s_('GitLabPages|Verified'), 'success'] + .domain-status.ci-status-icon.has-tooltip{ class: "gl-mr-5 ci-status-icon-#{status}", title: tooltip } + = sprite_icon("status_#{status}") + .domain-name + = external_link(domain.url, domain.url) + - if domain.certificate + %div + = gl_badge_tag(s_('GitLabPages|Certificate: %{subject}') % { subject: domain.pages_domain.subject }) + - if domain.expired? + = gl_badge_tag s_('GitLabPages|Expired'), variant: :danger + %div + = link_to s_('GitLabPages|Edit'), project_pages_domain_path(@project, domain), class: "btn gl-button btn-sm btn-grouped btn-confirm btn-inverted" + = link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?'), 'confirm-btn-variant': 'danger'}, "aria-label": s_("GitLabPages|Remove domain"), method: :delete, class: "btn gl-button btn-danger btn-sm btn-grouped" + - if domain.needs_verification? + %li.list-group-item.bs-callout-warning + - details_link_start = "<a href='#{project_pages_domain_path(@project, domain)}'>".html_safe + - details_link_end = '</a>'.html_safe + = s_('GitLabPages|%{domain} is not verified. To learn how to verify ownership, visit your %{link_start}domain details%{link_end}.').html_safe % { domain: domain.domain, + link_start: details_link_start, + link_end: details_link_end } + - if domain.show_auto_ssl_failed_warning? + %li.list-group-item.bs-callout-warning + - details_link_start = "<a href='#{project_pages_domain_path(@project, domain)}'>".html_safe + - details_link_end = '</a>'.html_safe + = s_("GitLabPages|Something went wrong while obtaining the Let's Encrypt certificate for %{domain}. To retry visit your %{link_start}domain details%{link_end}.").html_safe % { domain: domain.domain, + link_start: details_link_start, + link_end: details_link_end } + - else + .gl-text-center + = s_("You currently have no custom domains.") diff --git a/app/views/projects/pages/_no_domains.html.haml b/app/views/projects/pages/_no_domains.html.haml index eee7d062d00..5f377743439 100644 --- a/app/views/projects/pages/_no_domains.html.haml +++ b/app/views/projects/pages/_no_domains.html.haml @@ -1,6 +1,11 @@ +- can_add_new_domain = can_create_pages_custom_domains?(current_user, @project) + - if can?(current_user, :update_pages, @project) = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5'}, body_options: { class: 'gl-text-center nothing-here-block' }) do |c| - c.header do = s_('GitLabPages|Domains') + - if can_add_new_domain + = render Pajamas::ButtonComponent.new(variant: :confirm, href: new_project_pages_domain_path(@project)) do + = s_('GitLabPages|New Domain') - c.body do = s_("GitLabPages|Support for domains and certificates is disabled. Ask your system's administrator to enable it.") |