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/controllers/admin/ad_banners_controller.rb

@@ -1,7 +1,7 @@
 class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :for_app_manager,:except => [:index,:show] 
+  before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview] 
   before_filter :for_app_sub_manager
 
   def rename

app/controllers/admin/ad_images_controller.rb

@@ -1,8 +1,8 @@
-class Admin::AdImagesController < ApplicationController
+class Admin::AdImagesController < OrbitBackendController
   layout 'new_admin'
   before_filter :authenticate_user!
-  before_filter :is_admin?
-  
+  before_filter :for_app_sub_manager
+
   def edit
     @ad_banner = AdBanner.find params[:ad_banner_id]
     @ad_image = @ad_banner.ad_images.find params[:id]

app/controllers/admin/links_controller.rb

@@ -65,9 +65,11 @@ class Admin::LinksController < ApplicationController
   end
   
   def delete
+    @item = Link.find(params[:id])
+    @item.destroy
     respond_to do |format|
       format.html {}
-      format.js  { destroy }
+      format.js  { @item = @item.parent }
     end
   end
   

app/controllers/admin/pages_controller.rb

@@ -51,7 +51,7 @@ class Admin::PagesController < ApplicationController
   def create
     @item = Page.new(params[:page])
 	
-	if @item.module_app.key == 'page_content'
+	if @item.module_app && @item.module_app.key == 'page_content'
 	  @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
 	end
 	
@@ -99,14 +99,16 @@ class Admin::PagesController < ApplicationController
       format.html { 
         redirect_to admin_items_url( :parent_id => @item.parent_id )
       }
-      format.js  {}
+      format.js  { redirect_to admin_items_url }
     end
   end
   
   def delete
+    @item = Page.find(params[:id])
+    @item.destroy
     respond_to do |format|
       format.html {}
-      format.js  { destroy }
+      format.js  { @item = @item.parent }
     end
   end