Merge branch 'master' into ldap

Conflicts:
	app/assets/stylesheets/new_admin.css.erb

config/locales/en.yml

@@ -41,10 +41,22 @@ en:
   sure?: Are you sure?
   update: Update
   yes_: "Yes"
-  
+
   admin:
     action: Action
     ad_banner: AD Banner
+    ad:
+      ab_fx: FX
+      all_banners: AdBanner list
+      banner_best_size: Banner Best Size
+      new_banner: New banner
+      new_image: New image
+      showing: Showing
+      not_showing: NotShowing
+      title: Title
+      transition_sec: Transition time
+      trans_unit_sec: sec
+      update_banner: Update Banner
     add: Add
     add_item: Add item
     add_language: Add language
@@ -171,3 +183,8 @@ en:
     role: User role
     
   panel:
+    
+  modal:
+    close: Close
+    preview: Preview
+    

config/locales/zh_tw.yml

@@ -45,11 +45,15 @@ zh_tw:
     ad:
       ab_fx: 轉場特效
       all_banners: 輪播清單
+      banner_best_size: Banner 尺寸
       new_banner: 新增輪播
       new_image: 新增橫幅
+      showing: 顯示中
+      not_showing: 沒有顯示
       title: 標題
       transition_sec: 轉場單位時間
       trans_unit_sec: 秒
+      update_banner: 更新輪播
     add: 新增
     add_item: 新增項目
     add_language: 新增語言
@@ -392,3 +396,6 @@ zh_tw:
       create: "新增%{model}"
       update: "更新%{model}"
       submit: "儲存%{model}"
+  modal:
+    close: "關閉"
+    preview: "預覽"

config/routes.rb

@@ -24,7 +24,8 @@ Orbit::Application.routes.draw do
       end
     end
 
-    
+
+    match 'ad_banner/:title/preivew' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
     resources :ad_banners do 
         collection do
           match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get