From 608180646b76871282d58d9c06459f523b5ad8a6 Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Wed, 24 Aug 2011 01:39:28 +0800
Subject: [PATCH 1/4] Clean code and add 'name' in theme.rb

---
 Gemfile                                   |   2 +-
 Gemfile.lock                              |   4 +-
 app/controllers/admin/pages_controller.rb |  20 +----
 app/helpers/admin/item_helper.rb          |   1 -
 app/models/design/theme.rb                |  12 +++
 app/models/page.rb                        |  15 +---
 app/views/admin/pages/_edit_code.html.erb |   8 --
 app/views/admin/pages/_form.html.erb      |  10 ++-
 app/views/admin/pages/_form_code.html.erb |   3 -
 app/views/admin/pages/edit.html.erb       |  15 ----
 app/views/admin/pages/edit.js.erb         |   1 -
 app/views/admin/pages/show.html.erb       |   2 +-
 app/views/admin/pages/update.js.erb       |   2 -
 lib/fraisier/themes/red.css               |   1 +
 lib/parser.rb                             | 104 +---------------------
 lib/tasks/dev.rake                        |  36 ++++++--
 16 files changed, 59 insertions(+), 177 deletions(-)
 delete mode 100644 app/views/admin/pages/_edit_code.html.erb
 delete mode 100644 app/views/admin/pages/_form_code.html.erb
 delete mode 100644 app/views/admin/pages/edit.html.erb
 delete mode 100644 app/views/admin/pages/edit.js.erb
 delete mode 100644 app/views/admin/pages/update.js.erb
 create mode 100644 lib/fraisier/themes/red.css

diff --git a/Gemfile b/Gemfile
index a9813caa..1e6ce8fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '>=3.1.0.rc4'
 gem 'yajl-ruby', :require => 'yajl'
 
 gem 'bson_ext'
-gem 'carrierwave', '0.5.6'
+gem 'carrierwave', '0.5.4'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7177ff7e..74e4c8c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    carrierwave (0.5.6)
+    carrierwave (0.5.4)
       activesupport (~> 3.0)
     chronic (0.6.2)
     ckeditor (3.6.1)
@@ -171,7 +171,7 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
-  carrierwave (= 0.5.6)
+  carrierwave (= 0.5.4)
   ckeditor
   coffee-rails (~> 3.1.0.rc)
   delorean
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index d6992c71..a0f4231e 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -21,14 +21,11 @@ class Admin::PagesController < ApplicationController
     @item = Page.new
     @item.is_published = true
     @item.parent_id = @parent_item.id rescue nil
+    @designs = Design.all.entries
+    @default_design = @designs.detect {|d| d.title.to_s == 'Bob' }
   end
 
   def edit
-    @item = Page.find(params[:id])
-    # @item.content = parse_content(@item.content, {:locale => 'show'})
-    @item.content = parse_page_code(@item)
-    @i18n_variable = @item.i18n_variable
-    @code = params[:code]
   end
 
   def create
@@ -51,19 +48,6 @@ class Admin::PagesController < ApplicationController
   end
 
   def update
-    @item = Page.find(params[:id])
-    parse_content_update_code(@item, params[:page][:content])
-    if @item.update_attributes(params[:item])
-      flash[:notice] = t('admin.update_success_page')
-      respond_to do |format|
-        format.html { 
-          redirect_to admin_page_url(@item) 
-        }
-        format.js {}
-      end
-    else
-      render :action => "edit"
-    end
   end
 
   def destroy
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index 7994cb25..e91265fc 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -12,7 +12,6 @@ module Admin::ItemHelper
       ret << "<ul>"
       ret << "<li>"
       ret << (link_to node.name, dest)
-      ret << ' | ' << (link_to t('admin.code'), eval("edit_admin_#{node._type.downcase}_path(node, :code => true)")) if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
       ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
diff --git a/app/models/design/theme.rb b/app/models/design/theme.rb
index 54088e19..81318d0b 100644
--- a/app/models/design/theme.rb
+++ b/app/models/design/theme.rb
@@ -1,3 +1,15 @@
 class Theme < Stylesheet
   embedded_in :design
+  field :name
+  
+  has_many :pages
+  
+  before_save :set_name
+  
+  protected
+  
+  def set_name
+    self.name = self.file_filename.split('.')[0]
+  end
+  
 end
diff --git a/app/models/page.rb b/app/models/page.rb
index d29685ae..c470417f 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,11 +1,11 @@
 class Page < Item
   
   field :content
-  field :design_name
   
-  validates_presence_of :design_name, :design_id
+  validates_presence_of :design_id
   
   belongs_to :design
+  belongs_to :theme
   has_many :page_parts
   
   def create_parts
@@ -27,15 +27,4 @@ class Page < Item
     Design.find(design_id)
   end
   
-  protected
-  
-  def setup_default_value
-    super
-    
-    if self.design_id
-      self.design_name = get_design.title
-    end
-    
-  end
-  
 end
diff --git a/app/views/admin/pages/_edit_code.html.erb b/app/views/admin/pages/_edit_code.html.erb
deleted file mode 100644
index 24069927..00000000
--- a/app/views/admin/pages/_edit_code.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= flash_messages %>
-
-<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form' } do |f| %>
-	 <%= render :partial => "admin/pages/form_code", :locals => { :f => f, :locale => locale } %>
-  <p>
-    <%= f.submit t(:update) %> <%= link_back %>
-  </p>
-<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 54ee892f..4afc26e7 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -15,8 +15,14 @@
 <% end %>
 
 <p>
