diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-05 13:19:27 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-05 13:19:27 +0000 |
commit | 6e4949dba199d9fbc3070225e51f07657a81fbd7 (patch) | |
tree | bbe57cd4c3480fef6e84a032ff43d0cb21db6456 /app/views | |
parent | 75d56cec1bb28af32f471d6ba39e09216bcad3ce (diff) | |
parent | de10551ed5df72dffe9c4dfc21eba61aa19db77e (diff) | |
download | gitlab-ce-6e4949dba199d9fbc3070225e51f07657a81fbd7.tar.gz |
Merge branch '35010-projects-nav-dropdown' into 'master'
Add dropdown to Projects nav item
Closes #35010
See merge request !13866
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/nav/_new_dashboard.html.haml | 12 | ||||
-rw-r--r-- | app/views/layouts/nav/projects_dropdown/_show.html.haml | 15 |
2 files changed, 25 insertions, 2 deletions
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml index cfdfcbebc9f..88d164cac32 100644 --- a/app/views/layouts/nav/_new_dashboard.html.haml +++ b/app/views/layouts/nav/_new_dashboard.html.haml @@ -1,7 +1,10 @@ %ul.list-unstyled.navbar-sub-nav - = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "home"}) do - = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do + = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: { id: 'nav-projects-dropdown', class: "home dropdown" }) do + %a{ href: '#', title: 'Projects', data: { toggle: 'dropdown' } } Projects + = icon("chevron-down", class: "dropdown-chevron") + .dropdown-menu.projects-dropdown-menu + = render "layouts/nav/projects_dropdown/show" = nav_link(controller: ['dashboard/groups', 'explore/groups']) do = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do @@ -31,3 +34,8 @@ %li.divider %li = link_to "Help", help_path, title: 'About GitLab CE' + + -# Shortcut to Dashboard > Projects + %li.hidden + = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do + Projects diff --git a/app/views/layouts/nav/projects_dropdown/_show.html.haml b/app/views/layouts/nav/projects_dropdown/_show.html.haml new file mode 100644 index 00000000000..a7370180bf6 --- /dev/null +++ b/app/views/layouts/nav/projects_dropdown/_show.html.haml @@ -0,0 +1,15 @@ +- project_meta = { id: @project.id, name: @project.name, namespace: @project.name_with_namespace, web_url: @project.web_url, avatar_url: @project.avatar_url } if @project&.persisted? +.projects-dropdown-container + .project-dropdown-sidebar + %ul + = nav_link(path: 'dashboard/projects#index') do + = link_to dashboard_projects_path do + = _('Your projects') + = nav_link(path: 'projects#starred') do + = link_to starred_dashboard_projects_path do + = _('Starred projects') + = nav_link(path: 'projects#trending') do + = link_to explore_root_path do + = _('Explore projects') + .project-dropdown-content + #js-projects-dropdown{ data: { user_name: current_user.username, project: project_meta } } |