Changes into page_part edition.

Can choose between 'text', 'public_r_tag' and 'widget'

app/assets/javascripts/page_edit.js

@@ -19,3 +19,12 @@ $("#page_module_app_id").live('change', function() {
 		$("#app_page_url").children().remove();
 	}
 });
+
+$("#module_app_list select").live('change', function() {
+	$.getScript($(this).attr('rel') + '/' + $(this).val() + '/reload_widgets');
+});
+
+$('.part_kind').live('click', function() {
+	$('.part_kind_partial').hide();
+	$('#part_' + $(this).attr('value')).show();
+});

app/controllers/admin/page_parts_controller.rb

@@ -22,15 +22,10 @@ class Admin::PagePartsController < ApplicationController
 
   def edit
     @part = PagePart.find(params[:id])
-    case @part.kind
+    @module_apps = ModuleApp.all(:conditions => {:enable_frontend => true})
-      when 'text'
+    @module_app = @part.module_app ? @part.module_app : @module_apps[0]
-        @i18n_variable = @part.i18n_variable
+    @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
-        @partial = 'edit_text'
+    @tag_objects = @r_tag.classify.constantize.all
-        @part_locale = params[:part_locale] || I18n.locale.to_s
-      when 'module'
-        @plugins=[{:module=>"Blog",:widgets=>[{:name=>"Blog",:path=>"panel/new_blog/widget_latest_post"},{:name=>"Blog",:path=>"panel/new_blog/widget_index"}]}]
-      when 'snippet'
-    end
   end
 
   def create
@@ -41,7 +36,6 @@ class Admin::PagePartsController < ApplicationController
     @part = PagePart.find(params[:id])
     if @part.update_attributes(params[:page_part])
       flash.now[:notice] = t('admin.update_success_content')
-      @part.build_content(@site_valid_locales)
       @part.save
       respond_to do |format|
         format.html { 
@@ -59,9 +53,14 @@ class Admin::PagePartsController < ApplicationController
   def destroy
     @item = Page.find(params[:id])
     @item.destroy
-    @item.destroy_i18n_variable
-
     redirect_to admin_items_url( :parent_id => @item.parent_id )
   end
   
+  def reload_widgets
+    @module_app = ModuleApp.find(params[:id])
+    respond_to do |format|
+      format.js  {}
+    end
+  end
+  
 end

app/models/design/theme.rb

@@ -1,7 +1,8 @@
 class Theme < Stylesheet
-  embedded_in :design
   field :name
   
+  embedded_in :design
+  
   before_save :set_name
   
   protected

app/models/item.rb

@@ -5,7 +5,6 @@ class Item
   
   field :name, :index => true
   field :full_name, :index => true
-  field :i18n_variable_id, :type => BSON::ObjectId
   field :parent_id, :index => true
   field :parent_name
   field :position, :type => Integer
@@ -17,15 +16,11 @@ class Item
   validates_presence_of :name, :full_name, :position, :is_published
   
   belongs_to :parent, :class_name => "Item"
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :children, :class_name => "Item", :as => 'parent'
   
   before_validation :setup_default_value
   
-  # Destroy the i18n_variable
-  def destroy_i18n_variable
-    self.i18n_variable.destroy rescue nil
-  end
-  
   def self.find_by_name(item_name)
     Item.first(:conditions => { :name => item_name, :is_published => true })
   end
@@ -37,22 +32,6 @@ class Item
     nodes.reverse
   end
   
-  # Update or create the i18n_variable record
-  def i18n_variable=(attr)
-    if self.i18n_variable_id
-      self.i18n_variable.update_attributes(attr) rescue nil
-    else
-      var = I18nVariable.new(attr.merge({:key => self.name, :document_class => self.class}))
-      var.save
-      self.i18n_variable_id = var.id
-    end
-  end
-  
-   # Get the i18n_variable
-  def i18n_variable
-    @i18n_variable ||= I18nVariable.find(self.i18n_variable_id) rescue nil
-  end
-  
   # Build the url from the array of ancestors
   def url
     urls = ancestors.map{ |a| a.name } << self.name

app/models/module_app.rb

@@ -10,7 +10,7 @@ class ModuleApp
   field :intro
   field :update_info
   field :create_date
-  field :enable_frontend,type: Boolean
+  field :enable_frontend, type: Boolean, :default => true
   
   field :app_pages ,type: Array
   field :widgets ,type: Array
@@ -19,6 +19,8 @@ class ModuleApp
   has_many :sub_managers,as: :sub_managing_app ,:class_name => "AppManager"#, :dependent => :destroy,:foreign_key => "sub_managing_app_id",:inverse_of => :sub_managing_app
   
   has_many :tags
+  has_many :page_parts
+  has_many :pages
   
   has_one :app_auth,dependent: :delete
   

app/models/page.rb

@@ -5,23 +5,16 @@ class Page < Item
   field :theme_id, :type => BSON::ObjectId, :default => nil
   
   belongs_to :design
-  has_many :page_parts
   belongs_to :module_app
+  has_many :page_parts, :autosave => true, :dependent => :destroy
+  accepts_nested_attributes_for :page_parts, :allow_destroy => true
   
-  embeds_many :custom_images, :class_name => 'Image', as: :design_image
+  # embeds_many :custom_images, :class_name => 'Image', as: :design_image
   
   def create_parts
     page_design = self.design
     page_design.layout.layout_parts.each do |p|
-      self.page_parts.create( :name => p.name, :i18n_variable_id => I18nVariable.create.id, :kind => 'text' ) if p.editable?
+      self.page_parts.create( :name => p.name, :i18n_variable => I18nVariable.create, :kind => 'text' ) if p.editable?
-    end
-  end
-  
-  # Destroy the page_parts
-  def destroy_page_parts
-    self.page_parts.each do |part|
-      part.destroy_i18n_variable
-      part.destroy
     end
   end
   

app/models/page_part.rb

@@ -6,41 +6,13 @@ class PagePart
   field :name
   field :content
   field :kind
-  field :i18n_variable_id, :type => BSON::ObjectId
+  field :public_r_tag
+  field :public_r_tag_object_id, :type => BSON::ObjectId, :default => nil
+  field :widget_path
+  
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
 
   belongs_to :page
-  
+  belongs_to :module_app
-  # Get the i18n_variable
-  def i18n_variable
-    @i18n_variable ||= I18nVariable.find(self.i18n_variable_id) rescue nil
-  end
-  
-  # Update or create the i18n_variable record
-  def i18n_variable=(attr)
-    if self.i18n_variable_id
-      self.i18n_variable.update_attributes(attr)
-    else
-      var = I18nVariable.new(attr.merge({:key => self.name, :document_class => self.class, :parent_id => self.page.i18n_variable_id}))
-      var.save
-      self.i18n_variable_id = var.id
-    end
-  end
-  
-  def destroy_i18n_variable
-    self.i18n_variable.destroy rescue nil
-  end
-  
-  # Build the content from the i18n_variable
-  def build_content(locales)
-    res = ''
-    res << "<r:multi_lang i18n_id='#{i18n_variable.id}'>"
-    locales.each do |locale|
-      res << "<r:lang name='#{locale.to_s}'>"
-      res << i18n_variable[locale.to_s]
-      res << "</r:lang>"
-    end
-    res << "</r:multi_lang>"
-    self.content = res
-  end
 
 end

app/views/admin/module_apps/_app_selector.html.erb

@@ -1 +1 @@
-<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path }  %>
+<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {}, {:rel => admin_module_apps_path } %>

app/views/admin/page_parts/_edit_text.html.erb

@@ -1,17 +0,0 @@
-<%= flash_messages %>
-
-<%= render 'language_bar' %>
-
-
-<%= form_for @part, :url => admin_page_part_path(@part), :html => { :class => 'form' } do |f| %>
-	<%= fields_for "page_part[i18n_variable]", @i18n_variable, :index => nil do |f| %>
-		<% @site_valid_locales.each do |locale| %>
-			<div class="ckeditor_locale" style="display:<%= @part_locale.eql?(locale) ? 'block' : 'none' %>">
-	  		<%= render :partial => "admin/page_parts/form", :locals => { :f => f, :locale => locale } %>
-			</div>
-	  <% end %>
-	<% end %>
-  <p>
-    <%= f.submit t(:update) %> <%= link_back %>
-  </p>
-<% end %>

app/views/admin/page_parts/_form.html.erb

@@ -1,3 +0,0 @@
-<%= f.error_messages %>
-
-<%= f.cktext_area locale, :toolbar=>'Full', :width=>'700px', :height=>'200px'%>

app/views/admin/page_parts/edit.html.erb

@@ -2,4 +2,4 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render @partial %>
+<%= render 'edit' %>

app/views/admin/page_parts/edit.js.erb

@@ -1 +1 @@
-$('#back_main').html("<%= escape_javascript(render(:partial => @partial)) %>");
+$('#back_main').html("<%= j render(:partial => 'edit') %>");

config/application.rb

@@ -6,6 +6,7 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
+require 'sprockets/railtie'
 
 # If you have a Gemfile, require the default gems, the ones in the
 # current environment and also include :assets gems if in development

config/list.yml

@@ -6,3 +6,11 @@ forbidden_item_names:
 markups:
   - text_field
   - select
+  
+public_r_tags:
+  - ad_banner
+  
+page_part_kinds:
+  - text
+  - public_r_tag
+  - module_widget

