Merge branch 'yml' of github.com:Rulingcom/NCCU into yml

Conflicts:
	app/helpers/admin/item_helper.rb
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
	app/views/admin/assets/edit.html.erb
	app/views/admin/assets/file_upload.html.erb
	app/views/admin/assets/new.html.erb
	app/views/admin/attributes/index.html.erb
	app/views/admin/object_auths_new_interface/setting.html.erb
	app/views/admin/page_parts/_edit.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/shared/_privilege_user.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
	vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
	vendor/built_in_modules/news/config/locales/en.yml
	vendor/built_in_modules/news/config/locales/zh_tw.yml
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb

config/locales/zh_tw.yml

@@ -318,24 +318,6 @@ zh_tw:
   visitors_today: 今日造訪人次
   yes_: "是"
 
-
-  mongoid:
-    models:
-      news_bulletin: 新聞
-      bulletin: 公告
-      ad_banner: 廣告輪播
-      web_link: 連結管理
-    attributes:
-      news_bulletin:
-        title: 新聞標題
-      bulletin:
-        title: 公告標題
-      ad_banner:
-        title: 標題
-      web_link:
-        title: 名稱
-        url: 路徑
-
   nccu:
     date: 起迄日期
     file: 附加檔案
@@ -566,22 +548,19 @@ zh_tw:
           other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "以下欄位發生問題："
 
-  helpers:
+  mongoid:
-    select:
+    models:
-      prompt: "請選擇"
+      news_bulletin: 新聞
-    submit:
+      bulletin: 公告
-      create: "新增%{model}"
+      ad_banner: 廣告輪播
-      update: "更新%{model}"
+      web_link: 連結管理
-      submit: "儲存%{model}"
+    attributes:
-  modal:
+      news_bulletin:
-    close: "關閉"
+        title: 新聞標題
-    preview: "預覽"
+      bulletin:
-  sys:
+        title: 公告標題
-    not_previewable: "不支援預覽"
+      ad_banner:
-    limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}"
+        title: 標題
-    preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp...等圖片格式"
+      web_link:
-    can_not_display_due_to_no_context: "因為沒有中文版本，所以無法顯示"
+        title: 名稱
-    module_page_lang_not_support: "很抱歉，本頁沒有開放中文版本"
+        url: 路徑
-  object_disable:
-    change_to_true: "設為停用"
-    change_to_false: "重新啓用"

vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb

@@ -166,7 +166,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 		respond_to do |format|
 		  if @news_bulletin.save
                   expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
-			format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news_bulletin.create_news_bulletin_success')) }
+			format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news.create_news_bulletin_success')) }
 			format.xml  { render :xml => @news_bulletin, :status => :created, :location => @news_bulletin }
                   format.js 
                    #format.json {render :json => {"success"=>"true","redirect_url"=>panel_news_back_end_news_bulletins_url,"notice" => t('news_bulletin.create_news_bulletin_success')}}