diff options
Diffstat (limited to 'app/views/shared/projects')
| -rw-r--r-- | app/views/shared/projects/_inactive_project_deletion_alert.html.haml | 7 | ||||
| -rw-r--r-- | app/views/shared/projects/_search_bar.html.haml | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/shared/projects/_inactive_project_deletion_alert.html.haml b/app/views/shared/projects/_inactive_project_deletion_alert.html.haml new file mode 100644 index 00000000000..0030265f007 --- /dev/null +++ b/app/views/shared/projects/_inactive_project_deletion_alert.html.haml @@ -0,0 +1,7 @@ +- if show_inactive_project_deletion_banner?(@project) + - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('administration/inactive_project_deletion') } + - link_end = '</a>'.html_safe + - deletion_date = inactive_project_deletion_date(@project) + - title = _('Due to inactivity, this project is scheduled to be deleted on %{deletion_date}. %{link_start}Why is this scheduled?%{link_end}').html_safe % { deletion_date: deletion_date, link_start: link_start, link_end: link_end } + + = render Pajamas::AlertComponent.new(title: title, variant: :warning, alert_options: { class: 'gl-pb-3' }, dismissible: false) diff --git a/app/views/shared/projects/_search_bar.html.haml b/app/views/shared/projects/_search_bar.html.haml index 8ec11d9cfbb..5271a5fac09 100644 --- a/app/views/shared/projects/_search_bar.html.haml +++ b/app/views/shared/projects/_search_bar.html.haml @@ -13,8 +13,7 @@ .filtered-search-box.m-0 .filtered-search-box-input-container.pl-2 = render 'shared/projects/search_form', admin_view: false, search_form_placeholder: _("Search projects...") - %button.btn.gl-button.btn-icon.btn-secondary{ type: 'submit', form: 'project-filter-form' } - = sprite_icon('search', css_class: 'search-icon ') + = render Pajamas::ButtonComponent.new(icon: 'search', icon_classes: 'search-icon', button_options: { type: 'submit', form: 'project-filter-form' }) .filtered-search-dropdown.flex-row.align-items-center.mb-2.m-sm-0#filtered-search-visibility-dropdown{ class: flex_grow_and_shrink_xs } .filtered-search-dropdown-label.p-0.pl-sm-3.font-weight-bold %span |