wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove prefix. #470.

Browse Source
This commit is contained in:
bootstraponline
2012-08-16 12:01:03 -06:00
parent 6cfc807db0
commit e73c84490e
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/views/pages.rb
+4 -8
View File
@@ -5,10 +5,6 @@ module Precious
class Pages < Layout class Pages < Layout
attr_reader :results, :ref attr_reader :results, :ref
def prefix
@base_url ? @base_url.chomp('/') + '/' : '/'
end
def title def title
"All pages in #{@ref}" "All pages in #{@ref}"
end end
@@ -16,14 +12,14 @@ module Precious
def breadcrumb def breadcrumb
if @path if @path
path = Pathname.new(@path) path = Pathname.new(@path)
breadcrumb = [%{<a href="#{prefix}pages/">Home</a>}] breadcrumb = [%{<a href="#{@base_url}/pages/">Home</a>}]
path.descend do |crumb| path.descend do |crumb|
title = crumb.basename title = crumb.basename
if title == path.basename if title == path.basename
breadcrumb << title breadcrumb << title
else else
breadcrumb << %{<a href="#{prefix}pages/#{crumb}/">#{title}</a>} breadcrumb << %{<a href="#{@base_url}/pages/#{crumb}/">#{title}</a>}
end end
end end
@@ -43,7 +39,7 @@ module Precious
if page_path.include?('/') if page_path.include?('/')
folder = page_path.split('/').first folder = page_path.split('/').first
folder_path = @path ? "#{@path}/#{folder}" : folder folder_path = @path ? "#{@path}/#{folder}" : folder
folder_link = %{<li><a href="#{prefix}pages/#{folder_path}/" class="folder">#{folder}</a></li>} folder_link = %{<li><a href="#{@base_url}/pages/#{folder_path}/" class="folder">#{folder}</a></li>}
unless folder_links.include?(folder_link) unless folder_links.include?(folder_link)
folder_links << folder_link folder_links << folder_link
@@ -51,7 +47,7 @@ module Precious
folder_link folder_link
end end
elsif page_path != ".gitkeep" elsif page_path != ".gitkeep"
%{<li><a href="#{prefix}#{page.escaped_url_path}" class="file">#{page.name}</a></li>} %{<li><a href="#{@base_url}/#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
end end
}.compact.join("\n") }.compact.join("\n")
else else
test/test_pages_view.rb
+2 -2
View File
@@ -19,7 +19,7 @@ context "Precious::Views::Pages" do
test "breadcrumb" do test "breadcrumb" do
@page.instance_variable_set("@path", "Mordor/Eye-Of-Sauron/Saruman") @page.instance_variable_set("@path", "Mordor/Eye-Of-Sauron/Saruman")
@page.instance_variable_set("@base_url", "/") @page.instance_variable_set("@base_url", "")
assert_equal '<a href="/pages/">Home</a> / <a href="/pages/Mordor/">Mordor</a> / <a href="/pages/Mordor/Eye-Of-Sauron/">Eye-Of-Sauron</a> / Saruman', @page.breadcrumb assert_equal '<a href="/pages/">Home</a> / <a href="/pages/Mordor/">Mordor</a> / <a href="/pages/Mordor/Eye-Of-Sauron/">Eye-Of-Sauron</a> / Saruman', @page.breadcrumb
end end
@@ -29,7 +29,7 @@ context "Precious::Views::Pages" do
test "files_folders" do test "files_folders" do
@page.instance_variable_set("@path", "Mordor") @page.instance_variable_set("@path", "Mordor")
@page.instance_variable_set("@base_url", "/") @page.instance_variable_set("@base_url", "")
results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")] results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
@page.instance_variable_set("@results", results) @page.instance_variable_set("@results", results)
assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders