summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-16 12:08:28 +0100
committerPhil Hughes <me@iamphill.com>2017-06-21 14:45:23 +0100
commit4c01a68fc70cca14868e166361188601dc505d9f (patch)
treead4a41c49172d5cebadb9afd8a1dd5530a241843 /app/views/layouts/nav
parent9e6113a293d8a8ea956db160a8b5c74db0f3aa93 (diff)
downloadgitlab-ce-4c01a68fc70cca14868e166361188601dc505d9f.tar.gz
added signed out subnav
also added the help link back into the nav bar
Diffstat (limited to 'app/views/layouts/nav')
-rw-r--r--app/views/layouts/nav/_new_dashboard.html.haml3
-rw-r--r--app/views/layouts/nav/_new_explore.html.haml19
2 files changed, 22 insertions, 0 deletions
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml
index 698148d4265..35a586d462e 100644
--- a/app/views/layouts/nav/_new_dashboard.html.haml
+++ b/app/views/layouts/nav/_new_dashboard.html.haml
@@ -28,3 +28,6 @@
= nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
Snippets
+ %li.divider
+ %li
+ = link_to "Help", help_path, title: 'About GitLab CE'
diff --git a/app/views/layouts/nav/_new_explore.html.haml b/app/views/layouts/nav/_new_explore.html.haml
new file mode 100644
index 00000000000..40385f251e3
--- /dev/null
+++ b/app/views/layouts/nav/_new_explore.html.haml
@@ -0,0 +1,19 @@
+%ul.list-unstyled.navbar-sub-nav
+ = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
+ = link_to explore_root_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
+ Projects
+ = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
+ = link_to explore_groups_path, title: 'Groups', class: 'dashboard-shortcuts-groups' do
+ Groups
+ %li.dropdown
+ %a{ href: "#", data: { toggle: "dropdown" } }
+ More
+ = icon("chevron-down", class: "dropdown-chevron")
+ .dropdown-menu
+ %ul
+ = nav_link(controller: :snippets) do
+ = link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do
+ Snippets
+ %li.divider
+ %li
+ = link_to "Help", help_path, title: 'About GitLab CE'