-<%= f.label :design_id, t('admin.design_name') %>
-<%= f.select :design_id, Design.all.map{ |l| [l.title, l.id] } %>
+	<%= t('admin.design_name') %>
+	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
+</p>
+<p>
+	<%= @item.design.inspect %>
+	<%= t('admin.theme') %>
+	<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
+	<%#= f.collection_select :design, @designs, :id, :title %>
 </p>
 
 <p>
diff --git a/app/views/admin/pages/_form_code.html.erb b/app/views/admin/pages/_form_code.html.erb
deleted file mode 100644
index ad0e55ed..00000000
--- a/app/views/admin/pages/_form_code.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= f.error_messages %>
-
-<%= f.text_area :content %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
deleted file mode 100644
index b4bfc607..00000000
--- a/app/views/admin/pages/edit.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
-<% end -%>
-
-<h1><%= t('admin.editing_page') %></h1>
-
-<%= form_for @item, :url => admin_page_path(@item) do |f| %>
-  <%= f.error_messages %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  
-  <p>
-    <%= f.submit t('update') %> <%= link_back %>
-
-  </p>
-<% end %>
diff --git a/app/views/admin/pages/edit.js.erb b/app/views/admin/pages/edit.js.erb
deleted file mode 100644
index 9c61245e..00000000
--- a/app/views/admin/pages/edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
\ No newline at end of file
diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb
index 6dd0f923..d6b6a8a2 100644
--- a/app/views/admin/pages/show.html.erb
+++ b/app/views/admin/pages/show.html.erb
@@ -2,4 +2,4 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render @code ? 'show_code' : 'show' %>
\ No newline at end of file
+<%= render 'show' %>
\ No newline at end of file
diff --git a/app/views/admin/pages/update.js.erb b/app/views/admin/pages/update.js.erb
deleted file mode 100644
index 20cb22c1..00000000
--- a/app/views/admin/pages/update.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
-history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
diff --git a/lib/fraisier/themes/red.css b/lib/fraisier/themes/red.css
new file mode 100644
index 00000000..97097ed2
--- /dev/null
+++ b/lib/fraisier/themes/red.css
@@ -0,0 +1 @@
+/* Some css */
\ No newline at end of file
diff --git a/lib/parser.rb b/lib/parser.rb
index 83e5bcf8..a5299af3 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -105,12 +105,6 @@ module Parser
     end
   end
   
-  def parse_content(page_content, attributes = {})
-    context = parser_context(page_content, attributes)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(page_content)
-  end
-  
   def parse_page(page)
     if page._type == 'Page'
       layout_content = page.design.layout.content
@@ -214,33 +208,6 @@ module Parser
     end
   end
   
-  def parse_page_code(page)
-    layout_content = page.design.layout.content 
-    context = parser_context_code(page)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(layout_content)
-  end
-  
-  def parser_context_code(page) #context should be interpretd as the orginally one
-    Radius::Context.new do |c|
-      c.define_tag 'stylesheets' do |tag|
-        res << "<r:layout_part>"
-        res << tag.expand.to_s
-        res << "</r:layout_part>"
-      end
-      c.define_tag 'layout_part' do |tag|
-        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-        res = ''
-        res << "<r:layout_part"
-        tag.attr.each do |l|
-          res << " #{l[0]}='#{l[1]}'"
-        end
-        res << ">"
-        res << part.content if part
-        res << "</r:layout_part>"
-      end
-    end
-  end
   #=============
   def parse_layout_layout_part(layout)
     content = layout.content
@@ -265,76 +232,7 @@ module Parser
       end
     end
   end
-  #============
-  def parse_content_update_code(page, page_content)
-    context = parser_context_update_code(page, page_content)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(page_content)
-  end
-  
-  def parser_context_update_code(page, page_content)
-    Radius::Context.new do |c|
-      c.define_tag 'layout_part' do |tag|
-        @part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-        tag.locals.name = tag.attr['name'].to_s
-        if @part
-          part_update = tag.expand
-          if part_update
-            if !part_update.eql?(@part.content)
-              @part.content = tag.expand
-              @part.save
-              tag.locals.action = 'update'
-            end
-          else
-            tag.locals.action = 'destroy'
-          end
-        else
-          tag.locals.action = 'new'
-        end
-        res = ''
-        res << "<r:layout_part"
-        tag.attr.each do |l|
-          res << " #{l[0]}='#{l[1]}'"
-        end
-        res << ">"
-        res << tag.expand
-        res << "</r:layout_part>"
-      end
-      c.define_tag 'multi_lang' do |tag|
-        case tag.locals.action
-          when 'new', 'update'
-            @h = {}
-            tag.expand
-            @part.i18n_variable = @h
-          when 'destroy'
-          else
-            res = ''
-            res << "<r:multi_lang"
-            tag.attr.each do |l|
-              res << " #{l[0]}='#{l[1]}'"
-            end
-            res << ">"
-            res << tag.expand
-            res << "</r:multi_lang>"
-        end
-      end
-      c.define_tag 'multi_lang:lang' do |tag|
-        if tag.locals.action
-          @h.merge!(tag.attr['name'] => "#{tag.expand}")
-        else
-          res = ''
-          res << "<r:lang"
-          tag.attr.each do |l|
-            res << " #{l[0]}='#{l[1]}'"
-          end
-          res << ">"
-          res << tag.expand
-          res << "</r:lang>"
-        end
-      end
-    end
-  end
-  
+
   def self.included(base)
     base.send :helper_method, :parse_page if base.respond_to? :helper_method
     base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index a6747f4f..2f2118e6 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -75,25 +75,47 @@ namespace :dev do
     # 
     # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
     # 
