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

config/application.rb

@@ -30,6 +30,7 @@ module Orbit
     config.autoload_paths += %W(#{config.root}/lib)
     config.autoload_paths += %W(#{config.root}/lib/parsers)
     config.autoload_paths += %W(#{config.root}/app/models/design)
+    config.autoload_paths += %W(#{config.root}/app/models/meta)
     config.autoload_paths += %W(#{config.root}/app/models/purchase)
     config.autoload_paths += %W(#{config.root}/app/models/user)
 

config/locales/zh_tw.yml

@@ -42,6 +42,14 @@ zh_tw:
   admin:
     action: 操作
     ad_banner: 廣告輪播
+    ad:
+      ab_fx: 轉場特效
+      all_banners: 輪播清單
+      new_banner: 新增輪播
+      new_image: 新增橫幅
+      title: 標題
+      transition_sec: 轉場單位時間
+      trans_unit_sec: 秒
     add: 新增
     add_item: 新增項目
     add_language: 新增語言

config/routes.rb

@@ -24,7 +24,14 @@ Orbit::Application.routes.draw do
       end
     end
 
-    resources :ad_banners
+    
+    resources :ad_banners do 
+        collection do
+          match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
+          match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
+        end
+        resources :ad_images ,:except => [:show,:index]
+    end
     resources :dashboards
     resources :designs do
       collection do