Merge branch 'master' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

app/controllers/admin/ad_banners_controller.rb

@@ -1,5 +1,5 @@
 class Admin::AdBannersController < ApplicationController
-  layout "admin"
+  layout "new_admin"
   before_filter :authenticate_user!
   before_filter :is_admin?
 
@@ -10,11 +10,14 @@ class Admin::AdBannersController < ApplicationController
   end
   
   def show
-    @ad_banner = AdBanner.find(params[:id])
+    @ad_banners = AdBanner.all
+    @active = AdBanner.find(params[:id])
+    render :action => 'index'
   end
   
   def new
-    @ad_banner = AdBanner.new
+    @ad_banners = AdBanner.all
+    render :action => 'index',:params => 'new'
   end
   
   def create
@@ -36,8 +39,13 @@ class Admin::AdBannersController < ApplicationController
     redirect_to admin_ad_banners_url
   end
   
+  def destroy_ad_image
+    
+  end
+  
   def index
     @ad_banners = AdBanner.all
+      @active = @ad_banners.first
   end
   
 end

app/controllers/admin/ad_images_controller.rb

@@ -0,0 +1,47 @@
+class Admin::AdImagesController < ApplicationController
+  layout 'new_admin'
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  
+  def edit
+    @ad_banner = AdBanner.find params[:ad_banner_id]
+    @ad_image = @ad_banner.ad_images.find params[:id]
+  end
+  
+  def update
+    @ad_banner = AdBanner.find params[:ad_banner_id]
+    @ad_image = AdImage.find params[:id]
+    @ad_image.update_attributes(params[:ad_image])
+    @ad_image.to_save = true
+    @ad_image.save!
+    redirect_to  admin_ad_banner_path @ad_banner
+  end
+  
+  def new
+    @ad_image =AdImage.new 
+    #render :action => 'new',:url=> {:ad_banner_id => params.has_key?(:ad_banner_id)? params[:ad_banner_id],nil}
+  end
+  
+  def create
+    @ad_banner = AdBanner.find params[:ad_banner][:id]
+    ad_image = AdImage.new  params[:ad_image]
+    ad_image.to_save = true
+    @ad_banner.ad_images << ad_image
+
+    if @ad_banner.save!
+      redirect_to  admin_ad_banner_path @ad_banner
+    end
+
+  end
+  
+  def destroy
+    @ad_banner = AdBanner.find params[:ad_banner_id]
+    @ad_image = @ad_banner.ad_images.find params[:id]
+    if @ad_image.destroy
+      flash[:notice] = t('admin.success_destroy_ad_image')
+      redirect_to admin_ad_banner_path @ad_banner
+    end
+  end
+  
+  
+end