pages.rb in gollum-2.1.4

- old
+ new

@@ -3,25 +3,29 @@
 module Precious
   module Views
     class Pages < Layout
       attr_reader :results, :ref
 
+      def prefix
+        @base_url ? @base_url.chomp('/') + '/' : '/'
+      end
+
       def title
         "All pages in #{@ref}"
       end
 
       def breadcrumb
         if @path
           path = Pathname.new(@path)
-          breadcrumb = [%{<a href="#{@base_url}pages/">Home</a>}]
+          breadcrumb = [%{<a href="#{prefix}pages/">Home</a>}]
           path.descend do |crumb|
             title = crumb.basename
 
             if title == path.basename
               breadcrumb << title
             else
-              breadcrumb << %{<a href="#{@base_url}pages/#{crumb}/">#{title}</a>}
+              breadcrumb << %{<a href="#{prefix}pages/#{crumb}/">#{title}</a>}
             end
           end
 
           breadcrumb.join(" / ")
         else
@@ -37,18 +41,18 @@
             page_path = page.path.sub(/^#{@path}\//,'')
 
             if page_path.include?('/')
               folder      = page_path.split('/').first
               folder_path = @path ? "#{@path}/#{folder}" : folder
-              folder_link = %{<li><a href="#{@base_url}pages/#{folder_path}/" class="folder">#{folder}</a></li>}
+              folder_link = %{<li><a href="#{prefix}pages/#{folder_path}/" class="folder">#{folder}</a></li>}
 
               unless folder_links.include?(folder_link)
                 folder_links << folder_link
 
                 folder_link
               end
             elsif page_path != ".gitkeep"
-              %{<li><a href="#{@base_url}#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
+              %{<li><a href="#{prefix}#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
             end
           }.compact.join("\n")
         else
           ""
         end