-    # theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js.css"))
+    theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+    theme_1 = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
     
     design.build_layout
     design.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
     
     design.layout.save
-    # theme.save
+    theme.save
+    theme_1.save
     # image.save
     # js.save
     
     design.save
     
-    design.layout.layout_parts.create!( :name => 'header_1')
-    design.layout.layout_parts.create!( :name => 'header_2')
-    design.layout.layout_parts.create!( :name => 'block_1')
-    design.layout.layout_parts.create!( :name => 'footer_1')
+    
+    
+    design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
+    
+    design_1.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
+    
+    # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
+    # 
+    # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
+    # 
+    theme = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+    theme_1 = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
+    
+    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
+    # image.save
+    # js.save
+    
+    design_1.save
+    
     
     home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design.id, :name => 'home', :is_published => true )
-    home.page_parts.create!( :name => 'header_1', :kind => 'text')
+    home.page_parts.create!( :name => 'header_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
             
   end
   

From 00813c906053bd375af06b825e80d47aafeeb55b Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Wed, 24 Aug 2011 02:04:54 +0800
Subject: [PATCH 2/4] Revert "Clean code and add 'name' in theme.rb"

This reverts commit 608180646b76871282d58d9c06459f523b5ad8a6.
---
 Gemfile                                   |   2 +-
 Gemfile.lock                              |   4 +-
 app/controllers/admin/pages_controller.rb |  20 ++++-
 app/helpers/admin/item_helper.rb          |   1 +
 app/models/design/theme.rb                |  12 ---
 app/models/page.rb                        |  15 +++-
 app/views/admin/pages/_edit_code.html.erb |   8 ++
 app/views/admin/pages/_form.html.erb      |  10 +--
 app/views/admin/pages/_form_code.html.erb |   3 +
 app/views/admin/pages/edit.html.erb       |  15 ++++
 app/views/admin/pages/edit.js.erb         |   1 +
 app/views/admin/pages/show.html.erb       |   2 +-
 app/views/admin/pages/update.js.erb       |   2 +
 lib/fraisier/themes/red.css               |   1 -
 lib/parser.rb                             | 104 +++++++++++++++++++++-
 lib/tasks/dev.rake                        |  36 ++------
 16 files changed, 177 insertions(+), 59 deletions(-)
 create mode 100644 app/views/admin/pages/_edit_code.html.erb
 create mode 100644 app/views/admin/pages/_form_code.html.erb
 create mode 100644 app/views/admin/pages/edit.html.erb
 create mode 100644 app/views/admin/pages/edit.js.erb
 create mode 100644 app/views/admin/pages/update.js.erb
 delete mode 100644 lib/fraisier/themes/red.css

diff --git a/Gemfile b/Gemfile
index 1e6ce8fc..a9813caa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '>=3.1.0.rc4'
 gem 'yajl-ruby', :require => 'yajl'
 
 gem 'bson_ext'
-gem 'carrierwave', '0.5.4'
+gem 'carrierwave', '0.5.6'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 74e4c8c1..7177ff7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    carrierwave (0.5.4)
+    carrierwave (0.5.6)
       activesupport (~> 3.0)
     chronic (0.6.2)
     ckeditor (3.6.1)
@@ -171,7 +171,7 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
-  carrierwave (= 0.5.4)
+  carrierwave (= 0.5.6)
   ckeditor
   coffee-rails (~> 3.1.0.rc)
   delorean
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index a0f4231e..d6992c71 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -21,11 +21,14 @@ class Admin::PagesController < ApplicationController
     @item = Page.new
     @item.is_published = true
     @item.parent_id = @parent_item.id rescue nil
-    @designs = Design.all.entries
-    @default_design = @designs.detect {|d| d.title.to_s == 'Bob' }
   end
 
   def edit
+    @item = Page.find(params[:id])
+    # @item.content = parse_content(@item.content, {:locale => 'show'})
+    @item.content = parse_page_code(@item)
+    @i18n_variable = @item.i18n_variable
+    @code = params[:code]
   end
 
   def create
@@ -48,6 +51,19 @@ class Admin::PagesController < ApplicationController
   end
 
   def update
+    @item = Page.find(params[:id])
+    parse_content_update_code(@item, params[:page][:content])
+    if @item.update_attributes(params[:item])
+      flash[:notice] = t('admin.update_success_page')
+      respond_to do |format|
+        format.html { 
+          redirect_to admin_page_url(@item) 
+        }
+        format.js {}
+      end
+    else
+      render :action => "edit"
+    end
   end
 
   def destroy
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index e91265fc..7994cb25 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -12,6 +12,7 @@ module Admin::ItemHelper
       ret << "<ul>"
       ret << "<li>"
       ret << (link_to node.name, dest)
+      ret << ' | ' << (link_to t('admin.code'), eval("edit_admin_#{node._type.downcase}_path(node, :code => true)")) if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
       ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
diff --git a/app/models/design/theme.rb b/app/models/design/theme.rb
index 81318d0b..54088e19 100644
--- a/app/models/design/theme.rb
+++ b/app/models/design/theme.rb
@@ -1,15 +1,3 @@
 class Theme < Stylesheet
   embedded_in :design
-  field :name
-  
-  has_many :pages
-  
-  before_save :set_name
-  
-  protected
-  
-  def set_name
-    self.name = self.file_filename.split('.')[0]
-  end
-  
 end
diff --git a/app/models/page.rb b/app/models/page.rb
index c470417f..d29685ae 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,11 +1,11 @@
 class Page < Item
   
   field :content
+  field :design_name
   
-  validates_presence_of :design_id
+  validates_presence_of :design_name, :design_id
   
   belongs_to :design
-  belongs_to :theme
   has_many :page_parts
   
   def create_parts
@@ -27,4 +27,15 @@ class Page < Item
     Design.find(design_id)
   end
   
+  protected
+  
+  def setup_default_value
+    super
+    
+    if self.design_id
+      self.design_name = get_design.title
+    end
+    
+  end
+  
 end
diff --git a/app/views/admin/pages/_edit_code.html.erb b/app/views/admin/pages/_edit_code.html.erb
new file mode 100644
index 00000000..24069927
--- /dev/null
+++ b/app/views/admin/pages/_edit_code.html.erb
@@ -0,0 +1,8 @@
+<%= flash_messages %>
+
+<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form' } do |f| %>
+	 <%= render :partial => "admin/pages/form_code", :locals => { :f => f, :locale => locale } %>
+  <p>
+    <%= f.submit t(:update) %> <%= link_back %>
+  </p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 4afc26e7..54ee892f 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -15,14 +15,8 @@
 <% end %>
 
 <p>
-	<%= t('admin.design_name') %>
-	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
-</p>
-<p>
-	<%= @item.design.inspect %>
-	<%= t('admin.theme') %>
-	<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
-	<%#= f.collection_select :design, @designs, :id, :title %>
+<%= f.label :design_id, t('admin.design_name') %>
+<%= f.select :design_id, Design.all.map{ |l| [l.title, l.id] } %>
 </p>
 
 <p>
diff --git a/app/views/admin/pages/_form_code.html.erb b/app/views/admin/pages/_form_code.html.erb
new file mode 100644
index 00000000..ad0e55ed
--- /dev/null
+++ b/app/views/admin/pages/_form_code.html.erb
@@ -0,0 +1,3 @@
+<%= f.error_messages %>
+
+<%= f.text_area :content %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
new file mode 100644
index 00000000..b4bfc607
--- /dev/null
+++ b/app/views/admin/pages/edit.html.erb
@@ -0,0 +1,15 @@
+<% content_for :sidebar do %>
+	<%= render 'admin/items/site_map_left_bar' %>
+<% end -%>
+
+<h1><%= t('admin.editing_page') %></h1>
+
+<%= form_for @item, :url => admin_page_path(@item) do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  
+  <p>
+    <%= f.submit t('update') %> <%= link_back %>
+
+  </p>
+<% end %>
diff --git a/app/views/admin/pages/edit.js.erb b/app/views/admin/pages/edit.js.erb
new file mode 100644
index 00000000..9c61245e
--- /dev/null
+++ b/app/views/admin/pages/edit.js.erb
@@ -0,0 +1 @@
+$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
\ No newline at end of file
diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb
index d6b6a8a2..6dd0f923 100644
--- a/app/views/admin/pages/show.html.erb
+++ b/app/views/admin/pages/show.html.erb
@@ -2,4 +2,4 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render 'show' %>
\ No newline at end of file
+<%= render @code ? 'show_code' : 'show' %>
\ No newline at end of file
diff --git a/app/views/admin/pages/update.js.erb b/app/views/admin/pages/update.js.erb
new file mode 100644
index 00000000..20cb22c1
--- /dev/null
+++ b/app/views/admin/pages/update.js.erb
@@ -0,0 +1,2 @@
+$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
diff --git a/lib/fraisier/themes/red.css b/lib/fraisier/themes/red.css
deleted file mode 100644
index 97097ed2..00000000
--- a/lib/fraisier/themes/red.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Some css */
\ No newline at end of file
diff --git a/lib/parser.rb b/lib/parser.rb
index a5299af3..83e5bcf8 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -105,6 +105,12 @@ module Parser
     end
   end
   
+  def parse_content(page_content, attributes = {})
+    context = parser_context(page_content, attributes)
+    parser = Radius::Parser.new(context, :tag_prefix => 'r')
+    parser.parse(page_content)
+  end
+  
   def parse_page(page)
     if page._type == 'Page'
       layout_content = page.design.layout.content
@@ -208,6 +214,33 @@ module Parser
     end
   end
   
+  def parse_page_code(page)
+    layout_content = page.design.layout.content 
+    context = parser_context_code(page)
+    parser = Radius::Parser.new(context, :tag_prefix => 'r')
+    parser.parse(layout_content)
+  end
+  
+  def parser_context_code(page) #context should be interpretd as the orginally one
+    Radius::Context.new do |c|
+      c.define_tag 'stylesheets' do |tag|
+        res << "<r:layout_part>"
+        res << tag.expand.to_s
+        res << "</r:layout_part>"
+      end
+      c.define_tag 'layout_part' do |tag|
+        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
+        res = ''
+        res << "<r:layout_part"
+        tag.attr.each do |l|
+          res << " #{l[0]}='#{l[1]}'"
+        end
+        res << ">"
+        res << part.content if part
+        res << "</r:layout_part>"
+      end
+    end
+  end
   #=============
   def parse_layout_layout_part(layout)
     content = layout.content
@@ -232,7 +265,76 @@ module Parser
       end
     end
   end
-
+  #============
+  def parse_content_update_code(page, page_content)
+    context = parser_context_update_code(page, page_content)
+    parser = Radius::Parser.new(context, :tag_prefix => 'r')
+    parser.parse(page_content)
+  end
+  
+  def parser_context_update_code(page, page_content)
+    Radius::Context.new do |c|
+      c.define_tag 'layout_part' do |tag|
+        @part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
+        tag.locals.name = tag.attr['name'].to_s
+        if @part
+          part_update = tag.expand
+          if part_update
+            if !part_update.eql?(@part.content)
+              @part.content = tag.expand
+              @part.save
+              tag.locals.action = 'update'
+            end
+          else
+            tag.locals.action = 'destroy'
+          end
+        else
+          tag.locals.action = 'new'
+        end
+        res = ''
+        res << "<r:layout_part"
+        tag.attr.each do |l|
+          res << " #{l[0]}='#{l[1]}'"
+        end
+        res << ">"
+        res << tag.expand
+        res << "</r:layout_part>"
+      end
+      c.define_tag 'multi_lang' do |tag|
+        case tag.locals.action
+          when 'new', 'update'
+            @h = {}
+            tag.expand
+            @part.i18n_variable = @h
+          when 'destroy'
+          else
+            res = ''
+            res << "<r:multi_lang"
+            tag.attr.each do |l|
+              res << " #{l[0]}='#{l[1]}'"
+            end
+            res << ">"
+            res << tag.expand
+            res << "</r:multi_lang>"
+        end
+      end
+      c.define_tag 'multi_lang:lang' do |tag|
+        if tag.locals.action
+          @h.merge!(tag.attr['name'] => "#{tag.expand}")
+        else
+          res = ''
+          res << "<r:lang"
+          tag.attr.each do |l|
+            res << " #{l[0]}='#{l[1]}'"
+          end
+          res << ">"
+          res << tag.expand
+          res << "</r:lang>"
+        end
+      end
+    end
+  end
+  
   def self.included(base)
     base.send :helper_method, :parse_page if base.respond_to? :helper_method
     base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 2f2118e6..a6747f4f 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -75,47 +75,25 @@ namespace :dev do
     # 
     # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
     # 
-    theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
-    theme_1 = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
+    # theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js.css"))
     
     design.build_layout
     design.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
     
     design.layout.save
-    theme.save
-    theme_1.save
+    # theme.save
     # image.save
     # js.save
     
     design.save
     
-    
-    
-    design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
-    
-    design_1.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
-    
-    # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
-    # 
-    # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
-    # 
-    theme = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
-    theme_1 = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
-    
-    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
-    # image.save
-    # js.save
-    
-    design_1.save
-    
+    design.layout.layout_parts.create!( :name => 'header_1')
+    design.layout.layout_parts.create!( :name => 'header_2')
+    design.layout.layout_parts.create!( :name => 'block_1')
+    design.layout.layout_parts.create!( :name => 'footer_1')
     
     home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design.id, :name => 'home', :is_published => true )