config/routes.rb

@@ -66,7 +66,11 @@ PrototypeR4::Application.routes.draw do
         get 'reload_frontend_pages'
       end
     end
-    resources :page_parts
+    resources :page_parts do
+      member do
+        get 'reload_widgets'
+      end
+    end
     resources :purchases do
       collection do
         get 'install_app'

lib/fraisier/layout.html

@@ -18,19 +18,17 @@
 		<!-- example -->
 		<div id="header_top" class="header">
 			This is the first level of header
-			<r:adbanner name='banner_1'>
+			<r:content name='content_2'>
-		  </r:adbanner>
+		  </r:content>
 		</div>
 		<div id="header_bottom" class="header">
 			This is the second level of header
 		</div>
       
 		<div id="main_content" class="content">
-			  <r:content name='content_1' main='true'>
+			  <r:content name='content_1' main='true'/>
-			  </r:content>
+			  <r:content name='content_3'/>
-			<div class="dymanic_load" path="/panel/new_blog/widget/latest_post"></div> 
+				<r:content name='content_4'/>
-			<div class="dymanic_load" path="/panel/new_blog/widget/"></div> 	
-			<div class="dymanic_load" path="/panel/announcement/widget/"></div> 	
 		</div>
 
 		<div id="footer" class="footer">

lib/parsers/parser_back_end.rb

@@ -31,12 +31,6 @@ module ParserBackEnd
           end
         }.join(' | ')
       end
-      c.define_tag 'multi_lang' do |tag|
-        tag.expand
-      end
-      c.define_tag 'multi_lang:lang' do |tag|
-        tag.expand if tag.attr['name'].eql?(I18n.locale.to_s)
-      end
       c.define_tag 'css' do |tag|
         assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
         res = ''
@@ -75,26 +69,24 @@ module ParserBackEnd
         end
         res
       end
-      c.define_tag 'adbanner' do |tag|
+      c.define_tag 'ad_banner' do |tag|
         res = ''
