From 4e7b0c5bdfa713e2261331394b938a523f9eb298 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:20:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_attachments_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 15473e6e7..967bc0883 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -20,7 +20,7 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> <%#= link_to image_tag('delete.png'), attachment_path(attachment), From 41a6b8ab0614ed0c467d336de0111f8be589de70 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 28 Sep 2015 14:35:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_attachments_links.html.erb | 34 ++------------------- app/views/memos/show.html.erb | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 967bc0883..ca0f41d16 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -1,4 +1,4 @@ -
+
<% for attachment in attachments %> @@ -20,43 +20,13 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> - <%#= link_to image_tag('delete.png'), attachment_path(attachment), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :class => 'delete', - #:remote => true, - #:id => "attachments_" + attachment.id.to_s, - :title => l(:button_delete) %> <% end %>
<% end %> - - <%# if attachment.is_text? %> - <%#= link_to image_tag('magnifier.png'), - :controller => 'attachments', - :action => 'show', - :id => attachment, - :filename => attachment.filename%> - <%# end %> - - - - - - - - - - - <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %> - - - - <% end %> <% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 1e2f0f25b..550c7a4fe 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -69,7 +69,7 @@ <%= @memo.content.html_safe%>
-
+
<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> From b58fcb58de67bb5ce18541037283cc69cd5c3fcf Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 14:45:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0=EF=BC=9B=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 95 ++++++++------------------ 1 file changed, 28 insertions(+), 67 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 93969f71b..63876084d 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -127,7 +127,7 @@ :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
  •    截止时间快到了！
    • @@ -240,14 +215,13 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -267,14 +241,11 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -296,13 +267,12 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -386,13 +356,8 @@ :onmouseout => "message_titile_hide($(this))" %> <% end %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -437,16 +402,12 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From eac31cda7f0e75ae91ae679574c319f728fd6eae Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 15:13:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E7=95=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b2001e465..f56512fb9 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -168,6 +168,7 @@ a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px s a:hover.problem_pic{border:1px solid #64bdd9;} .issues_icon{ background:url(../images/public_icon.png) 0 -342px no-repeat; width:16px; height:21px;} .problem_txt{ width:600px; margin-left:10px; color:#777777; } +.problem_txt img {max-width:100%;} .pro_txt_w{width:610px;} a.problem_name{ color:#ff5722;max-width: 80px; overflow: hidden;