-    home.page_parts.create!( :name => 'header_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
+    home.page_parts.create!( :name => 'header_1', :kind => 'text')
             
   end
   

From 1d214bedec1c1666e9f423f403ebdac3c94511fb Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Wed, 24 Aug 2011 02:06:27 +0800
Subject: [PATCH 3/4] Revert "Revert "Clean code and add 'name' in theme.rb""

This reverts commit 00813c906053bd375af06b825e80d47aafeeb55b.
---
 Gemfile                                   |   2 +-
 Gemfile.lock                              |   4 +-
 app/controllers/admin/pages_controller.rb |  20 +----
 app/helpers/admin/item_helper.rb          |   1 -
 app/models/design/theme.rb                |  12 +++
 app/models/page.rb                        |  15 +---
 app/views/admin/pages/_edit_code.html.erb |   8 --
 app/views/admin/pages/_form.html.erb      |  10 ++-
 app/views/admin/pages/_form_code.html.erb |   3 -
 app/views/admin/pages/edit.html.erb       |  15 ----
 app/views/admin/pages/edit.js.erb         |   1 -
 app/views/admin/pages/show.html.erb       |   2 +-
 app/views/admin/pages/update.js.erb       |   2 -
 lib/fraisier/themes/red.css               |   1 +
 lib/parser.rb                             | 104 +---------------------
 lib/tasks/dev.rake                        |  36 ++++++--
 16 files changed, 59 insertions(+), 177 deletions(-)
 delete mode 100644 app/views/admin/pages/_edit_code.html.erb
 delete mode 100644 app/views/admin/pages/_form_code.html.erb
 delete mode 100644 app/views/admin/pages/edit.html.erb
 delete mode 100644 app/views/admin/pages/edit.js.erb
 delete mode 100644 app/views/admin/pages/update.js.erb
 create mode 100644 lib/fraisier/themes/red.css

diff --git a/Gemfile b/Gemfile
index a9813caa..1e6ce8fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '>=3.1.0.rc4'
 gem 'yajl-ruby', :require => 'yajl'
 
 gem 'bson_ext'
-gem 'carrierwave', '0.5.6'
+gem 'carrierwave', '0.5.4'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7177ff7e..74e4c8c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    carrierwave (0.5.6)
+    carrierwave (0.5.4)
       activesupport (~> 3.0)
     chronic (0.6.2)
     ckeditor (3.6.1)
@@ -171,7 +171,7 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
-  carrierwave (= 0.5.6)
+  carrierwave (= 0.5.4)
   ckeditor
   coffee-rails (~> 3.1.0.rc)
   delorean
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index d6992c71..a0f4231e 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -21,14 +21,11 @@ class Admin::PagesController < ApplicationController
     @item = Page.new
     @item.is_published = true
     @item.parent_id = @parent_item.id rescue nil
+    @designs = Design.all.entries
+    @default_design = @designs.detect {|d| d.title.to_s == 'Bob' }
   end
 
   def edit
-    @item = Page.find(params[:id])
-    # @item.content = parse_content(@item.content, {:locale => 'show'})
-    @item.content = parse_page_code(@item)
-    @i18n_variable = @item.i18n_variable
-    @code = params[:code]
   end
 
   def create
@@ -51,19 +48,6 @@ class Admin::PagesController < ApplicationController
   end
 
   def update
-    @item = Page.find(params[:id])
-    parse_content_update_code(@item, params[:page][:content])
-    if @item.update_attributes(params[:item])
-      flash[:notice] = t('admin.update_success_page')
-      respond_to do |format|
-        format.html { 
-          redirect_to admin_page_url(@item) 
-        }
-        format.js {}
-      end
-    else
-      render :action => "edit"
-    end
   end
 
   def destroy
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index 7994cb25..e91265fc 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -12,7 +12,6 @@ module Admin::ItemHelper
       ret << "<ul>"
       ret << "<li>"
       ret << (link_to node.name, dest)
-      ret << ' | ' << (link_to t('admin.code'), eval("edit_admin_#{node._type.downcase}_path(node, :code => true)")) if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
       ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
diff --git a/app/models/design/theme.rb b/app/models/design/theme.rb
index 54088e19..81318d0b 100644
--- a/app/models/design/theme.rb
+++ b/app/models/design/theme.rb
@@ -1,3 +1,15 @@
 class Theme < Stylesheet
   embedded_in :design
+  field :name
+  
+  has_many :pages
+  
+  before_save :set_name
+  
+  protected
+  
+  def set_name
+    self.name = self.file_filename.split('.')[0]
+  end
+  
 end
diff --git a/app/models/page.rb b/app/models/page.rb
index d29685ae..c470417f 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,11 +1,11 @@
 class Page < Item
   
   field :content
-  field :design_name
   
-  validates_presence_of :design_name, :design_id
+  validates_presence_of :design_id
   
   belongs_to :design
+  belongs_to :theme
   has_many :page_parts
   
   def create_parts
@@ -27,15 +27,4 @@ class Page < Item
     Design.find(design_id)
   end
   
-  protected
-  
-  def setup_default_value
-    super
-    
-    if self.design_id
-      self.design_name = get_design.title
-    end
-    
-  end
-  
 end
diff --git a/app/views/admin/pages/_edit_code.html.erb b/app/views/admin/pages/_edit_code.html.erb
deleted file mode 100644
index 24069927..00000000
--- a/app/views/admin/pages/_edit_code.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= flash_messages %>
-
-<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form' } do |f| %>
-	 <%= render :partial => "admin/pages/form_code", :locals => { :f => f, :locale => locale } %>
-  <p>
-    <%= f.submit t(:update) %> <%= link_back %>
-  </p>
-<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 54ee892f..4afc26e7 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -15,8 +15,14 @@
 <% end %>
 
 <p>
-<%= f.label :design_id, t('admin.design_name') %>
-<%= f.select :design_id, Design.all.map{ |l| [l.title, l.id] } %>
+	<%= t('admin.design_name') %>
+	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
+</p>
+<p>
+	<%= @item.design.inspect %>
+	<%= t('admin.theme') %>
+	<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
+	<%#= f.collection_select :design, @designs, :id, :title %>
 </p>
 
 <p>
diff --git a/app/views/admin/pages/_form_code.html.erb b/app/views/admin/pages/_form_code.html.erb
deleted file mode 100644
index ad0e55ed..00000000
--- a/app/views/admin/pages/_form_code.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= f.error_messages %>
-
-<%= f.text_area :content %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
deleted file mode 100644
index b4bfc607..00000000
--- a/app/views/admin/pages/edit.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
-<% end -%>
-
-<h1><%= t('admin.editing_page') %></h1>
-
-<%= form_for @item, :url => admin_page_path(@item) do |f| %>
-  <%= f.error_messages %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  
-  <p>
-    <%= f.submit t('update') %> <%= link_back %>
-
-  </p>
-<% end %>
diff --git a/app/views/admin/pages/edit.js.erb b/app/views/admin/pages/edit.js.erb
deleted file mode 100644
index 9c61245e..00000000
--- a/app/views/admin/pages/edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
\ No newline at end of file
diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb
index 6dd0f923..d6b6a8a2 100644
--- a/app/views/admin/pages/show.html.erb
+++ b/app/views/admin/pages/show.html.erb
@@ -2,4 +2,4 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render @code ? 'show_code' : 'show' %>
\ No newline at end of file
+<%= render 'show' %>
\ No newline at end of file
diff --git a/app/views/admin/pages/update.js.erb b/app/views/admin/pages/update.js.erb
deleted file mode 100644
index 20cb22c1..00000000
--- a/app/views/admin/pages/update.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
-history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
diff --git a/lib/fraisier/themes/red.css b/lib/fraisier/themes/red.css
new file mode 100644
index 00000000..97097ed2
--- /dev/null
+++ b/lib/fraisier/themes/red.css
@@ -0,0 +1 @@
+/* Some css */
\ No newline at end of file
diff --git a/lib/parser.rb b/lib/parser.rb
index 83e5bcf8..a5299af3 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -105,12 +105,6 @@ module Parser
     end
   end
   
-  def parse_content(page_content, attributes = {})
-    context = parser_context(page_content, attributes)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(page_content)
-  end
-  
   def parse_page(page)
     if page._type == 'Page'
       layout_content = page.design.layout.content
@@ -214,33 +208,6 @@ module Parser
     end
   end
   
-  def parse_page_code(page)
-    layout_content = page.design.layout.content 
-    context = parser_context_code(page)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(layout_content)
-  end
-  
-  def parser_context_code(page) #context should be interpretd as the orginally one
-    Radius::Context.new do |c|
-      c.define_tag 'stylesheets' do |tag|
-        res << "<r:layout_part>"
-        res << tag.expand.to_s
-        res << "</r:layout_part>"
-      end
-      c.define_tag 'layout_part' do |tag|
-        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-        res = ''
-        res << "<r:layout_part"
-        tag.attr.each do |l|
-          res << " #{l[0]}='#{l[1]}'"
-        end
-        res << ">"
-        res << part.content if part
-        res << "</r:layout_part>"
-      end
-    end
-  end
   #=============
   def parse_layout_layout_part(layout)
     content = layout.content
@@ -265,76 +232,7 @@ module Parser
       end
     end
   end
-  #============
-  def parse_content_update_code(page, page_content)
-    context = parser_context_update_code(page, page_content)
-    parser = Radius::Parser.new(context, :tag_prefix => 'r')
-    parser.parse(page_content)
-  end
-  
-  def parser_context_update_code(page, page_content)
-    Radius::Context.new do |c|
-      c.define_tag 'layout_part' do |tag|
-        @part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-        tag.locals.name = tag.attr['name'].to_s
-        if @part
-          part_update = tag.expand
-          if part_update
-            if !part_update.eql?(@part.content)
-              @part.content = tag.expand
-              @part.save
-              tag.locals.action = 'update'
-            end
-          else
-            tag.locals.action = 'destroy'
-          end
-        else
-          tag.locals.action = 'new'
-        end
-        res = ''
-        res << "<r:layout_part"
-        tag.attr.each do |l|
-          res << " #{l[0]}='#{l[1]}'"
-        end
-        res << ">"
-        res << tag.expand
-        res << "</r:layout_part>"
-      end
-      c.define_tag 'multi_lang' do |tag|
-        case tag.locals.action
-          when 'new', 'update'
-            @h = {}
-            tag.expand
-            @part.i18n_variable = @h
-          when 'destroy'
-          else
-            res = ''
-            res << "<r:multi_lang"
-            tag.attr.each do |l|
-              res << " #{l[0]}='#{l[1]}'"
-            end
-            res << ">"
-            res << tag.expand
-            res << "</r:multi_lang>"
-        end
-      end
-      c.define_tag 'multi_lang:lang' do |tag|
-        if tag.locals.action
-          @h.merge!(tag.attr['name'] => "#{tag.expand}")
-        else
-          res = ''
-          res << "<r:lang"
-          tag.attr.each do |l|
-            res << " #{l[0]}='#{l[1]}'"
-          end
-          res << ">"
-          res << tag.expand
-          res << "</r:lang>"
-        end
-      end
-    end
-  end
-  
+
   def self.included(base)
     base.send :helper_method, :parse_page if base.respond_to? :helper_method
     base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index a6747f4f..2f2118e6 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -75,25 +75,47 @@ namespace :dev do
     # 
     # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
     # 
-    # theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js.css"))
+    theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+    theme_1 = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
     
     design.build_layout
     design.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
     
     design.layout.save
-    # theme.save
+    theme.save
+    theme_1.save
     # image.save
     # js.save
     
     design.save
     
-    design.layout.layout_parts.create!( :name => 'header_1')
-    design.layout.layout_parts.create!( :name => 'header_2')
-    design.layout.layout_parts.create!( :name => 'block_1')
-    design.layout.layout_parts.create!( :name => 'footer_1')
+    
+    
+    design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
+    
+    design_1.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
+    
+    # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
+    # 
+    # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
+    # 
+    theme = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+    theme_1 = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
+    
+    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
+    # image.save
+    # js.save
+    
+    design_1.save
+    
     
     home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design.id, :name => 'home', :is_published => true )
