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

Fix bugs in design.

Browse Source 
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
This commit is contained in:
Christophe Vilayphiou committed 2012-01-31 16:38:25 +08:00
1 parent 4906894fb5
commit ccbde122df
3 files changed
+6 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/parsers/parser_back_end.rb
+3 -3
View File
@@ -67,11 +67,11 @@ module ParserBackEnd
end
c.define_tag 'javascripts' do |tag|
res = ''
res << "<script type='text/javascript' src='/static/jquery.js'></script>"
res << "<script type='text/javascript' src='/static/kernel.js'></script>"
page.design.javascripts.each do |js|
res << "<script type='text/javascript' src='#{js.file.url}'></script>"
end
res << "<script type='text/javascript' src='/static/jquery.js'></script>"
res << "<script type='text/javascript' src='/static/kernel.js'></script>"
res
end
c.define_tag 'layout_part' do |tag|
@@ -84,7 +84,7 @@ module ParserBackEnd
c.define_tag 'content' do |tag|
ret = ''
if (tag.attributes["main"] == "true" && !page.module_app.nil?)
ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.title}/front_end/#{page.app_frontend_url}'></div>"
ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.title}/front_end/#{page.app_frontend_url}?inner=true'></div>"
else
part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"
lib/parsers/parser_front_end.rb
+2 -2
View File
@@ -75,11 +75,11 @@ module ParserFrontEnd
end
c.define_tag 'javascripts' do |tag|
res = ''
res << "<script type='text/javascript' src='/static/jquery.js'></script>"
res << "<script type='text/javascript' src='/static/kernel.js'></script>"
page.design.javascripts.each do |js|
res << "<script type='text/javascript' src='#{js.file.url}'></script>"
end
res << "<script type='text/javascript' src='/static/jquery.js'></script>"
res << "<script type='text/javascript' src='/static/kernel.js'></script>"
res
end
c.define_tag 'image' do |tag|