diff options
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 11 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/header/_current_user_dropdown.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 13 | ||||
| -rw-r--r-- | app/views/layouts/header/_super_sidebar_logged_out.haml | 47 | ||||
| -rw-r--r-- | app/views/layouts/header/_title.html.haml | 8 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 1 |
8 files changed, 68 insertions, 19 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 3bb59db32aa..95627c2884a 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -7,7 +7,7 @@ - sidebar_panel = super_sidebar_nav_panel(nav: nav, user: current_user, group: group, project: @project, current_ref: current_ref, ref_type: @ref_type, viewed_user: @user, organization: @organization) - sidebar_data = super_sidebar_context(current_user, group: group, project: @project, panel: sidebar_panel, panel_type: nav).to_json - %aside.js-super-sidebar.super-sidebar.super-sidebar-loading{ data: { root_path: root_path, sidebar: sidebar_data, toggle_new_nav_endpoint: profile_preferences_url, force_desktop_expanded_sidebar: @force_desktop_expanded_sidebar.to_s, command_palette: command_palette_data(project: @project).to_json } } + %aside.js-super-sidebar.super-sidebar.super-sidebar-loading{ data: { root_path: root_path, sidebar: sidebar_data, toggle_new_nav_endpoint: profile_preferences_path, force_desktop_expanded_sidebar: @force_desktop_expanded_sidebar.to_s, command_palette: command_palette_data(project: @project).to_json } } - if display_whats_new? #whats-new-app{ data: { version_digest: whats_new_version_digest } } @@ -51,4 +51,4 @@ -# This is needed by [GitLab JH](https://gitlab.com/gitlab-jh/jh-team/gitlab-cn/-/issues/81) = render_if_exists "shared/footer/global_footer" -= render "layouts/nav/top_nav_responsive", class: 'layout-page' unless show_super_sidebar? += render "layouts/nav/top_nav_responsive", class: 'layout-page' if !show_super_sidebar? || !current_user diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 53e88d95893..28cbdf0a7a1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -13,10 +13,13 @@ = header_message - if show_super_sidebar? # TODO: Move this CSS to a better place - :css - body { - --header-height: 0px; - } + - if current_user + :css + body { + --header-height: 0px; + } + - else + = render partial: "layouts/header/super_sidebar_logged_out" - else = render partial: "layouts/header/default", locals: { project: @project, group: @group } = render 'layouts/page', sidebar: sidebar, nav: nav diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index c75b02aa6a6..83641fbb184 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -21,7 +21,6 @@ = render 'groups/invite_members_modal', group: @group = dispensable_render_if_exists "shared/web_hooks/group_web_hook_disabled_alert" -= dispensable_render_if_exists "shared/code_suggestions_alert" = dispensable_render_if_exists "shared/code_suggestions_third_party_alert", source: @group = dispensable_render_if_exists "shared/free_user_cap_alert", source: @group = dispensable_render_if_exists "shared/unlimited_members_during_trial_alert", resource: @group diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index e04ffc2e88a..7ce914cf660 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -11,7 +11,7 @@ %li.divider - if can?(current_user, :update_user_status, current_user) %li - %button.gl-button.btn.btn-link.menu-item.js-set-status-modal-trigger{ type: 'button' } + = render Pajamas::ButtonComponent.new(button_options: { class: 'menu-item js-set-status-modal-trigger' }) do - if current_user.status&.busy? || current_user.status&.customized? = s_('SetStatusModal|Edit status') - else diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 1c22a853dd0..993094c6889 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -1,19 +1,12 @@ - has_impersonation_link = header_link?(:admin_impersonation) - user_status_data = user_status_properties(current_user) -%header.navbar.navbar-gitlab.navbar-expand-sm.js-navbar{ data: { testid: 'navbar' } } +%header.navbar.navbar-gitlab.navbar-expand-sm.js-navbar.legacy-top-bar{ data: { testid: 'navbar' } } %a.gl-sr-only.gl-accessibility{ href: "#content-body" } Skip to content .container-fluid .header-content.js-header-content .title-container.hide-when-top-nav-responsive-open.gl-transition-medium.gl-display-flex.gl-align-items-stretch.gl-pt-0.gl-mr-3 - .title - %span.gl-sr-only GitLab - = link_to root_path, title: _('Homepage'), id: 'logo', class: 'has-tooltip', **tracking_attrs('main_navigation', 'click_gitlab_logo_link', 'navigation_top') do - = brand_header_logo - .gl-display-flex.gl-align-items-center - - if Gitlab.com_and_canary? - = gl_badge_tag({ variant: :success, size: :sm }, { href: Gitlab::Saas.canary_toggle_com_url, data: { testid: 'canary_badge_link' }, target: :_blank, rel: 'noopener noreferrer', class: 'canary-badge' }) do - = _('Next') + = render 'layouts/header/title' - if current_user .gl-display-none.gl-sm-display-block @@ -92,7 +85,7 @@ - if header_link?(:todos) = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos js-prefetch-document', - data: { testid: 'todos_shortcut_button', toggle: 'tooltip', placement: 'bottom', + data: { testid: 'todos-shortcut-button', toggle: 'tooltip', placement: 'bottom', track_label: 'main_navigation', track_action: 'click_to_do_link', track_property: 'navigation_top', diff --git a/app/views/layouts/header/_super_sidebar_logged_out.haml b/app/views/layouts/header/_super_sidebar_logged_out.haml new file mode 100644 index 00000000000..67322aced74 --- /dev/null +++ b/app/views/layouts/header/_super_sidebar_logged_out.haml @@ -0,0 +1,47 @@ +%header.navbar.navbar-gitlab.super-sidebar-logged-out{ data: { testid: 'navbar' } } + %a.gl-sr-only.gl-accessibility{ href: "#content-body" } Skip to content + .container-fluid + .header-content.gl-displax-flex + .title-container.gl-display-flex.gl-align-items-stretch.gl-pt-0.gl-mr-3 + = render 'layouts/header/title' + + %ul.nav.navbar-sub-nav.gl-align-items-center.gl-display-flex.gl-flex-direction-row.gl-flex-grow-1 + - if Gitlab.com? + %li.nav-item.dropdown.gl-mr-3.gl-md-display-none + %button{ type: "button", data: { toggle: "dropdown" } } + %span.gl-sr-only + = _('Menu') + = sprite_icon('hamburger', size: 16) + .dropdown-menu + %ul + %li + = link_to Gitlab::Utils.append_path(promo_url, 'why-gitlab') do + = s_('LoggedOutMarketingHeader|Why GitLab') + %li + = link_to Gitlab::Utils.append_path(promo_url, 'pricing') do + = s_('LoggedOutMarketingHeader|Pricing') + %li + = link_to Gitlab::Utils.append_path(promo_url, 'sales') do + = s_('LoggedOutMarketingHeader|Contact Sales') + %li + = link_to _("Explore"), explore_root_path + %li.nav-item.gl-mr-3.gl-display-none.gl-md-display-inline-block + = link_to Gitlab::Utils.append_path(promo_url, 'why-gitlab') do + = s_('LoggedOutMarketingHeader|Why GitLab') + %li.nav-item.gl-mr-3.gl-display-none.gl-md-display-inline-block + = link_to Gitlab::Utils.append_path(promo_url, 'pricing') do + = s_('LoggedOutMarketingHeader|Pricing') + %li.nav-item.gl-mr-3.gl-display-none.gl-md-display-inline-block + = link_to Gitlab::Utils.append_path(promo_url, 'sales') do + = s_('LoggedOutMarketingHeader|Contact Sales') + %li.nav-item{ class: ('gl-display-none gl-md-display-inline-block' if Gitlab.com?) } + = link_to _("Explore"), explore_root_path, class: '' + + - if header_link?(:sign_in) + %ul.nav.navbar-nav.gl-align-items-center.gl-justify-content-end.gl-flex-direction-row + %li.nav-item.gl-mr-3 + = link_to _('Sign in'), new_session_path(:user, redirect_to_referer: 'yes') + - if allow_signup? + %li + = render Pajamas::ButtonComponent.new(href: new_user_registration_path, variant: :confirm) do + = _('Register') diff --git a/app/views/layouts/header/_title.html.haml b/app/views/layouts/header/_title.html.haml new file mode 100644 index 00000000000..0e57c6809c2 --- /dev/null +++ b/app/views/layouts/header/_title.html.haml @@ -0,0 +1,8 @@ +.title + %span.gl-sr-only GitLab + = link_to root_path, title: _('Homepage'), id: 'logo', class: 'has-tooltip', **tracking_attrs('main_navigation', 'click_gitlab_logo_link', 'navigation_top') do + = brand_header_logo + .gl-display-flex.gl-align-items-center + - if Gitlab.com_and_canary? + = gl_badge_tag({ variant: :success, size: :sm }, { href: Gitlab::Saas.canary_toggle_com_url, data: { testid: 'canary_badge_link' }, target: :_blank, rel: 'noopener noreferrer', class: 'canary-badge' }) do + = _('Next') diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 4ecae875056..18ae3353f4d 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -23,7 +23,6 @@ = render 'projects/invite_members_modal', project: @project = dispensable_render_if_exists "shared/web_hooks/web_hook_disabled_alert" -= dispensable_render_if_exists "projects/code_suggestions_alert", project: @project = dispensable_render_if_exists "projects/code_suggestions_third_party_alert", project: @project = dispensable_render_if_exists "projects/free_user_cap_alert", project: @project = dispensable_render_if_exists 'shared/unlimited_members_during_trial_alert', resource: @project |