Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

app/models/ad_banner.rb

@@ -4,7 +4,7 @@ class AdBanner
   include Mongoid::MultiParameterAttributes
   
   field :title
-  field :transition_sec,type: Integer
+  field :transition_msec,type: Integer
   field :ad_fx  #TODO Design should explain
 
   before_save :save_or_destroy
@@ -13,6 +13,14 @@ class AdBanner
   has_many :ad_images , dependent: :delete
   
   FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"]
+attr_writer :transition_sec
+  def transition_sec
+    self.transition_msec/1000 rescue nil
+  end
+  
+  def transition_sec=(sec)
+    self.transition_msec = sec.to_i*1000
+  end
   
   def preview_clone
     preview_banner = self.clone

app/models/ad_image.rb

@@ -24,16 +24,15 @@ class AdImage
 
   # validates_numericality_of :weight, greater_than_or_equal_to: 1,less_than_or_equal_to: 10
   # validates_format_of :out_link, with: /(http:\/\/.*|)/ ,:message => 'Need a valid URL'
-  # validates_presence_of :post_date,:message => 'Need a valid post date'
   attr_reader :parse_post_date,:parse_unpost_date
 
   def parse_post_date=(att)
-    self.post_date = (Date.parse att rescue nil)
+    self.post_date = (Date.parse att.gsub(/\s+/, "") rescue nil)
   end
   
   
   def parse_unpost_date=(att)
-    self.unpost_date = (Date.parse att rescue nil)
+    self.unpost_date = (Date.parse att.gsub(/\s+/, "") rescue nil)
   end
 
   def display?