From c727fdd054cd2f73a4311265d9f5e9f1a7d434eb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 13 Nov 2013 10:35:10 +0200 Subject: [PATCH] Group head titles Signed-off-by: Dmitriy Zaporozhets --- app/helpers/groups_helper.rb | 19 +++++++++++++++++++ app/helpers/projects_helper.rb | 2 +- app/views/layouts/group.html.haml | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 8573c59dc94..7c09273d53e 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -2,4 +2,23 @@ module GroupsHelper def remove_user_from_group_message(group, user) "You are going to remove #{user.name} from #{group.name} Group. Are you sure?" end + + def group_head_title + title = @group.name + + title = if current_action?(:issues) + "Issues - " + title + elsif current_action?(:merge_requests) + "Merge requests - " + title + elsif current_action?(:members) + "Members - " + title + elsif current_action?(:edit) + "Settings - " + title + else + title + end + + title + + end end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index bfef34d9e3b..ee0e6816742 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -158,7 +158,7 @@ module ProjectsHelper elsif current_controller?(:blob) "#{@project.path}\/#{@blob.path} at #{@ref} - " + title elsif current_controller?(:commits) - "Commits - " + title + "Commits at #{@ref} - " + title elsif current_controller?(:merge_requests) if current_action?(:show) "Merge request ##{@merge_request.iid} - " + title diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 0e955d59ff8..7462121debf 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -1,6 +1,6 @@ !!! 5 %html{ lang: "en"} - = render "layouts/head", title: "#{@group.name}" + = render "layouts/head", title: group_head_title %body{class: "#{app_theme} application", :'data-page' => body_data_page} = render "layouts/head_panel", title: "group: #{@group.name}" = render "layouts/flash"