Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb

config/environments/development.rb

@@ -24,6 +24,9 @@ Orbit::Application.configure do
   config.action_dispatch.best_standards_support = :builtin  
 
 
+  config.assets.debug = true
+
+
   # config.middleware.use ExceptionNotifier,
   #   :email_prefix => "[R4_error]",
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},

config/initializers/impression.rb

@@ -0,0 +1,6 @@
+# Use this hook to configure impressionist parameters
+Impressionist.setup do |config|
+  # Define ORM. Could be :active_record (default) and :mongo_mapper
+  # config.orm = :active_record
+  config.orm = :mongoid
+end

config/locales/en.yml

@@ -42,6 +42,7 @@ en:
   sure?: Are you sure?
   update: Update
   view: View
+  view_count: View count
   yes_: "Yes"
 
   all_content: All Content
@@ -67,6 +68,11 @@ en:
   total_visitors: Total Visitors
   traffic: Traffic
 
+  visitors_today: Today's visitors
+  visitors_this_week: This week's visitors
+  visitors_this_month: This month's visitors
+  visitors_this_year: This year's visitors
+
   admin:
     access:
       denied:

config/locales/zh_tw.yml

@@ -36,11 +36,12 @@ zh_tw:
   sure?: 您肯定嗎?
   update: 更新
   view: 檢視
+  view_count: 查看次數
   yes_: "Yes"
 
-  all_content: 全部內容有：
-  all_file: 全部檔案有：
-  all_member: 成員總數：
+  all_content: 全部內容有
+  all_file: 全部檔案有
+  all_member: 成員總數
   content: 內容
   data: 數據
   file: 檔案
@@ -58,9 +59,14 @@ zh_tw:
   site_name: 網站名稱
   statistics: 統計
   title: 標題
-  total_visitors: 造訪次數：
+  total_visitors: 造訪次數
   traffic: 流量
 
+  visitors_today: 今日造訪
+  visitors_this_week: 本星期造訪
+  visitors_this_month: 本月造訪
+  visitors_this_year: 今年造訪
+
   admin:
     access:
       denied:

config/routes.rb

@@ -13,7 +13,12 @@ Orbit::Application.routes.draw do
   # routes for admin
   namespace :admin do
     mount Resque::Server.new, :at => "/resque"
-    resources :assets
+    resources :assets do   
+      collection do
+        post 'delete'
+      end
+    end
+    resources :asset_categories
     resources :app_auths 
     resources :object_auths  do
       match 'new_interface/:ob_type/:title/new' => "object_auths_new_interface#new" ,:as => :init_ob_auth,:via => :get