diff options
Diffstat (limited to 'app/views/layouts/header/_default.html.haml')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 2f6287bdfb3..3e7155b2c0e 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -15,7 +15,7 @@ %span.logo-text.d-none.d-lg-block.gl-ml-3 = logo_text - if Gitlab.com_and_canary? - = link_to 'https://next.gitlab.com', class: 'canary-badge bg-transparent', target: :_blank, rel: :_noopener do + = link_to 'https://next.gitlab.com', class: 'canary-badge bg-transparent', data: { qa_selector: 'canary_badge_link' }, target: :_blank, rel: :_noopener do %span.gl-badge.gl-bg-green-500.gl-text-white.gl-rounded-pill.gl-font-weight-bold.gl-py-1 = _('Next') @@ -29,7 +29,15 @@ - if top_nav_show_search - search_menu_item = top_nav_search_menu_item_attrs %li.nav-item.d-none.d-lg-block.m-auto - = render 'layouts/search' unless current_controller?(:search) + - unless current_controller?(:search) + - if Feature.enabled?(:new_header_search) + #js-header-search.header-search{ data: { 'search-context' => search_context.to_json, + 'search-path' => search_path, + 'issues-path' => issues_dashboard_path, + 'mr-path' => merge_requests_dashboard_path } } + %input{ type: "text", placeholder: _('Search or jump to...'), class: 'form-control gl-form-input' } + - else + = render 'layouts/search' %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' } = link_to search_menu_item.fetch(:href), title: search_menu_item.fetch(:title), aria: { label: search_menu_item.fetch(:title) }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = sprite_icon(search_menu_item.fetch(:icon)) @@ -38,7 +46,7 @@ = link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _('Issues') }, data: { qa_selector: 'issues_shortcut_button', toggle: 'tooltip', placement: 'bottom', track_label: 'main_navigation', - track_event: 'click_issues_link', + track_action: 'click_issues_link', track_property: 'navigation', container: 'body' } do = sprite_icon('issues') @@ -52,7 +60,7 @@ toggle: "dropdown", placement: 'bottom', track_label: 'main_navigation', - track_event: 'click_merge_link', + track_action: 'click_merge_link', track_property: 'navigation', container: 'body' } do = sprite_icon('git-merge') @@ -78,7 +86,7 @@ = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos', data: { qa_selector: 'todos_shortcut_button', toggle: 'tooltip', placement: 'bottom', track_label: 'main_navigation', - track_event: 'click_to_do_link', + track_action: 'click_to_do_link', track_property: 'navigation', container: 'body' } do = sprite_icon('todo-done') @@ -94,7 +102,7 @@ .dropdown-menu.dropdown-menu-right = render 'layouts/header/help_dropdown' - if header_link?(:user_dropdown) - %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) } + %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_action: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) } = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar", alt: current_user.name = render_if_exists 'layouts/header/user_notification_dot', project: project, namespace: group |