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

Modification in Design structure_css -> default_css

Browse Source
This commit is contained in:
chris2tof committed 2011-09-13 11:57:20 +08:00
1 parent 07ccacb7d7
commit 4db88282a1
8 files changed
+79 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/parser.rb
+4 -4
View File
@@ -65,8 +65,8 @@ module Parser
end
c.define_tag 'stylesheets' do |tag|
res = ''
res << "<link href='#{page.design.reset_css.url}' rel='stylesheet' type='text/css' />"
res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' /> "
res << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />"
res << "<link href='#{page.design.default_css.file.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
@@ -175,8 +175,8 @@ module Parser
end
c.define_tag 'stylesheets' do |tag|
res = ''
res << "<link href='#{page.design.reset_css.url}' rel='stylesheet' type='text/css' />"
res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' />"
res << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />"
res << "<link href='#{page.design.default_css.file.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
lib/tasks/dev.rake
+8 -8
View File
@@ -69,7 +69,7 @@ namespace :dev do
design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
design.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
design.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
@@ -81,9 +81,9 @@ namespace :dev do
design.build_layout
design.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
design.layout.save
theme.save
theme_1.save
design.layout
theme
theme_1
# image.save
# js.save
@@ -93,7 +93,7 @@ namespace :dev do
design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
design_1.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
design_1.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
@@ -105,9 +105,9 @@ namespace :dev do
design_1.build_layout
design_1.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
design_1.layout.save
theme.save
theme_1.save
design_1.layout
theme
theme_1
# image.save
# js.save