developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug when selecting theme

This commit is contained in:
chris2tof 2011-08-25 15:44:52 +08:00
parent 32849f1d1b
commit 8b576cac48
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/page.rb
View File

@ -1,7 +1,7 @@
class Page < Item class Page < Item
field :content field :content
field :theme_id field :theme_id, :type => BSON::ObjectId
belongs_to :design belongs_to :design
has_many :page_parts has_many :page_parts

10
lib/parser.rb
View File

@ -66,10 +66,8 @@ module Parser
c.define_tag 'stylesheets' do |tag| c.define_tag 'stylesheets' do |tag|
res = '' res = ''
res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' /> " res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' /> "
page.design.themes.each do |theme| theme = page.design.themes.detect{ |d| d.id == page.theme_id }
res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' /> " res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
end
res
end end
c.define_tag 'javascripts' do |tag| c.define_tag 'javascripts' do |tag|
res = '' res = ''
@ -171,11 +169,9 @@ module Parser
c.define_tag 'stylesheets' do |tag| c.define_tag 'stylesheets' do |tag|
res = '' res = ''
res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' />" res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' />"
page.design.themes.each do |theme| theme = page.design.themes.detect{ |d| d.id == page.theme_id }
res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
end end
res
end
c.define_tag 'javascripts' do |tag| c.define_tag 'javascripts' do |tag|
res = '' res = ''
page.design.javascripts.each do |js| page.design.javascripts.each do |js|