Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb

app/models/design/design.rb

@@ -20,7 +20,7 @@ class Design
   validates_presence_of :title
   validates_presence_of :author
   
-  # after_save :parse_css_for_images
+  after_save :parse_css_for_images
  
   def new_files=(*attrs)
     attrs[0].map  do |key,items_ary|   #Loop by JSs,Themes,Imgs

app/models/item.rb

@@ -5,15 +5,13 @@ class Item
   
   field :name, :index => true
   field :full_name, :index => true
-  field :parent_id, :index => true
-  field :parent_name
   field :position, :type => Integer
-  field :is_published, :type => Boolean, :default => true, :index => true
+  field :is_published, :type => Boolean, :default => false, :index => true
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
   validates_uniqueness_of :name, :scope => :parent_id
-  validates_presence_of :name, :full_name, :position, :is_published
+  validates_presence_of :name, :full_name, :position
   
   belongs_to :parent, :class_name => "Item"
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
@@ -47,9 +45,6 @@ class Item
       self.position = (max_page)? max_page + 1 : 1
     end
     
-    # Set the parent value
-    self.parent_name = Item.first(:conditions => {:id => self.parent_id} ).name rescue nil
-    
     # Build the full_name from the ancestors array
     full_node = self.ancestors.map{ |a| a.name }.push( self.name )
     # Remove root node if not root

app/models/page.rb

@@ -7,6 +7,7 @@ class Page < Item
   belongs_to :design
   belongs_to :module_app
   has_many :page_parts, :autosave => true, :dependent => :destroy
+  has_many :page_contexts, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :page_parts, :allow_destroy => true
   
   before_save :create_parts

app/models/user/user.rb

@@ -52,5 +52,9 @@ class User
     value = values.detect {|value| value.attribute_field_id == field_id} rescue nil
     value ? value : self.attribute_values.build
   end
+
+  def self.from_id(id)
+    User.find(id) rescue nil
+  end
   
 end