possibility to change css from everywhere

2 files changed, 12 insertions, 10 deletions

diff --git a/customize.rb b/customize.rb
index d9c5dc8..f69d6b4 100755
--- a/customize.rb
+++ b/customize.rb
@@ -62,13 +62,9 @@ $d << "<h3>" + _("Charset")+ "</h3>"
 $d << choosetable(a,$USEUTF ? "utf" : "ascii")
 $d << "</div>"
 
-css = $cgi.cookies["css"][0]
-css = $cgi["css"] if $cgi.include?("css")
-css ||= "default.css"
-$d.html.add_cookie("css",css,"/",Time.now + (1*60*60*24*365 * (css == "dudle.css" ? -1 : 1 )))
 $d << "<div id='config_stylesheet'>"
 $d << "<h3>" + _("Stylesheet") + "</h3>"
-$d << choosetable($d.css.collect{|href| [href.scan(/([^\/]*)\.css/).flatten[0],"css=#{href}"]},"css=#{css}")
+$d << choosetable($d.css.collect{|href| [href.scan(/([^\/]*)\.css/).flatten[0],"css=#{href}"]},"css=#{$d.user_css}")
 $d << "</div>"
 
 
diff --git a/dudle.rb b/dudle.rb
index 48feb72..21fbf2a 100644
--- a/dudle.rb
+++ b/dudle.rb
@@ -39,7 +39,7 @@ require "config"
 require "charset"
 
 class Dudle
-	attr_reader :html, :table, :urlsuffix, :css, :title, :tab
+	attr_reader :html, :table, :urlsuffix, :css, :user_css, :title, :tab
 	def is_poll?
 		@is_poll
 	end
@@ -135,15 +135,21 @@ class Dudle
 				@css << "css/#{f}"
 			end
 		}
-		default = $cgi["css"]
-		default = $cgi.cookies["css"][0] if default == ""
+		if $cgi.include?("css")
+			@user_css = $cgi["css"] 
+			@html.add_cookie("css",@user_css,"/",Time.now + (1*60*60*24*365 * (@user_css == "default.css" ? -1 : 1 )))
+		else
+			@user_css = $cgi.cookies["css"][0]
+			@user_css ||= "default.css"
+		end
+
 		if $cgi.user_agent =~ /.*MSIE [567]\..*/
-			css = [default ? default : "default.css"]
+			css = [@user_css]
 		else
 			css = @css
 		end
 		css.each{|href|
-			@html.add_css("#{@basedir}/#{href}",href.scan(/([^\/]*)\.css/).flatten[0] ,href == default)
+			@html.add_css("#{@basedir}/#{href}",href.scan(/([^\/]*)\.css/).flatten[0] ,href == @user_css)
 		}
 
 		@html << <<HEAD