From be8d8ff1e6f3ed05e18e9747de9040ada61ebcf5 Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Fri, 2 May 2014 13:52:02 +0800
Subject: [PATCH] add backend form append note and fix show image

---
 .../panel/announcement/back_end/bulletins_controller.rb  | 2 ++
 .../panel/announcement/back_end/bulletins/_form.html.erb | 9 +++++++--
 .../panel/announcement/front_end/bulletins/show.html.erb | 4 ----
 config/locales/en.yml                                    | 3 +++
 config/locales/zh_tw.yml                                 | 3 +++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 77b5de5..a661475 100644
--- a/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -141,6 +141,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
     params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
     params[:bulletin][:email_user_ids].delete('')
+
+    params[:bulletin][:update_user_id] = current_user.id
     
     delete_out_invalid_date_from_params
     respond_to do |format|
diff --git a/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index b869a95..9ef3a25 100644
--- a/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -33,7 +33,7 @@
       <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
     </li>
     <li>
-      <a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
+      <a href="#imageupload" data-toggle="tab"><%= t("announcement.image") %></a>
     </li>
     <li>
       <a href="#mail-group" data-toggle="tab"><%= t('announcement.email_reminder')%></a>
@@ -116,7 +116,7 @@
 
       <!-- Images Upload -->
       <div class="control-group">
-        <label class="control-label muted"><%= t(:image) %></label>
+        <label class="control-label muted"><%= t("announcement.image") %></label>
         <div class="controls">
           <div class="fileupload fileupload-new clearfix <%= 'fileupload-edit' if @bulletin.image.file %>" data-provides="fileupload">
             <div class="fileupload-new thumbnail pull-left">
@@ -139,6 +139,7 @@
               </label>
             </div>
           </div>
+          <div class="image_note"><%= t("announcement.image_note")%></div>
         </div>
       </div>
 
@@ -241,6 +242,10 @@
 
     <% end %>
 
+    <div class="control-group">
+      <div class="controls add-input"><%= t('announcement.append_note')%></div>
+    </div>
+
     <!-- Link -->
     <div class="control-group">
       <label class="control-label muted"><%= t(:link) %></label>
diff --git a/app/views/panel/announcement/front_end/bulletins/show.html.erb b/app/views/panel/announcement/front_end/bulletins/show.html.erb
index e2e1219..b6d6df2 100644
--- a/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -8,10 +8,6 @@
 		<span><%=  link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
 	</div>
 </div>
-<div class="news_image">
-	<%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-	<%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
-</div>
 <div class="news_paragraph">
 	<%= @bulletin.text.html_safe rescue '' %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3cc6bc5..6c440cd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,6 +4,7 @@ en:
     add_new: Add New
     all_articles: All Articles
     announcement: Announcement
+    append_note: Suggest to input underside Link and File's annotation to show correct info in frontend
     approval_setting: Approval Setting
     approve_bulletin_fail: Approval Fail
     approve_bulletin_success: Approve Successfully
@@ -25,6 +26,8 @@ en:
     frontend:
       bulletins: Announcement front-end
       search_result: Search result
+    image: Cover image
+    image_note: The image will not show in content
     link_name: Link Name
     new_bulletin_category: New Bulletin Category
     picture: Cover Picture
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index a8af0d1..9cfa1f6 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -4,6 +4,7 @@ zh_tw:
     add_new: 新建
     all_articles: 文章列表
     announcement: 公告
+    append_note: 以下之附加連結與檔案，為使前台顯示名稱，建議您輸入註解。
     approval_setting: 審核設定
     approve_bulletin_fail: 審核失敗
     approve_bulletin_success: 審核成功
@@ -27,6 +28,8 @@ zh_tw:
     frontend:
       bulletins: 公告前台
       search_result: 搜尋結果頁
+    image: 封面圖片
+    image_note: 此處上傳的圖片不會在公告內文出現
     link_name: 連結名稱
     new_bulletin_category: 新增公告類別
     picture: 刊頭圖片