From 385009b688d89d828e88b4a19c7cb4f3decff2fc Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 4 Nov 2014 10:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=8C=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_links.html.erb  | 2 +-
 app/views/homework_attach/_history.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 29ed094bf..2954adbcb 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -1,7 +1,7 @@
 <div class="attachments" style="font-weight:normal;">
 <% for attachment in attachments %>
 <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-  <span title="<%= attachment.filename%>" id = "attachment_"">
+  <span title="<%= attachment.filename%>" id = "attachment_">
     <% if options[:length] %>
       <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
     <% else %>
diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb
index c235e0867..3376d696f 100644
--- a/app/views/homework_attach/_history.erb
+++ b/app/views/homework_attach/_history.erb
@@ -19,7 +19,7 @@
               <div class="ping_discon" style="width: 85%;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= journal.created_on %></span>
+                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <p><%= textilizable journal.notes%></p>
                 </div>