Change "NewBlog" folders into "new_blog" in assets

Modify routes and pages handling for clean front-end urls
This commit is contained in:
Christophe Vilayphiou committed 2012-01-24 18:16:58 +08:00
1 parent 6a196c5d3d
commit 783eae4597
12 files changed
+40 -26

No files matched your search

+1 -1
View File
@@ -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='#{page.app_frontend_url}'></div>"
ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.title}/front_end/#{page.app_frontend_url}'></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;'>"
+6 -4
View File
@@ -2,7 +2,7 @@ module ParserFrontEnd
require 'radius'
include ParserCommon
def parser_context(page, attributes = {},appfront_url = nil)
def parser_context(page, attributes = {}, id = nil)
Radius::Context.new do |c|
c.define_tag 'snippet' do |tag|
snippet = Snippet.first(:conditions => {:name => tag.attr['name']})
@@ -101,7 +101,9 @@ module ParserFrontEnd
c.define_tag 'content' do |tag|
ret = ''
if (tag.attributes["main"] == "true" && !page.module_app.nil?)
ret << "<div id='appfrontend' class='dymanic_load' path='#{appfront_url.nil?? page.app_frontend_url : appfront_url}'></div>"
ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.title}/front_end/#{page.app_frontend_url}"
ret << "/#{id}" if id
ret << "?inner=true'></div>"
else
part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
ret << part.content rescue nil
@@ -123,10 +125,10 @@ module ParserFrontEnd
end
end
def parse_page(page ,appfront_url)
def parse_page(page, id = nil)
if page._type == 'Page'
layout_content = page.design.layout.content.force_encoding('UTF-8') rescue ''
context = parser_context(page,{}, appfront_url)
context = parser_context(page, {}, id)
parser = Radius::Parser.new(context, :tag_prefix => 'r')
parser.parse(parser.parse(layout_content))
end