diff options
author | Nick Kipling <nkipling@gitlab.com> | 2019-07-02 10:00:07 +0100 |
---|---|---|
committer | Nick Kipling <nkipling@gitlab.com> | 2019-07-23 10:39:25 +0100 |
commit | c1698f4132526697d711c73ca507bba790f7824c (patch) | |
tree | 08fd01482dad60ef34fe1e9b7a431e1ecfcc3784 | |
parent | 9cffa428ad1b572437c38d7a3a41a26c35cc3576 (diff) | |
download | gitlab-ce-11639-improve-discovery-and-navigation-for-gitlab-package-features-ce.tar.gz |
Improving packages navigation in project sidebar11639-improve-discovery-and-navigation-for-gitlab-package-features-ce
Removed Registry from sidebar
Created new Packages top level item
Added Container Registry into packages
Updated tests to support new layout
-rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 13 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_project_packages_link.html.haml | 16 | ||||
-rw-r--r-- | locale/gitlab.pot | 6 | ||||
-rw-r--r-- | spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb | 13 |
4 files changed, 22 insertions, 26 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index a9af5ba5008..8caae5eed83 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -274,19 +274,6 @@ = render_if_exists 'layouts/nav/sidebar/project_feature_flags_link' - - if project_nav_tab? :container_registry - = nav_link(controller: %w[projects/registry/repositories]) do - = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry' do - .nav-icon-container - = sprite_icon('disk') - %span.nav-item-name - = _('Registry') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: %w[projects/registry/repositories], html_options: { class: "fly-out-top-item" } ) do - = link_to project_container_registry_index_path(@project) do - %strong.fly-out-top-item-name - = _('Registry') - = render_if_exists 'layouts/nav/sidebar/project_packages_link' - if project_nav_tab? :wiki diff --git a/app/views/layouts/nav/sidebar/_project_packages_link.html.haml b/app/views/layouts/nav/sidebar/_project_packages_link.html.haml new file mode 100644 index 00000000000..0fdfc6cd2ab --- /dev/null +++ b/app/views/layouts/nav/sidebar/_project_packages_link.html.haml @@ -0,0 +1,16 @@ +- if project_nav_tab? :container_registry + = nav_link controller: :repositories do + = link_to project_container_registry_index_path(@project) do + .nav-icon-container + = sprite_icon('package') + %span.nav-item-name + = _('Packages') + %ul.sidebar-sub-level-items + = nav_link(controller: :repositories, html_options: { class: "fly-out-top-item" } ) do + = link_to project_container_registry_index_path(@project) do + %strong.fly-out-top-item-name + = _('Packages') + %li.divider.fly-out-top-item + = nav_link controller: :repositories do + = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry', title: _('Container Registry') do + %span= _('Container Registry') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bd26ca6714d..56311a506f1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7276,6 +7276,9 @@ msgstr "" msgid "Owner" msgstr "" +msgid "Packages" +msgstr "" + msgid "Page not found" msgstr "" @@ -8772,9 +8775,6 @@ msgstr "" msgid "Register with two-factor app" msgstr "" -msgid "Registry" -msgstr "" - msgid "Related Deployed Jobs" msgstr "" diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index 2befbcb3370..b627b9dba59 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -21,7 +21,7 @@ describe 'layouts/nav/sidebar/_project' do end end - describe 'container registry tab' do + describe 'packages tab' do before do stub_container_registry_config(enabled: true) @@ -31,24 +31,17 @@ describe 'layouts/nav/sidebar/_project' do .and_return('projects/registry/repositories') end - it 'has both Registry and Repository tabs' do - render - - expect(rendered).to have_text 'Repository' - expect(rendered).to have_text 'Registry' - end - it 'highlights sidebar item and flyout' do render expect(rendered).to have_css('.sidebar-top-level-items > li.active', count: 1) - expect(rendered).to have_css('.is-fly-out-only > li.active', count: 1) + expect(rendered).to have_css('.sidebar-sub-level-items > li.fly-out-top-item.active', count: 1) end it 'highlights container registry tab' do render - expect(rendered).to have_css('.sidebar-top-level-items > li.active', text: 'Registry') + expect(rendered).to have_css('.sidebar-sub-level-items > li:not(.fly-out-top-item).active', text: 'Container Registry') end end |