diff options
Diffstat (limited to 'app/views/layouts/header')
4 files changed, 27 insertions, 13 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 871d1213c0e..512a4185bee 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -38,17 +38,10 @@ = render 'layouts/header/new_dropdown', class: 'gl-display-none gl-sm-display-block' - if top_nav_show_search - search_menu_item = top_nav_search_menu_item_attrs - %li.nav-item.d-none.d-lg-block.m-auto + %li.nav-item.header-search-new.d-none.d-lg-block.m-auto - unless current_controller?(:search) - if Feature.enabled?(:new_header_search) - #js-header-search.header-search{ data: { 'search-context' => header_search_context.to_json, - 'search-path' => search_path, - 'issues-path' => issues_dashboard_path, - 'mr-path' => merge_requests_dashboard_path, - 'autocomplete-path' => search_autocomplete_path } } - .gl-search-box-by-type - = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon') - %input{ type: "text", placeholder: s_('GlobalSearch|Search GitLab'), class: 'form-control gl-form-input gl-search-box-by-type-input', id: 'search', autocomplete: 'off' } + = render 'layouts/header_search' - else = render 'layouts/search' %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' } @@ -68,7 +61,8 @@ = number_with_delimiter(issues_count) - if header_link?(:merge_requests) = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter dropdown" }) do - = link_to assigned_mrs_dashboard_path, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') }, + - top_level_link = Feature.enabled?(:mr_attention_requests, default_enabled: :yaml) ? attention_requested_mrs_dashboard_path : assigned_mrs_dashboard_path + = link_to top_level_link, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') }, data: { qa_selector: 'merge_requests_shortcut_button', toggle: "dropdown", placement: 'bottom', @@ -84,6 +78,13 @@ %ul %li.dropdown-header = _('Merge requests') + - if Feature.enabled?(:mr_attention_requests, default_enabled: :yaml) + %li#js-need-attention-nav + #js-need-attention-nav-onboarding + = link_to attention_requested_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center js-prefetch-document' do + = _('Need your attention') + = gl_badge_tag user_merge_requests_counts[:attention_requested_count], { size: :sm, variant: user_merge_requests_counts[:attention_requested_count] == 0 ? :neutral : :warning }, { class: 'merge-request-badge gl-ml-auto js-attention-count' } + %li.divider %li = link_to assigned_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center js-prefetch-document' do = _('Assigned to you') diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml index 90f3ac61614..d1d23c86c81 100644 --- a/app/views/layouts/header/_registration_enabled_callout.html.haml +++ b/app/views/layouts/header/_registration_enabled_callout.html.haml @@ -1,14 +1,17 @@ - return unless show_registration_enabled_user_callout? = render 'shared/global_alert', - title: _('Open registration is enabled on your instance.'), + title: _('Anyone can register for an account.'), variant: :warning, alert_class: 'js-registration-enabled-callout', alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, dismiss_endpoint: callouts_path }, close_button_data: { testid: 'close-registration-enabled-callout' } do .gl-alert-body - = html_escape(_('%{anchorOpen}Learn more%{anchorClose} about how you can customize / disable registration on your instance.')) % { anchorOpen: "<a href=\"#{help_page_path('user/admin_area/settings/sign_up_restrictions')}\" class=\"gl-link\">".html_safe, anchorClose: '</a>'.html_safe } + = _('Only allow anyone to register for accounts on GitLab instances that you intend to be used by anyone. Allowing anyone to register makes GitLab instances more vulnerable.') .gl-alert-actions = link_to general_admin_application_settings_path(anchor: 'js-signup-settings'), class: 'btn gl-alert-action btn-confirm btn-md gl-button' do %span.gl-button-text - = _('View setting') + = _('Turn off') + %button.btn.gl-alert-action.btn-default.btn-md.gl-button.js-close + %span.gl-button-text + = _('Acknowledge') diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml new file mode 100644 index 00000000000..851fc57e44d --- /dev/null +++ b/app/views/layouts/header/_storage_enforcement_banner.html.haml @@ -0,0 +1,9 @@ +- return unless current_user +- namespace = local_assigns.fetch(:namespace) +- banner_info = storage_enforcement_banner_info(namespace) +- return unless banner_info.present? + += render 'shared/global_alert', variant: :warning, alert_class: 'js-storage-enforcement-banner', alert_data: { feature_id: banner_info[:callouts_feature_name], dismiss_endpoint: banner_info[:callouts_path], group_id: namespace.id, defer_links: "true" } do + .gl-alert-body + = banner_info[:text] + = banner_info[:learn_more_link] diff --git a/app/views/layouts/header/_translations.html.haml b/app/views/layouts/header/_translations.html.haml new file mode 100644 index 00000000000..979f39ad3e0 --- /dev/null +++ b/app/views/layouts/header/_translations.html.haml @@ -0,0 +1 @@ += javascript_include_tag locale_path unless I18n.locale == :en |