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 01/72] =?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 02/72] =?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 03/72] =?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 04/72] =?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 187bd610264a4f133890608af92ed8c6adee7db7 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 13 May 2016 17:59:58 +0800
Subject: [PATCH 05/72] =?UTF-8?q?pull=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/code_review.js                |  706 +++---
 .../stylesheets/activity.css                  |    6 +-
 .../stylesheets/code_review.css               |  192 +-
 .../stylesheets/window_js/MIT-LICENSE         |   38 +-
 .../stylesheets/window_js/alert.css           |  238 +-
 .../stylesheets/window_js/alert_lite.css      |  176 +-
 .../stylesheets/window_js/alphacube.css       |  300 +--
 .../stylesheets/window_js/behavior.htc        |  100 +-
 .../stylesheets/window_js/darkX.css           |  242 +--
 .../stylesheets/window_js/debug.css           |   50 +-
 .../stylesheets/window_js/default.css         |  310 +--
 .../stylesheets/window_js/iefix/iepngfix.css  |    6 +-
 .../stylesheets/window_js/iefix/iepngfix.htc  |  106 +-
 .../stylesheets/window_js/lighting.css        | 1920 ++++++++---------
 .../window_js/lighting/pngbehavior.htc        |  134 +-
 .../stylesheets/window_js/mac_os_x.css        |  666 +++---
 .../stylesheets/window_js/mac_os_x_dialog.css |  320 +--
 .../stylesheets/window_js/nuncio.css          |  328 +--
 .../stylesheets/window_js/spread.css          |  216 +-
 19 files changed, 3027 insertions(+), 3027 deletions(-)

diff --git a/public/plugin_assets/redmine_code_review/javascripts/code_review.js b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
index 625f376c9..4f4d81691 100644
--- a/public/plugin_assets/redmine_code_review/javascripts/code_review.js
+++ b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
@@ -1,354 +1,354 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009-2013  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-var topZindex = 1000;
-var action_type = '';
-var rev = '';
-var rev_to = '';
-var path = '';
-var urlprefix = '';
-var review_form_dialog = null;
-var add_form_title = null;
-var review_dialog_title = null;
-var repository_id = null;
-var filenames = [];
-
-var ReviewCount = function(total, open, progress){
-    this.total = total;
-    this.open = open;
-    this.closed = total - open;
-    this.progress = progress
-};
-
-var CodeReview = function(id) {
-    this.id = id;
-    this.path = '';
-    this.line = 0;
-    this.url = '';
-    this.is_closed = false;
-};
-
-var review_counts = new Array();
-var code_reviews_map = new Array();
-var code_reviews_dialog_map = new Array();
-
-function UpdateRepositoryView(title) {
-    var header = $("table.changesets thead tr:first");
-    var th = $('<th></th>');
-    th.html(title);
-    header.append(th);
-    $('tr.changeset td.id a').each(function(i){
-        var revision = this.getAttribute("href");
-        revision = revision.substr(revision.lastIndexOf("/") + 1);        
-        var review = review_counts['revision_' + revision];
-        var td = $('<td/>',{
-            'class':'progress'
-        });
-        td.html(review.progress);
-        $(this.parentNode.parentNode).append(td);
-    });
-    }
-//add function $.down
-if(! $.fn.down)
-(function($) {
-    $.fn.down = function() {
-        var el = this[0] && this[0].firstChild;
-        while (el && el.nodeType != 1)
-            el = el.nextSibling;
-        return $(el);
-    };
-})(jQuery);
-
-function UpdateRevisionView() {
-    $('li.change').each(function(){
-        var li = $(this);
-        if (li.hasClass('folder')) return;
-
-        var a = li.down('a');
-        if (a.size() == 0) return;
-        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
-
-        var reviewlist = code_reviews_map[path];
-        if (reviewlist == null) return;
-
-        var ul = $('<ul></ul>');
-        for (var j = 0; j < reviewlist.length; j++) {
-            var review = reviewlist[j];
-            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
-            var item = $('<li></li>', {
-                'class': 'icon ' + icon + ' code_review_summary'
-                });
-            item.html(review.url);
-            ul.append(item);
-        }
-        li.append(ul);
-    });
-}
-
-function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
-    var filetables = [];
-    var j = 0;
-    $('table').each(function(){
-        if($(this).hasClass('filecontent')){
-            filetables[j++] = this;
-        }
-    });
-    j = 0;
-    $('table.filecontent th.filename').each(function(){
-        filenames[j] = $.trim($(this).text());
-        j++;
-    });
-    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
-        '&rev=' + rev + '&rev_to=' + rev_to +
-        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
-    if (path != null && path.length > 0) {
-        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
-    }
-    var num = 0;
-    if (is_diff) {
-        num = 1;
-    }
-    var i, l, tl;
-    for (i = 0, tl = filetables.length; i < tl; i++) {
-        var table = filetables[i];
-        var trs = table.getElementsByTagName('tr');
-
-        for (j = 0,l = trs.length; j < l; j++) {
-            var tr = trs[j];
-            var ths = tr.getElementsByTagName('th');
-
-            var th = ths[num];
-            if (th == null) {
-                continue;
-            }
-
-            var th_html = th.innerHTML;
-
-            var line = th_html.match(/[0-9]+/);
-            if (line == null) {
-                continue;
-            }
-
-            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
-
-            if (!is_readonly) {
-                span_html += image_tag;
-            }
-            span_html += '</span>';
-            th.innerHTML = th_html + span_html;
-
-            var img = th.getElementsByTagName('img')[0];
-            if (img != null ) {
-                img.id = 'add_revew_img_' + line + '_' + i;
-                $(img).click(clickPencil);
-            }
-        }
-    }
-
-
-}
-
-function clickPencil(e)
-{
-//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
-    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
-    var line = result[1];
-    var file_count = eval(result[2]);
-    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
-
-    if (path == null || path.length == 0) {
-        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
-    }
-    addReview(url);
-    formPopup(e.pageX, e.pageY);
-    e.preventDefault();
-}
-var addReviewUrl = null;
-var showReviewUrl = null;
-var showReviewImageTag = null;
-var showClosedReviewImageTag = null;
-
-function setShowReviewButton(line, review_id, is_closed, file_count) {
-    //alert('file_count = ' + file_count);
-    var span = $('#review_span_' + line + '_' + file_count);
-    if (span.size() == 0) {
-        return;
-    }
-    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
-    span.append(innerSpan);
-    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
-    var div = $('<div></div>', {
-        'class':'draggable',
-        id: 'show_review_' + review_id
-    });
-    $('#code_review').append(div);
-    innerSpan.down('img').click(function(e) {
-        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
-        var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
-    });
-}
-
-function popupReview(review_id) {
-    var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-    $('html,body').animate({ scrollTop: pos.top },
-        {duration: 'fast',
-        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
-    // position and show popup dialog
-    // create popup dialog
-    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
-//    win.toFront();
-}
-
-function showReview(url, review_id, x, y) {
-    if (code_reviews_dialog_map[review_id] != null) {
-        var cur_win = code_reviews_dialog_map[review_id];
-        cur_win.hide();
-        code_reviews_dialog_map[review_id] = null;
-    }
-    $('#show_review_' + review_id).load(url, {review_id: review_id});
-    var review = getReviewObjById(review_id);
-
-    var win = $('#show_review_' + review_id).dialog({
-        show: {effect:'scale'},// ? 'top-left'
-        //position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: review_dialog_title
-    });
-//    win.getContent().style.color = "#484848";
-//    win.getContent().style.background = "#ffffff";
-    topZindex++;
-    code_reviews_dialog_map[review_id] = win;
-    return win
-}
-
-function getReviewObjById(review_id) {
-    for (var reviewlist in code_reviews_map) {
-        for (var i = 0; i < reviewlist.length; i++) {
-            var review = reviewlist[i];
-            if (review.id == review_id) {
-                return review;
-            }
-        }
-    }
-    return null;
-}
-
-function formPopup(x, y){
-    //@see http://docs.jquery.com/UI/Effects/Scale
-    var win = $('#review-form-frame').dialog({
-        show: {effect:'scale', direction: 'both'},// ? 'top-left'
-//        position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: add_form_title
-    });
-//    win.getContent().style.background = "#ffffff";
-    if (review_form_dialog != null) {
-        review_form_dialog.destroy();
-        review_form_dialog = null;
-    }
-    review_form_dialog = win;
-    topZindex += 10;
-    return false;
-}
-
-function hideForm() {
-    if (review_form_dialog == null) {
-        return;
-    }
-    review_form_dialog.dialog('close');
-    review_form_dialog = null;
-    $('#review-form').html('');
-}
-function addReview(url) {
-    $('#review-form').load(url);
-}
-
-function deleteReview(review_id) {
-    $('show_review_' + review_id).remove();
-    $('review_' + review_id).remove();
-    
-}
-
-function changeImage(review_id, is_closed) {
-    var span = $('review_' + review_id);
-    var new_image = null;
-    var dummy = new Element('span');
-    if (is_closed) {
-        dummy.insert(showClosedReviewImageTag);
-    }
-    else {
-        dummy.insert(showReviewImageTag);
-    }
-    new_image = dummy.down().getAttribute('src');
-    //alert(new_image);
-    span.down('img').setAttribute('src', new_image);
-
-}
-
-function make_addreview_link(project, link) {
-    var alist = $('#content p a');
-    if (alist == null) {
-        return;
-    }
-    var a = alist[0];
-    var p = a.parentNode;
-    p.innerHTML = p.innerHTML + " | " + link;
-}
-
-function call_update_revisions(url) {
-    var changeset_ids = '';
-    var links = $$('table.changesets tbody tr.changeset td.id a');
-    for (var i = 0; i < links.length; i++) {
-        var link = links[i];
-        var href = link.getAttribute('href');
-        var id = href.replace(/^.*\/revisions\//, '');
-        if (i > 0) {
-            changeset_ids += ',';
-        }
-        changeset_ids += id;
-    }
-    new Ajax.Updater('code_review_revisions', url,
-    {
-        evalScripts:true,
-        method:'get',
-        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
-    });
-}
-
-$.fn.serialize2json = function()
-{
-   var o = {};
-   var a = this.serializeArray();
-   $.each(a, function() {
-       if (o[this.name]) {
-           if (!o[this.name].push) {
-               o[this.name] = [o[this.name]];
-           }
-           o[this.name].push(this.value || '');
-       } else {
-           o[this.name] = this.value || '';
-       }
-   });
-   return o;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009-2013  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+var topZindex = 1000;
+var action_type = '';
+var rev = '';
+var rev_to = '';
+var path = '';
+var urlprefix = '';
+var review_form_dialog = null;
+var add_form_title = null;
+var review_dialog_title = null;
+var repository_id = null;
+var filenames = [];
+
+var ReviewCount = function(total, open, progress){
+    this.total = total;
+    this.open = open;
+    this.closed = total - open;
+    this.progress = progress
+};
+
+var CodeReview = function(id) {
+    this.id = id;
+    this.path = '';
+    this.line = 0;
+    this.url = '';
+    this.is_closed = false;
+};
+
+var review_counts = new Array();
+var code_reviews_map = new Array();
+var code_reviews_dialog_map = new Array();
+
+function UpdateRepositoryView(title) {
+    var header = $("table.changesets thead tr:first");
+    var th = $('<th></th>');
+    th.html(title);
+    header.append(th);
+    $('tr.changeset td.id a').each(function(i){
+        var revision = this.getAttribute("href");
+        revision = revision.substr(revision.lastIndexOf("/") + 1);        
+        var review = review_counts['revision_' + revision];
+        var td = $('<td/>',{
+            'class':'progress'
+        });
+        td.html(review.progress);
+        $(this.parentNode.parentNode).append(td);
+    });
+    }
+//add function $.down
+if(! $.fn.down)
+(function($) {
+    $.fn.down = function() {
+        var el = this[0] && this[0].firstChild;
+        while (el && el.nodeType != 1)
+            el = el.nextSibling;
+        return $(el);
+    };
+})(jQuery);
+
+function UpdateRevisionView() {
+    $('li.change').each(function(){
+        var li = $(this);
+        if (li.hasClass('folder')) return;
+
+        var a = li.down('a');
+        if (a.size() == 0) return;
+        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
+
+        var reviewlist = code_reviews_map[path];
+        if (reviewlist == null) return;
+
+        var ul = $('<ul></ul>');
+        for (var j = 0; j < reviewlist.length; j++) {
+            var review = reviewlist[j];
+            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
+            var item = $('<li></li>', {
+                'class': 'icon ' + icon + ' code_review_summary'
+                });
+            item.html(review.url);
+            ul.append(item);
+        }
+        li.append(ul);
+    });
+}
+
+function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
+    var filetables = [];
+    var j = 0;
+    $('table').each(function(){
+        if($(this).hasClass('filecontent')){
+            filetables[j++] = this;
+        }
+    });
+    j = 0;
+    $('table.filecontent th.filename').each(function(){
+        filenames[j] = $.trim($(this).text());
+        j++;
+    });
+    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
+        '&rev=' + rev + '&rev_to=' + rev_to +
+        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
+    if (path != null && path.length > 0) {
+        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
+    }
+    var num = 0;
+    if (is_diff) {
+        num = 1;
+    }
+    var i, l, tl;
+    for (i = 0, tl = filetables.length; i < tl; i++) {
+        var table = filetables[i];
+        var trs = table.getElementsByTagName('tr');
+
+        for (j = 0,l = trs.length; j < l; j++) {
+            var tr = trs[j];
+            var ths = tr.getElementsByTagName('th');
+
+            var th = ths[num];
+            if (th == null) {
+                continue;
+            }
+
+            var th_html = th.innerHTML;
+
+            var line = th_html.match(/[0-9]+/);
+            if (line == null) {
+                continue;
+            }
+
+            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
+
+            if (!is_readonly) {
+                span_html += image_tag;
+            }
+            span_html += '</span>';
+            th.innerHTML = th_html + span_html;
+
+            var img = th.getElementsByTagName('img')[0];
+            if (img != null ) {
+                img.id = 'add_revew_img_' + line + '_' + i;
+                $(img).click(clickPencil);
+            }
+        }
+    }
+
+
+}
+
+function clickPencil(e)
+{
+//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
+    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
+    var line = result[1];
+    var file_count = eval(result[2]);
+    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
+
+    if (path == null || path.length == 0) {
+        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
+    }
+    addReview(url);
+    formPopup(e.pageX, e.pageY);
+    e.preventDefault();
+}
+var addReviewUrl = null;
+var showReviewUrl = null;
+var showReviewImageTag = null;
+var showClosedReviewImageTag = null;
+
+function setShowReviewButton(line, review_id, is_closed, file_count) {
+    //alert('file_count = ' + file_count);
+    var span = $('#review_span_' + line + '_' + file_count);
+    if (span.size() == 0) {
+        return;
+    }
+    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
+    span.append(innerSpan);
+    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
+    var div = $('<div></div>', {
+        'class':'draggable',
+        id: 'show_review_' + review_id
+    });
+    $('#code_review').append(div);
+    innerSpan.down('img').click(function(e) {
+        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
+        var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
+    });
+}
+
+function popupReview(review_id) {
+    var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+    $('html,body').animate({ scrollTop: pos.top },
+        {duration: 'fast',
+        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
+    // position and show popup dialog
+    // create popup dialog
+    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
+//    win.toFront();
+}
+
+function showReview(url, review_id, x, y) {
+    if (code_reviews_dialog_map[review_id] != null) {
+        var cur_win = code_reviews_dialog_map[review_id];
+        cur_win.hide();
+        code_reviews_dialog_map[review_id] = null;
+    }
+    $('#show_review_' + review_id).load(url, {review_id: review_id});
+    var review = getReviewObjById(review_id);
+
+    var win = $('#show_review_' + review_id).dialog({
+        show: {effect:'scale'},// ? 'top-left'
+        //position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: review_dialog_title
+    });
+//    win.getContent().style.color = "#484848";
+//    win.getContent().style.background = "#ffffff";
+    topZindex++;
+    code_reviews_dialog_map[review_id] = win;
+    return win
+}
+
+function getReviewObjById(review_id) {
+    for (var reviewlist in code_reviews_map) {
+        for (var i = 0; i < reviewlist.length; i++) {
+            var review = reviewlist[i];
+            if (review.id == review_id) {
+                return review;
+            }
+        }
+    }
+    return null;
+}
+
+function formPopup(x, y){
+    //@see http://docs.jquery.com/UI/Effects/Scale
+    var win = $('#review-form-frame').dialog({
+        show: {effect:'scale', direction: 'both'},// ? 'top-left'
+//        position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: add_form_title
+    });
+//    win.getContent().style.background = "#ffffff";
+    if (review_form_dialog != null) {
+        review_form_dialog.destroy();
+        review_form_dialog = null;
+    }
+    review_form_dialog = win;
+    topZindex += 10;
+    return false;
+}
+
+function hideForm() {
+    if (review_form_dialog == null) {
+        return;
+    }
+    review_form_dialog.dialog('close');
+    review_form_dialog = null;
+    $('#review-form').html('');
+}
+function addReview(url) {
+    $('#review-form').load(url);
+}
+
+function deleteReview(review_id) {
+    $('show_review_' + review_id).remove();
+    $('review_' + review_id).remove();
+    
+}
+
+function changeImage(review_id, is_closed) {
+    var span = $('review_' + review_id);
+    var new_image = null;
+    var dummy = new Element('span');
+    if (is_closed) {
+        dummy.insert(showClosedReviewImageTag);
+    }
+    else {
+        dummy.insert(showReviewImageTag);
+    }
+    new_image = dummy.down().getAttribute('src');
+    //alert(new_image);
+    span.down('img').setAttribute('src', new_image);
+
+}
+
+function make_addreview_link(project, link) {
+    var alist = $('#content p a');
+    if (alist == null) {
+        return;
+    }
+    var a = alist[0];
+    var p = a.parentNode;
+    p.innerHTML = p.innerHTML + " | " + link;
+}
+
+function call_update_revisions(url) {
+    var changeset_ids = '';
+    var links = $$('table.changesets tbody tr.changeset td.id a');
+    for (var i = 0; i < links.length; i++) {
+        var link = links[i];
+        var href = link.getAttribute('href');
+        var id = href.replace(/^.*\/revisions\//, '');
+        if (i > 0) {
+            changeset_ids += ',';
+        }
+        changeset_ids += id;
+    }
+    new Ajax.Updater('code_review_revisions', url,
+    {
+        evalScripts:true,
+        method:'get',
+        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
+    });
+}
+
+$.fn.serialize2json = function()
+{
+   var o = {};
+   var a = this.serializeArray();
+   $.each(a, function() {
+       if (o[this.name]) {
+           if (!o[this.name].push) {
+               o[this.name] = [o[this.name]];
+           }
+           o[this.name].push(this.value || '');
+       } else {
+           o[this.name] = this.value || '';
+       }
+   });
+   return o;
 };
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/activity.css b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
index e3cdc3d55..202ed54e3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/activity.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
@@ -1,4 +1,4 @@
-
-dt.code_review {
-    background-image: url(../images/review.png);
+
+dt.code_review {
+    background-image: url(../images/review.png);
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
index 11939ae79..e25dc6d72 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
@@ -1,97 +1,97 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-#review-form-frame {
-height: 100%;
-}
-
-.autoscroll table.filecontent th.line-num {
-    white-space: nowrap;
-    vertical-align: bottom;
-    padding-top: 0;
-    padding-bottom: 0;
-    text-align:left;
-}
-
-table.filecontent th.line-num img{
-    padding: 0;
-    margin: 0;
-    cursor: pointer;
-}
-
-
-.code-review-form-title {
-    background-color: #002059;
-    color: white;
-    padding-left: 2px;
-    padding-right: 2px;
-    cursor: default;
-}
-
-
-.code_review_viewer {
-
-    min-width: 300px;
-    /*
-    max-width: 60%;
-    */
-    /* max-height: 400px; */
-}
-
-.code_review_viewer .issue{
-    
-}
-
-.code_review_body {
-    background-color: white;
-    
-    padding:2px;
-    
-}
-
-#code_review_list table.list td {
-    text-align: center;
-}
-
-#code_review_list table.list td.path {
-    text-align: left;
-}
-
-#code_review_list table.list td.subject {
-    text-align: left;
-}
-
-.icon-review {
-    background-image: url(../images/review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-closed-review {
-    background-image: url(../images/closed_review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-settings {
-    background-image: url(../../../images/changeset.png);
-    background-repeat: no-repeat;
-}
-
-
-li.code_review_summary {
-    list-style-type: none;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#review-form-frame {
+height: 100%;
+}
+
+.autoscroll table.filecontent th.line-num {
+    white-space: nowrap;
+    vertical-align: bottom;
+    padding-top: 0;
+    padding-bottom: 0;
+    text-align:left;
+}
+
+table.filecontent th.line-num img{
+    padding: 0;
+    margin: 0;
+    cursor: pointer;
+}
+
+
+.code-review-form-title {
+    background-color: #002059;
+    color: white;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: default;
+}
+
+
+.code_review_viewer {
+
+    min-width: 300px;
+    /*
+    max-width: 60%;
+    */
+    /* max-height: 400px; */
+}
+
+.code_review_viewer .issue{
+    
+}
+
+.code_review_body {
+    background-color: white;
+    
+    padding:2px;
+    
+}
+
+#code_review_list table.list td {
+    text-align: center;
+}
+
+#code_review_list table.list td.path {
+    text-align: left;
+}
+
+#code_review_list table.list td.subject {
+    text-align: left;
+}
+
+.icon-review {
+    background-image: url(../images/review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-closed-review {
+    background-image: url(../images/closed_review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-settings {
+    background-image: url(../../../images/changeset.png);
+    background-repeat: no-repeat;
+}
+
+
+li.code_review_summary {
+    list-style-type: none;
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
index 5bcdad1bd..0a7cf9ad1 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
@@ -1,19 +1,19 @@
-Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
index 432d14e36..4846e6185 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
@@ -1,119 +1,119 @@
-.overlay_alert {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_nw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
-}
-
-.alert_n {
-	height: 5px;
-	background: transparent url(alert/top.gif) repeat-x bottom left;			
-}
-
-.alert_ne {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_right.gif) no-repeat bottom left			
-}
-
-.alert_e {
-	width: 5px;
-	background: transparent url(alert/right.gif) repeat-y 0 0;			
-}
-
-.alert_w {
-	width: 5px;
-	background: transparent url(alert/left.gif) repeat-y 0 0;			
-}
-
-.alert_sw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
-}
-
-.alert_s {
-	height: 5px;
-	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
-}
-
-.alert_se, .alert_sizer {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
-}
-
-.alert_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_title {
-	float:left;
-	height:1px;
-	width:100%;
-}
-
-.alert_content {
-	overflow:visible;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background: #FFF;
-}
-
-/* For alert/confirm dialog */
-.alert_window {
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_message {
-  font: 12px arial;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-
+.overlay_alert {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_nw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
+}
+
+.alert_n {
+	height: 5px;
+	background: transparent url(alert/top.gif) repeat-x bottom left;			
+}
+
+.alert_ne {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_right.gif) no-repeat bottom left			
+}
+
+.alert_e {
+	width: 5px;
+	background: transparent url(alert/right.gif) repeat-y 0 0;			
+}
+
+.alert_w {
+	width: 5px;
+	background: transparent url(alert/left.gif) repeat-y 0 0;			
+}
+
+.alert_sw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
+}
+
+.alert_s {
+	height: 5px;
+	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
+}
+
+.alert_se, .alert_sizer {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
+}
+
+.alert_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_title {
+	float:left;
+	height:1px;
+	width:100%;
+}
+
+.alert_content {
+	overflow:visible;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background: #FFF;
+}
+
+/* For alert/confirm dialog */
+.alert_window {
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_message {
+  font: 12px arial;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
index c2ad538ca..a74fc71c3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
@@ -1,88 +1,88 @@
-.overlay_alert_lite {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_lite_sizer {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_title {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: #FFF;
-}
-
-
-/* For alert/confirm dialog */
-.alert_lite_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_lite_message {
-	font-size:16px;
-	text-align:center;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_lite_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_lite_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_lite_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-table.alert_lite_header  {
-  border:1px solid #F00;
-  background:#FFF
-}
-
+.overlay_alert_lite {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_lite_sizer {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_title {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: #FFF;
+}
+
+
+/* For alert/confirm dialog */
+.alert_lite_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_lite_message {
+	font-size:16px;
+	text-align:center;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_lite_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_lite_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_lite_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+table.alert_lite_header  {
+  border:1px solid #F00;
+  background:#FFF
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
index 7d2790e75..6d2862c0e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
@@ -1,150 +1,150 @@
-.overlay_alphacube {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alphacube_nw {
-	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.alphacube_n {
-  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.alphacube_ne {
-  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.alphacube_w {
-  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.alphacube_e {
-  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.alphacube_sw {
-  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_s {
-  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.alphacube_se, .alphacube_sizer  {
-  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_sizer {
-	cursor:se-resize;	
-}
-
-.alphacube_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#123456;
-}
-
-.alphacube_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background:#FDFDFD;
-}
-
-/* For alert/confirm dialog */
-.alphacube_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alphacube_message {
-  font: 12px arial;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.alphacube_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alphacube_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alphacube_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-.alphacube_wired_frame {
-	background: #FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;	
-}
-
-
+.overlay_alphacube {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alphacube_nw {
+	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.alphacube_n {
+  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.alphacube_ne {
+  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.alphacube_w {
+  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.alphacube_e {
+  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.alphacube_sw {
+  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_s {
+  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.alphacube_se, .alphacube_sizer  {
+  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_sizer {
+	cursor:se-resize;	
+}
+
+.alphacube_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#123456;
+}
+
+.alphacube_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background:#FDFDFD;
+}
+
+/* For alert/confirm dialog */
+.alphacube_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alphacube_message {
+  font: 12px arial;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.alphacube_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alphacube_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alphacube_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+.alphacube_wired_frame {
+	background: #FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;	
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
index 437c5ec92..e5c6edc1c 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
@@ -1,51 +1,51 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="propertyChanged()" />
-<script>
-
-var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
-var realSrc;
-var blankSrc = "blank.gif";
-
-if (supported) fixImage();
-
-function propertyChanged() {
-   if (!supported) return;
-
-   var pName = event.propertyName;
-   if (pName != "src") return;
-   // if not set to blank
-   if ( ! new RegExp(blankSrc).test(src))
-      fixImage();
-};
-
-function fixImage() {
-   // get src
-   var src = element.src;
-
-   // check for real change
-   if (src == realSrc) {
-      element.src = blankSrc;
-      return;
-   }
-
-   if ( ! new RegExp(blankSrc).test(src)) {
-      // backup old src
-      realSrc = src;
-   }
-
-   // test for png
-   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
-      // set blank image
-      element.src = blankSrc;
-      // set filter
-      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
-                                     src + "',sizingMethod='scale')";
-   }
-   else {
-      // remove filter
-      element.runtimeStyle.filter = "";
-   }
-}
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="propertyChanged()" />
+<script>
+
+var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
+var realSrc;
+var blankSrc = "blank.gif";
+
+if (supported) fixImage();
+
+function propertyChanged() {
+   if (!supported) return;
+
+   var pName = event.propertyName;
+   if (pName != "src") return;
+   // if not set to blank
+   if ( ! new RegExp(blankSrc).test(src))
+      fixImage();
+};
+
+function fixImage() {
+   // get src
+   var src = element.src;
+
+   // check for real change
+   if (src == realSrc) {
+      element.src = blankSrc;
+      return;
+   }
+
+   if ( ! new RegExp(blankSrc).test(src)) {
+      // backup old src
+      realSrc = src;
+   }
+
+   // test for png
+   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
+      // set blank image
+      element.src = blankSrc;
+      // set filter
+      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+                                     src + "',sizingMethod='scale')";
+   }
+   else {
+      // remove filter
+      element.runtimeStyle.filter = "";
+   }
+}
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
index 2f83cfd46..e3df3e0a4 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
@@ -1,121 +1,121 @@
-.overlay_darkX {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.darkX_nw {
-	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
-  width:6px;
-  height:21px;
-}
-.darkX_n {
-  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
-  height:21px;
-}
-.darkX_ne {
-  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
-  width:6px;	  
-  height:21px;
-}
-.darkX_w {
-  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
-  width:3px;
-}
-
-.darkX_e {
-  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
-  width:3px;	  
-}
-
-.darkX_sw {
-  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-.darkX_s {
-  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
-  height:3px;
-}
-.darkX_se, .darkX_sizer {
-  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-
-.darkX_sizer {
-	cursor:se-resize;	
-}
-
-.darkX_close {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:5px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_minimize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:26px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_maximize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:47px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-
-.darkX_title {
-	float:left;
-	height:14px;
-	font-size:12px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#FFF;
-}
-
-.darkX_content {
-	overflow:auto;
-	color: #E6DF2A;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 14px;
-	background:#5E5148;
-}
-
-
-/* FOR IE */
-* html .darkX_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
-}
-
-* html .darkX_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
-}
-
-* html .darkX_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
-}
+.overlay_darkX {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.darkX_nw {
+	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
+  width:6px;
+  height:21px;
+}
+.darkX_n {
+  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
+  height:21px;
+}
+.darkX_ne {
+  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
+  width:6px;	  
+  height:21px;
+}
+.darkX_w {
+  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
+  width:3px;
+}
+
+.darkX_e {
+  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
+  width:3px;	  
+}
+
+.darkX_sw {
+  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+.darkX_s {
+  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
+  height:3px;
+}
+.darkX_se, .darkX_sizer {
+  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+
+.darkX_sizer {
+	cursor:se-resize;	
+}
+
+.darkX_close {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:5px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_minimize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:26px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_maximize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:47px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+
+.darkX_title {
+	float:left;
+	height:14px;
+	font-size:12px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#FFF;
+}
+
+.darkX_content {
+	overflow:auto;
+	color: #E6DF2A;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 14px;
+	background:#5E5148;
+}
+
+
+/* FOR IE */
+* html .darkX_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
+}
+
+* html .darkX_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
+}
+
+* html .darkX_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
+}
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
index 69e3b7fc2..d7981e9ca 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
@@ -1,25 +1,25 @@
-div.inspector div.inspectable {
- padding: 0.25em 0 0.25em 1em;
- background-color: Gray;
- color: white;
- border: outset 2px white;
- cursor: pointer;
-}
- 
-div.inspector div.child {
- margin: 0 0 0 1em;
-}
- 
-#debug_window_content { /*  DIV container for debug sizing*/
- width:250px;
- height:100px;
- background-color:#000;
-}
- 
-#debug {         /*  DIV container for debug contents*/
- padding:3px;
- color:#0f0;
- font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
- font-size:10px;
-}
- 
+div.inspector div.inspectable {
+ padding: 0.25em 0 0.25em 1em;
+ background-color: Gray;
+ color: white;
+ border: outset 2px white;
+ cursor: pointer;
+}
+ 
+div.inspector div.child {
+ margin: 0 0 0 1em;
+}
+ 
+#debug_window_content { /*  DIV container for debug sizing*/
+ width:250px;
+ height:100px;
+ background-color:#000;
+}
+ 
+#debug {         /*  DIV container for debug contents*/
+ padding:3px;
+ color:#0f0;
+ font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
+ font-size:10px;
+}
+ 
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
index 6ab13789d..591451723 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
@@ -1,155 +1,155 @@
-.overlay_dialog {
-	background-color: #666666;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.overlay___invisible__ {
-  background-color: #666666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.dialog_nw {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_left.gif) no-repeat 0 0;		
-}
-
-.dialog_n {
-	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
-	height: 23px;
-}
-
-.dialog_ne {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_right.gif) no-repeat 0 0;		
-}
-
-.dialog_e {
-	width: 2px;
-	background: transparent url(default/center_right.gif) repeat-y 0 0;	
-}
-
-.dialog_w {
-	width: 2px;
-	background: transparent url(default/center_left.gif) repeat-y 0 0;		
-}
-
-.dialog_sw {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
-}
-
-.dialog_s {
-	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
-	height: 19px;
-}
-
-.dialog_se {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
-}
-
-.dialog_sizer {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/sizer.gif) no-repeat 0 0;	
-	cursor:se-resize;	
-}
-
-.dialog_close {
-	width: 14px;
-	height: 14px;
-	background: transparent url(default/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:8px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_minimize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:28px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_maximize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:49px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	width:100%;
-	color:#000;
-}
-
-.dialog_content {
-	overflow:auto;
-	color: #DDD;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background-color:#123;
-}
-
-.top_draggable, .bottom_draggable {
-  cursor:move;
-}
-
-.status_bar {
-  font-size:12px;
-}
-.status_bar input{
-  font-size:12px;
-}
-
-.wired_frame {
-	display: block;
-  position: absolute;
-  border: 1px #000 dashed;
-}
-
-/* DO NOT CHANGE THESE VALUES*/
-.dialog {
-	display: block;
-	position: absolute;
-}
-
-.dialog table.table_window  { 
-  border-collapse: collapse; 
-  border-spacing: 0; 
-  width: 100%;
-	margin: 0px;
-	padding:0px;
-}
-
-.dialog table.table_window td , .dialog table.table_window th { 
-  padding: 0; 
-}
-
-.dialog .title_window {
-  -moz-user-select:none;
-}                                                    
-
+.overlay_dialog {
+	background-color: #666666;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.overlay___invisible__ {
+  background-color: #666666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.dialog_nw {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_left.gif) no-repeat 0 0;		
+}
+
+.dialog_n {
+	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
+	height: 23px;
+}
+
+.dialog_ne {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_right.gif) no-repeat 0 0;		
+}
+
+.dialog_e {
+	width: 2px;
+	background: transparent url(default/center_right.gif) repeat-y 0 0;	
+}
+
+.dialog_w {
+	width: 2px;
+	background: transparent url(default/center_left.gif) repeat-y 0 0;		
+}
+
+.dialog_sw {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
+}
+
+.dialog_s {
+	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
+	height: 19px;
+}
+
+.dialog_se {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
+}
+
+.dialog_sizer {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/sizer.gif) no-repeat 0 0;	
+	cursor:se-resize;	
+}
+
+.dialog_close {
+	width: 14px;
+	height: 14px;
+	background: transparent url(default/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:8px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_minimize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:28px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_maximize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:49px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	width:100%;
+	color:#000;
+}
+
+.dialog_content {
+	overflow:auto;
+	color: #DDD;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background-color:#123;
+}
+
+.top_draggable, .bottom_draggable {
+  cursor:move;
+}
+
+.status_bar {
+  font-size:12px;
+}
+.status_bar input{
+  font-size:12px;
+}
+
+.wired_frame {
+	display: block;
+  position: absolute;
+  border: 1px #000 dashed;
+}
+
+/* DO NOT CHANGE THESE VALUES*/
+.dialog {
+	display: block;
+	position: absolute;
+}
+
+.dialog table.table_window  { 
+  border-collapse: collapse; 
+  border-spacing: 0; 
+  width: 100%;
+	margin: 0px;
+	padding:0px;
+}
+
+.dialog table.table_window td , .dialog table.table_window th { 
+  padding: 0; 
+}
+
+.dialog .title_window {
+  -moz-user-select:none;
+}                                                    
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
index 257a1b1e3..249388be5 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
@@ -1,3 +1,3 @@
-/* PNG fix for all themes that uses PNG images on IE */
-td, div { behavior: url(../themes/iefix/iepngfix.htc) }
-
+/* PNG fix for all themes that uses PNG images on IE */
+td, div { behavior: url(../themes/iefix/iepngfix.htc) }
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
index a6c683b9f..9a13f32bf 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
@@ -1,54 +1,54 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
-// To work only on background and to handle repeat bg  
-                     
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{         
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
- var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
- if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
-  }
- }
-}
-
-doFix();
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
+// To work only on background and to handle repeat bg  
+                     
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{         
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
+ var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
+ if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
+  }
+ }
+}
+
+doFix();
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
index 95ec287a9..0d955c3d7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
@@ -1,960 +1,960 @@
-.overlay___invisible__ {
-  background-color: #666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.top_draggable, .bottom_draggable {
-	cursor:move;
-}
-
-.status_bar {
-	font-size:12px;
-}
-.status_bar input{
-	font-size:12px;
-}
-
-.wired_frame {
-	display:block;
-	position:absolute;
-	border:1px #000 dashed;
-}
-
-
-
-.overlay_bluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.bluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.bluelighting_nw {
-	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.bluelighting_n {
-	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.bluelighting_ne {
-	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.bluelighting_w {
-	background:transparent url(lighting/left-blue.png) repeat-y top left;			
-	width:9px;
-}
-
-.bluelighting_e {
-	background:transparent url(lighting/right-blue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.bluelighting_sw {
-	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.bluelighting_s {
-	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.bluelighting_se, .bluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.bluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.bluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#17385B;
-}
-
-.bluelighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#BFDBFF;
-}
-
-/* For alert/confirm dialog */
-.bluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.bluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.bluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.bluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.bluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .bluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_se, * html .bluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_content {
-	background:#B8D7FF;
-}
-
-
-
-.overlay_greylighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greylighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greylighting_nw {
-	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greylighting_n {
-	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greylighting_ne {
-	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greylighting_w {
-	background:transparent url(lighting/left-grey.png) repeat-y top left;			
-	width:9px;
-}
-
-.greylighting_e {
-	background:transparent url(lighting/right-grey.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greylighting_sw {
-	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greylighting_s {
-	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greylighting_se, .greylighting_sizer  {
-	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greylighting_sizer {
-	cursor:se-resize;	
-}
-
-.greylighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#525252;
-}
-
-.greylighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#CDCDCD;
-}
-
-/* For alert/confirm dialog */
-.greylighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greylighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greylighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greylighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greylighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greylighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
-}
-
-* html greylighting_se, * html .greylighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_content {
-	background:#C7C7C7;
-}
-
-
-
-.overlay_greenlighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greenlighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greenlighting_nw {
-	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greenlighting_n {
-	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greenlighting_ne {
-	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greenlighting_w {
-	background:transparent url(lighting/left-green.png) repeat-y top left;			
-	width:9px;
-}
-
-.greenlighting_e {
-	background:transparent url(lighting/right-green.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greenlighting_sw {
-	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greenlighting_s {
-	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greenlighting_se, .greenlighting_sizer  {
-	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greenlighting_sizer {
-	cursor:se-resize;	
-}
-
-.greenlighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#2A6002;
-}
-
-.greenlighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#ACFCAF;
-}
-
-/* For alert/confirm dialog */
-.greenlighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greenlighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greenlighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greenlighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greenlighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greenlighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
-}
-
-* html greenlighting_se, * html .greenlighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_content {
-	background:#A4FCA7;
-}
-
-
-
-.overlay_darkbluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.darkbluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.darkbluelighting_nw {
-	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.darkbluelighting_n {
-	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.darkbluelighting_ne {
-	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.darkbluelighting_w {
-	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
-	width:9px;
-}
-
-.darkbluelighting_e {
-	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.darkbluelighting_sw {
-	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.darkbluelighting_s {
-	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.darkbluelighting_se, .darkbluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.darkbluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.darkbluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#E4EFFD;
-}
-
-.darkbluelighting_content {
-	overflow:auto;
-	color:#FFF;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#0413C0;
-}
-
-/* For alert/confirm dialog */
-.darkbluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.darkbluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.darkbluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.darkbluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.darkbluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .darkbluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html darkbluelighting_se, * html .darkbluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_content {
-	background:#020EBA;
-}
-
+.overlay___invisible__ {
+  background-color: #666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.top_draggable, .bottom_draggable {
+	cursor:move;
+}
+
+.status_bar {
+	font-size:12px;
+}
+.status_bar input{
+	font-size:12px;
+}
+
+.wired_frame {
+	display:block;
+	position:absolute;
+	border:1px #000 dashed;
+}
+
+
+
+.overlay_bluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.bluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.bluelighting_nw {
+	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.bluelighting_n {
+	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.bluelighting_ne {
+	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.bluelighting_w {
+	background:transparent url(lighting/left-blue.png) repeat-y top left;			
+	width:9px;
+}
+
+.bluelighting_e {
+	background:transparent url(lighting/right-blue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.bluelighting_sw {
+	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.bluelighting_s {
+	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.bluelighting_se, .bluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.bluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.bluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#17385B;
+}
+
+.bluelighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#BFDBFF;
+}
+
+/* For alert/confirm dialog */
+.bluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.bluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.bluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.bluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.bluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .bluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_se, * html .bluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_content {
+	background:#B8D7FF;
+}
+
+
+
+.overlay_greylighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greylighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greylighting_nw {
+	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greylighting_n {
+	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greylighting_ne {
+	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greylighting_w {
+	background:transparent url(lighting/left-grey.png) repeat-y top left;			
+	width:9px;
+}
+
+.greylighting_e {
+	background:transparent url(lighting/right-grey.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greylighting_sw {
+	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greylighting_s {
+	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greylighting_se, .greylighting_sizer  {
+	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greylighting_sizer {
+	cursor:se-resize;	
+}
+
+.greylighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#525252;
+}
+
+.greylighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#CDCDCD;
+}
+
+/* For alert/confirm dialog */
+.greylighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greylighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greylighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greylighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greylighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greylighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
+}
+
+* html greylighting_se, * html .greylighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_content {
+	background:#C7C7C7;
+}
+
+
+
+.overlay_greenlighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greenlighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greenlighting_nw {
+	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greenlighting_n {
+	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greenlighting_ne {
+	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greenlighting_w {
+	background:transparent url(lighting/left-green.png) repeat-y top left;			
+	width:9px;
+}
+
+.greenlighting_e {
+	background:transparent url(lighting/right-green.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greenlighting_sw {
+	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greenlighting_s {
+	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greenlighting_se, .greenlighting_sizer  {
+	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greenlighting_sizer {
+	cursor:se-resize;	
+}
+
+.greenlighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#2A6002;
+}
+
+.greenlighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#ACFCAF;
+}
+
+/* For alert/confirm dialog */
+.greenlighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greenlighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greenlighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greenlighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greenlighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greenlighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
+}
+
+* html greenlighting_se, * html .greenlighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_content {
+	background:#A4FCA7;
+}
+
+
+
+.overlay_darkbluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.darkbluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.darkbluelighting_nw {
+	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.darkbluelighting_n {
+	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.darkbluelighting_ne {
+	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.darkbluelighting_w {
+	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
+	width:9px;
+}
+
+.darkbluelighting_e {
+	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.darkbluelighting_sw {
+	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.darkbluelighting_s {
+	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.darkbluelighting_se, .darkbluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.darkbluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.darkbluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#E4EFFD;
+}
+
+.darkbluelighting_content {
+	overflow:auto;
+	color:#FFF;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#0413C0;
+}
+
+/* For alert/confirm dialog */
+.darkbluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.darkbluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.darkbluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.darkbluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.darkbluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .darkbluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html darkbluelighting_se, * html .darkbluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_content {
+	background:#020EBA;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
index 36ea182e7..92248c665 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
@@ -1,67 +1,67 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{           
-  alert('ok')
-  
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;
-
- if (tagName == 'IMG')
- {
-  if ((/\.png$/i).test(src))
-  {
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   filt(src, 'scale');
-   src = blankImg;
-  }
-  else if (src.indexOf(blankImg) < 0) filt();
- }
- else if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, 'crop');
-   // IE link fix.
-   for (var n = 0; n < childNodes.length; n++)
-    if (childNodes[n].style) childNodes[n].style.position = 'relative';
-  }
-  else filt();
- }
-}
-
-doFix();
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{           
+  alert('ok')
+  
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;
+
+ if (tagName == 'IMG')
+ {
+  if ((/\.png$/i).test(src))
+  {
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   filt(src, 'scale');
+   src = blankImg;
+  }
+  else if (src.indexOf(blankImg) < 0) filt();
+ }
+ else if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, 'crop');
+   // IE link fix.
+   for (var n = 0; n < childNodes.length; n++)
+    if (childNodes[n].style) childNodes[n].style.position = 'relative';
+  }
+  else filt();
+ }
+}
+
+doFix();
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
index 24751f868..fdff45d8e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
@@ -1,333 +1,333 @@
-/* Focused windows */
-.overlay_mac_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_nw {
-	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.mac_os_x_n {
-  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.mac_os_x_ne {
-  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.mac_os_x_w {
-  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_e {
-  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_sw {
-  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_s {
-  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_se, .mac_os_x_sizer {
-  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.mac_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .mac_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-
-/* Focused windows */
-.overlay_blur_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.blur_os_x_nw {
-	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.blur_os_x_n {
-  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.blur_os_x_ne {
-  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.blur_os_x_w {
-  background: transparent url(mac_os_x/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.blur_os_x_e {
-  background: transparent url(mac_os_x/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.blur_os_x_sw {
-  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_s {
-  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.blur_os_x_se, .blur_os_x_sizer {
-  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.blur_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.blur_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.blur_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .blur_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
+/* Focused windows */
+.overlay_mac_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_nw {
+	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.mac_os_x_n {
+  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.mac_os_x_ne {
+  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.mac_os_x_w {
+  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_e {
+  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_sw {
+  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_s {
+  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_se, .mac_os_x_sizer {
+  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.mac_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .mac_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+
+/* Focused windows */
+.overlay_blur_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.blur_os_x_nw {
+	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.blur_os_x_n {
+  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.blur_os_x_ne {
+  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.blur_os_x_w {
+  background: transparent url(mac_os_x/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.blur_os_x_e {
+  background: transparent url(mac_os_x/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.blur_os_x_sw {
+  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_s {
+  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.blur_os_x_se, .blur_os_x_sizer {
+  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.blur_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.blur_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.blur_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .blur_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
index e663e3c5e..4c89f602d 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
@@ -1,160 +1,160 @@
-.overlay_mac_os_x_dialog {
-	background-color: #FF7224;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_dialog_nw {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_n {
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-  height:18px;
-}
-
-.mac_os_x_dialog_ne {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_w {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_dialog_e {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_dialog_sw {
-  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_s {
-  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
-  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_dialog_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:6px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_dialog_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-}
-
-.mac_os_x_dialog_buttons {
-  text-align: center;
-}
-/* FOR IE */
-* html .mac_os_x_dialog_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-
-* html .mac_os_x_dialog_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
+.overlay_mac_os_x_dialog {
+	background-color: #FF7224;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_dialog_nw {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_n {
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+  height:18px;
+}
+
+.mac_os_x_dialog_ne {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_w {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_dialog_e {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_dialog_sw {
+  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_s {
+  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
+  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_dialog_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:6px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_dialog_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+}
+
+.mac_os_x_dialog_buttons {
+  text-align: center;
+}
+/* FOR IE */
+* html .mac_os_x_dialog_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+
+* html .mac_os_x_dialog_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
index 2c439bd00..e2700e5b7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
@@ -1,164 +1,164 @@
-.overlay_nuncio img { border: none; }
-
-.overlay_nuncio {
-	background-color: #666666;
-}
-
-.nuncio_nw {
-	width: 12px;
-	height: 28px;
-	background: url(nuncio/top_left.png) no-repeat;		
-}
-
-.nuncio_n {
-	background: url(nuncio/top_mid.png) repeat-x;
-	height: 28px;
-}
-
-.nuncio_ne {
-	width: 21px;
-	height: 28px;
-	background: url(nuncio/top_right.png) no-repeat;		
-}
-
-.nuncio_e {
-	width: 21px;
-	background: url(nuncio/center_right.png)  repeat-y top right;		
-}
-
-.nuncio_w {
-	width: 12px;
-	background: url(nuncio/center_left.png) repeat-y top left;			
-}
-
-.nuncio_sw {
-	width: 12px;
-	height: 18px;
-	background: url(nuncio/bottom_left.png) no-repeat;			
-}
-
-.nuncio_s {
-	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
-	height: 18px;
-}
-
-.nuncio_se, .nuncio_sizer {
-	width: 21px;
-	height: 18px;
-	background: url(nuncio/bottom_right.png) no-repeat;			
-}
-
-.nuncio_close {
-	width: 14px;
-	height: 14px;
-	background: url(nuncio/close.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:22px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_minimize {
-	width: 14px;
-	height: 15px;
-	background: url(nuncio/minimize.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:40px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_title {
-	float:left;
-	font-size:11px;
-	font-weight: bold;
-	font-style: italic;
-	color: #fff;
-	width: 100%
-}
-
-.nuncio_content {
-	background: url(nuncio/overlay.png) repeat;
-	overflow:auto;
-	color: #ddd;
-	font-family: Tahoma, Arial, "sans-serif";
-	font-size: 10px;
-}
-
-.nuncio_sizer {
-	cursor:se-resize;	
-}
-
-
-.top_draggable, .bottom_draggable {
-  cursor:move
-}
-/* FOR IE */
-* html .nuncio_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
-}
-
-* html .nuncio_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
-}
-
-* html .nuncio_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
-}
-
-* html .nuncio_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
-}
-
+.overlay_nuncio img { border: none; }
+
+.overlay_nuncio {
+	background-color: #666666;
+}
+
+.nuncio_nw {
+	width: 12px;
+	height: 28px;
+	background: url(nuncio/top_left.png) no-repeat;		
+}
+
+.nuncio_n {
+	background: url(nuncio/top_mid.png) repeat-x;
+	height: 28px;
+}
+
+.nuncio_ne {
+	width: 21px;
+	height: 28px;
+	background: url(nuncio/top_right.png) no-repeat;		
+}
+
+.nuncio_e {
+	width: 21px;
+	background: url(nuncio/center_right.png)  repeat-y top right;		
+}
+
+.nuncio_w {
+	width: 12px;
+	background: url(nuncio/center_left.png) repeat-y top left;			
+}
+
+.nuncio_sw {
+	width: 12px;
+	height: 18px;
+	background: url(nuncio/bottom_left.png) no-repeat;			
+}
+
+.nuncio_s {
+	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
+	height: 18px;
+}
+
+.nuncio_se, .nuncio_sizer {
+	width: 21px;
+	height: 18px;
+	background: url(nuncio/bottom_right.png) no-repeat;			
+}
+
+.nuncio_close {
+	width: 14px;
+	height: 14px;
+	background: url(nuncio/close.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:22px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_minimize {
+	width: 14px;
+	height: 15px;
+	background: url(nuncio/minimize.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:40px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_title {
+	float:left;
+	font-size:11px;
+	font-weight: bold;
+	font-style: italic;
+	color: #fff;
+	width: 100%
+}
+
+.nuncio_content {
+	background: url(nuncio/overlay.png) repeat;
+	overflow:auto;
+	color: #ddd;
+	font-family: Tahoma, Arial, "sans-serif";
+	font-size: 10px;
+}
+
+.nuncio_sizer {
+	cursor:se-resize;	
+}
+
+
+.top_draggable, .bottom_draggable {
+  cursor:move
+}
+/* FOR IE */
+* html .nuncio_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
+}
+
+* html .nuncio_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
+}
+
+* html .nuncio_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
+}
+
+* html .nuncio_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
index 9bda2a68d..d7d722e8a 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
@@ -1,108 +1,108 @@
-.overlay_spread {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.spread_nw {
-	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.spread_n {
-  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.spread_ne {
-  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.spread_w {
-  background: transparent url(spread/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.spread_e {
-  background: transparent url(spread/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.spread_sw {
-  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_s  {
-  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.spread_se, .spread_sizer {
-  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_sizer {
-	cursor:se-resize;	
-}
-
-.spread_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:14px;
-	font-weight:bold;
-	text-align:left;
-	margin-top:2px;
-	width:100%;
-	color:#E47211;
-}
-
-.spread_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#A9EA00;
-}
-
+.overlay_spread {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.spread_nw {
+	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.spread_n {
+  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.spread_ne {
+  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.spread_w {
+  background: transparent url(spread/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.spread_e {
+  background: transparent url(spread/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.spread_sw {
+  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_s  {
+  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.spread_se, .spread_sizer {
+  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_sizer {
+	cursor:se-resize;	
+}
+
+.spread_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:14px;
+	font-weight:bold;
+	text-align:left;
+	margin-top:2px;
+	width:100%;
+	color:#E47211;
+}
+
+.spread_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#A9EA00;
+}
+

From 9caf9cbf2f065c0d5ce7b60be94cb3385cf2fb65 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 16 May 2016 16:16:24 +0800
Subject: [PATCH 06/72] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=EF=BC=8C=E5=9C=A8=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=A6=81=E5=BC=B9=E5=87=BA=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_apply_homework_course_message.html.erb   |   6 +-
 .../_join_course_course_message.html.erb      |   2 +-
 app/views/users/_user_message_course.html.erb | 136 +++++++++---------
 app/views/users/_user_message_forge.html.erb  |  62 ++++----
 app/views/users/_user_message_forum.html.erb  |   8 +-
 app/views/users/_user_message_org.html.erb    |   4 +-
 app/views/users/_user_message_system.html.erb |   2 +-
 .../_user_message_userfeedaback.html.erb      |   6 +-
 8 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb
index cf048bcd6..12bf0f2a4 100644
--- a/app/views/users/_apply_homework_course_message.html.erb
+++ b/app/views/users/_apply_homework_course_message.html.erb
@@ -1,12 +1,12 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)) %></div></a></li>
+<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %></div></a></li>
 <li class="homepageNewsPubType fl">
   <%= link_to User.find(ma.apply_user_id).show_name,
-              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %>
+              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
   <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用作业：</span>
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
-  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
   <!--:onmouseover => "message_titile_show($(this),event)",-->
   <!--:onmouseout => "message_titile_hide($(this))" %>-->
 </li>
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index 28675b7eb..01ebb5cf9 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -6,7 +6,7 @@
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <a href="javascript:void(0);" class="newsGrey">
     <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
-                :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
     <!--:onmouseout => "message_titile_hide($(this))" %>-->
   </a>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d278c7d74..a80a08e42 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,11 +1,11 @@
 <% if ma.class == CourseMessage %>
     <% if ma.course_message_type == "News" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -21,11 +21,11 @@
     <% end %>
     <% if ma.course_message_type == "Comment" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" , :target => '_blank'%>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -41,19 +41,19 @@
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
                 <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% else %>
                 <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% end %>
@@ -100,13 +100,13 @@
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
-            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
+            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
           <li class="homepageHomeworkContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -136,17 +136,17 @@
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
+                        :onmouseout => "message_titile_hide($(this))", :target => '_blank' %>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
@@ -170,12 +170,12 @@
     <!--作品关闭匿评-->
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
             <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
           </li>
@@ -202,15 +202,15 @@
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
+            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -239,7 +239,7 @@
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %></div></a></li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name,
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -247,7 +247,7 @@
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
@@ -257,11 +257,11 @@
     <% end %>
     <% if ma.course_message_type == "Poll" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
-                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}" %>
+                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a></li>
@@ -273,14 +273,14 @@
     <% end %>
     <% if ma.course_message_type == "Message" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
             <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
               </a></li>
@@ -294,7 +294,7 @@
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
               </a></li>
@@ -314,9 +314,9 @@
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <% if ma.course_message.reviewer_role == 3 %>
-                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
+                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"), :target => '_blank' %>
             <% else %>
-                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
             <% end %>
           </li>
           <li class="homepageNewsPubType fl">
@@ -324,7 +324,7 @@
                 <span class="newsBlue homepageNewsPublisher">匿名用户</span>
             <% else %>
                 <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <% end %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
                           <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
@@ -333,7 +333,7 @@
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% unless ma.content.nil? %>
                 <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a></li>
@@ -365,14 +365,14 @@
             <% if params[:type] != 'homework' %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
-                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                     <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
-                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                                 <!--:onmouseover => "message_titile_show($(this),event)",-->
                                 <!--:onmouseout => "message_titile_hide($(this))" %>-->
                     </a>
@@ -386,14 +386,14 @@
             <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
-                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                     <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了您的作业：</span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, homework_common_index_url_in_org( ma.course_id),
-                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                     <!--:onmouseover => "message_titile_show($(this),event)",-->
                     <!--:onmouseout => "message_titile_hide($(this))" %>-->
                   </a>
@@ -406,16 +406,16 @@
         <% else %>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
                 <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
                                     "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -439,14 +439,14 @@
     <!-- 作业迟交，不能参与匿评提醒消息 -->
     <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
           </li>
           <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -474,16 +474,16 @@
     <% if ma.course_message_type == "StudentWork" && ma.status == 1 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "同学",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">重新提交了作品：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <%#= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -495,16 +495,16 @@
     <% if ma.course_message_type == "StudentWork" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name+ "同学",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">追加新附件了：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -523,7 +523,7 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a></li>
@@ -565,7 +565,7 @@
                     '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
                      :
                     '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -588,14 +588,14 @@
     <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了课程：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -629,7 +629,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -656,14 +656,14 @@
     <% if ma.course_message_type == "RemoveFromCourse" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了课程：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -690,12 +690,12 @@
     <!--老师发布测验 发给学生看-->
     <% if ma.course_message_type == "Exercise" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
             <span><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
           </li>
@@ -727,12 +727,12 @@
 
     <% if ma.course_message_type == "Exercise" && ma.status == 3 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
            <span>  <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
           <li class="homepageHomeworkContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
 
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 1fd981d73..9da768d0e 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -3,14 +3,14 @@
     <% if ma.forge_message_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -23,14 +23,14 @@
       <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -44,14 +44,14 @@
       <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -65,10 +65,10 @@
         <% inviter = User.find(ma.forge_message_id) %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
           </li>
           <% if ma.user.member_of?(ma.project) %>
@@ -77,7 +77,7 @@
               <li class="homepageHomeworkContent fl">
           <% end %>
           <%= link_to ma.project, project_path(ma.project),
-                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                       <!--:onmouseover => "message_titile_show($(this),event)",-->
                       <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -86,7 +86,7 @@
                 <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
                            :value => ma.secret_key,
                            :class => "green_btn_cir ml10",
-                           :style => "color:#fff" %>
+                           :style => "color:#fff", :target => '_blank' %>
               </li>
           <% end %>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -96,14 +96,14 @@
         <% if ma.status == 1%>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
-                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
               </li>
               <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -114,14 +114,14 @@
         <% else %>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
-                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -133,16 +133,16 @@
     <% if ma.forge_message_type == "Journal" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
                             更新了问题状态：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ma.forge_message.journalized.subject,
-                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -152,13 +152,13 @@
     <% end %>
     <% if ma.forge_message_type == "Message" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                                                       :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
@@ -169,15 +169,15 @@
     <% if ma.forge_message_type == "News" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了新闻：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"  %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -187,12 +187,12 @@
     <% end %>
     <% if ma.forge_message_type == "Comment" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to "#{ma.forge_message.commented.title}",
-                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 716fef349..e0111276a 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -2,22 +2,22 @@
     <% if ma.memo_type == "Memo" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
           </li>
           <% if ma.memo.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
               </li>
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index 8c6159a58..13c62318f 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -2,10 +2,10 @@
     <% if ma.message_type == 'ApplySubdomain'%>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>申请子域名：</span>
           </li>
           <li class="homepageHomeworkContent fl">
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index 72241636f..a7e48f456 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -11,7 +11,7 @@
           <li class="homepageSystenMessageContent fl">
 
             <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current),
-                        :id => "content_link_#{ma.id}" %>
+                        :id => "content_link_#{ma.id}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event);",-->
                         <!--:onmouseout => "message_titile_hide($(this));"-->
           </li>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 1898090aa..3af623813 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -2,14 +2,14 @@
     <% if ma.journals_for_message_type == "JournalsForMessage" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"%>
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank'%>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>

From 708cb35fd22e432dca25fb12f88fd0e1c9ac9ab4 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 16 May 2016 16:57:18 +0800
Subject: [PATCH 07/72] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E7=9A=84=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?pop=5Fup=5Fbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb  | 194 +++++++++++---------
 app/views/admin/code_work_tests.html.erb    |   8 +-
 app/views/blogs/_article.html.erb           |   4 +-
 app/views/users/_course_boardlist.html.erb  |   4 +-
 app/views/users/_course_newslist.html.erb   |   4 +-
 app/views/users/_project_boardlist.html.erb |   4 +-
 app/views/users/_user_course_list.html.erb  |   8 +-
 app/views/users/_user_project_list.html.erb |   4 +-
 lib/rails_kindeditor/config/routes.rb       |   2 +-
 public/assets/kindeditor/pasteimg.js        |   5 +-
 public/javascripts/application.js           |  30 +++
 public/javascripts/homework.js              |  26 ++-
 12 files changed, 183 insertions(+), 110 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 589f232c5..3497e9fdd 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -81,6 +81,7 @@ class StudentWorkController < ApplicationController
 #根据传入的tIndex确定是第几次测试
 #之后如果觉得很卡 可以改成将结果传回JS再以参数形式传回来
   def program_test_ex
+
     tStarttime = Time.now
 
     is_test = params[:is_test] == 'true'
@@ -106,108 +107,123 @@ class StudentWorkController < ApplicationController
           tEndtime = Time.now
           tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
           logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
-
-          #status 0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+          #status 0:答案正确 -5program_test_ex 函数出错 -4judge代码出错 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+          resultObj[:status] = -3
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
-
-        end
-        if result["status"].to_i != -2
-          #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
-          #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
-          space_replace_1(result["results"].first['output'])
-          space_replace_1(result["results"].first['result'])
+        rescue
+          #-4 judge代码 出错
+          logger.debug "program_test_error 1"
+          resultObj[:status] = -4
+          tmpstatus = -4
+          CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)
         end
 
-        logger.debug  result
+        begin
+          if resultObj[:status] != -3 && resultObj[:status] != -4
+            if result["status"].to_i != -2
+              #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
+              #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
+              space_replace_1(result["results"].first['output'])
+              space_replace_1(result["results"].first['result'])
+            end
 
-        #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
-        resultObj[:status] = -1
-        resultObj[:results] = result["results"].first  #本次测试结果
-		if result["status"].to_i == -2 #编译错误
-			result["error_msg"] = result["error_msg"][0..2047]
-		end
-        resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
+            logger.debug  result
 
-        #该状态用于存入CodeTests
-        tmpstatus = -1
-        if result["status"].to_i == -2 #编译错误
-          resultObj[:results] = result["error_msg"]
-          resultObj[:status] = -2
-          tmpstatus = -2
-        elsif  result["results"][0]["status"].to_i == 2
-          resultObj[:status] = 2
-          tmpstatus = 2
-        end
+            #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
+            resultObj[:status] = -1
+            resultObj[:results] = result["results"].first  #本次测试结果
+            # if result["status"].to_i == -2 #编译错误
+              result["error_msg"] = result["error_msg"][0..2047]
+            # end
+            resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
-        if result["status"] == 0
-          tmpstatus = 0
-        end
+            #该状态用于存入CodeTests
+            tmpstatus = -1
+            if result["status"].to_i == -2 #编译错误
+              resultObj[:results] = result["error_msg"]
+              resultObj[:status] = -2
+              tmpstatus = -2
+            elsif  result["results"][0]["status"].to_i == 2
+              resultObj[:status] = 2
+              tmpstatus = 2
+            end
 
-        unless student_work.save
-          resultObj[:status] = 200
-        else
-          student_work.name = params[:title]
-          student_work.description = params[:src]
+            if result["status"] == 0
+              tmpstatus = 0
+            end
 
-          if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-            student_work.late_penalty = @homework.late_penalty
-          else
-            student_work.late_penalty = 0
-          end
+            unless student_work.save
+              resultObj[:status] = 200
+            else
+              student_work.name = params[:title]
+              student_work.description = params[:src]
 
-          #每次从数据库取出上次的结果加上本次的结果再存入数据库
-          if result["status"].to_i != -2
-            result["results"].first['user_wait'] = tUsedtime
+              if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+                student_work.late_penalty = @homework.late_penalty
+              else
+                student_work.late_penalty = 0
+              end
 
-            if result["results"][0]["status"].to_i == 2
-              result["status"] = 2
+              #每次从数据库取出上次的结果加上本次的结果再存入数据库
+              if result["status"].to_i != -2
+                result["results"].first['user_wait'] = tUsedtime
+
+                if result["results"][0]["status"].to_i == 2
+                  result["status"] = 2
+                end
+              end
+
+              status = result["status"]
+              if index == 1
+                student_work_test = student_work.student_work_tests.build(status: status,
+                                                                          results: [resultObj[:results]],src: params[:src])
+                student_work_test.save!
+                resultObj[:testid] = student_work_test.id
+              else
+                #先从数据库取出result
+                student_work_test = StudentWorkTest.find(params[:testid])
+                results = student_work_test.results
+                results << resultObj[:results]
+                student_work_test.results = results
+                student_work_test.status = (result["status"] != 0 ? result["status"] : student_work_test.status)
+                student_work_test.save!
+                status = student_work_test.status
+                resultObj[:testid] = student_work_test.id
+              end
+
+              #超时或编译错误则直接返回了并存入数据库
+              if resultObj[:status] == 2 || resultObj[:status] == -2 || index == @homework.homework_tests.size
+                if  status == 0
+                  resultObj[:status] = 0
+                end
+                student_work.save!
+                resultObj[:time] = student_work_test.created_at.to_s(:db)
+                resultObj[:index] = student_work.student_work_tests.count
+              end
+
+              #将每次用户等待时间都存起来以便管理界面显示用
+              tEndtime = Time.now
+              tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+              logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
+
+              time_used = 0
+              if result["status"].to_i != -2
+                #至少一毫秒
+                time_used = result["results"].first['time_used'] == 0 ? 1:result["results"].first['time_used']
+              end
+              #0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+              CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>time_used,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
             end
           end
-
-          status = result["status"]
-          if index == 1
-            student_work_test = student_work.student_work_tests.build(status: status,
-                                                                      results: [resultObj[:results]],src: params[:src])
-            student_work_test.save!
-            resultObj[:testid] = student_work_test.id
-          else
-            #先从数据库取出result
-            student_work_test = StudentWorkTest.find(params[:testid])
-            results = student_work_test.results
-            results << resultObj[:results]
-            student_work_test.results = results
-            student_work_test.status = (result["status"] != 0 ? result["status"] : student_work_test.status)
-            student_work_test.save!
-            status = student_work_test.status
-            resultObj[:testid] = student_work_test.id
-          end
-
-          #超时或编译错误则直接返回了并存入数据库
-          if resultObj[:status] == 2 || resultObj[:status] == -2 || index == @homework.homework_tests.size
-            if  status == 0
-              resultObj[:status] = 0
-            end
-            student_work.save!
-            resultObj[:time] = student_work_test.created_at.to_s(:db)
-            resultObj[:index] = student_work.student_work_tests.count
-          end
-
-          #将每次用户等待时间都存起来以便管理界面显示用
-          tEndtime = Time.now
-          tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-          logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
-
-          time_used = 0
-          if result["status"].to_i != -2
-            #至少一毫秒
-            time_used = result["results"].first['time_used'] == 0 ? 1:result["results"].first['time_used']
-          end
-          #0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
-          CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>time_used,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
-
-          #渲染返回结果
-          render :json => resultObj
+        rescue
+          #-5 program_test_ex 函数出错
+          logger.debug "program_test_error 2"
+          resultObj[:status] = -5
+          tmpstatus = -5
+          CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)
         end
+        #渲染返回结果
+        render :json => resultObj
       end
     end
   end
diff --git a/app/views/admin/code_work_tests.html.erb b/app/views/admin/code_work_tests.html.erb
index 64c3a41e1..2013bd322 100644
--- a/app/views/admin/code_work_tests.html.erb
+++ b/app/views/admin/code_work_tests.html.erb
@@ -24,8 +24,8 @@
       <th style="width: 100px;">
         测试完成时间
       </th>
-      <th style="width: 60px;">
-        <span style="float:left; margin-left:20px;">答题状态</span>
+      <th style="width: 80px;">
+        <span style="float:left; margin-left:30px;">答题状态</span>
       </th>
       <th style="width: 50px;">
         <span style="float:left; margin-left:20px;">耗时</span>
@@ -76,6 +76,10 @@
                     <%= "代码超时" %>
                 <% elsif test.status == -3 %>
                     <%= "请求超时" %>
+                <% elsif test.status == -4 %>
+                    <%= "judge代码出错!" %>
+                <% elsif test.status == -5 %>
+                    <%= "trustie代码出错!" %>
                 <% else %>
                     <%= "答题错误" %>
                 <% end %>
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 4c00ee8a2..77aa3f9d8 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -43,8 +43,8 @@
                       <% count=activity.children.count%>
                   <% end %>
                   <li class="ml15">
-                    <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-                    <span class="grayTxt">更新时间：<%= format_time(activity.updated_on) %></span>
+                    <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                    <span class="grayTxt">更新：<%= format_time(activity.updated_on) %></span>
                     <p class="list-info fr grayTxt">
                         <span><%= count>0 ? "#{count}" :"0" %></span>
                         <span>回复</span>
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index c92d117ee..bf23d9a97 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -45,8 +45,8 @@
                   <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index ff99e116e..0e5805112 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -33,8 +33,8 @@
                   <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发布时间：<%= format_time(activity.created_on) %></span>
-                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>
                   <% count=activity.comments.count %>
                   <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index 5f61d26ef..928d682d8 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -45,8 +45,8 @@
                   <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-                  <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 8ef0faa9e..5e3f48963 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -28,12 +28,10 @@
               </li>
               <div class="cl"></div>
                 <li class="ml15">
+                  <!--<span class="grayTxt">创建：<%#= format_time(course.created_at) %></span>-->
+                  <span class="grayTxt">更新：<%= format_time(course.updated_on) %></span>
                   <span class="grayTxt">
-                      创建时间：<%= format_time(course.created_at) %>
-                  </span>
-                  <span class="grayTxt">更新时间：<%= format_time(course.updated_on) %></span>
-                  <span class="grayTxt">
-                      开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
+                      学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
                   </span>
                   <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
                       <% homework_num = course.homework_commons.count %>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index 1526da58f..6124b82d8 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -27,8 +27,8 @@
               </li>
               <div class="cl"></div>
               <li class="ml15">
-                <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
-                <span class="grayTxt">更新时间：<%= format_time(project.updated_at) %></span>
+                <!--<span class="grayTxt">创建时间：<%#= format_time(project.created_on) %></span>-->
+                <span class="grayTxt">更新：<%= format_time(project.updated_at) %></span>
                 <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
               </li>
               <div class="cl"></div>
diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb
index 86b888ad3..e205376d9 100644
--- a/lib/rails_kindeditor/config/routes.rb
+++ b/lib/rails_kindeditor/config/routes.rb
@@ -2,6 +2,6 @@ Rails.application.routes.draw do
   namespace :kindeditor do
     post "/upload" => "assets#create"
     get  "/filemanager" => "assets#list"
-    get  "/uploadpic" => "assets#uploadpic"
+    post  "/uploadpic" => "assets#uploadpic"
   end
 end
\ No newline at end of file
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 7165b142a..97d5e33c5 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -370,6 +370,9 @@ function df(myself) {
                 else
                     sstr += that.attr("src") + "|";
             }
+            else if (that.attr("src").indexOf("data:image") >= 0){
+                that.parents().removeAttr("href"); //删除所有父节点的href
+            }
         }
     });
     uploadpic(sstr,myself);
@@ -397,7 +400,7 @@ function uploadpic(piclist,myself) {
     $.ajax({
         url: "/kindeditor/uploadpic",
         data:{"pic":piclist},
-        type: "GET",
+        type: "POST",
         beforeSend: function () {
 //            $("#ajax-indicator span").text("图片上传中请稍等...");
             keShadow(myself);
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 4cf64abb7..9820f66ff 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1261,3 +1261,33 @@ function description_showwords_ellipsis(id,num){
     $("#intro_content_"+id).show();
 
 }
+
+//by yk 弹框  tWidth = 580  tTop=30 tLeft=50
+function pop_up_box(value,tWidth,tTop,tLeft){
+
+    if(!tWidth){
+        var tWidth = 580;
+    }
+
+    if(!tTop){
+        var tTop = 30;
+    }
+
+    if(!tLeft){
+        var tLeft = 50;
+    }
+
+    $("#ajax-modal").html(value);
+    showModal('ajax-modal', tWidth + "px");
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-right: 5px; margin-top:-10px;right:0;' class='resourceClose'></a>");
+    $('#ajax-modal').parent().css("top", tTop+"%").css("left", tLeft+"%").css("padding-top", "10px").css("position", "fixed");
+    $('#ajax-modal').parent().addClass("resourceUploadPopup");
+    $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px");
+
+    function hideModal(){
+        $('#ajax-modal').hide();
+    }
+}
+
+
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 391774f0b..aaf70cd3f 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -66,6 +66,24 @@ $(function(){
                     src: src, title: title, is_test: is_test,tIndex:i,
                 testid: testid},
                 function(data,status){
+                    if (data.status==-4 || data.status==-5 ){
+//                        alert("非常抱歉，您的程序引起了后台问题，请在公共贴吧提交您的代码进行意见反馈，谢谢！");
+                        //弹框
+                        var root_path = getRootPath();
+                        var forums_1_path = root_path + "/forums/1"
+                        var htmlvalue = "</br><div style='width:400px;text-align:center;margin:0 auto' >您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！</div><div style='width:550px;text-align:center'><a  target='_Blank' href="+forums_1_path+">点我进入反馈页面</a></div>";
+                        pop_up_box(htmlvalue,580,30,50);
+
+                        $('#test-program-btn').show();
+                        return;
+                    }
+                    else if (data.status==-3){
+                        alert("对不起,服务器繁忙请稍后再试!");
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+                        pop_up_box(htmlvalue,580,30,50);
+                        $('#test-program-btn').show();
+                        return;
+                    }
                     var tSeq = data.tseq;
                     var tCount = data.tcount;
                     console.log("tSeq="+tSeq);
@@ -100,9 +118,13 @@ $(function(){
                 }
             ).fail(function(xhr, status){
                     if(status == 'timeout'){
-                        alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
+//                        alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div>";
+                        pop_up_box(htmlvalue,580,30,50);
                     } else {
-                        alert("对不起,服务器繁忙请稍后再试!");
+//                        alert("对不起,服务器繁忙请稍后再试!");
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+                        pop_up_box(htmlvalue,580,30,50);
                     }
                     $('#test-program-btn').show();
                     return;

From 025d07e6a4ecb3039c863bc226d6218ea3817cab Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 16 May 2016 17:02:18 +0800
Subject: [PATCH 08/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=BF=A1=E6=81=AF=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=B8=8D=E5=B0=8F=E5=BF=83=E6=B3=A8=E9=87=8A=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 4 ++--
 public/javascripts/application.js          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3497e9fdd..19fe8de9e 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -132,9 +132,9 @@ class StudentWorkController < ApplicationController
             #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
             resultObj[:status] = -1
             resultObj[:results] = result["results"].first  #本次测试结果
-            # if result["status"].to_i == -2 #编译错误
+            if result["status"].to_i == -2 #编译错误
               result["error_msg"] = result["error_msg"][0..2047]
-            # end
+            end
             resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
             #该状态用于存入CodeTests
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9820f66ff..d9f532a48 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1262,7 +1262,7 @@ function description_showwords_ellipsis(id,num){
 
 }
 
-//by yk 弹框  tWidth = 580  tTop=30 tLeft=50
+//by yk 弹框 value：html代码或跳转其他页面代码 tWidth = 580  tTop=30 tLeft=50
 function pop_up_box(value,tWidth,tTop,tLeft){
 
     if(!tWidth){

From c0de43ecc0c320922bc9870ff1acd143487d0f82 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 10:31:10 +0800
Subject: [PATCH 09/72] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=87=BA=E9=94=99=E6=8F=90=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_intro_content.html.erb        |  2 +-
 .../kindeditor/plugins/code/previewcode.css    |  5 +++--
 public/javascripts/homework.js                 |  2 +-
 public/stylesheets/courses.css                 | 14 +++++++-------
 public/stylesheets/css.css                     |  4 ++--
 public/stylesheets/new_user.css                | 18 +++++++++---------
 public/stylesheets/project.css                 | 18 +++++++++---------
 public/stylesheets/public.css                  |  8 ++++----
 8 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index c18e520ba..351f1fdb0 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,4 +1,4 @@
-<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
+<div class="homepagePostIntro break_word upload_img  maxh360 table_maxWidth " id="activity_description_<%= user_activity_id%>">
   <div id="intro_content_<%= user_activity_id%>">
     <%= content.to_s.html_safe%>
   </div>
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index b9c8252e8..15951ce98 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -51,5 +51,6 @@ span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
 /*yk*/
-.ke-content ol li{list-style-type: decimal;margin-left: 20px;}
-.ke-content ul li{list-style-type: disc;margin-left: 20px;}
\ No newline at end of file
+.ke-content ol li{list-style-type: decimal;}
+.ke-content ul li{list-style-type: disc;}
+ol,ul{margin-top:0;}
\ No newline at end of file
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index aaf70cd3f..b1144ebf1 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -71,7 +71,7 @@ $(function(){
                         //弹框
                         var root_path = getRootPath();
                         var forums_1_path = root_path + "/forums/1"
-                        var htmlvalue = "</br><div style='width:400px;text-align:center;margin:0 auto' >您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！</div><div style='width:550px;text-align:center'><a  target='_Blank' href="+forums_1_path+">点我进入反馈页面</a></div>";
+                        var htmlvalue = "</br><div style='width:430px;text-align:center;margin:0 auto' >您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！</div><div style='width:550px;text-align:center'><a  target='_Blank' href="+forums_1_path+">点我进入反馈页面</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
 
                         $('#test-program-btn').show();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6e55146a6..036bdeb8d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -129,8 +129,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
@@ -426,8 +426,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 span.author { font-size: 0.9em; color: #888; }
 
 /* 创建作品 work */
@@ -1114,10 +1114,10 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; }
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index b740436f9..3e21a5fda 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -120,8 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop span{ float:left;}
 .ping_distop p{ color:#5f5f5f;min-height: 24px;}
 .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
 
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 67176c761..3b2857854 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -676,8 +676,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
@@ -713,8 +713,8 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";}
-.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
@@ -857,10 +857,10 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; } /*line-height: 18px !important;*/
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { color:#888888; float:right;display: inline}
@@ -1351,8 +1351,8 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')}
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 1ef99e66b..c7ec7e1ab 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -220,8 +220,8 @@ a:hover.talk_btn{ background:#2a9dc1;}
 .mt0{ margin-top:0px;}
 .talk_info{  margin-left:60px; margin-top:10px;}
 /*.issue_desc li{list-style-type: decimal;margin-left: 20px;}*/
-.issue_desc ol li{list-style-type: decimal;margin-left: 20px;}
-.issue_desc ul li{list-style-type: disc;margin-left: 20px;}
+.issue_desc ol li{list-style-type: decimal;margin-left: 40px;}
+.issue_desc ul li{list-style-type: disc;margin-left: 40px;}
 .talk_info img {max-width:100%;}
 a.talk_edit{ color:#426e9a; margin-right:5px;}
 a:hover.talk_edit{ color:#ff5722;}
@@ -333,8 +333,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 
 /*上传资源弹出框样式*/
 .popbox_polls{position:fixed !important;}
@@ -971,8 +971,8 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     margin: 10px auto 0px;
     background-color: #F1F1F1;
 }
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
@@ -1111,10 +1111,10 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 253aaf46b..0d19724e7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -599,8 +599,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
@@ -635,8 +635,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
-.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}

From 0cba32ecd633555153cca802510946c1bca20903 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 11:23:20 +0800
Subject: [PATCH 10/72] =?UTF-8?q?=E5=8C=97=E6=96=97=E5=8D=95=E7=82=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=95=E8=B5=B7=E7=9A=84500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ssos_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/ssos_controller.rb b/app/controllers/ssos_controller.rb
index 9f05fc19b..9a5042c50 100644
--- a/app/controllers/ssos_controller.rb
+++ b/app/controllers/ssos_controller.rb
@@ -27,8 +27,10 @@ class SsosController < ApplicationController
       ## 加入组织
       @organization = Organization.find(82)
       unless @organization.org_members.exists?(user_id: sso.user_id)
-        member = OrgMember.new(:user_id => sso.user_id)
+        member =  OrgMember.create(:user_id => sso.user_id, :created_at => Time.now)
+        # member = OrgMember.new(:user_id => sso.user_id)
         @organization.org_members << member
+        OrgMemberRole.create(:org_member_id => member.id, :role_id => 12)
       end
 
       ## 选择性跳转

From 0b2fe1d88a68bc4d2018c58f4793dcb57041c3e4 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 17 May 2016 11:24:29 +0800
Subject: [PATCH 11/72] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                                               | 1 -
 app/views/organizations/_org_course_homework.html.erb | 4 ++--
 app/views/users/_course_homework.html.erb             | 4 ++--
 app/views/users/_user_homework_detail.html.erb        | 4 ++--
 public/stylesheets/courses.css                        | 3 ++-
 public/stylesheets/new_user.css                       | 4 +++-
 public/stylesheets/org.css                            | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 1234567

diff --git a/1234567 b/1234567
deleted file mode 100644
index 08de77ab4..000000000
--- a/1234567
+++ /dev/null
@@ -1 +0,0 @@
-{"access_token":"bFlabz0uBcoIBfWL7nBJkgpl26aOWDy-dyCOvH_MjUo_hMOOKG83WV1cCL1MG6H-AE-6eMI0iyLoOoAMv9Y3pFFsLYD-GAGr3UH9fT8OqeHMDlFhXyRTvHv9l2QPHGpcARUcCGANEH","expires_in":7200,"got_token_at":1462934760}
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index b4ca46959..63e4ef54a 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -210,9 +210,9 @@
 
                   <div class="mr10 mb10 mt10 fl w100 fontGrey2" style="text-align: center;">
                     <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
+                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
                     <% else %>
-                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
+                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
                     <% end %>
                     <% com_time = project.project_score.commit_time %>
                     <% time=project.updated_on %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 28f0f99db..9140d7b62 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -216,9 +216,9 @@
 
               <div class="mr10 mb10 mt10 fl w100 fontGrey2" style="text-align: center;">
                 <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                    <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
+                    <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
                 <% else %>
-                    <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
+                    <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
                 <% end %>
                 <% com_time = project.project_score.commit_time %>
                 <% time=project.updated_on %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index b8c5c2017..a4e5f68d5 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -219,9 +219,9 @@
 
                   <div class="mr10 mb10 mt10 fl w100 fontGrey2" style="text-align: center;">
                     <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %>
+                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %>
                     <% else %>
-                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
+                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
                     <% end %>
                     <% com_time = project.project_score.commit_time %>
                     <% time=project.updated_on %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index af22d6306..55c7150d4 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1247,7 +1247,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .hworkPrName {width:160px; max-width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
-.captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+.captainName {max-width:65px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+.relatePImage {display:block; margin:0 auto;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 44e64e9ab..68acf78f0 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1410,13 +1410,15 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
-.captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+.captainName {max-width:65px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
 
 /* @功能 定义 */
 span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
+.relatePImage {display:block; margin:0 auto;}
+
 /*问题状态图片*/
 .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
 .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index abfeaef85..f8b32a701 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -122,7 +122,7 @@ div.flash {margin-top :0px !important}
 
 .w80{ width:80px;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
-.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+.captainName {max-width:65px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
 .researchBox { width:240px; height:24px; border:1px solid #dddddd; color:#666666; outline:none;}
 .blueBtn{ width:60px; height:26px; color:#FFF; border:none; background-color:#269ac9; cursor:pointer; padding-left:0px; text-align:center;}
 .blueBtn:hover {background-color:#298fbd;}

From 93fb4441d83a54c6378770c395023f8b60419598 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 14:12:42 +0800
Subject: [PATCH 12/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=96=B0=E7=9A=84=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/homework.js | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index b1144ebf1..a4b30384a 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -11,11 +11,17 @@ $(function(){
         var title = $('#program-title').val();
 
         if (!src) {
-            alert('请输入正确的代码');
+//            alert('请输入正确的代码');
+
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入正确的代码!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
+
             return false;
         }
         if (!title) {
-            alert('请输入标题');
+//            alert('请输入标题');
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入标题!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
             return false;
         }
         return true;
@@ -78,8 +84,8 @@ $(function(){
                         return;
                     }
                     else if (data.status==-3){
-                        alert("对不起,服务器繁忙请稍后再试!");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+//                        alert("对不起,服务器繁忙请稍后再试!");
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                         $('#test-program-btn').show();
                         return;
@@ -99,10 +105,8 @@ $(function(){
 
                     if (data.status==0 && is_test != 'true') {
                         if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;}
-                        var r=confirm("答题正确，是否立刻提交?");
-                        if (r) {
-                            $(".HomeWorkCon form").submit();
-                        }
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>答题正确，是否立刻提交?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='submit_code()'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div><script>function submit_code(){$('.HomeWorkCon form').submit();hideModal();}</script>";
+                        pop_up_box(htmlvalue,580,30,50);
                         $('#test-program-btn').show();
                         return;
                     }
@@ -119,11 +123,11 @@ $(function(){
             ).fail(function(xhr, status){
                     if(status == 'timeout'){
 //                        alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div>";
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     } else {
 //                        alert("对不起,服务器繁忙请稍后再试!");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     }
                     $('#test-program-btn').show();
@@ -142,20 +146,30 @@ $(function(){
             return;
         }
         if($('.ProResult .ProResultTop').length<=0){
-            var r=confirm("测试后才能提交，是否立刻测试?");
-            if (r) {
+//            var r=confirm("测试后才能提交，是否立刻测试?");
+//            if (r) {
+//                test_program();
+//            }
+
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>测试后才能提交，是否立刻测试?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' id='code-test-button' class='Blue-btn fl'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
+            $("#code-test-button").on('click',function(){
                 test_program();
-            }
+                hideModal();
+            });
             return;
         }
-
         if (!tested) {
             test_program(function(data){
                 if (data.status!=0) {
-                    var r=confirm("测试不通过，是否强制提交?");
-                    if (!r) {
-                        return;
-                    }
+//                    var r=confirm("测试不通过，是否强制提交?");
+//                    if (!r) {
+//                        return;
+//                    }
+                    var htmlvalue = "</br><div style='width:550px;text-align:center'>测试不通过，是否强制提交?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='submit_code()'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div><script>function submit_code(){$('.HomeWorkCon form').submit();hideModal();}</script>";
+                    pop_up_box(htmlvalue,580,30,50);
+                    return;
+
                 };
                 $(".HomeWorkCon form").submit();                
             });

From 9b6c629d1071b6836a701ba9645d82dfa88bc2ef Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 14:18:14 +0800
Subject: [PATCH 13/72] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E8=B7=83=E5=BA=A6=E7=9A=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 55 +++++++++++++------
 app/views/courses/_new_member_list.html.erb   | 35 ++++++++----
 .../courses/_show_member_act_score.html.erb   | 38 +++++++++++++
 app/views/courses/_show_member_score.html.erb |  2 +-
 app/views/courses/deletegroup.js.erb          |  3 +-
 .../courses/show_member_act_score.js.erb      |  7 +++
 config/routes.rb                              |  1 +
 ..._alter_course_contributor_score_default.rb | 52 ++++++++++++++++++
 db/schema.rb                                  | 35 +++++++++---
 public/stylesheets/courses.css                |  2 +
 10 files changed, 192 insertions(+), 38 deletions(-)
 create mode 100644 app/views/courses/_show_member_act_score.html.erb
 create mode 100644 app/views/courses/show_member_act_score.js.erb
 create mode 100644 db/migrate/20160517013659_alter_course_contributor_score_default.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0fd4cc2c9..1478bceae 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -162,6 +162,7 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
     # @is_remote = true
+    @sort_type = 'score'
     @score_sort_by = "desc"
     q = "#{params[:name].strip}"
     if params[:incourse]
@@ -185,9 +186,11 @@ class CoursesController < ApplicationController
       group.course_id = @course.id
       group.save
     end
+    @sort_type = 'score'
+    @score_sort_by = "desc"
     @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
     @is_remote = true
-    @members = student_homework_score(0,0, 10,"desc")
+    @members = student_homework_score(0,0, 10,@score_sort_by)
     @course_groups = @course.course_groups
   end
 
@@ -196,7 +199,9 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
-
+    @sort_type = 'score'
+    @score_sort_by = "desc"
+    @members = student_homework_score(0,0, 10,@score_sort_by)
     @course_groups = @course.course_groups
   end
 
@@ -281,6 +286,7 @@ class CoursesController < ApplicationController
     @render_file = 'new_member_list'
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
+    @sort_type = 'score'
     @score_sort_by = "desc"
     if params[:group_id] && params[:group_id] != "0"
       @group = CourseGroup.find(params[:group_id])
@@ -298,6 +304,7 @@ class CoursesController < ApplicationController
 
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
+      @sort_type = "score"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
       @role = params[:role].nil? ?  '2':params[:role]
       @is_remote = true
@@ -312,7 +319,7 @@ class CoursesController < ApplicationController
           if @course.open_student == 1 || User.current.member_of_course?(@course)
             @subPage_title = l :label_student_list
             page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-            @all_members = student_homework_score(0,page, 10,"desc")
+            @all_members = student_homework_score(0,page, 10,@score_sort_by)
             @members =  @all_members
           else
             render_403
@@ -350,28 +357,29 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @render_file = 'new_member_list'
     @is_remote = true
+    @sort_type = params[:sort_type] if params[:sort_type]
     @score_sort_by = params[:sort_by] if params[:sort_by]
     @search_name = params[:search_name] if params[:search_name]
     group_id = params[:group_id]
     if !@search_name.nil?
       if group_id == '0'
         page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-        @results = searchmember_by_name(student_homework_score(0,0,0,@score_sort_by), @search_name)
+        @results = searchmember_by_name(student_homework_score(0,0,0,@score_sort_by,@sort_type), @search_name)
         @result_count = @results.count
         # @results = paginateHelper @results, 10
       else
         @group = CourseGroup.find(group_id)
-        @results = searchmember_by_name(student_homework_score(group_id, 0, 0,@score_sort_by),@search_name)
+        @results = searchmember_by_name(student_homework_score(group_id, 0, 0,@score_sort_by,@sort_type),@search_name)
         @result_count = @results.count
         # @results = paginateHelper @results, 10
       end
     else
       if group_id == '0'
         page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-        @results = student_homework_score(0,page, 10,@score_sort_by)
+        @results = student_homework_score(0,page, 10,@score_sort_by,@sort_type)
       else
         @group = CourseGroup.find(group_id)
-        @results = student_homework_score(group_id, 0, 0,@score_sort_by)
+        @results = student_homework_score(group_id, 0, 0,@score_sort_by,@sort_type)
       end
     end
   end
@@ -384,6 +392,15 @@ class CoursesController < ApplicationController
     end
   end
 
+  # 显示每个学生的作业评分详情
+  def show_member_act_score
+    @member = Member.find(params[:member_id]) if params[:member_id]
+    respond_to do |format|
+      format.html {render :layout => 'course_base'}
+      format.js
+    end
+  end
+
   def handle_course courses, activities
     course_activity_count_array=activities.values()
     course_array=[]
@@ -1149,7 +1166,7 @@ class CoursesController < ApplicationController
     end
   end
 
-  def student_homework_score(groupid,start_from, nums, score_sort_by)
+  def student_homework_score(groupid,start_from, nums, score_sort_by, sort_type = 'score')
     start_from = start_from * nums
     sql_select = ""
     if groupid == 0
@@ -1159,11 +1176,13 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+        ) AS act_score
         FROM members
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
-        WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
+        WHERE members.course_id = #{@course.id} ORDER BY #{sort_type} #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
           SELECT SUM(student_works.work_score)
@@ -1171,11 +1190,13 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+        ) AS act_score
         FROM members
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
-        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY score #{score_sort_by}"
+        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY #{sort_type} #{score_sort_by}"
     end
     sql = ActiveRecord::Base.connection()
     homework_scores = Member.find_by_sql(sql_select)
@@ -1225,8 +1246,7 @@ class CoursesController < ApplicationController
       sheet1[5,i+4] = "第"+(i+1).to_s+"次"
     end
     sheet1[5,homeworks.count+4] = "总成绩"
-    sheet1[5,0] = "排名"
-    sheet1[5,0] = "排名"
+    sheet1[5,homeworks.count+5] = "活跃度"
     count_row = 6
     members.each_with_index do |member, i|
       sheet1[count_row,0]= i+1
@@ -1236,14 +1256,15 @@ class CoursesController < ApplicationController
       homeworks.each_with_index do |homework, j|
         student_works = homework.student_works.where("user_id = #{member.user.id}")
         if student_works.empty?
-          sheet1[count_row,j+4] = format("%0.2f",0)
+          sheet1[count_row,j+4] = 0
         else
           final_score = student_works.first.final_score.nil? ? 0 : student_works.first.final_score
           score = final_score - student_works.first.absence_penalty - student_works.first.late_penalty
-          sheet1[count_row,j+4] = format("%0.2f",score <0 ? 0:score)
+          sheet1[count_row,j+4] = score <0 ? 0:score.round(2)
         end
       end
-      sheet1[count_row,homeworks.count+4] = format("%0.2f",member.score.nil? ? 0:member.score.to_s)
+      sheet1[count_row,homeworks.count+4] = member.score.nil? ? 0:member.score.round(2)
+      sheet1[count_row,homeworks.count+5] = member.act_score.nil? ? 0:member.act_score
       count_row += 1
     end
 
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index bf69c3a61..ef8a43d5c 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -24,16 +24,24 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
         <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
-        <li style="margin-left: 25px;">
-          <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
-          <% if @score_sort_by == 'desc' %>
+        <li style="padding-right: 55px; margin-left: 160px;"><a href="">分班</a></li>
+        <li class="st_list_score ml10">
+          <%= link_to '作业积分', member_score_sort_course_path(:sort_type => 'score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml25'%>
+          <% if @sort_type == "score" && @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
-          <% else %>
+          <% elsif @sort_type == "score" && @score_sort_by == 'asc' %>
               <a id="pic" href="javascript:" class= "st_up"></a>
           <% end %>
         </li>
-        <li class="ml50"><a href="javascript:void(0)" >加入时间</a></li>
+        <li class="st_list_score">
+          <%= link_to '活跃度', member_score_sort_course_path(:sort_type => 'act_score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml35'%>
+          <% if @sort_type == "act_score" && @score_sort_by == 'desc' %>
+              <a id="pic" href="javascript:" class= "st_down"></a>
+          <% elsif @sort_type == "act_score" && @score_sort_by == 'asc' %>
+              <a id="pic" href="javascript:" class= "st_up"></a>
+          <% end %>
+        </li>
+        <li class="ml20"><a href="javascript:void(0)" >加入时间</a></li>
       </ul>
       <div class="cl"></div><!--st_box_top end-->
 
@@ -61,21 +69,21 @@
             </ul>
             <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
                 <% if @course.course_groups.nil? || @group %>
-                    <div class="select-class-option fl" style="margin-left: 105px;">
+                    <div class="select-class-option fl" style="margin-left: 5px;">
                       <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                     </div>
                 <% else %>
                     <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
-                        <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                        <div class="select-class-option fl" style="margin-left: 5px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                           <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a>
                         </div>
                         <%= select( :name,:group_id, course_group_option(@course),
                                     { :include_blank => false,:selected => member.course_group_id},
-                                    {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
+                                    {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 5px;"}) %>
                     <% end %>
                 <% end %>
             <% else %>
-                <div class="select-class-option fl" style="margin-left: 105px;">
+                <div class="select-class-option fl" style="margin-left: 5px;">
                   <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                 </div>
             <% end %>
@@ -83,7 +91,12 @@
                     :action => 'show_member_score',
                     :member_id => member.id,
                     :remote => true},
-                        :class => 'ml25 c_red' %>
+                        :class => 'st_list_score c_red' %>
+            <%= link_to member.act_score.nil? ? 0 : member.act_score.to_s, {
+                    :action => 'show_member_act_score',
+                    :member_id => member.id,
+                    :remote => true},
+                        :class => 'st_list_score c_red' %>
             <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
             <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
           </div>
diff --git a/app/views/courses/_show_member_act_score.html.erb b/app/views/courses/_show_member_act_score.html.erb
new file mode 100644
index 000000000..cec17f0b8
--- /dev/null
+++ b/app/views/courses/_show_member_act_score.html.erb
@@ -0,0 +1,38 @@
+<style>
+    .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
+    .tscore_box li{ height:25px;}
+</style>
+
+
+<div class="tscore_con" id="user_score">
+  <% act_score = CourseContributorScore.where("user_id = ? and course_id = ?", member.user_id, member.course_id).first %>
+  <h2><%= member.user.show_name %> 活跃度计算</h2>
+  <% if act_score.nil? %>
+      <div style="padding-left: 40px;padding-bottom: 2px;padding-right: 2px;padding-top: 10px;">
+        资源发布数 x 5 = 0 x 5 = 0</br>
+        问答发布数 x 2 = 0 x 2 = 0</br>
+        通知发布数 x 1 = 0 x 1 = 0</br>
+        问答回帖数 x 1 = 0 x 1 = 0</br>
+        作业留言数 x 1 = 0 x 1 = 0</br>
+        通知留言数 x 1 = 0 x 1 = 0</br>
+        课程留言数  x 1 = 0 x 1 = 0</br>
+        总得分：0
+      </div>
+  <% else %>
+      <% total_score = act_score.resource_num.to_i * 5 + act_score.message_num.to_i * 2 +
+              act_score.message_reply_num.to_i * 1 + act_score.journal_num.to_i * 1 +
+              + act_score.homework_journal_num.to_i * 1 + act_score.news_reply_num.to_i * 1 +
+              act_score.news_num.to_i * 1 %>
+      <div style="padding-left: 40px;padding-bottom: 2px;padding-right: 2px;padding-top: 10px;">
+        资源发布数 x 5 = <%= act_score.resource_num.to_i %> x 5 = <%= act_score.resource_num.to_i * 5 %></br>
+        问答发布数 x 2 = <%= act_score.message_num.to_i %> x 2 = <%= act_score.message_num.to_i * 2 %></br>
+        通知发布数 x 1 = <%= act_score.news_num.to_i %> x 1 = <%= act_score.news_num.to_i %></br>
+        问答回帖数 x 1 = <%= act_score.message_reply_num.to_i %> x 1 = <%= act_score.message_reply_num.to_i %></br>
+        作业留言数 x 1 = <%= act_score.homework_journal_num.to_i %> x 1 = <%= act_score.homework_journal_num.to_i %></br>
+        通知留言数 x 1 = <%= act_score.news_reply_num.to_i %> x 1 = <%= act_score.news_reply_num.to_i %></br>
+        课程留言数  x 1 = <%= act_score.journal_num.to_i %> x 1 = <%= act_score.journal_num.to_i %></br>
+        总得分：<%=total_score %>
+      </div>
+  <% end %>
+
+</div>
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 94d282cec..27b3863b0 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score)  %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score.nil? ? 0 : (@member_score.student_work_score_sum).first.score)  %></span></li>
     </ul>
 
   </div>
diff --git a/app/views/courses/deletegroup.js.erb b/app/views/courses/deletegroup.js.erb
index cb7e1fbb1..f0c0f4be3 100644
--- a/app/views/courses/deletegroup.js.erb
+++ b/app/views/courses/deletegroup.js.erb
@@ -1 +1,2 @@
-$("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
\ No newline at end of file
+$("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
\ No newline at end of file
diff --git a/app/views/courses/show_member_act_score.js.erb b/app/views/courses/show_member_act_score.js.erb
new file mode 100644
index 000000000..c6327d164
--- /dev/null
+++ b/app/views/courses/show_member_act_score.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_member_act_score', :locals => {:member => @member}) %>');
+showModal('ajax-modal', '300px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span>" +
+        "<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: 275px;' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("new-watcher");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 0feb60098..451d3e0a7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1060,6 +1060,7 @@ RedmineApp::Application.routes.draw do
       match "addgroups",  :via => [:post, :get]
       match 'deletegroup', :via => [:delete]
       match 'show_member_score', :via => [:get]
+      match 'show_member_act_score', :via => [:get]
       match 'valid_ajax', :to => 'courses#valid_ajax', :via => :get
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
diff --git a/db/migrate/20160517013659_alter_course_contributor_score_default.rb b/db/migrate/20160517013659_alter_course_contributor_score_default.rb
new file mode 100644
index 000000000..488dab848
--- /dev/null
+++ b/db/migrate/20160517013659_alter_course_contributor_score_default.rb
@@ -0,0 +1,52 @@
+class AlterCourseContributorScoreDefault < ActiveRecord::Migration
+  def up
+    change_column :course_contributor_scores, :message_num, :integer, :default => 0
+    change_column :course_contributor_scores, :message_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :news_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :news_num, :integer, :default => 0
+    change_column :course_contributor_scores, :resource_num, :integer, :default => 0
+    change_column :course_contributor_scores, :journal_num, :integer, :default => 0
+    change_column :course_contributor_scores, :journal_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :homework_journal_num, :integer, :default => 0
+    change_column :course_contributor_scores, :total_score, :integer, :default => 0
+
+    count = CourseContributorScore.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        CourseContributorScore.page(i).per(30).each do |cs|
+          if cs.message_num.nil?
+            cs.message_num = 0
+          end
+          if cs.message_reply_num.nil?
+            cs.message_reply_num = 0
+          end
+          if cs.news_reply_num.nil?
+            cs.news_reply_num = 0
+          end
+          if cs.news_num.nil?
+            cs.news_num = 0
+          end
+          if cs.resource_num.nil?
+            cs.resource_num = 0
+          end
+          if cs.journal_num.nil?
+            cs.journal_num = 0
+          end
+          if cs.journal_reply_num.nil?
+            cs.journal_reply_num = 0
+          end
+          if cs.homework_journal_num.nil?
+            cs.homework_journal_num = 0
+          end
+          if cs.total_score.nil?
+            cs.total_score = 0
+          end
+          cs.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d5334c43c..9b317fd9e 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 => 20160511055221) do
+ActiveRecord::Schema.define(:version => 20160517013659) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -450,15 +450,15 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
   create_table "course_contributor_scores", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
-    t.integer  "message_num"
-    t.integer  "message_reply_num"
-    t.integer  "news_reply_num"
-    t.integer  "resource_num"
-    t.integer  "journal_num"
-    t.integer  "journal_reply_num"
+    t.integer  "message_num",          :default => 0
+    t.integer  "message_reply_num",    :default => 0
+    t.integer  "news_reply_num",       :default => 0
+    t.integer  "resource_num",         :default => 0
+    t.integer  "journal_num",          :default => 0
+    t.integer  "journal_reply_num",    :default => 0
     t.datetime "created_at",                          :null => false
     t.datetime "updated_at",                          :null => false
-    t.integer  "total_score"
+    t.integer  "total_score",          :default => 0
     t.integer  "homework_journal_num", :default => 0
     t.integer  "news_num",             :default => 0
   end
@@ -1107,6 +1107,23 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1328,6 +1345,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) 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|
@@ -2043,6 +2061,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) 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/stylesheets/courses.css b/public/stylesheets/courses.css
index 758e59296..cd9f88651 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -560,6 +560,8 @@ a:hover.st_img { border:1px solid #1c9ec7; }
 a:hover.st_add{ color:#ff8e15;}
 .classbox_on{ border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
 .classbox_on a{ color:#716cad;}
+.st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;}
+
 /* 创建课程courses*/
 .courses_input{ border:1px solid #64bdd9; height:16px; width:532px; background:#fff; margin-bottom:10px; padding:5px;}
 .courses_input_w{ width:300px;}

From 55a98d8d6e89805a268774c0fdca6f47dd9fac9d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 15:33:16 +0800
Subject: [PATCH 14/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb            | 4 ++++
 app/views/users/_user_message_course.html.erb | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 4b5ac227f..68b747ab9 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -260,6 +260,10 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.jour.user_id
           self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
         end
+      else
+        if self.user_id != self.parent.user_id
+          self.course_messages << CourseMessage.new(:user_id => self.parent.user_id,:course_id => self.jour.course.id, :viewed => false)
+        end
       end
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
       if count == 0
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index a80a08e42..bab7bb5ec 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -389,7 +389,13 @@
                     <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
                   <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了您的作业：</span>
+                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                      <% if ma.course_message.m_parent_id.nil? %>
+                          回复了您的作业：
+                      <% else %>
+                          回复了您：
+                      <% end %>
+                    </span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, homework_common_index_url_in_org( ma.course_id),

From ddafa7983595a4424d85779f29001197a8ad533c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 15:52:24 +0800
Subject: [PATCH 15/72] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A5=BC=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_comment_reply.html.erb        | 2 +-
 app/views/users/_user_homework_detail.html.erb | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
index ddc654463..895eda8a9 100644
--- a/app/views/users/_comment_reply.html.erb
+++ b/app/views/users/_comment_reply.html.erb
@@ -1,6 +1,6 @@
 <div class="orig_cont clearfix">
   <% unless comment.parent.nil? %>
-      <div id="comment_reply_<%=comment.id %>">
+      <div>
         <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
       </div>
   <% end %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index b8c5c2017..decaba88c 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -352,12 +352,16 @@
                           <% else %>
                             <div class="orig_cont clearfix">
                               <div class="orig_cont clearfix">
-                                <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                <div>
                                   <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
                                 </div>
                                 <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
                               </div>
-                              <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                              <div class="orig_cont_hide clearfix">
+                                <span class="orig_icon" >&darr; </span>
+                                <span class="orig_icon" style="display:none;" > &uarr;</span>
+                                <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
+                              </div>
                               <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
                             </div>
                           <% end %>

From 0ac7163b0548df08fc21f1df0c321a5a6ef0c015 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 15:55:24 +0800
Subject: [PATCH 16/72] =?UTF-8?q?KE=E4=BF=AE=E6=94=B9=E5=B1=85=E4=B8=AD?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E5=B1=85=E4=B8=AD=E6=B6=88=E5=A4=B1=E7=9A=84?=
 =?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/assets/kindeditor/kindeditor.js |  4 +--
 public/javascripts/homework.js         | 41 --------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 9ae1300e7..12db483b8 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -249,7 +249,7 @@ K.options = {
 	themeType : 'default',
 	langType : 'zh_CN',
 	urlType : '',
-	newlineTag : 'p',
+	newlineTag : 'br',
 	resizeType : 1,
 	syncType : 'form',
 	pasteType : 2,
@@ -2539,7 +2539,7 @@ function _nativeCommand(doc, key, val) {
 function _nativeCommandValue(doc, key) {
 	var val = '';
 	try {
-		val = doc.queryCommandValue(key);
+		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
 	} catch (e) {}
 	if (typeof val !== 'string') {
 		val = '';
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index a4b30384a..45d8de48b 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -11,15 +11,12 @@ $(function(){
         var title = $('#program-title').val();
 
         if (!src) {
-//            alert('请输入正确的代码');
-
             var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入正确的代码!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
             pop_up_box(htmlvalue,580,30,50);
 
             return false;
         }
         if (!title) {
-//            alert('请输入标题');
             var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入标题!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
             pop_up_box(htmlvalue,580,30,50);
             return false;
@@ -39,31 +36,6 @@ $(function(){
             $('#test-program-btn').show();
             return;
         }
-        /*
-        $.post(
-            '/student_work/program_test_ex',
-            {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test},
-            function(data,status){
-                tested = true;
-                console.log(data);
-                if(data.index <=0){
-                    data.index = $('.ProResultTop').length+1;
-                }
-
-                if (typeof cb == 'function') {cb(data); return;}
-
-                var html=bt('t:result-list',data);
-                $('.ProResult').prepend(html);
-
-                if (data.status==0 && is_test != 'true') {
-                    var r=confirm("答题正确，是否立刻提交?");
-                    if (r) {
-                        $(".HomeWorkCon form").submit();
-                    }
-                }
-            }
-        );
-        */
         //先测试一次并返回测试集个数及结果再判断是否需要继续进行测试
         var test_post = function(i, testid){
             $.post(
@@ -73,7 +45,6 @@ $(function(){
                 testid: testid},
                 function(data,status){
                     if (data.status==-4 || data.status==-5 ){
-//                        alert("非常抱歉，您的程序引起了后台问题，请在公共贴吧提交您的代码进行意见反馈，谢谢！");
                         //弹框
                         var root_path = getRootPath();
                         var forums_1_path = root_path + "/forums/1"
@@ -84,7 +55,6 @@ $(function(){
                         return;
                     }
                     else if (data.status==-3){
-//                        alert("对不起,服务器繁忙请稍后再试!");
                         var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                         $('#test-program-btn').show();
@@ -122,11 +92,9 @@ $(function(){
                 }
             ).fail(function(xhr, status){
                     if(status == 'timeout'){
-//                        alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
                         var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     } else {
-//                        alert("对不起,服务器繁忙请稍后再试!");
                         var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     }
@@ -146,11 +114,6 @@ $(function(){
             return;
         }
         if($('.ProResult .ProResultTop').length<=0){
-//            var r=confirm("测试后才能提交，是否立刻测试?");
-//            if (r) {
-//                test_program();
-//            }
-
             var htmlvalue = "</br><div style='width:550px;text-align:center'>测试后才能提交，是否立刻测试?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' id='code-test-button' class='Blue-btn fl'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>";
             pop_up_box(htmlvalue,580,30,50);
             $("#code-test-button").on('click',function(){
@@ -162,10 +125,6 @@ $(function(){
         if (!tested) {
             test_program(function(data){
                 if (data.status!=0) {
-//                    var r=confirm("测试不通过，是否强制提交?");
-//                    if (!r) {
-//                        return;
-//                    }
                     var htmlvalue = "</br><div style='width:550px;text-align:center'>测试不通过，是否强制提交?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='submit_code()'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div><script>function submit_code(){$('.HomeWorkCon form').submit();hideModal();}</script>";
                     pop_up_box(htmlvalue,580,30,50);
                     return;

From 1767e1200d5984f0f751d2a239c23dc776da088c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 17 May 2016 15:56:06 +0800
Subject: [PATCH 17/72] =?UTF-8?q?school=E4=B8=8D=E7=94=A8Base64=E8=A7=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=B8=A4=E8=BE=B9=E9=83=BD=E6=98=AFutf8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/sso.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/sso.rb b/app/models/sso.rb
index a58b5e442..c987ff933 100644
--- a/app/models/sso.rb
+++ b/app/models/sso.rb
@@ -17,7 +17,7 @@ class Sso < ActiveRecord::Base
     sso.openid   = opt["openid"]
     sso.email    = opt["email"]
     sso.password = opt["password"]
-    sso.school   = Base64.decode64(opt["school"]).force_encoding('utf-8')
+    sso.school   = opt["school"]
     sso.sex      = opt["sex"]
 
 

From 28edaf2246f38a7807f592fa2f9a12cafc2f737d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 10:57:56 +0800
Subject: [PATCH 18/72] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=EF=BC=9A=E5=BF=AB=E9=80=9F=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E9=87=8D=E5=A4=8D=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  4 ++--
 app/views/courses/_courses_jours.html.erb     | 23 +++++++++----------
 app/views/projects/_project_jours.html.erb    | 23 ++++++++++++-------
 app/views/words/_new_respond_course.html.erb  |  4 ++--
 app/views/words/_new_respond_project.html.erb |  3 ++-
 public/javascripts/init_KindEditor.js         | 13 +++++++----
 6 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f31edad1..da3b3b4d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org/'
-### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
+### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
 end
 
-gem 'certified'
+#gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index c7e4a7428..1050a59b9 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -36,7 +36,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
-            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
+            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="new_message_submit_btn_" >留言</a>
         <% end %>
       </div>
   <% end %>
@@ -55,9 +55,6 @@
 <script type="text/javascript">
 
     $(function(){
-        $("#submit_feedback_course").one('click',function() {
-            $("#course_feedback_new").submit();
-        });
         KindEditor.ready(function(K){
             $("a[nhname='reply_btn']").live('click',function(){
                 var params = {};
@@ -68,15 +65,18 @@
                 params.textarea = $("textarea[name='user_notes']",params.div_form);
                 params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
                 params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.submit_btn = $("input[nhname='submit_btn']",params.div_form);
                 params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
                 params.height = 55;
-                if(params.textarea.data('init') == undefined){
-                    params.editor = init_editor(params);
-                    init_form(params);
-                    params.cancel_btn.click(function(){
-                        nh_reset_form(params);
-                    });
-                }
+                params.editor = init_editor(params);
+                init_form(params);
+                params.cancel_btn.click(function(){
+                    nh_reset_form(params);
+                });
+                params.submit_btn.one('click', function () {
+                    params.form.submit();
+                });
+                params.textarea.data('init',1);
                 params.cancel_btn.click();
                 toggleAndSettingWordsVal(params.div_form, params.textarea);
                 setTimeout(function(){
@@ -86,7 +86,6 @@
                         params.textarea.hide();
                     }
                 },300);
-                params.textarea.data('init',1);
             });
         });
     });
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 6095bac96..eacc2a152 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -80,6 +80,9 @@
                     if(params.content.isEmpty()){
                         params.contentmsg.html('内容不能为空');
                         params.contentmsg.css({color:'#ff0000'});
+                        params.submit_btn.one('click', function(){
+                            params.form.submit();
+                        });
                     }else{
                         params.contentmsg.html('填写正确');
                         params.contentmsg.css({color:'#008000'});
@@ -124,7 +127,9 @@
                     issubmit:true,
                     content:params.editor,
                     contentmsg:params.contentmsg,
-                    textarea:params.textarea
+                    textarea:params.textarea,
+                    submit_btn:params.submit_btn,
+                    form:params.form
                 });
                 if(is_checked){
                     if(flag){
@@ -161,13 +166,15 @@
                 params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
                 params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
                 params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
-                if(params.textarea.data('init') == undefined){
-                    params.editor = init_editor(params);
-                    init_form(params);
-                    params.cancel_btn.click(function(){
-                        nh_reset_form(params);
-                    });
-                }
+                params.submit_btn = $("input[nhname='submit_btn']",params.div_form);
+                params.editor = init_editor(params);
+                init_form(params);
+                params.submit_btn.one('click', function () {
+                    params.form.submit();
+                });
+                params.cancel_btn.click(function(){
+                    nh_reset_form(params);
+                });
                 params.cancel_btn.click();
                 toggleAndSettingWordsVal(params.div_form, params.textarea);
                 setTimeout(function(){
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 3be435b15..88581b3bf 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -12,8 +12,8 @@
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-    <!--<input nhname="submit_btn" type="button" class="reply_btn" value="<%#=l(:button_feedback_respond) %>"/>-->
-    <%= submit_tag l(:button_feedback_respond), :name => nil ,
+    <input nhname="submit_btn" type="button" class="reply_btn" value="<%=l(:button_feedback_respond) %>"/>
+    <%#= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
 <% end %>
\ No newline at end of file
diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb
index c3ff241b3..4430735a2 100644
--- a/app/views/words/_new_respond_project.html.erb
+++ b/app/views/words/_new_respond_project.html.erb
@@ -11,7 +11,8 @@
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-    <%= submit_tag l(:button_feedback_respond), :name => nil ,
+    <input nhname="submit_btn" type="button" class="reply_btn" value="<%=l(:button_feedback_respond) %>"/>
+    <%#= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
 
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index f9b94e2d3..0f934e88e 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -1,5 +1,5 @@
 function init_editor(params){
-   // var minHeight;  //最小高度
+    // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
@@ -7,7 +7,7 @@ function init_editor(params){
         resizeType : 1,minWidth:"1px",width:paramsWidth,
         height:"30px",// == undefined ? "30px":paramsHeight+"px",
         minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
-            items:['emoticons'],
+        items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             var edit = this.edit;
@@ -49,6 +49,9 @@ function nh_check_field(params){
             if(params.content.isEmpty()){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
+                params.submit_btn.one('click', function(){
+                    params.form.submit();
+                });
             }else{
                 params.contentmsg.html('填写正确');
                 params.contentmsg.css({color:'#008000'});
@@ -68,7 +71,9 @@ function init_form(params){
             issubmit:true,
             content:params.editor,
             contentmsg:params.contentmsg,
-            textarea:params.textarea
+            textarea:params.textarea,
+            submit_btn:params.submit_btn,
+            form:params.form
         });
         if(is_checked){
             if(flag){
@@ -115,7 +120,7 @@ function init_KindEditor_data(id){
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
                 });
-                params.submit_btn.click(function () {
+                params.submit_btn.one('click', function () {
                     params.form.submit();
                 });
                 params.textarea.data('init', 1);

From 617649129e9443fec65649caece21e9bb1404330 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 11:20:14 +0800
Subject: [PATCH 19/72] Gemfile

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index da3b3b4d7..a599613ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-#gem 'certified'
+gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'

From 0e016eed2a3bcd1704ea9093ab2da9075f267cd3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 18 May 2016 14:15:39 +0800
Subject: [PATCH 20/72] =?UTF-8?q?KE=E4=B8=8A=E4=BC=A0=E9=9D=9E=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=A0=BC=E5=BC=8F=E6=97=B6=E5=BC=B9=E6=A1=86=E7=94=A8?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84,=E5=8D=9A=E5=AE=A2=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E5=8F=91=E5=B8=96=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blogs/_article.html.erb      | 2 +-
 public/assets/kindeditor/kindeditor.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 77aa3f9d8..550b1e4ef 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -43,7 +43,7 @@
                       <% count=activity.children.count%>
                   <% end %>
                   <li class="ml15">
-                    <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                    <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
                     <span class="grayTxt">更新：<%= format_time(activity.updated_on) %></span>
                     <p class="list-info fr grayTxt">
                         <span><%= count>0 ? "#{count}" :"0" %></span>
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 12db483b8..c86a9ccd3 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5694,7 +5694,9 @@ _plugin('core', function(K) {
                 }
             } else {
                 //alert(data.message);
-                alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
+//                alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
+                var htmlvalue = "</br><div style='width:550px;text-align:center'>仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+                pop_up_box(htmlvalue,580,30,50);
             }
         },
         afterError : function(str) {

From 3b3cafbc81e0daba276025233336a58d87f9f4f1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 14:49:49 +0800
Subject: [PATCH 21/72] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  6 +++---
 app/controllers/student_work_controller.rb    |  2 +-
 app/models/homework_common.rb                 | 16 ++++++++--------
 app/models/message.rb                         |  4 ++--
 app/models/news.rb                            |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 689ef2bd7..0566d3d98 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -291,9 +291,9 @@ class HomeworkCommonController < ApplicationController
 
   def open_student_works
     if @homework.is_open == 0
-      @homework.update_attribute(:is_open, 1)
+      @homework.update_column('is_open', 1)
     else
-      @homework.update_attribute(:is_open, 0)
+      @homework.update_column('is_open', 0)
     end
     @user_activity_id = params[:user_activity_id]
     @is_in_course = params[:is_in_course] if params[:is_in_course]
@@ -440,7 +440,7 @@ class HomeworkCommonController < ApplicationController
           puts time
           s_time = time
           if format_time(time) > format_time(h.updated_at)
-            h.update_attribute(:updated_at, s_time)
+            h.update_column('updated_at', s_time)
           end
         end
       end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index deab2feb6..c3d7dbbc6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -814,7 +814,7 @@ class StudentWorkController < ApplicationController
           stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
           @work.student_score = stu_score.first.score.try(:round, 2).to_f
       end
-      @homework.update_attributes(:updated_at => Time.now)
+      @homework.update_column('updated_at', Time.now)
       update_course_activity(@homework.class,@homework.id)
       update_user_activity(@homework.class,@homework.id)
       update_org_activity(@homework.class,@homework.id)
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index f11a48a80..e4426e78f 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -29,8 +29,8 @@ class HomeworkCommon < ActiveRecord::Base
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail
-  after_update :update_activity
+  after_create :act_as_activity, :send_mail,:act_as_course_message
+  after_update :update_activity, :wechat_message
   after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
@@ -59,12 +59,12 @@ class HomeworkCommon < ActiveRecord::Base
       else
         self.course.members.each do |m|
           # if m.user_id != self.user_id
-          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-          #count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
-          #if count == 0
-          #  ws = WechatService.new
-          #  ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
-          #end
+          #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
+          if count == 0
+            ws = WechatService.new
+            ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+          end
           # end
         end
       end
diff --git a/app/models/message.rb b/app/models/message.rb
index 7bfb9d80e..fdc3c6bdc 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -274,7 +274,7 @@ class Message < ActiveRecord::Base
       else    # 回帖
         parent_author_id = Message.find(self.parent_id).author_id
         if parent_author_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-          #self.course_messages << CourseMessage.new(:user_id => parent_author_id, :course_id => self.board.course_id, :viewed => false)
+          self.course_messages << CourseMessage.new(:user_id => parent_author_id, :course_id => self.board.course_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{parent_author_id} and shield_type='Course' and shield_id=#{self.board.course_id}").count
           if count == 0
             content = strip_html self.content.html_safe, 200
@@ -297,7 +297,7 @@ class Message < ActiveRecord::Base
       else    # 回帖
         parent_author_id = Message.find(self.parent_id).author_id
         if parent_author_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-          #self.forge_messages << ForgeMessage.new(:user_id => parent_author_id, :project_id => self.board.project_id, :viewed => false)
+          self.forge_messages << ForgeMessage.new(:user_id => parent_author_id, :project_id => self.board.project_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{parent_author_id} and shield_type='Project' and shield_id=#{self.board.project_id}").count
           if count == 0
             content = strip_html self.content.html_safe, 200
diff --git a/app/models/news.rb b/app/models/news.rb
index f0457dc81..1544faf61 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -169,7 +169,7 @@ class News < ActiveRecord::Base
     if self.course
       self.course.members.each do |m|
         if m.user_id != self.author_id
-          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new

From 52724bd9ed05b1896b6ca8ac1617fd1211bcd4a5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 18 May 2016 15:11:53 +0800
Subject: [PATCH 22/72] =?UTF-8?q?KE=20ol=20ul=E6=A0=87=E7=AD=BE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0margin-bottom:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/code/previewcode.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 15951ce98..65c75d6ea 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -53,4 +53,4 @@ span.at a{color:#269ac9;text-decoration: none;}
 /*yk*/
 .ke-content ol li{list-style-type: decimal;}
 .ke-content ul li{list-style-type: disc;}
-ol,ul{margin-top:0;}
\ No newline at end of file
+.ke-content ol,.ke-content ul{margin-top:0;margin-bottom: 0;}
\ No newline at end of file

From 670b2c48c7fc9e90344476dab512d82e58f6cf35 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 16:08:40 +0800
Subject: [PATCH 23/72] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=B6=88=E6=81=AF=E8=A6=81=E7=BB=86=E5=8C=96=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index d5d148117..b5e87feea 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -164,7 +164,20 @@ class Issue < ActiveRecord::Base
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Project' and shield_id=#{self.project_id}").count
       if m.user_id != self.author_id && count == 0
         ws = WechatService.new
-        content = strip_html self.project.name + " 有新缺陷了：" + self.subject.html_safe, 200
+        str = " 有新缺陷了： "
+        case self.tracker_id
+          when 1
+            str = " 有新缺陷了： "
+          when 2
+            str = " 有新功能了： "
+          when 3
+            str = " 有新支持了： "
+          when 4
+            str = " 有新任务了： "
+          when 5
+            str = " 有新周报了： "
+        end
+        content = strip_html self.project.name + str + self.subject.html_safe, 200
         ws.message_update_template m.user_id, "issues", self.id, "#{l(:label_new_issue_template)}", content, format_time(self.created_on)
       end
     end

From c208b79e2dea9d86e45afef7119de891bcba27b3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 18 May 2016 16:23:28 +0800
Subject: [PATCH 24/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E7=9A=84=E8=AF=AD=E8=A8=80=E5=8F=B3=E8=BE=B9?=
 =?UTF-8?q?=20=E5=8A=A0=E4=B8=8A=E7=BC=96=E8=AF=91=E5=99=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/new_user_commit_homework.html.erb | 9 +++++++++
 app/views/users/user_commit_homework.html.erb     | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 4d2a091eb..99789172b 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -92,6 +92,15 @@
           <input type="hidden" name="is_test" value="<%=@is_test%>">
           <div class="mt15">
             <span>请使用 <%= @homework.language_name %> 语言编写</span>
+            <% if @homework.language.to_i == 1 %>
+                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+            <% elsif @homework.language.to_i == 2 %>
+                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+            <% elsif @homework.language.to_i == 3 %>
+                <span class = "fr">编译器信息:Python version "2.6.6"</span>
+            <% elsif @homework.language.to_i == 4 %>
+                <span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span>
+            <% end %>
             <span data-language=<%=@homework.language%> style="display-hidden" id="data-language"></span>
             </div>
             <div class="mt10">
diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb
index 6df6f2115..043886779 100644
--- a/app/views/users/user_commit_homework.html.erb
+++ b/app/views/users/user_commit_homework.html.erb
@@ -75,6 +75,15 @@
 
           <div class="mt15">
             <span>请使用 <%= @homework.language_name %> 语言编写</span>
+            <% if @homework.language.to_i == 1 %>
+                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+            <% elsif @homework.language.to_i == 2 %>
+                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+            <% elsif @homework.language.to_i == 3 %>
+                <span class = "fr">编译器信息:Python version "2.6.6"</span>
+            <% elsif @homework.language.to_i == 4 %>
+                <span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span>
+            <% end %>
             </div>
           <div class="mt10">
               <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>

From 31d94dc0528fab9d66497b019ddf0218fd43b710 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 16:28:43 +0800
Subject: [PATCH 25/72] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=AF=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BD=9C=E4=B8=9A=E8=87=B3=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=8E=9F=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E6=94=B6=E5=88=B0=E5=BE=AE=E4=BF=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a81ade3fa..373801963 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -589,7 +589,7 @@ class UsersController < ApplicationController
         new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
         new_homework.homework_detail_group.save if new_homework.homework_detail_group
       end
-      homework.update_attribute(:quotes, homework.quotes+1)
+      homework.update_column(:quotes, homework.quotes+1)
     end
     @homework = homework
     respond_to do |format|
@@ -862,7 +862,7 @@ class UsersController < ApplicationController
 
       student_work.save
       send_message_to_teacher(student_work)
-      homework.update_attributes(:updated_at => Time.now)
+      homework.update_column(:updated_at, Time.now)
       update_course_activity(homework.class,homework.id)
       update_user_activity(homework.class,homework.id)
       update_org_activity(homework.class,homework.id)
@@ -950,7 +950,7 @@ class UsersController < ApplicationController
           homework_detail_group.save if homework_detail_group
           if params[:quotes] && !params[:quotes].blank?
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
-            quotes_homework.update_attribute(:quotes, quotes_homework.quotes+1)
+            quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
           end
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)

From 1b3bc38f8e132cfcf1653ddc1e2bf2f675ab81c4 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 19 May 2016 13:44:03 +0800
Subject: [PATCH 26/72] =?UTF-8?q?=E6=8B=96=E4=BB=A3=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock~                                 |  386 ++++
 Gemfile~                                      |  112 +
 db/schema.rb                                  |    4 +-
 lib/wechat/bin/wechat                         |    0
 public/assets/wechat/blog_detail.html         |    4 +-
 .../javascripts/code_review.js                |  706 +++---
 .../stylesheets/activity.css                  |    6 +-
 .../stylesheets/code_review.css               |  192 +-
 .../stylesheets/window_js/MIT-LICENSE         |   38 +-
 .../stylesheets/window_js/alert.css           |  238 +-
 .../stylesheets/window_js/alert_lite.css      |  176 +-
 .../stylesheets/window_js/alphacube.css       |  300 +--
 .../stylesheets/window_js/behavior.htc        |  100 +-
 .../stylesheets/window_js/darkX.css           |  242 +--
 .../stylesheets/window_js/debug.css           |   50 +-
 .../stylesheets/window_js/default.css         |  310 +--
 .../stylesheets/window_js/iefix/iepngfix.css  |    6 +-
 .../stylesheets/window_js/iefix/iepngfix.htc  |  106 +-
 .../stylesheets/window_js/lighting.css        | 1920 ++++++++---------
 .../window_js/lighting/pngbehavior.htc        |  134 +-
 .../stylesheets/window_js/mac_os_x.css        |  666 +++---
 .../stylesheets/window_js/mac_os_x_dialog.css |  320 +--
 .../stylesheets/window_js/nuncio.css          |  328 +--
 .../stylesheets/window_js/spread.css          |  216 +-
 24 files changed, 3530 insertions(+), 3030 deletions(-)
 create mode 100644 Gemfile.lock~
 create mode 100644 Gemfile~
 mode change 100644 => 100755 lib/wechat/bin/wechat

diff --git a/Gemfile.lock~ b/Gemfile.lock~
new file mode 100644
index 000000000..7d6563465
--- /dev/null
+++ b/Gemfile.lock~
@@ -0,0 +1,386 @@
+GIT
+  remote: http://github.com/guange2015/wechat.git
+  revision: a18c3d6603cb1aa7bd1fe887b17f67426be01f35
+  specs:
+    wechat (0.7.1)
+      activerecord (>= 3.2, < 5.1.x)
+      http (~> 1.0, >= 1.0.1)
+      nokogiri (>= 1.6.0)
+      thor
+
+PATH
+  remote: lib/gitlab-cli
+  specs:
+    gitlab (3.2.0)
+      httparty
+      terminal-table
+
+PATH
+  remote: lib/grack
+  specs:
+    grack (2.0.2)
+      rack (~> 1.4.5)
+
+PATH
+  remote: lib/rails_kindeditor
+  specs:
+    rails_kindeditor (0.4.5)
+      carrierwave
+      mini_magick
+
+GEM
+  remote: https://ruby.taobao.org/
+  specs:
+    actionmailer (3.2.22.2)
+      actionpack (= 3.2.22.2)
+      mail (~> 2.5.4)
+    actionpack (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22.2)
+      activesupport (= 3.2.22.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+    activesupport (3.2.22.2)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (2.4.1)
+      rails (>= 3, < 5)
+    addressable (2.4.0)
+    ansi (1.5.0)
+    arel (3.0.3)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    better_errors (1.1.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    builder (3.0.0)
+    byebug (8.2.2)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    chinese_pinyin (1.0.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    daemons (1.2.3)
+    debug_inspector (0.0.2)
+    delayed_job (4.1.1)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.1.0)
+      activerecord (>= 3.0, < 5)
+      delayed_job (>= 3.0, < 5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    domain_name (0.5.20160216)
+      unf (>= 0.0.5, < 1.0.0)
+    elasticsearch (1.0.15)
+      elasticsearch-api (= 1.0.15)
+      elasticsearch-transport (= 1.0.15)
+    elasticsearch-api (1.0.15)
+      multi_json
+    elasticsearch-model (0.1.8)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.8)
+    elasticsearch-transport (1.0.15)
+      faraday
+      multi_json
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    execjs (2.6.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    fastercsv (1.5.5)
+    grape (0.9.0)
+      activesupport
+      builder
+      hashie (>= 2.1.0)
+      multi_json (>= 1.3.2)
+      multi_xml (>= 0.5.2)
+      rack (>= 1.3.0)
+      rack-accept
+      rack-mount
+      virtus (>= 1.0.0)
+    grape-entity (0.4.8)
+      activesupport
+      multi_json (>= 1.3.2)
+    grape-swagger (0.10.4)
+      grape (>= 0.8.0)
+      grape-entity (< 0.5.0)
+    hashie (3.4.3)
+    hike (1.2.3)
+    htmlentities (4.3.4)
+    http (1.0.2)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
+    http_parser.rb (0.6.0)
+    httparty (0.13.7)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    i18n (0.6.11)
+    ice_nine (0.11.2)
+    iconv (1.0.4)
+    journey (1.0.4)
+    jquery-rails (2.0.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
+    json (1.8.3)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    libv8 (3.16.14.13)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_magick (4.4.0)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    mysql2 (0.3.18)
+    net-ldap (0.3.1)
+    netrc (0.11.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    paperclip (3.5.4)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    polyglot (0.3.5)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
+      pry (~> 0.10)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
+    pry-stack_explorer (0.4.9.2)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    rack (1.4.7)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-cache (1.6.1)
+      rack (>= 0.4)
+    rack-cors (0.4.0)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-openid (1.4.2)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-raw-upload (1.1.1)
+      multi_json
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.22.2)
+      actionmailer (= 3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activerecord (= 3.2.22.2)
+      activeresource (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      bundler (~> 1.0)
+      railties (= 3.2.22.2)
+    railties (3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    redis (3.2.2)
+    redis-actionpack (3.2.4)
+      actionpack (~> 3.2.0)
+      redis-rack (~> 1.4.4)
+      redis-store (~> 1.1.4)
+    redis-activesupport (3.2.5)
+      activesupport (~> 3.2.0)
+      redis-store (~> 1.1.0)
+    redis-rack (1.4.4)
+      rack (~> 1.4.0)
+      redis-store (~> 1.1.4)
+    redis-rails (3.2.4)
+      redis-actionpack (~> 3.2.4)
+      redis-activesupport (~> 3.2.4)
+      redis-store (~> 1.1.4)
+    redis-store (1.1.7)
+      redis (>= 2.2)
+    ref (2.0.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rich (1.4.6)
+      jquery-rails
+      kaminari
+      mime-types
+      paperclip
+      rack-raw-upload
+      rails (>= 3.2.0)
+      sass-rails
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    ruby-ole (1.2.12)
+    ruby-openid (2.1.8)
+    rubyzip (1.2.0)
+    sass (3.4.21)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    seems_rateable (1.0.13)
+      jquery-rails
+      rails
+    slop (3.6.0)
+    spreadsheet (1.1.1)
+      ruby-ole (>= 1.0)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    terminal-table (1.5.2)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.46)
+    uglifier (2.7.2)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts-as-taggable-on (= 2.4.1)
+  ansi
+  better_errors (~> 1.1.0)
+  binding_of_caller
+  builder (= 3.0.0)
+  chinese_pinyin
+  coderay (~> 1.1.0)
+  coffee-rails (~> 3.2.1)
+  daemons
+  delayed_job_active_record
+  elasticsearch-model
+  elasticsearch-rails
+  factory_girl_rails
+  fastercsv (~> 1.5.0)
+  gitlab!
+  grack!
+  grape (~> 0.9.0)
+  grape-entity
+  grape-swagger
+  htmlentities
+  i18n (~> 0.6.0)
+  iconv
+  jquery-rails (~> 2.0.2)
+  kaminari
+  mysql2 (= 0.3.18)
+  net-ldap (~> 0.3.1)
+  paperclip (~> 3.5.4)
+  pry-byebug
+  pry-rails
+  pry-stack_explorer
+  rack-cors
+  rack-openid
+  rails (~> 3.2)
+  rails_kindeditor!
+  redis-rails
+  rest-client
+  rich (= 1.4.6)
+  rspec-rails (~> 3.0)
+  ruby-ole
+  ruby-openid (~> 2.1.4)
+  rubyzip
+  sass-rails (~> 3.2.3)
+  seems_rateable (~> 1.0.13)
+  spreadsheet
+  therubyracer
+  uglifier (>= 1.0.3)
+  wechat!
+
+BUNDLED WITH
+   1.10.6
diff --git a/Gemfile~ b/Gemfile~
new file mode 100644
index 000000000..24869e72b
--- /dev/null
+++ b/Gemfile~
@@ -0,0 +1,112 @@
+source 'http://rubygems.org/'
+### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
+
+unless RUBY_PLATFORM =~ /w32/
+  # unix-like only
+  gem 'iconv'
+end
+
+gem 'certified'
+
+gem 'wechat',path: 'lib/wechat'
+gem 'grack', path:'lib/grack'
+gem 'gitlab', path: 'lib/gitlab-cli'
+gem 'rest-client'
+gem "mysql2", "= 0.3.18"
+gem 'redis-rails'
+gem 'rubyzip'
+gem 'delayed_job_active_record'#, :group => :production
+gem 'daemons'
+gem 'grape', '~> 0.9.0'
+gem 'grape-entity'
+gem 'rack-cors', :require => 'rack/cors'
+gem 'seems_rateable', '~> 1.0.13'
+gem 'rails', '~> 3.2'
+gem "jquery-rails", "~> 2.0.2"
+gem "i18n", "~> 0.6.0"
+gem 'coderay', '~> 1.1.0'
+gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+gem "builder", "3.0.0"
+gem 'acts-as-taggable-on', '2.4.1'
+gem 'spreadsheet'
+gem 'ruby-ole'
+gem 'rails_kindeditor',path:'lib/rails_kindeditor'
+#gem "rmagick", ">= 2.0.0"
+gem 'binding_of_caller'
+gem 'chinese_pinyin'
+# gem 'sunspot_rails', '~> 1.3.3'
+# gem 'sunspot_solr'
+# gem 'sunspot'
+# gem 'progress_bar'
+gem  'ansi'
+
+gem 'kaminari'
+gem 'elasticsearch-model'
+gem 'elasticsearch-rails'
+
+
+### profile
+#gem 'oneapm_rpm'
+
+group :development do
+  gem 'grape-swagger'
+  gem 'better_errors', '~> 1.1.0'
+  # gem "query_reviewer"
+  # gem 'rack-mini-profiler', '~> 0.9.3'
+  if RUBY_PLATFORM =~ /w32/
+    gem  'win32console'
+  end
+end
+
+group :development, :test do
+  unless RUBY_PLATFORM =~ /w32/
+    gem 'pry-rails'
+    if RUBY_VERSION >= '2.0.0'
+      gem 'pry-byebug'
+    end
+    gem 'pry-stack_explorer'
+    if RUBY_PLATFORM =~ /darwin/
+      gem 'puma'
+    end
+  end
+
+  gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails'
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+# Optional gem for LDAP authentication
+group :ldap do
+  gem "net-ldap", "~> 0.3.1"
+end
+
+
+# Optional gem for OpenID authentication
+group :openid do
+  gem "ruby-openid", "~> 2.1.4", :require => "openid"
+  gem "rack-openid"
+end
+
+
+database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+if File.exist?(database_file)
+else
+  warn("Please configure your config/database.yml first")
+end
+
+# Load plugins' Gemfiles
+Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end
diff --git a/db/schema.rb b/db/schema.rb
index d5334c43c..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 => 20160511055221) do
+ActiveRecord::Schema.define(:version => 20160513021204) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1328,6 +1328,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) 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|
@@ -2043,6 +2044,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) 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/lib/wechat/bin/wechat b/lib/wechat/bin/wechat
old mode 100644
new mode 100755
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index c1133f955..0eaa2cda7 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -3,7 +3,7 @@
 <div class="post-container">
     <div class="post-wrapper">
         <div class="post-main">
-            <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span></div>
+            <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><span ng-if="blog.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
             <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
             <div class="cl"></div>
             <div class="post-content" style="height:auto;">
@@ -32,7 +32,7 @@
                 </div>
             </div>
         </div>
-        <div class="post-input-wrap">
+        <div ng-if="!blog.locked" class="post-input-wrap">
             <div class="post-reply-row">
                 <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                 <div class="post-input-container">
diff --git a/public/plugin_assets/redmine_code_review/javascripts/code_review.js b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
index 4f4d81691..625f376c9 100644
--- a/public/plugin_assets/redmine_code_review/javascripts/code_review.js
+++ b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
@@ -1,354 +1,354 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009-2013  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-var topZindex = 1000;
-var action_type = '';
-var rev = '';
-var rev_to = '';
-var path = '';
-var urlprefix = '';
-var review_form_dialog = null;
-var add_form_title = null;
-var review_dialog_title = null;
-var repository_id = null;
-var filenames = [];
-
-var ReviewCount = function(total, open, progress){
-    this.total = total;
-    this.open = open;
-    this.closed = total - open;
-    this.progress = progress
-};
-
-var CodeReview = function(id) {
-    this.id = id;
-    this.path = '';
-    this.line = 0;
-    this.url = '';
-    this.is_closed = false;
-};
-
-var review_counts = new Array();
-var code_reviews_map = new Array();
-var code_reviews_dialog_map = new Array();
-
-function UpdateRepositoryView(title) {
-    var header = $("table.changesets thead tr:first");
-    var th = $('<th></th>');
-    th.html(title);
-    header.append(th);
-    $('tr.changeset td.id a').each(function(i){
-        var revision = this.getAttribute("href");
-        revision = revision.substr(revision.lastIndexOf("/") + 1);        
-        var review = review_counts['revision_' + revision];
-        var td = $('<td/>',{
-            'class':'progress'
-        });
-        td.html(review.progress);
-        $(this.parentNode.parentNode).append(td);
-    });
-    }
-//add function $.down
-if(! $.fn.down)
-(function($) {
-    $.fn.down = function() {
-        var el = this[0] && this[0].firstChild;
-        while (el && el.nodeType != 1)
-            el = el.nextSibling;
-        return $(el);
-    };
-})(jQuery);
-
-function UpdateRevisionView() {
-    $('li.change').each(function(){
-        var li = $(this);
-        if (li.hasClass('folder')) return;
-
-        var a = li.down('a');
-        if (a.size() == 0) return;
-        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
-
-        var reviewlist = code_reviews_map[path];
-        if (reviewlist == null) return;
-
-        var ul = $('<ul></ul>');
-        for (var j = 0; j < reviewlist.length; j++) {
-            var review = reviewlist[j];
-            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
-            var item = $('<li></li>', {
-                'class': 'icon ' + icon + ' code_review_summary'
-                });
-            item.html(review.url);
-            ul.append(item);
-        }
-        li.append(ul);
-    });
-}
-
-function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
-    var filetables = [];
-    var j = 0;
-    $('table').each(function(){
-        if($(this).hasClass('filecontent')){
-            filetables[j++] = this;
-        }
-    });
-    j = 0;
-    $('table.filecontent th.filename').each(function(){
-        filenames[j] = $.trim($(this).text());
-        j++;
-    });
-    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
-        '&rev=' + rev + '&rev_to=' + rev_to +
-        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
-    if (path != null && path.length > 0) {
-        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
-    }
-    var num = 0;
-    if (is_diff) {
-        num = 1;
-    }
-    var i, l, tl;
-    for (i = 0, tl = filetables.length; i < tl; i++) {
-        var table = filetables[i];
-        var trs = table.getElementsByTagName('tr');
-
-        for (j = 0,l = trs.length; j < l; j++) {
-            var tr = trs[j];
-            var ths = tr.getElementsByTagName('th');
-
-            var th = ths[num];
-            if (th == null) {
-                continue;
-            }
-
-            var th_html = th.innerHTML;
-
-            var line = th_html.match(/[0-9]+/);
-            if (line == null) {
-                continue;
-            }
-
-            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
-
-            if (!is_readonly) {
-                span_html += image_tag;
-            }
-            span_html += '</span>';
-            th.innerHTML = th_html + span_html;
-
-            var img = th.getElementsByTagName('img')[0];
-            if (img != null ) {
-                img.id = 'add_revew_img_' + line + '_' + i;
-                $(img).click(clickPencil);
-            }
-        }
-    }
-
-
-}
-
-function clickPencil(e)
-{
-//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
-    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
-    var line = result[1];
-    var file_count = eval(result[2]);
-    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
-
-    if (path == null || path.length == 0) {
-        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
-    }
-    addReview(url);
-    formPopup(e.pageX, e.pageY);
-    e.preventDefault();
-}
-var addReviewUrl = null;
-var showReviewUrl = null;
-var showReviewImageTag = null;
-var showClosedReviewImageTag = null;
-
-function setShowReviewButton(line, review_id, is_closed, file_count) {
-    //alert('file_count = ' + file_count);
-    var span = $('#review_span_' + line + '_' + file_count);
-    if (span.size() == 0) {
-        return;
-    }
-    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
-    span.append(innerSpan);
-    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
-    var div = $('<div></div>', {
-        'class':'draggable',
-        id: 'show_review_' + review_id
-    });
-    $('#code_review').append(div);
-    innerSpan.down('img').click(function(e) {
-        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
-        var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
-    });
-}
-
-function popupReview(review_id) {
-    var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-    $('html,body').animate({ scrollTop: pos.top },
-        {duration: 'fast',
-        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
-    // position and show popup dialog
-    // create popup dialog
-    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
-//    win.toFront();
-}
-
-function showReview(url, review_id, x, y) {
-    if (code_reviews_dialog_map[review_id] != null) {
-        var cur_win = code_reviews_dialog_map[review_id];
-        cur_win.hide();
-        code_reviews_dialog_map[review_id] = null;
-    }
-    $('#show_review_' + review_id).load(url, {review_id: review_id});
-    var review = getReviewObjById(review_id);
-
-    var win = $('#show_review_' + review_id).dialog({
-        show: {effect:'scale'},// ? 'top-left'
-        //position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: review_dialog_title
-    });
-//    win.getContent().style.color = "#484848";
-//    win.getContent().style.background = "#ffffff";
-    topZindex++;
-    code_reviews_dialog_map[review_id] = win;
-    return win
-}
-
-function getReviewObjById(review_id) {
-    for (var reviewlist in code_reviews_map) {
-        for (var i = 0; i < reviewlist.length; i++) {
-            var review = reviewlist[i];
-            if (review.id == review_id) {
-                return review;
-            }
-        }
-    }
-    return null;
-}
-
-function formPopup(x, y){
-    //@see http://docs.jquery.com/UI/Effects/Scale
-    var win = $('#review-form-frame').dialog({
-        show: {effect:'scale', direction: 'both'},// ? 'top-left'
-//        position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: add_form_title
-    });
-//    win.getContent().style.background = "#ffffff";
-    if (review_form_dialog != null) {
-        review_form_dialog.destroy();
-        review_form_dialog = null;
-    }
-    review_form_dialog = win;
-    topZindex += 10;
-    return false;
-}
-
-function hideForm() {
-    if (review_form_dialog == null) {
-        return;
-    }
-    review_form_dialog.dialog('close');
-    review_form_dialog = null;
-    $('#review-form').html('');
-}
-function addReview(url) {
-    $('#review-form').load(url);
-}
-
-function deleteReview(review_id) {
-    $('show_review_' + review_id).remove();
-    $('review_' + review_id).remove();
-    
-}
-
-function changeImage(review_id, is_closed) {
-    var span = $('review_' + review_id);
-    var new_image = null;
-    var dummy = new Element('span');
-    if (is_closed) {
-        dummy.insert(showClosedReviewImageTag);
-    }
-    else {
-        dummy.insert(showReviewImageTag);
-    }
-    new_image = dummy.down().getAttribute('src');
-    //alert(new_image);
-    span.down('img').setAttribute('src', new_image);
-
-}
-
-function make_addreview_link(project, link) {
-    var alist = $('#content p a');
-    if (alist == null) {
-        return;
-    }
-    var a = alist[0];
-    var p = a.parentNode;
-    p.innerHTML = p.innerHTML + " | " + link;
-}
-
-function call_update_revisions(url) {
-    var changeset_ids = '';
-    var links = $$('table.changesets tbody tr.changeset td.id a');
-    for (var i = 0; i < links.length; i++) {
-        var link = links[i];
-        var href = link.getAttribute('href');
-        var id = href.replace(/^.*\/revisions\//, '');
-        if (i > 0) {
-            changeset_ids += ',';
-        }
-        changeset_ids += id;
-    }
-    new Ajax.Updater('code_review_revisions', url,
-    {
-        evalScripts:true,
-        method:'get',
-        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
-    });
-}
-
-$.fn.serialize2json = function()
-{
-   var o = {};
-   var a = this.serializeArray();
-   $.each(a, function() {
-       if (o[this.name]) {
-           if (!o[this.name].push) {
-               o[this.name] = [o[this.name]];
-           }
-           o[this.name].push(this.value || '');
-       } else {
-           o[this.name] = this.value || '';
-       }
-   });
-   return o;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009-2013  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+var topZindex = 1000;
+var action_type = '';
+var rev = '';
+var rev_to = '';
+var path = '';
+var urlprefix = '';
+var review_form_dialog = null;
+var add_form_title = null;
+var review_dialog_title = null;
+var repository_id = null;
+var filenames = [];
+
+var ReviewCount = function(total, open, progress){
+    this.total = total;
+    this.open = open;
+    this.closed = total - open;
+    this.progress = progress
+};
+
+var CodeReview = function(id) {
+    this.id = id;
+    this.path = '';
+    this.line = 0;
+    this.url = '';
+    this.is_closed = false;
+};
+
+var review_counts = new Array();
+var code_reviews_map = new Array();
+var code_reviews_dialog_map = new Array();
+
+function UpdateRepositoryView(title) {
+    var header = $("table.changesets thead tr:first");
+    var th = $('<th></th>');
+    th.html(title);
+    header.append(th);
+    $('tr.changeset td.id a').each(function(i){
+        var revision = this.getAttribute("href");
+        revision = revision.substr(revision.lastIndexOf("/") + 1);        
+        var review = review_counts['revision_' + revision];
+        var td = $('<td/>',{
+            'class':'progress'
+        });
+        td.html(review.progress);
+        $(this.parentNode.parentNode).append(td);
+    });
+    }
+//add function $.down
+if(! $.fn.down)
+(function($) {
+    $.fn.down = function() {
+        var el = this[0] && this[0].firstChild;
+        while (el && el.nodeType != 1)
+            el = el.nextSibling;
+        return $(el);
+    };
+})(jQuery);
+
+function UpdateRevisionView() {
+    $('li.change').each(function(){
+        var li = $(this);
+        if (li.hasClass('folder')) return;
+
+        var a = li.down('a');
+        if (a.size() == 0) return;
+        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
+
+        var reviewlist = code_reviews_map[path];
+        if (reviewlist == null) return;
+
+        var ul = $('<ul></ul>');
+        for (var j = 0; j < reviewlist.length; j++) {
+            var review = reviewlist[j];
+            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
+            var item = $('<li></li>', {
+                'class': 'icon ' + icon + ' code_review_summary'
+                });
+            item.html(review.url);
+            ul.append(item);
+        }
+        li.append(ul);
+    });
+}
+
+function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
+    var filetables = [];
+    var j = 0;
+    $('table').each(function(){
+        if($(this).hasClass('filecontent')){
+            filetables[j++] = this;
+        }
+    });
+    j = 0;
+    $('table.filecontent th.filename').each(function(){
+        filenames[j] = $.trim($(this).text());
+        j++;
+    });
+    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
+        '&rev=' + rev + '&rev_to=' + rev_to +
+        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
+    if (path != null && path.length > 0) {
+        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
+    }
+    var num = 0;
+    if (is_diff) {
+        num = 1;
+    }
+    var i, l, tl;
+    for (i = 0, tl = filetables.length; i < tl; i++) {
+        var table = filetables[i];
+        var trs = table.getElementsByTagName('tr');
+
+        for (j = 0,l = trs.length; j < l; j++) {
+            var tr = trs[j];
+            var ths = tr.getElementsByTagName('th');
+
+            var th = ths[num];
+            if (th == null) {
+                continue;
+            }
+
+            var th_html = th.innerHTML;
+
+            var line = th_html.match(/[0-9]+/);
+            if (line == null) {
+                continue;
+            }
+
+            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
+
+            if (!is_readonly) {
+                span_html += image_tag;
+            }
+            span_html += '</span>';
+            th.innerHTML = th_html + span_html;
+
+            var img = th.getElementsByTagName('img')[0];
+            if (img != null ) {
+                img.id = 'add_revew_img_' + line + '_' + i;
+                $(img).click(clickPencil);
+            }
+        }
+    }
+
+
+}
+
+function clickPencil(e)
+{
+//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
+    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
+    var line = result[1];
+    var file_count = eval(result[2]);
+    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
+
+    if (path == null || path.length == 0) {
+        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
+    }
+    addReview(url);
+    formPopup(e.pageX, e.pageY);
+    e.preventDefault();
+}
+var addReviewUrl = null;
+var showReviewUrl = null;
+var showReviewImageTag = null;
+var showClosedReviewImageTag = null;
+
+function setShowReviewButton(line, review_id, is_closed, file_count) {
+    //alert('file_count = ' + file_count);
+    var span = $('#review_span_' + line + '_' + file_count);
+    if (span.size() == 0) {
+        return;
+    }
+    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
+    span.append(innerSpan);
+    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
+    var div = $('<div></div>', {
+        'class':'draggable',
+        id: 'show_review_' + review_id
+    });
+    $('#code_review').append(div);
+    innerSpan.down('img').click(function(e) {
+        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
+        var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
+    });
+}
+
+function popupReview(review_id) {
+    var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+    $('html,body').animate({ scrollTop: pos.top },
+        {duration: 'fast',
+        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
+    // position and show popup dialog
+    // create popup dialog
+    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
+//    win.toFront();
+}
+
+function showReview(url, review_id, x, y) {
+    if (code_reviews_dialog_map[review_id] != null) {
+        var cur_win = code_reviews_dialog_map[review_id];
+        cur_win.hide();
+        code_reviews_dialog_map[review_id] = null;
+    }
+    $('#show_review_' + review_id).load(url, {review_id: review_id});
+    var review = getReviewObjById(review_id);
+
+    var win = $('#show_review_' + review_id).dialog({
+        show: {effect:'scale'},// ? 'top-left'
+        //position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: review_dialog_title
+    });
+//    win.getContent().style.color = "#484848";
+//    win.getContent().style.background = "#ffffff";
+    topZindex++;
+    code_reviews_dialog_map[review_id] = win;
+    return win
+}
+
+function getReviewObjById(review_id) {
+    for (var reviewlist in code_reviews_map) {
+        for (var i = 0; i < reviewlist.length; i++) {
+            var review = reviewlist[i];
+            if (review.id == review_id) {
+                return review;
+            }
+        }
+    }
+    return null;
+}
+
+function formPopup(x, y){
+    //@see http://docs.jquery.com/UI/Effects/Scale
+    var win = $('#review-form-frame').dialog({
+        show: {effect:'scale', direction: 'both'},// ? 'top-left'
+//        position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: add_form_title
+    });
+//    win.getContent().style.background = "#ffffff";
+    if (review_form_dialog != null) {
+        review_form_dialog.destroy();
+        review_form_dialog = null;
+    }
+    review_form_dialog = win;
+    topZindex += 10;
+    return false;
+}
+
+function hideForm() {
+    if (review_form_dialog == null) {
+        return;
+    }
+    review_form_dialog.dialog('close');
+    review_form_dialog = null;
+    $('#review-form').html('');
+}
+function addReview(url) {
+    $('#review-form').load(url);
+}
+
+function deleteReview(review_id) {
+    $('show_review_' + review_id).remove();
+    $('review_' + review_id).remove();
+    
+}
+
+function changeImage(review_id, is_closed) {
+    var span = $('review_' + review_id);
+    var new_image = null;
+    var dummy = new Element('span');
+    if (is_closed) {
+        dummy.insert(showClosedReviewImageTag);
+    }
+    else {
+        dummy.insert(showReviewImageTag);
+    }
+    new_image = dummy.down().getAttribute('src');
+    //alert(new_image);
+    span.down('img').setAttribute('src', new_image);
+
+}
+
+function make_addreview_link(project, link) {
+    var alist = $('#content p a');
+    if (alist == null) {
+        return;
+    }
+    var a = alist[0];
+    var p = a.parentNode;
+    p.innerHTML = p.innerHTML + " | " + link;
+}
+
+function call_update_revisions(url) {
+    var changeset_ids = '';
+    var links = $$('table.changesets tbody tr.changeset td.id a');
+    for (var i = 0; i < links.length; i++) {
+        var link = links[i];
+        var href = link.getAttribute('href');
+        var id = href.replace(/^.*\/revisions\//, '');
+        if (i > 0) {
+            changeset_ids += ',';
+        }
+        changeset_ids += id;
+    }
+    new Ajax.Updater('code_review_revisions', url,
+    {
+        evalScripts:true,
+        method:'get',
+        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
+    });
+}
+
+$.fn.serialize2json = function()
+{
+   var o = {};
+   var a = this.serializeArray();
+   $.each(a, function() {
+       if (o[this.name]) {
+           if (!o[this.name].push) {
+               o[this.name] = [o[this.name]];
+           }
+           o[this.name].push(this.value || '');
+       } else {
+           o[this.name] = this.value || '';
+       }
+   });
+   return o;
 };
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/activity.css b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
index 202ed54e3..e3cdc3d55 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/activity.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
@@ -1,4 +1,4 @@
-
-dt.code_review {
-    background-image: url(../images/review.png);
+
+dt.code_review {
+    background-image: url(../images/review.png);
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
index e25dc6d72..11939ae79 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
@@ -1,97 +1,97 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-#review-form-frame {
-height: 100%;
-}
-
-.autoscroll table.filecontent th.line-num {
-    white-space: nowrap;
-    vertical-align: bottom;
-    padding-top: 0;
-    padding-bottom: 0;
-    text-align:left;
-}
-
-table.filecontent th.line-num img{
-    padding: 0;
-    margin: 0;
-    cursor: pointer;
-}
-
-
-.code-review-form-title {
-    background-color: #002059;
-    color: white;
-    padding-left: 2px;
-    padding-right: 2px;
-    cursor: default;
-}
-
-
-.code_review_viewer {
-
-    min-width: 300px;
-    /*
-    max-width: 60%;
-    */
-    /* max-height: 400px; */
-}
-
-.code_review_viewer .issue{
-    
-}
-
-.code_review_body {
-    background-color: white;
-    
-    padding:2px;
-    
-}
-
-#code_review_list table.list td {
-    text-align: center;
-}
-
-#code_review_list table.list td.path {
-    text-align: left;
-}
-
-#code_review_list table.list td.subject {
-    text-align: left;
-}
-
-.icon-review {
-    background-image: url(../images/review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-closed-review {
-    background-image: url(../images/closed_review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-settings {
-    background-image: url(../../../images/changeset.png);
-    background-repeat: no-repeat;
-}
-
-
-li.code_review_summary {
-    list-style-type: none;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#review-form-frame {
+height: 100%;
+}
+
+.autoscroll table.filecontent th.line-num {
+    white-space: nowrap;
+    vertical-align: bottom;
+    padding-top: 0;
+    padding-bottom: 0;
+    text-align:left;
+}
+
+table.filecontent th.line-num img{
+    padding: 0;
+    margin: 0;
+    cursor: pointer;
+}
+
+
+.code-review-form-title {
+    background-color: #002059;
+    color: white;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: default;
+}
+
+
+.code_review_viewer {
+
+    min-width: 300px;
+    /*
+    max-width: 60%;
+    */
+    /* max-height: 400px; */
+}
+
+.code_review_viewer .issue{
+    
+}
+
+.code_review_body {
+    background-color: white;
+    
+    padding:2px;
+    
+}
+
+#code_review_list table.list td {
+    text-align: center;
+}
+
+#code_review_list table.list td.path {
+    text-align: left;
+}
+
+#code_review_list table.list td.subject {
+    text-align: left;
+}
+
+.icon-review {
+    background-image: url(../images/review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-closed-review {
+    background-image: url(../images/closed_review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-settings {
+    background-image: url(../../../images/changeset.png);
+    background-repeat: no-repeat;
+}
+
+
+li.code_review_summary {
+    list-style-type: none;
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
index 0a7cf9ad1..5bcdad1bd 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
@@ -1,19 +1,19 @@
-Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
index 4846e6185..432d14e36 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
@@ -1,119 +1,119 @@
-.overlay_alert {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_nw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
-}
-
-.alert_n {
-	height: 5px;
-	background: transparent url(alert/top.gif) repeat-x bottom left;			
-}
-
-.alert_ne {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_right.gif) no-repeat bottom left			
-}
-
-.alert_e {
-	width: 5px;
-	background: transparent url(alert/right.gif) repeat-y 0 0;			
-}
-
-.alert_w {
-	width: 5px;
-	background: transparent url(alert/left.gif) repeat-y 0 0;			
-}
-
-.alert_sw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
-}
-
-.alert_s {
-	height: 5px;
-	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
-}
-
-.alert_se, .alert_sizer {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
-}
-
-.alert_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_title {
-	float:left;
-	height:1px;
-	width:100%;
-}
-
-.alert_content {
-	overflow:visible;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background: #FFF;
-}
-
-/* For alert/confirm dialog */
-.alert_window {
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_message {
-  font: 12px arial;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-
+.overlay_alert {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_nw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
+}
+
+.alert_n {
+	height: 5px;
+	background: transparent url(alert/top.gif) repeat-x bottom left;			
+}
+
+.alert_ne {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_right.gif) no-repeat bottom left			
+}
+
+.alert_e {
+	width: 5px;
+	background: transparent url(alert/right.gif) repeat-y 0 0;			
+}
+
+.alert_w {
+	width: 5px;
+	background: transparent url(alert/left.gif) repeat-y 0 0;			
+}
+
+.alert_sw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
+}
+
+.alert_s {
+	height: 5px;
+	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
+}
+
+.alert_se, .alert_sizer {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
+}
+
+.alert_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_title {
+	float:left;
+	height:1px;
+	width:100%;
+}
+
+.alert_content {
+	overflow:visible;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background: #FFF;
+}
+
+/* For alert/confirm dialog */
+.alert_window {
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_message {
+  font: 12px arial;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
index a74fc71c3..c2ad538ca 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
@@ -1,88 +1,88 @@
-.overlay_alert_lite {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_lite_sizer {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_title {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: #FFF;
-}
-
-
-/* For alert/confirm dialog */
-.alert_lite_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_lite_message {
-	font-size:16px;
-	text-align:center;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_lite_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_lite_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_lite_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-table.alert_lite_header  {
-  border:1px solid #F00;
-  background:#FFF
-}
-
+.overlay_alert_lite {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_lite_sizer {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_title {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: #FFF;
+}
+
+
+/* For alert/confirm dialog */
+.alert_lite_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_lite_message {
+	font-size:16px;
+	text-align:center;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_lite_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_lite_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_lite_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+table.alert_lite_header  {
+  border:1px solid #F00;
+  background:#FFF
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
index 6d2862c0e..7d2790e75 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
@@ -1,150 +1,150 @@
-.overlay_alphacube {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alphacube_nw {
-	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.alphacube_n {
-  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.alphacube_ne {
-  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.alphacube_w {
-  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.alphacube_e {
-  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.alphacube_sw {
-  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_s {
-  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.alphacube_se, .alphacube_sizer  {
-  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_sizer {
-	cursor:se-resize;	
-}
-
-.alphacube_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#123456;
-}
-
-.alphacube_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background:#FDFDFD;
-}
-
-/* For alert/confirm dialog */
-.alphacube_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alphacube_message {
-  font: 12px arial;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.alphacube_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alphacube_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alphacube_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-.alphacube_wired_frame {
-	background: #FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;	
-}
-
-
+.overlay_alphacube {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alphacube_nw {
+	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.alphacube_n {
+  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.alphacube_ne {
+  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.alphacube_w {
+  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.alphacube_e {
+  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.alphacube_sw {
+  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_s {
+  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.alphacube_se, .alphacube_sizer  {
+  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_sizer {
+	cursor:se-resize;	
+}
+
+.alphacube_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#123456;
+}
+
+.alphacube_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background:#FDFDFD;
+}
+
+/* For alert/confirm dialog */
+.alphacube_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alphacube_message {
+  font: 12px arial;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.alphacube_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alphacube_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alphacube_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+.alphacube_wired_frame {
+	background: #FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;	
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
index e5c6edc1c..437c5ec92 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
@@ -1,51 +1,51 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="propertyChanged()" />
-<script>
-
-var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
-var realSrc;
-var blankSrc = "blank.gif";
-
-if (supported) fixImage();
-
-function propertyChanged() {
-   if (!supported) return;
-
-   var pName = event.propertyName;
-   if (pName != "src") return;
-   // if not set to blank
-   if ( ! new RegExp(blankSrc).test(src))
-      fixImage();
-};
-
-function fixImage() {
-   // get src
-   var src = element.src;
-
-   // check for real change
-   if (src == realSrc) {
-      element.src = blankSrc;
-      return;
-   }
-
-   if ( ! new RegExp(blankSrc).test(src)) {
-      // backup old src
-      realSrc = src;
-   }
-
-   // test for png
-   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
-      // set blank image
-      element.src = blankSrc;
-      // set filter
-      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
-                                     src + "',sizingMethod='scale')";
-   }
-   else {
-      // remove filter
-      element.runtimeStyle.filter = "";
-   }
-}
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="propertyChanged()" />
+<script>
+
+var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
+var realSrc;
+var blankSrc = "blank.gif";
+
+if (supported) fixImage();
+
+function propertyChanged() {
+   if (!supported) return;
+
+   var pName = event.propertyName;
+   if (pName != "src") return;
+   // if not set to blank
+   if ( ! new RegExp(blankSrc).test(src))
+      fixImage();
+};
+
+function fixImage() {
+   // get src
+   var src = element.src;
+
+   // check for real change
+   if (src == realSrc) {
+      element.src = blankSrc;
+      return;
+   }
+
+   if ( ! new RegExp(blankSrc).test(src)) {
+      // backup old src
+      realSrc = src;
+   }
+
+   // test for png
+   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
+      // set blank image
+      element.src = blankSrc;
+      // set filter
+      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+                                     src + "',sizingMethod='scale')";
+   }
+   else {
+      // remove filter
+      element.runtimeStyle.filter = "";
+   }
+}
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
index e3df3e0a4..2f83cfd46 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
@@ -1,121 +1,121 @@
-.overlay_darkX {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.darkX_nw {
-	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
-  width:6px;
-  height:21px;
-}
-.darkX_n {
-  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
-  height:21px;
-}
-.darkX_ne {
-  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
-  width:6px;	  
-  height:21px;
-}
-.darkX_w {
-  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
-  width:3px;
-}
-
-.darkX_e {
-  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
-  width:3px;	  
-}
-
-.darkX_sw {
-  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-.darkX_s {
-  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
-  height:3px;
-}
-.darkX_se, .darkX_sizer {
-  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-
-.darkX_sizer {
-	cursor:se-resize;	
-}
-
-.darkX_close {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:5px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_minimize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:26px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_maximize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:47px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-
-.darkX_title {
-	float:left;
-	height:14px;
-	font-size:12px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#FFF;
-}
-
-.darkX_content {
-	overflow:auto;
-	color: #E6DF2A;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 14px;
-	background:#5E5148;
-}
-
-
-/* FOR IE */
-* html .darkX_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
-}
-
-* html .darkX_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
-}
-
-* html .darkX_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
-}
+.overlay_darkX {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.darkX_nw {
+	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
+  width:6px;
+  height:21px;
+}
+.darkX_n {
+  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
+  height:21px;
+}
+.darkX_ne {
+  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
+  width:6px;	  
+  height:21px;
+}
+.darkX_w {
+  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
+  width:3px;
+}
+
+.darkX_e {
+  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
+  width:3px;	  
+}
+
+.darkX_sw {
+  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+.darkX_s {
+  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
+  height:3px;
+}
+.darkX_se, .darkX_sizer {
+  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+
+.darkX_sizer {
+	cursor:se-resize;	
+}
+
+.darkX_close {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:5px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_minimize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:26px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_maximize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:47px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+
+.darkX_title {
+	float:left;
+	height:14px;
+	font-size:12px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#FFF;
+}
+
+.darkX_content {
+	overflow:auto;
+	color: #E6DF2A;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 14px;
+	background:#5E5148;
+}
+
+
+/* FOR IE */
+* html .darkX_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
+}
+
+* html .darkX_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
+}
+
+* html .darkX_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
+}
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
index d7981e9ca..69e3b7fc2 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
@@ -1,25 +1,25 @@
-div.inspector div.inspectable {
- padding: 0.25em 0 0.25em 1em;
- background-color: Gray;
- color: white;
- border: outset 2px white;
- cursor: pointer;
-}
- 
-div.inspector div.child {
- margin: 0 0 0 1em;
-}
- 
-#debug_window_content { /*  DIV container for debug sizing*/
- width:250px;
- height:100px;
- background-color:#000;
-}
- 
-#debug {         /*  DIV container for debug contents*/
- padding:3px;
- color:#0f0;
- font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
- font-size:10px;
-}
- 
+div.inspector div.inspectable {
+ padding: 0.25em 0 0.25em 1em;
+ background-color: Gray;
+ color: white;
+ border: outset 2px white;
+ cursor: pointer;
+}
+ 
+div.inspector div.child {
+ margin: 0 0 0 1em;
+}
+ 
+#debug_window_content { /*  DIV container for debug sizing*/
+ width:250px;
+ height:100px;
+ background-color:#000;
+}
+ 
+#debug {         /*  DIV container for debug contents*/
+ padding:3px;
+ color:#0f0;
+ font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
+ font-size:10px;
+}
+ 
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
index 591451723..6ab13789d 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
@@ -1,155 +1,155 @@
-.overlay_dialog {
-	background-color: #666666;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.overlay___invisible__ {
-  background-color: #666666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.dialog_nw {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_left.gif) no-repeat 0 0;		
-}
-
-.dialog_n {
-	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
-	height: 23px;
-}
-
-.dialog_ne {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_right.gif) no-repeat 0 0;		
-}
-
-.dialog_e {
-	width: 2px;
-	background: transparent url(default/center_right.gif) repeat-y 0 0;	
-}
-
-.dialog_w {
-	width: 2px;
-	background: transparent url(default/center_left.gif) repeat-y 0 0;		
-}
-
-.dialog_sw {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
-}
-
-.dialog_s {
-	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
-	height: 19px;
-}
-
-.dialog_se {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
-}
-
-.dialog_sizer {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/sizer.gif) no-repeat 0 0;	
-	cursor:se-resize;	
-}
-
-.dialog_close {
-	width: 14px;
-	height: 14px;
-	background: transparent url(default/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:8px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_minimize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:28px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_maximize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:49px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	width:100%;
-	color:#000;
-}
-
-.dialog_content {
-	overflow:auto;
-	color: #DDD;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background-color:#123;
-}
-
-.top_draggable, .bottom_draggable {
-  cursor:move;
-}
-
-.status_bar {
-  font-size:12px;
-}
-.status_bar input{
-  font-size:12px;
-}
-
-.wired_frame {
-	display: block;
-  position: absolute;
-  border: 1px #000 dashed;
-}
-
-/* DO NOT CHANGE THESE VALUES*/
-.dialog {
-	display: block;
-	position: absolute;
-}
-
-.dialog table.table_window  { 
-  border-collapse: collapse; 
-  border-spacing: 0; 
-  width: 100%;
-	margin: 0px;
-	padding:0px;
-}
-
-.dialog table.table_window td , .dialog table.table_window th { 
-  padding: 0; 
-}
-
-.dialog .title_window {
-  -moz-user-select:none;
-}                                                    
-
+.overlay_dialog {
+	background-color: #666666;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.overlay___invisible__ {
+  background-color: #666666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.dialog_nw {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_left.gif) no-repeat 0 0;		
+}
+
+.dialog_n {
+	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
+	height: 23px;
+}
+
+.dialog_ne {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_right.gif) no-repeat 0 0;		
+}
+
+.dialog_e {
+	width: 2px;
+	background: transparent url(default/center_right.gif) repeat-y 0 0;	
+}
+
+.dialog_w {
+	width: 2px;
+	background: transparent url(default/center_left.gif) repeat-y 0 0;		
+}
+
+.dialog_sw {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
+}
+
+.dialog_s {
+	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
+	height: 19px;
+}
+
+.dialog_se {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
+}
+
+.dialog_sizer {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/sizer.gif) no-repeat 0 0;	
+	cursor:se-resize;	
+}
+
+.dialog_close {
+	width: 14px;
+	height: 14px;
+	background: transparent url(default/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:8px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_minimize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:28px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_maximize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:49px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	width:100%;
+	color:#000;
+}
+
+.dialog_content {
+	overflow:auto;
+	color: #DDD;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background-color:#123;
+}
+
+.top_draggable, .bottom_draggable {
+  cursor:move;
+}
+
+.status_bar {
+  font-size:12px;
+}
+.status_bar input{
+  font-size:12px;
+}
+
+.wired_frame {
+	display: block;
+  position: absolute;
+  border: 1px #000 dashed;
+}
+
+/* DO NOT CHANGE THESE VALUES*/
+.dialog {
+	display: block;
+	position: absolute;
+}
+
+.dialog table.table_window  { 
+  border-collapse: collapse; 
+  border-spacing: 0; 
+  width: 100%;
+	margin: 0px;
+	padding:0px;
+}
+
+.dialog table.table_window td , .dialog table.table_window th { 
+  padding: 0; 
+}
+
+.dialog .title_window {
+  -moz-user-select:none;
+}                                                    
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
index 249388be5..257a1b1e3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
@@ -1,3 +1,3 @@
-/* PNG fix for all themes that uses PNG images on IE */
-td, div { behavior: url(../themes/iefix/iepngfix.htc) }
-
+/* PNG fix for all themes that uses PNG images on IE */
+td, div { behavior: url(../themes/iefix/iepngfix.htc) }
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
index 9a13f32bf..a6c683b9f 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
@@ -1,54 +1,54 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
-// To work only on background and to handle repeat bg  
-                     
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{         
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
- var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
- if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
-  }
- }
-}
-
-doFix();
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
+// To work only on background and to handle repeat bg  
+                     
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{         
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
+ var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
+ if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
+  }
+ }
+}
+
+doFix();
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
index 0d955c3d7..95ec287a9 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
@@ -1,960 +1,960 @@
-.overlay___invisible__ {
-  background-color: #666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.top_draggable, .bottom_draggable {
-	cursor:move;
-}
-
-.status_bar {
-	font-size:12px;
-}
-.status_bar input{
-	font-size:12px;
-}
-
-.wired_frame {
-	display:block;
-	position:absolute;
-	border:1px #000 dashed;
-}
-
-
-
-.overlay_bluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.bluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.bluelighting_nw {
-	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.bluelighting_n {
-	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.bluelighting_ne {
-	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.bluelighting_w {
-	background:transparent url(lighting/left-blue.png) repeat-y top left;			
-	width:9px;
-}
-
-.bluelighting_e {
-	background:transparent url(lighting/right-blue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.bluelighting_sw {
-	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.bluelighting_s {
-	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.bluelighting_se, .bluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.bluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.bluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#17385B;
-}
-
-.bluelighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#BFDBFF;
-}
-
-/* For alert/confirm dialog */
-.bluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.bluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.bluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.bluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.bluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .bluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_se, * html .bluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_content {
-	background:#B8D7FF;
-}
-
-
-
-.overlay_greylighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greylighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greylighting_nw {
-	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greylighting_n {
-	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greylighting_ne {
-	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greylighting_w {
-	background:transparent url(lighting/left-grey.png) repeat-y top left;			
-	width:9px;
-}
-
-.greylighting_e {
-	background:transparent url(lighting/right-grey.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greylighting_sw {
-	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greylighting_s {
-	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greylighting_se, .greylighting_sizer  {
-	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greylighting_sizer {
-	cursor:se-resize;	
-}
-
-.greylighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#525252;
-}
-
-.greylighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#CDCDCD;
-}
-
-/* For alert/confirm dialog */
-.greylighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greylighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greylighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greylighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greylighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greylighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
-}
-
-* html greylighting_se, * html .greylighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_content {
-	background:#C7C7C7;
-}
-
-
-
-.overlay_greenlighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greenlighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greenlighting_nw {
-	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greenlighting_n {
-	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greenlighting_ne {
-	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greenlighting_w {
-	background:transparent url(lighting/left-green.png) repeat-y top left;			
-	width:9px;
-}
-
-.greenlighting_e {
-	background:transparent url(lighting/right-green.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greenlighting_sw {
-	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greenlighting_s {
-	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greenlighting_se, .greenlighting_sizer  {
-	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greenlighting_sizer {
-	cursor:se-resize;	
-}
-
-.greenlighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#2A6002;
-}
-
-.greenlighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#ACFCAF;
-}
-
-/* For alert/confirm dialog */
-.greenlighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greenlighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greenlighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greenlighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greenlighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greenlighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
-}
-
-* html greenlighting_se, * html .greenlighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_content {
-	background:#A4FCA7;
-}
-
-
-
-.overlay_darkbluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.darkbluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.darkbluelighting_nw {
-	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.darkbluelighting_n {
-	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.darkbluelighting_ne {
-	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.darkbluelighting_w {
-	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
-	width:9px;
-}
-
-.darkbluelighting_e {
-	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.darkbluelighting_sw {
-	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.darkbluelighting_s {
-	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.darkbluelighting_se, .darkbluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.darkbluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.darkbluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#E4EFFD;
-}
-
-.darkbluelighting_content {
-	overflow:auto;
-	color:#FFF;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#0413C0;
-}
-
-/* For alert/confirm dialog */
-.darkbluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.darkbluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.darkbluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.darkbluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.darkbluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .darkbluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html darkbluelighting_se, * html .darkbluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_content {
-	background:#020EBA;
-}
-
+.overlay___invisible__ {
+  background-color: #666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.top_draggable, .bottom_draggable {
+	cursor:move;
+}
+
+.status_bar {
+	font-size:12px;
+}
+.status_bar input{
+	font-size:12px;
+}
+
+.wired_frame {
+	display:block;
+	position:absolute;
+	border:1px #000 dashed;
+}
+
+
+
+.overlay_bluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.bluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.bluelighting_nw {
+	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.bluelighting_n {
+	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.bluelighting_ne {
+	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.bluelighting_w {
+	background:transparent url(lighting/left-blue.png) repeat-y top left;			
+	width:9px;
+}
+
+.bluelighting_e {
+	background:transparent url(lighting/right-blue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.bluelighting_sw {
+	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.bluelighting_s {
+	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.bluelighting_se, .bluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.bluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.bluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#17385B;
+}
+
+.bluelighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#BFDBFF;
+}
+
+/* For alert/confirm dialog */
+.bluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.bluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.bluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.bluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.bluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .bluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_se, * html .bluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_content {
+	background:#B8D7FF;
+}
+
+
+
+.overlay_greylighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greylighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greylighting_nw {
+	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greylighting_n {
+	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greylighting_ne {
+	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greylighting_w {
+	background:transparent url(lighting/left-grey.png) repeat-y top left;			
+	width:9px;
+}
+
+.greylighting_e {
+	background:transparent url(lighting/right-grey.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greylighting_sw {
+	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greylighting_s {
+	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greylighting_se, .greylighting_sizer  {
+	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greylighting_sizer {
+	cursor:se-resize;	
+}
+
+.greylighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#525252;
+}
+
+.greylighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#CDCDCD;
+}
+
+/* For alert/confirm dialog */
+.greylighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greylighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greylighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greylighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greylighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greylighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
+}
+
+* html greylighting_se, * html .greylighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_content {
+	background:#C7C7C7;
+}
+
+
+
+.overlay_greenlighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greenlighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greenlighting_nw {
+	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greenlighting_n {
+	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greenlighting_ne {
+	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greenlighting_w {
+	background:transparent url(lighting/left-green.png) repeat-y top left;			
+	width:9px;
+}
+
+.greenlighting_e {
+	background:transparent url(lighting/right-green.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greenlighting_sw {
+	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greenlighting_s {
+	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greenlighting_se, .greenlighting_sizer  {
+	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greenlighting_sizer {
+	cursor:se-resize;	
+}
+
+.greenlighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#2A6002;
+}
+
+.greenlighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#ACFCAF;
+}
+
+/* For alert/confirm dialog */
+.greenlighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greenlighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greenlighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greenlighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greenlighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greenlighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
+}
+
+* html greenlighting_se, * html .greenlighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_content {
+	background:#A4FCA7;
+}
+
+
+
+.overlay_darkbluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.darkbluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.darkbluelighting_nw {
+	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.darkbluelighting_n {
+	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.darkbluelighting_ne {
+	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.darkbluelighting_w {
+	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
+	width:9px;
+}
+
+.darkbluelighting_e {
+	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.darkbluelighting_sw {
+	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.darkbluelighting_s {
+	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.darkbluelighting_se, .darkbluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.darkbluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.darkbluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#E4EFFD;
+}
+
+.darkbluelighting_content {
+	overflow:auto;
+	color:#FFF;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#0413C0;
+}
+
+/* For alert/confirm dialog */
+.darkbluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.darkbluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.darkbluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.darkbluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.darkbluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .darkbluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html darkbluelighting_se, * html .darkbluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_content {
+	background:#020EBA;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
index 92248c665..36ea182e7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
@@ -1,67 +1,67 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{           
-  alert('ok')
-  
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;
-
- if (tagName == 'IMG')
- {
-  if ((/\.png$/i).test(src))
-  {
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   filt(src, 'scale');
-   src = blankImg;
-  }
-  else if (src.indexOf(blankImg) < 0) filt();
- }
- else if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, 'crop');
-   // IE link fix.
-   for (var n = 0; n < childNodes.length; n++)
-    if (childNodes[n].style) childNodes[n].style.position = 'relative';
-  }
-  else filt();
- }
-}
-
-doFix();
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{           
+  alert('ok')
+  
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;
+
+ if (tagName == 'IMG')
+ {
+  if ((/\.png$/i).test(src))
+  {
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   filt(src, 'scale');
+   src = blankImg;
+  }
+  else if (src.indexOf(blankImg) < 0) filt();
+ }
+ else if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, 'crop');
+   // IE link fix.
+   for (var n = 0; n < childNodes.length; n++)
+    if (childNodes[n].style) childNodes[n].style.position = 'relative';
+  }
+  else filt();
+ }
+}
+
+doFix();
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
index fdff45d8e..24751f868 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
@@ -1,333 +1,333 @@
-/* Focused windows */
-.overlay_mac_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_nw {
-	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.mac_os_x_n {
-  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.mac_os_x_ne {
-  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.mac_os_x_w {
-  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_e {
-  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_sw {
-  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_s {
-  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_se, .mac_os_x_sizer {
-  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.mac_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .mac_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-
-/* Focused windows */
-.overlay_blur_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.blur_os_x_nw {
-	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.blur_os_x_n {
-  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.blur_os_x_ne {
-  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.blur_os_x_w {
-  background: transparent url(mac_os_x/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.blur_os_x_e {
-  background: transparent url(mac_os_x/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.blur_os_x_sw {
-  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_s {
-  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.blur_os_x_se, .blur_os_x_sizer {
-  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.blur_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.blur_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.blur_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .blur_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
+/* Focused windows */
+.overlay_mac_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_nw {
+	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.mac_os_x_n {
+  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.mac_os_x_ne {
+  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.mac_os_x_w {
+  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_e {
+  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_sw {
+  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_s {
+  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_se, .mac_os_x_sizer {
+  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.mac_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .mac_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+
+/* Focused windows */
+.overlay_blur_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.blur_os_x_nw {
+	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.blur_os_x_n {
+  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.blur_os_x_ne {
+  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.blur_os_x_w {
+  background: transparent url(mac_os_x/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.blur_os_x_e {
+  background: transparent url(mac_os_x/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.blur_os_x_sw {
+  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_s {
+  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.blur_os_x_se, .blur_os_x_sizer {
+  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.blur_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.blur_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.blur_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .blur_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
index 4c89f602d..e663e3c5e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
@@ -1,160 +1,160 @@
-.overlay_mac_os_x_dialog {
-	background-color: #FF7224;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_dialog_nw {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_n {
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-  height:18px;
-}
-
-.mac_os_x_dialog_ne {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_w {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_dialog_e {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_dialog_sw {
-  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_s {
-  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
-  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_dialog_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:6px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_dialog_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-}
-
-.mac_os_x_dialog_buttons {
-  text-align: center;
-}
-/* FOR IE */
-* html .mac_os_x_dialog_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-
-* html .mac_os_x_dialog_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
+.overlay_mac_os_x_dialog {
+	background-color: #FF7224;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_dialog_nw {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_n {
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+  height:18px;
+}
+
+.mac_os_x_dialog_ne {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_w {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_dialog_e {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_dialog_sw {
+  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_s {
+  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
+  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_dialog_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:6px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_dialog_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+}
+
+.mac_os_x_dialog_buttons {
+  text-align: center;
+}
+/* FOR IE */
+* html .mac_os_x_dialog_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+
+* html .mac_os_x_dialog_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
index e2700e5b7..2c439bd00 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
@@ -1,164 +1,164 @@
-.overlay_nuncio img { border: none; }
-
-.overlay_nuncio {
-	background-color: #666666;
-}
-
-.nuncio_nw {
-	width: 12px;
-	height: 28px;
-	background: url(nuncio/top_left.png) no-repeat;		
-}
-
-.nuncio_n {
-	background: url(nuncio/top_mid.png) repeat-x;
-	height: 28px;
-}
-
-.nuncio_ne {
-	width: 21px;
-	height: 28px;
-	background: url(nuncio/top_right.png) no-repeat;		
-}
-
-.nuncio_e {
-	width: 21px;
-	background: url(nuncio/center_right.png)  repeat-y top right;		
-}
-
-.nuncio_w {
-	width: 12px;
-	background: url(nuncio/center_left.png) repeat-y top left;			
-}
-
-.nuncio_sw {
-	width: 12px;
-	height: 18px;
-	background: url(nuncio/bottom_left.png) no-repeat;			
-}
-
-.nuncio_s {
-	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
-	height: 18px;
-}
-
-.nuncio_se, .nuncio_sizer {
-	width: 21px;
-	height: 18px;
-	background: url(nuncio/bottom_right.png) no-repeat;			
-}
-
-.nuncio_close {
-	width: 14px;
-	height: 14px;
-	background: url(nuncio/close.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:22px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_minimize {
-	width: 14px;
-	height: 15px;
-	background: url(nuncio/minimize.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:40px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_title {
-	float:left;
-	font-size:11px;
-	font-weight: bold;
-	font-style: italic;
-	color: #fff;
-	width: 100%
-}
-
-.nuncio_content {
-	background: url(nuncio/overlay.png) repeat;
-	overflow:auto;
-	color: #ddd;
-	font-family: Tahoma, Arial, "sans-serif";
-	font-size: 10px;
-}
-
-.nuncio_sizer {
-	cursor:se-resize;	
-}
-
-
-.top_draggable, .bottom_draggable {
-  cursor:move
-}
-/* FOR IE */
-* html .nuncio_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
-}
-
-* html .nuncio_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
-}
-
-* html .nuncio_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
-}
-
-* html .nuncio_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
-}
-
+.overlay_nuncio img { border: none; }
+
+.overlay_nuncio {
+	background-color: #666666;
+}
+
+.nuncio_nw {
+	width: 12px;
+	height: 28px;
+	background: url(nuncio/top_left.png) no-repeat;		
+}
+
+.nuncio_n {
+	background: url(nuncio/top_mid.png) repeat-x;
+	height: 28px;
+}
+
+.nuncio_ne {
+	width: 21px;
+	height: 28px;
+	background: url(nuncio/top_right.png) no-repeat;		
+}
+
+.nuncio_e {
+	width: 21px;
+	background: url(nuncio/center_right.png)  repeat-y top right;		
+}
+
+.nuncio_w {
+	width: 12px;
+	background: url(nuncio/center_left.png) repeat-y top left;			
+}
+
+.nuncio_sw {
+	width: 12px;
+	height: 18px;
+	background: url(nuncio/bottom_left.png) no-repeat;			
+}
+
+.nuncio_s {
+	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
+	height: 18px;
+}
+
+.nuncio_se, .nuncio_sizer {
+	width: 21px;
+	height: 18px;
+	background: url(nuncio/bottom_right.png) no-repeat;			
+}
+
+.nuncio_close {
+	width: 14px;
+	height: 14px;
+	background: url(nuncio/close.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:22px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_minimize {
+	width: 14px;
+	height: 15px;
+	background: url(nuncio/minimize.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:40px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_title {
+	float:left;
+	font-size:11px;
+	font-weight: bold;
+	font-style: italic;
+	color: #fff;
+	width: 100%
+}
+
+.nuncio_content {
+	background: url(nuncio/overlay.png) repeat;
+	overflow:auto;
+	color: #ddd;
+	font-family: Tahoma, Arial, "sans-serif";
+	font-size: 10px;
+}
+
+.nuncio_sizer {
+	cursor:se-resize;	
+}
+
+
+.top_draggable, .bottom_draggable {
+  cursor:move
+}
+/* FOR IE */
+* html .nuncio_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
+}
+
+* html .nuncio_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
+}
+
+* html .nuncio_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
+}
+
+* html .nuncio_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
index d7d722e8a..9bda2a68d 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
@@ -1,108 +1,108 @@
-.overlay_spread {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.spread_nw {
-	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.spread_n {
-  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.spread_ne {
-  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.spread_w {
-  background: transparent url(spread/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.spread_e {
-  background: transparent url(spread/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.spread_sw {
-  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_s  {
-  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.spread_se, .spread_sizer {
-  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_sizer {
-	cursor:se-resize;	
-}
-
-.spread_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:14px;
-	font-weight:bold;
-	text-align:left;
-	margin-top:2px;
-	width:100%;
-	color:#E47211;
-}
-
-.spread_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#A9EA00;
-}
-
+.overlay_spread {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.spread_nw {
+	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.spread_n {
+  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.spread_ne {
+  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.spread_w {
+  background: transparent url(spread/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.spread_e {
+  background: transparent url(spread/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.spread_sw {
+  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_s  {
+  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.spread_se, .spread_sizer {
+  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_sizer {
+	cursor:se-resize;	
+}
+
+.spread_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:14px;
+	font-weight:bold;
+	text-align:left;
+	margin-top:2px;
+	width:100%;
+	color:#E47211;
+}
+
+.spread_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#A9EA00;
+}
+

From 0f2f4717b6f6aa40792ab5e1bce3fdbadfa76e75 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 13:50:45 +0800
Subject: [PATCH 27/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=92=8C=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E3=80=81=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb  |  5 +++--
 app/helpers/application_helper.rb              | 11 +++++++++++
 app/views/homework_common/index.html.erb       |  6 ++++++
 app/views/users/_user_homework_detail.html.erb |  7 ++++++-
 app/views/users/_user_homework_list.html.erb   |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 0566d3d98..9da4b90b9 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -20,15 +20,16 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
+      #@homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.order("created_at desc")
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
+      #@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc")
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
 
+    @homeworks = paginateHelper @homework_commons,10
     #设置at已读
     @homeworks.each do |homework|
       homework.journals_for_messages.each do |j|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 229aceb1c..7d970c762 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3248,3 +3248,14 @@ def strip_html(text,len=0,endss="...")
   end
   return ss
 end
+
+def get_hw_index(hw,is_teacher)
+  if is_teacher
+    homeworks = hw.course.homework_commons.order("created_at asc")
+  else
+    homeworks = hw.course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at asc")
+  end
+  hw_ids = homeworks.map{|hw| hw.id} if !homeworks.empty?
+  index = hw_ids.index(hw.id)
+  return index
+end
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index e34cf0736..29cff8933 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -73,6 +73,12 @@
   <% end%>
   <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
 
+  <div style="width:210px; text-align:center; margin:0 auto;">
+    <ul class="wlist" style=" border:none; display:inline-block; float:none; margin-top:10px;">
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+    </ul>
+    <div class="cl"></div>
+  </div>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index decaba88c..c0578c042 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -11,7 +11,12 @@
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
           <span class="homepagePostTitle hidden fl m_w505">
-            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% if is_in_course == 1%>
+                <% index = get_hw_index(homework_common, is_teacher) %>
+                <%= link_to "<span class='fontBlue2'>作业#{index+1}：</span>".html_safe+homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% else %>
+                <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% end %>
           </span>
 
       <% if homework_common.homework_detail_manual%>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index e42c5d8b2..f7669047c 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -31,7 +31,7 @@
 <% if homework_commons.count == 10%>
     <% if is_in_course == 1%>
         <!-- 在课程内 -->
-        <%= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+        <%#= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% else%>
         <!-- 在个人主页 -->
         <%= link_to "点击展开更多",student_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

From 05a475e47ea8bdeeb070b2a04a61411e9a922a74 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 14:35:40 +0800
Subject: [PATCH 28/72] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 94ee14a56..ae60d548a 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -33,8 +33,8 @@ module Mobile
           shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
+          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           project_types = "('Message','Issue','ProjectCreateInfo')"
           principal_types = "JournalsForMessage"

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 29/72] =?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 30/72] 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){

From 6517f23f03e727599ee39aeacc3e64df182b0ba1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 15:26:23 +0800
Subject: [PATCH 31/72] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=88=9B=E5=BB=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb                        | 2 +-
 app/api/mobile/entities/activity.rb                      | 6 +++---
 app/controllers/organizations_controller.rb              | 2 +-
 app/controllers/users_controller.rb                      | 2 +-
 app/controllers/wechats_controller.rb                    | 2 +-
 app/models/course_activity.rb                            | 3 +--
 app/models/forge_activity.rb                             | 2 +-
 app/views/organizations/_org_activities.html.erb         | 2 +-
 app/views/organizations/_org_project_activities.html.erb | 2 +-
 app/views/users/_user_activities.html.erb                | 4 ++--
 db/migrate/20160519070718_change_user_activities_data.rb | 9 +++++++++
 db/schema.rb                                             | 3 ++-
 12 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 db/migrate/20160519070718_change_user_activities_data.rb

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index ae60d548a..cbd43bb79 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -36,7 +36,7 @@ module Mobile
           user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
           user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','ProjectCreateInfo')"
+          project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
           watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
           user_ids = "(" + user.id.to_s + watched_user_ids + ")"
diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 20876bf69..3eab332a7 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -14,7 +14,7 @@ module Mobile
             else
               case f
                 when :user_act
-                  if ac.act_type == "ProjectCreateInfo"
+                  if ac.act_type == "Project"
                     ac unless ac.nil?
                   else
                     ac.act unless ac.nil? || ac.act.nil?
@@ -87,7 +87,7 @@ module Mobile
                         "项目缺陷"
                       when "Message"
                         "项目讨论区"
-                      when "ProjectCreateInfo"
+                      when "Project"
                         "项目"
                     end
                   end
@@ -101,7 +101,7 @@ module Mobile
       expose :container_type     #课程/项目/博客/个人
       expose :author, using: Mobile::Entities::User do |a, opt|    #用户信息
         if a.is_a? ::UserActivity
-          if a.act_type == "ProjectCreateInfo"
+          if a.act_type == "Project"
             get_user(get_project(a.act_id).user_id)
           elsif !a.act.nil?
             if a.act_type == 'Issue' || a.act_type == 'News' || a.act_type == 'Message' || a.act_type == 'BlogComment'
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c94f734e1..1946378ef 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -127,7 +127,7 @@ class OrganizationsController < ApplicationController
           case params[:type]
             when nil
               @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                                       "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                                       "or (container_type ='Project' and org_act_type in ('Issue','Message','Project') and container_id in (#{project_ids.join(',')})) "+
                                                        "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
                                                    @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
             when 'project_issue'
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 373801963..6f3aa6b18 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1373,7 +1373,7 @@ class UsersController < ApplicationController
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
-    project_types = "('Message','Issue','ProjectCreateInfo')"
+    project_types = "('Message','Issue','Project')"
     principal_types = "JournalsForMessage"
     if params[:type].present?
       case params[:type]
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 0d75636f7..a9e4771e8 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -211,7 +211,7 @@ class WechatsController < ActionController::Base
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-    project_types = "('Message','Issue','ProjectCreateInfo')"
+    project_types = "('Message','Issue','Project')"
     principal_types = "JournalsForMessage"
 
     blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 96ec6e355..2aae45d0a 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -5,8 +5,7 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity, :add_org_activity
-  after_create :add_course_lead
+  after_create :add_course_lead,:add_user_activity, :add_org_activity
   before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index c044392a0..44b13b315 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -20,7 +20,7 @@ class ForgeActivity < ActiveRecord::Base
   validates :forge_act_id,presence: true
   validates :forge_act_type, presence: true
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity, :add_org_activity
+  after_create :add_user_activity, :add_org_activity
   before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index a3e62fd16..c00cc6161 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -56,7 +56,7 @@
                 <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message' %>
                 <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'ProjectCreateInfo'%>
+            <% when 'Project'%>
                 <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
diff --git a/app/views/organizations/_org_project_activities.html.erb b/app/views/organizations/_org_project_activities.html.erb
index b46996661..d27e690c6 100644
--- a/app/views/organizations/_org_project_activities.html.erb
+++ b/app/views/organizations/_org_project_activities.html.erb
@@ -6,7 +6,7 @@
                         <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
                     <% when 'Message' %>
                         <%= render :partial => 'organizations/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
-                    <% when 'ProjectCreateInfo'%>
+                    <% when 'Project'%>
                         <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
                     <% end %>
                 <% end %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index b7df824a4..2fe7315d5 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -54,7 +54,7 @@
                 sd_create_editor_from_data(<%= user_activity.id %>, null, "100%", "<%= user_activity.class.to_s %>");
             });
         </script>
-        <% if user_activity.act_type == "ProjectCreateInfo" %>
+        <% if user_activity.act_type == "Project" %>
             <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
         <% else %>
             <% act= user_activity.act  %>
@@ -94,7 +94,7 @@
                         <%# end %>
                         <% when 'Message' %>
                             <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
-                        <% when 'ProjectCreateInfo'%>
+                        <% when 'Project'%>
                         <%# cache (act) do %>
                             <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                         <%# end %>
diff --git a/db/migrate/20160519070718_change_user_activities_data.rb b/db/migrate/20160519070718_change_user_activities_data.rb
new file mode 100644
index 000000000..1a1bfb827
--- /dev/null
+++ b/db/migrate/20160519070718_change_user_activities_data.rb
@@ -0,0 +1,9 @@
+class ChangeUserActivitiesData < ActiveRecord::Migration
+  def up
+    execute("update user_activities set act_type = 'Project' where act_type = 'ProjectCreateInfo'")
+    execute("update org_activities set org_act_type = 'Project' where org_act_type = 'ProjectCreateInfo'")
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 43153fb76..9c4b4b333 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160511055221) do
+ActiveRecord::Schema.define(:version => 20160519070718) do
+
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
     t.string   "act_type",                                :null => false

From 3ebef0eae239955a499315a859054caeb19b1941 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 15:57:20 +0800
Subject: [PATCH 32/72] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=B8=AD=E7=94=B3=E8=AF=B7=E5=BC=95=E7=94=A8=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E6=89=93=E5=BC=80=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BF=E9=97=AE=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 8 ++++++--
 public/stylesheets/new_user.css               | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index bab7bb5ec..d46c45593 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -240,14 +240,18 @@
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name,
                         user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
+            <span class="<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl':'homepageNewsType fl' %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% link_str = ma.apply_result == 1 ?
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
+            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || ma.course_message.is_open == 1 %>
+                <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
+            <% else %>
+                <span title='<%=link_str %>' style="color:#4b4b4b; cursor: default;" class="<%= ma.viewed == 0 ? 'newsBlack' : 'newsGrey'%>"><%=link_str %></span>
+            <% end %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 44e64e9ab..89712c89f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -637,6 +637,7 @@ a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
 a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
+span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}

From 7da1418069e09e002efd311a7d6e371690f6280f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 19 May 2016 16:24:57 +0800
Subject: [PATCH 33/72] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=ABURL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_intro_content.html.erb |  5 ++-
 public/javascripts/application.js       | 54 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index 351f1fdb0..ead3f6713 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,6 +1,6 @@
 <div class="homepagePostIntro break_word upload_img  maxh360 table_maxWidth " id="activity_description_<%= user_activity_id%>">
   <div id="intro_content_<%= user_activity_id%>">
-    <%= content.to_s.html_safe%>
+    <%= content.to_s.html_safe %>
   </div>
 </div>
 <script type="text/javascript">
@@ -13,6 +13,9 @@
           postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
           $(this).html(postContent);
       });
+
+      autoUrl('intro_content_<%= user_activity_id%>');
+
       description_show_hide(<%=user_activity_id %>);
   });
 </script>
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index d9f532a48..6023542f3 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1291,3 +1291,57 @@ function pop_up_box(value,tWidth,tTop,tLeft){
 }
 
 
+//yk 自动识别URL 并加上链接
+var strRegex = '((https|http|ftp|rtsp|mms)?://)'
+    + '?(([0-9a-z_!~*\'().&=+$%-]+: )?[0-9a-z_!~*\'().&=+$%-]+@)?' //ftp的user@
+    + '(([0-9]{1,3}.){3}[0-9]{1,3}' // IP形式的URL- 199.194.52.184
+    + '|' // 允许IP和DOMAIN（域名）
+    + '([0-9a-z_!~*\'()-]+.)*' // 域名- www.
+    + '([0-9a-z][0-9a-z-]{0,61})?[0-9a-z].' // 二级域名
+    + '[a-z]{2,6})' // first level domain- .com or .museum
+    + '(:[0-9]{1,4})?' // 端口- :80
+    + '((/?)|' // a slash isn't required if there is no file name
+    + '(/[0-9a-z_!~*\'().;?:@&=+$,%#-]+)+/?)';
+
+function autoUrl(id){
+    if ($("#"+id).children().length > 0 ){
+        $("#"+id+" p,#"+ id +" span,#"+id+" em,#"+id+" h1,#"+id+" h2,#"+id+" h3,#"+id+" h4,#"+id+" strong,#"+id+" b,#"+id+" font,#"+id+" i").each(function(){
+            if ($(this).children().length == 0){
+                var html = $(this).text(); //.replace(/(^\s*)|(\s*$)/g, "")
+                console.log("html="+html);
+                var re=new RegExp(strRegex,"g");
+                html = html.replace(re,function(full) {
+                    //没有://的都加上http://
+                    if (full.indexOf("://") >= 0){
+                        var reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    }
+                    else{
+                        var reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                    }
+                    console.log("reStr="+reStr);
+                    return reStr;
+                });
+                $(this).html(html);
+            }
+        });
+    }
+    else{
+        var html = $("#"+id).text(); //.replace(/(^\s*)|(\s*$)/g, "")
+        console.log("html="+html);
+        var re=new RegExp(strRegex,"g");
+        html = html.replace(re,function(full) {
+            //没有://的都加上http://
+            if (full.indexOf("://") >= 0){
+                var reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+            }
+            else{
+                var reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+            }
+            console.log("reStr="+reStr);
+            return reStr;
+        });
+        $("#"+id).html(html);
+    }
+}
+
+

From ed58e780656d1e967158b5f236869f5bd8c4862c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 19 May 2016 16:38:48 +0800
Subject: [PATCH 34/72] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E9=A2=9C=E8=89=B2?=
 =?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/new_user.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f79b3ca02..db2974e01 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -672,6 +672,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDes {float:left; width:655px; margin-left:15px; overflow:hidden;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
+.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
@@ -681,10 +682,9 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
-.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
-
-.borderBottomNone {border-bottom:none !important;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
+.borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
@@ -721,6 +721,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
+.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -864,7 +865,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
-.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; } /*line-height: 18px !important;*/
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}

From df70c33bcd4c86805cb0b52b65f1028d3200dffe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 16:39:14 +0800
Subject: [PATCH 35/72] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B4=BB=E8=B7=83=E5=BA=A6=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 1478bceae..374e26431 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1177,7 +1177,7 @@ class CoursesController < ApplicationController
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
         ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
-         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id
         ) AS act_score
         FROM members
         JOIN students_for_courses
@@ -1191,7 +1191,7 @@ class CoursesController < ApplicationController
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
         ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
-         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id
         ) AS act_score
         FROM members
         JOIN students_for_courses

From 0dd7aae08c9258f933211c15122ac71b96211d0a Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 19 May 2016 16:39:23 +0800
Subject: [PATCH 36/72] =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=86=E5=88=ABURL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_intro_content.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index ead3f6713..050720b6c 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -14,7 +14,7 @@
           $(this).html(postContent);
       });
 
-      autoUrl('intro_content_<%= user_activity_id%>');
+//      autoUrl('intro_content_<%#= user_activity_id%>');
 
       description_show_hide(<%=user_activity_id %>);
   });

From b03b9a3c27feea203d763e41a952e4a1192cd73f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 09:59:41 +0800
Subject: [PATCH 37/72] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=9A=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=AF=BC=E5=85=A5=E6=97=B6=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 10 +++++++---
 db/schema.rb                       | 21 ++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 1d7b4117d..e4cf31f55 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -423,9 +423,13 @@ class PollController < ApplicationController
   # 将其他地方的问卷导出来
   def other_poll
     # 查作者是我，或者作者是当前课程的老师，且不在当前课程内的问卷 进行导入
-    tea_ids = '('
-    tea_ids << Course.find(params[:polls_group_id]).tea_id.to_s << ','<< User.current.id.to_s << ')'
-    @polls = Poll.where("user_id in #{tea_ids} and polls_type = 'course'  and polls_group_id != #{params[:polls_group_id]}")
+    courses = User.current.courses.select { |course|  User.current.allowed_to?(:as_teacher,course)}
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map { |course| course.id}.join(',') + ")"
+    none_courses = User.current.courses.where("is_delete = 1 or #{Course.table_name}.id = #{params[:polls_group_id].to_i}")
+    none_course_ids = none_courses.empty? ? "(-1)" : "(" + none_courses.map { |course| course.id}.join(',') + ")"
+    #tea_ids = '('
+    #tea_ids << Course.find(params[:polls_group_id]).tea_id.to_s << ','<< User.current.id.to_s << ')'
+    @polls = Poll.where("(user_id = #{User.current.id} or polls_group_id in #{course_ids}) and polls_type = 'course' and polls_group_id not in #{none_course_ids}")
     @polls_group_id = params[:polls_group_id]
     respond_to do |format|
       format.js
diff --git a/db/schema.rb b/db/schema.rb
index 02a79aa9b..9c4b4b333 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,12 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
-
-ActiveRecord::Schema.define(:version => 20160513120002) do
-=======
-ActiveRecord::Schema.define(:version => 20160513021204) do
->>>>>>> weixin_guange
+ActiveRecord::Schema.define(:version => 20160519070718) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -455,15 +450,15 @@ ActiveRecord::Schema.define(:version => 20160513021204) do
   create_table "course_contributor_scores", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
-    t.integer  "message_num"
-    t.integer  "message_reply_num"
-    t.integer  "news_reply_num"
-    t.integer  "resource_num"
-    t.integer  "journal_num"
-    t.integer  "journal_reply_num"
+    t.integer  "message_num",          :default => 0
+    t.integer  "message_reply_num",    :default => 0
+    t.integer  "news_reply_num",       :default => 0
+    t.integer  "resource_num",         :default => 0
+    t.integer  "journal_num",          :default => 0
+    t.integer  "journal_reply_num",    :default => 0
     t.datetime "created_at",                          :null => false
     t.datetime "updated_at",                          :null => false
-    t.integer  "total_score"
+    t.integer  "total_score",          :default => 0
     t.integer  "homework_journal_num", :default => 0
     t.integer  "news_num",             :default => 0
   end

From 6aa20c9edf5f544b30d2c40422a3132fe794ee3f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 11:12:37 +0800
Subject: [PATCH 38/72] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=94=A8Tab=E9=94=AE=E7=A9=BA=E6=A0=BC=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7d970c762..cda3ce53c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3238,6 +3238,7 @@ def strip_html(text,len=0,endss="...")
   ss = ""
   if text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip
+    ss = ss.gsub(/&nbsp;/, ' ')
 
     if len > 0 && ss.length > len
       ss = ss[0, len] + endss

From 82568b59514fadce49bb50b6bc74751fa1a29e86 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 11:39:30 +0800
Subject: [PATCH 39/72] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=88=96=E5=86=85=E5=AE=B9=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8F=91=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 02086fa62..eeaa17dd6 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -239,8 +239,10 @@ class Journal < ActiveRecord::Base
 
   #缺陷回复微信模板消息
   def issue_wechat_message
-    ws = WechatService.new
-    content = strip_html self.notes.html_safe, 200
-    ws.comment_template self.issue.author_id, "issues", self.journalized_id, "#{l(:label_issue_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+    if !self.notes.nil? && self.notes.gsub(' ','') != ''
+      ws = WechatService.new
+      content = strip_html self.notes.html_safe, 200
+      ws.comment_template self.issue.author_id, "issues", self.journalized_id, "#{l(:label_issue_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+    end
   end
 end

From 2895dd5342c5cf8e9a4218d49d059f749246c776 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 14:28:14 +0800
Subject: [PATCH 40/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9A=84tip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d46c45593..d4fbeb234 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -395,9 +395,9 @@
                   <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                     <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
                       <% if ma.course_message.m_parent_id.nil? %>
-                          回复了您的作业：
+                          回复了您的<span class="fontBlue2" title="作业：<%=ma.course_message.jour.name %>">作业</span>：
                       <% else %>
-                          回复了您：
+                          在<span class="fontBlue2" title="作业：<%=ma.course_message.jour.name %>">作业</span>中回复了您：
                       <% end %>
                     </span>
                   </li>

From c165d0b37ef392f01a9c421e87f0dc7635e53fdf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 14:52:47 +0800
Subject: [PATCH 41/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=A8=A1=E6=9D=BF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb | 21 ++++++++++++++-------
 config/locales/zh.yml              |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 68b747ab9..d0113744c 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -259,19 +259,26 @@ class JournalsForMessage < ActiveRecord::Base
       if self.m_parent_id.nil?
         if self.user_id != self.jour.user_id
           self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
+          count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
+          if count == 0
+            ws = WechatService.new
+            #content = truncate(strip_tags(self.notes.to_s), length: 200)
+            content = strip_html self.notes.html_safe, 200
+            ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+          end
         end
       else
         if self.user_id != self.parent.user_id
           self.course_messages << CourseMessage.new(:user_id => self.parent.user_id,:course_id => self.jour.course.id, :viewed => false)
+          count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.parent.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
+          if count == 0
+            ws = WechatService.new
+            #content = truncate(strip_tags(self.notes.to_s), length: 200)
+            content = strip_html self.notes.html_safe, 200
+            ws.comment_template self.parent.user_id, "homework", self.jour_id, "#{l(:label_new_second_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+          end
         end
       end
-      count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
-      if count == 0
-        ws = WechatService.new
-        #content = truncate(strip_tags(self.notes.to_s), length: 200)
-        content = strip_html self.notes.html_safe, 200
-        ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
-      end
     end
   end
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 18f027dce..a347359bb 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2137,6 +2137,7 @@ zh:
   label_notice_comment_template: 您的课程通知有新回复了
   label_news_comment_template: 您的项目新闻有新回复了
   label_homework_comment_template: 您的作业有新回复了
+  label_new_second_comment_template: 您有新回复了
   label_new_journals_template: 您有新留言了
   label_journals_comment_template: 您的留言有新回复了
   label_blog_comment_template: 您的博客有新回复了

From 13f83719c1d0990c74dfbb1d6fea4488d9da1588 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 20 May 2016 15:15:42 +0800
Subject: [PATCH 42/72] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAtable=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_exercise.html.erb |  58 +----
 .../_student_exercise_archive.html.erb        |  81 +++++++
 app/views/exercise/_student_table.html.erb    |  90 +++++--
 .../exercise/_student_table_archive.html.erb  |  23 ++
 .../student_work/_evaluation_title.html.erb   |  58 +++--
 .../_evaluation_title_archive.html.erb        |  27 +++
 .../_evaluation_un_title.html.erb             | 137 +++++------
 .../_evaluation_un_title_archive.erb          |  73 ++++++
 .../student_work/_evaluation_un_work.html.erb |  60 +++--
 .../_evaluation_un_work_archive.html.erb      | 101 ++++++++
 .../student_work/_evaluation_work.html.erb    |  81 +++----
 .../_evaluation_work_archive.html.erb         |  84 +++++++
 .../_programing_work_show.html.erb            | 225 +++++++++---------
 app/views/student_work/_show.html.erb         | 200 ++++++++--------
 .../student_work/_student_work_list.html.erb  |  11 -
 public/stylesheets/courses.css                |   4 +
 public/stylesheets/public.css                 |   3 +
 17 files changed, 851 insertions(+), 465 deletions(-)
 create mode 100644 app/views/exercise/_student_exercise_archive.html.erb
 create mode 100644 app/views/exercise/_student_table_archive.html.erb
 create mode 100644 app/views/student_work/_evaluation_title_archive.html.erb
 create mode 100644 app/views/student_work/_evaluation_un_title_archive.erb
 create mode 100644 app/views/student_work/_evaluation_un_work_archive.html.erb
 create mode 100644 app/views/student_work/_evaluation_work_archive.html.erb

diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index d7a1b85bb..f9fd114dd 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -22,60 +22,6 @@
 <div class="cl"></div>
 
 <div class="fl">
-  <%= render :partial => "student_table"%>
+  <%= render :partial => "student_table" %>
 </div>
-<div class="cl"></div>
-
-<% @exercise_users_list.each do |exercise|%>
-    <script type="text/javascript">
-        $(".student_work_<%= exercise.id%>").mouseenter(function(){
-            $("#work_click_<%= exercise.id%>").show();
-        }).mouseleave(function(){
-            $("#work_click_<%= exercise.id%>").hide();
-        });
-        $(function(){
-            <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
-                $("#show_student_result_div_<%= exercise.id%>").on('click',function() {
-                    window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
-                });
-            <% else %>
-                $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-                $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-                $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-                $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-            <% end %>
-        });
-        /*function show_result(id) {
-            window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
-        }*/
-    </script>
-    <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
-      <li class="ml5 mr5" style="width:28px; text-align:center;">1</li>
-      <li class="hworkPortrait mt15 mr10">
-        <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %>
-      </li>
-      <li class="hworkStName" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
-        <%=exercise.user.show_name %>
-      </li><li class="hworkStID pl15 pr10" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
-      <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
-    </li>
-      <li class="hworkStID" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
-        --
-      </li>
-      <li class="hworkList130 ml200 c_grey student_work_<%= exercise.id%>">
-        <% if exercise.created_at%>
-            <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-            <% if @exercise.end_time <= exercise.created_at %>
-                <span class="c_red">[未答]</span>
-            <% end %>
-        <% end %>
-      </li>
-
-      <li class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
-        <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
-      </li>
-      <li class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
-    </ul>
-
-    <div class="cl"></div>
-<% end%>
\ No newline at end of file
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/exercise/_student_exercise_archive.html.erb b/app/views/exercise/_student_exercise_archive.html.erb
new file mode 100644
index 000000000..abc604b73
--- /dev/null
+++ b/app/views/exercise/_student_exercise_archive.html.erb
@@ -0,0 +1,81 @@
+<div class="fl" style="padding-bottom:10px; width:720px;">
+  <span class="c_dark f14 fb fl mr30">
+      测验
+      <font class="f12 c_red">
+        (<%= @exercise_count%>人已交)
+      </font>
+    <% if !@is_teacher && @exercise_users_list.empty?%>
+       <span class="f12 c_red">您尚未提交</span>
+    <% elsif !@is_teacher && !@exercise_users_list.empty?%>
+       <span class="f12 c_red">您已提交</span>
+    <% end %>
+  </span>
+  <%#if @is_teacher || @exercise.exercise_status == 3%>
+  <!--<div class="hworkSearchBox">
+        <input type="text" id="course_student_name" value="<%#= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%#= student_work_index_path(:homework => @homework.id)%>',event);"/>
+        <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%#= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
+      </div>-->
+  <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
+  <%# end%>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" style="display: none">[ 显示测验信息 ]</a> </span>
+</div>
+<div class="cl"></div>
+
+<div class="fl">
+  <%= render :partial => "student_table"%>
+</div>
+<div class="cl"></div>
+
+<% @exercise_users_list.each do |exercise|%>
+    <script type="text/javascript">
+        $(".student_work_<%= exercise.id%>").mouseenter(function(){
+            $("#work_click_<%= exercise.id%>").show();
+        }).mouseleave(function(){
+            $("#work_click_<%= exercise.id%>").hide();
+        });
+        $(function(){
+            <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+            $("#show_student_result_div_<%= exercise.id%>").on('click',function() {
+                window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
+            });
+            <% else %>
+            $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            <% end %>
+        });
+        /*function show_result(id) {
+         window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+         }*/
+    </script>
+    <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
+      <li class="ml5 mr5" style="width:28px; text-align:center;">1</li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %>
+      </li>
+      <li class="hworkStName" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
+        <%=exercise.user.show_name %>
+      </li><li class="hworkStID pl15 pr10" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
+      <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
+    </li>
+      <li class="hworkStID" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
+        --
+      </li>
+      <li class="hworkList130 ml200 c_grey student_work_<%= exercise.id%>">
+        <% if exercise.created_at%>
+            <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+            <% if @exercise.end_time <= exercise.created_at %>
+                <span class="c_red">[未答]</span>
+            <% end %>
+        <% end %>
+      </li>
+
+      <li class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
+        <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
+      </li>
+      <li class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+    </ul>
+
+    <div class="cl"></div>
+<% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 8957c5048..5a93c352a 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,23 +1,71 @@
-<ul class="hworkUl">
-  <li class="hworkList340 hworkH30 width530">
-    <span class="c_dark f14 fb fl mr5">序号</span>
-    <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
-    <span class="c_dark f14 fb fl mr60">姓名</span>
-    <span class="c_dark f14 fb fl mr60">学号</span>
-    <span class="c_dark f14 fb fl">班级</span>
-  </li>
+<table class="hwork-table-wrap">
+  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
+    <th class="hworkList340 width530" colspan="6">
+      <span class="c_dark f14 fb fl mr5">序号</span>
+      <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
+      <span class="c_dark f14 fb fl mr60">姓名</span>
+      <span class="c_dark f14 fb fl mr60">学号</span>
+      <span class="c_dark f14 fb fl">班级</span>
+    </th>
+    <th class="hworkList130">
+      <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+    </th>
+    <th class="hworkList50">
+      <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
+    </th>
+  </tr>
 
-  <li class="hworkList130 hworkH30">
-    <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
-    <%# if @show_all && @order == "created_at"%>
-        <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-    <%# end%>
-  </li>
+  <% @exercise_users_list.each do |exercise|%>
+      <script type="text/javascript">
+          $(".student_work_<%= exercise.id%>").mouseenter(function(){
+              $("#work_click_<%= exercise.id%>").show();
+          }).mouseleave(function(){
+              $("#work_click_<%= exercise.id%>").hide();
+          });
+          $(function(){
+              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+              $("#show_student_result_div_<%= exercise.id%>").on('click',function() {
+                  window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
+              });
+              <% else %>
+              $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              <% end %>
+          });
+          /*function show_result(id) {
+           window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+           }*/
+      </script>
 
-  <li class="hworkList50 hworkH30">
-    <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
-    <%# if @show_all && @order == "score"%>
-        <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-    <%# end%>
-  </li>
-</ul>
\ No newline at end of file
+      <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
+        <td class="pl5 pr5" style="width:28px; text-align:center;">1</td>
+        <td class="hworkPortrait pr10 float-none">
+          <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %>
+        </td>
+        <td class="hworkStName" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
+          <%=exercise.user.show_name %>
+        </td>
+        <td class="hworkStID pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
+          <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
+        </td>
+        <td class="hworkStID float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
+          --
+        </td>
+        <td width="200">&nbsp;</td>
+        <td class="hworkList130 c_grey student_work_<%= exercise.id%>">
+          <% if exercise.created_at%>
+              <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+              <% if @exercise.end_time <= exercise.created_at %>
+                  <span class="c_red">[未答]</span>
+              <% end %>
+          <% end %>
+        </td>
+        <td class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
+          <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
+        </td>
+        <td class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+      </tr>
+  <% end%>
+</table>
\ No newline at end of file
diff --git a/app/views/exercise/_student_table_archive.html.erb b/app/views/exercise/_student_table_archive.html.erb
new file mode 100644
index 000000000..0e018cddc
--- /dev/null
+++ b/app/views/exercise/_student_table_archive.html.erb
@@ -0,0 +1,23 @@
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 width530">
+    <span class="c_dark f14 fb fl mr5">序号</span>
+    <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
+    <span class="c_dark f14 fb fl mr60">姓名</span>
+    <span class="c_dark f14 fb fl mr60">学号</span>
+    <span class="c_dark f14 fb fl">班级</span>
+  </li>
+
+  <li class="hworkList130 hworkH30">
+    <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+    <%# if @show_all && @order == "created_at"%>
+    <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <%# end%>
+  </li>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <%# if @show_all && @order == "score"%>
+    <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <%# end%>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 257fcb94a..c74bd76c6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,27 +1,39 @@
-<ul class="hworkUl">
-  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
-  <li class="hworkList50 hworkH30">&nbsp;</li>
-  <li class="hworkList260 hworkH30">
-    <span class="f14 fb fl">作品名称</span>
-  </li>
+<table class="hwork-table-wrap">
+  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
+    <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
+    <th class="hworkList50">&nbsp;</th>
+    <th class="hworkList260" style="text-align:left;">作品名称</th>
     <% if @homework.homework_type != 3 %>
-    <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">姓名</span></li>
-    <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">学号</span></li>
+        <th class="hworkList80">
+          <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        </th>
+        <th class="hworkList80">
+          <span class="HomeworkStuTitle f14 fb fl">学号</span>
+        </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <li class="hworkList160 hworkH30"><span class="HomeworkStuTitle f14 fb fl">关联项目</span></li>
+        <th class="hworkList160">
+          <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+        </th>
     <% end %>
-
-  <li class="hworkList130 hworkH30 fb ml10">
-    时间
-  </li>
-
-  <% if @homework.homework_type == 2%>
-      <li class="hworkList50 hworkH30 fb">
-        系统
-      </li>
+    <th class="hworkList130 pl10">
+      时间
+    </th>
+    <% if @homework.homework_type == 2%>
+        <th class="hworkList50">
+          系统
+        </th>
+    <% end%>
+    <th class="hworkList50 pr10 pl10">
+      我的评分
+    </th>
+  </tr>
+  <% @stundet_works.each_with_index do |student_work, i|%>
+          <%= render :partial => "evaluation_work", :locals => {:student_work => student_work, :index => i}%>
+      <tr>
+        <td colspan="12">
+          <div id="about_hwork_<%= student_work.id%>">
+          </div>
+        </td>
+      </tr>
   <% end%>
-
-  <li class="hworkList50 hworkH30 fb mr10 ml10">
-    我的评分
-  </li>
-</ul>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title_archive.html.erb b/app/views/student_work/_evaluation_title_archive.html.erb
new file mode 100644
index 000000000..e4e26ed4f
--- /dev/null
+++ b/app/views/student_work/_evaluation_title_archive.html.erb
@@ -0,0 +1,27 @@
+<ul class="hworkUl">
+  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
+  <li class="hworkList50 hworkH30">&nbsp;</li>
+  <li class="hworkList260 hworkH30">
+    <span class="f14 fb fl">作品名称</span>
+  </li>
+  <% if @homework.homework_type != 3 %>
+      <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">姓名</span></li>
+      <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">学号</span></li>
+  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+      <li class="hworkList160 hworkH30"><span class="HomeworkStuTitle f14 fb fl">关联项目</span></li>
+  <% end %>
+
+  <li class="hworkList130 hworkH30 fb ml10">
+    时间
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30 fb">
+        系统
+      </li>
+  <% end%>
+
+  <li class="hworkList50 hworkH30 fb mr10 ml10">
+    我的评分
+  </li>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 0721c9ff5..afb213196 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,73 +1,74 @@
-<ul class="hworkUl">
-  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
-  <li class="hworkList50">&nbsp;</li>
-  <li class="<%= @homework.homework_type == 2 ? 'hworkList80 mr10' : 'hworkList130 mr10'%> hworkH30">
-    <span class="c_dark f14 fb fl <%#= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
-  </li>
+<table class="hwork-table-wrap">
+  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
+    <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
+    <th class="hworkList50">&nbsp;</th>
+    <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10' : 'hworkList130 pr10'%>" style="text-align:left;">作品名称</th>
     <% if @homework.homework_type != 3 %>
-        <!--<span class="c_dark f14 fb fl mr50">姓名</span>-->
-    <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> hworkH30 mr10">
-        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%>
-        <% if @show_all && @order == "lastname"%>
-            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
-        <% end%>
-    </li>
-    <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> hworkH30 mr10">
-        <!--<span class="c_dark f14 fb fl">学号</span>-->
-        <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%>
-        <% if @show_all && @order == "student_id"%>
-            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
-        <% end%>
-    </li>
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10">
+      <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%>
+      <% if @show_all && @order == "lastname"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+      <% end%>
+    </th>
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> pr10">
+      <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%>
+      <% if @show_all && @order == "student_id"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+      <% end%>
+    </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-      <li class="hworkList160 hworkH30">
-      <span class="c_dark f14 fb">关联项目</span>
-      </li>
+        <th class="hworkList160">
+          <span class="c_dark f14 fb">关联项目</span>
+        </th>
     <% end %>
-
-  <li class="hworkList130 hworkH30">
-    <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
-    <% if @show_all && @order == "created_at"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <th class="hworkList130">
+      <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+      <% if @show_all && @order == "created_at"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+      <% end%>
+    </th>
+    <th class="hworkList50">
+      <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%>
+      <% if @show_all && @order == "teacher_score"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+      <% end%>
+    </th>
+    <th class="hworkList50">
+      <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+      <% if @show_all && @order == "teaching_asistant_score"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+      <% end%>
+    </th>
+    <% if @homework.homework_type == 2%>
+        <th class="hworkList50">
+          <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+          <% if @show_all && @order == "system_score"%>
+              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+          <% end%>
+        </th>
     <% end%>
-  </li>
-
-  <li class="hworkList50 hworkH30" >
-    <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%>
-    <% if @show_all && @order == "teacher_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
-    <% end%>
-  </li>
-
-  <li class="hworkList50 hworkH30">
-    <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
-    <% if @show_all && @order == "teaching_asistant_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-    <% end%>
-  </li>
-
-  <% if @homework.homework_type == 2%>
-      <li class="hworkList50 hworkH30">
-        <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
-        <% if @show_all && @order == "system_score"%>
-            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-        <% end%>
-      </li>
+    <% if @homework.anonymous_comment == 0%>
+        <th class="hworkList50">
+          <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+          <% if @show_all && @order == "student_score"%>
+              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+          <% end%>
+        </th>
+    <% end %>
+    <th class="hworkList50">
+      <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+      <% if @show_all && @order == "score"%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+      <% end%>
+    </th>
+  </tr>
+  <% @stundet_works.each_with_index do |student_work, i|%>
+          <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i}%>
+      <tr>
+        <td colspan="12">
+          <div id="about_hwork_<%= student_work.id%>">
+          </div>
+        </td>
+      </tr>
   <% end%>
-
-  <% if @homework.anonymous_comment == 0%>
-      <li class="hworkList50 hworkH30">
-        <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
-        <% if @show_all && @order == "student_score"%>
-            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-        <% end%>
-      </li>
-  <% end %>
-
-  <li class="hworkList50 hworkH30">
-    <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
-    <% if @show_all && @order == "score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-    <% end%>
-  </li>
-</ul>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title_archive.erb b/app/views/student_work/_evaluation_un_title_archive.erb
new file mode 100644
index 000000000..f844e320b
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_title_archive.erb
@@ -0,0 +1,73 @@
+<ul class="hworkUl">
+  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
+  <li class="hworkList50">&nbsp;</li>
+  <li class="<%= @homework.homework_type == 2 ? 'hworkList80 mr10' : 'hworkList130 mr10'%> hworkH30">
+    <span class="c_dark f14 fb fl <%#= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
+  </li>
+  <% if @homework.homework_type != 3 %>
+      <!--<span class="c_dark f14 fb fl mr50">姓名</span>-->
+      <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> hworkH30 mr10">
+        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%>
+        <% if @show_all && @order == "lastname"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+        <% end%>
+      </li>
+      <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> hworkH30 mr10">
+        <!--<span class="c_dark f14 fb fl">学号</span>-->
+        <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%>
+        <% if @show_all && @order == "student_id"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+        <% end%>
+      </li>
+  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+      <li class="hworkList160 hworkH30">
+        <span class="c_dark f14 fb">关联项目</span>
+      </li>
+  <% end %>
+
+  <li class="hworkList130 hworkH30">
+    <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+    <% if @show_all && @order == "created_at"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30" >
+    <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%>
+    <% if @show_all && @order == "teacher_score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <% if @show_all && @order == "teaching_asistant_score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30">
+        <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+        <% if @show_all && @order == "system_score"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+        <% end%>
+      </li>
+  <% end%>
+
+  <% if @homework.anonymous_comment == 0%>
+      <li class="hworkList50 hworkH30">
+        <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+        <% if @show_all && @order == "student_score"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+        <% end%>
+      </li>
+  <% end %>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <% if @show_all && @order == "score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index de54585b3..bffc8ab0f 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,60 +1,58 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <a name="<%= student_work.id%>"></a>
-<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
-  <li class="hworkPortrait mt15 mr10">
+<tr class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+  <td class="hworkPortrait pr10 float-none">
     <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
-  </li>
-  <div class="student_work_<%= student_work.id%>">
-    <li class="hworkName mt12 pr10 <%= @homework.homework_type == 2 ? '' : 'width130'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+  </td>
+    <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%= @homework.homework_type == 2 ? '' : 'width130'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
       <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
       <div>
         <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
       </div>
-    </li>
+    </td>
       <% if @homework.homework_type != 3 %>
-        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10 student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
           <%= student_work.user.show_name%>
-        </li>
-        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
-          <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-        </li>
+        </td>
+        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+          <span style="width:90px; float:left;" class="hidden"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
+        </td>
       <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
         <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-            <li  class="hworkPrName" title="项目名称">
+            <td  class="hworkPrName student_work_<%= student_work.id%>" title="项目名称">
               <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-            </li>
+            </td>
         <% else %>
-            <li class="hworkPrName" title="该项目是私有的">
+            <td class="hworkPrName student_work_<%= student_work.id%>" title="该项目是私有的">
               <%= student_work.project.name %>
-            </li>
+            </td>
         <% end %>
       <% end %>
-  </div>
-  <li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+  <td class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.created_at && @homework.end_time%>
         <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
         <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
             <span class="c_red">[迟交]</span>
         <% end %>
     <% end %>
-  </li>
-  <li class="hworkList50 <%= score_color student_work.teacher_score%>">
+  </td>
+  <td class="hworkList50 <%= score_color student_work.teacher_score%>">
     <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
-  </li>
-  <li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
+  </td>
+  <td class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
     <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
-  </li>
+  </td>
 
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
-      <li class="hworkList50 <%= score_color student_work.system_score%>">
+      <td class="hworkList50 <%= score_color student_work.system_score%>">
         <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
-      </li>
+      </td>
   <% end%>
 
   <% if @homework.anonymous_comment == 0%>
-    <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
+    <td class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
       <% if student_work.student_score.nil? %>
         <span title="该作品未被匿评">未参与</span>
       <% else %>
@@ -71,7 +69,7 @@
           <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
         </div>
     <% end%>
-  </li>
+  </td>
   <% end %>
   <!-- 成绩 -->
   <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
@@ -79,7 +77,7 @@
   <% else %>
     <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <% end %>
-  <li class="hworkList50 <%= score_color score%> student_final_scor_info">
+  <td class="hworkList50 <%= score_color score%> student_final_scor_info">
     <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
     <% unless score.nil?%>
         <div class="infoNi none width180">
@@ -97,9 +95,9 @@
           <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
         </div>
     <% end%>
-  </li>
-  <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
-</ul>
+  </td>
+  <td class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+</tr>
 <script type="text/javascript">
     $(".student_work_<%= student_work.id%>").mouseenter(function(){
         if($("#about_hwork_<%= student_work.id%>").html().trim() == "") {
diff --git a/app/views/student_work/_evaluation_un_work_archive.html.erb b/app/views/student_work/_evaluation_un_work_archive.html.erb
new file mode 100644
index 000000000..5602dd4e3
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_work_archive.html.erb
@@ -0,0 +1,101 @@
+<a name="<%= student_work.id%>"></a>
+<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+  <li class="hworkPortrait mt15 mr10">
+    <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
+  </li>
+  <div class="student_work_<%= student_work.id%>">
+    <li class="hworkName mt12 pr10 <%= @homework.homework_type == 2 ? '' : 'width130'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+      <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+      <div>
+        <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+      </div>
+    </li>
+    <% if @homework.homework_type != 3 %>
+        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+          <%= student_work.user.show_name%>
+        </li>
+        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+          <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+        </li>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+            <li  class="hworkPrName" title="项目名称">
+              <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+            </li>
+        <% else %>
+            <li class="hworkPrName" title="该项目是私有的">
+              <%= student_work.project.name %>
+            </li>
+        <% end %>
+    <% end %>
+  </div>
+  <li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.created_at && @homework.end_time%>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
+    <% end %>
+  </li>
+  <li class="hworkList50 <%= score_color student_work.teacher_score%>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
+  </li>
+  <li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <!-- 系统评分 -->
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
+        <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+      </li>
+  <% end%>
+
+  <% if @homework.anonymous_comment == 0%>
+      <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
+        <% if student_work.student_score.nil? %>
+            <span title="该作品未被匿评">未参与</span>
+        <% else %>
+            <%=format("%.1f",student_work.student_score) %>
+        <% end %>
+        <% unless student_work.student_score.nil?%>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
+        </span>
+            <div class="infoNi none">
+              现共有
+              <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
+              名学生进行了匿评，平均分为
+              <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
+            </div>
+        <% end%>
+      </li>
+  <% end %>
+  <!-- 成绩 -->
+  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
+      <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
+  <% else %>
+      <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+  <% end %>
+  <li class="hworkList50 <%= score_color score%> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+    <% unless score.nil?%>
+        <div class="infoNi none width180">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+            &nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
+            &nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
+  <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 47ce6e0ab..5bd4ec568 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,5 +1,5 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
-<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
+<tr class="hworkListRow" id="student_work_<%= student_work.id%>">
   <% if @homework.homework_type != 3 %>
       <% is_my_work = student_work.user == User.current%>
   <% else %>
@@ -8,81 +8,78 @@
   <% end %>
 
   <% if is_my_work%>
-      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
-      <li class="hworkPortrait mt15 mr10">
+      <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+      <td class="hworkPortrait pr10 float-none">
         <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %>
-      </li>
-      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+      </td>
+      <td class="hworkName pr10 w250 float-none student_work_<%= student_work.id%>">
         <div>
           <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
           <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
         </div>
-      </li>
-      <div class="student_work_<%= student_work.id%>">
+      </td>
         <% if @homework.homework_type != 3 %>
-          <li class="hworkStName w80" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          <td class="hworkStName float-none w80 student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <%= student_work.user.show_name%>
-          </li>
-          <li class="hworkStID" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          </td>
+          <td class="hworkStID float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-          </li>
+          </td>
         <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-          <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-              <li  class="hworkPrName mr10 mt12" title="项目名称">
+            <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+              <td  class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="项目名称">
                 <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-              </li>
-          <% else %>
-              <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+              </td>
+            <% else %>
+              <td class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="该项目是私有的">
                 <%= student_work.project.name %>
-              </li>
-          <% end %>
+              </td>
+            <% end %>
         <% end %>
-      </div>
   <% else%>
-      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
-      <li class="hworkPortrait mt15 mr10">
+      <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+      <td class="hworkPortrait float-none pr10">
         <%= image_tag(url_to_avatar(""),width:"40", height: "40", style: "display:block;") %>
-      </li>
-      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+      </td>
+      <td class="hworkName float-none pr10 w250 student_work_<%= student_work.id%>">
         <div>
           <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
         </div>
-      </li>
-        <% if @homework.homework_type != 3 %>
-          <li class="hworkStName w80" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+      </td>
+      <% if @homework.homework_type != 3 %>
+          <td class="hworkStName float-none w80" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             匿名
-          </li>
-          <li class="hworkStID" title="学号">
+          </td>
+          <td class="hworkStID float-none" title="学号">
             --
-          </li>
-        <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-          <li class="hworkPrName mr10" title="项目名称" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          </td>
+      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+          <td class="hworkPrName mr10 float-none" title="项目名称" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             匿名
-          </li>
-        <% end %>
+          </td>
+      <% end %>
   <% end%>
-
-  <li class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+  <td class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
         <span class="c_red">[迟交]</span>
     <% end %>
-  </li>
+  </td>
 
   <!-- 成绩 -->
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
-      <li class="hworkList50 <%= score_color student_work.system_score%>">
+      <td class="hworkList50 <%= score_color student_work.system_score%>">
         <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
-      </li>
+      </td>
   <% end%>
 
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
+  <td class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
-  </li>
-  <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
-</ul>
+  </td>
+  <td class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+</tr>
 <script type="text/javascript">
     $(".student_work_<%= student_work.id%>").mouseenter(function(){
         $("#work_click_<%= student_work.id%>").show();
diff --git a/app/views/student_work/_evaluation_work_archive.html.erb b/app/views/student_work/_evaluation_work_archive.html.erb
new file mode 100644
index 000000000..a183762e2
--- /dev/null
+++ b/app/views/student_work/_evaluation_work_archive.html.erb
@@ -0,0 +1,84 @@
+<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <% if @homework.homework_type != 3 %>
+      <% is_my_work = student_work.user == User.current%>
+  <% else %>
+      <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+      <% is_my_work = pro && pro.student_work_id == student_work.id%>
+  <% end %>
+
+  <% if is_my_work%>
+      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %>
+      </li>
+      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+        <div>
+          <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+          <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+        </div>
+      </li>
+      <div class="student_work_<%= student_work.id%>">
+        <% if @homework.homework_type != 3 %>
+            <li class="hworkStName w80" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+              <%= student_work.user.show_name%>
+            </li>
+            <li class="hworkStID" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+              <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+            </li>
+        <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+            <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+                <li  class="hworkPrName mr10 mt12" title="项目名称">
+                  <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+                </li>
+            <% else %>
+                <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                  <%= student_work.project.name %>
+                </li>
+            <% end %>
+        <% end %>
+      </div>
+  <% else%>
+      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= image_tag(url_to_avatar(""),width:"40", height: "40", style: "display:block;") %>
+      </li>
+      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+        <div>
+          <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+        </div>
+      </li>
+      <% if @homework.homework_type != 3 %>
+          <li class="hworkStName w80" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            匿名
+          </li>
+          <li class="hworkStID" title="学号">
+            --
+          </li>
+      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+          <li class="hworkPrName mr10" title="项目名称" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            匿名
+          </li>
+      <% end %>
+  <% end%>
+
+  <li class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
+  </li>
+
+  <!-- 成绩 -->
+  <% if @homework.homework_type == 2%>
+      <!-- 系统评分 -->
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
+        <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+      </li>
+  <% end%>
+
+  <% my_score = student_work_score(student_work,User.current) %>
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
+    <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
+  </li>
+  <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 0dd52c6e5..4ca5a8f2d 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -1,123 +1,122 @@
-
-<div class="show_hwork_arrow"></div>
-<div class="showHwork">
-  <ul>
-    <li class="fl" >
-      <span class="tit_fb">上交时间：</span>
-      <%=format_time work.created_at %>
-    </li>
-
-    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
-        <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
-        <li class="fr" >
-          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+    <div class="show_hwork_arrow"></div>
+    <div class="showHwork">
+      <ul>
+        <li class="fl" >
+          <span class="tit_fb">上交时间：</span>
+          <%=format_time work.created_at %>
         </li>
-        <li class="fr" >
-          <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
-        </li>
-    <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
-        <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= work.id%>">
-          <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
-        </li>
-    <% end%>
-    <div class="cl"></div>
 
-    <li >
-      <span class="tit_fb ">编程代码：</span>
-      <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
-        </div>
-      </div>
-      <div class="cl"></div>
-    </li>
+        <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
+            <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
+            <li class="fr" >
+              <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+            </li>
+            <li class="fr" >
+              <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
+            </li>
+        <% end%>
+        <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
+            <!-- 匿评结束阶段，显示点赞按钮 -->
+            <li class="fr" id="student_work_praise_<%= work.id%>">
+              <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
+            </li>
+        <% end%>
+        <div class="cl"></div>
 
-    <li class="mt10 fl">
-      <span class="tit_fb ">
-        测试结果：
-      </span>
-      <div class="show_hwork_p break_word">
-        <% work.student_work_tests.each_with_index do |test, index| %>
-            <div class="ProResultTop">
-              <p class="c_blue fl">
-                第<%= work.student_work_tests.count - index%>次测试
-              </p>
-              <span class="fr c_grey">
-                <%= test.created_at.to_s(:db) %>
-              </span>
-              <div class="cl"></div>
+        <li >
+          <span class="tit_fb ">编程代码：</span>
+          <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
             </div>
-            <% if test.status.to_i == -2 %>
-                <div class="ProResultCon ">
-                  <%= test.results.first %>
-                </div>
-            <% else %>
-                <div class="ProResultTable " >
-                  <ul class="ProResultUl " >
-
-                    <% test.results.reverse.each_with_index do |x, i| %>
-                      <% unless x.nil? %>
-                        <li >
-                          <span class="w60 T_C">测试<%=test.results.size-i%></span>
-                          <% if x["status"].to_i != 0 %>
-                              <% if x["status"].to_i == 2 %>
-                                  <span class="w60 c_red">超时！</span>
-                              <% else %>
-                                  <span class="w60 c_red">测试错误！</span>
-                              <% end %>
-                              <span class="w60">您的输出：</span>
-                              <span class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"].force_encoding("UTF-8")%> </pre></span>
-                              <span class="w60">正确输出：</span>
-
-                              <span  class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["output"].force_encoding("UTF-8")%></pre></span>
-                              <span class="w50">耗时：</span>
-                              <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>
-                              <div class="cl"></div>
-                          <% else %>
-                              <span class="w60 c_green">测试正确！</span>
-                              <span style="width:360px;">&nbsp;</span>
-                               <span class="w50">耗时：</span>
-                               <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>
-                              <div class="cl"></div>
-                          <% end %>
-                        </li>
-                      <% end %>
-                    <% end %>
-                  </ul>
-                </div>
-            <% end %>
-        <% end %>
-      </div>
-    </li>
-
-    <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
-          <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
           </div>
-      <% end%>
+          <div class="cl"></div>
+        </li>
+
+        <li class="mt10 fl">
+          <span class="tit_fb ">
+            测试结果：
+          </span>
+          <div class="show_hwork_p break_word">
+            <% work.student_work_tests.each_with_index do |test, index| %>
+                <div class="ProResultTop">
+                  <p class="c_blue fl">
+                    第<%= work.student_work_tests.count - index%>次测试
+                  </p>
+                  <span class="fr c_grey">
+                    <%= test.created_at.to_s(:db) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <% if test.status.to_i == -2 %>
+                    <div class="ProResultCon ">
+                      <%= test.results.first %>
+                    </div>
+                <% else %>
+                    <div class="ProResultTable " >
+                      <ul class="ProResultUl " >
+
+                        <% test.results.reverse.each_with_index do |x, i| %>
+                          <% unless x.nil? %>
+                            <li >
+                              <span class="w60 T_C">测试<%=test.results.size-i%></span>
+                              <% if x["status"].to_i != 0 %>
+                                  <% if x["status"].to_i == 2 %>
+                                      <span class="w60 c_red">超时！</span>
+                                  <% else %>
+                                      <span class="w60 c_red">测试错误！</span>
+                                  <% end %>
+                                  <span class="w60">您的输出：</span>
+                                  <span class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"].force_encoding("UTF-8")%> </pre></span>
+                                  <span class="w60">正确输出：</span>
+
+                                  <span  class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["output"].force_encoding("UTF-8")%></pre></span>
+                                  <span class="w50">耗时：</span>
+                                  <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>
+                                  <div class="cl"></div>
+                              <% else %>
+                                  <span class="w60 c_green">测试正确！</span>
+                                  <span style="width:360px;">&nbsp;</span>
+                                   <span class="w50">耗时：</span>
+                                   <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>
+                                  <div class="cl"></div>
+                              <% end %>
+                            </li>
+                          <% end %>
+                        <% end %>
+                      </ul>
+                    </div>
+                <% end %>
+            <% end %>
+          </div>
+        </li>
+
+        <li >
+          <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
+              <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
+              <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+                <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
+              </div>
+          <% end%>
+          <div class="cl"></div>
+        </li>
+      </ul>
+
+      <div id="revise_attachment">
+        <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
+      </div>
       <div class="cl"></div>
-    </li>
-  </ul>
 
-  <div id="revise_attachment">
-    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
-  </div>
-  <div class="cl"></div>
-
-  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%student_work_scores.each do |student_score|%>
-        <div id="work_score_<%= student_score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
-        </div>
-    <% end%>
-  </div>
-  <div class="cl"></div>
-  <!---ping_box end--->
-  <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
-  <div class="cl"></div>
-</div>
+      <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+        <%student_work_scores.each do |student_score|%>
+            <div id="work_score_<%= student_score.id%>">
+              <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
+            </div>
+        <% end%>
+      </div>
+      <div class="cl"></div>
+      <!---ping_box end--->
+      <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
+      <div class="cl"></div>
+    </div>
 <script type="text/javascript">
     $(function(){
         <% if defined?(is_focus) && is_focus.to_i == 1 %>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index fb1b2da4b..484e8eb0e 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -1,109 +1,109 @@
-<div class="show_hwork_arrow"></div>
-<div class="showHwork">
-  <% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
-  <% if @homework.homework_type != 3 %>
-      <% is_my_work = work.user == User.current%>
-  <% else %>
-      <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
-      <% is_my_work = pro && pro.student_work_id == work.id%>
-  <% end %>
-  <ul>
-    <li class="fl" >
-      <span class="tit_fb">上交时间：</span>
-      <%=format_time work.created_at %>
-    </li>
+  <div class="show_hwork_arrow"></div>
+  <div class="showHwork">
+    <% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
+    <% if @homework.homework_type != 3 %>
+        <% is_my_work = work.user == User.current%>
+    <% else %>
+        <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+        <% is_my_work = pro && pro.student_work_id == work.id%>
+    <% end %>
+    <ul>
+      <li class="fl" >
+        <span class="tit_fb">上交时间：</span>
+        <%=format_time work.created_at %>
+      </li>
 
-    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
-        <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
-        <li class="fr" >
-          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除")  %>
-        </li>
-        <li class="fr mr5" >
-          <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
-        </li>
-    <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
-        <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= work.id%>">
-          <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
-        </li>
-    <% end%>
+      <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
+          <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
+          <li class="fr" >
+            <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除")  %>
+          </li>
+          <li class="fr mr5" >
+            <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
+          </li>
+      <% end%>
+      <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
+          <!-- 匿评结束阶段，显示点赞按钮 -->
+          <li class="fr" id="student_work_praise_<%= work.id%>">
+            <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
+          </li>
+      <% end%>
+      <div class="cl"></div>
+
+      <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
+
+      <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
+          <div class="cl"></div>
+          <li>
+            <span class="tit_fb"> 参与人员：</span>
+            <%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
+            <% members = work.student_work_projects.where("is_leader = 0") %>
+            <% members.each do |member| if !members.empty? %>
+                    、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
+                <% end %>
+            <% end %>
+          </li>
+          <% if @homework.homework_detail_group.base_on_project == 1 %>
+              <li>
+                <span class="tit_fb"> 关联项目：</span>
+                <% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
+                    <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+                <% else %>
+                    <span title ="该项目是私有的"><%=work.project.name %></span>
+                <% end %>
+                <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+                <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
+              </li>
+          <% end %>
+      <% end%>
+
+      <li >
+        <span class="tit_fb ">内容：</span>
+        <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
+          <%= work.description.html_safe if work.description%>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <span class="tit_fb"> 附件：</span>
+        <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
+        <% if com_attachments.empty?%>
+            <span style="color: #999999">尚未提交附件</span>
+        <% else%>
+            <div class="fl" style="width: 90%;">
+              <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
+            </div>
+        <% end%>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
+            <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
+            <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+              <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
+            </div>
+        <% end%>
+        <div class="cl"></div>
+      </li>
+    </ul>
+
+    <div id="revise_attachment">
+      <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
+    </div>
     <div class="cl"></div>
 
-    <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
-
-    <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
-        <div class="cl"></div>
-        <li>
-          <span class="tit_fb"> 参与人员：</span>
-          <%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
-          <% members = work.student_work_projects.where("is_leader = 0") %>
-          <% members.each do |member| if !members.empty? %>
-            、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
-          <% end %>
-          <% end %>
-        </li>
-        <% if @homework.homework_detail_group.base_on_project == 1 %>
-            <li>
-              <span class="tit_fb"> 关联项目：</span>
-              <% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
-                  <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
-              <% else %>
-                  <span title ="该项目是私有的"><%=work.project.name %></span>
-              <% end %>
-              <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
-              <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
-            </li>
-        <% end %>
-    <% end%>
-
-    <li >
-      <span class="tit_fb ">内容：</span>
-      <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
-        <%= work.description.html_safe if work.description%>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <span class="tit_fb"> 附件：</span>
-      <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
-      <% if com_attachments.empty?%>
-          <span style="color: #999999">尚未提交附件</span>
-      <% else%>
-          <div class="fl" style="width: 90%;">
-            <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
+    <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+      <%student_work_scores.each do |student_score|%>
+          <div id="work_score_<%= student_score.id%>">
+            <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
           </div>
       <% end%>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
-          <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
-          </div>
-      <% end%>
-      <div class="cl"></div>
-    </li>
-  </ul>
-
-  <div id="revise_attachment">
-    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
+    </div>
+    <div class="cl"></div>
+    <!---ping_box end--->
+    <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
+    <div class="cl"></div>
   </div>
-  <div class="cl"></div>
-
-  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%student_work_scores.each do |student_score|%>
-        <div id="work_score_<%= student_score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
-        </div>
-    <% end%>
-  </div>
-  <div class="cl"></div>
-  <!---ping_box end--->
-  <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
-  <div class="cl"></div>
-</div>
 <script type="text/javascript">
     $(function(){
         showNormalImage('student_work_img_<%=work.id %>');
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 8fc98c6ca..1c699d331 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -37,17 +37,6 @@
 </div>
 <div class="cl"></div>
 
-<% @stundet_works.each_with_index do |student_work, i|%>
-    <% if @is_evaluation%>
-        <%= render :partial => "evaluation_work", :locals => {:student_work => student_work, :index => i}%>
-    <% else%>
-        <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i}%>
-    <% end%>
-    <div class="cl"></div>
-    <div id="about_hwork_<%= student_work.id%>">
-    </div>
-    <div class="cl"></div>
-<% end%>
 <script type="text/javascript">
   $(function(){
       <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 9815c8040..e17487fe5 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -101,6 +101,10 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .mt16{margin-top: 16px;}
 .pr10{padding-right: 10px;}
 
+/*20160520作品列表table*/
+.hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d;}
+
 /*作业信息*/
 .mt-2 {margin-top:-2px;}
 .homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 643aea8cf..a5c1ada12 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -48,6 +48,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .fr{float:right;display:inline;}
 .f_l{ float:left;}
 .f_r{ float:right;}
+.float-none {float:none !important;}
 .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
 .clearfix{clear:both;zoom:1}
 .break_word{ word-break:break-all; word-wrap: break-word;}
@@ -136,6 +137,8 @@ h4{ font-size:14px; color:#3b3b3b;}
 .pl10 {padding-left:10px;}
 .pl15{ padding-left:15px;}
 .pl5{ padding-left:5px;}
+.pr5 {padding-right:5px;}
+.pr10 {padding-right:10px;}
 .pt5{ padding-top:5px;}
 .pt10{ padding-top:10px;}
 .pb5{ padding-bottom: 5px;}

From ded5f8f86105d3f4c592c58d99d3c9b11a5cd403 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 15:30:25 +0800
Subject: [PATCH 43/72] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAKE=E5=86=85=E5=AE=B9=E7=9A=84=E5=9C=B0=E6=96=B9?=
 =?UTF-8?q?=E9=83=BD=E5=8A=A0=E4=B8=8A=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=BD=91=E5=9D=80=E7=9A=84=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb         |  2 +
 app/views/courses/syllabus.html.erb           |  2 +
 app/views/forums/_show_topics.html.erb        |  8 ++-
 app/views/issues/_detail.html.erb             | 11 +++-
 app/views/issues/_issue_replies.html.erb      |  1 +
 app/views/memos/show.html.erb                 |  4 +-
 app/views/messages/_course_show.html.erb      |  2 +
 .../messages/_org_subfield_show.html.erb      |  2 +
 app/views/messages/_project_show.html.erb     |  2 +
 app/views/news/_course_show.html.erb          |  2 +
 app/views/news/_organization_show.html.erb    |  2 +
 app/views/news/_project_show.html.erb         |  2 +
 app/views/org_document_comments/show.html.erb |  2 +
 .../_org_course_homework.html.erb             |  1 +
 .../_org_course_message.html.erb              |  1 +
 .../organizations/_org_course_news.html.erb   |  1 +
 .../organizations/_org_project_issue.html.erb |  1 +
 .../_org_subfield_message.html.erb            |  1 +
 .../organizations/_org_subfield_news.html.erb |  1 +
 .../organizations/_project_message.html.erb   |  1 +
 .../organizations/_show_home_page.html.erb    |  1 +
 .../organizations/_show_org_document.html.erb |  8 ++-
 app/views/projects/_project_news.html.erb     |  3 +-
 app/views/sub_document_comments/show.html.erb |  2 +
 app/views/users/_course_homework.html.erb     |  1 +
 .../users/_course_journalsformessage.html.erb |  1 +
 app/views/users/_course_message.html.erb      |  3 +-
 app/views/users/_course_news.html.erb         |  1 +
 app/views/users/_intro_content.html.erb       |  4 +-
 app/views/users/_project_issue_reply.html.erb |  1 +
 app/views/users/_project_message.html.erb     |  1 +
 app/views/users/_project_news.html.erb        |  1 +
 app/views/users/_user_blog.html.erb           |  1 +
 .../users/_user_homework_detail.html.erb      |  1 +
 .../users/_user_journalsformessage.html.erb   |  6 ++
 public/javascripts/application.js             | 57 +++++++++----------
 public/stylesheets/new_user.css               |  2 +-
 public/stylesheets/project.css                |  4 +-
 38 files changed, 104 insertions(+), 43 deletions(-)

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index de7f1647d..d3763abf3 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -141,6 +141,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -215,5 +216,6 @@
       var postContent = $("#message_description_<%= @article.id %>").html();
       postContent = postContent.replace(/&nbsp;/g," ");
       $("#message_description_<%= @article.id %>").html(postContent);
+      autoUrl('message_description_<%= @article.id %>');
   });
 </script>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index 8be245958..66bc8ff9a 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -120,6 +120,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -214,5 +215,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @article.id %>');
     });
 </script>
\ No newline at end of file
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 08c030f90..ed90453ac 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -1,6 +1,12 @@
 <div style="padding-top: 10px">
   <% if memos.any? %>
       <% memos.each do |topic| %>
+          <script type="text/javascript">
+              $(function(){
+                  showNormalImage('postDetailDes_<%= topic.id %>');
+                  autoUrl('postDetailDes_<%= topic.id %>');
+              });
+          </script>
           <div class="postDetailRow">
             <div class="postDetailPortrait">
               <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="贴吧图片" /></a>-->
@@ -16,7 +22,7 @@
                 <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
               </div>
 
-              <div class="postDetailDes"><%= topic.content.html_safe%>
+              <div class="postDetailDes" id = "postDetailDes_<%= topic.id %>"><%= topic.content.html_safe%>
                 <!--<a href="javascript:void(0);" class="linkBlue2 underline ml8">显示全部</a>-->
               </div>
               <% author = topic.last_reply.try(:author)%>
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index 92021f728..03c420c99 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -28,7 +28,7 @@
   <%= render :partial => 'action_menu' %>
   <div class="cl"></div>
   <% if @issue.description? || @issue.attachments.any? -%>
-      <div class="talk_info mb10 issue_desc" style="word-break:break-all;">
+      <div class="talk_info mb10 issue_desc" id="issue_desc_<%= @issue.id %>" style="word-break:break-all;">
         <% if @issue.description? %>
             <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
             <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
@@ -43,4 +43,11 @@
   <!--属性-->
   <%= render :partial => 'issues/attributes_show' %>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('issue_desc_<%= @issue.id %>');
+        autoUrl('issue_desc_<%= @issue.id %>');
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index aaf9c132f..197cd9c02 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -3,6 +3,7 @@
       <script type="text/javascript">
           $(function(){
               showNormalImage('reply_content_<%= reply.id %>');
+              autoUrl('reply_content_<%= reply.id %>');
           });
       </script>
       <% replies_all_i=replies_all_i + 1 %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index aeaf3f423..3524de0c8 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -99,7 +99,7 @@
       </div>
       <script type="text/javascript">
           $(function(){
-              $("#activity_description_<%= reply.id %> p,#activity_description__<%= reply.id %> span,#activity_description_<%= reply.id %> em").each(function(){
+              $("#activity_description_<%= reply.id %> p,#activity_description_<%= reply.id %> span,#activity_description_<%= reply.id %> em").each(function(){
                   var postContent = $(this).html();
                   postContent = postContent.replace(/&nbsp;/g," ");
                   postContent= postContent.replace(/ {2}/g,"&nbsp; ");
@@ -107,6 +107,7 @@
                   postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
                   $(this).html(postContent);
               });
+              autoUrl('activity_description_<%= reply.id %>');
               description_show_hide(<%= reply.id %>);
           });
       </script>
@@ -147,6 +148,7 @@
                 postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
                 $(this).html(postContent);
             });
+            autoUrl('activity_description_<%= @memo.id %>');
             description_show_hide(<%= @memo.id %>);
     });
 </script>
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 33c9d7f8d..443440455 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -109,6 +109,7 @@
           <script type="text/javascript">
               $(function(){
                   showNormalImage('reply_message_description_<%= reply.id %>');
+                  autoUrl('reply_message_description_<%= reply.id %>');
               });
           </script>
           <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -188,5 +189,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @topic.id %>');
     });
 </script>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 4d5af61dd..145afcfd7 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -138,6 +138,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -210,5 +211,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @topic.id %>');
     });
 </script>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 10046bce2..35b3f8a3c 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -165,6 +165,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_message_description_<%= reply.id %>');
+                        autoUrl('reply_message_description_<%= reply.id %>');
                     });
                 </script>
                 <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -245,5 +246,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @topic.id %>');
     });
 </script>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 46346eb71..5908c7593 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -115,6 +115,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -210,5 +211,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @news.id %>');
     });
 </script>
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 640854164..7eecf43ab 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -97,6 +97,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -185,5 +186,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @news.id %>');
     });
 </script>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 6b91c98ed..6b3824222 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -107,6 +107,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
@@ -195,5 +196,6 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('message_description_<%= @news.id %>');
     });
 </script>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index f5b186197..e2967a9ae 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -84,6 +84,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <% user = User.find(reply.creator_id) %>
@@ -158,6 +159,7 @@
             postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
             $(this).html(postContent);
         });
+        autoUrl('intro_content_<%= @document.id %>');
     });
     function expand_reply(container, btnid) {
         var target = $(container);
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index d72600e1e..d3fe36fe3 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -315,6 +315,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index e0ec8d5fd..e68745f7a 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -100,6 +100,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i+1 %>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 6fa588ec9..acf0f0377 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -69,6 +69,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index d19c2cabe..9ca10c91d 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -80,6 +80,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i + 1 %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 315b6d8b4..61bc5bc7f 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -105,6 +105,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i+1 %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 314380c20..5d6c38542 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -89,6 +89,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 63d416f7a..e1b000c70 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -79,6 +79,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i+1 %>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 63eb1808b..7d8f7963f 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -59,6 +59,7 @@
         postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
         $(this).html(postContent);
     });
+    autoUrl('intro_content_<%= @document.id %>');
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 6012dd0d4..e8f531206 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -88,6 +88,12 @@
       <ul>
         <% reply_id = 0 %>
         <% comments_for_doc.each do |comment| %>
+            <script type="text/javascript">
+                $(function(){
+                    showNormalImage('reply_content_<%= comment.id %>');
+                    autoUrl('reply_content_<%= comment.id %>');
+                });
+            </script>
             <% reply_id += 1 %>
             <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
               <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
@@ -104,7 +110,7 @@
                   </span>
                 </div>
                 <% unless comment.content.blank? %>
-                    <div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
+                    <div class="homepagePostReplyContent" id="reply_content_<%= comment.id %>"><%= comment.content.html_safe %></div>
                 <% end %>
               </div>
               <div class="cl"></div>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 2994d908b..6d97b252d 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -69,6 +69,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
@@ -125,4 +126,4 @@
     $(function(){
         user_card_show_hide();
     });
-</script>
+</script>
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index 3155c178b..fc35d00cb 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -97,6 +97,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_message_description_<%= reply.id %>');
+                      autoUrl('reply_message_description_<%= reply.id %>');
                   });
               </script>
               <% user = User.find(reply.creator_id) %>
@@ -164,6 +165,7 @@
                 postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
                 $(this).html(postContent);
             });
+            autoUrl('intro_content_<%= @document.id %>');
             var replyCount = $(".homepagePostReplyContainer").size();
             if (replyCount >3){
                 for(var i= 3; i < replyCount+1; i++){
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index fe586b28c..3721244ed 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -321,6 +321,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 05e0a67b0..aeb7f5e5d 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -56,6 +56,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index aa2781b95..8b6056309 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -117,6 +117,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i+1 %>
@@ -179,4 +180,4 @@
     $(function(){
         user_card_show_hide();
     });
-</script>
+</script>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 3e4bda9f3..19d62b14e 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -94,6 +94,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index 050720b6c..04babe100 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -13,9 +13,7 @@
           postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
           $(this).html(postContent);
       });
-
-//      autoUrl('intro_content_<%#= user_activity_id%>');
-
+      autoUrl('intro_content_<%= user_activity_id%>');
       description_show_hide(<%=user_activity_id %>);
   });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 671cbeab9..5323b76b6 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -29,6 +29,7 @@
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_content_<%= reply.id %>');
+                      autoUrl('reply_content_<%= reply.id %>');
                   });
               </script>
               <% replies_all_i=replies_all_i + 1 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 468ce3a88..b6e3f9a94 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -112,6 +112,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');
+                        autoUrl('reply_content_<%= reply.id %>');
                     });
                 </script>
                 <% replies_all_i=replies_all_i+1 %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 681493c44..55e2182b5 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -91,6 +91,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 904d573bb..de5ffc31f 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -75,6 +75,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index e561c6363..f81fbabf5 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -331,6 +331,7 @@
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 944477e88..d39cccb11 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -86,6 +86,12 @@
         <div class="" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= user_activity_id %>');
+                        autoUrl('reply_content_<%= user_activity_id %>');
+                    });
+                </script>
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_delete_<%= comment.id%>').show();" onmouseout="$('#message_delete_<%= comment.id%>').hide();"  style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index b0fda8168..3828b981b 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1318,16 +1318,7 @@ function pop_up_box(value,tWidth,tTop,tLeft){
 
 
 //yk 自动识别URL 并加上链接
-var strRegex = '((https|http|ftp|rtsp|mms)?://)'
-    + '?(([0-9a-z_!~*\'().&=+$%-]+: )?[0-9a-z_!~*\'().&=+$%-]+@)?' //ftp的user@
-    + '(([0-9]{1,3}.){3}[0-9]{1,3}' // IP形式的URL- 199.194.52.184
-    + '|' // 允许IP和DOMAIN（域名）
-    + '([0-9a-z_!~*\'()-]+.)*' // 域名- www.
-    + '([0-9a-z][0-9a-z-]{0,61})?[0-9a-z].' // 二级域名
-    + '[a-z]{2,6})' // first level domain- .com or .museum
-    + '(:[0-9]{1,4})?' // 端口- :80
-    + '((/?)|' // a slash isn't required if there is no file name
-    + '(/[0-9a-z_!~*\'().;?:@&=+$,%#-]+)+/?)';
+//var strRegex = '((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?';
 
 function autoUrl(id){
     if ($("#"+id).children().length > 0 ){
@@ -1335,17 +1326,20 @@ function autoUrl(id){
             if ($(this).children().length == 0){
                 var html = $(this).text(); //.replace(/(^\s*)|(\s*$)/g, "")
                 console.log("html="+html);
-                var re=new RegExp(strRegex,"g");
-                html = html.replace(re,function(full) {
+//                var re=new RegExp(strRegex,"g");
+                html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
                     //没有://的都加上http://
-                    if (full.indexOf("://") >= 0){
-                        var reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    var reStr = full;
+                    if (full.length > 0){
+                        if (full.indexOf("://") >= 0){
+                            reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                        }
+                        else{
+                            reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                        }
+                        console.log("reStr="+reStr);
                     }
-                    else{
-                        var reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
-                    }
-                    console.log("reStr="+reStr);
-                    return reStr;
+                    return reStr ;
                 });
                 $(this).html(html);
             }
@@ -1353,18 +1347,21 @@ function autoUrl(id){
     }
     else{
         var html = $("#"+id).text(); //.replace(/(^\s*)|(\s*$)/g, "")
-        console.log("html="+html);
-        var re=new RegExp(strRegex,"g");
-        html = html.replace(re,function(full) {
-            //没有://的都加上http://
-            if (full.indexOf("://") >= 0){
-                var reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+        console.log("!!!!html="+html);
+//        var re=new RegExp(strRegex,"g");
+        html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
+        //没有://的都加上http://
+            var reStr = full;
+            if (full.length > 0){
+                if (full.indexOf("://") >= 0){
+                    reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                }
+                else{
+                    reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                }
+                console.log("reStr="+reStr);
             }
-            else{
-                var reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
-            }
-            console.log("reStr="+reStr);
-            return reStr;
+            return reStr ;
         });
         $("#"+id).html(html);
     }
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index db2974e01..d7b56a8aa 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1457,7 +1457,7 @@ span.at a{color:#269ac9;text-decoration: none;}
 .pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
 .w70{ width:70px;}
 .w80{ width:80px;}
-.label03{ width:70px; text-align:right;    display:block; float:left;}
+.label03{ width:70px; text-align:right;    display:block; float:left;white-space: nowrap;}
 .pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .proInfoP{color:#000000 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 927be4cc3..09f7075f7 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -470,7 +470,7 @@ a:hover.st_add{ color:#ff8e15;}
 .newpro_box select{ height:29px; float:left; margin-bottom:10px;}
 /*.label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); }*/
 .label02{ width:110px; text-align:right; font-size:14px;    display:block; float:left;}
-.label03{ width:70px; text-align:right;    display:block; float:left;}
+.label03{ width:70px; text-align:right;    display:block; float:left;white-space: nowrap;}
 .collapsible{ border-left:none;border-right:none;border-bottom:none; border-top:1px solid #e4e4e4; padding-top:10px;  }
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon {
@@ -1240,4 +1240,4 @@ a.pages-big{ width:50px;}
 .pages{width:330px; margin:20px auto 10px;}
 
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}

From da375dcb4e7f315ef6d73836e79b1b86e38cf251 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 15:39:07 +0800
Subject: [PATCH 44/72] =?UTF-8?q?=E6=8C=82=E8=B5=B7=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E7=9A=84=E5=86=85=E5=AE=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=E4=B8=8D=E5=BA=94=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb |  1 +
 app/views/student_work/index.html.erb      | 24 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 7da42bd24..f518f81da 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -376,6 +376,7 @@ class StudentWorkController < ApplicationController
     ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
+    @all_homework_commons = @course.homework_commons.order("created_at desc")
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 8e7d87302..c321a10fb 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -69,16 +69,16 @@
         <ul class="menu_r">
           <li>
             <a href="javascript:void(0);" class="parent">
-              <% @homework_commons.each_with_index do |homework_common,index |%>
+              <% @all_homework_commons.each_with_index do |homework_common,index |%>
                 <% if homework_common.id == @homework.id %>
-                <%="作业 #{@homework_commons.count - index}"  %>
+                <%="作业 #{@all_homework_commons.count - index}"  %>
                 <% end %>
               <% end%>
             </a>
             <ul>
-              <% @homework_commons.each_with_index do |homework_common,index |%>
+              <% @all_homework_commons.each_with_index do |homework_common,index |%>
                   <li class="pr10">
-                    <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
+                    <%= link_to "作业#{@all_homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
                     <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>
@@ -170,13 +170,15 @@
           <div class="cl"></div>
         </div>
         <div class="mt5">
-          <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %>
-            <div class="fontGrey2 db fl">提交截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
-          <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 && @homework.anonymous_comment == 0 %>
-              <div class="fontGrey2 db fl">匿评截止时间：<%= @homework.homework_detail_manual.evaluation_end %>&nbsp;23:59</div>
-          <% end %>
-          <% if @homework.homework_detail_manual.comment_status == 0 %>
-            <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
+          <% if @homework.end_time && @homework.publish_time %>
+              <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %>
+                <div class="fontGrey2 db fl">提交截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+              <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 && @homework.anonymous_comment == 0 %>
+                  <div class="fontGrey2 db fl">匿评截止时间：<%= @homework.homework_detail_manual.evaluation_end %>&nbsp;23:59</div>
+              <% end %>
+              <% if @homework.homework_detail_manual.comment_status == 0 %>
+                <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
+              <% end %>
           <% end %>
           <% if @homework.homework_detail_manual%>
               <% if @homework.homework_detail_manual.comment_status == 1%>

From 6479ace5e16e70b5fd87b1ff281416784e7404c6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 16:19:10 +0800
Subject: [PATCH 45/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E5=87=BA=E6=A1=86=E5=A2=9E=E5=8A=A0=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E5=AF=BC=E5=87=BA=E7=9A=84=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=8E=BB=E6=8E=89=E6=9C=AA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E4=BD=9C=E4=B8=9A=E3=80=81=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 2 +-
 app/views/courses/_show_member_score.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 374e26431..17f62f18c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -341,7 +341,7 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
-    @homeworks = @course.homework_commons.order("created_at asc")
+    @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at asc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
 
     respond_to do |format|
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 27b3863b0..80c2ef5cc 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -8,19 +8,19 @@
 
 
     .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
-    .tscore_box{ width:350px; margin:15px auto;}
+    .tscore_box{ width:370px; margin:15px auto;}
     .tscore_box li{ height:25px;}
 </style>
 
 
   <div class="tscore_con" id="user_score">
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
-    <ul class="tscore_box">
+    <ul class="tscore_box" style="max-height: 400px; overflow: auto;">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
-      <% @member_score.homework_common_list.each do |homework_common| %>
+      <% @member_score.homework_common_list.each_with_index do |homework_common, index| %>
             <li>
               <span class="c_grey02 w280 hiddent">
-                <%= homework_common.name %>
+                作业<%=index + 1 %>：<%= homework_common.name %>
               </span>
               <span class="c_red w70">
                 <% final_score = @member_score.homework_common_score(homework_common).first%>

From f9e445500eb0488383fd6016e0a89b19c7b8d450 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 16:38:58 +0800
Subject: [PATCH 46/72] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E5=8B=BE=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 3397d5929..038a48c30 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,7 +6,7 @@
     <% attachments.each do |attach| %>
         <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
           <li class="resource-list-checkbox fl">
-            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
                 <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
             <% else %>
                 <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />

From 6d7eca487f5ef521692267fbacceacc609981665 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 17:02:43 +0800
Subject: [PATCH 47/72] =?UTF-8?q?=E5=B0=86KE=E7=9A=84newlineTag=EF=BC=9A'b?=
 =?UTF-8?q?r'=20=E6=94=B9=E4=B8=BA'p',=E6=96=B9=E4=BE=BF=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=BD=91=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js |  2 +-
 public/javascripts/application.js      | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index c86a9ccd3..a8c17345b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -249,7 +249,7 @@ K.options = {
 	themeType : 'default',
 	langType : 'zh_CN',
 	urlType : '',
-	newlineTag : 'br',
+	newlineTag : 'p',
 	resizeType : 1,
 	syncType : 'form',
 	pasteType : 2,
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3828b981b..aec0af070 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1316,17 +1316,12 @@ function pop_up_box(value,tWidth,tTop,tLeft){
     }
 }
 
-
 //yk 自动识别URL 并加上链接
-//var strRegex = '((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?';
-
 function autoUrl(id){
     if ($("#"+id).children().length > 0 ){
         $("#"+id+" p,#"+ id +" span,#"+id+" em,#"+id+" h1,#"+id+" h2,#"+id+" h3,#"+id+" h4,#"+id+" strong,#"+id+" b,#"+id+" font,#"+id+" i").each(function(){
             if ($(this).children().length == 0){
-                var html = $(this).text(); //.replace(/(^\s*)|(\s*$)/g, "")
-                console.log("html="+html);
-//                var re=new RegExp(strRegex,"g");
+                var html = $(this).text();
                 html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
                     //没有://的都加上http://
                     var reStr = full;
@@ -1337,7 +1332,6 @@ function autoUrl(id){
                         else{
                             reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                         }
-                        console.log("reStr="+reStr);
                     }
                     return reStr ;
                 });
@@ -1346,11 +1340,9 @@ function autoUrl(id){
         });
     }
     else{
-        var html = $("#"+id).text(); //.replace(/(^\s*)|(\s*$)/g, "")
-        console.log("!!!!html="+html);
-//        var re=new RegExp(strRegex,"g");
+        var html = $("#"+id).text();
         html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
-        //没有://的都加上http://
+            //没有://的都加上http://
             var reStr = full;
             if (full.length > 0){
                 if (full.indexOf("://") >= 0){
@@ -1359,7 +1351,6 @@ function autoUrl(id){
                 else{
                     reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                 }
-                console.log("reStr="+reStr);
             }
             return reStr ;
         });

From 18054dd96d01c9f3f4cfb5f41cb2f55f4f1e96e4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 17:04:20 +0800
Subject: [PATCH 48/72] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb      | 4 ++--
 app/views/users/_resources_list.html.erb | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 15d731634..52fdad2e7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2705,7 +2705,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源搜索
   def get_public_resources_search user_course_ids, user_project_ids, order, score, search
-    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的资源
@@ -2816,7 +2816,7 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public order, score
-    attchments = Attachment.where("container_type = 'Principal'and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Principal' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 038a48c30..46a69f985 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -14,7 +14,11 @@
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
+            <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                <a href="" style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
+            <% else %>
+                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
+            <% end %>
             <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>

From 82f4c685dae692156c8513a237cf987e898aaad9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 17:11:44 +0800
Subject: [PATCH 49/72] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_apply_resource_course_message_reply.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
index 617ee53c3..2aff99c17 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -7,10 +7,10 @@
   </li>
   <li class="homepageNewsPubType fl">
     <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %>
-    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用资源：</span>
+    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
   </li>
   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-    <% link_str = ma.apply_result == 1 ?
+    <% link_str = ma.apply_result == 2 ?
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>

From 0e827abd359350c502da31509953d2112eedbf64 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 17:25:56 +0800
Subject: [PATCH 50/72] =?UTF-8?q?=E5=B0=86=E4=BB=A3=E7=A0=81=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=BC=96=E8=AF=91=E5=99=A8=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=86=92=E5=8F=B7=E6=94=B9=E4=B8=BA=E4=B8=AD=E6=96=87=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/new_user_commit_homework.html.erb | 8 ++++----
 app/views/users/user_commit_homework.html.erb     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index c066baae0..4a7e5cee3 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -93,13 +93,13 @@
           <div class="mt15">
             <span>请使用 <%= @homework.language_name %> 语言编写</span>
             <% if @homework.language.to_i == 1 %>
-                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+                <span class = "fr">编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
             <% elsif @homework.language.to_i == 2 %>
-                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+                <span class = "fr">编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
             <% elsif @homework.language.to_i == 3 %>
-                <span class = "fr">编译器信息:Python version "2.6.6"</span>
+                <span class = "fr">编译器信息：Python version "2.6.6"</span>
             <% elsif @homework.language.to_i == 4 %>
-                <span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span>
+                <span class = "fr">编译器信息：java version "1.7.0_85" OpenJDK Runtime Environment</span>
             <% end %>
             <span data-language=<%=@homework.language%> style="display-hidden" id="data-language"></span>
             </div>
diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb
index 043886779..1d1d0ef14 100644
--- a/app/views/users/user_commit_homework.html.erb
+++ b/app/views/users/user_commit_homework.html.erb
@@ -76,13 +76,13 @@
           <div class="mt15">
             <span>请使用 <%= @homework.language_name %> 语言编写</span>
             <% if @homework.language.to_i == 1 %>
-                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+                <span class = "fr">编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
             <% elsif @homework.language.to_i == 2 %>
-                <span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
+                <span class = "fr">编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
             <% elsif @homework.language.to_i == 3 %>
-                <span class = "fr">编译器信息:Python version "2.6.6"</span>
+                <span class = "fr">编译器信息：Python version "2.6.6"</span>
             <% elsif @homework.language.to_i == 4 %>
-                <span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span>
+                <span class = "fr">编译器信息：java version "1.7.0_85" OpenJDK Runtime Environment</span>
             <% end %>
             </div>
           <div class="mt10">

From b0e4ed5ab369884b97f362c20821929e9aaa82e3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 17:40:18 +0800
Subject: [PATCH 51/72] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=87=AA=E5=B7=B1=E5=9C=A8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E8=AF=9D=E5=88=99=E4=B8=8D=E9=9C=80=E8=A6=81=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb        | 15 +++++++++++++++
 app/views/users/_resources_list.html.erb |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e0f70313..8d9c9733e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -49,6 +49,21 @@ module ApplicationHelper
     return result
   end
 
+  # 判断某个资源是否可以申请
+  def attach_show_allow attach_id
+    attachment = Attachment.find(attach_id)
+    case attachment.container_type
+      when "Project"
+        User.current.member_of?(attachment.container) ? true : false
+      when "Course"
+        User.current.member_of_course?(attachment.container) ? true : false
+      when "OrgSubfield"
+        User.current.member_of_org?(attachment.container) ? true : false
+      when "Principal"
+        User.current.id == attachment.author_id ? true : false
+    end
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 46a69f985..7d510d977 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -24,9 +24,9 @@
             <% end %>
           </li>
           <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
-            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && !attach_show_allow(attach) %>
                 <% ah = attach.get_status_by_attach(User.current.id) %>
-                <% if ah.nil? %>
+                <% if ah.nil?  %>
                     <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
                 <% elsif ah == 1 %>
                     等待回复

From bc8171501db1524971a11dd6c9dc3fa26d481302 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 18:40:39 +0800
Subject: [PATCH 52/72] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AE=BE=E4=B8=BA=E9=A6=96=E9=A1=B5=E6=8A=A5?=
 =?UTF-8?q?500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_show_home_page.html.erb  | 2 +-
 app/views/users/_user_journalsformessage.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 7d8f7963f..ecb5ebb25 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -59,7 +59,7 @@
         postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
         $(this).html(postContent);
     });
-    autoUrl('intro_content_<%= @document.id %>');
+    autoUrl('intro_content_<%= document.id %>');
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index d39cccb11..47d5145ac 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -88,8 +88,8 @@
             <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
                 <script type="text/javascript">
                     $(function(){
-                        showNormalImage('reply_content_<%= user_activity_id %>');
-                        autoUrl('reply_content_<%= user_activity_id %>');
+                        showNormalImage('reply_content_<%= comment.id %>');
+                        autoUrl('reply_content_<%= comment.id %>');
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
@@ -121,7 +121,7 @@
                           <% end %>
                       </div>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= user_activity_id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %>
                     </div>
                   </div>

From e901becfe69b79644441e9403b3b67361d9918f0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 18:46:19 +0800
Subject: [PATCH 53/72] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 7d510d977..fd6c52dba 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -49,6 +49,7 @@
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
           <li style="display: none"><%= attach.is_public %></li>
           <li style="display: none"><%= attach.get_apply_resource_status(attach.id, attach.author_id) %></li>
+          <li style="display: none"><%= attach_show_allow(attach) == true ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -100,7 +101,8 @@
         is_public = line.children().eq(11).html();
         user_id = line.children().eq(6).html();
         apply_status = line.children().eq(12).html();
-        if(is_public == 0 && user_id != '<%= User.current.id %>' && apply_status != 2){
+        allow = line.children().eq(13).html();
+        if(is_public == 0 && user_id != '<%= User.current.id %>' && apply_status != 2 && allow == 1){
             alert('您无权发送私有资源')
         }else{
             if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。

From 8ebe8b0d0c29898b1a47b5254a37084b209e1c4d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 18:55:17 +0800
Subject: [PATCH 54/72] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=20=E6=B6=88=E6=81=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 9 +++++----
 public/stylesheets/new_user.css          | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index fd6c52dba..5dd2495c9 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -71,14 +71,15 @@
     //批量删除
     function batch_delete(){
         var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
         if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
             alert("您只能删除自己上传的资源，请重新选择后再删除。");
             return;
         }
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+
 
         if(data != "" && confirm('确认要删除这些资源吗？')) {
             $.post(
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 326d2897b..cfdf12153 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -609,7 +609,7 @@ a.homepageMenuControl {float:left; width:180px;}
 .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
-.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
+.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; }
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;}

From 56a151a7b427878a33c85c27ac389d862d8839be Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 19:11:09 +0800
Subject: [PATCH 55/72] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E9=80=9A=E8=BF=87=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=88=B0=E6=8C=82=E8=B5=B7=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index c321a10fb..96e43af46 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -69,16 +69,21 @@
         <ul class="menu_r">
           <li>
             <a href="javascript:void(0);" class="parent">
-              <% @all_homework_commons.each_with_index do |homework_common,index |%>
+              <% if @is_teacher %>
+                  <% hcommons = @all_homework_commons %>
+              <% else %>
+                  <% hcommons = @homework_commons %>
+              <% end %>
+              <% hcommons.each_with_index do |homework_common,index |%>
                 <% if homework_common.id == @homework.id %>
-                <%="作业 #{@all_homework_commons.count - index}"  %>
+                <%="作业 #{hcommons.count - index}"  %>
                 <% end %>
               <% end%>
             </a>
             <ul>
-              <% @all_homework_commons.each_with_index do |homework_common,index |%>
+              <% hcommons.each_with_index do |homework_common,index |%>
                   <li class="pr10">
-                    <%= link_to "作业#{@all_homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
+                    <%= link_to "作业#{hcommons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
                     <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>

From 40f45ea69737863542b34dd1554d931551378e32 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 19:13:19 +0800
Subject: [PATCH 56/72] =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9C=89=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/news.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/news.rb b/app/models/news.rb
index 1544faf61..a411ccaca 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -174,7 +174,7 @@ class News < ActiveRecord::Base
           if count == 0
             ws = WechatService.new
             content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200
-            ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.author.try(:realname) + " 发布了通知：" + content, format_time(self.created_on)
+            ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", content, format_time(self.created_on)
           end
         end
       end

From 1c7efa247e99d6708928de862ac8d72fd696fd61 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 20 May 2016 19:13:55 +0800
Subject: [PATCH 57/72] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E5=90=8E=E6=A0=BC=E5=BC=8F=E6=B7=B7=E4=B9=B1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/add_score.js.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
index dec068b9e..0ddd3ea5c 100644
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@@ -11,9 +11,9 @@ var num = $("#work_num_<%= @work.id%>").html();
 $("#score_list_<%= @work.id%>").removeAttr("style");
 
 <% if @is_teacher %>
-    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("tr[id='"+student_work_<%= @work.id%>+"']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
     $("#work_num_<%= @work.id%>").html(num);
 <% else %>
-    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("tr[id='"+student_work_<%= @work.id%>+"']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
     $("#work_num_<%= @work.id%>").html(num);
 <% end%>

From baf7e1dbc011382116a0ab52a7e89e1d7f094bac Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 19:52:42 +0800
Subject: [PATCH 58/72] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8D=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb       |  2 +-
 .../users/_user_import_resource_list.html.erb  | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 5dd2495c9..caab1a49b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -15,7 +15,7 @@
           </li>
           <li class="resource-list-name fl">
             <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
-                <a href="" style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
+                <a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
             <% else %>
                 <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
             <% end %>
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 38770421d..2052f8219 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,8 +6,22 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+              <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                  <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
+              <% else %>
+                  <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <% end %>
+
+              <span>
+                <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                    <a href="" style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
+                <% else %>
+                    <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
+                <% end %>
+              </span>
+              <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
+                  <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+              <% end %>
             </label>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>

From 3ffe131a736c33288a541e90a10de7359cc289a9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 20:02:17 +0800
Subject: [PATCH 59/72] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index caab1a49b..89491970b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -217,19 +217,21 @@
         line.children().css("background-color", 'white');
         id = line.children().last().html();
         user_id = line.children().eq(6).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
         if(user_id === '<%= User.current.id%>') {
+            if(line.children().first().children().data('hasHistory') == 'Y'){
+                alert('该资源存在历史版本，不能删除');
+                return;
+            }
             if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
                 $.ajax({
                     type: 'post',
                     url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
                 });
             }
+
         }else{
             alert('您无法删除此资源！')
         }
+
     }
 </script>

From 5f4a9304fe0d5d63e241839ad6385dc35122c634 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 20 May 2016 20:05:39 +0800
Subject: [PATCH 60/72] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=97=E8=A1=A8=E6=88=90=E7=BB=A9=E6=B2=A1?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9=EF=BC=9B=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E5=AE=BD=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_title.html.erb | 2 +-
 app/views/student_work/_evaluation_un_work.html.erb  | 4 ++--
 app/views/student_work/_evaluation_work.html.erb     | 1 +
 app/views/student_work/add_score.js.erb              | 4 ++--
 public/stylesheets/courses.css                       | 4 +++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index afb213196..98e9f1f64 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -17,7 +17,7 @@
       <% end%>
     </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <th class="hworkList160">
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList220' : 'hworkList160'%>">
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% end %>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index bffc8ab0f..ba91589fa 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,6 +1,6 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
-<a name="<%= student_work.id%>"></a>
 <tr class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <td class="none"><a name="<%= student_work.id%>"></a></td>
   <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
   <td class="hworkPortrait pr10 float-none">
     <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
@@ -20,7 +20,7 @@
         </td>
       <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
         <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-            <td  class="hworkPrName student_work_<%= student_work.id%>" title="项目名称">
+            <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
               <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
             </td>
         <% else %>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 5bd4ec568..55861d444 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,5 +1,6 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <tr class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <td class="none"><a name="<%= student_work.id%>"></a></td>
   <% if @homework.homework_type != 3 %>
       <% is_my_work = student_work.user == User.current%>
   <% else %>
diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
index 0ddd3ea5c..e4341869f 100644
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@@ -11,9 +11,9 @@ var num = $("#work_num_<%= @work.id%>").html();
 $("#score_list_<%= @work.id%>").removeAttr("style");
 
 <% if @is_teacher %>
-    $("tr[id='"+student_work_<%= @work.id%>+"']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
     $("#work_num_<%= @work.id%>").html(num);
 <% else %>
-    $("tr[id='"+student_work_<%= @work.id%>+"']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
     $("#work_num_<%= @work.id%>").html(num);
 <% end%>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index e17487fe5..d1831f4a8 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -59,6 +59,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkList100 {width:100px; text-align:center;}
 .hworkList130 {width:130px; text-align:center;}
 .hworkList160 {width:160px; text-align:center;}
+.hworkList220 {width:220px; text-align:center;}
 .hworkList260 {width:260px; text-align:left;}
 .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px;  width:714px; margin-bottom:10px; }
 .hworkName {width:80px; float:left; line-height:18px;}
@@ -1250,7 +1251,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .ml7 {margin-left:7px;}
 .tac {text-align:center;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
-.hworkPrName {width:160px; max-width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkPrName {width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkPrName2 {width:220px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 .captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}

From d4be470e5fff724846cc0b597904ead38e5c5cf5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 20:08:46 +0800
Subject: [PATCH 61/72] =?UTF-8?q?1.=E7=BB=84=E7=BB=87=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=96=87=E7=AB=A0=E5=9B=9E=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E4=BA=86=202.=E7=BB=84=E7=BB=87=E4=BA=8C=E7=BA=A7=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E6=96=87=E7=AB=A0=E7=82=B9=E8=BF=9B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=A0=E9=99=A4=E4=B8=8D=E4=BA=86=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/at_controller.rb                 |  2 +-
 .../org_document_comments_controller.rb          | 16 +++++++++-------
 app/views/org_document_comments/destroy.js.erb   |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index fe16385f4..5b29565ad 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -68,7 +68,7 @@ class AtController < ApplicationController
   end
 
   def find_project(id)
-    return [] if id<0
+    return [] if id.to_i<0
     at_persons = Project.find(id).users
     at_persons.delete_if { |u| u.id == User.current.id }
   end
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index c6047d227..02e74237a 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -102,13 +102,15 @@ class OrgDocumentCommentsController < ApplicationController
   end
 
   def destroy
-    @org_document_comment = OrgDocumentComment.find(params[:id])
-    org = @org_document_comment.organization
-    if @org_document_comment.id == org.home_id
-      org.update_attributes(:home_id => nil)
-    end
-    if @org_document_comment.destroy
-    end
+    @org_document_comment = SubDocumentComment.find(params[:id])
+    @sub_domain = @org_document_comment.sub_domain
+    @org_subfield = @sub_domain.org_subfield
+    # org = @org_document_comment.organization
+    # if @org_document_comment.id == org.home_id
+    #   org.update_attributes(:home_id => nil)
+    # end
+    @org_document_comment.destroy
+    # end
     respond_to do |format|
       format.js
     end
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index 787bd3185..1e830d7bc 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1,6 +1,6 @@
 //location.reload();
 <% if params[:detail_page] %>
-    window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>';
+    window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>';
 <% else %>
     window.location.reload();
 <% end %>
\ No newline at end of file

From d329b60a8a7e5d70a20e57096029c011deec0757 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 20 May 2016 20:26:04 +0800
Subject: [PATCH 62/72] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=AD=E5=8E=BB=E7=99=BD=E5=BA=95=EF=BC=8C=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=9B=BA=E5=AE=9A=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/wechat/wechat_icon.png  | Bin 4259 -> 5631 bytes
 public/images/wechat/wechat_icon2.png | Bin 0 -> 4259 bytes
 public/stylesheets/weui/weixin.css    |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100755 public/images/wechat/wechat_icon2.png

diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png
index cbc3eb565cc9ddd9ce1a9618becd0035d38f0919..7aa0a4351c720ed5b5f10f056d2d1d14be1d05f6 100755
GIT binary patch
literal 5631
zcmbVP)mPMk*8Nd3q)2yzARvt}(jbhKFmy9?cMXk%NH>xqDM(3om!yCoT?33r3`qCK
z_aEGQAI{znXRY&a)?WMU^HE(*kpPz(7XSc)w-9;gBZofL2hfv8<i7%|J`#>AMBf7d
z@JRl@(15HQN&vuBwUd)mSGRTXbn&otab<ifC&%dO?qY4{XaxYii@BOUdMOv=l4}=M
zPjzJHkG^L(h62ni6`)}v{Q{z702WR}EIkkrg{wnK_ACdY-T!_T7m^#bna|N|BNH8E
z5Tk7*ddRR`+7Rf6IykubebbK2LEcWlC!dBqBW6$9DX<5`pb_HWd4_~{kp3SXA?Rd~
zbxcO0ozY$!tN{Qx!hrh*dDckXqE)*9=z#0&OIG5cjfb#Sb#`5VF$q{_CPw0+B|?GW
zms-Q5z%V6HqgiK(3#0;oBRoKs87L<J_D|nRVgd7IDa#bVd;x742#7-iGC34k(WTn}
zGwo0)H+pw3kY6Fq{1UUf3N1vxQ9uzrqyr1^j@L_kDs2XYWXf`n0gR&PfE+!^I0mB%
zMn2zk*Ls<$YeX{y4d@<C8_!Ul79?#>`$_Hd?`VCKX|vbyyDW@?lgJupi#aDFn}q~|
z#88>Q2LS4;sh)dLsYK+?*2a!C(h+q!P;l>X<iae;bi8)o9*d3%5UEX~7EQOe=P+D{
z&}zK89LfxVMIFF)?aEki2`AqG_ov@g3|#b9nm+G~`mi`1EiNA30h{@k4n9PT<b&Xb
z%X&=E`D6Ef$?pho%aYEl>@EzubAvg1S3%>EqnNV%&KF3Q`=N;7yLis2O`-2b++@+m
zdLNtBnN^42Ezl%+rXOjW#Jj-)#|-IrI4M2^Kt<%cZnZ}2hEd1vphGnD7(%^iZ$LWe
zgeR67F9{&B5fXr306<FDRf04Z8Ze$wgaCl{Ka@saQz=viK>#41ANrz31{=SJw4$3Z
zr-!b+n*ts7L|z)7wOgD>_Q_TVE$$b}bQvnGZty&2Lk$LX{<EwNqWT_wQ3B*Tu~F!r
zE5#Et%Di66_DCE|nPCtKj0qg|%shUcc>+X{8IQ>fg9s&u6fy2bk!mmx47(Shm&w{E
z8ADk9@wk(U#TiLoCoT;$3Pj&Vw=43ehSq9e{6hDVZu!bU9X*)uG36=r)Ho!)z+sBI
zo?arPv7mHH`Hz<;5EvbA5i-S3XdSx%Gm8E2#_XdWHTw{`#kQWXPJ*xno!%>NGMer@
z7z)IS9uq>c4>AcS>UDgdn5d|yq9^y2ZJ(u{xD}*}6Bf?j`<yxD>$`e3KjN!?Uvu#H
zL_LKH_CqFmraU&2=Y%AtDG*k|AIV#4xJ+z`0&nr&IzW~nJVlyClG8+XIV$XXiB3OO
zw?MTa6^t24O^Htv-zDGt=-X-{1rJ1Rs^Ao`LW@#~m4vONwlRx83&>{Xmurld<^2Mc
zM}a>ZymiX=R_E3HP(~u;mBlumO)fWD#8Wu?Gt17#?!uOL*RvI8C5-+}#?Opthd<c6
z$lb70AAEvHg0LZoIR}*kl|NM}WfK)|rb-FcOh)Fg7T<3HnoOHdPd~Y6>%BOC5kQtS
zLYxLp(@6_TLzZi4duU6|!prfrzG*-GW}*{VqM%);jwr+VMgDEJj840)Or&Z8>H|$s
zpVTld>@>Z5e{Dff8yTUH9|<YcvS=Elien-l6tFthlbv(d!Pw(=_@ruXSbMdv;*E7f
z<IU@@qABN5Ze3xWWSzU?HjYL(_<j9IY#~Q!f@y+a!k-6&M~dhBoPDKrWl-g-MZd+)
zMe_sq1M-8tMU<Cou5>PU?itt#eBp)DD$=Ua8qvDsHThR^#$pe?i*q(|M!35&rFiCa
zT6jkB7d3~PVtB<T1QJQ4a^x4aI2uc|_~Y=&u6gPxeB<l0QQOv}e%r#Sw}sD}*$+S1
zAcTD>B&{o4Xw55xR;`vD#9`)k0!u~xMFU%%oa3nuS=Oyn^)sGhW5e9b74sE8_T$B7
za~$$uoeS+tw{a20Z*m5dVnkww(ihVMMzPXW(=RGM=}79pb<T8tSG=7w+T-4Hn$vYu
zr_s&E&jx3YHh!(luI%^Dc3LCdBu(I)<~-AMUgY1u-N)U}+JAB&b`CpdJ9j#tq#L6p
zrki{1`8vSe(`(Gz(Y1ZAXhW#4tiP;pSJ#Hd=8H$}i7-Wpa^fg)hIa;qrc-Hjsq<&Q
z(X?&q!`A7BnX|&|w(RA~1*cytV-f>_-)>Z2X4CvI?vp^toE}~1ZMuyia!a#IdruOP
zye8fz`X)CW^zZ6&*z@N2oQ9YB4c9wH{msCV5?0p}yBLy#lIWlPK7Z&e>11A$=wu0+
z3(5?_zRkONeLZ@YaM`s1|3`kThGmA<gSL&<5lS6ehv9(1fSHL|j4g~6ht>9k7hjT0
z79WQ|pTRxFrJLd(&6S1VvJH3E6xj$Um&}0Xns1C<g?{c?eB>l(jVQ>a<Vt0CtPvEo
zuIL!m%wR{ANpTfO%K1W|{N-PbdQDF^&kOFkiY@&cn~wP7gtFL{*Gu+|?%p;P_Kr|T
zi~a28kmmB{P~Q)iZ;msFJxN$`4nA)6&-Y7wM0lVh9kT>;wz9O+JuRxXmkU}bc6KL5
z^L)hhh4m8yL?b>CXVgk<hcU{k^HRRsE_GI=Bl#De9r5l>XF*(n#`mUXCGq5)T%ELY
z(UsSMa@V$z?-aZS1##X%x!_4u$t^4=sygy>s}++AZVNnOsX3`Rg-`;!^m?w}d`%op
z@2t7FQV6!-J5D1sDIZ2Iwpgw_PL{|VBUGje>!DTZgybr`U%7k@DGhy_AsrBdUxI7a
z_kXWg@ZOULbR^cOH`mn7H~Z=zuQPYOX(MNe(WLNs$!`p8we+<+nhqSb9j#5jQ{U8s
zYX7r`FaL{&hD{e2%W=Ke6-p~h{W0oXb!yOJK?X~+)JEB7%o^$hzo1Ant#GaQT6I~Y
z(7dy$t7bYIa0Yi;TwGOZ8add5>=o@fS6t|KRV#Ja%gp|aJR+#1IgZ<=F?CW}_59*z
ze-=MpKRz;!Aq*2fFdS>FSo-%xr10D?H`sVo=dSWwQ|AKv;#}8?kN*i_7#-Q`RaEMJ
zdjprRu0zM0z%%FR!}lu*)aEp;T{}T5&5Azn2J#a8i~X_B-=OyFJzX4^tGl{tah#wc
zar6+d>vndC%VPFHmQRDL!3)A(neCqEYb62x2=zZ-Ci<59#@8}~o6bOc5IEN~xXY`8
zr_d>1;!6kWPi$c>oe7;{XVXIviXUO&H6)y%o0p%<A#r@Q^*#krYFV0>t0pD!D{~os
zp>mt)V60)>VIw!0Cq?0TsM2J5@#AC_nP7a>?t036VZOxHq+BUcC7~GPdba_oHgwsu
zx)?ps6|eF<Ro#0%g_;Szw(p+x_<i~NrSWHY2WoJirpcLog|?Zk_3YC7{D8s-_fTco
z*e}7i`nGfN?l1QB)4##>_us9$oz^eSy3Hp0^q-;#aX#eTr#{Sl*qBxvQ=DZ{V2Mk}
zWniEopzio*IgzqaT3bpoITEDv0N?ZYhFrVbyiuOiyPZG6yNa3Ys)CoDxTC(6RfC6E
zh8Wr>;1b6rx0Mr1fv9Fw>)KEULng<q^u7AY)V0M>>Cbl;lE{GjTi%QClN+|_&w`I>
zlhFbKeN3HxYyc1v1^`zNkGu;2UVH%X*9-u_p8$ZuCE0X9;W3SJzm=EK@?G4|^>@{p
zr5ox(E)Q8V{9w-x#|$`XgsKoVaHRGmy`siflE;Cl44Z2k*wXQ+?OlE{D1C}mT-=Qw
z&B4s51!B|*^Ws3@VW4rnhtS4^Bsz*LTy$LI+&{zM#LRY_PqYjE9Q=tDIbk(%k+LSy
z)s};i0yW>}a?lWP!UfigGkz~SQ%*UEA#_1Z1cR`*KM2dR8XGLHe<h%q?HQtat?OXF
z;^btEeE)Tj0U`FLXh8m-j~62ev`^0kRi-FH(7J2wZimAe&gL&HcW3v&eo}L+Jzx%%
z_?R~=Z=lhWUfFlyD;wgpxF6zMbE+7gpx+yTzEL2=<(kBhHdZzaR8oGJ#c7r}RR^d{
zjkAd0a8=}o8Dl@jE+4;@?!2<IG=H@n+RC`1Ic!8rI@^ke%U;*r0s%IcLG%p07Elwb
z2V*6t%K1AHFe0=mY%~i~c4MTC>pgT0B(rr4>D!PMqNbv^|LXs9qvi(KFK$jAO3Nrt
z(`G0`Ngx~Vt0&i7T@6{ud%iD%8iND&r3T}ua|FG52IWYi70;FQjrHp!ll<KPGnIHH
z)k(i-u6BhPA=@lMCT_^6yf}SWiG2+>Ub*v9*^)8do!4`Q{7=b>4b=el!>s6Ki#`U$
z_~ZDci@3njzy05~Nv_))tcP?F#AWC}zLC5BB$ir+f92~H%|1pL4jxq=cX%I6zE?&s
zUEbPS1pO>%{(!K^zt*0IMZ^--dDjy5uWIpKlCf`9Uc+`vQkaJ~&+_T^jT2SZP2z)x
z_O{%sgX`9{dW{aBrZ!?%_L+S`<cF+s8Kng|y*U6#go2r@BrQ~6_`sHSiCqg~ici#n
z1~CPZisrH_S~*7KbYXN?M`Oq4iFHo00=|Q<UDxY1B%brON=*^~f(jR{cNc;uk8eUR
zEJG*Ikl`R{cwCD~o^hU%k5ZG!5ntS{zmSCn{k(I^6#;?`>L`t-KQFc=vi5Y~9-)s5
zr`DnVu0EWbw-8sWL>T*JV>QA*0j+zcn*P&^qV`?hx|1gEh4V8nf5MxGpRatnQ;|W*
zKAsbsfq3o`=WA$}{Rk)`l2eexfW)=Rvb4miS;#nSChgoay3fnTKFhE~6zbzPEAm$3
zOf&YFL)S^uQRIf)M?qvc&zb7jcVBcMjh359@If!{6%k-falWJ{x<3uSxGP)a=-izS
zw5Z;@uQO^gNGsqHZZcX!Y+&PF?_-4&Ht@HV)TZEQqvHhSGpWB?O-ZYx?}k-<{gCZw
ziN@Ed3_^qHuN%QlXNCTV&~4;*MSZ&_jOG%X7rGxP;8Bc3zdXI_qA$0-zwaA84@6&2
zX`1i^IWz_w5diDs37u2|H5qN-FG}hrI{&iugtSOw!m%R?`8lE^TNhKJ6nY`wU&9R8
zZ|}kLbZV55p@Sh0kIK_}r*pVOs_TAfJ2jpV4CfYY^|h=nXpCh@`dz7~#K9{ia61rg
zC_lb)>$FmaIEmG>1R-c;K_I65axf(#5&E8gaC2(7Ur)$$X>2;VrL}5^qpGO!qfcd3
zMW*<1q;g4)%UHp})nd2F;dJiJJCiP(T^<kOj*ROjAD^C-Ok+BNrB~MuU35=4rAX7o
zOmJuHGQT&IMw;V}S`4xT3XSh{`Cr$!sAecBz4&oD=B9Hv?_cl=Fj`vEgfa-!lja&m
za_Sq)jq%$Y-z#fHV1bzd;A`l$AE|09)i)FUlnis9Pd!h%bU{-jX7-}L^1nt~?~2?U
z?rNeg&lZ2b!T=g|?=dRMTv(HbUo|AH=JbrH)Qy)(LO*kbYXKZU#b}$@Q*BAXog_Rr
zhK5yBY#=IJu7gaQ-#UHuq<>^~kC7V(h8~@Vo;|*L+Qy4D=d}D@$Op{!3x~3#IY-d?
z(ARpbusd^-6j&cVUKc~0bdcc$dUqEU)!si4mU1#e(BHHE4`85J%=yPJC(ut{@RfKC
z+(dN3dEDDzbX8xyd2|1`(s-sssRq8ZG~ax+Y~iL;WpFn$5JQ17Xt6(IjV^W|imzJ$
zYSkiBYw@l{6QRtc;y%in;^bGwRZF$8zNa!-_b=t-8miZEBM{QWthTmikycj4x?jt$
zImZK$GY0xd{5G_1VoLX(-<XvLid#9sAfUvKun_W6GR#`L;;n|22bSplTDYAq8%Mj<
zzSz>3ZhMV;1JA(mB&t(f;hE9x3r4n}qn?6~3Beb|EW0bAcGMUnO3Kk_(x8nZJ@Dr}
z)Y|FSRI_x;%*cU3e_HdPlS$I}$;Vrv%@c_StkfC#7PtrXB=@r>Zc-?xUpG6~ZBri4
zR}yC2eBVK9bzW+6yo!F2-(mn^;{N9EXWi7I$xc!AXw%SZQ;T&Nj%aZ|f$mP!CdTv2
ziJi~7Je)_3(>l(t$@&j~Mc$rh3R6FAjnu>v`zl)@ac*H2|BBZVh||9_Y3V_xe3Uw9
zAN>zIM=?V(bUNCFX&pH*9#@3Mx$(nWe`%i@FJK$l!h?0$spxMIy`1+GAr0cvoQ3Le
zmG2-G+S}|Xu{WnU8Xc=Ki^5Zhp}2M1Zz5stZ8K-!fixj*W$BpA>Bz>e*;${LIhT&I
z#C&|pN_H_cZm%t3hY)VR=JL=j@bku0_y&8(;*;%s8ZT+G{El<qNRE_y*j-uIu+d{5
zVw-vS!seHmgdRAH<!in_i!NZ6khnX=+7oH#kK?!2V5Mj>6m=lrm(kqnl%M1VqinFF
z3%Z4PC?j#&B(_g4`g$Tc%S%utwynRY3y_BcB+pHLk|*&K4qon#5P@>wg_Lm${%fyC
z4I!GJwLbMen<4E7^pO7eK!|ZlLK!W}>r?^_Lyy$#89<I4u|reKe)946oXdNdJpHB-
z{DXj!WU1^3<)9^{v}x%}dhjHAQp9F}N<+1o?@1QZm!Z&9;&du5^H}VNnrk=M>hqq7
z7MO(`T^)Dfkx8|W=$q72;qGRcx)&mNJpz<{ieE$-7VLYhqh8_t{8GzO++VxR+uoBE
zbcX=;E7uYS9wo)DA^#9INe>=N&JQ+GNW{c^EB&8?yu(+?wM?D}6I3SM<mjV@Cj{c$
zqRa2#*800FLfW}Q3)!k!7sOlsTyq$d-}tzz3=EE3r@2CF#+V27%4^2pq{<mEfe<a_
zO(s8DqI!15mo=E<dm-t2p;n{mzkmKR3Mdc6;`xmsoNItnM7qN9K87ZUi<O6jy|^Fx
z8ASl(c;vA}P-03;IT&Hu9BBM<I>%xYEP2RbRyO!hgQHp+u?^U2vgd4ENhss(uue0N
zkRy|GU6#eNwc>mo!9X&j7<#=`*dMV>&_{FNAU&kXSFyX@gx6s&BD&nUusNBqFS8C~
zN#Jr^?SN1T#hEEX<;8P;jeA%^o&<^Veki4gJwX74<h2fNw9>tq^=-rurs+|ebb?|y
z3R<LlgB$6cg$dlm?zE3ieNj=9A`Fl;HC#-7Qr&b*opqvCsG6yDg9}c@NrCnv4ZZR4
z@l_QI?JMIfLi9~cR&(8V>wU0>Ivt))X5#>Li@HBIRQ{~LcyA#8Kl$N*Z=;JnUD&{F
Xz08CkL8tv=#s=QLQIoHdHGBVmi>8p(

literal 4259
zcmcIoX*iU9+m|ggp`k2^F^rvAVq(fNj2c9evM*zdrOc8U46=lXqAb}eL@Kg{DBD<y
zq>wdRqim5ivePr&&)xmJAKu>Mcs{(>ab4$sIex$2x%|)nmn+)b?9_ffaXvOSw*5v}
zj0J1F%KD;sxLFpyfih(cVl+c*+Bvct%@5~IU_-l-T?il}BF>#)LBP5CUv4FwU}NI|
zds<r4tW8g&@MNMI?iWUlPNcBdY-}fV=@cCP5`hMCA-H>zw80D23^2&kRU2%jVG1*)
z7!W)>u>szMa{*?S_<&1zEmyFv4(J3O#S$PAXgCm^=tZKU=-S}FbWyDNuWcw8^cRG7
zNgMp{psY>JK?Y=R0!Tycs45-?hl7wvHMqJ45(!rUAz*L>6vldys&I9b1`>rh2KxH}
zv%Gn`x}hvEC;#@vT4{qlXfz563ib2zQ}a8jM)r1x!nL%terX^Osw{*m)t^Me(N#%Q
zncoT+0u}G=Nuha?NuXbfI2W=HO&iRL^xr8EDgVflsDGD<RWK+WM}flCV82rO4Ky|V
zzoA6pKWHk=g7BYs|5stEr9XuLwIEQ*KHhlN!MVx&az#NIcoT3mvbQCf?De~f<{o4k
znd(8NfDFzdK?+u$Bv-N@Rq-#psVT~cM5W<Kc!Ci|8_ZHr^YnB@9aGmrA`B2nm<9$8
zhZ`a_^<i*~fu@GOIzn9wt%d&0#gOqnL;{KSo9p@??y)~|f3*UU!t#tEczgO1Tu*wF
ziJ-qyMtS}@7WF^s{mpg#b1WKv<U(1&Kz|+V|2XL1TdeN+HT|b;S&M%fpFm=DyEm(?
zXNJ8aSyxTO2!pny56<4_y)E1;7Rn3^GVOTR{;qv?UL~bX3~jFvmJJMh3%OqTH2Jm%
z@0VzFTd3?s$Rj>-_{s1Vpits>ta&{Ml&tqq@Sx#Df?++E)}dj%Z+k}FGQ;N1`9o#=
z$M@aY)O|WVfB)Ff`JIr3+Mmx?1cHJFjDeRfg7Rk|wsN`V`f}-Rz6v?B@^NG7Ne6~}
zruok%B=d%?#4EJQ3i1dVo_+JRtOJZ~IqETZm?^1?^3hwHx-cu{6bS3>FTba=C?kZl
zi?^PO=&mL?){vNCeasQdpoUv@86Qh?UcGT^F9X!R^|?P+n%(!rk=aF)t7R@MX991v
zy!~9ZkLc#eL7YM~UxZs;bN65@YLsOZi{-uXvNAH?@HQ{*e9WO7lWrAcD>cG=a!}PF
z#2J=D8=p&AwOeYrmdS`;@WJpXJTu*KG3}2O=8~bRbbox0NmG!7wz`&Ker&G2O62|W
zW77!vG!`qLKED#sJCm*FArqNLSy?!cTAEk!vj3*ZRxQ%+^HiI(&cmX!GRivnTV~ZC
z46?0s>pWT_jB)}39BrR(^<F7@ZPB_eXgu=4@IivsY3FK)5f}*Ah{Fr@S6s(^#Q-5L
zL&yUJLSeyX=1q-W=AZ<5759X%>HO3^+Uu#U1cQthxX}}8^#acwHd-H~6lZpB6<S?b
z&{}xr$+345f<}Cz70#$`x<AqM3UJPN%r5ibi;GLD+%uI#*+e5?bP~{^KN{ejbh4VX
zM(;5gIQ<<Au)<j{wtqU16NzEg5<X2<t(J$728#N*uJ-BHz3|020%0@U&bv+>fz{ut
z9F7c0*6W7irMBVMEtJgDw_5X(345jeKrjJSM5(P4z^Z}AeyQy1@$J!hBaY_NN0?i{
z;CF$W;~x&DbX4ae-gFd;buX7jJ-)D;B;|CXW=q~l!@YX)j*w=YP?TargtgGepAG7z
zIl#-$1y)w#<8m3JgT@fq8@w%V)w;`8998er8+y8@ofRx1pD6)4r-8?GUc!&@omljK
z-y8QWV{2svZIbCww^n|}@3rLgIi1nB@}&G>-LbUyw^E{dqp}8Ca14*s<io9GS!aFE
zvsoXZt-z%X4gq@2?$a1{bpM#DZ3|`sh)z1JK(NuQvpCz6+wjE#2uL|-P(%@IIxp(g
z5_=*bh(HR?48F`X>}+#qZuiJhyIzhQyLG&<t@v&D7kNpWkJ?K&i^@o~S$=A0CiBVD
z1njqEabEkzi@>EvOP>=II#m4N=;2-$nOLE>eGOQ&a}1kZ#F`;ioM0%IW?8^@LGUTu
z{u(;|W4ph}r457B!Vue<v7uaM!Ny(P$=cn*CgljL<X{TOZ*ekeZ{+@2vEihCthxBy
zcM<KoMP1L|jh?<B9|nql)Etn|i+Gi@d7Vo+!n%MrIY!4tzclq`OM7I*SwKn>Blfcr
zfKiwIGaWi(fp;FT>djb{QEroasdk{~@Q_S#Dy+EQN?x&U>#jI|JJN?JO1L>5pzD>b
z&~&|?p77=rH(%@MHPE}<+z%vyw$cLp3%;g%DLQr<{<IFRl6l5<<I!pd|8n2uM*<01
zYfhEECOcw`+JO3m;~670(BkP(cj?dA=|^5C9fU7!U)020sm0rkIkbEqNG83AQ?!md
zQUNHelvRYcjxqM0ye2Hdp(p_@8s4!r>=ALST{4FT>y$gK4^EaV`n$Rruw(B6tNfae
z+Eqof$Lgy8NSbnMXI5!2FGVj+x;1iM{TUK&d~4>pMf68?Q7$Ervf$C_2oPU_s`3ms
z&*lj%Kwz=rN>Y~Ux04S;B|Lfp;Ks99y|ibni#>eVeoyebV_Odq%(%nytBzVz6GU=2
zTMO;TGqK6Qj2rddB_fz%%iiqXM`M=9D@-Kz6)6PraO$p&3ns^uz;Bw#FTP3I9dXxj
zq5^Yz@@EeYu4cwYWq9oP&ov0|*@JR3ifKZHjfkUp1(VqRd!xk%{uCy3tFO1scI?i`
zfLOSr<xJUB|Kn>@Ll+aRew0GmnC*9RJ$Lx|LSCzU7^dA#HnT6>WEa@0AOAW+f>iHh
zt*G=p@!8a_giN0iVD2+*q$I^OstLdYo9OYT?j(nICG)58)AhRZgg^XHDK_gX^|bBm
zd|vHpqX>_ky}x9QucQ}5k5^2JJ|pg98qT_^kHj^qT@E;dJnQ^WE^lB2r6TVU4?-iR
z)#0>o(Z~ivo~3=snCe(T!^=;TjSR~M0N1l8@>7>YEaKZCgqR>v$YJ5=W?~dz8LQIw
zAR0Fxgz1;dB@krARpoUuD@E{L+7D#$HhmPEvttRf(xqP}4w}HgEmv#bmm41#aX2nu
zGxm99bd}pbC`vB!ipSJ>?7C%rD%K);eSb{LR$fML`_)_Dwy%z=Y2SSx%cg~+D1Ei8
z;=I@D!|VG!Yo6A(8m?CCIyrZ!Jl{TL^2?MSc3aYxQI=8o&LoUH>08%ky1#XujuqY;
z(Fmyw6Ba>_2Bp!yOT5`f<x<Vs@8k7Nd7bZqx~gD!b+>e;R4H_n%f&0@q+aL}uK4I$
zxb5o1_24hc3v;E)Yb~#<?SfuQ8+GNrIx`<W<{nbc2^+Q&?0<Q$T)5(9dSq~Xztr~q
z0=i4KY^|H?^P{TgGTXjMh14P`3C~W8T;;87YGuG&k90iRnfEfb=0?2`z-X3*^rTr*
zuNO{a7LMSS`8DSX__~{{yskJO;%o@0ykOmR8=Nu$K~vA|gfE(OB`9o2Zya{Cv`49l
zDiy_J;;kdozVFpP_Six!-l_AdvQp`nk8YE(r<LGb5Cs6`Zc}b>;7dNE(F{@LpC?26
zYAR2?4c2AsqYoeSheXEVPhnb@t3du4E@9S}(%fSAEbDe07{2Fug{tz=E=I*JOhNOJ
zCww5MF7mUID6)V}cEtN&SKQ+&{NA^alElD>>Af2hoL2@fJG_SNKlq)aIpun6?EaUo
zaEa*g{1mu#DmMoj2;hz;ef@+fkd!d*cP=mkAbZ4X8q<y}RY^_OqSoE6bp~{t3bjP=
zF2`c^9|$hxE5TK7$O<i)JcuRQteVyA$aBMEPv7SBTTZ{<^JYs6ZKs!^2kI>GdN-+*
zuFswpSOa)je<xd(9NL>5TlsUHYRfezu=70IDXnBYRq{}flnz(9SCWXX+!CGLoAd71
z0WU4=2W1P3RTo)_W*%YwT`2$81U-5~r_`*Moq(oQ^gD-ToBL%m){=)B*3U?HKNM$x
zLcnjh*3ByTetM>JgFP4#9ab}uF9%A2qWSDyw+}U2%(#t~+&bgyCYjsRRo>8iLHPKs
zx#)?XY-h%)4C3^8!FAyR;Y~zK)c|DW`aU@!)1Hd=H-dIMy|CcuZ_d-z`X6#qw|$(B
zrp;=Wi*k<%NO$H8N|Y$VmGt`z0$si&;Kh9pscf&MPCkkp@-SJOioQ0u%9Ur9y6*h2
zd?jcXnnm$%m-16PIr|eg-{6wWv-<<V3DGlW|1Zp-enC+YX^0<f?`${eAEvM~@T`zo
z-s?74?n&Rful_@R%AVpzq*>Ou*bt;_@Z#+=KT46O*lm_pL+h>18sBi%z02EW4tT#r
z&`Y!7J??lan};)XK-)P^@hi>Q#_iU^{mh#<&AL~JmE&;Fu80h-J9<g4aD^RQ=z=Dg
zgcIoN;|iU%Rx<-M1m?4|+Ba2%FKlM*1MYt6+N{x0Rhut)wfN?&UR?_!wsZj!ZO@m+
zsGb3)#AL5u%X1fT_CP5Hy3YqC8!&`~Y$)zpYVmbCx%uPsCNr~S|DE7oEA<nJW}jZ;
z_hZnZ4XS%|0kTnRi5C_W(kr-Hb2c?4K3$cbp;vLvE`I|ynm)|6wHD^o1k1q?+jTyt
z6Ht(w3DOkJu~Q~lxrqysMJB#I#<{0z9$pmRgqnvnvazcWPnF5Iu*)<(ydvvd*teZT
zp4-U=#k9fgxuO!9o^uR!ufOLv0Stx9wn1?>%~Tq7+>IU^k7~{<)y&Bsl21u(L%I4a
z>PAU4^EYNz`=}B}iMqJZ)Y~K9Ru%Hh#CSpefILU044rvKK_A^4gknOc;72-%X_hY1
zpVow8h?iq`wHKxYnG%*(R+W!Qrus?a8_9WN#081LgF=S1pAYO>%xh0C(HFYP29K1~
zjWVwFze^mP*<E~Km`Z{2z@+f!tYs%Z;Zd~B{<fx^W=>?A42oKMC~zjV?}7CTz6OR(
nL>4EHap?cM!ES97vvII#bbG{qmhfHp_1nP6&<s<g?;Q3o!0vfu

diff --git a/public/images/wechat/wechat_icon2.png b/public/images/wechat/wechat_icon2.png
new file mode 100755
index 0000000000000000000000000000000000000000..cbc3eb565cc9ddd9ce1a9618becd0035d38f0919
GIT binary patch
literal 4259
zcmcIoX*iU9+m|ggp`k2^F^rvAVq(fNj2c9evM*zdrOc8U46=lXqAb}eL@Kg{DBD<y
zq>wdRqim5ivePr&&)xmJAKu>Mcs{(>ab4$sIex$2x%|)nmn+)b?9_ffaXvOSw*5v}
zj0J1F%KD;sxLFpyfih(cVl+c*+Bvct%@5~IU_-l-T?il}BF>#)LBP5CUv4FwU}NI|
zds<r4tW8g&@MNMI?iWUlPNcBdY-}fV=@cCP5`hMCA-H>zw80D23^2&kRU2%jVG1*)
z7!W)>u>szMa{*?S_<&1zEmyFv4(J3O#S$PAXgCm^=tZKU=-S}FbWyDNuWcw8^cRG7
zNgMp{psY>JK?Y=R0!Tycs45-?hl7wvHMqJ45(!rUAz*L>6vldys&I9b1`>rh2KxH}
zv%Gn`x}hvEC;#@vT4{qlXfz563ib2zQ}a8jM)r1x!nL%terX^Osw{*m)t^Me(N#%Q
zncoT+0u}G=Nuha?NuXbfI2W=HO&iRL^xr8EDgVflsDGD<RWK+WM}flCV82rO4Ky|V
zzoA6pKWHk=g7BYs|5stEr9XuLwIEQ*KHhlN!MVx&az#NIcoT3mvbQCf?De~f<{o4k
znd(8NfDFzdK?+u$Bv-N@Rq-#psVT~cM5W<Kc!Ci|8_ZHr^YnB@9aGmrA`B2nm<9$8
zhZ`a_^<i*~fu@GOIzn9wt%d&0#gOqnL;{KSo9p@??y)~|f3*UU!t#tEczgO1Tu*wF
ziJ-qyMtS}@7WF^s{mpg#b1WKv<U(1&Kz|+V|2XL1TdeN+HT|b;S&M%fpFm=DyEm(?
zXNJ8aSyxTO2!pny56<4_y)E1;7Rn3^GVOTR{;qv?UL~bX3~jFvmJJMh3%OqTH2Jm%
z@0VzFTd3?s$Rj>-_{s1Vpits>ta&{Ml&tqq@Sx#Df?++E)}dj%Z+k}FGQ;N1`9o#=
z$M@aY)O|WVfB)Ff`JIr3+Mmx?1cHJFjDeRfg7Rk|wsN`V`f}-Rz6v?B@^NG7Ne6~}
zruok%B=d%?#4EJQ3i1dVo_+JRtOJZ~IqETZm?^1?^3hwHx-cu{6bS3>FTba=C?kZl
zi?^PO=&mL?){vNCeasQdpoUv@86Qh?UcGT^F9X!R^|?P+n%(!rk=aF)t7R@MX991v
zy!~9ZkLc#eL7YM~UxZs;bN65@YLsOZi{-uXvNAH?@HQ{*e9WO7lWrAcD>cG=a!}PF
z#2J=D8=p&AwOeYrmdS`;@WJpXJTu*KG3}2O=8~bRbbox0NmG!7wz`&Ker&G2O62|W
zW77!vG!`qLKED#sJCm*FArqNLSy?!cTAEk!vj3*ZRxQ%+^HiI(&cmX!GRivnTV~ZC
z46?0s>pWT_jB)}39BrR(^<F7@ZPB_eXgu=4@IivsY3FK)5f}*Ah{Fr@S6s(^#Q-5L
zL&yUJLSeyX=1q-W=AZ<5759X%>HO3^+Uu#U1cQthxX}}8^#acwHd-H~6lZpB6<S?b
z&{}xr$+345f<}Cz70#$`x<AqM3UJPN%r5ibi;GLD+%uI#*+e5?bP~{^KN{ejbh4VX
zM(;5gIQ<<Au)<j{wtqU16NzEg5<X2<t(J$728#N*uJ-BHz3|020%0@U&bv+>fz{ut
z9F7c0*6W7irMBVMEtJgDw_5X(345jeKrjJSM5(P4z^Z}AeyQy1@$J!hBaY_NN0?i{
z;CF$W;~x&DbX4ae-gFd;buX7jJ-)D;B;|CXW=q~l!@YX)j*w=YP?TargtgGepAG7z
zIl#-$1y)w#<8m3JgT@fq8@w%V)w;`8998er8+y8@ofRx1pD6)4r-8?GUc!&@omljK
z-y8QWV{2svZIbCww^n|}@3rLgIi1nB@}&G>-LbUyw^E{dqp}8Ca14*s<io9GS!aFE
zvsoXZt-z%X4gq@2?$a1{bpM#DZ3|`sh)z1JK(NuQvpCz6+wjE#2uL|-P(%@IIxp(g
z5_=*bh(HR?48F`X>}+#qZuiJhyIzhQyLG&<t@v&D7kNpWkJ?K&i^@o~S$=A0CiBVD
z1njqEabEkzi@>EvOP>=II#m4N=;2-$nOLE>eGOQ&a}1kZ#F`;ioM0%IW?8^@LGUTu
z{u(;|W4ph}r457B!Vue<v7uaM!Ny(P$=cn*CgljL<X{TOZ*ekeZ{+@2vEihCthxBy
zcM<KoMP1L|jh?<B9|nql)Etn|i+Gi@d7Vo+!n%MrIY!4tzclq`OM7I*SwKn>Blfcr
zfKiwIGaWi(fp;FT>djb{QEroasdk{~@Q_S#Dy+EQN?x&U>#jI|JJN?JO1L>5pzD>b
z&~&|?p77=rH(%@MHPE}<+z%vyw$cLp3%;g%DLQr<{<IFRl6l5<<I!pd|8n2uM*<01
zYfhEECOcw`+JO3m;~670(BkP(cj?dA=|^5C9fU7!U)020sm0rkIkbEqNG83AQ?!md
zQUNHelvRYcjxqM0ye2Hdp(p_@8s4!r>=ALST{4FT>y$gK4^EaV`n$Rruw(B6tNfae
z+Eqof$Lgy8NSbnMXI5!2FGVj+x;1iM{TUK&d~4>pMf68?Q7$Ervf$C_2oPU_s`3ms
z&*lj%Kwz=rN>Y~Ux04S;B|Lfp;Ks99y|ibni#>eVeoyebV_Odq%(%nytBzVz6GU=2
zTMO;TGqK6Qj2rddB_fz%%iiqXM`M=9D@-Kz6)6PraO$p&3ns^uz;Bw#FTP3I9dXxj
zq5^Yz@@EeYu4cwYWq9oP&ov0|*@JR3ifKZHjfkUp1(VqRd!xk%{uCy3tFO1scI?i`
zfLOSr<xJUB|Kn>@Ll+aRew0GmnC*9RJ$Lx|LSCzU7^dA#HnT6>WEa@0AOAW+f>iHh
zt*G=p@!8a_giN0iVD2+*q$I^OstLdYo9OYT?j(nICG)58)AhRZgg^XHDK_gX^|bBm
zd|vHpqX>_ky}x9QucQ}5k5^2JJ|pg98qT_^kHj^qT@E;dJnQ^WE^lB2r6TVU4?-iR
z)#0>o(Z~ivo~3=snCe(T!^=;TjSR~M0N1l8@>7>YEaKZCgqR>v$YJ5=W?~dz8LQIw
zAR0Fxgz1;dB@krARpoUuD@E{L+7D#$HhmPEvttRf(xqP}4w}HgEmv#bmm41#aX2nu
zGxm99bd}pbC`vB!ipSJ>?7C%rD%K);eSb{LR$fML`_)_Dwy%z=Y2SSx%cg~+D1Ei8
z;=I@D!|VG!Yo6A(8m?CCIyrZ!Jl{TL^2?MSc3aYxQI=8o&LoUH>08%ky1#XujuqY;
z(Fmyw6Ba>_2Bp!yOT5`f<x<Vs@8k7Nd7bZqx~gD!b+>e;R4H_n%f&0@q+aL}uK4I$
zxb5o1_24hc3v;E)Yb~#<?SfuQ8+GNrIx`<W<{nbc2^+Q&?0<Q$T)5(9dSq~Xztr~q
z0=i4KY^|H?^P{TgGTXjMh14P`3C~W8T;;87YGuG&k90iRnfEfb=0?2`z-X3*^rTr*
zuNO{a7LMSS`8DSX__~{{yskJO;%o@0ykOmR8=Nu$K~vA|gfE(OB`9o2Zya{Cv`49l
zDiy_J;;kdozVFpP_Six!-l_AdvQp`nk8YE(r<LGb5Cs6`Zc}b>;7dNE(F{@LpC?26
zYAR2?4c2AsqYoeSheXEVPhnb@t3du4E@9S}(%fSAEbDe07{2Fug{tz=E=I*JOhNOJ
zCww5MF7mUID6)V}cEtN&SKQ+&{NA^alElD>>Af2hoL2@fJG_SNKlq)aIpun6?EaUo
zaEa*g{1mu#DmMoj2;hz;ef@+fkd!d*cP=mkAbZ4X8q<y}RY^_OqSoE6bp~{t3bjP=
zF2`c^9|$hxE5TK7$O<i)JcuRQteVyA$aBMEPv7SBTTZ{<^JYs6ZKs!^2kI>GdN-+*
zuFswpSOa)je<xd(9NL>5TlsUHYRfezu=70IDXnBYRq{}flnz(9SCWXX+!CGLoAd71
z0WU4=2W1P3RTo)_W*%YwT`2$81U-5~r_`*Moq(oQ^gD-ToBL%m){=)B*3U?HKNM$x
zLcnjh*3ByTetM>JgFP4#9ab}uF9%A2qWSDyw+}U2%(#t~+&bgyCYjsRRo>8iLHPKs
zx#)?XY-h%)4C3^8!FAyR;Y~zK)c|DW`aU@!)1Hd=H-dIMy|CcuZ_d-z`X6#qw|$(B
zrp;=Wi*k<%NO$H8N|Y$VmGt`z0$si&;Kh9pscf&MPCkkp@-SJOioQ0u%9Ur9y6*h2
zd?jcXnnm$%m-16PIr|eg-{6wWv-<<V3DGlW|1Zp-enC+YX^0<f?`${eAEvM~@T`zo
z-s?74?n&Rful_@R%AVpzq*>Ou*bt;_@Z#+=KT46O*lm_pL+h>18sBi%z02EW4tT#r
z&`Y!7J??lan};)XK-)P^@hi>Q#_iU^{mh#<&AL~JmE&;Fu80h-J9<g4aD^RQ=z=Dg
zgcIoN;|iU%Rx<-M1m?4|+Ba2%FKlM*1MYt6+N{x0Rhut)wfN?&UR?_!wsZj!ZO@m+
zsGb3)#AL5u%X1fT_CP5Hy3YqC8!&`~Y$)zpYVmbCx%uPsCNr~S|DE7oEA<nJW}jZ;
z_hZnZ4XS%|0kTnRi5C_W(kr-Hb2c?4K3$cbp;vLvE`I|ynm)|6wHD^o1k1q?+jTyt
z6Ht(w3DOkJu~Q~lxrqysMJB#I#<{0z9$pmRgqnvnvazcWPnF5Iu*)<(ydvvd*teZT
zp4-U=#k9fgxuO!9o^uR!ufOLv0Stx9wn1?>%~Tq7+>IU^k7~{<)y&Bsl21u(L%I4a
z>PAU4^EYNz`=}B}iMqJZ)Y~K9Ru%Hh#CSpefILU044rvKK_A^4gknOc;72-%X_hY1
zpVow8h?iq`wHKxYnG%*(R+W!Qrus?a8_9WN#081LgF=S1pAYO>%xh0C(HFYP29K1~
zjWVwFze^mP*<E~Km`Z{2z@+f!tYs%Z;Zd~B{<fx^W=>?A42oKMC~zjV?}7CTz6OR(
nL>4EHap?cM!ES97vvII#bbG{qmhfHp_1nP6&<s<g?;Q3o!0vfu

literal 0
HcmV?d00001

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index fffa7a214..47610d4c5 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -49,7 +49,7 @@ a.underline {text-decoration:underline;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:13px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
 .post-content img {max-width:100%;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
@@ -74,6 +74,6 @@ a.underline {text-decoration:underline;}
 
 /* loading 弹框*/
 .loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
-.loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
+.loading-box {position:absolute; top:50%; background:rgba(240,240,240, 0.5); width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
 .loading-box img {margin-top: 3px; text-align: center;}
 .loading-box span {display: block; font-size:12px;}

From 90bb9402901c92a8cb98db3e6ef4e846adc52088 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 20:27:32 +0800
Subject: [PATCH 63/72] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb            | 4 ++--
 app/views/users/_user_import_resource_list.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 89491970b..9dc530c72 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,7 +6,7 @@
     <% attachments.each do |attach| %>
         <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
           <li class="resource-list-checkbox fl">
-            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 && !attach_show_allow(attach) %>
                 <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
             <% else %>
                 <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
@@ -14,7 +14,7 @@
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+            <% if attach.is_public == 0 && !attach_show_allow(attach) && attach.get_apply_resource_status(attach.id, attach.author_id) != "2" %>
                 <a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
             <% else %>
                 <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 2052f8219..efae73a3d 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,14 +6,14 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+              <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 && !attach_show_allow(attach)%>
                   <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
               <% else %>
                   <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
               <% end %>
 
               <span>
-                <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                <% if attach.is_public == 0 &&  !attach_show_allow(attach)  && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
                     <a href="" style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
                 <% else %>
                     <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>

From 166a97dc0c098579cab8e274f09373018fb858b3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 20:37:11 +0800
Subject: [PATCH 64/72] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_resource_info.html.erb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 1e3cd508c..52a61a7b0 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -19,12 +19,13 @@
     <div class="resource-check-all">
       <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
     </div>
-    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
+    <!--<a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> -->
+    <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
   <div class="cl"></div>
   <div class="resourcesSelectSend mt10 fl">
-    <div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">
-      <a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>
-    </div>
+    <!--<div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">-->
+      <!--&lt;!&ndash;<a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>&ndash;&gt;-->
+    <!--</div>-->
     <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
   </div>
 

From dd4786d6390da2ed448426b5090878fda93a4ace Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 20 May 2016 20:44:13 +0800
Subject: [PATCH 65/72] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb          | 2 +-
 app/views/student_work/_evaluation_un_work.html.erb | 2 +-
 app/views/student_work/_evaluation_work.html.erb    | 2 +-
 public/stylesheets/courses.css                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 5a93c352a..979e711bc 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -65,7 +65,7 @@
         <td class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
           <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
         </td>
-        <td class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+        <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
       </tr>
   <% end%>
 </table>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index ba91589fa..9cac477ab 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -96,7 +96,7 @@
         </div>
     <% end%>
   </td>
-  <td class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+  <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
 </tr>
 <script type="text/javascript">
     $(".student_work_<%= student_work.id%>").mouseenter(function(){
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 55861d444..dac46f289 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -79,7 +79,7 @@
   <td class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </td>
-  <td class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></td>
+  <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
 </tr>
 <script type="text/javascript">
     $(".student_work_<%= student_work.id%>").mouseenter(function(){
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d1831f4a8..49f87416c 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -47,7 +47,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkListRow:hover {background-color:#f6f6f7;}
 .hworkUl li{ float:left;}
 .hworkListRow li{ float:left;}
-.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:20px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
+.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:-15px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
 .hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
 .hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;}
 .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;}

From d9241d5dcab2e603700e5698bd65e01b7966ac57 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 20:55:43 +0800
Subject: [PATCH 66/72] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AE=BE=E4=B8=BA=E9=A6=96=E9=A1=B5=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E6=A0=8F=E7=9B=AE=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_activities.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index c00cc6161..2c135cd2e 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -46,7 +46,7 @@
                   </div>
                 </div>
             <% end %>
-            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
+            <% if act.org_act_type == 'OrgDocumentComment' %>
                 <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>

From e512154ea97232fe5a6aeb7f083beacc99be7dfc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 21:00:36 +0800
Subject: [PATCH 67/72] =?UTF-8?q?=E5=8F=A4=E5=89=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 9dc530c72..dcebddb8b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -72,7 +72,7 @@
     function batch_delete(){
         var data = $("#resources_list_form").serialize();
         if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            alert("您无法删除此资源！");
             return;
         }
         if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){

From 0fcd8ae86d677240c6728fa522ae37ee11f128e0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 21:10:53 +0800
Subject: [PATCH 68/72] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=82=B9=E5=87=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_import_resource_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index efae73a3d..dd96eb10e 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -14,7 +14,7 @@
 
               <span>
                 <% if attach.is_public == 0 &&  !attach_show_allow(attach)  && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
-                    <a href="" style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
+                    <a style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
                 <% else %>
                     <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
                 <% end %>

From 51cd9c6dd16ede491a698fe481e7b990998ebcb2 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 20 May 2016 21:47:31 +0800
Subject: [PATCH 69/72] =?UTF-8?q?=E5=AD=A6=E5=8F=B7=E6=BA=A2=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb                | 2 +-
 app/views/student_work/_evaluation_title.html.erb         | 2 +-
 app/views/student_work/_evaluation_title_archive.html.erb | 2 +-
 app/views/student_work/_evaluation_un_work.html.erb       | 2 +-
 app/views/student_work/_evaluation_work.html.erb          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 979e711bc..3022b83a6 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -48,7 +48,7 @@
           <%=exercise.user.show_name %>
         </td>
         <td class="hworkStID pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
-          <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
+          <span class="hidden fl" style="width:80px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
         </td>
         <td class="hworkStID float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
           --
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index c74bd76c6..064444f04 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -23,7 +23,7 @@
           系统
         </th>
     <% end%>
-    <th class="hworkList50 pr10 pl10">
+    <th class="hworkList50 pr10 pl10" style="font-size:12px;">
       我的评分
     </th>
   </tr>
diff --git a/app/views/student_work/_evaluation_title_archive.html.erb b/app/views/student_work/_evaluation_title_archive.html.erb
index e4e26ed4f..01bab5264 100644
--- a/app/views/student_work/_evaluation_title_archive.html.erb
+++ b/app/views/student_work/_evaluation_title_archive.html.erb
@@ -21,7 +21,7 @@
       </li>
   <% end%>
 
-  <li class="hworkList50 hworkH30 fb mr10 ml10">
+  <li class="hworkList50 hworkH30 fb mr10 ml10" style="font-size:12px;">
     我的评分
   </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 9cac477ab..ecdde77d8 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -16,7 +16,7 @@
           <%= student_work.user.show_name%>
         </td>
         <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
-          <span style="width:90px; float:left;" class="hidden"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
+          <span style="width:80px;" class="hidden fl"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
         </td>
       <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
         <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index dac46f289..0259fddf7 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -24,7 +24,7 @@
             <%= student_work.user.show_name%>
           </td>
           <td class="hworkStID float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-            <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+            <span class="hidden fl" style="width:80px;"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
           </td>
         <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
             <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>

From 039d11e862f4c5f82a9d5f62f9497adc15cf5f4f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 21:48:51 +0800
Subject: [PATCH 70/72] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 2 +-
 app/views/users/user_resource.html.erb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index dcebddb8b..1349ba2b7 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -48,7 +48,7 @@
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
           <li style="display: none"><%= attach.is_public %></li>
-          <li style="display: none"><%= attach.get_apply_resource_status(attach.id, attach.author_id) %></li>
+          <li style="display: none"><%= attach.get_apply_resource_status(attach.id, User.current.id) %></li>
           <li style="display: none"><%= attach_show_allow(attach) == true ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 0bd5724c1..f773e3c48 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -56,7 +56,7 @@
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">引用资源</a>
     </li>
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">

From 76006ef3e71b1c66ec2c124b9d02ef032931acbd Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 20 May 2016 22:07:33 +0800
Subject: [PATCH 71/72] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=B8=96=E5=AD=90=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb         | 17 ++++++++---------
 .../sub_document_comments_controller.rb         |  2 ++
 app/views/org_document_comments/destroy.js.erb  |  2 +-
 app/views/sub_document_comments/destroy.js.erb  |  2 +-
 app/views/sub_document_comments/show.html.erb   |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 02e74237a..82062d3dd 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -102,15 +102,14 @@ class OrgDocumentCommentsController < ApplicationController
   end
 
   def destroy
-    @org_document_comment = SubDocumentComment.find(params[:id])
-    @sub_domain = @org_document_comment.sub_domain
-    @org_subfield = @sub_domain.org_subfield
-    # org = @org_document_comment.organization
-    # if @org_document_comment.id == org.home_id
-    #   org.update_attributes(:home_id => nil)
-    # end
-    @org_document_comment.destroy
-    # end
+    @org_document_comment = OrgDocumentComment.find(params[:id])
+    @org_sub_id = @org_document_comment.org_subfield_id
+    org = @org_document_comment.organization
+    if @org_document_comment.id == org.home_id
+      org.update_attributes(:home_id => nil)
+    end
+    if @org_document_comment.destroy
+    end
     respond_to do |format|
       format.js
     end
diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 767e1ba29..cdf153a20 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -125,6 +125,8 @@ class SubDocumentCommentsController < ApplicationController
   def destroy
     @sub_document_comment = SubDocumentComment.find(params[:id])
     @sub_document_comment.destroy
+    @sub_domain = @sub_document_comment.sub_domain
+    @org_subfield = @sub_domain.org_subfield
   rescue ActiveRecord::RecordNotFound
     respond_to do |format|
       # format.html{
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index 1e830d7bc..394078db1 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1,6 +1,6 @@
 //location.reload();
 <% if params[:detail_page] %>
-    window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>';
+    window.location.href = '<%= organization_path(params[:organization_id],:org_subfield_id => @org_sub_id )%>';
 <% else %>
     window.location.reload();
 <% end %>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/destroy.js.erb b/app/views/sub_document_comments/destroy.js.erb
index 4a45e48dd..d4c7bffcd 100644
--- a/app/views/sub_document_comments/destroy.js.erb
+++ b/app/views/sub_document_comments/destroy.js.erb
@@ -1,6 +1,6 @@
 //location.reload();
 <% if params[:detail_page] %>
-window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)%>';
+window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>';
 <% else %>
 window.location.reload();
 <% end %>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index fc35d00cb..7050c1c66 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -56,7 +56,7 @@
                         <%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 1), :class => "postOptionLink" %>
                       </li>
                       <li>
-                        <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :detail_page => 1), :method => 'delete',
+                        <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 0, :detail_page=>1), :method => 'delete',
                                     :data => {:confirm => l(:text_are_you_sure)},
                                     :remote => true, :class => 'postOptionLink' %>
                       </li>

From eead7962cf6483bfcee347062611343780d1b251 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 21 May 2016 11:39:50 +0800
Subject: [PATCH 72/72] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb     |  6 ++++-
 app/controllers/users_controller.rb           |  2 +-
 app/helpers/application_helper.rb             | 19 +++++++++++----
 app/models/attachment.rb                      |  3 ++-
 app/views/users/_resources_list.html.erb      | 23 +++++++++++--------
 .../users/_user_import_resource_list.html.erb |  6 ++---
 app/views/users/user_resource.html.erb        |  2 +-
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d6470ce51..cbce67618 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -363,7 +363,11 @@ class ApplicationController < ActionController::Base
       when "contest"
         return true
       when "Course"
-        allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+        if @attachment.get_status_by_attach(User.current.id) == 2
+          return true
+        else
+          allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+        end
       else
         return true
     end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 52fdad2e7..2c4355180 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2705,7 +2705,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源搜索
   def get_public_resources_search user_course_ids, user_project_ids, order, score, search
-    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attachments = Attachment.where("is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的资源
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8d9c9733e..4d92808d4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -58,12 +58,21 @@ module ApplicationHelper
       when "Course"
         User.current.member_of_course?(attachment.container) ? true : false
       when "OrgSubfield"
-        User.current.member_of_org?(attachment.container) ? true : false
+        User.current.member_of_org?(attachment.container.organization) ? true : false
       when "Principal"
         User.current.id == attachment.author_id ? true : false
     end
   end
 
+  # 判断某个私有资源是否可以发送下载权限
+  # 结果为true不能下载，false可以下载
+  def private_attachment_allow attachment_id
+    attach = Attachment.find(attachment_id)
+    # 条件取否，result结果为true则不能下载
+    result = attach.is_public == 0 && attach.author != User.current && !attach.get_apply_resource_status(attach.id, User.current.id) && !attach_show_allow(attach)
+    return result
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件
@@ -2109,20 +2118,20 @@ module ApplicationHelper
         candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
       elsif attachment.container.is_a?(Project)
         project = attachment.container
-        candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
+        candown = User.current.member_of?(project) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.project
         project = attachment.container.board.project
         candown = User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:course) ||attachment.container.has_attribute?(:course_id) ) && attachment.container.course
         course = attachment.container.course
-        candown = User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+        candown = User.current.member_of_course?(course) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(Course)
         course = attachment.container
-        candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+        candown= User.current.member_of_course?(course) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgSubfield)
         org = attachment.container.organization
-        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
+        candown = User.current.member_of_org?(org) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgDocumentComment)
         org = attachment.container.organization
         candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index b7ec264fd..8f9ee2d85 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -142,7 +142,8 @@ class Attachment < ActiveRecord::Base
   end
 
   def get_apply_resource_status attachment_id, author_id
-    ApplyResource.where("attachment_id =? and apply_user_id =?", attachment_id, author_id).first.try(:status)
+    status = ApplyResource.where("attachment_id =? and user_id =?", attachment_id, author_id).first.try(:status)
+    status == 2 ? true :false
   end
 
   # add by nwb
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 1349ba2b7..3aaed7594 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,7 +6,7 @@
     <% attachments.each do |attach| %>
         <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
           <li class="resource-list-checkbox fl">
-            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 && !attach_show_allow(attach) %>
+            <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2")  %>
                 <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
             <% else %>
                 <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
@@ -14,17 +14,17 @@
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <% if attach.is_public == 0 && !attach_show_allow(attach) && attach.get_apply_resource_status(attach.id, attach.author_id) != "2" %>
+            <% if private_attachment_allow(attach.id) %>
                 <a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
             <% else %>
                 <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
             <% end %>
-            <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
+            <% if private_attachment_allow(attach.id)  && (@type == "6" || @type == "2") %>
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>
           <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
-            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && !attach_show_allow(attach) %>
+            <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
                 <% ah = attach.get_status_by_attach(User.current.id) %>
                 <% if ah.nil?  %>
                     <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
@@ -36,7 +36,12 @@
                     已拒绝
                 <% end %>
             <% else %>
-                --
+                <% ah = attach.get_status_by_attach(User.current.id) %>
+                <% if ah == 2 %>
+                    可引用
+                <% else %>
+                    --
+                <% end %>
             <% end %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
@@ -47,9 +52,9 @@
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
-          <li style="display: none"><%= attach.is_public %></li>
+          <li style="display: none"><%= private_attachment_allow(attach.id) %></li>
           <li style="display: none"><%= attach.get_apply_resource_status(attach.id, User.current.id) %></li>
-          <li style="display: none"><%= attach_show_allow(attach) == true ? 0 : 1 %></li>
+          <li style="display: none"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -99,11 +104,9 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        is_public = line.children().eq(11).html();
         user_id = line.children().eq(6).html();
-        apply_status = line.children().eq(12).html();
         allow = line.children().eq(13).html();
-        if(is_public == 0 && user_id != '<%= User.current.id %>' && apply_status != 2 && allow == 1){
+        if( allow == 0){
             alert('您无权发送私有资源')
         }else{
             if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index dd96eb10e..e8ed684c6 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,20 +6,20 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 && !attach_show_allow(attach)%>
+              <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
                   <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
               <% else %>
                   <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
               <% end %>
 
               <span>
-                <% if attach.is_public == 0 &&  !attach_show_allow(attach)  && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                <% if private_attachment_allow(attach.id) %>
                     <a style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
                 <% else %>
                     <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
                 <% end %>
               </span>
-              <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
+              <% if private_attachment_allow(attach.id)  && (@type == "6" || @type == "2") %>
                   <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
               <% end %>
             </label>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f773e3c48..483dceaed 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -56,7 +56,7 @@
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">引用资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">申请资源</a>
     </li>
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">