From 0ea683e1b497f88a004d588cf5119a15cde3841e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Apr 2015 07:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E4=B8=AD=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=99=84=E4=BB=B6=E7=9A=84=E7=BC=A9=E7=95=A5=E5=9B=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                  | 14 ++++++++++++++
 app/views/attachments/_project_file_links.html.erb |  6 ++----
 app/views/issues/_edit.html.erb                    |  4 ++--
 app/views/issues/_history.html.erb                 |  2 +-
 app/views/issues/show.html.erb                     |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dc52de3e3..599f27215 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -325,6 +325,20 @@ module ApplicationHelper
             :title => attachment.filename
   end
 
+  def thumbnail_issue_tag(attachment)
+    imagesize = attachment.thumbnail(:size => "50*50")
+    imagepath = named_attachment_path(attachment, attachment.filename)
+    if imagesize
+      link_to image_tag(imagesize),
+              imagepath,
+              :title => attachment.filename
+    else
+      link_to image_tag(imagepath , height: '73', width: '100'),
+              imagepath,
+              :title => attachment.filename
+    end
+  end
+
   # 图片缩略图链接
   def thumbnail_small_tag(attachment)
     imagesize = attachment.thumbnail(:size => "200*200")
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index d32025787..7a9d1a6ca 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -5,7 +5,7 @@
         <%if is_float%>
           <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
       <% end%>
-      <span title="<%= attachment.filename%>" id = "attachment_">
+      <span title="<%= attachment.filename %>" id = "attachment_">
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%>
         <% else %>
@@ -62,11 +62,9 @@
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>
       <% if images.any? %>
-          <div class="thumbnails">
             <% images.each do |attachment| %>
-                <div><%= thumbnail_tag(attachment) %></div>
+                <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
-          </div>
       <% end %>
   <% end %>
 </div>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index fa3153012..1266f4611 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -18,7 +18,7 @@
           <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
         </div>
     <% end %>
-    <fieldset><legend>说明</legend>
+    <fieldset><legend>回复</legend>
     <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
@@ -29,7 +29,7 @@
     <!--</fieldset>-->
 
     <!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
-    <!--<p style="padding-top: 5px;"><%= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>-->
+    <!--<p style="padding-top: 5px;"><%#= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>
     <!--</fieldset>-->
 
     <div class="cl"></div>
diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb
index 50ddbceee..8239517c0 100644
--- a/app/views/issues/_history.html.erb
+++ b/app/views/issues/_history.html.erb
@@ -13,7 +13,7 @@
         <% if journal.details.any? %>
 			<% details_to_strings(journal.details).each do |string| %>
                 <%= string %>
-		    <% end %> </span>
+		    <% end %>
         <% end %>
         </p>
       </div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index a42562c06..d68e1fc7d 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -115,7 +115,7 @@
       </div>
   <% end %>
   <!--留言-->
-  <br>
+  <p style="padding-top: 5px"></p>
   <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
     <%= l(:button_submit) %>
   </a>