From d247f05d2e238650872865ffc6165710236d52c9 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 24 Apr 2012 15:27:46 +0800
Subject: [PATCH] Add missing translations in announcement and change
 announcement behavior for passed and rejected

---
 .../back_end/bulletins_controller.rb          |  2 +-
 .../back_end/bulletins/_bulletin.html.erb     | 36 +++++++++----------
 .../back_end/bulletins/_form.html.erb         |  6 ++--
 .../bulletins/_form_bulletin_file.html.erb    |  1 +
 .../announcement/config/locales/en.yml        | 14 ++++++++
 .../announcement/config/locales/zh_tw.yml     | 12 +++----
 6 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 030c11bf2..f77e70b71 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -89,7 +89,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1/edit
   def edit
     @bulletin = Bulletin.find(params[:id])
-    if @bulletin.is_rejected?
+    if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
       redirect_to :action => :index
     else
       # @summary_variable = @bulletin.summary_variable
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index 7db705936..c4e134cc9 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -14,7 +14,7 @@
 			<span class="label"><%= t(:pending) %></span>
 		<% end %>
 		<% if bulletin.is_checked? %>
-			<span class="label"><%= t(:checked) %></span>
+			<span class="label"><%= t(:passed) %></span>
 		<% end %>
 		<% if bulletin.is_rejected? %>
 			<span class="label"><%= t(:rejected) %></span>
@@ -25,23 +25,23 @@
 		<%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
-				<% unless bulletin.is_rejected?%>
-				<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
-				<li class="dropdown">
-					<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
-					<ul class="dropdown-menu" id="menu1">
-						<li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li>
-						<li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li>
-						<li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li>
-						<li><%= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li>
-						<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
-					</ul>
-				</li>
-				<%#= debugger  %>
-				<%#= a=1 %>
-				<% if (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !bulletin.is_expired? %>
-				<li><%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
-				<% end %>				
+				<% if current_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
+					<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
+					<li class="dropdown">
+						<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
+						<ul class="dropdown-menu" id="menu1">
+							<li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li>
+							<li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li>
+							<li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li>
+							<li><%= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li>
+							<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
+						</ul>
+					</li>
+					<%#= debugger  %>
+					<%#= a=1 %>
+					<% if (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !bulletin.is_expired? %>
+					<li><%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+					<% end %>				
 				<% end %>
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
 			</ul>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index d9c62078d..a8fb3587a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -98,7 +98,7 @@
 						<% end %>
 					<% end %>
 				</div>
-		</div>  
+		</div> 
   	<% if params[:action] != 'new' %>
 		<div id="widget-audit" class="widget-box">
 			<div class="widget-action clear">
@@ -208,7 +208,7 @@
 								<td style="text-align:center" colspan="4">
 									<div id='add_bulletin_link' class="info_input bulletin_links_block">
 										<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
-										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
 									</div>
 								</td>
 							</tr>
@@ -253,7 +253,7 @@
 								<td style="text-align:center" colspan="4">
 									<div id='add_bulletin_file' class="info_input bulletin_files_block">
 										<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
-										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
 									</div>
 								</td>
 							</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
index ea9774673..d391c80c2 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
@@ -4,6 +4,7 @@
 				<div class="control-group">
 					<div class="controls">
 					<%= f.file_field :file %>
+					<%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:target => '_blank', :title => t(:view)} ) : '' %>
 					</div>
 				</div>
 			</td>	
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 2af39968b..0d861af28 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -5,6 +5,12 @@ en:
   
   _locale: English
   
+  basic: Basic
+  picture: Piture
+  tags: Tag
+  link: Link
+  file: File
+
   add: Add
   back: Back
   create: Create
@@ -22,6 +28,14 @@ en:
   sure?: Are you sure?
   update: Update
   yes_: "Yes"
+
+  hot: Hot
+  top: Top
+  hidden: Hidden
+  passed: Passed
+  pending: Pending
+  rejected: Rejected
+  clear: Clear
   
   announcement:
     sure?: Sure?
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index 23ae38b8f..1d354f822 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -24,12 +24,12 @@ zh_tw:
   update: 更新
   yes_: "Yes"
 
-  is_hot: 熱門
-  is_top: 置頂
-  is_hidden: 隱藏
-  is_checked: 通過
-  is_pending: 待審核
-  is_rejected: 不通過
+  hot: 熱門
+  top: 置頂
+  hidden: 隱藏
+  passed: 通過
+  pending: 待審核
+  rejected: 不通過
   clear: 清除
 
   quick_edit: 快速編輯