From fc47b793ee40fc76bda1cf8c7f9e7d8e8f33ca6d Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 17:06:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9D=97=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_attachment.html.erb | 4 ++-- app/views/users/_course_poll.html.erb | 4 ++-- app/views/users/_project_attachment.html.erb | 2 +- app/views/users/_project_create.html.erb | 2 +- app/views/users/_project_document.html.erb | 2 +- app/views/users/_project_journal.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/show_chen.erb | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index ec68b2332..e0d04548b 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -5,7 +5,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -15,7 +15,7 @@ <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%=activity.filename.to_s(附件名称)%>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index f0a2a8aba..e72924780 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -7,7 +7,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -17,7 +17,7 @@ <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> <% if has_commit %> <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 13e6df408..731737610 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -1,5 +1,5 @@
-
+
用户头像
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index b2487c444..913aeb3d0 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -1,5 +1,5 @@
-
+
用户头像
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index 4f5d986d7..4a7fa1f4d 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -1,5 +1,5 @@
-
+
用户头像
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 3c1f8c61d..cc5036ede 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -1,5 +1,5 @@
-
+
用户头像
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 89f149303..db41a1e49 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -1,5 +1,5 @@
-
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb index 950350202..11c007b39 100644 --- a/app/views/users/show_chen.erb +++ b/app/views/users/show_chen.erb @@ -138,10 +138,10 @@
用户头像
-
尹教授 TO +
尹教授 TO 黄井泉，陈正东
-
假期开心吗？（讨论区内容）
+
假期开心吗？（讨论区内容）
时间：2015-07-31
@@ -205,9 +205,9 @@
用户头像
-
尹教授 TO +
尹教授 TO Trustie Forge（项目名称）
-
+
上传资源未显示在项目动态中（缺陷标题）正常