From 9b55d8b527c8c2a398af116c3d572c861949b465 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 10 May 2016 14:06:34 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=89=88=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blogs/_article.html.erb                      | 4 ++--
 app/views/files/_org_subfield_list.html.erb            | 2 +-
 app/views/files/_project_list.html.erb                 | 2 +-
 app/views/files/_resource_detail.html.erb              | 2 +-
 app/views/issues/_issue_replies.html.erb               | 2 +-
 app/views/memos/show.html.erb                          | 2 +-
 app/views/organizations/_org_course_create.html.erb    | 2 +-
 app/views/organizations/_org_course_homework.html.erb  | 2 +-
 app/views/organizations/_org_course_message.html.erb   | 4 ++--
 app/views/organizations/_org_course_news.html.erb      | 4 ++--
 app/views/organizations/_org_course_poll.html.erb      | 2 +-
 app/views/organizations/_org_project_issue.html.erb    | 4 ++--
 app/views/organizations/_org_subfield_message.html.erb | 4 ++--
 app/views/organizations/_org_subfield_news.html.erb    | 4 ++--
 app/views/organizations/_project_create.html.erb       | 2 +-
 app/views/organizations/_project_message.html.erb      | 4 ++--
 app/views/projects/_attachment_acts.html.erb           | 2 +-
 app/views/projects/_project_create.html.erb            | 2 +-
 app/views/projects/_project_news.html.erb              | 4 ++--
 app/views/users/_course_attachment.html.erb            | 2 +-
 app/views/users/_course_create.html.erb                | 2 +-
 app/views/users/_course_homework.html.erb              | 2 +-
 app/views/users/_course_journalsformessage.html.erb    | 2 +-
 app/views/users/_course_message.html.erb               | 4 ++--
 app/views/users/_course_news.html.erb                  | 4 ++--
 app/views/users/_course_poll.html.erb                  | 2 +-
 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_issue.html.erb                | 2 +-
 app/views/users/_project_issue_reply.html.erb          | 2 +-
 app/views/users/_project_journal.html.erb              | 2 +-
 app/views/users/_project_message.html.erb              | 4 ++--
 app/views/users/_project_news.html.erb                 | 4 ++--
 app/views/users/_user_blog.html.erb                    | 4 ++--
 app/views/users/_user_homework_detail.html.erb         | 2 +-
 app/views/users/user_system_messages.html.erb          | 2 +-
 37 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index edbce26d3..afeefd299 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -47,7 +47,7 @@
             </ul>
           </div>
       <%end%>
-      <div class="homepagePostTo  mt-4 fl">
+      <div class="homepagePostTo fl">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
@@ -161,7 +161,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index ad3ce7a3e..66b68e895 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -8,7 +8,7 @@
             <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
           </div>
           <div class="homepagePostDes">
-            <div class="homepagePostTitle break_word mt-4">
+            <div class="homepagePostTitle break_word">
               <%# 如果有历史版本则提供历史版本下载 %>
               <% if file.attachment_histories.count == 0 %>
                   <%= link_to file.is_public? ? truncate(file.filename, length: 45) : truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 2ee726d77..831dc0e68 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -7,7 +7,7 @@
               <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
             </div>
             <div class="homepagePostDes">
-              <div class="homepagePostTitle break_word mt-4">
+              <div class="homepagePostTitle break_word">
                 <%# 如果有历史版本则提供历史版本下载 %>
                 <% if file.attachment_histories.count == 0 %>
                     <%= link_to truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 20ffb1e50..2a03723ca 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -5,7 +5,7 @@
       <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTitle break_word mt-4">
+      <div class="homepagePostTitle break_word">
         <%# 如果有历史版本则提供历史版本下载 %>
         <% if file.attachment_histories.count == 0 %>
             <%= link_to truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 4c8dfa1d9..aaf9c132f 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -11,7 +11,7 @@
           <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher mt-4">
+          <div class="homepagePostReplyPublisher">
             <% if reply.try(:user).try(:realname) == ' ' %>
                 <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
             <% else %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 83b90dc93..aeaf3f423 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -94,7 +94,7 @@
           <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
       </div>
       <div class="homepagePostReplyDes">
