diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-26 22:21:21 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-11-28 11:59:37 -0800 |
commit | 00209ed89e4e7972f843656b3703d852b6462160 (patch) | |
tree | 21127fd6cba3202e31dce237692a3103090dbbf8 /app/views/projects/wikis | |
parent | b8e5acb2fc5639666165e2b29e164b6aaa1bccc0 (diff) | |
download | gitlab-ce-00209ed89e4e7972f843656b3703d852b6462160.tar.gz |
Remove needless auto-capitalization on Wiki page titles
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38317
Diffstat (limited to 'app/views/projects/wikis')
-rw-r--r-- | app/views/projects/wikis/_sidebar_wiki_page.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/edit.html.haml | 10 | ||||
-rw-r--r-- | app/views/projects/wikis/history.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/wikis/show.html.haml | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/app/views/projects/wikis/_sidebar_wiki_page.html.haml b/app/views/projects/wikis/_sidebar_wiki_page.html.haml index 2423ac6abce..daf01634c42 100644 --- a/app/views/projects/wikis/_sidebar_wiki_page.html.haml +++ b/app/views/projects/wikis/_sidebar_wiki_page.html.haml @@ -1,3 +1,3 @@ %li{ class: active_when(params[:id] == wiki_page.slug) } = link_to project_wiki_path(@project, wiki_page) do - = wiki_page.title.capitalize + = wiki_page.title diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index aa9e29e5371..eaceb457420 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -1,7 +1,5 @@ - @content_class = "limit-container-width" unless fluid_layout -- add_to_breadcrumbs _("Wiki"), project_wiki_path(@project, @page) -- breadcrumb_title @page.persisted? ? _("Edit") : _("New") -- page_title @page.persisted? ? _("Edit") : _("New"), @page.title.capitalize, _("Wiki") +- page_title _("Edit"), @page.title, _("Wiki") = wiki_page_errors(@error) @@ -12,9 +10,9 @@ .nav-text %h2.wiki-page-title - if @page.persisted? - = link_to @page.title.capitalize, project_wiki_path(@project, @page) + = link_to @page.title, project_wiki_path(@project, @page) - else - = @page.title.capitalize + = @page.title %span.light · - if @page.persisted? @@ -30,7 +28,7 @@ = link_to project_wiki_history_path(@project, @page), class: "btn" do = s_("Wiki|Page history") - if can?(current_user, :admin_wiki, @project) - #delete-wiki-modal-wrapper{ data: { delete_wiki_url: project_wiki_path(@project, @page), page_title: @page.title.capitalize } } + #delete-wiki-modal-wrapper{ data: { delete_wiki_url: project_wiki_path(@project, @page), page_title: @page.title } } = render 'form', uploads_path: wiki_attachment_upload_url diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml index 969a1677d9a..622c644ccbd 100644 --- a/app/views/projects/wikis/history.html.haml +++ b/app/views/projects/wikis/history.html.haml @@ -1,4 +1,4 @@ -- page_title _("History"), @page.title.capitalize, _("Wiki") +- page_title _("History"), @page.title, _("Wiki") .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } @@ -6,7 +6,7 @@ .nav-text %h2.wiki-page-title - = link_to @page.title.capitalize, project_wiki_path(@project, @page) + = link_to @page.title, project_wiki_path(@project, @page) %span.light · = _("History") diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index fbf248c2058..ca15dfb7f71 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -1,7 +1,7 @@ - @content_class = "limit-container-width" unless fluid_layout -- breadcrumb_title @page.title.capitalize +- breadcrumb_title @page.title - wiki_breadcrumb_dropdown_links(@page.slug) -- page_title @page.title.capitalize, _("Wiki") +- page_title @page.title, _("Wiki") - add_to_breadcrumbs _("Wiki"), get_project_wiki_path(@project) .wiki-page-header.has-sidebar-toggle @@ -9,7 +9,7 @@ = icon('angle-double-left') .nav-text - %h2.wiki-page-title= @page.title.capitalize + %h2.wiki-page-title= @page.title %span.wiki-last-edit-by - if @page.last_version = (_("Last edited by %{name}") % { name: "<strong>#{@page.last_version.author_name}</strong>" }).html_safe |