Commit bca528a5 authored by Hiroyuki Sato's avatar Hiroyuki Sato

Better title format for wiki page

The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
parent 03472b4f
...@@ -47,7 +47,11 @@ class WikiPage ...@@ -47,7 +47,11 @@ class WikiPage
# The formatted title of this page. # The formatted title of this page.
def title def title
@attributes[:title] || "" if @attributes[:title]
@attributes[:title].gsub(/-+/, ' ')
else
""
end
end end
# Sets the title of this page. # Sets the title of this page.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= render 'main_links' = render 'main_links'
%h3.page-title %h3.page-title
Editing - Editing -
%span.light #{@page.title.titleize} %span.light #{@page.title}
%hr %hr
= render 'form' = render 'form'
......
= render 'nav' = render 'nav'
%h3.page-title %h3.page-title
%span.light History for %span.light History for
= link_to @page.title.titleize, project_wiki_path(@project, @page) = link_to @page.title, project_wiki_path(@project, @page)
%table.table %table.table
%thead %thead
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- @wiki_pages.each do |wiki_page| - @wiki_pages.each do |wiki_page|
%li %li
%h4 %h4
= link_to wiki_page.title.titleize, project_wiki_path(@project, wiki_page) = link_to wiki_page.title, project_wiki_path(@project, wiki_page)
%small (#{wiki_page.format}) %small (#{wiki_page.format})
.pull-right .pull-right
%small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)} %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}
= render 'nav' = render 'nav'
%h3.page-title %h3.page-title
= @page.title.titleize = @page.title
= render 'main_links' = render 'main_links'
- if @page.historical? - if @page.historical?
.warning_message .warning_message
......
...@@ -83,7 +83,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps ...@@ -83,7 +83,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
Then 'I should see the existing page in the pages list' do Then 'I should see the existing page in the pages list' do
page.should have_content current_user.name page.should have_content current_user.name
page.should have_content @page.title.titleize page.should have_content @page.title
end end
def wiki def wiki
......
...@@ -155,4 +155,20 @@ describe WikiPage do ...@@ -155,4 +155,20 @@ describe WikiPage do
end end
end end
describe "#title" do
before do
create_page("Title", "content")
@page = wiki.find_page("Title")
end
after do
destroy_page("Title")
end
it "should be replace a hyphen to a space" do
@page.title = "Import-existing-repositories-into-GitLab"
@page.title.should == "Import existing repositories into GitLab"
end
end
end end
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