Merge remote-tracking branch 'origin/szzh' into guange_dev

This commit is contained in:
guange 2015-04-29 10:44:04 +08:00
commit e6f8610dea
2 changed files with 2 additions and 2 deletions

View File

@ -326,7 +326,7 @@ module ApplicationHelper
end
def thumbnail_issue_tag(attachment)
imagesize = attachment.thumbnail(:size => "50*50")
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'),

View File

@ -1,6 +1,6 @@
<div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
<div class="upload_con">
<h2>将此文件引入我的资源库</h2>
<h2>将此文件引入我的资源库</h2>
<% if error == '403' %>
<div class="upload_box">
<div style="color: red;">您没有权限引用此资源</div>