From 6af8bfef3799ad74a3557eeb6d8a24d1c821f54a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 17 Nov 2015 10:19:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=8A=A0=E4=B8=8Alogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index da649663d..1a12f0f4f 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -411,7 +411,9 @@ <% if ma.course_message_type == "Course" %>

如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!

-
  •   您迟交了作品！
    • +
  •   您迟交了作品
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> From 0e94b4f33ba2e92e31ad6dc717976ef4300244d9 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 Nov 2015 16:18:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E8=83=BD=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_join_org.html.erb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb index 57ae714bd..589bed1b9 100644 --- a/app/views/projects/settings/_join_org.html.erb +++ b/app/views/projects/settings/_join_org.html.erb @@ -16,12 +16,13 @@
    关联组织
    - <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true %> - -
    - - 关联 - 取消 + <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true do %> + +
    + + 关联 + 取消 + <% end %>
    From d133acbf2adf9a77723e6cbd9482dc74a370d178 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 18 Nov 2015 10:41:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_show_topics.html.erb | 4 ++-- app/views/memos/show.html.erb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index bb8a91b69..af90b3049 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -13,10 +13,10 @@
    <% author = topic.last_reply.try(:author)%> <% if author%> -
    最后回复：<%= author.name%>
    +
    最后回复:<%= author.name%>
    <%= format_date(topic.last_reply.created_at)%>
    <% end%> - +
    最后更新:<%= format_date(topic.updated_at)%>
    diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index efcd15a66..408be0aa3 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -79,6 +79,7 @@ <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> <% end %>
    +
    最后更新:<%= format_date(@memo.updated_at)%>