-        ad_banner = AdBanner.first(conditions:{title: tag.attr["name"]})
+        ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
-        res << "<script type='text/javascript'>
+        if ad_banner
-                  $(document).ready(function(){ $('#slideshow-#{ad_banner.title}').cycle({after:   onAfter,timeout:1 ,fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}' }); });
+          res << "<script type='text/javascript'>
-                  </script>"
+                    $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({after:   onAfter,timeout:1 ,fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}' }); });
-
+                    </script>"
-       
+          res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
-        res << "<div id='#{tag.attr['name']}' ad_banner_id='#{ad_banner.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"
+          ad_banner.ad_images.each do |ad_image|
-        res << "<div class='edit_link' style='display:none'>"
+            res << "<img src='#{ad_image.file}' "
-        res << " <a href='#{edit_admin_ad_banner_path(ad_banner.id)}' class='nav'>#{t(:edit)}</a>"
+            res << "alt='#{ad_image.picture_intro || ' '}' "
-        res << '</div>'
+            res << "time_to_next='#{ad_image.get_delay_time}' "
-       #==================================
+            res << "link_open='#{ad_image.link_open}' "
-        res << "<div id='slideshow-#{ad_banner.title}'>"
+            res << "link_url='#{(ad_banner.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
-         ad_banner.ad_images.each do |ad_image|
+            res << "/>"
-           res << "<img src='#{ad_image.file}' />"
           end
-        res << "</div>"
+          res << "</div>"
-      #==================================
+        end
-      res << "</div>"
       end
       c.define_tag 'layout_part' do |tag|
         part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
@@ -108,13 +100,22 @@ module ParserBackEnd
         if (tag.attributes["main"] == "true" && !page.module_app.nil?)
           ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/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 }
+          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 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 << "<div class='edit_link' style='display:none'>"
-            ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
+          ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
-            ret << '</div>'
+          ret << '</div>'
-            ret << part.i18n_variable[I18n.locale.to_s] rescue ''
+          case part.kind
-            ret << '</div>'
+            when 'text'
+              ret << part.i18n_variable[I18n.locale] rescue ''
+            when 'module_widget'
+              ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}'></div>"
+            when 'public_r_tag'
+              ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
+            else
+              ''
+          end
+          ret << '</div>'
         end
       end
       c.define_tag 'link' do |tag|

lib/parsers/parser_front_end.rb

@@ -51,12 +51,6 @@ module ParserFrontEnd
             var.destroy
         end
       end
-      c.define_tag 'multi_lang' do |tag|
-        tag.expand
-      end
-      c.define_tag 'multi_lang:lang' do |tag|
-        tag.expand if tag.attr['name'].eql?(I18n.locale.to_s)
-      end
       c.define_tag 'css' do |tag|
         assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
         res = ''
@@ -83,15 +77,14 @@ module ParserFrontEnd
         end
         res
       end
-      c.define_tag 'adbanner' do |tag|
+      c.define_tag 'ad_banner' do |tag|
         res = ''
-        ad_banner = AdBanner.first(conditions:{title: tag.attr["name"]})
+        ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
-        if ad_banner.display?
+        if ad_banner && ad_banner.display?
           res << "<script type='text/javascript'>
-                  $(document).ready(function(){ $('#slideshow-#{ad_banner.title}').cycle({after:   onAfter,timeout:1 ,fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}' }); });
+                  $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({after:   onAfter,timeout:1 ,fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}' }); });
                   </script>"
-
+          res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
-          res << "<div id='slideshow-#{ad_banner.title}'>"
            ad_banner.ad_images.each do |ad_image|
              res << "<img src='#{ad_image.file}' "
              res << "alt='#{ad_image.picture_intro || ' '}' "
@@ -128,7 +121,16 @@ module ParserFrontEnd
           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
+          case part.kind
+          when 'text'
+            ret << part.i18n_variable[I18n.locale] rescue ''
+          when 'module_widget'
+            ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true'></div>"
+          when 'public_r_tag'
+            ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
+          else
+              ''
+          end
         end
         ret
       end

lib/parsers/parser_layout.rb

@@ -15,7 +15,7 @@ module ParserLayout
       end
       c.define_tag 'stylesheets' do |tag|
       end
-      c.define_tag 'adbanner' do |tag|
+      c.define_tag 'ad_banner' do |tag|
       end
       c.define_tag 'menu' do |tag|
         layout.build_menu(:levels => 0, :values => {}) unless layout.menu

lib/tasks/dev.rake

@@ -103,8 +103,11 @@ namespace :dev do
     design_1.save
     
     
-    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.create!( :i18n_variable => var_10, :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 )
+    home.page_parts.create!( :name => 'content_1', :content => nil, :kind => nil )
+    home.page_parts.create!( :name => 'content_2', :content => nil, :kind => nil )
+    home.page_parts.create!( :name => 'content_3', :content => nil, :kind => 'text', :i18n_variable => var_13 )
+    home.page_parts.create!( :name => 'content_4', :content => nil, :kind => 'text', :i18n_variable => nil )
     ModuleApp.new.from_json(File.open("#{Rails.root}/vendor/built_in_modules/new_blog/new_blog.json").read).save
     ModuleApp.new.from_json(File.open("#{Rails.root}/vendor/built_in_modules/announcement/announcement.json").read).save
     Post.create(:title=>"1st post",:body=>"Long long time ago.....")

lib/template/home.page

@@ -1,8 +1,2 @@
-<r:multi_lang>
+<r:ad_banner name='banner_1'>
-	<r:lang name='en'>
+</r:ad_banner>
-		<p>This is the homepage</p>
-	</r:lang>
-	<r:lang name='zh_tw'>
-		<p>t這是首頁</p>
-	</r:lang>
-</r:multi_lang>

vendor/built_in_modules/announcement/announcement.json

@@ -7,5 +7,6 @@
   "update_info": "Some info",
   "create_date": "11-11-2011",
 	"app_pages":  ["bulletins"],
+	"widgets": ["bulletins"],
 	"enable_frontend": true
 }

vendor/built_in_modules/announcement/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-  
   namespace :panel do
     namespace :announcement do
       namespace :back_end do
@@ -15,9 +14,8 @@ Rails.application.routes.draw do
         resources :bulletins
       end
       namespace :widget do
-        root :to => "bulletins#index"
+        match "bulletins" => "bulletins#index"
       end
     end
   end
- match "/appfront/*path" => redirect("/panel/*path")
+end
-end

vendor/built_in_modules/new_blog/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-  
   namespace :panel do
     namespace :new_blog do
       namespace :back_end do
@@ -13,13 +12,9 @@ Rails.application.routes.draw do
         resources :comments
       end
       namespace :widget do
-        root :to => "posts#index"
+        match "posts" => "posts#index"
-         match "latest_post" => "posts#latest_post"
+        match "latest_post" => "posts#latest_post"
       end
     end
   end
-  
- # match "appfront/blog/front_end/show/:id" => "posts#frontend_show" ,:as => :appfront_blog_show
- 
- match "/appfront/*path" => redirect("/panel/*path")
 end

vendor/built_in_modules/new_blog/new_blog.json

@@ -7,6 +7,6 @@
   "update_info": "Some info",
   "create_date": "11-11-2011",
 	"app_pages":  ["posts"],
-	"widgets": ["/latest_post","/"],
+	"widgets": ["latest_post","posts"],
 	"enable_frontend": true
 }