Merge branch 'design_team' into ldap

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

app/controllers/admin/ad_banners_controller.rb

@@ -46,7 +46,7 @@ class Admin::AdBannersController < ApplicationController
   
   def realtime_preview
     @ad_banner = AdBanner.first(conditions: { title: params[:title] }).preview_clone
-    @ad_banner.update_attributes(params[:ad_banner]).update_attributes(params[:ad_images])
+    #@ad_banner.update_attributes(params[:ad_banner]).update_attributes(params[:ad_images])
   end
   
   def index

app/controllers/admin/ad_images_controller.rb

@@ -19,6 +19,8 @@ class Admin::AdImagesController < ApplicationController
   
   def new
     @ad_image =AdImage.new 
+    @ad_image.post_date = Date.today
+    @ad_image.unpost_date = Date.today + 30
     #render :action => 'new',:url=> {:ad_banner_id => params.has_key?(:ad_banner_id)? params[:ad_banner_id],nil}
   end