-    home.page_parts.create!( :name => 'header_1', :kind => 'text')
+    home.page_parts.create!( :name => 'header_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
             
   end
   

From 27d47215e9e57f2cb44a1e80663547a17a336400 Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Wed, 24 Aug 2011 02:34:24 +0800
Subject: [PATCH 4/4] Modify edit page. Still need to handle "form" with drop
 down lists

---
 app/controllers/admin/pages_controller.rb | 17 +++++++++++++++++
 app/helpers/admin/item_helper.rb          |  1 +
 app/models/design/theme.rb                |  2 --
 app/models/page.rb                        |  2 +-
 app/views/admin/pages/_edit.html.erb      | 10 ++++++++++
 app/views/admin/pages/_form.html.erb      |  8 ++++----
 app/views/admin/pages/edit.html.erb       |  5 +++++
 app/views/admin/pages/edit.js.erb         |  1 +
 app/views/admin/pages/update.js.erb       |  2 ++
 lib/tasks/dev.rake                        |  2 +-
 10 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 app/views/admin/pages/_edit.html.erb
 create mode 100644 app/views/admin/pages/edit.html.erb
 create mode 100644 app/views/admin/pages/edit.js.erb
 create mode 100644 app/views/admin/pages/update.js.erb

diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index a0f4231e..1fcc7bde 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -26,6 +26,11 @@ class Admin::PagesController < ApplicationController
   end
 
   def edit
+    @item = Page.find(params[:id])
+    @i18n_variable = @item.i18n_variable
+    @designs = Design.all.entries
+    @design = @item.design
+    @default_design = @design.themes.detect {|t| t.id == @item.theme_id }
   end
 
   def create
@@ -48,6 +53,18 @@ class Admin::PagesController < ApplicationController
   end
 
   def update
+    @item = Page.find(params[:id])
+    if @item.update_attributes(params[:item])
+      flash[:notice] = t('admin.update_success_page')
+      respond_to do |format|
+        format.html {
+          redirect_to admin_page_url(@item) 
+        }
+        format.js {}
+      end
+    else
+      render :action => "edit"
+    end
   end
 
   def destroy
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index e91265fc..c28c9b8f 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -12,6 +12,7 @@ module Admin::ItemHelper
       ret << "<ul>"
       ret << "<li>"
       ret << (link_to node.name, dest)
+      ret << ' | ' << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
       ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
       ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
diff --git a/app/models/design/theme.rb b/app/models/design/theme.rb
index 81318d0b..d9888c37 100644
--- a/app/models/design/theme.rb
+++ b/app/models/design/theme.rb
@@ -2,8 +2,6 @@ class Theme < Stylesheet
   embedded_in :design
   field :name
   
-  has_many :pages
-  
   before_save :set_name
   
   protected
diff --git a/app/models/page.rb b/app/models/page.rb
index c470417f..6cbc0067 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,11 +1,11 @@
 class Page < Item
   
   field :content
+  field :theme_id
   
   validates_presence_of :design_id
   
   belongs_to :design
-  belongs_to :theme
   has_many :page_parts
   
   def create_parts
diff --git a/app/views/admin/pages/_edit.html.erb b/app/views/admin/pages/_edit.html.erb
new file mode 100644
index 00000000..61ff8046
--- /dev/null
+++ b/app/views/admin/pages/_edit.html.erb
@@ -0,0 +1,10 @@
+<%= flash_messages %>
+
+<h1><%= t('admin.editing_page') %></h1>
+
+<%= form_for @item, :url => admin_page_path(@item) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%= f.submit t('update') %> <%= link_back %>
+  </p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 4afc26e7..208a92f3 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -16,13 +16,13 @@
 
 <p>
 	<%= t('admin.design_name') %>
-	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
+	<%#= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
+	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] } %>
 </p>
 <p>
