aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2009-11-26 13:17:25 +0100
committerBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2009-11-26 13:17:25 +0100
commitc69d8a73dc1028b7df908a6eccfe8f60ff45b03f (patch)
tree3ddddb47e2b16f9a63c3856a561ec0451b4f5a9e
parent1f066293d7bdd11f2c112f94e327259684d774c8 (diff)
minor bugfixes of css feature
-rwxr-xr-xcustomize.rb2
-rw-r--r--dudle.rb14
2 files changed, 8 insertions, 8 deletions
diff --git a/customize.rb b/customize.rb
index 0cb79a7..c3d3e2d 100755
--- a/customize.rb
+++ b/customize.rb
@@ -22,7 +22,7 @@
if __FILE__ == $0
-$:.unshift("..")
+$:.push("..")
require "dudle"
$d = Dudle.new("Customize")
diff --git a/dudle.rb b/dudle.rb
index fcab88a..6b0a6ad 100644
--- a/dudle.rb
+++ b/dudle.rb
@@ -22,7 +22,7 @@ require "cgi"
$cgi = CGI.new
-$:.unshift("..")
+$:.push("..")
require "html"
require "poll"
require "config"
@@ -33,7 +33,7 @@ class Dudle
def tabs(active_tab)
ret = "<div id='tabs'><ul>"
tabs = []
- tabs << ["Home",".."]
+ tabs << ["Home",@basedir]
if @is_poll
tabs << ["",""]
tabs << ["Poll","."]
@@ -64,7 +64,7 @@ class Dudle
def initialize(htmltitle, revision=nil)
if File.exists?("data.yaml") && !File.stat("data.yaml").directory?
@is_poll = true
- basedir = ".."
+ @basedir = ".."
if revision
@table = YAML::load(VCS.cat(revision, "data.yaml"))
else
@@ -76,7 +76,7 @@ class Dudle
@html.header["Cache-Control"] = "no-cache"
else
@is_poll = false
- basedir = "."
+ @basedir = "."
@title = "dudle"
@html = HTML.new(@title)
end
@@ -84,10 +84,10 @@ class Dudle
@css = [["default","dudle.css"],
["print" ,"print.css"]]
- Dir.open("#{basedir}/css/").each{|f|
+ Dir.open("#{@basedir}/css/").each{|f|
if f =~ /\.css$/
name = ""
- File.open("#{basedir}/css/#{f}","r").each_line{|l|
+ File.open("#{@basedir}/css/#{f}","r").each_line{|l|
name = l.scan(/\/\* Name: (.*) \*\/$/).flatten[0]
break
}
@@ -97,7 +97,7 @@ class Dudle
default = $cgi["css"]
default = $cgi.cookies["css"][0] if default == ""
@css.each{|title,href|
- @html.add_css("../#{href}",title,href == default)
+ @html.add_css("#{@basedir}/#{href}",title,href == default)
}
@html << <<HEAD