BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit f937ac86 by Dmitriy Zaporozhets
Options

Merge branch 'project-header-titles' into 'master'

Project header titles Fixes my issues with !1293, see [my comment](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1293#note_2112289): > No please, not this huge if/else statement again! This will get out of sync so quickly, like happened with the original page titles before the page_title helper per page :( cc @haynes See merge request !1328
parents e9a56809 5faa6e75
Showing with 107 additions and 55 deletions
app/helpers/groups_helper.rb
......@@ -31,12 +31,12 @@ module GroupsHelper
end
end
def group_title(group, name, url)
def group_title(group, name = nil, url = nil)
full_title = link_to(simple_sanitize(group.name), group_path(group))
full_title += ' · '.html_safe + link_to(simple_sanitize(name), url) if name
content_tag :span do
link_to(
simple_sanitize(group.name), group_path(group)
) + ' · '.html_safe +
link_to(simple_sanitize(name), url)
full_title
end
end
end
app/helpers/projects_helper.rb
......@@ -317,41 +317,6 @@ module ProjectsHelper
@ref || @repository.try(:root_ref)
end
def detect_project_title(project)
name, url =
if current_controller? 'wikis'
['Wiki', get_project_wiki_path(project)]
elsif current_controller? 'project_members'
['Members', namespace_project_project_members_path(project.namespace, project)]
elsif current_controller? 'labels'
['Labels', namespace_project_labels_path(project.namespace, project)]
elsif current_controller? 'members'
['Members', project_files_path(project)]
elsif current_controller? 'commits'
['Commits', project_commits_path(project)]
elsif current_controller? 'graphs'
['Graphs', namespace_project_graph_path(project.namespace, project, current_ref)]
elsif current_controller? 'network'
['Network', namespace_project_network_path(project.namespace, project, current_ref)]
elsif current_controller? 'milestones'
['Milestones', namespace_project_milestones_path(project.namespace, project)]
elsif current_controller? 'snippets'
['Snippets', namespace_project_snippets_path(project.namespace, project)]
elsif current_controller? 'issues'
['Issues', namespace_project_issues_path(project.namespace, project)]
elsif current_controller? 'merge_requests'
['Merge Requests', namespace_project_merge_requests_path(project.namespace, project)]
elsif current_controller? 'tree', 'blob'
['Files', project_files_path(project)]
elsif current_path? 'projects#activity'
['Activity', activity_project_path(project)]
else
[nil, nil]
end
project_title(project, name, url)
end
private
def filename_path(project, filename)
......
app/views/groups/milestones/_header_title.html.haml 0 → 100644
- header_title group_title(@group, "Milestones", group_milestones_path(@group))
app/views/groups/milestones/show.html.haml
- page_title @group_milestone.title, "Milestones"
= render "header_title"
%h4.page-title
.issue-box{ class: "issue-box-#{@group_milestone.closed? ? 'closed' : 'open'}" }
- if @group_milestone.closed?
......
app/views/layouts/ci/_nav_admin.html.haml
%ul.nav.nav-sidebar
= nav_link do
= link_to admin_root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
= link_to admin_root_path, title: 'Back to admin', data: {placement: 'right'}, class: 'back-link' do
= icon('caret-square-o-left fw')
%span
Back to Admin
Back to admin
%li.separate-item
= nav_link path: 'projects#index' do
......
app/views/layouts/dashboard.html.haml
- 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"
app/views/layouts/group.html.haml
- 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"
app/views/layouts/group_settings.html.haml
- page_title "Settings"
- header_title group_title(@group, "Settings", edit_group_path(@group))
- sidebar "group_settings"
= render template: "layouts/group"
app/views/layouts/nav/_dashboard.html.haml
......@@ -46,6 +46,8 @@
= icon('question-circle fw')
%span
Help
%li.separate-item
= nav_link(controller: :profile) do
= link_to profile_path, title: 'Profile settings', data: {placement: 'bottom'} do
= icon('user fw')
......
app/views/layouts/profile.html.haml
- 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"
app/views/layouts/project.html.haml
- 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
......
app/views/layouts/project_settings.html.haml
- page_title "Settings"
- header_title project_title(@project, "Settings", edit_project_path(@project))
- sidebar "project_settings"
= render template: "layouts/project"
app/views/projects/activity.html.haml
- page_title "Activity"
- header_title project_title(@project, "Activity", activity_project_path(@project))
= render 'projects/activity'
app/views/projects/blame/show.html.haml
- page_title "Blame", @blob.path, @ref
- header_title project_title(@project, "Files", project_files_path(@project))
%h3.page-title Blame view
#tree-holder.tree-holder
......
app/views/projects/blob/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Files", project_files_path(@project))
app/views/projects/blob/edit.html.haml
- page_title "Edit", @blob.path, @ref
= render "header_title"
.file-editor
%ul.center-top-menu.no-bottom.js-edit-mode
%li.active
......
app/views/projects/blob/new.html.haml
- page_title "New File", @path.presence, @ref
= render "header_title"
.gray-content-block.top-block
Create a new file or
= link_to 'upload', '#modal-upload-blob',
......
app/views/projects/blob/show.html.haml
- page_title @blob.path, @ref
= render "header_title"
= render 'projects/last_push'
......
app/views/projects/branches/index.html.haml
- page_title "Branches"
= render "projects/commits/header_title"
= render "projects/commits/head"
.gray-content-block
.pull-right
......
app/views/projects/branches/new.html.haml
- page_title "New Branch"
= render "projects/commits/header_title"
- if @error
.alert.alert-danger
%button{ type: "button", class: "close", "data-dismiss" => "alert"} ×
......
app/views/projects/commit/show.html.haml
- page_title "#{@commit.title} (#{@commit.short_id})", "Commits"
= render "projects/commits/header_title"
= render "commit_box"
= render "projects/diffs/diffs", diffs: @diffs, project: @project
= render "projects/notes/notes_with_form", view: params[:view]
app/views/projects/commits/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Commits", project_commits_path(@project))
app/views/projects/commits/show.html.haml
- page_title "Commits", @ref
= render "header_title"
= content_for :meta_tags do
- if current_user
= auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
......
app/views/projects/compare/index.html.haml
- page_title "Compare"
= render "projects/commits/header_title"
= render "projects/commits/head"
.gray-content-block
......
app/views/projects/compare/show.html.haml
- page_title "#{params[:from]}...#{params[:to]}"
= render "projects/commits/header_title"
= render "projects/commits/head"
......
app/views/projects/graphs/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Graphs", namespace_project_graph_path(@project.namespace, @project, current_ref))
app/views/projects/graphs/commits.html.haml
- page_title "Commit statistics"
- page_title "Commits", "Graphs"
= render "header_title"
.tree-ref-holder
= render 'shared/ref_switcher', destination: 'graphs_commits'
= render 'head'
......
app/views/projects/graphs/show.html.haml
- page_title "Contributor statistics"
- page_title "Contributors", "Graphs"
= render "header_title"
.tree-ref-holder
= render 'shared/ref_switcher', destination: 'graphs'
= render 'head'
......
app/views/projects/issues/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Issues", namespace_project_issues_path(@project.namespace, @project))
app/views/projects/issues/index.html.haml
- page_title "Issues"
= render "header_title"
= content_for :meta_tags do
- if current_user
= auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
......
app/views/projects/issues/new.html.haml
- page_title "New Issue"
= render "header_title"
= render "form"
app/views/projects/issues/show.html.haml
- page_title "#{@issue.title} (##{@issue.iid})", "Issues"
= render "header_title"
.issue
.issue-details.issuable-details
.page-title
......
app/views/projects/labels/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Labels", namespace_project_labels_path(@project.namespace, @project))
app/views/projects/labels/edit.html.haml
- page_title "Edit", @label.name, "Labels"
= render "header_title"
%h3
Edit label
%span.light #{@label.name}
......
app/views/projects/labels/index.html.haml
- page_title "Labels"
= render "header_title"
.gray-content-block.top-block
- if can? current_user, :admin_label, @project
......
app/views/projects/labels/new.html.haml
- page_title "New Label"
= render "header_title"
%h3 New label
.back-link
= link_to namespace_project_labels_path(@project.namespace, @project) do
......
app/views/projects/merge_requests/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Merge Requests", namespace_project_merge_requests_path(@project.namespace, @project))
app/views/projects/merge_requests/_show.html.haml
- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
= render "header_title"
- if params[:view] == 'parallel'
- fluid_layout true
......
app/views/projects/merge_requests/edit.html.haml
- page_title "Edit", "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
= render "header_title"
%h3.page-title
= "Edit merge request ##{@merge_request.iid}"
%hr
......
app/views/projects/merge_requests/index.html.haml
- page_title "Merge Requests"
= render "header_title"
= render 'projects/last_push'
.project-issuable-filter
.controls
......
app/views/projects/merge_requests/invalid.html.haml
- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
= render "header_title"
.merge-request
= render "projects/merge_requests/show/mr_title"
= render "projects/merge_requests/show/mr_box"
......
app/views/projects/merge_requests/new.html.haml
- page_title "New Merge Request"
= render "header_title"
- if @merge_request.can_be_created
= render 'new_submit'
- else
......
app/views/projects/milestones/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Milestones", namespace_project_milestones_path(@project.namespace, @project))
app/views/projects/milestones/edit.html.haml
- page_title "Edit", @milestone.title, "Milestones"
= render "header_title"
= render "form"
app/views/projects/milestones/index.html.haml
- page_title "Milestones"
= render "header_title"
= render 'shared/milestones_filter'
.gray-content-block
......
app/views/projects/milestones/new.html.haml
- page_title "New Milestone"
= render "header_title"
= render "form"
app/views/projects/milestones/show.html.haml
- page_title @milestone.title, "Milestones"
= render "header_title"
%h4.page-title
.issue-box{ class: issue_box_class(@milestone) }
- if @milestone.closed?
......
app/views/projects/network/show.html.haml
- page_title "Network", @ref
= header_title project_title(@project, "Network", namespace_project_network_path(@project.namespace, @project, current_ref))
= render "head"
.project-network
.controls
......
app/views/projects/project_members/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Members", namespace_project_project_members_path(@project.namespace, @project))
app/views/projects/project_members/import.html.haml
- page_title "Import members"
= render "header_title"
%h3.page-title
Import members from another project
%p.light
......
app/views/projects/project_members/index.html.haml
- page_title "Members"
= render "header_title"
.gray-content-block.top-block
.clearfix.js-toggle-container
......
app/views/projects/snippets/_header_title.html.haml 0 → 100644
- header_title project_title(@project, "Snippets", namespace_project_snippets_path(@project.namespace, @project))
app/views/projects/snippets/edit.html.haml
- page_title "Edit", @snippet.title, "Snippets"
= render "header_title"
%h3.page-title
Edit snippet
%hr
......
app/views/projects/snippets/index.html.haml
- page_title "Snippets"
= render "header_title"
%h3.page-title
Snippets
- if can? current_user, :create_project_snippet, @project
......
app/views/projects/snippets/new.html.haml
- page_title "New Snippets"
= render "header_title"
%h3.page-title
New snippet
%hr
......
app/views/projects/snippets/show.html.haml
- page_title @snippet.title, "Snippets"
= render "header_title"
%h3.page-title
= @snippet.title
......
app/views/projects/tags/index.html.haml
- page_title "Tags"
= render "projects/commits/header_title"
= render "projects/commits/head"
.gray-content-block
......
app/views/projects/tags/new.html.haml
- page_title "New Tag"
= render "projects/commits/header_title"
- if @error
.alert.alert-danger
%button{ type: "button", class: "close", "data-dismiss" => "alert"} ×
......
app/views/projects/tree/show.html.haml
- page_title @path.presence || "Files", @ref
- header_title project_title(@project, "Files", project_files_path(@project))
= content_for :meta_tags do
- if current_user
= auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
......
app/views/projects/wikis/_header_title.html.haml 0 → 100644
- header_title project_title(@project, 'Wiki', get_project_wiki_path(@project))
app/views/projects/wikis/edit.html.haml
- page_title "Edit", @page.title, "Wiki"
= render "header_title"
= render 'nav'
.pull-right
= render 'main_links'
......
app/views/projects/wikis/empty.html.haml
- page_title "Wiki"
= render "header_title"
%h3.page-title Empty page
%hr
.error_message
......
app/views/projects/wikis/git_access.html.haml
- page_title "Git Access", "Wiki"
= render "header_title"
= render 'nav'
.gray-content-block
.row
......
app/views/projects/wikis/history.html.haml
- page_title "History", @page.title, "Wiki"
- page_title "History", @page.title.capitalize, "Wiki"
= render "header_title"
= render 'nav'
.gray-content-block
%h3.page-title
......
app/views/projects/wikis/pages.html.haml
- page_title "All Pages", "Wiki"
= render "header_title"
= render 'nav'
.gray-content-block
%h3.page-title
......
app/views/projects/wikis/show.html.haml
- page_title @page.title, "Wiki"
- page_title @page.title.capitalize, "Wiki"
= render "header_title"
= render 'nav'
.gray-content-block
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment