Changes on nccu

vendor/built_in_modules/announcement/app/models/bulletin_category.rb

@@ -11,6 +11,7 @@ class BulletinCategory
   
   PAYMENT_TYPES = [ "List", "Picture" ]
   APP_NAME = 'Announcement'
+
   field :key
   field :display
   
@@ -26,4 +27,4 @@ class BulletinCategory
     BulletinCategory.find(id) rescue nil
   end
   
-end
+end

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

@@ -4,7 +4,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   include AdminHelper
   
   def preview_and_approve
-    @bulletin = NewsBulletin.find params[:bulletin_id]
+    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
   end
   
   def approve

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

@@ -55,7 +55,7 @@
 					<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>	
 				<% end %>
 				<% if news_show_approval_link(news_bulletin) %>
-					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin) ,:class=>"preview_trigger"  %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>		
 				
 			</ul>

vendor/built_in_modules/news/config/locales/zh_tw.yml

@@ -51,7 +51,7 @@ zh_tw:
       list_lower: 列表
       title: 標題
       postdate: 張貼日期
-      approval: 公告審核
+      approval: 新聞審核
       approval_setting: 審核設定
       approval_stat: 審核狀況
       approval_pending: 待審核
@@ -68,7 +68,7 @@ zh_tw:
     category: 分類
     status: 狀態
     title: 標題
-    fact_check: 公告審核
+    fact_check: 新聞審核
     delete: 刪除
     edit: 編輯
 #    action: 行動

vendor/built_in_modules/news/config/routes.rb

@@ -6,8 +6,8 @@ Rails.application.routes.draw do
         match 'update_setting' => "news_approvals#update_setting" ,:as => :news_approval_update_setting
         
         resources :news_bulletins do
-          match "approve/:news_bulletin_id"  => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
-          match "approve/:news_bulletin_id"  => "approvals#approve",:as => :approve,:via => :post
+          match "approve/:news_bulletin_id"  => "news_approvals#preview_and_approve",:as => :approval_preview,:via => :put
+          match "approve/:news_bulletin_id"  => "news_approvals#approve",:as => :approve,:via => :post
           match "link_quick_add/:news_bulletin_id" => "news_bulletins#link_quick_add" ,:as => :link_quick_add
           match "link_quick_edit/:news_bulletin_id" => "news_bulletins#link_quick_edit" ,:as => :link_quick_edit
           member do