Merge branch 'design_team' into ldap

Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

app/controllers/admin/ad_banners_controller.rb

@@ -1,7 +1,7 @@
-class Admin::AdBannersController < ApplicationController
+class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :for_app_manager
 
   def destroy
     @ad_banner = AdBanner.find(params[:id])

app/controllers/admin/dashboards_controller.rb

@@ -2,7 +2,7 @@ class Admin::DashboardsController < ApplicationController
   
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+#  before_filter :is_admin?
   
   def index
   end

app/controllers/admin/designs_controller.rb

@@ -1,11 +1,12 @@
-class Admin::DesignsController < ApplicationController
+class Admin::DesignsController < OrbitBackendController
   require "net/http"
   require "uri"
   require 'zip/zip'
 
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :is_admin? 
+  before_filter :for_admin_only
 
   def upload_package
     if !params[:design].nil?
@@ -24,7 +25,7 @@ class Admin::DesignsController < ApplicationController
   end
 
   def index
-    @designs = Design.all.entries
+    @designs = params[:sort] ? get_sorted_and_filtered("designs") : Design.all
   end
 
   def new
@@ -83,6 +84,13 @@ class Admin::DesignsController < ApplicationController
         render :action => 'new'
       end
   end
+
+  def delete
+    if params[:to_delete]
+      designs = Design.any_in(:_id => params[:to_delete]).delete_all
+    end
+    redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
+  end
   
   protected
   

app/controllers/admin/sites_controller.rb

@@ -1,16 +1,48 @@
 class Admin::SitesController < ApplicationController
   
-  layout "admin"
+  layout "new_admin"
   before_filter :authenticate_user!
   before_filter :is_admin?
+  before_filter :get_site
   
-  def index
-    @site = Site.first
-    redirect_to :action => :new unless @site
+  # def index
+  #   @site = Site.first
+  #   # redirect_to :action => :new unless @site
+  # end
+  
+  # def new
+  #   @site = Site.new
+  # end
+
+  def update
+    @site.update_attributes(params[:site])
+    redirect_to :back
   end
-  
-  def new
-    @site = Site.new
+
+  def site_info
+    
+  end
+
+  def system_info
+    
+  end
+
+  def language
+    
+  end
+
+  def mail_setting
+    
+  end
+
+  def ui_theme
+    
+  end
+
+  private
+
+  def get_site
+    @site ||= Site.first
   end
   
 end