From bbe4c15293614be8553fc11549b5de8c3ad5700e Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 29 Apr 2015 17:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=99=84=E4=BB=B6=E5=92=8C=E5=AE=9A=E4=B9=89=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E4=B8=80=E6=97=B6=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=9B=BE=E7=89=87=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=98=BE?=
 =?UTF-8?q?=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             |  5 +--
 .../attachments/_project_file_links.html.erb  | 32 +++++++++++++++++++
 public/stylesheets/project.css                |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6eb02f1cf..65ad32602 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -329,11 +329,12 @@ module ApplicationHelper
     imagesize = attachment.thumbnail(:size => "200*200")
     imagepath = named_attachment_path(attachment, attachment.filename)
     if imagesize
-      link_to image_tag(thumbnail_path(attachment), height: '73', width: '100'),
+      link_to image_tag(thumbnail_path(attachment), height: '73', width: '100', name: 'issue_attachment_picture'),
               imagepath,
               :title => attachment.filename
+
     else
-      link_to image_tag(imagepath , height: '73', width: '100'),
+      link_to image_tag(imagepath , height: '73', width: '100', name: 'issue_attachment_picture'),
               imagepath,
               :title => attachment.filename
     end
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 0135ee239..28fde5fe1 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -1,3 +1,35 @@
+<script type="text/javascript">
+    document.addEventListener('DOMContentLoaded',function(){
+        var img = document.getElementsByName('issue_attachment_picture');
+        function getImgNaturalStyle(img,callback) {
+            var nWidth, nHeight
+            if (typeof img.naturalWidth == "undefined"|| img.naturalWidth == 0) { // 现代浏览器
+                var image = new Image();
+                image.src = img.src;
+                nWidth = image.width;
+                nHeight = image.height;
+            } else {
+                nWidth = img.naturalWidth;
+                nHeight = img.naturalHeight;
+            }
+            return [nWidth, nHeight]
+        }
+
+        for(i=0;i<img.length;i++)
+        {
+            imgNatural = getImgNaturalStyle(img[i]);
+            var width = imgNatural[0];
+            var height = imgNatural[1];
+            if (width<100)
+            {
+                img[i].width = width;
+            }
+            if (height<73) {
+                img[i].height = height;
+            }
+        }
+    });
+</script>
 <div class="attachments" style="font-weight:normal;">
   <% is_float ||= false %>
   <% for attachment in attachments %>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index a62bd0389..4f9c6ec78 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -87,7 +87,7 @@ a.pro_mes_w{ height:20px; float:left;display:block; color:#999999;}
 .pro_page_top{ font-size:14px; border-bottom:2px solid #64bdd9; margin-bottom:10px; padding-bottom:5px;}
 .pro_page_tit{color:#3e4040;  font-weight:bold;width:480px; float:left; font-size:14px; margin-bottom:5px;}
 .pro_pic_box{ margin-left:60px; }
-.pro_pic{ width:100px; border:2px solid #CCC; margin:10px 0;}
+.pro_pic{ width:100px; height:73px;line-height:73px;border:2px solid #CCC; margin:10px 0;}
 .pro_info_box{ margin-left:60px; background:#f0fbff; height:80px; padding:10px 0;}
 .pro_info_box ul{}
 .pro_info_box ul li{ margin-bottom:10px;}