From ef722faa955a755b2a73efbacdc8a2ca17e399b2 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 27 Jun 2017 15:30:15 -0500 Subject: Add context header to sidebar --- app/views/layouts/nav/_new_admin_sidebar.html.haml | 4 ++++ app/views/layouts/nav/_new_group_sidebar.html.haml | 5 +++++ app/views/layouts/nav/_new_profile_sidebar.html.haml | 4 ++++ app/views/layouts/nav/_new_project_sidebar.html.haml | 5 +++++ 4 files changed, 18 insertions(+) (limited to 'app/views') 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 -- cgit v1.2.1 From 646feca6d72b75d92e1a4db6c7ebc6b0d5bc9be4 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Wed, 28 Jun 2017 09:52:11 -0500 Subject: Make header into links; CSS tweaks --- app/views/layouts/nav/_new_admin_sidebar.html.haml | 2 +- app/views/layouts/nav/_new_group_sidebar.html.haml | 2 +- app/views/layouts/nav/_new_profile_sidebar.html.haml | 6 +++--- app/views/layouts/nav/_new_project_sidebar.html.haml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index 3f05ae67010..c9415469912 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - .context-header + = link_to admin_root_path, title: 'Overview', class: 'context-header' do .avatar-container.s40.settings-avatar = icon('wrench') .project-title Admin Area diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 8eab32a6391..7720918be54 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - .context-header + = link_to group_path(@group), title: 'Home', class: 'context-header' do .avatar-container.s40.group-avatar = image_tag group_icon(@group), class: "avatar s40 avatar-tile" .group-title diff --git a/app/views/layouts/nav/_new_profile_sidebar.html.haml b/app/views/layouts/nav/_new_profile_sidebar.html.haml index 465bad1de21..033ea149cfb 100644 --- a/app/views/layouts/nav/_new_profile_sidebar.html.haml +++ b/app/views/layouts/nav/_new_profile_sidebar.html.haml @@ -1,8 +1,8 @@ .nav-sidebar - .context-header + = link_to profile_path, title: 'Profile Settings', class: 'context-header' do .avatar-container.s40.settings-avatar - = icon('wrench') - .project-title Settings + = icon('user') + .project-title User 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 de0f4e3d2bc..eae9da5da14 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -1,6 +1,6 @@ .nav-sidebar - can_edit = can?(current_user, :admin_project, @project) - .context-header + = link_to project_path(@project), title: 'Project', class: 'context-header' do .avatar-container.s40.project-avatar = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') .project-title -- cgit v1.2.1 From 5994fc38a84e2988667274fe55b60c5d44255b5b Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 29 Jun 2017 07:05:07 -0500 Subject: Minor edits --- app/views/layouts/nav/_new_admin_sidebar.html.haml | 2 +- app/views/layouts/nav/_new_group_sidebar.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index c9415469912..40c1ca7b53e 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - = link_to admin_root_path, title: 'Overview', class: 'context-header' do + = link_to admin_root_path, title: 'Admin Overview', class: 'context-header' do .avatar-container.s40.settings-avatar = icon('wrench') .project-title Admin Area diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 7720918be54..b7ac04cc3e5 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - = link_to group_path(@group), title: 'Home', class: 'context-header' do + = link_to group_path(@group), title: 'Group', class: 'context-header' do .avatar-container.s40.group-avatar = image_tag group_icon(@group), class: "avatar s40 avatar-tile" .group-title -- cgit v1.2.1