-        <div class="homepagePostReplyPublisher mt-4"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
+        <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
         <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= reply.content.html_safe%></div>
       </div>
       <script type="text/javascript">
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index 875c45059..1207d65c9 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:teacher).try(:realname) == ' ' %>
             <%= link_to activity.try(:teacher), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 025bb48af..179c70930 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -6,7 +6,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 9a9943e9b..2817cd6c8 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -108,7 +108,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 7f50b3725..c35bef80a 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -77,7 +77,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index 10d1919a2..cdb4537c9 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -9,7 +9,7 @@
           <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
         </div>
         <div class="homepagePostDes">
-          <div class="homepagePostTo break_word mt-4">
+          <div class="homepagePostTo break_word">
             <% if activity.try(:user).try(:realname) == ' ' %>
                 <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% else %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 9b7dbfa8f..8b113be93 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -88,7 +88,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:user).try(:realname) == ' ' %>
                           <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index bf0cc8734..9693a3974 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -113,7 +113,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 3d2a316cf..a1ee88928 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -97,7 +97,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb
index 5003fd0e2..a25c8f123 100644
--- a/app/views/organizations/_project_create.html.erb
+++ b/app/views/organizations/_project_create.html.erb
@@ -7,7 +7,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if user.try(:realname) == ' ' %>
             <%= link_to user, user_url_in_org(user.id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index a818939d6..3e5e92f8f 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -87,7 +87,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb
index de0820bff..0ecfa9be7 100644
--- a/app/views/projects/_attachment_acts.html.erb
+++ b/app/views/projects/_attachment_acts.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb
index ef0c7c4c3..d54bf632e 100644
--- a/app/views/projects/_project_create.html.erb
+++ b/app/views/projects/_project_create.html.erb
@@ -7,7 +7,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if user.try(:realname) == ' ' %>
             <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 4ea0e9f17..a07a0a0f1 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -77,7 +77,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb
index 6f6cf82f3..a8dc2e479 100644
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb
index dc1e0ee81..0f413727d 100644
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:teacher).try(:realname) == ' ' %>
             <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 351001bb8..18127bb59 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -6,7 +6,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index f9a59f024..92b3b664c 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 0ac756f71..f58b33665 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -5,7 +5,7 @@
       <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
@@ -125,7 +125,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index efaa72beb..a336f1cfb 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -102,7 +102,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 970fb516e..0fd311376 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -9,7 +9,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb
index b3d904104..fa85d5683 100644
--- a/app/views/users/_project_attachment.html.erb
+++ b/app/views/users/_project_attachment.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb
index 0e35bca25..b4b186300 100644
--- a/app/views/users/_project_create.html.erb
+++ b/app/views/users/_project_create.html.erb
@@ -7,7 +7,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if user.try(:realname) == ' ' %>
             <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb
index eb3ff2122..5427bd112 100644
--- a/app/views/users/_project_document.html.erb
+++ b/app/views/users/_project_document.html.erb
@@ -3,7 +3,7 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mt-4"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
       <div class="homepagePostTitle">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）</a></div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 008f08706..5f0adced0 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 5020f67d3..671cbeab9 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -37,7 +37,7 @@
                   <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher mt-4">
+                  <div class="homepagePostReplyPublisher">
                     <% if reply.try(:user).try(:realname) == ' ' %>
                         <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                     <% else %>
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb
index 7cf487211..1efbf1c7d 100644
--- a/app/views/users/_project_journal.html.erb
+++ b/app/views/users/_project_journal.html.erb
@@ -3,7 +3,7 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mt-4"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
       <div class="homepagePostTitle">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）</a></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index c071f4a13..5fdff5aad 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -120,7 +120,7 @@
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
                           <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 7f5d185e5..681493c44 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -99,7 +99,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 841fd9377..2fcf94a13 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -5,7 +5,7 @@
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <div class="homepagePostTo break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -83,7 +83,7 @@
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
+                    <div class="homepagePostReplyPublisher">
                       <% if comment.try(:author).try(:realname) == ' ' %>
                           <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index e483f3daf..4360dca3b 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -5,7 +5,7 @@
       <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mt-4">
+      <div class="homepagePostTo">
         <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 86ae56cc8..57c6eb573 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -7,7 +7,7 @@
           <%= image_tag("/images/trustie_logo1.png", :width => "50", :height => "50") %>
         </div>
         <div class="homepagePostDes">
-          <div class="homepagePostTo break_word mt-4">
+          <div class="homepagePostTo break_word">
             <span class="fl"><span style="color:#0781b4;">Trustie平台 </span>发布了系统消息：</span>
             <span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject.nil? ? "系统消息" : system_message.subject %></span>
           </div>

