Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

app/models/item.rb

@@ -31,6 +31,17 @@ class Item
     nodes << node = node.parent while !node.parent.blank? rescue nil
     nodes.reverse
   end
+
+  # Get an array of ancestor's id
+  def ancestor_ids
+    node, nodes = self, []
+    while !node.parent.blank? do
+      node = node.parent rescue nil
+      nodes << node.id if node
+    end
+    # nodes << node = node.parent while !node.parent.blank? rescue nil
+    nodes.reverse
+  end
   
   # Build the url from the array of ancestors
   def url

app/models/page.rb

@@ -28,8 +28,20 @@ class Page < Item
   
   def create_parts
     page_design = self.design
+    parent = self.parent
+    menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
     page_design.layout.layout_parts.each do |layout_part|
-      self.page_parts.new(:name => layout_part.name) unless self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+      current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+      current_part = self.page_parts.build(:name => layout_part.name) unless current_part
+      if menu_part && current_part.name.eql?(menu_part.name)
+        if current_part.new_record?
+          current_part.kind = menu_part.kind
+          current_part.public_r_tag = menu_part.public_r_tag
+          current_part.public_r_tag_object_id = menu_part.public_r_tag_object_id
+        else
+          current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
+        end
+      end
     end
   end
   

app/models/page_part.rb

@@ -8,6 +8,7 @@ class PagePart
   field :kind
   field :public_r_tag
   field :public_r_tag_object_id, :default => nil
+  field :public_r_tag_option, :default => nil
   field :widget_path
   
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy

app/models/site.rb

@@ -12,12 +12,15 @@ class Site
   field :private_key, :type => Binary
   field :public_key, :type => Binary
   field :title_always_on, :type => Boolean, :default => false
+
+  field :mail_settings, :type => Hash
   
   field :school
   field :department
 
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_one :footer, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  has_one :sub_menu, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :site_metas, :autosave => true, :dependent => :destroy
   
   before_save :set_key
@@ -33,7 +36,6 @@ class Site
   end
   
   def up_to_date?
-    p res = %x(git remote show origin)
     res = res.split('rails_3_1').pop.gsub('(', '').gsub(')','').strip rescue nil
     res.eql?('local out of date') ? false : true
   end
@@ -46,6 +48,10 @@ class Site
     @footer ||= I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
   end
 
+  def sub_menu
+    @sub_menu ||= I18nVariable.first(:conditions => {:key => 'sub_menu', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+
   METAS.each do |meta|
     define_method meta do
       fetch_meta = self.site_metas.where(key: meta).limit(1)
@@ -66,6 +72,7 @@ class Site
   def set_key
     title.key = 'title' if title && (title.key.blank? rescue true)
     footer.key = 'footer' if footer && (footer.key.blank? rescue true)
+    sub_menu.key = 'sub_menu' if sub_menu && (sub_menu.key.blank? rescue true)
   end
   
 end

app/models/tag.rb

@@ -3,6 +3,8 @@ class Tag
   include Mongoid::Document
   include Mongoid::Timestamps
   
+  field :key
+
   belongs_to :module_app
   
 end