Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

app/models/asset.rb

@@ -34,10 +34,10 @@ class Asset
   protected
   
   def set_key
-    if title.new_record?
+    if title && title.new_record?
       title.key = 'title'
     end
-    if description.new_record?
+    if description && description.new_record?
       description.key = 'description'
     end
   end

app/models/item.rb

@@ -10,16 +10,18 @@ class Item
   field :is_published, :type => Boolean, :default => false
   field :enabled_for, :type => Array, :default => nil
   field :menu_enabled_for, :type => Array, :default => nil
+
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
  
   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
-
   validates_associated :parent, :children
+  
+  before_destroy :destroy_children
   after_rearrange :rebuild_path
   
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   
   def self.find_by_name(item_name)
     Item.first(:conditions => { :name => item_name, :is_published => true })

app/models/link.rb

@@ -13,7 +13,7 @@ class Link < Item
   protected
 
 	def add_http
-	  unless self.url[/^http?s:\/\//]
+	  unless self.url[/^http:\/\//] || self.url[/^https:\/\//]
 	    self.url = 'http://' + self.url
 	  end
 	end