From ec3a077b222508db868092c34563b30028e28ec8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 10 May 2016 14:48:40 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/menu.yml | 2 +-
 db/schema.rb    | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/config/menu.yml b/config/menu.yml
index d129f7aff..3951f836b 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -5,7 +5,7 @@ button:
   url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
-  name: "意见返馈"
+  name: "意见反馈"
   key:  "FEEDBACK"
  -
   name: "更多"
diff --git a/db/schema.rb b/db/schema.rb
index cb7e6d1a1..efc41f1eb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1660,15 +1660,6 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.datetime "updated_at",     :null => false
   end
 
-  create_table "shield_wechats", :force => true do |t|
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.string   "shield_type"
-    t.integer  "shield_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"

From 67380d58d4fcd7be9fb64afa5d8452e2c41933af Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 10 May 2016 15:27:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_blog.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 2fcf94a13..00ff3c10c 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -16,13 +16,13 @@
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
         <div class="fl">
         <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
+          <% if activity.locked%>
+              <span class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          <% end%>
+          <% if activity.sticky == 1%>
+              <span class="sticky_btn_cir ml10">置顶</span>
+          <% end%>
         </div>
-        <% if activity.sticky == 1%>
-            <span class="sticky_btn_cir ml10">置顶</span>
-        <% end%>
-        <% if activity.locked%>
-            <span class="locked_btn_cir ml10 fl" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-        <% end%>
         <div class="cl"></div>
       </div>
 

From a1afd0dc96d798aeff5db80ac9aeb9ff3bb1ed3a Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 11 May 2016 09:38:02 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=EF=BC=8C=E4=BB=85=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                                       | 1 -
 public/assets/wechat/blog_detail.html         | 2 +-
 public/assets/wechat/course_discussion.html   | 2 +-
 public/assets/wechat/course_notice.html       | 2 +-
 public/assets/wechat/homework_detail.html     | 2 +-
 public/assets/wechat/issue_detail.html        | 2 +-
 public/assets/wechat/jour_message_detail.html | 2 +-
 public/assets/wechat/project_discussion.html  | 2 +-
 public/javascripts/wechat/app.js              | 3 +++
 9 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 1234567

diff --git a/1234567 b/1234567
deleted file mode 100644
index c7ff2f81d..000000000
--- a/1234567
+++ /dev/null
@@ -1 +0,0 @@
-{"access_token":"nwsA--Idg9Wk4Kyuybly8XuI8MWx-NrJbPTzZX2ynbGaVHBnXZgJ4DHkwlJK6dGfYOmeMNmRj6PSXEzs1GS6vAy0e_7_6S34-S44wtGK83dv6HCUQ8qh3vAw12QUi39fUMDhCIAFXO","expires_in":7200,"got_token_at":1461723935}
\ No newline at end of file
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index c1133f955..9f229699e 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -38,7 +38,7 @@
                 <div class="post-input-container">
                     <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                 </div>
-                <button ng-click="addBlogReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                 <div class="cl"></div>
             </div>
         </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 3f095ab62..6466e12b8 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -44,7 +44,7 @@
                     <div class="post-input-container">
                         <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 3b7965733..c426f2794 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -44,7 +44,7 @@
                     <div class="post-input-container">
                         <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                     </div>
-                    <button ng-click="addNoticeReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addNoticeReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index fec0c4cff..83d04edca 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -50,7 +50,7 @@
                     <div class="post-input-container">
                         <input type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment" />
                     </div>
-                    <button ng-click="addHomeworkReply(formData)" value="回复" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addHomeworkReply(formData)" ng-disabled="formData.disabled" value="回复" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index f61d803dd..d71f0cb65 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -48,7 +48,7 @@
                         <div class="post-input-container">
                             <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                         </div>
-                        <button ng-click="addIssueReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-click="addIssueReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                         <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 0bc87214b..29660e4fd 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -36,7 +36,7 @@
                 <div class="post-input-container">
                     <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                 </div>
-                <button ng-click="addJournalReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                 <div class="cl"></div>
             </div>
         </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 890b47a73..03fda04e5 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -44,7 +44,7 @@
                     <div class="post-input-container">
                         <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 3dcc0e6c1..c591195c5 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -128,12 +128,15 @@ app.factory('common', function($http, auth, $routeParams){
             openid: auth.openid()
         };
 
+        data.disabled = true;
+
         $http({
             method: 'POST',
             url: apiUrl+ "new_comment/"+id,
             data: userInfo
         }).then(function successCallback(response) {
             alert("提交成功");
+            data.disabled = false;
             if(typeof cb === 'function'){
                 cb();
             }

From e2f3ba8e7db0429951e4d98e36ff662db519e888 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 19 May 2016 15:20:46 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                                   |  1 +
 app/api/mobile/entities/activity.rb       |  2 +-
 db/schema.rb                              | 59 ++++++++++++++++++++++-
 public/assets/wechat/activities.html      | 52 ++++++++++----------
 public/assets/wechat/homework_detail.html |  8 +--
 public/assets/wechat/issue_detail.html    |  2 +-
 public/javascripts/wechat/app.js          |  7 ++-
 7 files changed, 93 insertions(+), 38 deletions(-)
 create mode 100644 1234567

diff --git a/1234567 b/1234567
new file mode 100644
index 000000000..3d4e13b55
--- /dev/null
+++ b/1234567
@@ -0,0 +1 @@
+{"access_token":"xAp1rQu0Xpv8CrlooZydXiyAQIqavONhB6FXnCl1Rw_nM-fyjUz-9foxqgkH2rPMwr5f1THUkzqxshoF3CZHjJM4CautpSlQ5e7MgkjF5-a8GB5gYCxtcdb5C1H2jyMgIOOcCGAPVV","expires_in":7200,"got_token_at":1463640239}
\ No newline at end of file
diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 20876bf69..9bbdd22a4 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -84,7 +84,7 @@ module Mobile
                   elsif ac.container_type == "Project"
                     case ac.act_type
                       when "Issue"
-                        "项目缺陷"
+                        "项目问题"
                       when "Message"
                         "项目讨论区"
                       when "ProjectCreateInfo"
diff --git a/db/schema.rb b/db/schema.rb
index efc41f1eb..766348dc8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160426084709) do
+ActiveRecord::Schema.define(:version => 20160513021204) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -57,6 +57,17 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.integer "user_id",    :null => false
   end
 
+  create_table "apply_homeworks", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "apply_homeworks", ["homework_common_id"], :name => "index_apply_homeworks_on_homework_common_id"
+  add_index "apply_homeworks", ["user_id"], :name => "index_apply_homeworks_on_user_id"
+
   create_table "apply_project_masters", :force => true do |t|
     t.integer  "user_id"
     t.string   "apply_type"
@@ -474,8 +485,10 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.integer  "viewed"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false
-    t.string   "content"
+    t.text     "content"
     t.integer  "status"
+    t.integer  "apply_user_id"
+    t.integer  "apply_result"
   end
 
   add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type"
@@ -1315,6 +1328,7 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
+    t.integer  "allow_teacher",        :default => 0
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1678,6 +1692,20 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.integer  "project_id"
   end
 
+  create_table "ssos", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "openid"
+    t.string   "name"
+    t.string   "password"
+    t.string   "email"
+    t.integer  "sex"
+    t.string   "school"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "ssos", ["user_id"], :name => "index_ssos_on_user_id"
+
   create_table "student_work_projects", :force => true do |t|
     t.integer  "homework_common_id"
     t.integer  "student_work_id"
@@ -1720,6 +1748,7 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.boolean  "is_test",                                       :default => false
     t.integer  "simi_id"
     t.integer  "simi_value"
+    t.float    "work_score"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1751,6 +1780,31 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
   add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
   add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
 
+  create_table "sub_document_comments", :force => true do |t|
+    t.text     "content"
+    t.text     "title"
+    t.integer  "sub_domain_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.integer  "locked"
+    t.integer  "sticky"
+    t.integer  "org_subfield_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "sub_domains", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "priority",        :default => 0
+    t.string   "name"
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
   create_table "subfield_subdomain_dirs", :force => true do |t|
     t.integer  "org_subfield_id"
     t.string   "name"
@@ -1990,6 +2044,7 @@ ActiveRecord::Schema.define(:version => 20160426084709) do
     t.string   "salt",              :limit => 64
     t.integer  "gid"
     t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index f0f8e9c92..b4e582336 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -17,18 +17,18 @@
                 <div class="post-title hidden">
                   <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-title mt5 hidden"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title mt5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
                 <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                  <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> 匿评开启时间：{{act.homework_common_detail.evaluation_start}}<br />
-                  <span class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
+                  <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
+                  <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
                 </div>
                 <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -46,7 +46,7 @@
                 <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mt5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
@@ -54,8 +54,8 @@
                 <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -73,7 +73,7 @@
                 <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mt5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
@@ -81,8 +81,8 @@
                 <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -98,8 +98,8 @@
             <div class="post-wrapper">
               <div class="post-main">
                 <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}}</span></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.latest_update}}</a></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 课程</span></div>