-	<%= @item.design.inspect %>
 	<%= t('admin.theme') %>
-	<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
-	<%#= f.collection_select :design, @designs, :id, :title %>
+	<%#= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
+	<%= f.select :theme_id, @design.themes.collect { |t| [t.name, t.id] }%>
 </p>
 
 <p>
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
new file mode 100644
index 00000000..23676c93
--- /dev/null
+++ b/app/views/admin/pages/edit.html.erb
@@ -0,0 +1,5 @@
+<% content_for :sidebar do %>
+    <%= render 'admin/items/site_map_left_bar' %>
+<% end -%>
+
+<%= render 'edit' %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.js.erb b/app/views/admin/pages/edit.js.erb
new file mode 100644
index 00000000..67d528b5
--- /dev/null
+++ b/app/views/admin/pages/edit.js.erb
@@ -0,0 +1 @@
+$('#panel_main').html("<%= escape_javascript(render 'edit') %>");
\ No newline at end of file
diff --git a/app/views/admin/pages/update.js.erb b/app/views/admin/pages/update.js.erb
new file mode 100644
index 00000000..4fdd4357
--- /dev/null
+++ b/app/views/admin/pages/update.js.erb
@@ -0,0 +1,2 @@
+$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
\ No newline at end of file
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 2f2118e6..caba0fa6 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -114,7 +114,7 @@ namespace :dev do
     design_1.save
     
     
-    home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design.id, :name => 'home', :is_published => true )
+    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 => 'header_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
             
   end