diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-24 12:41:46 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-07-30 18:25:02 +0300 |
commit | e6af1625b21df42f6baf4953a3cfe0c403e4c993 (patch) | |
tree | 9304b87b6aabc1f03e41703405dc320a335b3ded /app | |
parent | 655b38f85a0ff98a9219a8c2b9d8f4fd6e97bb32 (diff) |
Merge branch '11639-improve-discovery-and-navigation-for-gitlab-package-features-ce' into 'master'
Improving packages navigation in project sidebar [CE Backport]
See merge request gitlab-org/gitlab-ce!30256
(cherry picked from commit f64868ccbd88ecd9517554c5817d077d6e12d1e0)
c1698f41 Improving packages navigation in project sidebar
Diffstat (limited to 'app')
-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 |
2 files changed, 16 insertions, 13 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') |