Commit 80fe87a4 authored by Toon Claes's avatar Toon Claes Committed by Stan Hu

Extract Geo admin sidebar in partial

To reduce the conflicts, and the diff from gitlab-ce, extract the Geo
admin sidebar into a partial.
parent 0a7f3b80
......@@ -170,27 +170,7 @@
%strong.fly-out-top-item-name
= _('Push Rules')
= nav_link(controller: %w(admin/geo/nodes admin/geo/projects)) do
= link_to admin_geo_nodes_path, class: "qa-link-geo-menu" do
.nav-icon-container
= sprite_icon('location-dot')
%span.nav-item-name
#{ _('Geo') }
- if Gitlab::Geo.secondary?
%ul.sidebar-sub-level-items
= nav_link(controller: 'admin/geo/nodes', html_options: { class: "fly-out-top-item" } ) do
= link_to admin_geo_nodes_path do
%strong.fly-out-top-item-name
#{ _('Geo') }
%li.divider.fly-out-top-item
= nav_link(path: 'admin/geo/nodes#index') do
= link_to admin_geo_nodes_path, title: 'Nodes' do
%span
#{ _('Nodes') }
= nav_link(path: 'admin/geo/projects#index') do
= link_to admin_geo_projects_path, title: 'Projects' do
%span
= _('Projects')
= render 'layouts/nav/ee/admin/geo_sidebar'
= nav_link(controller: :deploy_keys) do
= link_to admin_deploy_keys_path do
......
= nav_link(controller: %w(admin/geo/nodes admin/geo/projects)) do
= link_to admin_geo_nodes_path, class: "qa-link-geo-menu" do
.nav-icon-container
= sprite_icon('location-dot')
%span.nav-item-name
#{ _('Geo') }
- if Gitlab::Geo.secondary?
%ul.sidebar-sub-level-items
= nav_link(controller: 'admin/geo/nodes', html_options: { class: "fly-out-top-item" } ) do
= link_to admin_geo_nodes_path do
%strong.fly-out-top-item-name
#{ _('Geo') }
%li.divider.fly-out-top-item
= nav_link(path: 'admin/geo/nodes#index') do
= link_to admin_geo_nodes_path, title: 'Nodes' do
%span
#{ _('Nodes') }
= nav_link(path: 'admin/geo/projects#index') do
= link_to admin_geo_projects_path, title: 'Projects' do
%span
= _('Projects')
......@@ -9,9 +9,12 @@ module QA
page.module_eval do
view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
element :link_license_menu
element :link_geo_menu
element :admin_settings_template_item
end
view 'ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml' do
element :link_geo_menu
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment