Fix bug in layout, parser and change lib/fraisier

This commit is contained in:
chris2tof committed 2011-09-07 11:53:16 +08:00
1 parent 4ce0bda00b
commit 0956e9784a
6 files changed
+10 -8

No files matched your search

File renamed without changes.
+2
View File
@@ -69,6 +69,7 @@ module Parser
res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' /> "
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" if theme
res
end
c.define_tag 'javascripts' do |tag|
res = ''
@@ -178,6 +179,7 @@ module Parser
res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' />"
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" if theme
res
end
c.define_tag 'javascripts' do |tag|
res = ''
+2 -2
View File
@@ -69,7 +69,7 @@ namespace :dev do
design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
design.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
design.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
@@ -93,7 +93,7 @@ namespace :dev do
design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
design_1.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
design_1.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#