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.
This commit is contained in:
Hiroyuki Sato 2014-04-09 14:14:16 +09:00
parent 03472b4fc0
commit bca528a57c
7 changed files with 26 additions and 6 deletions

View File

@ -47,7 +47,11 @@ class WikiPage
# The formatted title of this page.
def title
@attributes[:title] || ""
if @attributes[:title]
@attributes[:title].gsub(/-+/, ' ')
else
""
end
end
# Sets the title of this page.

View File

@ -3,7 +3,7 @@
= render 'main_links'
%h3.page-title
Editing -
%span.light #{@page.title.titleize}
%span.light #{@page.title}
%hr
= render 'form'

View File

@ -1,7 +1,7 @@
= render 'nav'
%h3.page-title
%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
%thead

View File

@ -5,7 +5,7 @@
- @wiki_pages.each do |wiki_page|
%li
%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})
.pull-right
%small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}

View File

@ -1,6 +1,6 @@
= render 'nav'
%h3.page-title
= @page.title.titleize
= @page.title
= render 'main_links'
- if @page.historical?
.warning_message

View File

@ -83,7 +83,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
Then 'I should see the existing page in the pages list' do
page.should have_content current_user.name
page.should have_content @page.title.titleize
page.should have_content @page.title
end
def wiki

View File

@ -155,4 +155,20 @@ describe WikiPage do
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