merge with november_presentation

lib/fraisier/layout.html

@@ -24,10 +24,10 @@
 		</div>
       
 		<div id="main_content" class="content">
-		  <r:content name='content_1'>
-		  </r:content>
-			<div class="dymanic_load" path="/panel/blog/widget_latest_post"></div> 
-			<div class="dymanic_load" path="/panel/blog/widget_index"></div> 		
+			  <r:content name='content_1' main='true'>
+			  </r:content>
+			<div class="dymanic_load" path="/panel/blog/widget/latest_post"></div> 
+			<div class="dymanic_load" path="/panel/blog/widget/"></div> 		
 		</div>
 
 		<div id="footer" class="footer">

lib/parser.rb

@@ -1,6 +1,6 @@
 module Parser
   
-  def parser_context(page, attributes = {})
+  def parser_context(page, attributes = {},appfront_url = nil)
     Radius::Context.new do |c|
       c.define_tag 'snippet' do |tag|
         snippet = Snippet.first(:conditions => {:name => tag.attr['name']})
@@ -97,8 +97,14 @@ module Parser
         part.content
       end
       c.define_tag 'content' do |tag|
-        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
-        part.content
+        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>"
+        else
+          part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
+          ret << part.content
+        end
+        ret
       end
       c.define_tag 'link' do |tag|
         item = Item.first(:conditions => { :full_name => tag.attr['name'] })
@@ -115,10 +121,10 @@ module Parser
     end
   end
   
-  def parse_page(page)
+  def parse_page(page ,appfront_url)
     if page._type == 'Page'
       layout_content = page.design.layout.content.force_encoding('UTF-8') rescue ''
-      context = parser_context(page)
+      context = parser_context(page,{}, appfront_url)
       parser = Radius::Parser.new(context, :tag_prefix => 'r')
       parser.parse(parser.parse(layout_content))
     end
@@ -204,14 +210,18 @@ module Parser
         ret << '</div>'
       end
       c.define_tag 'content' do |tag|
-        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
         ret = ''
-        ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"
-        ret << "<div class='edit_link' style='display:none'>"
-        ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
-        ret << '</div>'
-        ret << part.i18n_variable[I18n.locale.to_s] rescue ''
-        ret << '</div>'
+        if (tag.attributes["main"] == "true" && !page.module_app.nil?)
+          ret << "<div id='appfrontend' class='dymanic_load' path='#{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;'>"
+            ret << "<div class='edit_link' style='display:none'>"
+            ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
+            ret << '</div>'
+            ret << part.i18n_variable[I18n.locale.to_s] rescue ''
+            ret << '</div>'
+        end
       end
       c.define_tag 'link' do |tag|
         item = Item.first(:conditions => { :full_name => tag.attr['name'] })

lib/tasks/dev.rake

@@ -118,7 +118,7 @@ namespace :dev do
     
     home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design_1.id, :name => 'home', :is_published => true, :theme_id => theme.id )
     home.page_parts.create!( :name => 'content_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
-    
+    ModuleApp.create.from_json(File.open("#{Rails.root}/vendor/plugins/NewBlog/NewBlog.json").read).save
     Post.create(:title=>"1st post",:body=>"Long long time ago.....")
     Post.create(:title=>"2ec post",:body=>"And?.....")