From c856b4cdce15925bac4c5fe08860cbf4d9673342 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 24 Apr 2012 12:41:28 +0800
Subject: [PATCH] Fix for upload image component in announcement

---
 app/views/admin/ad_images/_form.html.erb      | 33 +++++++++----------
 config/locales/en.yml                         |  1 +
 config/locales/zh_tw.yml                      |  1 +
 .../back_end/bulletins/_form.html.erb         | 25 ++++++++++----
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index e9d60374..790f371b 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -75,27 +75,24 @@
         </div>
         <h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
         <div class="widget-content clear">         
-            <div class="control-group">
-                <div  class="upload-picture">
-                    <!--請程式務必將圖片尺寸加入到行內裡-->
-                    <%= image_tag @ad_image.file rescue ''%>
-                </div>
-                <span class="alert widgetInfo">此區塊圖片尺寸請使用580px × 225px</span>
-                <div class="controls file-upload input-prepend">
-                    <label class="control-label add-on btn" for="input-upload">
-									Choose file
-									
-									<%= f.file_field :file,:id=>"input-upload",:class => "upload", :onchange=> "document.getElementById('fu1').innerHTML = this.form.fu1.value = this.value;" %>
-								</label>
-								<span id="fu1" class="file-name"></span>
-								<br>
-
-								
-								<input name="fu1" class="input-medium" type="text">
-							</div>
+          <div class="control-group">
+            <div  class="upload-picture">
+              <!--請程式務必將圖片尺寸加入到行內裡-->
+              <%= image_tag @ad_image.file rescue ''%>
+            </div>
+            <span class="alert widgetInfo">此區塊圖片尺寸請使用580px × 225px</span>
+            <div class="controls file-upload input-prepend">
+              <label class="control-label add-on btn" for="input-upload">
+								Choose file
+								<%= f.file_field :file,:id=>"input-upload",:class => "upload", :onchange=> "document.getElementById('fu1').innerHTML = this.form.fu1.value = this.value;" %>
+							</label>
+							<span id="fu1" class="file-name"></span>
+							<br>
+							<input name="fu1" class="input-medium" type="text">
 						</div>
 					</div>
 				</div>
+			</div>
 				
 			<div id="widget-type" class="widget-box">
 					<div class="widget-action clear">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f34557ca..de58faa7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -9,6 +9,7 @@ en:
   account_settings: Account settings
   add: Add
   back: Back
+  browse: Browse
   cancel: Cancel
   create: Create
   delete: Delete
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 2615c99c..cc185ab5 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -6,6 +6,7 @@ zh_tw:
   account_settings: 帳號設定
   add: 新增
   back: 回上一步
+  browse: 選擇檔案
   cancel: 取消
   create: 創建
   delete: 刪除
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 fe35d98d..d9c62078 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
@@ -4,23 +4,31 @@
 	<%= f.error_messages %>
 	
 	<div id="sub-wiget">
-		<div id="widget-picture" class="widget-box widget-size-300">
+		<div id="widget-picture" class="widget-box">
 			<div class="widget-action clear">
 				<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
 			<h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
 			<div class="widget-content clear">
 				<div class="control-group">
-					<img class="pull-left upload-picture" src="/assets/default-img.png" />
-					
-					<div class="controls file-upload">
-					<label class="control-label btn" for="input-upload">
-						Browse/選擇檔案
+           <!-- <img class="pull-left upload-picture" src="/assets/default-img.png" /> -->
+					<div  class="upload-picture">
+              <!--請程式務必將圖片尺寸加入到行內裡-->
+              <% if @bulletin.image %>
+              	<%= image_tag @bulletin.image, :width=> "456", :height=>'700' rescue ''%>
+              <% else %>
+              	<img class="pull-left upload-picture" src="/assets/default-img.png" />
+              <% end %>
+
+          </div>
+					<div class="controls file-upload input-prepend">
+					<label class="control-label add-on btn" for="input-upload">
+						<%= t(:browse) %>
 						<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
 					</label>
 					<span id='fu' class="file-name"></span>
 					<br>
-					<input name='fu' class="input-large" type="text">
+					<input name='fu' class="input-medium" type="text">
 					<br>
 					<% if @bulletin.image.file %>
 					  <%= f.check_box :remove_image %>
@@ -31,6 +39,8 @@
 			</div>
 		</div>
 
+
+
 		<div id="widget-date" class="widget-box widget-size-300">
 			<div class="widget-action clear">
 				<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
@@ -281,6 +291,7 @@
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
+	<%= javascript_include_tag "inc/jquery.imagesloaded" %>
 	<script>
 		$('#add_bulletin_link a.add').live('click', function(){
 			var new_id = $(this).prev().attr('value');