diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-09-17 12:16:24 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-09-17 12:16:24 +0200 |
commit | d89ae7df2cf02198570dddd80dfef60796b017b5 (patch) | |
tree | 1028ad42df5de354e9ab3e8472a17d379f10fd53 /app/views/layouts | |
parent | f4816372457c3b513f8707efd87ce34c9922177c (diff) | |
download | gitlab-ce-d89ae7df2cf02198570dddd80dfef60796b017b5.tar.gz |
Move project header title definition to view in question.
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/dashboard.html.haml | 3 | ||||
-rw-r--r-- | app/views/layouts/group.html.haml | 5 | ||||
-rw-r--r-- | app/views/layouts/group_settings.html.haml | 1 | ||||
-rw-r--r-- | app/views/layouts/profile.html.haml | 3 | ||||
-rw-r--r-- | app/views/layouts/project.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/project_settings.html.haml | 1 |
6 files changed, 8 insertions, 9 deletions
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index fad7de69432..cb96bcc2cf4 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -1,6 +1,5 @@ - page_title "Dashboard" -- unless @header_title - - header_title "Dashboard", root_path +- header_title "Dashboard", root_path unless header_title - sidebar "dashboard" = render template: "layouts/application" diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 4f00d01d4cd..31888c5580e 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -1,6 +1,5 @@ - page_title @group.name -- unless @header_title - - header_title @group.name, group_path(@group) -- sidebar "group" unless sidebar +- header_title group_title(@group) unless header_title +- sidebar "group" unless sidebar = render template: "layouts/application" diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml index e303a561628..a1a1fc2f858 100644 --- a/app/views/layouts/group_settings.html.haml +++ b/app/views/layouts/group_settings.html.haml @@ -1,4 +1,5 @@ - page_title "Settings" +- header_title group_title(@group, "Settings", edit_group_path(@group)) - sidebar "group_settings" = render template: "layouts/group" diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index b80ce0dfc75..dfa6cc5702e 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -1,6 +1,5 @@ - page_title "Profile Settings" -- unless @header_title - - header_title "Profile Settings", profile_path +- header_title "Profile Settings", profile_path unless header_title - sidebar "profile" = render template: "layouts/application" diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 5c4dd67f0ec..78dafcd8bfa 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -1,6 +1,6 @@ - page_title @project.name_with_namespace -- header_title detect_project_title(@project) -- sidebar "project" unless sidebar +- header_title project_title(@project) unless header_title +- sidebar "project" unless sidebar - content_for :scripts_body_top do - if current_user diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml index 43401668334..59ce38f67bb 100644 --- a/app/views/layouts/project_settings.html.haml +++ b/app/views/layouts/project_settings.html.haml @@ -1,4 +1,5 @@ - page_title "Settings" +- header_title project_title(@project, "Settings", edit_project_path(@project)) - sidebar "project_settings" = render template: "layouts/project" |