diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-27 15:30:15 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-28 09:58:35 -0500 |
| commit | ef722faa955a755b2a73efbacdc8a2ca17e399b2 (patch) | |
| tree | 68321ce4aae3e136b8e9f0e0887577261d394cee /app/views | |
| parent | fb093e8b2e0057c1a0da541fc228f19507a7d4b8 (diff) | |
| download | gitlab-ce-ef722faa955a755b2a73efbacdc8a2ca17e399b2.tar.gz | |
Add context header to sidebar
Diffstat (limited to 'app/views')
4 files changed, 18 insertions, 0 deletions
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index f995145917c..3f05ae67010 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,4 +1,8 @@ .nav-sidebar + .context-header + .avatar-container.s40.settings-avatar + = icon('wrench') + .project-title Admin Area %ul.sidebar-top-level-items = nav_link(controller: %w(dashboard admin projects users groups builds runners cohorts), html_options: {class: 'home'}) do = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 3b658e055b3..8eab32a6391 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -1,4 +1,9 @@ .nav-sidebar + .context-header + .avatar-container.s40.group-avatar + = image_tag group_icon(@group), class: "avatar s40 avatar-tile" + .group-title + = @group.name %ul.sidebar-top-level-items = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do = link_to group_path(@group), title: 'Home' do diff --git a/app/views/layouts/nav/_new_profile_sidebar.html.haml b/app/views/layouts/nav/_new_profile_sidebar.html.haml index 37ffbbecca8..465bad1de21 100644 --- a/app/views/layouts/nav/_new_profile_sidebar.html.haml +++ b/app/views/layouts/nav/_new_profile_sidebar.html.haml @@ -1,4 +1,8 @@ .nav-sidebar + .context-header + .avatar-container.s40.settings-avatar + = icon('wrench') + .project-title Settings %ul.sidebar-top-level-items = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: 'Profile Settings' do diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index f85781737aa..de0f4e3d2bc 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -1,5 +1,10 @@ .nav-sidebar - can_edit = can?(current_user, :admin_project, @project) + .context-header + .avatar-container.s40.project-avatar + = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') + .project-title + = @project.name %ul.sidebar-top-level-items = nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do |