+                <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                 <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mt5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
                 <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
@@ -126,8 +126,8 @@
                 <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -146,7 +146,7 @@
                 <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mt5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
                 <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
@@ -154,8 +154,8 @@
                 <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -170,8 +170,8 @@
             <div class="post-wrapper">
               <div class="post-main">
                 <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.author.realname}}</span>创建了<span class="c-grey3 f15 fb">{{act.course_project_name}}</span></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.latest_update}}</a></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -195,8 +195,8 @@
                 <a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
                 <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
                 <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
@@ -215,15 +215,15 @@
               <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
               <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
               <div class="cl"></div>
-              <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+              <div class="post-title hidden mt5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
               <div class="post-content c-grey2">
                 <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
               </div>
               <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
               <div class="cl"></div>
               <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-              <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
-              <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
               <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
               <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
               <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 83d04edca..1af5e185d 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -16,10 +16,10 @@
                     </tr></table>
                 <div class="post-content c-grey3 mt10" style="height:auto;">
                     <div class="post-all-content mb10" ng-bind-html="homework.description|safeHtml"></div>
-                    <span class="c-grey">迟交扣分：{{homework.late_penalty}}分<br/>
-                    缺评扣分：{{homework.absence_penalty}}分/作品<br />
-                    匿评开启时间：{{homework.evaluation_start}}<br />
-                    匿评关闭时间：{{homework.evaluation_end}}</span>
+                    <span class="c-grey">迟交扣分：{{homework.late_penalty}}分</span><br/>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey">匿评开启时间：{{homework.evaluation_start}}<br /></span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey">匿评关闭时间：{{homework.evaluation_end}}</span>
                 </div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{homework.publish_time}}</span>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index d71f0cb65..950cbe18e 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -10,7 +10,7 @@
                 </tr>
                     <tr>
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目缺陷</td>
+                        <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目问题</td>
                     </tr></table>
                 <div class="post-content" style="height:auto;">
                     <div class="post-all-content c-grey3 mt10 mb10" ng-bind-html="issue.description|safeHtml"></div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index c591195c5..2201d4104 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,10 +1,10 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
 var apiUrl = '/api/v1/';
-var debug = false; //调试标志,如果在本地请置为true
+var debug = true; //调试标志,如果在本地请置为true
 
 if(debug===true){
-    //apiUrl = 'http://localhost:3000/api/v1/';
-    apiUrl = 'https://www.trustie.net/api/v1/';
+    apiUrl = 'http://localhost:3000/api/v1/';
+    //apiUrl = 'https://www.trustie.net/api/v1/';
 }
 
 app.factory('auth', function($http,$routeParams, $cookies, $q){
@@ -383,7 +383,6 @@ app.directive('textAutoHeight', function($timeout){
             $timeout(function(){
                 var e = element.parent().children().eq(5);
                 var height = e[0].scrollHeight;
-                var offsetHeight = e[0].offsetHeight;
                 if(height>90){
                     element.css('display', 'block');
                     element.on('click', function(){

From 66042cb3c9befd208621e2c68d5f48e79b8c480d Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 19 May 2016 15:21:25 +0800
Subject: [PATCH 6/6] debug false

---
 public/javascripts/wechat/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 2201d4104..447365c35 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,10 +1,10 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
 var apiUrl = '/api/v1/';
-var debug = true; //调试标志,如果在本地请置为true
+var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){
-    apiUrl = 'http://localhost:3000/api/v1/';
-    //apiUrl = 'https://www.trustie.net/api/v1/';
+    //apiUrl = 'http://localhost:3000/api/v1/';
+    apiUrl = 'https://www.trustie.net/api/v1/';
 }
 
 app.factory('auth', function($http,$routeParams, $cookies, $q){