From a5f5d53881645d42d27ea9b46d10a2442676e271 Mon Sep 17 00:00:00 2001
From: Benjamin Kellermann <Benjamin.Kellermann@gmx.de>
Date: Mon, 7 Feb 2011 10:56:56 +0100
Subject: Attempt to fix relative path bug with error pages

---
 html.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'html.rb')

diff --git a/html.rb b/html.rb
index a9db0b7..3ea4425 100644
--- a/html.rb
+++ b/html.rb
@@ -19,8 +19,10 @@
 
 class HTML
 	attr_accessor :body, :header
-	def initialize(title)
+	attr_reader :relative_dir
+	def initialize(title, relative_dir = "")
 		@title = title
+		@relative_dir = relative_dir
 		@header = {}
 		@header["type"] = "text/html"
 #		@header["type"] = "application/xhtml+xml"
@@ -42,12 +44,12 @@ HEAD
 		@css = [@css[0]] + @css[1..-1].sort unless @css.empty?
 		@css.each{|title,href|
 			titleattr = "title='#{title}'" if title != ""
-			ret += "<link rel='stylesheet' type='text/css' href='#{href}' #{titleattr} media='screen, projection, tv, handheld'/>\n"
-			ret += "<link rel='stylesheet' type='text/css' href='#{href}' media='print' />\n" if title == "print"
+			ret += "<link rel='stylesheet' type='text/css' href='#{@relative_dir}#{href}' #{titleattr} media='screen, projection, tv, handheld'/>\n"
+			ret += "<link rel='stylesheet' type='text/css' href='#{@relative_dir}#{href}' media='print' />\n" if title == "print"
 		}
 
 		@atom.each{|href|
-			ret += "<link rel='alternate'  type='application/atom+xml' href='#{href}' />\n"
+			ret += "<link rel='alternate'  type='application/atom+xml' href='#{@relative_dir}#{href}' />\n"
 		}
 
 		ret += @htmlheader
@@ -73,10 +75,10 @@ HEAD
 		@header["cookie"] << c
 	end
 	def add_head_script(file)
-		add_html_head("<script type='text/javascript' src='#{file}'></script>")
+		add_html_head("<script type='text/javascript' src='#{@relative_dir}#{file}'></script>")
 	end
 	def add_script_file(file)
-		self << "<script type='text/javascript' src='#{file}'></script>"
+		self << "<script type='text/javascript' src='#{@relative_dir}#{file}'></script>"
 	end
 	def add_script(script)
 		self << <<SCRIPT
-- 
cgit v1.2.3