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 001/668] =?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 002/668] =?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 003/668] =?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 004/668] =?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 005/668] =?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 fa788ced1beeb5af8b6b01997da8ed8d35392eba Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 16 May 2016 15:00:08 +0800
Subject: [PATCH 006/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb      |  6 ++--
 .../users/_user_resource_tip_list.html.erb    |  1 +
 app/views/users/user_resource.html.erb        |  5 ++-
 public/stylesheets/org.css                    |  2 +-
 public/stylesheets/public.css                 | 34 +++++--------------
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index b8551f7c5..57cc95c87 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -9,9 +9,11 @@
             <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" />
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
-          <li class="resource-list-name fl hidden">
-            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
+          <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' %>
+            <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
           </li>
+          <li class="resource-list-apply fr"><a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a></li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 5d5876ac8..67fe292ee 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,6 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
+  <li class="resource-list-apply fr">操作</li>
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 80167db56..9420fa3ff 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -55,7 +55,10 @@
     <li class="fl resource-switch">
       <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 w770 border-bottom h34">&nbsp;</li>
+    <li class="fl resource-switch">
+      <a href="javascript:void(0);"  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">
       <div id="user_resource_type_filter">
         <%= render :partial => 'user_resource_type_filter' %>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index abfeaef85..515865f28 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -109,7 +109,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
 .shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
 .sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; min-height:150px; padding-top:5px;}
-.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
+.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#ffffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
 .columnWrap li {padding-left:10px; color:#585858;}
 .columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
 .sectionRow:hover {background-color:#cccccc; cursor:pointer;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 643aea8cf..fcbd79e0b 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -185,6 +185,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .h150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
 .mw220 {max-width: 220px !important;}
+.mw280 {max-width:280px !important;;}
 .mw360 {max-width: 360px !important;}
 .mw380 {max-width: 380px !important;}
 .mw400 {max-width: 400px !important;}
@@ -315,6 +316,7 @@ a:hover.orange_n_btn{background:#d63502;}
 .bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
 a.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
 a:hover.bgreen_n_btn{background:#08a384;}
+.green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 
 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
@@ -1071,30 +1073,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 
-/*20160226新资源库*/
-.resource-wrapper {width:980px; padding:10px; border:1px solid #ddd; background-color:#fff; float:left;}
-.resource-list-tab {width:980px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
-.resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
-.resource-checkbox {margin-top:14px; width:12px; height:12px;}
-.resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
-.resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
-.resource-list-size {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-uploader {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
-.resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
-.resource-list:hover {background-color:#e1e1e1;}
-.resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
-.resource-check-all {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
-.border-bottom {border-bottom:1px solid #ddd;}
-.h34 {height:34px;}
-.resource-tab {font-size:16px; color:#4d4d4d; width:70px; padding:5px 10px; display:inline-block; text-align:left; border-bottom:1px solid #ddd;}
-a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px solid #269ac9;}
-.inactive-text {color:#888888 !important;}
-.inactive-border {border:1px solid #888888 !important;}
-
 /*导入资源样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .resoure-list {width:705px;}
@@ -1121,11 +1099,11 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .course-search {border: 1px solid #dddddd; height: 25px; width: 200px;outline: none;}
 
 /*20160226新资源库*/
-.resource-wrapper {width:980px; background-color:#fff; float:left;}
+.resource-wrapper {width:980px; padding:10px; border:1px solid #ddd; background-color:#fff; float:left;}
 .resource-list-tab {width:980px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
 .resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resource-checkbox {margin-top:14px; width:12px; height:12px;}
-.resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
+.resource-list-name {width:310px; height:40px; line-height:40px; text-align:left;}
 .resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
 .resource-list-size {width:80px; height:40px; line-height:40px; text-align:center;}
 .resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
@@ -1133,6 +1111,8 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
 .resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
 .resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
+.resource-list-apply {width:70px; height:40px; line-height:40px; text-align:center;}
+.resource-list-middle {line-height:40px; vertical-align:middle; display:inline-block;}
 .resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
 .resource-list:hover {background-color:#e1e1e1;}
 .resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
@@ -1141,6 +1121,8 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .h34 {height:34px;}
 .resource-tab {font-size:16px; color:#4d4d4d; width:70px; padding:5px 10px; display:inline-block; text-align:left; border-bottom:1px solid #ddd;}
 a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px solid #269ac9;}
+.inactive-text {color:#888888 !important;}
+.inactive-border {border:1px solid #888888 !important;}
 
 a.group-btn{  background: url(../images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repeat; width:30px; height:20px; display:block; padding-left:23px; color:#888888;}

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 007/668] =?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 008/668] =?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  | 190 +++++++++++---------
 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, 181 insertions(+), 108 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)
-
+        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
-        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
-
-        logger.debug  result
 
-        #-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"]   #编译错误时的信息
+        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
 
-        #该状态用于存入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
+            logger.debug  result
+
+            #-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"]   #编译错误时的信息
+
+            #该状态用于存入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
 
-        if result["status"] == 0
-          tmpstatus = 0
-        end
+            if result["status"] == 0
+              tmpstatus = 0
+            end
 
-        unless student_work.save
-          resultObj[:status] = 200
-        else
-          student_work.name = params[:title]
-          student_work.description = params[:src]
+            unless student_work.save
+              resultObj[:status] = 200
+            else
+              student_work.name = params[:title]
+              student_work.description = params[:src]
 
-          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 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["status"].to_i != -2
-            result["results"].first['user_wait'] = tUsedtime
+              #每次从数据库取出上次的结果加上本次的结果再存入数据库
+              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
+                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
+              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
+              #超时或编译错误则直接返回了并存入数据库
+              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} 毫秒"
+              #将每次用户等待时间都存起来以便管理界面显示用
+              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']
+              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
-          #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 009/668] =?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 545e4ac380087b6c8d9777706e6e256edb3e342f Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 17 May 2016 09:11:30 +0800
Subject: [PATCH 010/668] =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=97=A8=E6=88=B7=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=8A=A8=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                              | 1 -
 app/views/layouts/base_org2.html.erb | 2 +-
 2 files changed, 1 insertion(+), 2 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/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 9b481fac5..91f57ee99 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -46,7 +46,7 @@
 
           scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
           scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
-          scrollPic.autoPlay       = true; //自动播放
+          scrollPic.autoPlay       = false; //自动播放
           scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
 
           scrollPic.initialize(); //初始化

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 011/668] =?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 4c066f9ad304ebb5968d3f8ab9133ccb5fbb9955 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 11:21:05 +0800
Subject: [PATCH 012/668] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?=
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 93fb4441d83a54c6378770c395023f8b60419598 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 14:12:42 +0800
Subject: [PATCH 013/668] =?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 014/668] =?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 4c71e525a7d4d28824bcd1dc83a23a2d58932c4e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 15:30:10 +0800
Subject: [PATCH 015/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=90=8E=EF=BC=8C=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 58829386c..950dcd6f5 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -212,7 +212,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();

From 07678e367e546b94f2e58fdb1b25dbe5906b3f58 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 15:32:18 +0800
Subject: [PATCH 016/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
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 57cc95c87..004cfee4d 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -178,7 +178,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(line.children().first().children().data('hasHistory') == 'Y'){
             alert('该资源存在历史版本，不能删除');
             return;

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 017/668] =?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 018/668] =?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 019/668] =?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 020/668] =?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 615d0ddbd26ddd928d40bdf75090ce5a6599efca Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 16:45:11 +0800
Subject: [PATCH 021/668] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E3=80=81=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=95=8C=E9=9D=A2=E5=8F=8A=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 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 004cfee4d..ebe111507 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,9 +11,17 @@
           </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' %>
-            <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+            <% if attach.is_public == 0  && @type == "6" %>
+                <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+            <% end %>
+          </li>
+          <li class="resource-list-apply fr">
+            <% if attach.is_public == 0 && @type == "6" %>
+                <a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a>
+            <% else %>
+                --
+            <% end %>
           </li>
-          <li class="resource-list-apply fr"><a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a></li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>

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 022/668] =?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 023/668] 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 024/668] =?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 658ea0cf1ecd9a50df74f32bced5c8cd1ce7d7c5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 18 May 2016 14:49:13 +0800
Subject: [PATCH 025/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8=20?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=90=AD=E5=BB=BA=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/apply_resource.rb                  |  14 +
 app/models/attachment.rb                      |   6 +
 app/models/user.rb                            |   1 +
 app/views/users/_apply_for_resource.html.erb  |  16 +
 app/views/users/_apply_resource.html.erb      |  28 ++
 app/views/users/_resources_list.html.erb      |  15 +-
 app/views/users/apply_for_resource.js.erb     |  15 +
 app/views/users/apply_resource.js.erb         |  10 +
 app/views/users/user_resource.html.erb        |   2 +-
 config/routes.rb                              |   2 +
 .../20160517091224_create_apply_resources.rb  |  11 +
 ...0518031514_add_column_to_apply_resource.rb |   6 +
 ...43_add_column_content_to_apply_resource.rb |   6 +
 db/schema.rb                                  | 435 +++++++++++++++++-
 public/stylesheets/public.css                 |   3 +
 spec/factories/apply_resources.rb             |   8 +
 spec/models/apply_resource_spec.rb            |   5 +
 17 files changed, 557 insertions(+), 26 deletions(-)
 create mode 100644 app/models/apply_resource.rb
 create mode 100644 app/views/users/_apply_for_resource.html.erb
 create mode 100644 app/views/users/_apply_resource.html.erb
 create mode 100644 app/views/users/apply_for_resource.js.erb
 create mode 100644 app/views/users/apply_resource.js.erb
 create mode 100644 db/migrate/20160517091224_create_apply_resources.rb
 create mode 100644 db/migrate/20160518031514_add_column_to_apply_resource.rb
 create mode 100644 db/migrate/20160518060243_add_column_content_to_apply_resource.rb
 create mode 100644 spec/factories/apply_resources.rb
 create mode 100644 spec/models/apply_resource_spec.rb

diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
new file mode 100644
index 000000000..50fdeebcb
--- /dev/null
+++ b/app/models/apply_resource.rb
@@ -0,0 +1,14 @@
+class ApplyResource < ActiveRecord::Base
+  attr_accessible :attachment_id, :status, :user_id, :container_type, :container_id, :apply_user_id, :content
+  belongs_to :user
+  belongs_to :attachment
+  has_many :course_messages, :class_name => 'CourseMessage', :as => :course_message, :dependent => :destroy
+  after_create :act_as_apply_resource_message
+
+  def act_as_apply_resource_message
+    self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    # REDO:发送邮件
+    # Mailer.run.apply_for_resource_request(self.container_id, User.current)
+  end
+
+end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index b3f5ce4ed..72205fdc5 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -35,6 +35,7 @@ class Attachment < ActiveRecord::Base
   # end
   include UserScoreHelper
   has_many :attachment_histories
+  has_many :apply_resources, :dependent => :destroy
 
   validates :filename, presence: true, length: {maximum: 254}
   validates :author, presence: true
@@ -536,6 +537,11 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  # 获取资源申请状态
+  def get_status_by_attach user_id
+    ApplyResource.where("user_id =? and attachment_id =?", user_id, self.id).first.try(:status)
+  end
+
   private
 
   # Physically deletes the file from the file system
diff --git a/app/models/user.rb b/app/models/user.rb
index 3956d936e..44ef54c95 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,6 +109,7 @@ class User < Principal
   has_many :student_works_scores, :dependent => :destroy
   has_many :student_work_projects, :dependent => :destroy
   has_many :apply_homeworks, :dependent => :destroy
+  has_many :apply_resources, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
diff --git a/app/views/users/_apply_for_resource.html.erb b/app/views/users/_apply_for_resource.html.erb
new file mode 100644
index 000000000..1a0df801b
--- /dev/null
+++ b/app/views/users/_apply_for_resource.html.erb
@@ -0,0 +1,16 @@
+<div>
+  <div class="ni_con">
+    <p class="mt30">
+      <% if state == 2 %>
+          请求已发送至<%= attachment.author.show_name %>，希望他同意与你分享：）
+      <% elsif state == 3 %>
+          您已发送过分享请求，请勿重复发送。
+      <% end %>
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="hideModal();" style="margin-bottom: 10px; margin-left: 60px; color: #fff;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_apply_resource.html.erb b/app/views/users/_apply_resource.html.erb
new file mode 100644
index 000000000..2f5732030
--- /dev/null
+++ b/app/views/users/_apply_resource.html.erb
@@ -0,0 +1,28 @@
+<div>
+  <div class="ni_con">
+    <%= form_tag(apply_for_resource_user_path(:id => User.current.id, :attachment_id => attachment.id), :multipart => true, :remote => true, :name=>"apply_for_homework_form", :id=>'apply_for_homework_form') do %>
+        <h2>申请分享</h2>
+        <p style="color: #000;">
+          申请说明（必选）：
+          <textarea type="text" name="content" id="apply_content" placeholder="请附言，以增加分享的成功机率。" class="apply_content mt10" style="outline:none;"></textarea>
+        </p>
+        <span class="c_red ml5 f12" style="display: none" id="apply_content_notice">为增加分享的成功机率，请务必填写申请说明。</span>
+        <div class="ni_btn">
+          <a href="javascript:" class="tijiao" onclick="submit_apply_resource();" style="margin-bottom: 20px; margin-left: 60px; color: #fff">
+            确&nbsp;&nbsp;定
+          </a>
+        </div>
+    <% end %>
+  </div>
+</div>
+<script type="application/javascript">
+    var first_click_apply = true;
+    function submit_apply_resource(){
+        if($.trim($("#apply_content").val()) == ""){
+            $("#apply_content_notice").show();
+        } else if(first_click_apply) {
+            first_click_apply = false;
+            $('#apply_for_homework_form').submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index ebe111507..720fed133 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,13 +11,22 @@
           </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  && @type == "6" %>
+            <% if attach.is_public == 0  && @type == "6" && attach.author != User.current %>
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>
           <li class="resource-list-apply fr">
-            <% if attach.is_public == 0 && @type == "6" %>
-                <a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a>
+            <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
+                <% ah = attach.get_status_by_attach(attach.author_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) %>
+                <% elsif ah.status == 1 %>
+                    等待回复
+                <% elsif ah.status == 2 %>
+                    可引用
+                <% elsif ah.status == 3 %>
+                    已拒绝
+                <% end %>
             <% else %>
                 --
             <% end %>
diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
new file mode 100644
index 000000000..c37632810
--- /dev/null
+++ b/app/views/users/apply_for_resource.js.erb
@@ -0,0 +1,15 @@
+<% if @state == 1 %>
+hideModal();
+alert("您还未登录，请先登录");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_for_resource', :locals => {:attachment => @attachment, :state => @state}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
+$("#homework_apply_status_<%= @attachment.id %>").html("等待回复");
+<% elsif @state == 3 %>
+hideModal();
+alert("您已申请过该资源");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
new file mode 100644
index 000000000..62afcfd48
--- /dev/null
+++ b/app/views/users/apply_resource.js.erb
@@ -0,0 +1,10 @@
+<% if @state == 1 %>
+alert("您还未登录");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_resource', :locals => {:attachment => @attachment}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 9420fa3ff..f7e239d97 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="javascript:void(0);"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '1', :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">
diff --git a/config/routes.rb b/config/routes.rb
index 6554d1779..85e3198a3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -561,6 +561,7 @@ RedmineApp::Application.routes.draw do
       match 'apply_homework', :to => 'users#apply_homework', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       match 'student_homeworks', :to => 'users#student_homeworks', :via => :get
+      get 'apply_resource'
       get 'user_import_homeworks'
       get 'user_search_homeworks'
       get 'choose_user_course'
@@ -630,6 +631,7 @@ RedmineApp::Application.routes.draw do
       get 'user_ref_homework_search'
       get 'show_homework_detail'
       post 'apply_for_homework'
+      post 'apply_for_resource'
       # end
     end
     #resources :blogs
diff --git a/db/migrate/20160517091224_create_apply_resources.rb b/db/migrate/20160517091224_create_apply_resources.rb
new file mode 100644
index 000000000..8e2516966
--- /dev/null
+++ b/db/migrate/20160517091224_create_apply_resources.rb
@@ -0,0 +1,11 @@
+class CreateApplyResources < ActiveRecord::Migration
+  def change
+    create_table :apply_resources do |t|
+      t.integer :status
+      t.integer :user_id
+      t.integer :attachment_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160518031514_add_column_to_apply_resource.rb b/db/migrate/20160518031514_add_column_to_apply_resource.rb
new file mode 100644
index 000000000..164bad7b7
--- /dev/null
+++ b/db/migrate/20160518031514_add_column_to_apply_resource.rb
@@ -0,0 +1,6 @@
+class AddColumnToApplyResource < ActiveRecord::Migration
+  def change
+    add_column :apply_resources, :container_id, :integer
+    add_column :apply_resources, :container_type, :string
+  end
+end
diff --git a/db/migrate/20160518060243_add_column_content_to_apply_resource.rb b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb
new file mode 100644
index 000000000..e741527e0
--- /dev/null
+++ b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb
@@ -0,0 +1,6 @@
+class AddColumnContentToApplyResource < ActiveRecord::Migration
+  def change
+    add_column :apply_resources, :content, :text
+    add_column :apply_resources, :apply_user_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 092252062..58cb9b8ae 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 => 20160513120002) do
+ActiveRecord::Schema.define(:version => 20160518060243) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -77,6 +99,18 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
   create_table "at_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "at_message_id"
@@ -144,6 +178,20 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -241,6 +289,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -540,6 +599,10 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "visits",                        :default => 0
   end
 
+  add_index "courses", ["id"], :name => "id", :unique => true
+  add_index "courses", ["tea_id"], :name => "tea_id"
+  add_index "courses", ["visits"], :name => "visits"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -601,6 +664,15 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -650,6 +722,16 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -672,6 +754,25 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -774,6 +875,15 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -903,6 +1013,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1046,6 +1167,20 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1057,6 +1192,27 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1107,23 +1263,47 @@ ActiveRecord::Schema.define(:version => 20160513120002) 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
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1158,6 +1338,39 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1183,6 +1396,31 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1192,6 +1430,49 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1348,6 +1629,23 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1430,6 +1728,11 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1519,6 +1822,16 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1653,6 +1966,25 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1691,6 +2023,26 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1763,9 +2115,9 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
+    t.float    "work_score"
     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"
@@ -1813,13 +2165,13 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority",        :default => 0
+    t.integer  "priority"
     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
+    t.integer  "hide"
+    t.integer  "status"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
   create_table "subfield_subdomain_dirs", :force => true do |t|
@@ -1829,6 +2181,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2068,6 +2431,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2119,6 +2493,23 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index fcbd79e0b..8489b0fa1 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1134,3 +1134,6 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 
 .likeText{color: #7f7f7f}
 .likeNum{color: #7f7f7f}
+
+/*弹框*/
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
\ No newline at end of file
diff --git a/spec/factories/apply_resources.rb b/spec/factories/apply_resources.rb
new file mode 100644
index 000000000..92e48632b
--- /dev/null
+++ b/spec/factories/apply_resources.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :apply_resource do
+    status 1
+user_id 1
+attachment_id 1
+  end
+
+end
diff --git a/spec/models/apply_resource_spec.rb b/spec/models/apply_resource_spec.rb
new file mode 100644
index 000000000..a0d4b48b1
--- /dev/null
+++ b/spec/models/apply_resource_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ApplyResource, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

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 026/668] =?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 027/668] =?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 028/668] =?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 029/668] =?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 030/668] =?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 f3f75a57bdad2096e33b521479061efd4b31b39f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 18 May 2016 17:37:48 +0800
Subject: [PATCH 031/668] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B5=84=E6=BA=90=E5=8F=91=E5=B8=83=E8=BF=99?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 101 ++++++++++++++++--
 app/models/apply_resource.rb                  |   3 +-
 .../_apply_resource_course_message.html.erb   |  29 +++++
 app/views/users/_resources_list.html.erb      |  10 +-
 app/views/users/_user_message_course.html.erb |   6 ++
 .../users/_user_resource_type_filter.html.erb |   2 +-
 app/views/users/apply_for_resource.js.erb     |   2 +-
 7 files changed, 136 insertions(+), 17 deletions(-)
 create mode 100644 app/views/users/_apply_resource_course_message.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dd1d8f876..b6fed88af 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -311,6 +311,30 @@ class UsersController < ApplicationController
     end
   end
 
+  # 处理资源引用请求
+  # status
+  def deal_with_apply_resource
+    @msg = CourseMessage.find(params[:msg_id])
+    ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id)
+    case params[:agree]
+      when 'Y'
+        unless ah.empty?
+          ah.first.update_column('status', 2)
+          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>1)
+          @msg.update_attributes(:apply_result=>1,:viewed=>1)
+        end
+      when 'N'
+        unless ah.empty?
+          ah.first.update_column('status', 3)
+          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>2)
+          @msg.update_attributes(:apply_result=>2,:viewed=>1)
+        end
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #处理引用作业的请求
   #status 1 同意 2 拒绝
   def dealwith_apply_homework
@@ -419,6 +443,19 @@ class UsersController < ApplicationController
   end
   # end
 
+  # 资源分享请求弹框
+  def apply_resource
+    if User.current.logged?
+      @attachment = Attachment.find params[:attachment_id]
+      @state = 2
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #引用作业请求弹框
   def apply_homework
     if User.current.logged?
@@ -432,6 +469,27 @@ class UsersController < ApplicationController
     end
   end
 
+  # 申请引用资源
+  def apply_for_resource
+    if User.current.logged?
+      @attachment = Attachment.where("id =?", params[:attachment_id].to_i).first
+      unless @attachment.nil?
+        ar = ApplyResource.where("user_id = ? and attachment_id = ?", User.current.id, params[:attacment_id].to_i)
+        if ar.empty?
+          ApplyResource.create(:user_id => params[:id].to_i, :attachment_id => params[:attachment_id].to_i, :status => true, :container_id => @attachment.container_id, :container_type => @attachment.container_type, :content => params[:content], :apply_user_id => @attachment.author_id)
+          @state = 2
+        else
+          @state = 3
+        end
+      end
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #申请引用非公开作业
   def apply_for_homework
     if User.current.logged?
@@ -2608,7 +2666,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, 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')) ").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')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源搜索
@@ -2637,6 +2695,17 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的私有资源分享结果
+  def get_my_private_resources apply_ids, resource_type, order, score
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的私有资源分享结果
+  def get_course_private_resources author_id, user_course_ids, order, score
+    apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
+    attachments = Attachment.where("user_id =? and attachment_id =?")
+  end
+
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
     attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
@@ -2646,12 +2715,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中课程资源搜索结果
   def get_course_resources_public_search user_course_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
@@ -2670,12 +2739,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源搜索
   def get_project_resources_public_search  user_project_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
@@ -2693,13 +2762,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
     attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public_search order, score, search
     attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2714,12 +2783,12 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public order, score
-    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").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
 
   # 获取我的用户类型资源
   def get_principal_resources_public_search order, score, search
-    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2761,6 +2830,20 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      # apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
index 50fdeebcb..ac65c0e3d 100644
--- a/app/models/apply_resource.rb
+++ b/app/models/apply_resource.rb
@@ -1,4 +1,5 @@
 class ApplyResource < ActiveRecord::Base
+  # status：1. 等待回复 2.审核通过 3.已拒绝
   attr_accessible :attachment_id, :status, :user_id, :container_type, :container_id, :apply_user_id, :content
   belongs_to :user
   belongs_to :attachment
@@ -6,7 +7,7 @@ class ApplyResource < ActiveRecord::Base
   after_create :act_as_apply_resource_message
 
   def act_as_apply_resource_message
-    self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => self.container_id, :viewed => false, :status => 5)
     # REDO:发送邮件
     # Mailer.run.apply_for_resource_request(self.container_id, User.current)
   end
diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
new file mode 100644
index 000000000..154ae3172
--- /dev/null
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -0,0 +1,29 @@
+<li class="homepageNewsPortrait fl">
+  <div class="navHomepageLogo fl">
+    <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+  </div>
+</li>
+<li class="homepageNewsPubType fl">
+  <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+  <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.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>
+  </a>
+</li>
+
+<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+   <span id="deal_info_<%=ma.id%>">
+     <% if ma.apply_result == 0 || ma.apply_result.nil?%>
+         <%= link_to '同意', dealwith_apply_homework_user_path(User.current,:agree => 'Y', :msg_id => ma.id), :remote => 'true' %> |
+         <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree => 'N', :msg_id => ma.id), :remote => 'true' %>
+     <% elsif ma.apply_result == 1 %>
+         您已经同意了该申请
+     <% elsif ma.apply_result == 2 %>
+         您已经拒绝了该申请
+     <%end %>
+   </span>
+</li>
+<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 720fed133..18d20cd60 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -15,16 +15,16 @@
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>
-          <li class="resource-list-apply fr">
+          <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
             <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
-                <% ah = attach.get_status_by_attach(attach.author_id) %>
+                <% 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) %>
-                <% elsif ah.status == 1 %>
+                <% elsif ah == 1 %>
                     等待回复
-                <% elsif ah.status == 2 %>
+                <% elsif ah == 2 %>
                     可引用
-                <% elsif ah.status == 3 %>
+                <% elsif ah == 3 %>
                     已拒绝
                 <% end %>
             <% else %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d278c7d74..9befe2b0b 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -234,6 +234,12 @@
           <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
+    <!--资源申请-->
+    <% if ma.course_message_type == "ApplyResource" %>
+        <ul class="homepageNewsList fl" id="course_message_homework_<%=ma.id %>">
+          <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
+        </ul>
+    <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
         <ul class="homepageNewsList fl">
           <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>
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
index 6e5ed51c3..d2aa29eed 100644
--- a/app/views/users/_user_resource_type_filter.html.erb
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -17,7 +17,7 @@
         <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
       </li>
       <div id="my_files_resource">
-        <% if @type != "6" %>
+        <% unless (@type == "6" || @type == "2") %>
             <li>
               <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 4, :search => @switch_search) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
               <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
index c37632810..10dd326e8 100644
--- a/app/views/users/apply_for_resource.js.erb
+++ b/app/views/users/apply_for_resource.js.erb
@@ -8,7 +8,7 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
-$("#homework_apply_status_<%= @attachment.id %>").html("等待回复");
+$("#resource_apply_status_<%= @attachment.id %>").html("等待回复");
 <% elsif @state == 3 %>
 hideModal();
 alert("您已申请过该资源");

From 99cbf0b54ef3058c79b1d303374573af0c48ecfd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 11:32:58 +0800
Subject: [PATCH 032/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=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/controllers/users_controller.rb           | 26 +++++++++----------
 app/models/apply_resource.rb                  |  6 ++++-
 app/models/course_message.rb                  |  2 ++
 .../_apply_resource_course_message.html.erb   | 12 ++++-----
 ...ply_resource_course_message_reply.html.erb | 21 +++++++++++++++
 app/views/users/_user_message_course.html.erb | 10 +++++--
 .../users/deal_with_apply_resource.js.erb     |  1 +
 app/views/users/user_resource.html.erb        |  2 +-
 config/routes.rb                              |  1 +
 9 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 app/views/users/_apply_resource_course_message_reply.html.erb
 create mode 100644 app/views/users/deal_with_apply_resource.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b6fed88af..7542ef3ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -315,20 +315,18 @@ class UsersController < ApplicationController
   # status
   def deal_with_apply_resource
     @msg = CourseMessage.find(params[:msg_id])
-    ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id)
-    case params[:agree]
-      when 'Y'
-        unless ah.empty?
-          ah.first.update_column('status', 2)
-          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>1)
-          @msg.update_attributes(:apply_result=>1,:viewed=>1)
-        end
-      when 'N'
-        unless ah.empty?
-          ah.first.update_column('status', 3)
-          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>2)
-          @msg.update_attributes(:apply_result=>2,:viewed=>1)
-        end
+    ar = ApplyResource.where("id = ?", @msg.course_message_id).first
+    unless ar.nil?
+      case params[:agree]
+        when 'Y'
+          ar.update_column('status', 2)
+           @msg.update_attributes(:apply_result => 1, :viewed => 1)
+          ar.course_messages << CourseMessage.new(:user_id => ar.user_id, :course_id => -1, :viewed => false, :apply_result => 2, :status => 1)
+        when 'N'
+          ar.update_column('status', 3)
+          @msg.update_attributes(:apply_result => 2, :viewed => 1)
+          ar.course_messages << CourseMessage.new(:user_id => ar.user_id, :course_id => -1, :viewed => false, :apply_result => 3, :status => 1)
+      end
     end
     respond_to do |format|
       format.js
diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
index ac65c0e3d..df646166c 100644
--- a/app/models/apply_resource.rb
+++ b/app/models/apply_resource.rb
@@ -7,9 +7,13 @@ class ApplyResource < ActiveRecord::Base
   after_create :act_as_apply_resource_message
 
   def act_as_apply_resource_message
-    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => -1, :viewed => false, :status => 0, )
     # REDO:发送邮件
     # Mailer.run.apply_for_resource_request(self.container_id, User.current)
   end
 
+  def find_attachment attachment_id
+    Attachment.find(attachment_id)
+  end
+
 end
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 703da936b..59fcfe456 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -1,5 +1,7 @@
 class CourseMessage < ActiveRecord::Base
   # status说明： status在课程不同的类型，区分不同的功能 status = 9 作品的提交记录
+  # ApplyResource status:
+  # 0: 发送申请 1：回复允许申请 2：拒绝申请消息
   # HomeworkCommon：status：
   # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败； 5：申请引用作业, 6:申请结果
   # apply_user_id: 申请者的用户id
diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 154ae3172..55dcb4d22 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,16 +9,16 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>
   </a>
 </li>
 
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
-   <span id="deal_info_<%=ma.id%>">
-     <% if ma.apply_result == 0 || ma.apply_result.nil?%>
-         <%= link_to '同意', dealwith_apply_homework_user_path(User.current,:agree => 'Y', :msg_id => ma.id), :remote => 'true' %> |
-         <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree => 'N', :msg_id => ma.id), :remote => 'true' %>
+   <span id="deal_info_<%= ma.id %>">
+     <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+         <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
+         <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
      <% elsif ma.apply_result == 1 %>
          您已经同意了该申请
      <% elsif ma.apply_result == 2 %>
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
new file mode 100644
index 000000000..4869c4393
--- /dev/null
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -0,0 +1,21 @@
+<ul class="homepageNewsList fl">
+  <li class="homepageNewsPortrait fl">
+    <% owner = User.find(ma.course_message.apply_user_id) %>
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(owner), :width => "30", :height => "30", class: "mt3"), user_path(owner) %>
+    </div>
+  </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>
+  </li>
+  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+    <% link_str = ma.apply_result == 1 ?
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请已通过'
+    :
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请被婉拒' %>
+    <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  </a>
+  </li>
+  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 9befe2b0b..8e3aa4873 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -235,11 +235,17 @@
         </ul>
     <% end %>
     <!--资源申请-->
-    <% if ma.course_message_type == "ApplyResource" %>
-        <ul class="homepageNewsList fl" id="course_message_homework_<%=ma.id %>">
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 0 %>
+        <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
           <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
+    <!--资源申请回复-->
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+        <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
+          <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
+        </ul>
+    <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
         <ul class="homepageNewsList fl">
           <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>
diff --git a/app/views/users/deal_with_apply_resource.js.erb b/app/views/users/deal_with_apply_resource.js.erb
new file mode 100644
index 000000000..dbf07217c
--- /dev/null
+++ b/app/views/users/deal_with_apply_resource.js.erb
@@ -0,0 +1 @@
+$("#apply_resource_message_<%= @msg.id %>").html('<%= escape_javascript(render :partial => 'users/apply_resource_course_message', :locals => {:ma => @msg}) %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f7e239d97..0bd5724c1 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 => '1', :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">
diff --git a/config/routes.rb b/config/routes.rb
index 85e3198a3..98d90c753 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -623,6 +623,7 @@ RedmineApp::Application.routes.draw do
       post 'import_resources_to_homework'
       get 'dealwith_apply_request'
       get 'dealwith_apply_homework'
+      get 'deal_with_apply_resource'
       get 'store_selected_resource'
       get 'user_organizations'
       get 'search_user_orgs'

From bddc807057f7cf0de8a570be89b4fa0b85b159be Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 13:41:32 +0800
Subject: [PATCH 033/668] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E5=BC=B9=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/apply_for_resource.js.erb | 2 +-
 app/views/users/apply_resource.js.erb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
index 10dd326e8..7debbcba2 100644
--- a/app/views/users/apply_for_resource.js.erb
+++ b/app/views/users/apply_for_resource.js.erb
@@ -7,7 +7,7 @@ showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
 $("#resource_apply_status_<%= @attachment.id %>").html("等待回复");
 <% elsif @state == 3 %>
 hideModal();
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
index 62afcfd48..14a795fe5 100644
--- a/app/views/users/apply_resource.js.erb
+++ b/app/views/users/apply_resource.js.erb
@@ -6,5 +6,5 @@ showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
 <% end %>
\ No newline at end of file

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 034/668] =?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 4c68da9beeeb233fdfcfc5c8227ee5cf9ab4b55b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 13:49:29 +0800
Subject: [PATCH 035/668] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 55dcb4d22..4dbec8127 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,8 +9,8 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
   </a>
 </li>
 
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 4869c4393..7cf246c53 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -11,9 +11,9 @@
   </li>
   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
     <% link_str = ma.apply_result == 1 ?
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请已通过'
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请被婉拒' %>
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
   </a>
   </li>

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 036/668] =?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 0b2f6c9a53a3d3134ae2b1add26f2b015a62f529 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 14:28:13 +0800
Subject: [PATCH 037/668] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E5=92=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7542ef3ee..b0194a2d8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2698,10 +2698,9 @@ class UsersController < ApplicationController
     attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取我的私有资源分享结果
-  def get_course_private_resources author_id, user_course_ids, order, score
-    apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
-    attachments = Attachment.where("user_id =? and attachment_id =?")
+  # 获取我的私有资源分享搜索结果
+  def get_my_private_resources_search apply_ids, resource_type, order, score, search
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的课程资源中搜索结果
@@ -2830,7 +2829,6 @@ class UsersController < ApplicationController
       end
     elsif params[:type] == "2" # 私有资源
       apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      # apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
       if params[:status] == "2"
         resource_type = "'Course'"
       elsif params[:status] == "3"
@@ -2838,7 +2836,6 @@ class UsersController < ApplicationController
       elsif params[:status] == "5"
         resource_type = "'Principal'"
       else
-        # 公共资源库：所有公开资源或者我上传的私有资源
         resource_type = "'Project','OrgSubfield','Principal','Course'"
       end
       @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
@@ -3022,6 +3019,19 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
       @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+      @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 18d20cd60..63ef92667 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,7 +11,7 @@
           </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  && @type == "6" && attach.author != User.current %>
+            <% 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 %>
           </li>

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 038/668] =?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 039/668] =?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 040/668] 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 041/668] =?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 042/668] =?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 984f7067224510d98040d490d78d6cc838a46eb4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 15:59:59 +0800
Subject: [PATCH 043/668] =?UTF-8?q?=E5=8F=AF=E5=8F=91=E9=80=81=E6=9D=83?=
 =?UTF-8?q?=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/models/attachment.rb                 |  5 ++++
 app/views/users/_resources_list.html.erb | 34 +++++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 72205fdc5..b7ec264fd 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -140,6 +140,11 @@ 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)
+  end
+
   # add by nwb
   # 公开的项目id列表
   def self.public_project_id
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 63ef92667..252798227 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -16,7 +16,7 @@
             <% end %>
           </li>
           <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
-            <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
                 <% 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) %>
@@ -39,6 +39,8 @@
           <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"><%= attach.get_apply_resource_status(attach.id, attach.author_id) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -87,19 +89,27 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
-                data:{send_type:'file'}
-            });
+        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){
+            alert('您无权发送私有资源')
         }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
-                data:{send_type:'file'}
-            });
+            if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+                $.ajax({
+                    type: 'get',
+                    url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
+                    data:{send_type:'file'}
+                });
+            }else{
+                $.ajax({
+                    type: 'get',
+                    url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
+                    data:{send_type:'file'}
+                });
+            }
         }
+
     }
 
     function batch_send(){

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 044/668] =?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 045/668] =?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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 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;}
+.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;}
-.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;}
 .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 046/668] =?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 047/668] =?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 1402f2076a91b49bd5c71abce7072159cf0ff5d2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 16:53:22 +0800
Subject: [PATCH 048/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_apply_resource_course_message.html.erb | 15 ++++++++++++---
 .../_apply_resource_course_message_reply.html.erb | 13 +++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 4dbec8127..fd493daf2 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,9 +9,18 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
-  </a>
+  <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
+  <% if ma.course_message.container_type == "Course" %>
+      <%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% elsif ma.course_message.container_type == "Project" %>
+      <%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% elsif ma.course_message.container_type == "OrgSubfield" %>
+      <%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% else %>
+      <a title="<%= show_content %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+        <%= show_content %>
+      </a>
+  <% end %>
 </li>
 
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
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 7cf246c53..617ee53c3 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -14,6 +14,19 @@
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
+    <% if ma.course_message.container_type == "Course" %>
+        <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% elsif ma.course_message.container_type == "Project" %>
+        <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% elsif ma.course_message.container_type == "OrgSubfield" %>
+        <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% else %>
+        <a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+          <%= link_str %>
+        </a>
+    <% end %>
+
+
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
   </a>
   </li>

From e0370e3e32409a0e86c3242994ff973925726fa8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 17:04:46 +0800
Subject: [PATCH 049/668] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b0194a2d8..5148f3318 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2199,6 +2199,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]

From f806dbf587dd20d910b251ed658a7e5d26803b9b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 17:12:33 +0800
Subject: [PATCH 050/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=87=B3=E7=BB=84=E7=BB=87=E5=92=8C=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5148f3318..d86ce379b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2058,6 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2340,6 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25

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 051/668] =?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 92f55e0dc159f4be2ce5adfbd7914ddb9f06335f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:02:59 +0800
Subject: [PATCH 052/668] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BA=95=E9=83=A8=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=8F=91=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d86ce379b..6c5cbd390 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1942,7 +1942,7 @@ class UsersController < ApplicationController
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
     @flag = true
-    if  params[:send_id].present?
+    if params[:send_id].present?
       send_id  = params[:send_id]
       @ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
@@ -1989,14 +1989,14 @@ class UsersController < ApplicationController
       end
       send_ids.each do |send_id|
         quotes = 0
-        ori = Attachment.find_by_id(send_id)
+        @ori = Attachment.find_by_id(send_id)
         unless course_ids.nil?
           course_ids.each do |id|
             quotes = 0
-            next if ori.blank?
+            next if @ori.blank?
             @exist = false
             Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-              if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+              if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
                 att.created_on = Time.now
                 att.save
                 @exist = true
@@ -2004,21 +2004,21 @@ class UsersController < ApplicationController
               end
             end
             next if @exist
-            attach_copied_obj = ori.copy
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj = @ori.copy
+            attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
             attach_copied_obj.container = Course.find(id)
             attach_copied_obj.created_on = Time.now
             attach_copied_obj.author_id = User.current.id
             attach_copied_obj.is_public = 0
-            attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+            attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
             if attach_copied_obj.attachtype == nil
               attach_copied_obj.attachtype = 4
             end
             if attach_copied_obj.save
               # 更新引用次数
-              quotes = ori.quotes.to_i + 1
-              ori.update_attribute(:quotes, quotes) unless ori.nil?
-              ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+              quotes = @ori.quotes.to_i + 1
+              @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+              @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
             @save_message = attach_copied_obj.errors.full_messages
           end

From 80f829c0187cb9b0cbe630a7a875ca3a8e5657e0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:48:17 +0800
Subject: [PATCH 053/668] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 2 +-
 app/views/organizations/teachers.html.erb   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c94f734e1..62876d757 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -164,7 +164,7 @@ class OrganizationsController < ApplicationController
       return
     end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
-    @field = OrgSubfield.find(params[:org_subfield_id])
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comptec").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type == "courses" || @type.nil?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index c368adef7..dac36f7a5 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -9,8 +9,7 @@
 </div>
 <div class="resources mt10">
   <div class="function-row" id="org_teacher_search">
-    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
-                  :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'teachers', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
         <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->

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 054/668] =?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 055/668] =?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 0d8d2939b33d4376f4e0fd54bd340a4e4b8fe51b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 12:43:47 +0800
Subject: [PATCH 056/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8D=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E4=B8=8D=E8=83=BD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 252798227..3397d5929 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,7 +6,11 @@
     <% 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">
-            <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" />
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+                <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" />
+            <% end %>
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">

From f18c3ed6679d88e63314b700914e2f3d5e99e450 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 13:37:18 +0800
Subject: [PATCH 057/668] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E6=B7=BB=E5=8A=A0=E2=80=9D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E2=80=9C=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_new_upload.html.erb    | 3 +++
 app/views/users/_user_resource_info.html.erb | 4 +++-
 app/views/users/user_resource.js.erb         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_show_new_upload.html.erb

diff --git a/app/views/users/_show_new_upload.html.erb b/app/views/users/_show_new_upload.html.erb
new file mode 100644
index 000000000..b343aeae1
--- /dev/null
+++ b/app/views/users/_show_new_upload.html.erb
@@ -0,0 +1,3 @@
+<% if @type != "2" %>
+    <div class="resourcesUploadBox mt10" ><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+<% end %>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 950dcd6f5..1e3cd508c 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,5 +1,7 @@
 <div id="users_setting">
-  <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+  <div id="upload_private_resource">
+     <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
+  </div>
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>
   </div>
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 2fa0035b2..758b8c2f0 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -2,6 +2,7 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_searc
 $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>');
 $("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);

From 352b40dd9689eac02220d220ce3104183f17dac4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 13:52:39 +0800
Subject: [PATCH 058/668] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6c5cbd390..20ed22f9e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2836,7 +2836,7 @@ class UsersController < ApplicationController
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type].blank? || params[:type] == "1") # 我的资源
+    if( params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
         @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
@@ -2850,7 +2850,7 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "6" # 公共资源
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"

From 004c48b456ccc5e74c7244613528cbcf809d0b2e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 14:16:45 +0800
Subject: [PATCH 059/668] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=87=B3=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B9=E7=9B=AE=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/add_exist_file_to_course.js.erb  | 5 ++++-
 app/views/users/add_exist_file_to_project.js.erb | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 8db83aefc..880bd2877 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,7 +1,10 @@
 <% if @flag == true%>
-$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user => @user, :type => @type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 4c24f4932..5690a0f88 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,7 +1,10 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);

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 060/668] =?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 061/668] =?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 b1e0618742b70e5feb3ade5ebf8ff9b633a67389 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:05:04 +0800
Subject: [PATCH 062/668] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 20ed22f9e..1b4fcd499 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2894,8 +2894,7 @@ class UsersController < ApplicationController
   # 导入资源
   def import_resources
     # 别人的资源库是没有权限去看的
-    @user = User.find_by_login(params[:id])
-    if User.current != @user
+    if User.current.id != params[:id].to_i
       render_403
       return
     end

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 063/668] =?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            | 213 +++++++++---------
 app/views/student_work/_show.html.erb         | 196 ++++++++--------
 .../student_work/_student_work_list.html.erb  |  11 -
 public/stylesheets/courses.css                |   4 +
 public/stylesheets/public.css                 |   3 +
 17 files changed, 843 insertions(+), 457 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")  %>
-        </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} %>
+    <div class="show_hwork_arrow"></div>
+    <div class="showHwork">
+      <ul>
+        <li class="fl" >
+          <span class="tit_fb">上交时间：</span>
+          <%=format_time work.created_at %>
         </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>
+          <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>
-            <% else %>
-                <div class="ProResultTable " >
-                  <ul class="ProResultUl " >
+                <% 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>
 
-                    <% 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>
+                                  <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_red">测试错误！</span>
+                                  <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 %>
-                              <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>
+                            </li>
                           <% end %>
-                        </li>
-                      <% end %>
-                    <% end %>
-                  </ul>
-                </div>
+                        <% end %>
+                      </ul>
+                    </div>
+                <% end %>
             <% 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>
+        </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>
+      <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%>
-    <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>
+      <% 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%>
-      <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>
+      <% 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>
-  </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>-->
 
-  <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}%>
+      <% 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>
-    <% end%>
+        <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>
+
+    <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="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 dddd7e0ea223cfd20689bc36a2346bdb104eb4ab Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:28:09 +0800
Subject: [PATCH 064/668] =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 2 ++
 app/views/repositories/show.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 4a148bb8b..531f0cb90 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -362,6 +362,8 @@ update
       # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
+      # REDO:需优化，仅测试用
+      @zip_path = gitlab_address.to_s + "/api/v3/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=YTyCv4978MXmdL2B9C62"
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 276283e97..43be57760 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,7 +1,7 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
-  <!--<a href="javascript:void(0);" class="btn_zipdown fr" onclick="">ZIP下载</a>-->
+  <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
 
 </div>
 <div class="repository_con" style="line-height:1.9;">

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 065/668] =?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>";
-            }
-            else{
-                var reStr =  "<a target='_Blank' href="+"'http://"+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);
             }
-            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 5114c12c17cb0ea55ddb8fe4f36e437ce1623d90 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:34:35 +0800
Subject: [PATCH 066/668] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=B8=BA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index cf94da8d9..7ec796b61 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -256,6 +256,13 @@ class FilesController < ApplicationController
     @order = ""
     @is_remote = false
     if params[:project_id]
+      # 更新资源申请消息为已读
+      # ar_ids = ApplyResource.where("user_id =? and container_id =? and container_type =?", User.current.id, params[:project_id].to_i, "Project").map{|ar| ar.id}
+      # cms = CourseMessage.where("course_message_type =? and user_id =? and course_message_id in (#{ar_ids.empty? ? '0': ar_ids.join(',')})", "ApplyResource", User.current.id)
+      # cms.each do |cm|
+      #   cm.update_column(:viewed, true)
+      # end
+      # over
       @page = params[:page] ? params[:page].to_i + 1 : 2
       @container_type = 0
       if params[:sort]

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 067/668] =?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 ef1a5d32f277d8e75569a810560fbd447bd43403 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 16:18:23 +0800
Subject: [PATCH 068/668] =?UTF-8?q?=E9=A1=B6=E7=AB=AF=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css   | 4 ++--
 public/stylesheets/new_user.css | 4 ++--
 public/stylesheets/public.css   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 096dd7e57..767d76cb2 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -1,8 +1,8 @@
 /*新个人主页框架css*/
-.navContainer {width:100%; background-color:#269ac9;}
+.navContainer {width:100%; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 44e64e9ab..6082021af 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -537,10 +537,10 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#269ac9;}
+.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 8489b0fa1..ae77f380d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -504,10 +504,10 @@ a.uploadIcon {background:url(../images/resource_icon_list.png) 8px -60px no-repe
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#269ac9;}
+.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px; display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}

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 069/668] =?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 070/668] =?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 071/668] =?UTF-8?q?=E5=B0=86KE=E7=9A=84newlineTag=EF=BC=9A?=
 =?UTF-8?q?'br'=20=E6=94=B9=E4=B8=BA'p',=E6=96=B9=E4=BE=BF=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=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 072/668] =?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 073/668] =?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 074/668] =?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 075/668] =?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 076/668] =?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 077/668] =?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 078/668] =?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 079/668] =?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 080/668] =?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 081/668] =?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 082/668] =?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 083/668] =?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 084/668] =?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 085/668] =?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 086/668] =?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
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
Xz08CkL8tv=#s=QLQIoHdHGBVmi>8p(

literal 4259
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

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
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

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 087/668] =?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 088/668] =?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 089/668] =?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 090/668] =?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 091/668] =?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 092/668] =?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 093/668] =?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 094/668] =?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 095/668] =?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 096/668] =?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">

From 103af96ac2876e4bdce63fcbd15553ee669c4dc1 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Mon, 23 May 2016 10:26:17 +0800
Subject: [PATCH 097/668] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=ADgif=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 447365c35..7737a46dc 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -406,7 +406,7 @@ app.directive('loadingSpinner', function ($http) {
     return {
         restrict: 'A',
         replace: true,
-        template: '<div class="loading-bg"><div class="loading-box"><img src="/images/wechat/loading.gif" alt=""/><span>加载中...</span></div></div>',
+        template: '<div class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
         link: function (scope, element, attrs) {
 
             scope.$watch('activeCalls', function (newVal, oldVal) {

From 820e594fecac9249a7c4c6b65f8a8d7fe6b2b55b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 23 May 2016 10:53:49 +0800
Subject: [PATCH 098/668] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 30 +++++++++----------
 .../_homework_repository_detail.html.erb      | 10 +++----
 app/views/users/show_homework_detail.js.erb   |  2 +-
 app/views/users/user_homework_type.js.erb     |  2 +-
 app/views/users/user_homeworks.html.erb       |  2 +-
 app/views/users/user_homeworks.js.erb         |  2 +-
 app/views/users/user_search_homeworks.js.erb  |  2 +-
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 52fdad2e7..1a6bc4f1b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -727,21 +727,21 @@ class UsersController < ApplicationController
   end
 
   def show_homework_detail
-    homework = HomeworkCommon.find params[:homework].to_i
-    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user
-      ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i)
-      if ah.empty?
-        @status = 2
-        @homework = nil
-      elsif ah.first.status != 2
-        @status = ah.first.status
-        @homework = nil
-      elsif ah.first.status == 2
-        @homework = homework
-      end
-    else
-      @homework = homework
-    end
+    @homework = HomeworkCommon.find params[:homework].to_i
+    # if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user
+    #   ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i)
+    #   if ah.empty?
+    #     @status = 2
+    #     @homework = nil
+    #   elsif ah.first.status != 2
+    #     @status = ah.first.status
+    #     @homework = nil
+    #   elsif ah.first.status == 2
+    #     @homework = homework
+    #   end
+    # else
+    #   @homework = homework
+    # end
     @is_import = params[:is_import]
     respond_to do |format|
       format.js
diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb
index cf04e16cb..103ca515f 100644
--- a/app/views/users/_homework_repository_detail.html.erb
+++ b/app/views/users/_homework_repository_detail.html.erb
@@ -1,7 +1,7 @@
 <div class="subjectDetail fl mt10">
   <div class="subjectInfo">题目信息</div>
   <div class="subject-content-wrapper">
-    <% if homework.nil? && status == 0 %>
+    <% if homework.nil? %>
         <span id="homework_notice_span"><span class="center db">本题库遵循创作共用许可证</span><br>
 
 教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：<br/><br/>
@@ -14,14 +14,14 @@
 
 对此许可证的支持或反对，请在网站中留言，我们不断完善，谢谢！
 </span>
-    <% elsif homework.nil? && status == 1 %>
+   <!-- <%# elsif homework.nil? && status == 1 %>
         <span class="c_red">您选中的作业目前为私有作业，您的分享请求已发送至老师，请耐心等待老师的同意。</span>
-    <% elsif homework.nil? && status == 2 %>
+    <%# elsif homework.nil? && status == 2 %>
         <span class="c_red">您选中的作业目前为私有作业，请点击“请求分享”按钮向题目的作者发送分享请求吧！<br/>
             祝您成功：）
         </span>
-    <% elsif homework.nil? && status == 3 %>
-        <span class="c_red">您选中的作业目前为私有作业，您的分享请求已被老师拒绝，暂时不可查看作业详情。</span>
+    <%# elsif homework.nil? && status == 3 %>
+        <span class="c_red">您选中的作业目前为私有作业，您的分享请求已被老师拒绝，暂时不可查看作业详情。</span>-->
     <% else %>
         <div class="subjectIntro mb15">标题：<%=homework.name %><br />
           来源：<%=homework.course.name %><br />
diff --git a/app/views/users/show_homework_detail.js.erb b/app/views/users/show_homework_detail.js.erb
index c005eabad..a5dd82453 100644
--- a/app/views/users/show_homework_detail.js.erb
+++ b/app/views/users/show_homework_detail.js.erb
@@ -1,5 +1,5 @@
 <% if @is_import.to_i == 1 %>
     $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>");
 <% else %>
-    $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework,:status=>@status}) %>");
+    $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework}) %>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/user_homework_type.js.erb b/app/views/users/user_homework_type.js.erb
index 83c1761e3..8cfb4dc04 100644
--- a/app/views/users/user_homework_type.js.erb
+++ b/app/views/users/user_homework_type.js.erb
@@ -6,7 +6,7 @@ $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homewor
 <% else %>
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>''})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
 $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_repository_search', :locals=>{:type=>@type,:is_import=>@is_import,:property=>@property}) %>");
 $("#homework_type_all").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>');
 $("#homework_type_nor").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>');
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 86939b510..6197aa9c4 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -71,7 +71,7 @@
           <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
         </div>
         <div id="homework_repository_detail">
-          <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil, :status => 0} %>
+          <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
         </div>
         <div class="cl"></div>
         <div>
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb
index 5579d8a92..ce1bb65e2 100644
--- a/app/views/users/user_homeworks.js.erb
+++ b/app/views/users/user_homeworks.js.erb
@@ -1,4 +1,4 @@
 /*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
diff --git a/app/views/users/user_search_homeworks.js.erb b/app/views/users/user_search_homeworks.js.erb
index 807dcc7d0..29d490960 100644
--- a/app/views/users/user_search_homeworks.js.erb
+++ b/app/views/users/user_search_homeworks.js.erb
@@ -5,5 +5,5 @@ $("#homework_detail_information").html("<%=escape_javascript(render :partial =>
 <% else %>
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>@search})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
 <% end %>
\ No newline at end of file

From a60356091bf5291a0d36bc31b508552639ed9ea3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 11:02:21 +0800
Subject: [PATCH 099/668] =?UTF-8?q?issue=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8Btag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_detail.html.erb       | 10 +++++-----
 app/views/users/_project_issue.html.erb | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index 03c420c99..ec9a0bc54 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -6,15 +6,15 @@
     <p class="pro_page_tit" style="word-break:break-all;">
       <% case @issue.tracker_id %>
       <% when 1%>
-          <span class="issues fl" title="缺陷"></span>
+          <span class="fl" title="缺陷">【缺陷】</span>
       <% when 2%>
-          <span class="issues-function fl" title="功能"></span>
+          <span class="fl" title="功能">【功能】</span>
       <% when 3%>
-          <span class="support fl" title="支持"></span>
+          <span class="fl" title="支持">【支持】</span>
       <% when 4%>
-          <span class="duty fl" title="任务"></span>
+          <span class="fl" title="任务">【任务】</span>
       <% when 5%>
-          <span class="weekly fl" title="周报"></span>
+          <span class="fl" title="周报">【周报】</span>
       <% end %>
       </span> <span style="padding-left: 5px;"><%= @issue.subject %></span>
       <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 4b13850de..d8714400d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -38,16 +38,16 @@
       </div>
       <div class="homepagePostTitle break_word">
         <% case activity.tracker_id %>
-          <% when 1%>
-            <span class="issues fl" title="缺陷"></span>
+        <% when 1%>
+            <span class="fl" title="缺陷">【缺陷】</span>
         <% when 2%>
-            <span class="issues-function fl" title="功能"></span>
+            <span class="fl" title="功能">【功能】</span>
         <% when 3%>
-            <span class="support fl" title="支持"></span>
+            <span class="fl" title="支持">【支持】</span>
         <% when 4%>
-            <span class="duty fl" title="任务"></span>
+            <span class="fl" title="任务">【任务】</span>
         <% when 5%>
-            <span class="weekly fl" title="周报"></span>
+            <span class="fl" title="周报">【周报】</span>
         <% end %>
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey ml5" %>
         <span class='<%= get_issue_priority(activity.priority_id)[0] %>'>
@@ -100,4 +100,4 @@
     $(function(){
         user_card_show_hide();
     });
-</script>
+</script>

From 2afce9d56380706f57b889b450e5304698a0936b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 23 May 2016 14:05:28 +0800
Subject: [PATCH 100/668] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E7=94=B3=E8=AF=B7=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_user_homeworks.html.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index 7e9df7f4d..46e075412 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -3,6 +3,8 @@
   <div class="subject-list fl mr10">
     <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">公共题库</a>
     <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">我的题库</a>
+    <!--<a href="<%#= user_homework_type_user_path(@user,:type=>'3',:is_import => 1) %>" id="apply_homeworks_choose" class="resource-tab fl" data-remote="true">申请题库</a>-->
+
     <div id="homework_search_input">
         <%=render :partial=>'homework_search_input', :locals=>{:type => @type,:is_import => 1} %>
     </div>
@@ -43,11 +45,18 @@
 </div>
 <script type="text/javascript">
     $("#public_homeworks_choose").click(function(){
-        $(this).toggleClass("resource-tab-active");
-        $("#user_homeworks_choose").toggleClass("resource-tab-active");
+        $(this).addClass("resource-tab-active");
+        $("#user_homeworks_choose").removeClass("resource-tab-active");
+        //$("#apply_homeworks_choose").removeClass("resource-tab-active");
     });
     $("#user_homeworks_choose").click(function(){
-        $(this).toggleClass("resource-tab-active");
-        $("#public_homeworks_choose").toggleClass("resource-tab-active");
+        $(this).addClass("resource-tab-active");
+        $("#public_homeworks_choose").removeClass("resource-tab-active");
+        //$("#apply_homeworks_choose").removeClass("resource-tab-active");
     });
+//    $("#apply_homeworks_choose").click(function(){
+//        $(this).addClass("resource-tab-active");
+//        $("#public_homeworks_choose").removeClass("resource-tab-active");
+//        $("#user_homeworks_choose").removeClass("resource-tab-active");
+//    });
 </script>

From 6586dfaf916fc57cfd080080043555b82452d9df Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 23 May 2016 14:47:10 +0800
Subject: [PATCH 101/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=8D=E5=88=B6=E7=9A=84=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E6=88=96=E5=AD=A6=E5=8F=B7=E6=88=96=E9=82=AE=E7=AE=B1=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=8C=85=E5=90=AB=E7=A9=BA=E6=A0=BC=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8D=E5=88=B0=E7=9B=B8=E5=85=B3=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index f518f81da..dd178a1ce 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -374,7 +374,7 @@ class StudentWorkController < ApplicationController
       end
     end
     ##################################################################################################################
-    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
+    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name].to_s.strip || "",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?

From d70f42b4137d51b8c46d0d71052bb3e134868a76 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 15:03:22 +0800
Subject: [PATCH 102/668] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=E5=BC=82=E6=AD=A5=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=EF=BC=88=E6=B5=8B=E8=AF=95=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/news.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/news.rb b/app/models/news.rb
index a411ccaca..7131969a4 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -163,13 +163,13 @@ class News < ActiveRecord::Base
     end
   end
 
-  #课程/项目通知 消息发送
-  #消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
+  # 课程/项目通知 消息发送
+  # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
   def act_as_system_message
     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.delay.send_message(m.user_id, self.course_id)
           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
@@ -189,6 +189,10 @@ class News < ActiveRecord::Base
     end
   end
 
+  def send_message user_id, course_id
+    self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false)
+  end
+
   # Time 2015-03-31 13:50:54
   # Author lizanle
   # Description 删除news后删除对应的资源

From 5eff3db9e877e874589d6c936089937cb2950c85 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 23 May 2016 15:58:32 +0800
Subject: [PATCH 103/668] =?UTF-8?q?1.=E9=97=AE=E7=AD=94=E5=8C=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8FBUG=E4=BF=AE=E5=A4=8D=E3=80=81?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=81=E5=8F=91=E8=B4=B4=E4=BA=BA=E6=94=BE=E5=B7=A6=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92=E3=80=81=E5=86=85=E5=AE=B9=E6=88=AA=E6=96=AD=E4=B8=80?=
 =?UTF-8?q?=E7=82=B9=202.KE=E7=BC=96=E8=BE=91=E5=99=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=97=B6=E9=9C=80=E6=9C=89=E4=B8=80=E7=82=B9?=
 =?UTF-8?q?=E4=B8=8B=E8=BE=B9=E8=B7=9D=203.KE=E4=B8=AD=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=AE=B5=E8=90=BD=E6=98=BE=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E6=9C=89=E9=A2=9C=E8=89=B2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_subfield_leftMD.html.erb             | 20 +++++++++----------
 app/views/users/_course_boardlist.html.erb    | 11 +++++-----
 app/views/users/_course_newslist.html.erb     |  9 ++++-----
 app/views/users/_intro_content_ex.html.erb    |  5 +++++
 app/views/users/_project_boardlist.html.erb   | 11 +++++-----
 app/views/users/_user_course_list.html.erb    |  2 +-
 public/javascripts/create_kindeditor.js       |  2 +-
 public/stylesheets/public.css                 |  8 ++++----
 public/stylesheets/public_new.css             |  6 +++---
 9 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index d0439439a..afa7d0716 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -28,7 +28,7 @@
                               <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -50,7 +50,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -67,7 +67,7 @@
                               <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -130,7 +130,7 @@
                               <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -151,7 +151,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -168,7 +168,7 @@
                               <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank"  %>
@@ -214,7 +214,7 @@
                               <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
@@ -244,7 +244,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
@@ -264,7 +264,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
@@ -285,7 +285,7 @@
                                 </h3>
                                 <div class="resources-tagbox">
                                   <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
-                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
+                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28, :maxwidth=>0} %>
                                 </div>
                                 <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
                               </div>
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index bf23d9a97..5cb2c27a7 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></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">
+                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></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 0e5805112..87dbe6b95 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -24,16 +24,15 @@
                       <span class="fl ml10 red-cir-btn">顶</span>
                   <% end%>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">
+                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </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 %>
diff --git a/app/views/users/_intro_content_ex.html.erb b/app/views/users/_intro_content_ex.html.erb
index e3baf3fe2..082d0cb94 100644
--- a/app/views/users/_intro_content_ex.html.erb
+++ b/app/views/users/_intro_content_ex.html.erb
@@ -12,6 +12,11 @@
             $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
         }
 
+        var maxWidth = <%= maxwidth %>
+        if (maxWidth > 0) {
+            $("#intro_content_<%= user_activity_id%>").css("max-width", maxWidth + "px");
+        }
+
         description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>);
     });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index 25fd675fb..fe7bc03f2 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10 f12">
-                  <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">
+                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></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 5e3f48963..ea8f3fc40 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -24,7 +24,7 @@
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-                </span>
+                  </span>
               </li>
               <div class="cl"></div>
                 <li class="ml15">
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index 2ff5336e1..d6fc52a8d 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -25,7 +25,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2ca221d5c..c7fa7d60c 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -24,9 +24,9 @@ table{ background:#fff;}
 a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 .db {display:block;}
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
-h3{ font-size:14px; color:#e8770d;}
-h4{ font-size:14px; color:#3b3b3b;}
+h2{ font-size:18px; }
+h3{ font-size:14px; }
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}
@@ -1139,4 +1139,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .likeNum{color: #7f7f7f}
 
 /*弹框*/
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 56c867829..ec0290918 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -22,9 +22,9 @@ table{ background:#fff;}
 .none{display: none;}
 
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
-h3{ font-size:14px; color:#e8770d;}
-h4{ font-size:14px; color:#3b3b3b;}
+h2{ font-size:18px; }
+h3{ font-size:14px; }
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}

From a3abf098419e77605be9b5f152553d2fef30b6f9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 16:04:06 +0800
Subject: [PATCH 104/668] =?UTF-8?q?delayjob=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/news.rb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/models/news.rb b/app/models/news.rb
index 7131969a4..beb58799f 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -167,17 +167,7 @@ class News < ActiveRecord::Base
   # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
   def act_as_system_message
     if self.course
-      self.course.members.each do |m|
-        if m.user_id != self.author_id
-          self.delay.send_message(m.user_id, self.course_id)
-          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
-            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)}", content, format_time(self.created_on)
-          end
-        end
-      end
+      self.delay.send_message
     else
       if !self.project.nil?
         self.project.members.each do |m|
@@ -189,8 +179,19 @@ class News < ActiveRecord::Base
     end
   end
 
-  def send_message user_id, course_id
-    self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false)
+  def send_message
+    self.course.members.each do |m|
+      if m.user_id != self.author_id
+        self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_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
+          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)}", content, format_time(self.created_on)
+        end
+      end
+    end
   end
 
   # Time 2015-03-31 13:50:54

From 0e03798f6e8f2075fae224089f3f39bdade47b56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 16:24:32 +0800
Subject: [PATCH 105/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=88yeild=EF=BC=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb  |   2 +-
 app/views/layouts/base_org2.html.erb         |  38 +-----
 app/views/organizations/_show_type2.html.erb |  33 +++++
 app/views/organizations/show.html.erb        | 122 ++++++++++---------
 4 files changed, 102 insertions(+), 93 deletions(-)
 create mode 100644 app/views/organizations/_show_type2.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 3ab62bbea..2ab724728 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.switch_type && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         # REDO:时间紧，暂时先这样
         @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 799aaa42b..e51a62e24 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -14,7 +14,7 @@
   <%= javascript_include_tag 'attachments' %>
   <%#= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
-  <%#= yield :header_tags -%>
+  <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
@@ -130,39 +130,9 @@
 <%# over %>
 <!--内容开始-->
 <div class="sn-content">
-<div class="sn-content-left fl sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 1 %>
-          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
-          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
-            <div class="cl"></div>
-          </div>
-      <% elsif field.status.to_i == 4 %>
-          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 5 %>
-          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<!--右侧-->
-<div class="sn-content-right fr sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 6 %>
-          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 7 %>
-          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 8 %>
-          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 23 %>
-          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<div class="cl"></div>
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
 </div>
 <!--内容结束-->
 <footer>
diff --git a/app/views/organizations/_show_type2.html.erb b/app/views/organizations/_show_type2.html.erb
new file mode 100644
index 000000000..eba77174c
--- /dev/null
+++ b/app/views/organizations/_show_type2.html.erb
@@ -0,0 +1,33 @@
+<div class="sn-content-left fl sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="sn-content-right fr sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 7 %>
+          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 8 %>
+          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 23 %>
+          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index d93ead84b..db3849de9 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,66 +1,71 @@
-<%= javascript_include_tag "jquery.infinitescroll.js" %>
+<%# 区分两种模式 %>
+<% if @organization.switch_type %>
+    <%= render :partial => 'show_type2' %>
+<% else %>
+    <%= javascript_include_tag "jquery.infinitescroll.js" %>
 
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
-<% end %>
+    <%= content_for(:header_tags) do %>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <% end %>
 
-<% if params[:show_homepage].nil? and User.current.logged? %>
-    <div class="homepageRightBanner">
-      <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
-      <% if params[:org_subfield_id].nil? %>
-          <ul class="resourcesSelect">
-            <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-              <ul class="homepagePostType">
-                <li>
-                  <ul class="homepagePostTypeHomework fl">
-                    <li class="f14">课程动态</li>
-                    <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                      <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-                    <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                    <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-                  </ul>
-                </li>
-                <li>
-                  <ul class="homepagePostTypeProject fl">
-                    <li class="f14">项目动态</li>
-                    <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-                      <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                  </ul>
-                </li>
-                <li>
-                  <ul class="homepagePostTypeProject fl">
-                    <li class="f14">更多</li>
-                    <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-                    <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+    <% if params[:show_homepage].nil? and User.current.logged? %>
+        <div class="homepageRightBanner">
+          <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+          <% if params[:org_subfield_id].nil? %>
+              <ul class="resourcesSelect">
+                <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+                  <ul class="homepagePostType">
+                    <li>
+                      <ul class="homepagePostTypeHomework fl">
+                        <li class="f14">课程动态</li>
+                        <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                          <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                        <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                        <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                        <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+                      </ul>
+                    </li>
+                    <li>
+                      <ul class="homepagePostTypeProject fl">
+                        <li class="f14">项目动态</li>
+                        <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+                        <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+                          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                      </ul>
+                    </li>
+                    <li>
+                      <ul class="homepagePostTypeProject fl">
+                        <li class="f14">更多</li>
+                        <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                        <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+                      </ul>
+                    </li>
                   </ul>
                 </li>
               </ul>
-            </li>
-          </ul>
-      <% end %>
-    </div>
-<% end %>
-<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
-    <script>
-        $(function() {
-            sd_create_editor_from_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "100%", 'OrgActivity');
-        });
-    </script>
-    <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-    <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
-<% end  %>
-<% if @org_activities %>
-    <%= render :partial =>  'organizations/org_activities',
-               :locals => {:org_activities => @org_activities,
-                           :page=> @page,
-                           :org => @organization,
-                           :org_act_count=> @org_activities.count} %>
+          <% end %>
+        </div>
+    <% end %>
+    <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
+        <script>
+            $(function() {
+                sd_create_editor_from_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "100%", 'OrgActivity');
+            });
+        </script>
+        <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
+        <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
+    <% end  %>
+    <% if @org_activities %>
+        <%= render :partial =>  'organizations/org_activities',
+                   :locals => {:org_activities => @org_activities,
+                               :page=> @page,
+                               :org => @organization,
+                               :org_act_count=> @org_activities.count} %>
+    <% end %>
 <% end %>
 
 
@@ -70,3 +75,4 @@
 
 
 
+

From e62a4cc64632a8985bc73c84679a4210aa8cdfbc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 23 May 2016 16:29:38 +0800
Subject: [PATCH 106/668] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/wechat_service.rb | 12 ++++++------
 config/menu.yml                |  2 +-
 config/wechat.yml              |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index 1dcd147d4..ee45c99dc 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -5,7 +5,7 @@ class WechatService
     data = {
         touser:openid,
         template_id:template_id,
-        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
         topcolor:"#FF0000",
         data:{
             first: {
@@ -44,7 +44,7 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def topic_publish_template(user_id, type, id, first, key1, key2, key3, remark="")
@@ -59,7 +59,7 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def comment_template(user_id,type, id, first, key1, key2, key3, remark="")
@@ -74,7 +74,7 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def message_update_template(user_id, type, id, first, key1, key2, remark="")
@@ -83,7 +83,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:"YTyNPZnQD8uZFBFq-Q6cCOWaq5LA9vL6RFlF2JuD5Cg",
-          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
           topcolor:"#FF0000",
           data:{
               first: {
@@ -112,6 +112,6 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 end
\ No newline at end of file
diff --git a/config/menu.yml b/config/menu.yml
index 3951f836b..0c0e5c17d 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  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"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
diff --git a/config/wechat.yml b/config/wechat.yml
index 5b528487b..53141df40 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,8 +3,8 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key

From b1c70db28a83d9147bfabd3bcab148a2fd7ab7e8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 16:34:31 +0800
Subject: [PATCH 107/668] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/news.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/news.rb b/app/models/news.rb
index 7131969a4..877d799bf 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -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.delay.send_message(m.user_id, self.course_id)
+          # self.delay.send_message(m.user_id, self.course_id)
           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
@@ -189,9 +189,9 @@ class News < ActiveRecord::Base
     end
   end
 
-  def send_message user_id, course_id
-    self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false)
-  end
+  # def send_message user_id, course_id
+  #   self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false)
+  # end
 
   # Time 2015-03-31 13:50:54
   # Author lizanle

From e7d20c2b985ddbc1339e3eb7765d2e70b980f664 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 24 May 2016 09:11:50 +0800
Subject: [PATCH 108/668] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E5=8C=BA=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?URL=E5=8A=9F=E8=83=BD=202.=E6=89=80=E6=9C=89=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=86=E5=88=ABURL=E5=8C=BA=E5=9F=9F=E7=9A=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E9=A2=9C=E8=89=B2=E9=83=BD=E6=94=B9=E4=B8=BA#15bccf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb         |  3 +++
 app/views/courses/_history.html.erb           | 14 +++++++++++---
 app/views/projects/_history.html.erb          | 10 +++++++++-
 app/views/words/_journal_reply_items.html.erb | 17 ++++++++++++-----
 public/stylesheets/courses.css                |  8 ++++++--
 public/stylesheets/css.css                    |  2 +-
 public/stylesheets/new_user.css               |  4 ++++
 public/stylesheets/project.css                |  5 ++++-
 public/stylesheets/public.css                 |  2 ++
 9 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index d3763abf3..72c5dce1e 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -215,6 +215,9 @@
   $(function(){
       var postContent = $("#message_description_<%= @article.id %>").html();
       postContent = postContent.replace(/&nbsp;/g," ");
+      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
       $("#message_description_<%= @article.id %>").html(postContent);
       autoUrl('message_description_<%= @article.id %>');
   });
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 864509546..b93cbc3c6 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -15,9 +15,11 @@
                     <%= format_time(journal.created_on) %>
                   </span>
               <div class="cl"></div>
-              <p>
-                <%= journal.notes.html_safe %>
-              </p>
+              <div class = "ping_journal" id="journal_<%= journal.id %>">
+                  <p>
+                    <%= journal.notes.html_safe %>
+                  </p>
+              </div>
               <div class="cl"></div>
             </div>
             <div class="ping_disfoot f14">
@@ -49,6 +51,12 @@
           </div>
           <div class="cl"></div>
         </div>
+        <script type="text/javascript">
+            $(function(){
+                showNormalImage('journal_<%= journal.id %>');
+                autoUrl('journal_<%= journal.id %>');
+            });
+        </script>
     <% end %>
 <% end %>
 
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index b31445fdc..e8d08de3d 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -10,7 +10,9 @@
                   </span><span class="c_grey fr f14"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
-                  <p><%=journal.notes.html_safe%>
+                  <div class = "ping_journal" id="journal_<%= journal.id %>">
+                    <p><%=journal.notes.html_safe%></p>
+                  </div>
                 </div>
                 <div class="ping_disfoot f14">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
@@ -42,6 +44,12 @@
               </div>
               <div class="cl"></div>
             </div>
+            <script type="text/javascript">
+                $(function(){
+                    showNormalImage('journal_<%= journal.id %>');
+                    autoUrl('journal_<%= journal.id %>');
+                });
+            </script>
         <% end %>
     <% end %>
 
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index db848d2cd..e0d52479d 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -20,10 +20,11 @@
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>
-
-        <p>
-          <%= reply.notes.html_safe %>
-        </p>
+        <div id="reply_<%= reply.id %>">
+            <p>
+              <%= reply.notes.html_safe %>
+            </p>
+        </div>
         <div class="cl"></div>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
@@ -52,4 +53,10 @@
       </div>
       <div class="cl"></div>
     </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply__<%= reply.id %>');
+        autoUrl('reply_<%= reply.id %>');
+    });
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 08981ae54..7e64a27c2 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -139,6 +139,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
+.homepagePostTitle a{color: #15bccf;}
 .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;}
@@ -146,7 +147,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
-
+.homepagePostIntro a{color: #15bccf;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -188,6 +189,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyContent a{color: #15bccf;}
 .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;}
@@ -435,6 +437,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
 .ping_discon{ float:left; width:610px; margin-left:10px; }
+.ping_journal a{color: #15bccf;}
 /*.ping_distop span{ float:left;}*/
 .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;}
@@ -1131,7 +1134,8 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .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;}
+.postDetailDes a{color: #15bccf;}
 .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;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 3e21a5fda..74a9d9aaf 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -123,7 +123,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .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;}
-
+.ping_journal a{color: #15bccf;}
 
 /* 创建作业 */
 .Newwork{ width:940px; border:1px solid #c3c3c3;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 326d2897b..ba3afd79b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -673,6 +673,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
+.homepagePostTitle a{color: #15bccf;}
 .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;}
@@ -683,6 +684,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
+.homepagePostIntro a{color: #15bccf;}
 .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;}
@@ -722,6 +724,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .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;}
+.homepagePostReplyContent a{color: #15bccf;}
 .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;}
@@ -866,6 +869,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
+.postDetailDes a{color: #15bccf;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 09f7075f7..6baf0386d 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -332,6 +332,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .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_journal a{color: #15bccf;}
 /*.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: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
@@ -974,6 +975,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .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;}
+.homepagePostIntro a{color: #15bccf;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1114,7 +1116,8 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .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;}
+.postDetailDes a{color: #15bccf;}
 .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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c7fa7d60c..98fa11b99 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -611,6 +611,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
+.homepagePostIntro a{color: #15bccf;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -647,6 +648,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .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;}
+.homepagePostReplyContent a{color: #15bccf;}
 .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;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}

From 2a0b35a1b393252ba1ad45df76f55b959b3d1312 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 24 May 2016 09:38:49 +0800
Subject: [PATCH 109/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6=E9=9A=8F=E6=96=87=E5=AD=97=E5=A2=9E?=
 =?UTF-8?q?=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                                       |  2 +-
 public/assets/wechat/blog_detail.html         |  3 ++-
 public/assets/wechat/course_discussion.html   |  3 ++-
 public/assets/wechat/course_notice.html       |  3 ++-
 public/assets/wechat/homework_detail.html     |  3 ++-
 public/assets/wechat/issue_detail.html        |  3 ++-
 public/assets/wechat/jour_message_detail.html |  3 ++-
 public/assets/wechat/project_discussion.html  |  3 ++-
 public/javascripts/wechat/app.js              | 19 ++++++++++++++++++-
 public/stylesheets/weui/weixin.css            |  3 ++-
 10 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/1234567 b/1234567
index 3d4e13b55..f2f064de8 100644
--- a/1234567
+++ b/1234567
@@ -1 +1 @@
-{"access_token":"xAp1rQu0Xpv8CrlooZydXiyAQIqavONhB6FXnCl1Rw_nM-fyjUz-9foxqgkH2rPMwr5f1THUkzqxshoF3CZHjJM4CautpSlQ5e7MgkjF5-a8GB5gYCxtcdb5C1H2jyMgIOOcCGAPVV","expires_in":7200,"got_token_at":1463640239}
\ No newline at end of file
+{"access_token":"gRbIMUYYKFdANxpBGhYc8iauelCeSy3x7wODnZd1crF9upNiANKAdGaMKFLcgPz_0-oJvRtb7Ai0G1WnL_AnVV-tdRlzlCPpgpO9Z9k9EqrGz2iSLCAbQ35qk0f75KWlRRDfCEAVVH","expires_in":7200,"got_token_at":1464053170}
\ No newline at end of file
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 9f229699e..8473b1446 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -36,7 +36,8 @@
             <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">
-                    <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                    <textarea class="copy-input"></textarea>
+                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                 </div>
                 <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 6466e12b8..c790fd5cf 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -42,7 +42,8 @@
                 <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">
-                        <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
                     <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index c426f2794..18f62be1e 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -42,7 +42,8 @@
                 <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">
-                        <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
                     <button ng-click="addNoticeReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 1af5e185d..5efa7c54d 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -48,7 +48,8 @@
                 <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">
-                        <input type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment" />
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment"></textarea>
                     </div>
                     <button ng-click="addHomeworkReply(formData)" ng-disabled="formData.disabled" value="回复" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 950cbe18e..20c35c664 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -46,7 +46,8 @@
                 <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">
-                            <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                            <textarea class="copy-input"></textarea>
+                            <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                         </div>
                         <button ng-click="addIssueReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                         <div class="cl"></div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 29660e4fd..f9aebd632 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -34,7 +34,8 @@
             <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">
-                    <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                    <textarea class="copy-input"></textarea>
+                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                 </div>
                 <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 03fda04e5..0c3f9aad3 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -42,7 +42,8 @@
                 <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">
-                        <input type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" />
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
                     <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <div class="cl"></div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 7737a46dc..4c9ea260a 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -128,6 +128,7 @@ app.factory('common', function($http, auth, $routeParams){
             openid: auth.openid()
         };
 
+        //回复按钮禁用
         data.disabled = true;
 
         $http({
@@ -136,6 +137,7 @@ app.factory('common', function($http, auth, $routeParams){
             data: userInfo
         }).then(function successCallback(response) {
             alert("提交成功");
+            //数据提交完成,回复按钮启用
             data.disabled = false;
             if(typeof cb === 'function'){
                 cb();
@@ -402,6 +404,21 @@ app.directive('textAutoHeight', function($timeout){
     }
 });
 
+app.directive('inputAuto',function(){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+                var copyContainer = element.parent().children().eq(0);
+                element.on('input',function(){
+                    copyContainer.html(element[0].value);
+                    var textHeight = copyContainer[0].scrollHeight;
+                    element.css('height', textHeight + 'px');
+                });
+            }
+    }
+});
+
 app.directive('loadingSpinner', function ($http) {
     return {
         restrict: 'A',
@@ -459,7 +476,7 @@ app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProv
             redirectTo: '/activities'
         });
 
-        //监听异步请求
+        //监听异步请求,实现加载中显隐标记
         $httpProvider.interceptors.push(function ($q, $rootScope) {
             if ($rootScope.activeCalls == undefined) {
                 $rootScope.activeCalls = 0;
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 47610d4c5..64598e381 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -66,7 +66,8 @@ a.underline {text-decoration:underline;}
 .post-reply-content img {max-width:100%;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
 .post-input-container {padding-right:2px;}
-.post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;}
+.copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
+.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:hidden; resize:none;}
 .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
 .reply-icon {background:url(/images/wechat/wechat_icon.png) -100px 1px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/wechat_icon.png) -100px -38px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}

From ed7c6cbcfe62d37513f567eb517760f97e4a3b47 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 09:40:16 +0800
Subject: [PATCH 110/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=A2=9E=E5=87=8Fstatus=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb       |   1 +
 app/models/org_document_comment.rb            |   3 +-
 .../org_document_comments/_form.html.erb      |  34 ++
 app/views/org_document_comments/edit.html.erb |  29 --
 app/views/org_document_comments/new.html.erb  |  31 +-
 app/views/organizations/show.html.erb         |   4 +-
 db/schema.rb                                  | 436 +++++++++++++++++-
 7 files changed, 454 insertions(+), 84 deletions(-)
 create mode 100644 app/views/org_document_comments/_form.html.erb

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 82062d3dd..b012ba901 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -12,6 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id)
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
+    @org_document_comment.status = params[:org_document_comment][:status] == "on" ? 1 : 0
     @org_document_comment.save_attachments(params[:attachments])
     if params[:field_id]
       @org_document_comment.org_subfield_id = params[:field_id].to_i
diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb
index 5aa3c1dab..dd070c825 100644
--- a/app/models/org_document_comment.rb
+++ b/app/models/org_document_comment.rb
@@ -1,5 +1,6 @@
 class OrgDocumentComment < ActiveRecord::Base
-  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked
+  # status: 1 模式二中置顶 0：模式二中正常显示
+  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title, :sticky, :locked, :status
   include Redmine::SafeAttributes
   include ApplicationHelper
   belongs_to :organization
diff --git a/app/views/org_document_comments/_form.html.erb b/app/views/org_document_comments/_form.html.erb
new file mode 100644
index 000000000..502da97ad
--- /dev/null
+++ b/app/views/org_document_comments/_form.html.erb
@@ -0,0 +1,34 @@
+<div>
+  <input class="postDetailInput fl mr15"  name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></input>
+</div>
+<div id="doc_title_hint">
+</div>
+<div class="cl"></div>
+<div class="" >
+  <div class="mt10">
+    <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+    <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+  </div>
+  <div class="cl"></div>
+  <p id="homework_course_id_span" class="c_red mt5"></p>
+  <p id="e_tip" class="c_grey"></p>
+  <p id="e_tips" class="c_grey"></p>
+  <div class="cl"></div>
+  <div class="f14 fontGrey2">置顶显示&nbsp;:
+    <input type="checkbox" id="is_public"   name="org_document_comment[status]" class="ml3" />（仅限模式二）
+  </div>
+  <div class="cl"></div>
+  <div class="mt10">
+    <div class="fl" id="topic_attachments">
+      <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
+    </div>
+  </div>
+  <div class="cl"></div>
+
+  <div class="mt5">
+    <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+    <span class="fr mr10 mt3">或</span>
+    <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+    <div class="cl"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index 5997482fb..a36397677 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -28,36 +28,7 @@
 <div>
   <div class="resources" nhname="new_topic_form">
       <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
-    <div>
-        <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
-      </div>
-      <div id="doc_title_hint"></div>
-      <div class="cl"></div>
-      <div>
-        <div class="mt10">
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
-          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
-        </div>
-        <div class="cl"></div>
 
-        <p id="homework_course_id_span" class="c_red mt5"></p>
-        <p id="e_tip" class="c_grey"></p>
-        <p id="e_tips" class="c_grey"></p>
-        <div class="cl"></div>
-
-        <div class="mt10">
-          <div class="fl" id="topic_attachments">
-            <%= render :partial => 'org_document_comments/attachment', :locals => {:container => @org_document} %>
-          </div>
-        </div>
-        <div class="cl"></div>
-        <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
-          <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
-          <div class="cl"></div>
-        </div>
-      </div>
     <% end %>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index cf4ffddcf..ed327dece 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -37,35 +37,6 @@
 </div>
 <div class="resources" nhname="new_topic_form" >
   <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
-    <div>
-        <input class="postDetailInput fl mr15"  name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></input>
-    </div>
-    <div id="doc_title_hint">
-    </div>
-    <div class="cl"></div>
-    <div class="" >
-      <div class="mt10">
-        <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
-        <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
-      </div>
-      <div class="cl"></div>
-      <p id="homework_course_id_span" class="c_red mt5"></p>
-      <p id="e_tip" class="c_grey"></p>
-      <p id="e_tips" class="c_grey"></p>
-      <div class="cl"></div>
-      <div class="mt10">
-        <div class="fl" id="topic_attachments">
-          <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
-        </div>
-      </div>
-      <div class="cl"></div>
-
-      <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
-            <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
-        <div class="cl"></div>
-      </div>
-    </div>
+     <%= render :partial => "form" %>
   <% end %>
 </div>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index db3849de9..c490efb85 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,5 +1,5 @@
-<%# 区分两种模式 %>
-<% if @organization.switch_type %>
+<%# 区分两种模式 params[:org_subfield_id] 不为空的时候则跳到栏目%>
+<% if @organization.switch_type && params[:org_subfield_id].nil? %>
     <%= render :partial => 'show_type2' %>
 <% else %>
     <%= javascript_include_tag "jquery.infinitescroll.js" %>
diff --git a/db/schema.rb b/db/schema.rb
index 9c4b4b333..7462c304e 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 => 20160519070718) do
+ActiveRecord::Schema.define(:version => 20160523085440) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -77,6 +99,18 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
   create_table "at_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "at_message_id"
@@ -144,6 +178,20 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -241,6 +289,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -540,6 +599,10 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "visits",                        :default => 0
   end
 
+  add_index "courses", ["id"], :name => "id", :unique => true
+  add_index "courses", ["tea_id"], :name => "tea_id"
+  add_index "courses", ["visits"], :name => "visits"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -601,6 +664,15 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -650,6 +722,16 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -672,6 +754,25 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -774,6 +875,15 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -903,6 +1013,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1046,6 +1167,20 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1057,6 +1192,27 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1107,23 +1263,47 @@ ActiveRecord::Schema.define(:version => 20160519070718) 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
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1158,6 +1338,39 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1183,6 +1396,31 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1192,6 +1430,49 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1282,6 +1563,7 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.boolean  "locked",          :default => false
     t.integer  "sticky",          :default => 0
     t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
   end
 
   create_table "org_member_roles", :force => true do |t|
@@ -1348,6 +1630,23 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1430,6 +1729,11 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1519,6 +1823,16 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1653,6 +1967,25 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1691,6 +2024,26 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1763,9 +2116,9 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
+    t.float    "work_score"
     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"
@@ -1813,13 +2166,13 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority",        :default => 0
+    t.integer  "priority"
     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
+    t.integer  "hide"
+    t.integer  "status"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
   create_table "subfield_subdomain_dirs", :force => true do |t|
@@ -1829,6 +2182,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2068,6 +2432,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2119,6 +2494,23 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"

From 61eeee702ca2efe5d33803d65a97b98cbe3d61c7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 09:40:47 +0800
Subject: [PATCH 111/668] migrate

---
 .../20160523085440_add_status_to_org_document_comment.rb     | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20160523085440_add_status_to_org_document_comment.rb

diff --git a/db/migrate/20160523085440_add_status_to_org_document_comment.rb b/db/migrate/20160523085440_add_status_to_org_document_comment.rb
new file mode 100644
index 000000000..e29426450
--- /dev/null
+++ b/db/migrate/20160523085440_add_status_to_org_document_comment.rb
@@ -0,0 +1,5 @@
+class AddStatusToOrgDocumentComment < ActiveRecord::Migration
+  def change
+    add_column :org_document_comments, :status, :integer, :default => false
+  end
+end

From 13676ec9c3eee6d62db3e862c8c3691e6d5af063 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 May 2016 09:51:27 +0800
Subject: [PATCH 112/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9A=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/wechat_service.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index ee45c99dc..6d8c0f234 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -5,7 +5,7 @@ class WechatService
     data = {
         touser:openid,
         template_id:template_id,
-        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
         topcolor:"#FF0000",
         data:{
             first: {
@@ -44,7 +44,6 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def topic_publish_template(user_id, type, id, first, key1, key2, key3, remark="")
@@ -59,7 +58,6 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def comment_template(user_id,type, id, first, key1, key2, key3, remark="")
@@ -74,7 +72,6 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
   def message_update_template(user_id, type, id, first, key1, key2, remark="")
@@ -83,7 +80,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:"YTyNPZnQD8uZFBFq-Q6cCOWaq5LA9vL6RFlF2JuD5Cg",
-          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
           topcolor:"#FF0000",
           data:{
               first: {
@@ -112,6 +109,5 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
-    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 end
\ No newline at end of file

From bc0e24d39e421b37721ea4d38c75ea5d04bb3e13 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 10:28:17 +0800
Subject: [PATCH 113/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 160 +++++++++---------
 app/views/users/_resources_list.html.erb      |  45 +----
 .../users/_user_import_resource_list.html.erb |  16 +-
 app/views/users/_user_resource_info.html.erb  |  10 +-
 .../users/_user_resource_tip_list.html.erb    |   2 +-
 app/views/users/user_resource.html.erb        |   6 +-
 6 files changed, 96 insertions(+), 143 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2c4355180..853219426 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2058,18 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    # elsif params[:type] == "2"
+    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+    #   if params[:status] == "2"
+    #     resource_type = "'Course'"
+    #   elsif params[:status] == "3"
+    #     resource_type = "'Project'"
+    #   elsif params[:status] == "5"
+    #     resource_type = "'Principal'"
+    #   else
+    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+    #   end
+    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2211,18 +2211,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    # elsif params[:type] == "2"
+    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+    #   if params[:status] == "2"
+    #     resource_type = "'Course'"
+    #   elsif params[:status] == "3"
+    #     resource_type = "'Project'"
+    #   elsif params[:status] == "5"
+    #     resource_type = "'Principal'"
+    #   else
+    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+    #   end
+    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -2352,18 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    # elsif params[:type] == "2"
+    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+    #   if params[:status] == "2"
+    #     resource_type = "'Course'"
+    #   elsif params[:status] == "3"
+    #     resource_type = "'Project'"
+    #   elsif params[:status] == "5"
+    #     resource_type = "'Principal'"
+    #   else
+    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+    #   end
+    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2700,12 +2700,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, order, score
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").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')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源搜索
   def get_public_resources_search user_course_ids, user_project_ids, order, score, search
-    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}")
+    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
 
   # 获取我的资源
@@ -2729,15 +2729,15 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取我的私有资源分享结果
-  def get_my_private_resources apply_ids, resource_type, order, score
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
-
-  # 获取我的私有资源分享搜索结果
-  def get_my_private_resources_search apply_ids, resource_type, order, score, search
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
+  # # 获取我的私有资源分享结果
+  # def get_my_private_resources apply_ids, resource_type, order, score
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
+  #
+  # # 获取我的私有资源分享搜索结果
+  # def get_my_private_resources_search apply_ids, resource_type, order, score, search
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
@@ -2748,12 +2748,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中课程资源搜索结果
   def get_course_resources_public_search user_course_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
@@ -2772,12 +2772,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源搜索
   def get_project_resources_public_search  user_project_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
@@ -2795,13 +2795,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
     attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public_search order, score, search
     attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2816,12 +2816,12 @@ 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 is_public =1 and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
   def get_principal_resources_public_search order, score, search
-    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2863,18 +2863,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    # elsif params[:type] == "2" # 私有资源
+    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+    #   if params[:status] == "2"
+    #     resource_type = "'Course'"
+    #   elsif params[:status] == "3"
+    #     resource_type = "'Project'"
+    #   elsif params[:status] == "5"
+    #     resource_type = "'Principal'"
+    #   else
+    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+    #   end
+    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -3054,19 +3054,19 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
       @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
-      @attachments
+    # elsif params[:type] == "2" # 私有资源
+    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+    #   if params[:status] == "2"
+    #     resource_type = "'Course'"
+    #   elsif params[:status] == "3"
+    #     resource_type = "'Project'"
+    #   elsif params[:status] == "5"
+    #     resource_type = "'Principal'"
+    #   else
+    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+    #   end
+    #   @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+    #   @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 3aaed7594..d22b69760 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,55 +6,20 @@
     <% 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 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" />
-            <% end %>
+            <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" />
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <% 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 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 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) %>
-                <% elsif ah == 1 %>
-                    等待回复
-                <% elsif ah == 2 %>
-                    可引用
-                <% elsif ah == 3 %>
-                    已拒绝
-                <% end %>
-            <% else %>
-                <% ah = attach.get_status_by_attach(User.current.id) %>
-                <% if ah == 2 %>
-                    可引用
-                <% else %>
-                    --
-                <% end %>
-            <% end %>
+            <%= 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' %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
-          <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-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"><%= 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"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -219,7 +184,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id%>') {
             if(line.children().first().children().data('hasHistory') == 'Y'){
                 alert('该资源存在历史版本，不能删除');
@@ -228,7 +193,7 @@
             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 %>'
+                    url: '<%= user_resource_delete_user_path(User.current.id) %>' + '?resource_id=' + id + '&type=<%= @type %>&status=<%= @status %>'
                 });
             }
 
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index e8ed684c6..97366832b 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,22 +6,10 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <% 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 %>
-
+              <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>
-                <% 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 %>
+                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
               </span>
-              <% 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>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 52a61a7b0..a140f803c 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -19,13 +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 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();">-->
-      <!--&lt;!&ndash;<a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>&ndash;&gt;-->
-    <!--</div>-->
+    <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="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
   </div>
 
@@ -215,7 +215,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 67fe292ee..35ca130dd 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
-  <li class="resource-list-apply fr">操作</li>
+  <!--<li class="resource-list-apply fr">操作</li>-->
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 483dceaed..43f06b93d 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -55,9 +55,9 @@
     <li class="fl resource-switch">
       <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>
-    </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>-->
+    <!--</li>-->
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">

From ccf29c980a243dae60c0f16193c9c2ce4ee36bf9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 May 2016 10:34:36 +0800
Subject: [PATCH 114/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BD=9C=E4=B8=9A=EF=BC=9A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=8C=85=E6=8B=AC=E4=B8=8D=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E5=85=B3=E9=94=AE=E5=AD=97=E7=9A=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=8D=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb            | 5 +++--
 app/views/homework_common/_homework_index_list.html.erb  | 8 ++++++++
 app/views/homework_common/_homework_search_form.html.erb | 2 +-
 app/views/homework_common/index.html.erb                 | 9 ++-------
 app/views/homework_common/index.js.erb                   | 5 ++++-
 5 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 app/views/homework_common/_homework_index_list.html.erb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 9da4b90b9..376f8d5c2 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -14,6 +14,7 @@ class HomeworkCommonController < ApplicationController
     #unless params[:page]
     #  update_homework_time(@course.homework_commons)
     #end
+    search = "%#{params[:search].to_s.strip.downcase}%"
     @new_homework = HomeworkCommon.new
     @new_homework.homework_detail_manual = HomeworkDetailManual.new
     @new_homework.course = @course
@@ -21,10 +22,10 @@ class HomeworkCommonController < ApplicationController
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
       #@homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
-      @homework_commons = @course.homework_commons.order("created_at desc")
+      @homework_commons = @course.homework_commons.where("name like '%#{search}%'").order("created_at desc")
     else
       #@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")
+      @homework_commons = @course.homework_commons.where("name like '%#{search}%' and 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]
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
new file mode 100644
index 000000000..9b11017e8
--- /dev/null
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -0,0 +1,8 @@
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,: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>
\ No newline at end of file
diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index f71cec9a5..250d72467 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
+<%= form_tag( homework_common_index_url_in_org(course.id),
               :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
     <input type="text" name="search" placeholder="输入作业名称进行搜索" class="searchResource" />
     <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 29cff8933..35f4658f9 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -71,13 +71,8 @@
         <% end%>
       </div><!----HomeWork end-->
   <% 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 id="homework_index_list">
+    <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %>
   </div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/homework_common/index.js.erb b/app/views/homework_common/index.js.erb
index 7a038eb5c..4a9ec6ad3 100644
--- a/app/views/homework_common/index.js.erb
+++ b/app/views/homework_common/index.js.erb
@@ -1 +1,4 @@
-$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");
\ No newline at end of file
+/*
+$("#user_show_more_homework").replaceWith("<%#= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");*/
+
+$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id}) %>");

From 29ceb7b8e961c76bb1942e7ef174e4441494ce4f Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 24 May 2016 15:01:26 +0800
Subject: [PATCH 115/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=B8=85=E6=99=B0=E9=97=AE=E9=A2=98=EF=BC=8C=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E8=B5=9E=E5=8F=B3=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html  | 108 +++++++++++++-------------
 public/images/wechat/wechat_icon.gif  | Bin 0 -> 2482 bytes
 public/images/wechat/wechat_icon.png  | Bin 5631 -> 4259 bytes
 public/images/wechat/wechat_icon2.png | Bin 4259 -> 0 bytes
 public/javascripts/wechat/app.js      |  54 ++++++-------
 public/stylesheets/weui/weixin.css    |   9 ++-
 6 files changed, 87 insertions(+), 84 deletions(-)
 create mode 100755 public/images/wechat/wechat_icon.gif
 delete mode 100755 public/images/wechat/wechat_icon2.png

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index b4e582336..3391506f2 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -23,15 +23,15 @@
                   <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>
+                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 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 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>
+                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -50,15 +50,15 @@
                 <div class="post-content c-grey2 mt10">
                   <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>
+                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 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 f13 fl">{{act.latest_update}}</span>
-                <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>
+                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -77,15 +77,15 @@
                 <div class="post-content c-grey2 mt10">
                   <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>
+                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 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 f13 fl">{{act.latest_update}}</span>
-                <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>
+                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -122,15 +122,15 @@
                   <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
                   <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
                 </div>
-                <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
+                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 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 f13 fl">{{act.latest_update}}</span>
-                <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>
+                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -150,15 +150,15 @@
                 <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>
+                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 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 f13 fl">{{act.latest_update}}</span>
-                <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>
+                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -192,14 +192,14 @@
                 <div class="post-content c-grey2 mt5">
                   <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
                 </div>
-                <a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
+                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                 <div class="cl"></div>
-                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-                <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>
+                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><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"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -219,14 +219,14 @@
               <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>
+              <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
               <div class="cl"></div>
-              <span  class="c-grey f13 fl">{{act.latest_update}}</span>
-              <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>
+              <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
+              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
+              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+              <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
               <div class="cl"></div>
             </div>
           </div>
diff --git a/public/images/wechat/wechat_icon.gif b/public/images/wechat/wechat_icon.gif
new file mode 100755
index 0000000000000000000000000000000000000000..8d460be806d4cadac2f3a1d9ce231aa13b206c04
GIT binary patch
literal 2482
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
BY!(0j

literal 0
HcmV?d00001

diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png
index 7aa0a4351c720ed5b5f10f056d2d1d14be1d05f6..cbc3eb565cc9ddd9ce1a9618becd0035d38f0919 100755
GIT binary patch
literal 4259
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

literal 5631
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
Xz08CkL8tv=#s=QLQIoHdHGBVmi>8p(

diff --git a/public/images/wechat/wechat_icon2.png b/public/images/wechat/wechat_icon2.png
deleted file mode 100755
index cbc3eb565cc9ddd9ce1a9618becd0035d38f0919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4259
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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4c9ea260a..5d94afca4 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -376,33 +376,33 @@ app.filter('safeHtml', function ($sce) {
     }
 });
 
-app.directive('textAutoHeight', function($timeout){
-    return {
-        restrict: 'A',
-        scope: {},
-        link: function(scope, element, attr){
-            scope.text = '点击展开';
-            $timeout(function(){
-                var e = element.parent().children().eq(5);
-                var height = e[0].scrollHeight;
-                if(height>90){
-                    element.css('display', 'block');
-                    element.on('click', function(){
-                        if(element.text() == "点击展开"){
-                            e.css("height", height+'px');
-                            element.text("点击隐藏");
-                        } else {
-                            e.css("height", '90px');
-                            element.text("点击展开");
-                        }
-
-                    });
-                }
-            }, false);
-
-        }
-    }
-});
+//app.directive('textAutoHeight', function($timeout){
+//    return {
+//        restrict: 'A',
+//        scope: {},
+//        link: function(scope, element, attr){
+//            scope.text = '点击展开';
+//            $timeout(function(){
+//                var e = element.parent().children().eq(5);
+//                var height = e[0].scrollHeight;
+//                if(height>90){
+//                    element.css('display', 'block');
+//                    element.on('click', function(){
+//                        if(element.text() == "点击展开"){
+//                            e.css("height", height+'px');
+//                            element.text("点击隐藏");
+//                        } else {
+//                            e.css("height", '90px');
+//                            element.text("点击展开");
+//                        }
+//
+//                    });
+//                }
+//            }, false);
+//
+//        }
+//    }
+//});
 
 app.directive('inputAuto',function(){
     return{
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 64598e381..8b135dbeb 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -8,6 +8,7 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
 .f13 {font-size:13px;}
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
+.mt2 {margin-top:2px;}
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
 .mb5 {margin-bottom:5px;}
@@ -16,6 +17,8 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
 .mr15 {margin-right:15px;}
+.mr20 {margin-right:20px;}
+.mr25 {margin-right:25px;}
 .ml55 {margin-left:55px;}
 .mr55 {margin-right:55px;}
 .c-blue {color:#269ac9;}
@@ -69,9 +72,9 @@ a.underline {text-decoration:underline;}
 .copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
 .post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:hidden; resize:none;}
 .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
-.reply-icon {background:url(/images/wechat/wechat_icon.png) -100px 1px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praise-icon {background:url(/images/wechat/wechat_icon.png) -100px -38px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praised-icon {background:url(/images/wechat/wechat_icon.png) -100px -76px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+.reply-icon {background:url(/images/wechat/wechat_icon.gif) -100px 1px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praise-icon {background:url(/images/wechat/wechat_icon.gif) -100px -38px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praised-icon {background:url(/images/wechat/wechat_icon.gif) -100px -76px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 
 /* 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;}

From 65c7719ed2d52524318e3e3c1ad6d257af9ab5f0 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 24 May 2016 15:18:11 +0800
Subject: [PATCH 116/668] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=9C=A8=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index 30f527595..c04c2effb 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -20,9 +20,9 @@
 </div>
 <div class="cl"></div>
 <div >
-<a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
+<a class="pr_info_name fl c_dark fb" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
 <div>
-  <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+  <a class="pr_info_name c_dark fb fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
     <%= @course.name %>
   </a>
   <span id="course_outline_bar">

From 1c0a68e57b424c06f12397dde37c015e8ab01bad Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 24 May 2016 15:47:22 +0800
Subject: [PATCH 117/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98tab=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=A4=AA=E5=A4=9A=E5=AF=BC=E8=87=B4=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E6=96=AD=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_member_list.html.erb | 2 +-
 public/stylesheets/org.css                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index fb22716ff..0059a2be5 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -1,6 +1,6 @@
 <% members.each do |member|%>
     <ul class="orgListRow">
-      <li class="orgListUser"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
+      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
       <li class="orgListRole">
         <%= get_org_member_role_name member %>
         <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index abfeaef85..f1b552687 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -18,14 +18,14 @@
 .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
 a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
-.orgMemberList {width:480px; float:left;}
+.orgMemberList {width:420px; float:left;}
 .orgColumnList {width:688px; float:left;}
 .orgListUser {width:110px; float:left;padding-right: 10px;}
 .orgListRole {width:180px; float:left;}
 .orgOrder {width:70px; float:left; text-align:center;}
 .orgSubNum {width:30px; float:left; text-align:center;}
 .subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
-.orgMemContainer {width:208px;}
+.orgMemContainer {width:268px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
 .undis {display:none;}

From a7a2be6a4bec789dc0e50ee6076dcac281fdaa28 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 16:01:02 +0800
Subject: [PATCH 118/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 73 ++++++++++++-------
 app/views/users/_show_user_resource.html.erb  | 15 ++--
 .../users/_user_homework_attachment.html.erb  |  2 +-
 app/views/users/user_import_resource.js.erb   |  2 +-
 .../users/user_ref_resource_search.js.erb     | 13 +++-
 5 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 853219426..6f3cca744 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1022,20 +1022,34 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    @user = User.current
-    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
+    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+    elsif (params[:type].blank? ||params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+    end
+    @status = params[:status]
     @type = params[:type]
     @homework_id = params[:homework_id]
-    @limit = 7
+    @limit = 10
     @is_remote = true
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
-    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,7
+    @attachments = paginateHelper @attachments,10
     respond_to do |format|
       format.js
     end
@@ -1043,10 +1057,10 @@ class UsersController < ApplicationController
 
   #引入资源列表根据类型过滤
   def user_resource_type
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
+    # if User.current.id.to_i != params[:id].to_i
+    #   render_403
+    #   return
+    # end
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
@@ -1095,22 +1109,27 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    search = params[:search].to_s.strip.downcase
-    if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
-      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "2" #课程资源
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "6" #公共资源
-      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 7
@@ -1120,7 +1139,7 @@ class UsersController < ApplicationController
     @offset ||= @atta_pages.offset
     @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,7
+    @attachments = paginateHelper @attachments, 7
     respond_to do |format|
       format.js
     end
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 6c3216f11..f2c28387f 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -10,11 +10,16 @@
 //    });
 
     $(document).ready(function(){
+        <% if type == "1" %>
+        $("#my_resources_choose_homework").addClass("referenceTypeActive");
+        $("#public_resources_choose_homework").removeClass("referenceTypeActive");
+        <% else %>
         $(".referenceTypeBlock").click(function(){
             var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
             activeBlock.removeClass("referenceTypeActive");
             $(this).addClass("referenceTypeActive");
         });
+        <% end %>
     });
 
 // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
@@ -36,14 +41,12 @@ function store_seleted_resource(dom){
   </div>
   <div>
     <div class="referenceResourceType fl">
-      <a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock"  data-remote="true">课程资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock"  data-remote="true">项目资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock"  data-remote="true">用户资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock"  data-remote="true">附件</a> </div>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '6') %>" id="public_resources_choose_homework" class="referenceTypeBlock referenceTypeActive" data-remote="true">公共资源</a>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '1') %>"  id="my_resources_choose_homework"  class="referenceTypeBlock" data-remote="true">我的资源</a>
+    </div>
     <div class="fr">
       <!--<form class="referenceSearchBox">-->
-      <%=  form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
+      <%=  form_tag(user_ref_resource_search_user_path(user, :type => @type),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
         <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
         <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
       <% end %>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 673cee0e1..9f9aea60f 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -70,7 +70,7 @@
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
+  <%= link_to "资源库",{:controller => 'users', :action => 'user_ref_resource_search', :id => User.current.id, :homework_id => container.id, :type => nil}, :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
   <% if defined?(has_program) && has_program %>
     <div id="program_setting" class="fl">
         <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index 87324669e..cd302a9c1 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
 showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/user_ref_resource_search.js.erb b/app/views/users/user_ref_resource_search.js.erb
index 8651768a5..e6af1bc47 100644
--- a/app/views/users/user_ref_resource_search.js.erb
+++ b/app/views/users/user_ref_resource_search.js.erb
@@ -1,2 +1,11 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
-$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
+showModal('ajax-modal', '730px');
+$('#ajax-modal').css('height','auto').css("width","730px");
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" + "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed");
+$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
+
+$("#public_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '6') %>');
+$("#my_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '1') %>');
+

From 9e8411aac978e573bf94e593ef50916d0a6a23be Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 24 May 2016 16:22:46 +0800
Subject: [PATCH 119/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9ke=EF=BC=9Aissue?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=8F=AA=E6=9C=89=E4=B8=80=E8=A1=8C=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E5=90=8E=EF=BC=8C=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=A1=86=E8=A2=AB=E6=8B=89=E9=AB=98=E4=BA=86=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=89=E5=BE=88=E5=A4=9A=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/autoheight/autoheight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
index 82928ff0c..cdd3f94f8 100644
--- a/public/assets/kindeditor/plugins/autoheight/autoheight.js
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -41,7 +41,7 @@ KindEditor.plugin('autoheight', function(K) {
         var body = edit.doc.body;
         edit.iframe.height(minHeight);
         self.resize(null, Math.max(
-                ((K.IE ? body.scrollHeight : body.offsetHeight) > 500 ? 500 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 250 ? 250 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
                 + 33, minHeight));
 	}
 

From fc3b47e3aa556b454fc1d4c4f570dda7d79be673 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 May 2016 16:37:21 +0800
Subject: [PATCH 120/668] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84js=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb | 61 +++++++++++-----------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 3022b83a6..cbb56025e 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -15,46 +15,23 @@
     </th>
   </tr>
 
-  <% @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>
-
+  <% @exercise_users_list.each_with_index do |exercise, index|%>
       <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
-        <td class="pl5 pr5" style="width:28px; text-align:center;">1</td>
+        <td class="pl5 pr5" style="width:28px; text-align:center;"><%=index + 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;">
+        <td class="hworkStName student_work_<%= exercise.id%>" 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;">
+        <td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
           <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;">
+        <td class="hworkStID student_work_<%= exercise.id%> 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%>">
+        <td class="hworkList130 c_grey">
           <% if exercise.created_at%>
               <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
               <% if @exercise.end_time <= exercise.created_at %>
@@ -67,5 +44,29 @@
         </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%>
+
+      <script type="text/javascript">
+          $(".student_work_<%= exercise.id%>").mouseenter(function(){
+              $("#work_click_<%= exercise.id%>").show();
+          }).mouseleave(function(){
+              $("#work_click_<%= exercise.id%>").hide();
+          }).mouse;
+          $(function(){
+              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+              $("#student_name_<%= exercise.id%>,#student_id_<%= exercise.id%>,#student_class_<%= 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>
+
+<% end%>
 </table>
\ No newline at end of file

From 909d40b4eb462e4aa28a5242792580bec8dcbebd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 17:14:01 +0800
Subject: [PATCH 121/668] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6f3cca744..cff97e423 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2050,7 +2050,7 @@ class UsersController < ApplicationController
     @score = @b_sort == "desc" ? "asc" : "desc"
     user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    if(params[:type].blank? || params[:type] == "1") # 我的资源
+    if(params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
         @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
@@ -2064,7 +2064,7 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "6" # 公共资源
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
@@ -2203,7 +2203,7 @@ class UsersController < ApplicationController
     @score = @b_sort == "desc" ? "asc" : "desc"
     user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    if(params[:type].blank? || params[:type] == "1") # 我的资源
+    if(params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
         @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
@@ -2217,7 +2217,7 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "6" # 公共资源
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
@@ -2344,7 +2344,7 @@ class UsersController < ApplicationController
     @score = @b_sort == "desc" ? "asc" : "desc"
     user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    if(params[:type].blank? || params[:type] == "1") # 我的资源
+    if(params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
         @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
@@ -2358,7 +2358,7 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "6" # 公共资源
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"

From 7b7f9cf8f2b108777a974955fc62c8aecf97fb84 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 May 2016 19:52:51 +0800
Subject: [PATCH 122/668] =?UTF-8?q?=E5=88=A0=E9=99=A4wechat=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 1 -
 lib/wechat/bin/wechat                 | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 39be9cef3..7ee0552fb 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -178,7 +178,6 @@ class WechatsController < ActionController::Base
            openid: openid,
            user: user
        )
-       request.reply.text "欢迎加入Trustie创新实践社区"
        render :json => {status:0, msg: "绑定成功"}
     rescue Exception=>e
       render :json => {status: -1, msg: e.message}
diff --git a/lib/wechat/bin/wechat b/lib/wechat/bin/wechat
index 8931a2dcb..d5563802e 100755
--- a/lib/wechat/bin/wechat
+++ b/lib/wechat/bin/wechat
@@ -1,3 +1,4 @@
+#coding=utf-8
 #!/usr/bin/env ruby
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')

From ed2f41394902fc09acfd56507fb3cd2453c918c7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 May 2016 20:04:06 +0800
Subject: [PATCH 123/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 210 +++++++++---------
 app/views/users/_resources_list.html.erb      |  45 +++-
 .../users/_user_import_resource_list.html.erb |  22 +-
 app/views/users/_user_resource_info.html.erb  |  14 +-
 .../users/_user_resource_tip_list.html.erb    |   2 +-
 app/views/users/user_resource.html.erb        |  14 +-
 6 files changed, 177 insertions(+), 130 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 853219426..854e604b4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -320,7 +320,7 @@ class UsersController < ApplicationController
       case params[:agree]
         when 'Y'
           ar.update_column('status', 2)
-           @msg.update_attributes(:apply_result => 1, :viewed => 1)
+          @msg.update_attributes(:apply_result => 1, :viewed => 1)
           ar.course_messages << CourseMessage.new(:user_id => ar.user_id, :course_id => -1, :viewed => false, :apply_result => 2, :status => 1)
         when 'N'
           ar.update_column('status', 3)
@@ -539,28 +539,28 @@ class UsersController < ApplicationController
   end
 
   def student_homeworks
-      if User.current == @user
-        @page = params[:page] ? params[:page].to_i + 1 : 0
-        user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-
-        #判断当前用户在当前课程的身份
-        visibleCourse = @user.courses.empty? ? [] : @user.courses.where("is_delete = 0").visible
-        homework_ids = []
-        visibleCourse.each do |course|
-            homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
-            homework_ids << homeworks.pluck(:id) unless homeworks.empty?
-        end
-        visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
-        @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
-        @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
-        @is_in_course = params[:is_in_course].to_i || 0
-        respond_to do |format|
-          format.js
-          format.html {render :layout => 'new_base_user'}
-        end
-      else
-        render_403
+    if User.current == @user
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+
+      #判断当前用户在当前课程的身份
+      visibleCourse = @user.courses.empty? ? [] : @user.courses.where("is_delete = 0").visible
+      homework_ids = []
+      visibleCourse.each do |course|
+        homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
+        homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+      end
+      visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
+      @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
+      @is_in_course = params[:is_in_course].to_i || 0
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
       end
+    else
+      render_403
+    end
   end
 
   def choose_user_course
@@ -2058,18 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    # elsif params[:type] == "2"
-    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-    #   if params[:status] == "2"
-    #     resource_type = "'Course'"
-    #   elsif params[:status] == "3"
-    #     resource_type = "'Project'"
-    #   elsif params[:status] == "5"
-    #     resource_type = "'Principal'"
-    #   else
-    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
-    #   end
-    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2211,18 +2211,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    # elsif params[:type] == "2"
-    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-    #   if params[:status] == "2"
-    #     resource_type = "'Course'"
-    #   elsif params[:status] == "3"
-    #     resource_type = "'Project'"
-    #   elsif params[:status] == "5"
-    #     resource_type = "'Principal'"
-    #   else
-    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
-    #   end
-    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -2352,18 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    # elsif params[:type] == "2"
-    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-    #   if params[:status] == "2"
-    #     resource_type = "'Course'"
-    #   elsif params[:status] == "3"
-    #     resource_type = "'Project'"
-    #   elsif params[:status] == "5"
-    #     resource_type = "'Principal'"
-    #   else
-    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
-    #   end
-    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2700,12 +2700,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, 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')) ").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')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源搜索
   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
 
   # 获取我的资源
@@ -2725,19 +2725,19 @@ class UsersController < ApplicationController
   # 获取我的课程资源
   def get_course_resources author_id, user_course_ids, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
-                                   "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # # 获取我的私有资源分享结果
-  # def get_my_private_resources apply_ids, resource_type, order, score
-  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
-  # end
-  #
-  # # 获取我的私有资源分享搜索结果
-  # def get_my_private_resources_search apply_ids, resource_type, order, score, search
-  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
-  # end
+  # 获取我的私有资源分享结果
+  def get_my_private_resources apply_ids, resource_type, order, score
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的私有资源分享搜索结果
+  def get_my_private_resources_search apply_ids, resource_type, order, score, search
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
@@ -2748,18 +2748,18 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中课程资源搜索结果
   def get_course_resources_public_search user_course_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
   def get_project_resources author_id, user_project_ids, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
-                                   "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
+                                      "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
                               and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
@@ -2772,12 +2772,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源搜索
   def get_project_resources_public_search  user_project_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
@@ -2795,13 +2795,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
     attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public_search order, score, search
     attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2816,12 +2816,12 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public order, score
-    attchments = Attachment.where("container_type = 'Principal' and is_public =1 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
 
   # 获取我的用户类型资源
   def get_principal_resources_public_search order, score, search
-    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2863,18 +2863,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    # elsif params[:type] == "2" # 私有资源
-    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-    #   if params[:status] == "2"
-    #     resource_type = "'Course'"
-    #   elsif params[:status] == "3"
-    #     resource_type = "'Project'"
-    #   elsif params[:status] == "5"
-    #     resource_type = "'Principal'"
-    #   else
-    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
-    #   end
-    #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -3052,21 +3052,21 @@ class UsersController < ApplicationController
         @attachments = get_principal_resources_public_search(@order, @score, search)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
+        @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
+      end
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
       end
-    # elsif params[:type] == "2" # 私有资源
-    #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-    #   if params[:status] == "2"
-    #     resource_type = "'Course'"
-    #   elsif params[:status] == "3"
-    #     resource_type = "'Project'"
-    #   elsif params[:status] == "5"
-    #     resource_type = "'Principal'"
-    #   else
-    #     resource_type = "'Project','OrgSubfield','Principal','Course'"
-    #   end
-    #   @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
-    #   @attachments
+      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+      @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index d22b69760..3aaed7594 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,20 +6,55 @@
     <% 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">
-            <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" />
+            <% 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" />
+            <% end %>
             <!--<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 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 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 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) %>
+                <% elsif ah == 1 %>
+                    等待回复
+                <% elsif ah == 2 %>
+                    可引用
+                <% elsif ah == 3 %>
+                    已拒绝
+                <% 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>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
-          <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-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"><%= 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"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -184,7 +219,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(user_id === '<%= User.current.id%>') {
             if(line.children().first().children().data('hasHistory') == 'Y'){
                 alert('该资源存在历史版本，不能删除');
@@ -193,7 +228,7 @@
             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 %>'
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
                 });
             }
 
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 97366832b..26118f3f4 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -1,15 +1,27 @@
 <%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
-                     :mul_id => @resource_id,
-                     :mul_type => @resource_type}),
-                     :method => 'post',  :id => 'resource_import_container_form') do %>
+                       :mul_id => @resource_id,
+                       :mul_type => @resource_type}),
+              :method => 'post',  :id => 'resource_import_container_form') do %>
     <% @attachments.each do |attach| %>
         <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;"  />
+              <% 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>
-                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
+                <% 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 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>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index a140f803c..9c321cdb5 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,6 +1,6 @@
 <div id="users_setting">
   <div id="upload_private_resource">
-     <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
+    <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
   </div>
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>
@@ -19,13 +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 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>
 
@@ -215,7 +215,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();
@@ -232,7 +232,7 @@
         }
     }
 
-        //发送至按钮控制
+    //发送至按钮控制
     $("input[name='checkbox1[]']").click(function(){
         if($("input[name='checkbox1[]']:checked").length >= 1){
             $(".resourcesSelectSendButton").removeClass("inactive-border");
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 35ca130dd..67fe292ee 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
-  <!--<li class="resource-list-apply fr">操作</li>-->
+  <li class="resource-list-apply fr">操作</li>
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 43f06b93d..a8bd96859 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -8,11 +8,11 @@
 
     }
     $(document).ready(function(){
-           $(".resource-switch").click(function(){
-                $(".resource-switch").children().removeClass("resource-tab-active");
-                $(this).children().addClass("resource-tab-active");
-            });
+        $(".resource-switch").click(function(){
+            $(".resource-switch").children().removeClass("resource-tab-active");
+            $(this).children().addClass("resource-tab-active");
         });
+    });
     function remote_search(){
         $("#resource_search_form").submit();
     }
@@ -55,9 +55,9 @@
     <li class="fl resource-switch">
       <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>-->
-    <!--</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>
+    </li>
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">

From d1e11d426010b93de1d3d9631241258ddcd6c940 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 08:58:58 +0800
Subject: [PATCH 124/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E5=90=8E=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb   | 7 +------
 app/helpers/application_helper.rb     | 1 -
 app/models/attachment.rb              | 2 +-
 app/views/users/apply_resource.js.erb | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cff97e423..18093b790 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -443,12 +443,7 @@ class UsersController < ApplicationController
 
   # 资源分享请求弹框
   def apply_resource
-    if User.current.logged?
-      @attachment = Attachment.find params[:attachment_id]
-      @state = 2
-    else
-      @state = 1
-    end
+    @attachment = Attachment.find params[:attachment_id]
     respond_to do |format|
       format.js
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4d92808d4..ce6d2259c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -70,7 +70,6 @@ module ApplicationHelper
     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
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 8f9ee2d85..aa4ef8670 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -143,7 +143,7 @@ class Attachment < ActiveRecord::Base
 
   def get_apply_resource_status attachment_id, author_id
     status = ApplyResource.where("attachment_id =? and user_id =?", attachment_id, author_id).first.try(:status)
-    status == 2 ? true :false
+    status == 2 
   end
 
   # add by nwb
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
index 14a795fe5..601cafa11 100644
--- a/app/views/users/apply_resource.js.erb
+++ b/app/views/users/apply_resource.js.erb
@@ -1,6 +1,6 @@
-<% if @state == 1 %>
+<% if !User.current.logged? %>
 alert("您还未登录");
-<% elsif @state == 2 %>
+<% else %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_resource', :locals => {:attachment => @attachment}) %>');
 showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();

From 197f054c1896a3923fe828946f3157beab51c60d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 09:10:41 +0800
Subject: [PATCH 125/668] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 233 ++++++++----------
 app/views/users/_resources_list.html.erb      |  47 +---
 .../users/_user_import_resource_list.html.erb |  16 +-
 app/views/users/_user_resource_info.html.erb  |  10 +-
 .../users/_user_resource_tip_list.html.erb    |   2 +-
 app/views/users/user_resource.html.erb        |   6 +-
 6 files changed, 124 insertions(+), 190 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1b85a4a20..203296160 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1022,34 +1022,20 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
-    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
-    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
-    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
-    @score = @b_sort == "desc" ? "asc" : "desc"
-    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type] == "1") # 我的资源
-      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
-    elsif (params[:type].blank? ||params[:type] == "6") # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
-    end
-    @status = params[:status]
+    @user = User.current
+    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @homework_id = params[:homework_id]
-    @limit = 10
+    @limit = 7
     @is_remote = true
-    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,10
+    @attachments = paginateHelper @attachments,7
     respond_to do |format|
       format.js
     end
@@ -1057,10 +1043,10 @@ class UsersController < ApplicationController
 
   #引入资源列表根据类型过滤
   def user_resource_type
-    # if User.current.id.to_i != params[:id].to_i
-    #   render_403
-    #   return
-    # end
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
@@ -1109,27 +1095,22 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
-    @resource_id = params[:mul_id]
-    @resource_type = params[:mul_type]
-    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
-    @score = @b_sort == "desc" ? "asc" : "desc"
-    @user = User.current
-    @switch_search = params[:search].nil? ? " " : params[:search]
-    search = "%#{@switch_search.strip.downcase}%"
-    # 别人的资源库是没有权限去看的
-    if(params[:type] == "1") # 我的资源
-      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].blank? || params[:type] == "1") #全部
+      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
-      # user_org_ids = User.current.organizations.map {|o| o.id}
-      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
-    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "6" #公共资源
+      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
     end
     @type = params[:type]
     @limit = 7
@@ -1139,7 +1120,7 @@ class UsersController < ApplicationController
     @offset ||= @atta_pages.offset
     @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments, 7
+    @attachments = paginateHelper @attachments,7
     respond_to do |format|
       format.js
     end
@@ -2077,18 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2230,18 +2211,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -2371,18 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2719,12 +2700,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, order, score
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").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')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源搜索
   def get_public_resources_search user_course_ids, user_project_ids, order, score, search
-    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}")
+    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
 
   # 获取我的资源
@@ -2748,15 +2729,15 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取我的私有资源分享结果
-  def get_my_private_resources apply_ids, resource_type, order, score
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
-
-  # 获取我的私有资源分享搜索结果
-  def get_my_private_resources_search apply_ids, resource_type, order, score, search
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
+  # # 获取我的私有资源分享结果
+  # def get_my_private_resources apply_ids, resource_type, order, score
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
+  #
+  # # 获取我的私有资源分享搜索结果
+  # def get_my_private_resources_search apply_ids, resource_type, order, score, search
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
@@ -2767,12 +2748,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中课程资源搜索结果
   def get_course_resources_public_search user_course_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
@@ -2791,12 +2772,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源搜索
   def get_project_resources_public_search  user_project_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
@@ -2814,13 +2795,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
     attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public_search order, score, search
     attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2835,12 +2816,12 @@ 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 is_public =1 and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
   def get_principal_resources_public_search order, score, search
-    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2882,18 +2863,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2" # 私有资源
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -3073,19 +3054,19 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
-      @attachments
+      # elsif params[:type] == "2" # 私有资源
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+      #   @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 3aaed7594..26e8f922b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,55 +6,20 @@
     <% 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 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" />
-            <% end %>
+            <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" />
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <% 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 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 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) %>
-                <% elsif ah == 1 %>
-                    等待回复
-                <% elsif ah == 2 %>
-                    可引用
-                <% elsif ah == 3 %>
-                    已拒绝
-                <% end %>
-            <% else %>
-                <% ah = attach.get_status_by_attach(User.current.id) %>
-                <% if ah == 2 %>
-                    可引用
-                <% else %>
-                    --
-                <% end %>
-            <% end %>
+            <%= 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' %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
-          <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-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"><%= 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"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -104,7 +69,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         allow = line.children().eq(13).html();
         if( allow == 0){
             alert('您无权发送私有资源')
@@ -219,7 +184,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id%>') {
             if(line.children().first().children().data('hasHistory') == 'Y'){
                 alert('该资源存在历史版本，不能删除');
@@ -228,7 +193,7 @@
             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 %>'
+                    url: '<%= user_resource_delete_user_path(User.current.id) %>' + '?resource_id=' + id + '&type=<%= @type %>&status=<%= @status %>'
                 });
             }
 
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 26118f3f4..e886c16ca 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,22 +6,10 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <% 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 %>
-
+              <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>
-                <% 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 %>
+                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
               </span>
-              <% 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>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 9c321cdb5..c415ba0b4 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -19,13 +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 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();">-->
-    <!--&lt;!&ndash;<a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>&ndash;&gt;-->
-    <!--</div>-->
+    <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="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
   </div>
 
@@ -215,7 +215,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 67fe292ee..35ca130dd 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
-  <li class="resource-list-apply fr">操作</li>
+  <!--<li class="resource-list-apply fr">操作</li>-->
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index a8bd96859..d2e3242d8 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -55,9 +55,9 @@
     <li class="fl resource-switch">
       <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>
-    </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>-->
+    <!--</li>-->
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">

From b6de2dbd2d7376b4c36dbf8cc9070fbd140e5dd4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 09:44:30 +0800
Subject: [PATCH 126/668] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb                | 1 +
 app/views/users/_user_homework_attachment.html.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 203296160..1e12db25d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1096,6 +1096,7 @@ class UsersController < ApplicationController
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
     search = params[:search].to_s.strip.downcase
+    @user = User.current
     if(params[:type].blank? || params[:type] == "1") #全部
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
       @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 9f9aea60f..669e7aa91 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -70,7 +70,7 @@
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users', :action => 'user_ref_resource_search', :id => User.current.id, :homework_id => container.id, :type => nil}, :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
+  <%= link_to "资源库", user_ref_resource_search_user_path(User.current.id, :homework_id => container.id), :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
   <% if defined?(has_program) && has_program %>
     <div id="program_setting" class="fl">
         <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>

From 46860a838baa5e9b2c7759256700e86022eb01d2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 25 May 2016 10:34:09 +0800
Subject: [PATCH 127/668] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E5=90=8E=E6=89=80=E6=9C=89=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=BA=BF=E5=AE=BD=E5=BA=A6=E9=83=BD=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=202.KE=E6=94=B9=E5=8F=98=E5=AD=97=E4=BD=93=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AD=97=E4=BD=93=E4=BC=9A=E6=A0=87=E6=98=8E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=9A=84=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js                | 5 +++--
 public/assets/kindeditor/plugins/code/previewcode.css | 6 +++---
 public/assets/kindeditor/plugins/table/table.js       | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index a8c17345b..39ce0abdb 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -297,7 +297,7 @@ K.options = {
 		'td,th': [
 			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
-			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border', '.text-overflow','.overflow','.white-space'
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
 		],
 		a : ['id', 'class', 'href', 'target', 'name'],
 		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
@@ -2539,7 +2539,8 @@ function _nativeCommand(doc, key, val) {
 function _nativeCommandValue(doc, key) {
 	var val = '';
 	try {
-		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+//		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+        val = doc.queryCommandValue(key);
 	} catch (e) {}
 	if (typeof val !== 'string') {
 		val = '';
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 65c75d6ea..352c77625 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -1,7 +1,7 @@
 .ke-content {
-    font-size: 12px;
-    font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����;
-    font-family:Tahoma;
+    font-size: 14px;
+    /*font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;*/
+    font-family: "微软雅黑","宋体";
 }
 .ke-content pre {
     font-size:9pt;
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index be386f7cc..74b14b118 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -257,6 +257,7 @@ KindEditor.plugin('table', function(K) {
                             style += 'border-color:'+borderColor+';';
                         }
                         style += 'table-layout: '+'fixed;';
+                        style += 'border-collapse: collapse;';
 						var html = '<table';
 						if (style !== '') {
 							html += ' style="' + style + '"';
@@ -283,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}

From fcaa9666e2744537265d8f391c36f1dc944e46ae Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 25 May 2016 10:37:35 +0800
Subject: [PATCH 128/668] =?UTF-8?q?KE=E5=86=85=E5=AE=B9=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E7=BD=91=E5=9D=80=E5=8A=A0=E4=B8=8A=E8=B6=85?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=97=B6=E6=8A=8A=E9=A2=9C=E8=89=B2=E4=B9=9F?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aec0af070..01bb164a9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1327,10 +1327,10 @@ function autoUrl(id){
                     var reStr = full;
                     if (full.length > 0){
                         if (full.indexOf("://") >= 0){
-                            reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                         }
                         else{
-                            reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                         }
                     }
                     return reStr ;
@@ -1346,10 +1346,10 @@ function autoUrl(id){
             var reStr = full;
             if (full.length > 0){
                 if (full.indexOf("://") >= 0){
-                    reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                 }
                 else{
-                    reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                 }
             }
             return reStr ;

From 2abb68c00cba170db035219d4e699e9d41456f56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 10:54:49 +0800
Subject: [PATCH 129/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=83=A8=E5=88=86=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb          | 70 +------------------
 app/views/organizations/_org2_footer.html.erb | 12 ++++
 .../organizations/_org_avater_swap.html.erb   |  8 +++
 .../organizations/_org_field_menu.html.erb    | 44 ++++++++++++
 4 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 app/views/organizations/_org2_footer.html.erb
 create mode 100644 app/views/organizations/_org_avater_swap.html.erb
 create mode 100644 app/views/organizations/_org_field_menu.html.erb

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index e51a62e24..c234fd288 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -62,66 +62,15 @@
   <div class="sn-header">
     <div class="sn-row sn-bg-white">
       <div class="sn-logo">
-        <% if @org_logo_attchment.blank? || !User.current.logged? %>
-            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
-        <% else %>
-            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">
-        <% end %>
-        <% if User.current.admin_of_org?(@organization) %>
-            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
-        <% end %>
+        <%= render :partial => 'org_avater_swap', :org_logo_attchment => @org_logo_attchment %>
         <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
-
         <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
         <%= render :partial => 'organizations/org_logined_header' %>
       </div>
     </div>
     <!--导航-->
     <div class="sn-row sn-bg-blue sn-p-relative">
-      <ul class="sn-nav">
-        <% @subfield_content.each do |field| %>
-            <% if is_default_field?(field) %>
-                <% case field.name %>
-                <% when 'activity' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
-                    </li>
-                <% when 'course' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-                    </li>
-                <% when 'project' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-                    </li>
-                <% end %>
-            <% else %>
-                <% if field.field_type == "Post" && field.hide == 0 %>
-                    <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-                    </li>
-                    <!--二级目录-->
-                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
-                      <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
-                        <% field.sub_domains.each do |subdomain| %>
-                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
-                            <li class="sn-subnav-slice">|</li>
-                        <% end %>
-                      </ul>
-                    </div>
-                <% elsif field.field_type == "Resource" && field.hide == 0 %>
-                    <li class="nav-element">
-                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-                    </li>
-                <% end %>
-            <% end %>
-        <% end %>
-        <% if User.current.admin_of_org?(@organization) %>
-            <li class="nav-element">
-              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
-            </li>
-        <% end %>
-      </ul>
+      <%= render :partial => "org_field_menu", :locals => {:subfield_content => @subfield_content} %>
     </div>
   </div>
 </header>
@@ -136,20 +85,7 @@
 </div>
 <!--内容结束-->
 <footer>
-  <!--footer-->
-  <div class="sn-row sn-bg-grey2">
-    <div class="sn-footer">
-      <ul class="sn-footer-link">
-        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
-        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
-        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
-      </ul>
-      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
-      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
-        卫星导航仿真与测试开放实验室</div>
-    </div>
-  </div>
+  <%= render :partial => "org2_footer" %>
 </footer>
 
 <!--页面底部-->
diff --git a/app/views/organizations/_org2_footer.html.erb b/app/views/organizations/_org2_footer.html.erb
new file mode 100644
index 000000000..9ff7051c1
--- /dev/null
+++ b/app/views/organizations/_org2_footer.html.erb
@@ -0,0 +1,12 @@
+<div class="sn-row sn-bg-grey2">
+  <div class="sn-footer">
+    <ul class="sn-footer-link">
+      <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+      <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+      <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+      <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+    </ul>
+    <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+    <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />卫星导航仿真与测试开放实验室</div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_avater_swap.html.erb b/app/views/organizations/_org_avater_swap.html.erb
new file mode 100644
index 000000000..70bdf3b1b
--- /dev/null
+++ b/app/views/organizations/_org_avater_swap.html.erb
@@ -0,0 +1,8 @@
+<% if @org_logo_attchment.blank? || !User.current.logged? %>
+    <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
+<% else %>
+    <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">
+<% end %>
+<% if User.current.admin_of_org?(@organization) %>
+    <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_field_menu.html.erb b/app/views/organizations/_org_field_menu.html.erb
new file mode 100644
index 000000000..792bea87e
--- /dev/null
+++ b/app/views/organizations/_org_field_menu.html.erb
@@ -0,0 +1,44 @@
+<ul class="sn-nav">
+  <% subfield_content.each do |field| %>
+      <% if is_default_field?(field) %>
+          <% case field.name %>
+  <% when 'activity' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+              </li>
+          <% when 'course' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+              </li>
+          <% when 'project' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+              </li>
+          <% end %>
+      <% else %>
+          <% if field.field_type == "Post" && field.hide == 0 %>
+              <li class="nav-element">
+                <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+              </li>
+              <!--二级目录-->
+              <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                  <% field.sub_domains.each do |subdomain| %>
+                      <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                      <li class="sn-subnav-slice">|</li>
+                  <% end %>
+                </ul>
+              </div>
+          <% elsif field.field_type == "Resource" && field.hide == 0 %>
+              <li class="nav-element">
+                <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+              </li>
+          <% end %>
+      <% end %>
+  <% end %>
+  <% if User.current.admin_of_org?(@organization) %>
+      <li class="nav-element">
+        <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file

From 415b624e0bba4456848995741f8076b7fc5216ad Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 11:07:36 +0800
Subject: [PATCH 130/668] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_show_new_upload.html.erb b/app/views/users/_show_new_upload.html.erb
index b343aeae1..e63cf2af9 100644
--- a/app/views/users/_show_new_upload.html.erb
+++ b/app/views/users/_show_new_upload.html.erb
@@ -1,3 +1 @@
-<% if @type != "2" %>
-    <div class="resourcesUploadBox mt10" ><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
-<% end %>
+<div class="resourcesUploadBox mt10" ><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index d2e3242d8..3c70e6c33 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -58,7 +58,7 @@
     <!--<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>-->
     <!--</li>-->
-    <li class="fl w680 border-bottom h34">&nbsp;</li>
+    <li class="fl w770 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">
         <%= render :partial => 'user_resource_type_filter' %>

From 72ae31b7f989b21b80eae84131a7a237eecea94f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 11:23:19 +0800
Subject: [PATCH 131/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1e12db25d..121b93dc5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1095,23 +1095,27 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    search = params[:search].to_s.strip.downcase
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
-    if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
-      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "2" #课程资源
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "6" #公共资源
-      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 7

From c4c0dd3c60b5577a5b147e5f81b5f0ed5a8d2b29 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 25 May 2016 13:50:59 +0800
Subject: [PATCH 132/668] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=E6=9C=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                                       | 2 +-
 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/stylesheets/weui/weixin.css            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/1234567 b/1234567
index f2f064de8..ed94d1804 100644
--- a/1234567
+++ b/1234567
@@ -1 +1 @@
-{"access_token":"gRbIMUYYKFdANxpBGhYc8iauelCeSy3x7wODnZd1crF9upNiANKAdGaMKFLcgPz_0-oJvRtb7Ai0G1WnL_AnVV-tdRlzlCPpgpO9Z9k9EqrGz2iSLCAbQ35qk0f75KWlRRDfCEAVVH","expires_in":7200,"got_token_at":1464053170}
\ No newline at end of file
+{"access_token":"q51KZUeA6_-CCCH-Buy1m4pR7G9hh-9GT_Vn-h9oFq8qfF9SVVeagJZ7Jeuvv3k12UEXk7IxtAuXkrBlufaanGd81bNEEkXkPyhPveTHenmjj5fQa3GQmxCM9kUPhZjyXMPjCIAKZC","expires_in":7200,"got_token_at":1464146250}
\ No newline at end of file
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 8473b1446..8c5dcb73f 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -24,7 +24,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
                         <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index c790fd5cf..bf450d447 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -30,7 +30,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
                         <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 18f62be1e..ac1f7dcea 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -30,7 +30,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{comments.author.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{comments.author.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="comments.comments|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="comments.comments|safeHtml"></pre>
                         <div class="post-reply-date fl">{{comments.created_on}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 5efa7c54d..41ff56f57 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -36,7 +36,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
                         <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 20c35c664..08eb9a39d 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -34,7 +34,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
                         <div class="post-reply-date fl">{{journal.created_on}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index f9aebd632..f813d19c1 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -22,7 +22,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
+                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
                         <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 0c3f9aad3..c0a609bc0 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -30,7 +30,7 @@
                         <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                         <div class="ml55">
                             <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
                             <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                             <div class="post-reply-trigger fr undis">回复</div>
                         </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 8b135dbeb..f0e336563 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -3,7 +3,7 @@
 
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
+h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
 .f12 {font-size:12px;}
 .f13 {font-size:13px;}
 .f15 {font-size:15px;}

From 0a8d21ea5579a52ba59be284c1ff7470af380fc1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 14:05:09 +0800
Subject: [PATCH 133/668] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=95=E7=AB=AF=E5=8F=91=E9=80=81JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 26e8f922b..3f5138107 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -49,8 +49,6 @@
             alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
             return;
         }
-
-
         if(data != "" && confirm('确认要删除这些资源吗？')) {
             $.post(
                     '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
@@ -62,8 +60,6 @@
         }
     }
 
-
-
     function show_send(){
         $("#contextMenu").hide();
         document.oncontextmenu = function() {return true;}
@@ -99,13 +95,26 @@
         if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                url: '<%= search_user_project_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
                 data:{send_type:'file'}
             });
-        }else{
+        }else if (lastSendType === '1'){
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }else if (lastSendType === '3'){
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_org_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }
+        else{
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type %>",
                 data:{send_type:'file'}
             });
 

From 457cf72263c9c91ef14670f882aa44a11cacd6aa Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 14:08:05 +0800
Subject: [PATCH 134/668] =?UTF-8?q?=E6=96=AD=E8=A1=8C=E6=A0=B7=E5=BC=8F=20?=
 =?UTF-8?q?=E5=8F=91=E9=80=81JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 26e8f922b..cdd270a56 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -99,13 +99,26 @@
         if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                url: '<%= search_user_project_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
                 data:{send_type:'file'}
             });
-        }else{
+        }else if (lastSendType === '1'){
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }else if (lastSendType === '3'){
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_org_user_path(User.current.id) %>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }
+        else{
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type %>",
                 data:{send_type:'file'}
             });
 
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index d2e3242d8..3c70e6c33 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -58,7 +58,7 @@
     <!--<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>-->
     <!--</li>-->
-    <li class="fl w680 border-bottom h34">&nbsp;</li>
+    <li class="fl w770 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">
         <%= render :partial => 'user_resource_type_filter' %>

From 921b01e8e3eda778aa56676b000262bf9a40e5b7 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 25 May 2016 14:26:49 +0800
Subject: [PATCH 135/668] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=96=87=E5=AD=97=E5=86=85=E5=AE=B9=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js   | 7 ++++++-
 public/stylesheets/weui/weixin.css | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 5d94afca4..0817eaa58 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -136,7 +136,7 @@ app.factory('common', function($http, auth, $routeParams){
             url: apiUrl+ "new_comment/"+id,
             data: userInfo
         }).then(function successCallback(response) {
-            alert("提交成功");
+            //alert("提交成功");
             //数据提交完成,回复按钮启用
             data.disabled = false;
             if(typeof cb === 'function'){
@@ -410,11 +410,16 @@ app.directive('inputAuto',function(){
         scope: {},
         link: function(scope, element){
                 var copyContainer = element.parent().children().eq(0);
+                var sendButton = element.parent().next();
                 element.on('input',function(){
+                    console.log(sendButton);
                     copyContainer.html(element[0].value);
                     var textHeight = copyContainer[0].scrollHeight;
                     element.css('height', textHeight + 'px');
                 });
+                sendButton.on('click',function(){
+                    element.css('height','28px');
+                });
             }
     }
 });
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index f0e336563..0455c81e3 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -70,7 +70,7 @@ a.underline {text-decoration:underline;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
 .post-input-container {padding-right:2px;}
 .copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
-.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:hidden; resize:none;}
+.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:auto; resize:none;}
 .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
 .reply-icon {background:url(/images/wechat/wechat_icon.gif) -100px 1px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/wechat_icon.gif) -100px -38px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}

From d9bd13c2fc5c9a1b5928a6db27b2ddf5c1078e03 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 May 2016 14:57:46 +0800
Subject: [PATCH 136/668] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb | 32 +++++------
 app/views/courses/new.html.erb          | 30 +++++-----
 app/views/courses/settings.html.erb     | 22 ++++----
 public/javascripts/course.js            | 74 ++++++++++++-------------
 4 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 402e00cf6..3b6d55d96 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,17 +1,17 @@
 <script type="text/javascript">
     function submit_copy_course() {
-        if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
+        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
         {
             $("#new_course").submit();
             document.getElementById("submit_copy_course").onclick = "";
         }
     }
     $(document).ready(function(){
-        $("#time").change(function(){
-            document.getElementById("end_time").options[document.getElementById("time").selectedIndex].selected = true;
+        $("#new_time").change(function(){
+            document.getElementById("new_end_time").options[document.getElementById("new_time").selectedIndex].selected = true;
         });
-        $("#term").change(function(){
-            document.getElementById("end_term").options[document.getElementById("term").selectedIndex].selected = true;
+        $("#new_term").change(function(){
+            document.getElementById("new_end_term").options[document.getElementById("new_term").selectedIndex].selected = true;
         });
 
         var popupHeight = $(".referenceResourcesPopup").outerHeight(true);
@@ -56,35 +56,35 @@
       <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
       <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
-      <input  type="text" name="course[name]" id="course_name" class="courses_input grey_border" maxlength="100" onkeyup="regex_course_name();" value="<%=@course.name %>">
-      <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+      <input  type="text" name="course[name]" id="new_course_name" class="courses_input grey_border" maxlength="100" onkeyup="regex_course_name('new');" value="<%=@course.name %>">
+      <span class="c_red" id="new_course_name_notice" style="display: none;">课程名称不能为空</span>
     <div class="cl"></div>
     <li class="ml45">
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
-      <input  type="text" name="class_period" id="class_period" class="hwork_input02 grey_border" onkeyup="regex_course_class_period();" maxlength="6" value="<%=@course.class_period %>">
-      <span class="c_red" id="course_class_period_notice" style="display: none;"></span>
+      <input  type="text" name="class_period" id="new_class_period" class="hwork_input02 grey_border" onkeyup="regex_course_class_period('new');" maxlength="6" value="<%=@course.class_period %>">
+      <span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>
     </li>
     <div class="cl"></div>
     <li class="ml45 mb10">
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-      <%= select_tag :time,options_for_select(course_time_option(@new_course.time),@new_course.time), {}  %>
-      <%= select_tag :term,options_for_select(course_term_option,@new_course.term || cur_course_term),{}  %>
-      <span class="c_red" id="course_time_term_notice"></span>
+      <%= select_tag :time,options_for_select(course_time_option(@new_course.time),@new_course.time), {:id=>"new_time"}  %>
+      <%= select_tag :term,options_for_select(course_term_option,@new_course.term || cur_course_term),{:id=>"new_term"}  %>
+      <span class="c_red" id="new_course_time_term_notice"></span>
     </li>
     <div class="cl"></div>
     <li class="ml45 mb10">
       <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-      <%= select_tag :end_time,options_for_select(course_time_option(@new_course.end_time),@new_course.end_time), {}  %>
-      <%= select_tag :end_term,options_for_select(course_term_option,@new_course.end_term || cur_course_term),{}  %>
+      <%= select_tag :end_time,options_for_select(course_time_option(@new_course.end_time),@new_course.end_time), {:id=>"new_end_time"}  %>
+      <%= select_tag :end_term,options_for_select(course_term_option,@new_course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
       <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
     </li>
     <div class="cl"></div>
     <li class="ml45 mb10">
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
       <input type="text" style="display: none;">
-      <input  type="text" name="course[password]" id="course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password();" value="<%=@course.password %>">
+      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%=@course.password %>">
       <!--<a id="psw_btn" href="javascript:void(0)">显示明码</a>-->
-      <span class="c_red" id="course_course_password_notice"></span>
+      <span class="c_red" id="new_course_course_password_notice"></span>
       <div class="cl"></div>
       <span class="ml95 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
     </li>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index dc2509c77..ef1a0fc58 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -8,36 +8,36 @@
           <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
           <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();">
-          <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
+          <input  type="text" name="course[name]" id="new_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('new');">
+          <span class="c_red" id="new_course_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="class_period" id="class_period" class="hwork_input02" onkeyup="regex_course_class_period();" maxlength="6">
-          <span class="c_red" id="course_class_period_notice" style="display: none;"></span>
+          <input  type="text" name="class_period" id="new_class_period" class="hwork_input02" onkeyup="regex_course_class_period('new');" maxlength="6">
+          <span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>
         </li>
         <div class="cl"></div>
         <li  class="ml45 mb10">
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-          <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {}  %>
-          <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{}  %>
-          <span class="c_red" id="course_time_term_notice"></span>
+          <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"new_time"}  %>
+          <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"new_term"}  %>
+          <span class="c_red" id="new_course_time_term_notice"></span>
         </li>
         <div class="cl"></div>
         <li  class="ml45 mb10">
           <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-          <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {}  %>
-          <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{}  %>
+          <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"new_end_time"}  %>
+          <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
           <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
         </li>
         <div class="cl"></div>
         <li class="ml45 mb10">
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
           <input type="text" style="display: none;">
-          <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" onkeyup="regex_course_password();">
+          <input  type="password" name="course[password]" id="new_course_course_password" class="hwork_input02" onkeyup="regex_course_password('new');">
           <a id="psw_btn" href="javascript:void(0)">显示明码</a>
-          <span class="c_red" id="course_course_password_notice"></span>
+          <span class="c_red" id="new_course_course_password_notice"></span>
           <div class="cl"></div>
           <span class="ml80 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
         </li>
@@ -75,11 +75,11 @@
 <div class="cl"></div>
 <script>
   $(function(){
-      $("#time").change(function(){
-        document.getElementById("end_time").options[document.getElementById("time").selectedIndex].selected = true;
+      $("#new_time").change(function(){
+        document.getElementById("new_end_time").options[document.getElementById("new_time").selectedIndex].selected = true;
       });
-      $("#term").change(function(){
-          document.getElementById("end_term").options[document.getElementById("term").selectedIndex].selected = true;
+      $("#new_term").change(function(){
+          document.getElementById("new_end_term").options[document.getElementById("new_term").selectedIndex].selected = true;
       });
   });
 </script>
\ No newline at end of file
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index b0c4a067f..82123a767 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -33,35 +33,35 @@
             <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
             <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
-            <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();" value="<%= @course.name%>">
-            <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+            <input  type="text" name="course[name]" id="edit_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('edit');" value="<%= @course.name%>">
+            <span class="c_red" id="edit_course_name_notice" style="display: none;">课程名称不能为空</span>
             <input type="password" style="top: -100000px;position: fixed;">
           </li>
           <div class="cl"></div>
           <li  class="ml45">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
-            <input  type="text" name="class_period" id="class_period" class="hwork_input02" onkeyup="regex_course_class_period();" maxlength="6" value="<%= @course.class_period%>">
-            <span class="c_red" id="course_class_period_notice" style="display: none;"></span>
+            <input  type="text" name="class_period" id="edit_class_period" class="hwork_input02" onkeyup="regex_course_class_period('edit');" maxlength="6" value="<%= @course.class_period%>">
+            <span class="c_red" id="edit_course_class_period_notice" style="display: none;"></span>
           </li>
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time"}  %>
-            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term"}  %>
+            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"edit_time"}  %>
+            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"edit_term"}  %>
           </li>
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time"}  %>
-            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term"}  %>
-            <span class="c_red" id="course_time_term_notice"></span>
+            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"edit_end_time"}  %>
+            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"edit_end_term"}  %>
+            <span class="c_red" id="edit_course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password();">
+            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password('edit');">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
-            <span class="c_red" id="course_course_password_notice"></span>
+            <span class="c_red" id="edit_course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
           </li>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 0bba3264b..7cfad6005 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -73,79 +73,79 @@ function hidden_homework_score_form()
 ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////新建课程相关
 //验证课程名称
-function regex_course_name()
+function regex_course_name(str)
 {
-    var name = $.trim($("#course_name").val());
+    var name = $.trim($("#"+str+"_course_name").val());
     if(name.length < 2)
     {
-        $("#course_name_notice").show();
+        $("#"+str+"_course_name_notice").show();
         return false;
     }
     else
     {
-        $("#course_name_notice").hide();
+        $("#"+str+"_course_name_notice").hide();
         return true;
     }
 }
 //验证课程学时
-function regex_course_class_period()
+function regex_course_class_period(str)
 {
-    var class_period = $.trim($("#class_period").val());
+    var class_period = $.trim($("#"+str+"_class_period").val());
     var regex = /^\d*$/;
     if(class_period.length == 0)
     {
-        $("#course_class_period_notice").html("学时总数不能为空");
-        $("#course_class_period_notice").show();
+        $("#"+str+"_course_class_period_notice").html("学时总数不能为空");
+        $("#"+str+"_course_class_period_notice").show();
         return false;
     }
     else if (regex.test(class_period)) {
         if(parseInt(class_period) > 0)
         {
-            $("#course_class_period_notice").html("");
-            $("#course_class_period_notice").hide();
+            $("#"+str+"_course_class_period_notice").html("");
+            $("#"+str+"_course_class_period_notice").hide();
             return true;
         }
         else
         {
-            $("#course_class_period_notice").html("学时总数必须大于0");
-            $("#course_class_period_notice").show();
+            $("#"+str+"_course_class_period_notice").html("学时总数必须大于0");
+            $("#"+str+"_course_class_period_notice").show();
             return false;
         }
     }
     else
     {
-        $("#course_class_period_notice").html("学时总数必须为正整数");
-        $("#course_class_period_notice").show();
+        $("#"+str+"_course_class_period_notice").html("学时总数必须为正整数");
+        $("#"+str+"_course_class_period_notice").show();
         return false;
     }
 }
 //验证开始学期和结束学期
-function regex_time_term(){
-    var obj_time = document.getElementById("time");
-    var obj_end_time = document.getElementById("end_time");
-    var obj_term = document.getElementById("term");
-    var obj_end_term = document.getElementById("end_term");
+function regex_time_term(str){
+    var obj_time = document.getElementById(str+"_time");
+    var obj_end_time = document.getElementById(str+"_end_time");
+    var obj_term = document.getElementById(str+"_term");
+    var obj_end_term = document.getElementById(str+"_end_term");
     var time = obj_time.options[obj_time.selectedIndex];
     var end_time = obj_end_time.options[obj_end_time.selectedIndex];
     var term = obj_term.options[obj_term.selectedIndex];
     var end_term = obj_end_term.options[obj_end_term.selectedIndex];
     if(time.value == end_time.value) {
         if(set_term_val(term.value) > set_term_val(end_term.value)) {
-            $("#course_time_term_notice").html("开始学期不能晚于结束学期");
-            $("#course_time_term_notice").show();
+            $("#"+str+"_course_time_term_notice").html("开始学期不能晚于结束学期");
+            $("#"+str+"_course_time_term_notice").show();
             return false;
         } else {
-            $("#course_time_term_notice").html("");
-            $("#course_time_term_notice").hide();
+            $("#"+str+"_course_time_term_notice").html("");
+            $("#"+str+"_course_time_term_notice").hide();
             return true;
         }
     } else if(time.value < end_time.value) {
-        $("#course_time_term_notice").html("");
-        $("#course_time_term_notice").hide();
+        $("#"+str+"_course_time_term_notice").html("");
+        $("#"+str+"_course_time_term_notice").hide();
         return true;
     } else {
-        $("#course_time_term_notice").html("开始学期不能晚于结束学期");
-        $("#course_time_term_notice").show();
+        $("#"+str+"_course_time_term_notice").html("开始学期不能晚于结束学期");
+        $("#"+str+"_course_time_term_notice").show();
         return false;
     }
 }
@@ -160,32 +160,32 @@ function set_term_val(val) {
     }
 }
 //验证密码
-function regex_course_password()
+function regex_course_password(str)
 {
-    var class_period = $.trim($("#course_course_password").val());
+    var class_period = $.trim($("#"+str+"_course_course_password").val());
     var regex = /^\w+$/;
     if(class_period.length == 0)
     {
-        $("#course_course_password_notice").html("课程密码不能为空");
-        $("#course_course_password_notice").show();
+        $("#"+str+"_course_course_password_notice").html("课程密码不能为空");
+        $("#"+str+"_course_course_password_notice").show();
         return false;
     }
     else if (regex.test(class_period)) {
-        $("#course_course_password_notice").html("");
-        $("#course_course_password_notice").hide();
+        $("#"+str+"_course_course_password_notice").html("");
+        $("#"+str+"_course_course_password_notice").hide();
         return true;
     }
     else
     {
-        $("#course_course_password_notice").html("课程密码有非法字符");
-        $("#course_course_password_notice").show();
+        $("#"+str+"_course_course_password_notice").html("课程密码有非法字符");
+        $("#"+str+"_course_course_password_notice").show();
         return false;
     }
 }
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
+    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
     {
         $("#new_course").submit();
     }
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
+    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit')&&regex_course_password('edit'))
     {
         $("#edit_course_"+id).submit();
     }

From c8467a50a023a2381dede7b6fdf359a3bf4f03ad Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 May 2016 16:19:41 +0800
Subject: [PATCH 137/668] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=BB=99=E8=87=AA=E5=B7=B1=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/praise_tread_controller.rb       | 16 ++++++++--------
 app/views/blog_comments/show.html.erb            | 12 ++----------
 app/views/messages/_course_show.html.erb         | 10 +---------
 app/views/messages/_project_show.html.erb        | 12 ++----------
 app/views/news/_course_show.html.erb             | 12 ++----------
 app/views/org_document_comments/show.html.erb    | 12 ++----------
 .../organizations/_org_course_homework.html.erb  | 14 +++-----------
 .../organizations/_org_course_message.html.erb   | 12 ++----------
 .../organizations/_org_course_news.html.erb      | 14 +++-----------
 .../organizations/_org_project_issue.html.erb    | 12 ++----------
 .../organizations/_org_subfield_message.html.erb | 12 ++----------
 .../organizations/_org_subfield_news.html.erb    | 12 ++----------
 .../organizations/_project_message.html.erb      | 12 ++----------
 .../organizations/_show_org_document.html.erb    | 12 ++----------
 app/views/projects/_project_news.html.erb        | 12 ++----------
 app/views/users/_course_homework.html.erb        | 12 ++----------
 .../users/_course_journalsformessage.html.erb    | 13 +++++++++----
 app/views/users/_course_message.html.erb         | 12 ++----------
 app/views/users/_course_news.html.erb            | 12 ++----------
 app/views/users/_project_issue_reply.html.erb    | 14 +++-----------
 app/views/users/_project_message.html.erb        | 12 ++----------
 app/views/users/_user_activities.html.erb        | 12 ++++++------
 app/views/users/_user_blog.html.erb              | 12 ++----------
 app/views/users/_user_homework_detail.html.erb   | 12 ++----------
 .../users/_user_journalsformessage.html.erb      | 12 ++----------
 25 files changed, 69 insertions(+), 240 deletions(-)

diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index 96eeab884..0c665341a 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -25,14 +25,14 @@ class PraiseTreadController < ApplicationController
         return
       end
       @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal]
-      if @obj.respond_to?("author_id")
-        author_id = @obj.author_id
-      elsif @obj.respond_to?("user_id")
-        author_id = @obj.user_id
-      end
-      unless author_id == User.current.id
-        praise_tread_plus(@obj_type,@obj_id,1)
-      end
+      # if @obj.respond_to?("author_id")
+      #   author_id = @obj.author_id
+      # elsif @obj.respond_to?("user_id")
+      #   author_id = @obj.user_id
+      # end
+      # unless author_id == User.current.id
+         praise_tread_plus(@obj_type,@obj_id,1)
+      # end
       respond_to do |format|
         format.js
       end
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index d3763abf3..288a02d56 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -122,11 +122,7 @@
           <div class="homepagePostReplyBannerCount">回复
             <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
             <span id="praise_count_<%=@article.id %>">
-            <% if @article.author == User.current %>
-                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@article) > 0 ? "（#{get_praise_num(@article)}）" : "" %></span></span>
-            <% else %>
                 <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%>
-            <% end %>
             </span>
           </div>
           <div class="homepagePostReplyBannerTime"></div>
@@ -162,12 +158,8 @@
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_on) %>
                     <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                    </span>
                     <div class="fr mr10" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
                                   l(:button_reply),
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 443440455..746881bdc 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -95,11 +95,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= @reply_count>0 ? "（#{@reply_count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=@topic.id %>">
-          <% if @topic.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@topic) > 0 ? "（#{get_praise_num(@topic)}）" : "" %></span></span>
-          <% else %>
             <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
-          <% end %>
         </span>
       </div>
     </div>
@@ -131,11 +127,7 @@
                 <%= format_time(reply.created_on) %>
                 <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                   <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr newsGrey" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                   </span>
                   <%= link_to(
                               l(:button_reply),
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 35b3f8a3c..39990e215 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -151,11 +151,7 @@
         <div class="homepagePostReplyBannerCount">回复
           <sapn class="mr15"><%= @reply_count>0 ? "（#{@reply_count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
           <span id="praise_count_<%=@topic.id %>">
-          <% if @topic.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@topic) > 0 ? "（#{get_praise_num(@topic)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
-          <% end %>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
         </span>
         </div>
       </div>
@@ -187,11 +183,7 @@
                       <%= format_time(reply.created_on) %>
                       <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                         <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr newsGrey" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                         </span>
                         <%= link_to(
                                     l(:button_reply),
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 5908c7593..fc877d809 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -101,11 +101,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= @comments.count>0 ? "（#{@comments.count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=@news.id %>">
-          <% if @news.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@news) > 0 ? "（#{get_praise_num(@news)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
-          <% end %>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
         </span>
       </div>
     </div>
@@ -137,11 +133,7 @@
                     <%= format_time(reply.created_on) %>
                     <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr newsGrey" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                       <%= link_to_if_authorized_course(
                                   l(:button_delete),
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index e2967a9ae..4fc9482d4 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -71,11 +71,7 @@
           <div class="homepagePostReplyBannerCount">回复
             <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
             <span id="praise_count_<%=@document.id %>">
-            <% if @document.creator_id.to_i == User.current.id.to_i %>
-                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@document) > 0 ? "（#{get_praise_num(@document)}）" : "" %></span></span>
-            <% else %>
-                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
-            <% end %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
             </span>
           </div>
         </div>
@@ -100,11 +96,7 @@
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_at) %>
                     <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.creator_id.to_i == User.current.id.to_i %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                     </span>
                     <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index d3fe36fe3..bcbeca778 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -290,12 +290,8 @@
         <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.user == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+       </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
@@ -359,11 +355,7 @@
                       <div class="reply">
                                 <span class="reply-right">
                                     <span id="reply_praise_count_<%=comment.id %>">
-                                      <% if comment.user == User.current %>
-                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                                      <% else %>
-                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                      <% end %>
+                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                                     </span>
                                     <span style="position: relative" class="fr mr20">
                                         <%= link_to(
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index e68745f7a..03e986716 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -74,11 +74,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
@@ -117,11 +113,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index acf0f0377..8c260c21c 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -44,12 +44,8 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+       </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
@@ -86,11 +82,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 9ca10c91d..94eb2820a 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -55,11 +55,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -97,11 +93,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 61bc5bc7f..bcc43610e 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -84,11 +84,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <%if count>3 %>
@@ -122,11 +118,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 5d6c38542..662a965e9 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -64,11 +64,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%= user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -106,11 +102,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                        <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index e1b000c70..4407d86bd 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -57,11 +57,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
@@ -96,11 +92,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index e8f531206..3042ca9ae 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -69,11 +69,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=document.id %>">
-          <% if document.creator_id.to_i == User.current.id.to_i %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
         </span>
       </div>
       <% if count > 3 %>
@@ -102,11 +98,7 @@
                   <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
                   <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
                   <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.creator_id.to_i == User.current.id.to_i %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                   </span>
                 </div>
                 <% unless comment.content.blank? %>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 6d97b252d..7baf93e4f 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -44,11 +44,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -86,11 +82,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 3721244ed..e694f471e 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -296,11 +296,7 @@
         <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.user == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
@@ -365,11 +361,7 @@
                       <div class="reply">
                                 <span class="reply-right">
                                     <span id="reply_praise_count_<%=comment.id %>">
-                                      <% if comment.user == User.current %>
-                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                                      <% else %>
-                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                      <% end %>
+                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                                     </span>
                                     <span style="position: relative" class="fr mr20">
                                         <%= link_to(
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index aeb7f5e5d..a76081859 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -33,10 +33,12 @@
   </div>
   <% count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount">
-        回复（<%= count %>）
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
@@ -72,6 +74,9 @@
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
+                      <span id="reply_praise_count_<%=comment.id %>">
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                      </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 8b6056309..c0e667396 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -91,11 +91,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
@@ -134,11 +130,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
 
                     </div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 19d62b14e..b89873b43 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -69,11 +69,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -111,11 +107,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 5323b76b6..2b43d8acf 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -4,11 +4,7 @@
     <div class="homepagePostReplyBannerCount">回复
       <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
     </div>
     <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -46,12 +42,8 @@
                     <% end %>
                     <%= format_time(reply.created_on) %>
                     <span id="reply_praise_count_<%= reply.id %>">
-                          <% if reply.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
+                       <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                    </span>
                   </div>
                   <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                     <% if reply.details.any? %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index b6e3f9a94..b3c2fea59 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -90,11 +90,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
@@ -129,11 +125,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2fe7315d5..432074191 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -5,24 +5,24 @@
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
-        })
+        });
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
-        })
+        });
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
-        })
+        });
         $(".coursesLineGrey").mouseout(function(){
             $(this).css("color","#808080");
-        })
+        });
         $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){
             $(this).prev().css("color","#ffffff");
             $(this).css("z-index", "9999");
-        })
+        });
         $(".homepagePostSetting").mouseout(function(){
             $(this).prev().css("color","#808080");
             $(this).css("z-index", "1");
-        })
+        });
     })
 </script>
 
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index de5ffc31f..522bdc835 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -50,11 +50,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -92,11 +88,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index f81fbabf5..650ced5dc 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -306,11 +306,7 @@
         <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=homework_common.id %>">
-          <% if homework_common.user == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(homework_common) > 0 ? "（#{get_praise_num(homework_common)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
@@ -379,11 +375,7 @@
                       <div class="reply">
                                 <span class="reply-right">
                                     <span id="reply_praise_count_<%=comment.id %>">
-                                      <% if comment.user == User.current %>
-                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                                      <% else %>
-                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                      <% end %>
+                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                                     </span>
                                     <span style="position: relative" class="fr mr20">
                                         <%= link_to(
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 47d5145ac..6967bb398 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -64,11 +64,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.user == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
@@ -106,11 +102,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                       <div id="message_delete_<%=comment.id %>" style="display: none" class="mr10 fr">
                           <% if comment.user == User.current|| User.current.admin? %>

From 8257770ec902b6a2dee0895cbf7a00840f05eaff Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 May 2016 16:20:01 +0800
Subject: [PATCH 138/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=95=99=E8=A8=80=E7=9A=84=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_history.html.erb           | 3 +++
 app/views/projects/_history.html.erb          | 4 +++-
 app/views/words/_journal_reply_items.html.erb | 3 +++
 public/stylesheets/courses.css                | 1 +
 public/stylesheets/project.css                | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 864509546..ba89db0f9 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -23,6 +23,9 @@
             <div class="ping_disfoot f14">
               <% ids = 'project_respond_form_'+ journal.id.to_s%>
 
+              <span id="reply_praise_count_<%=journal.id %>">
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
+              </span>
               <% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
                   <%= link_to(l(:label_bid_respond_delete),
                               {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index b31445fdc..88cf8f344 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -14,6 +14,9 @@
                 </div>
                 <div class="ping_disfoot f14">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
+                  <span id="reply_praise_count_<%=journal.id %>">
+                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
+                  </span>
                     <% if journal.user == User.current|| User.current.admin? %>
                       <%= link_to(l(:label_bid_respond_delete),
                                   {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
@@ -26,7 +29,6 @@
                         <%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
 
                     <% end %>
-                </span>
                 </div>
                 <div class="cl"></div>
                 <% ids = 'project_respond_form_'+ journal.id.to_s%>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index db848d2cd..2616cfd24 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -29,6 +29,9 @@
               <%= format_time reply.created_on %>
             </span>
         <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+          <span id="reply_praise_count_<%=reply.id %>">
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+          </span>
           <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
               <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
                           :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index a55755740..55f2a0ffc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -439,6 +439,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .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_disfoot span a span{ color: #6883b6;}
 /*.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: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 09f7075f7..76228ceb7 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -332,6 +332,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .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_disfoot span a span{ color: #6883b6;}
 /*.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: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}

From 192258a82d9a025d747f10f911c94311c771cbc3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 25 May 2016 17:04:46 +0800
Subject: [PATCH 139/668] =?UTF-8?q?1.=E5=8F=96=E6=B6=88KE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E5=80=99=E6=AE=B5=E8=90=BD=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E8=BE=B9=E8=B7=9D=202.=E5=85=88=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8E=E6=AE=B5=E8=90=BD=20=E5=8F=AF=E4=BB=A5=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=AE=B5=E8=90=BD=E6=A0=B7=E5=BC=8F=20=20=E6=AD=A3?=
 =?UTF-8?q?=E6=96=87=E8=BF=98=E4=B8=8D=E8=83=BD=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js                | 11 ++++++++++-
 public/assets/kindeditor/plugins/code/previewcode.css |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 39ce0abdb..6b0f1621b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -3311,6 +3311,7 @@ _each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull
 		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
 			self.selection();
 		}
+
 		return self;
 	};
 });
@@ -5752,7 +5753,7 @@ _plugin('core', function(K) {
 				h2 : 24,
 				h3 : 18,
 				H4 : 14,
-				p : 12
+                p : 12
 			},
 			curVal = self.cmd.val('formatblock'),
 			menu = self.createMenu({
@@ -5770,6 +5771,14 @@ _plugin('core', function(K) {
 				checked : (curVal === key || curVal === val),
 				click : function() {
 					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+                    //by yk利用html的特性使h1 h2 h3 h4标签之间不能相互包含 并将空的标签去掉
+                    if (key != "p"){
+                        var val = self.select().html();
+                        self.select().html(val);
+                        val = self.select().html().replace(/(<h1>\s*<\/h1>)|(<h2>\s*<\/h2>)|(<h3>\s*<\/h3>)|(<h4>\s*<\/h4>)/g,"");
+                        self.select().html(val);
+                        self.select();
+                    }
 				}
 			});
 		});
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 352c77625..459fbd5d6 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;}
-.ke-content ol,.ke-content ul{margin-top:0;margin-bottom: 0;}
\ No newline at end of file
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
\ No newline at end of file

From 0a7d1f1efc3faedb2ef250eaaf487b38311aa681 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 17:54:53 +0800
Subject: [PATCH 140/668] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE=E7=A8=8B=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |  4 ++-
 app/views/users/_org_file_form.html.erb       |  2 +-
 app/views/users/_project_file_form.html.erb   |  2 +-
 .../users/_resource_share_for_orgs.html.erb   |  4 +--
 ..._resource_share_for_project_popup.html.erb |  2 +-
 .../users/_resource_share_popup.html.erb      |  9 +++---
 app/views/users/_user_resource_info.html.erb  |  2 +-
 app/views/users/search_user_project.js.erb    |  2 --
 public/javascripts/application.js             | 30 +++++++++++++++++++
 9 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 121b93dc5..fa286b43b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2105,7 +2105,8 @@ class UsersController < ApplicationController
         project_ids.each do |project_id|
           next if ori.blank?
           @exist = false
-          Project.find(project_id).attachments.each do |att|  #如果课程中包含该资源
+          # 如果对象中包含该资源
+          Project.find(project_id).attachments.each do |att|
             if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
               att.created_on = Time.now
               att.save
@@ -3126,6 +3127,7 @@ class UsersController < ApplicationController
         @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
       end
     end
+    @type = params[:type]
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
index 348a68c00..b4a7bc6ef 100644
--- a/app/views/users/_org_file_form.html.erb
+++ b/app/views/users/_org_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => defined?(type) ?  type : "6" ),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => @type ),:remote=>true,:id=>'orgs_list_form' do %>
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
     <div class="sectionWrap fl mr15">
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 74e8fecc2..413ffa17a 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => defined?(type) ?  type : "6" ), :remote => true, :id => 'projects_list_form' %>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => @type ), :remote => true, :id => 'projects_list_form' %>
 <div>
   <%= hidden_field_tag(:send_id, send_id) %>
   <%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 54ff83684..b1736a378 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -7,7 +7,7 @@
         <option value="3" selected>组织</option>
       </select>
     </div>
-  <%= form_tag  search_user_org_user_path(user),:method => 'get',
+  <%= form_tag  search_user_org_user_path(user, :type => @type),:method => 'get',
                 :remote=>true,:id=>'search_user_org_form' do %>
       <%= hidden_field_tag(:send_id, send_id) %>
       <%= hidden_field_tag(:send_ids, send_ids) %>
@@ -19,5 +19,5 @@
     <div class="cl"></div>
 </div>
 <div id="org_file_form">
-  <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids, :type => type} %>
+  <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids, :type => @type} %>
 </div>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index c758ef492..23be825da 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -12,7 +12,7 @@
   </div>
   <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
   <div class="fl">
-    <%= form_tag  search_user_project_user_path(user),:method => 'get',
+    <%= form_tag  search_user_project_user_path(user, :type => @type),:method => 'get',
                   :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
         <%= hidden_field_tag(:send_id, send_id) %>
         <%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 3895446f1..93e0d0c47 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -4,7 +4,7 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
+      <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>','<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3">组织</option>
@@ -14,10 +14,9 @@
   </div>
   <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
   <div class="fl">
-    <%= form_tag  search_user_course_user_path(user),:method => 'get',
-                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
+    <%= form_tag  search_user_course_user_path(user),:method => 'get', :remote=>true, :id=> 'search_user_course_form', :class=> 'resourcesSearchBox' do %>
+      <%= hidden_field_tag(:send_id, send_id) %>
+      <%= hidden_field_tag(:send_ids, send_ids) %>
       <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
         <script>
             observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index c415ba0b4..1077d7133 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -11,7 +11,7 @@
 <div class="cl"></div>
 <form id="resources_list_form">
   <div id="resources_list">
-    <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %>
+    <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments, :type => @type} %>
   </div>
   <div class="cl"></div>
 
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 94cbd129c..37d078662 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,5 +1,3 @@
-
-
 <% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aec0af070..6eb464f64 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1178,6 +1178,36 @@ function chooseSendType(res_id,res_ids, user_id, send_type){
   lastSendType = sendType;
 }
 
+
+function chooseSendType2(res_id,res_ids, user_id, send_type, type){
+    console.log(res_ids);
+    sendType = $(".resourcesSendType").val();
+    if (sendType === lastSendType) {
+        return;
+    } else if(lastSendType != null) { //不是第一次点击的时候
+        if (sendType == '1') {
+            $.ajax({
+                type: 'get',
+                url: '/users/' + user_id + '/search_user_course' + '?' + "&type=" + type,
+                data:{send_id:res_id, send_ids:res_ids ,send_type:send_type}
+            });
+        } else if(sendType == '2') {
+            $.ajax({
+                type: 'get',
+                url: '/users/' + user_id + '/search_user_project' + '?' + "&type=" + type,
+                data:{send_id:res_id, send_ids:res_ids, send_type:send_type}
+            });
+        }else if(sendType == '3'){
+            $.ajax({
+                type: 'get',
+                url: '/users/' + user_id + '/search_user_org' + '?' + "&type=" + type,
+                data:{send_id:res_id, send_ids:res_ids, send_type:send_type}
+            });
+        }
+    }
+    lastSendType = sendType;
+}
+
 //组织新建和配置中，选择组织为私有后，disbled掉允许游客下载选项
 function disable_down(source, des, hint){
   if (source.attr("checked")){

From a3d90df5ce8c666c059ca8d84f25be2f8450b428 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 26 May 2016 10:51:39 +0800
Subject: [PATCH 141/668] delete unuse file

---
 Client.html   |  25 ----
 Gemfile.lock~ | 386 --------------------------------------------------
 Gemfile~      | 112 ---------------
 3 files changed, 523 deletions(-)
 delete mode 100644 Client.html
 delete mode 100644 Gemfile.lock~
 delete mode 100644 Gemfile~

diff --git a/Client.html b/Client.html
deleted file mode 100644
index fbb7cec52..000000000
--- a/Client.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-
-<head>
-<title>
-Client
-</title>
-</head>
-
-<body> 
-<hr />
-	<h2>这是一张图片</h2>
-	<p>photo<a href="http://10.0.47.15:3000/shares/new?access_token='2d3dda45dsd'&comment='verygood'&title=davide&share_type=1&url=http://www.baidu.com"> Share A </a></p>
-<hr />
-	
-	<h2>这是一段视频</h2>	
-	<p>Text<a href="http://10.0.47.15:3000/shares/new?access_token=2d3dda45dsd&comment=verygood&title=kaka&share_type=2&url=http://www.sina.com"> Share B </a></p>
-<hr />
-	
-	<h2>这是一篇文章</h2>	
-	<p>Text<a href="http://10.0.47.15:3000/shares/new?access_token=2d3dda45dsd&comment=verygood&title=pepe&share_type=3&url=http://www.sina.com"> Share C </a></p>
-<hr />
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/Gemfile.lock~ b/Gemfile.lock~
deleted file mode 100644
index 7d6563465..000000000
--- a/Gemfile.lock~
+++ /dev/null
@@ -1,386 +0,0 @@
-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~
deleted file mode 100644
index 24869e72b..000000000
--- a/Gemfile~
+++ /dev/null
@@ -1,112 +0,0 @@
-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

From c73ce61afe8e60850fc8be696acdc4366c87cfde Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 10:55:00 +0800
Subject: [PATCH 142/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB=EF=BC=8Cicon=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html |  14 +++++++-------
 public/images/wechat/icon.png        | Bin 0 -> 5710 bytes
 public/images/wechat/icon_list.gif   | Bin 0 -> 2780 bytes
 public/images/wechat/loading.gif     | Bin 3878 -> 0 bytes
 public/stylesheets/weui/weixin.css   |   6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100755 public/images/wechat/icon.png
 create mode 100755 public/images/wechat/icon_list.gif
 delete mode 100755 public/images/wechat/loading.gif

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 3391506f2..dbf5e8b27 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -5,7 +5,7 @@
     <div ng-repeat="act in activities">
       <div ng-if="act.container_type=='Course'">
         <div ng-if="act.act_type=='HomeworkCommon'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
             <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>
@@ -39,7 +39,7 @@
         </div>
 
         <div ng-if="act.act_type=='News'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
             <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>
@@ -66,7 +66,7 @@
         </div>
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
             <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>
@@ -109,7 +109,7 @@
 
       <div ng-if="act.container_type=='Project'">
         <div ng-if="act.act_type=='Issue'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
             <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>
@@ -139,7 +139,7 @@
 
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
             <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>
@@ -181,7 +181,7 @@
 
       <div ng-if="act.container_type=='Principal'">
         <div ng-if="act.act_type=='JournalsForMessage'">
-          <div class="post-container">
+          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
             <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>
@@ -208,7 +208,7 @@
       </div>
 
       <div ng-if="act.act_type=='BlogComment'">
-        <div class="post-container">
+        <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
           <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>
diff --git a/public/images/wechat/icon.png b/public/images/wechat/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..afc7aa639a1a8c5721ed866e851d07cf944e93b4
GIT binary patch
literal 5710
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
GgZ}`HLWBnZ

literal 0
HcmV?d00001

diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1d7dcb061e6f401767d8ada7c18c38ac178fa6f3
GIT binary patch
literal 2780
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/loading.gif b/public/images/wechat/loading.gif
deleted file mode 100755
index b806bf34c396900414f74b8e591e85333f9ab38f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3878
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

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 0455c81e3..809c3247e 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -72,9 +72,9 @@ a.underline {text-decoration:underline;}
 .copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
 .post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:auto; resize:none;}
 .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
-.reply-icon {background:url(/images/wechat/wechat_icon.gif) -100px 1px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.praise-icon {background:url(/images/wechat/wechat_icon.gif) -100px -38px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.praised-icon {background:url(/images/wechat/wechat_icon.gif) -100px -76px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 
 /* 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;}

From e4653426d29534c7ba1ef54b883fced0f8894c8f Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 26 May 2016 12:59:15 +0800
Subject: [PATCH 143/668] =?UTF-8?q?=E5=B0=86openid=E5=AD=98=E5=88=B0sessio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 155 +++++++++++++++-----------
 app/views/wechats/create.html.erb     |   0
 app/views/wechats/login.html.erb      |   6 +-
 3 files changed, 90 insertions(+), 71 deletions(-)
 delete mode 100644 app/views/wechats/create.html.erb

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 7ee0552fb..c1d235d75 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -150,87 +150,108 @@ class WechatsController < ActionController::Base
   end
 
 
-  def get_open_id
-    begin
-      raise "非法操作, code不存在" unless params[:code]
-      openid = get_openid_from_code(params[:code])
-      raise "无法获取到openid" unless openid
-      render :json => {status:0, openid: openid}
-    rescue Exception=>e
-      render :json => {status: -1, msg: e.message}
-    end
-  end
 
-  def bind
-    begin
-       raise "非法操作, code不存在" unless params[:code]
-       openid = get_openid_from_code(params[:code])
-       raise "无法获取到openid" unless openid
-       raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
 
-       user, last_login_on = User.try_to_login(params[:username], params[:password])
-       raise "用户名或密码错误,请重新登录" unless user
-       #补全用户信息
+  ###  controller method
+  include Controllers
+
+  module Controllers
+    def get_open_id
+      begin
 
-       raise "此用户已经绑定了公众号" if user.user_wechat
+        code = params[:code] || session[:wechat_code]
+        openid = get_openid_from_code(code)
 
-       UserWechat.create!(
-           openid: openid,
-           user: user
-       )
-       render :json => {status:0, msg: "绑定成功"}
-    rescue Exception=>e
-      render :json => {status: -1, msg: e.message}
+
+        raise "无法获取到微信openid" unless openid
+        render :json => {status:0, openid: openid}
+      rescue Exception=>e
+        render :json => {status: -1, msg: e.message}
+      end
     end
-  end
 
-  def login
-    @code = params[:code] #TODO 安全性
-    render 'wechats/login', layout: 'base_wechat'
-  end
+    def bind
+      begin
 
-  private
-  def get_openid_from_code(code)
-    url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=#{Wechat.config.appid}&secret=#{Wechat.config.secret}&code=#{code}&grant_type=authorization_code"
-    logger.debug url
-    body = URI.parse(url).read
-    logger.debug body
-    JSON.parse(body)["openid"]
-  end
+        code = params[:code] || session[:wechat_code]
+        openid = get_openid_from_code(code)
 
-  def user_binded?(openid)
-    uw = UserWechat.where(openid: openid).first
-  end
+        raise "无法获取到openid" unless openid
+        raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
+
+        user, last_login_on = User.try_to_login(params[:username], params[:password])
+        raise "用户名或密码错误,请重新登录" unless user
+        #补全用户信息
 
-  def user_activity(user)
-    @user = user
-    shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
-    shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
-    @page = params[:page] ? params[:page].to_i + 1 : 0
-    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','Project')"
-    principal_types = "JournalsForMessage"
+        raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
 
-    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(','))+")"
-    @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                              "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+        UserWechat.create!(
+            openid: openid,
+            user: user
+        )
+        render :json => {status:0, msg: "绑定成功"}
+      rescue Exception=>e
+        render :json => {status: -1, msg: e.message}
+      end
+    end
 
+    def login
+      session[:wechat_code] = params[:code] if params[:code]
+      render 'wechats/login', layout: 'base_wechat'
+    end
 
-  end
+    private
+    def get_openid_from_code(code)
+      openid = session[:wechat_openid]
 
-  def process_activity(user_activity)
-    act= user_activity.act
-    case user_activity.container_type.to_s
-      when 'Course'
-      when 'Project'
-        case user_activity.act_type.to_s
-          when 'Issue'
-            [act.project.name.to_s+" | 项目问题", act.subject.to_s, url_to_avatar(act.author),"http://wechat.trustie.net/app.html#/issue/#{act.id}"]
+      unless openid
+        if code
+          openid = wechat.web_access_token(code)["openid"]
         end
+      end
+
+      if openid
+        session[:wechat_openid] = openid
+      end
+
+      return openid
+    end
+
+    def user_binded?(openid)
+      uw = UserWechat.where(openid: openid).first
+    end
+
+    def user_activity(user)
+      @user = user
+      shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+      shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      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','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(','))+")"
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                                "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                                "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+
+
+    end
+
+    def process_activity(user_activity)
+      act= user_activity.act
+      case user_activity.container_type.to_s
+        when 'Course'
+        when 'Project'
+          case user_activity.act_type.to_s
+            when 'Issue'
+              [act.project.name.to_s+" | 项目问题", act.subject.to_s, url_to_avatar(act.author),"http://wechat.trustie.net/app.html#/issue/#{act.id}"]
+          end
+      end
     end
   end
+
 end
diff --git a/app/views/wechats/create.html.erb b/app/views/wechats/create.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index 0e6fd8695..dc39b9f23 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -12,19 +12,17 @@
         <div class="weui_cell">
           <div class="weui_cell_hd"><label class="weui_label">用户名</label></div>
           <div class="weui_cell_bd weui_cell_primary">
-            <input class="weui_input" autocapitalize="off" type="text" name="username" placeholder="请输入邮箱地址或昵称"/>
+            <input class="weui_input" autocapitalize="off" type="text" name="username" placeholder="请输入邮箱地址/登录名"/>
           </div>
         </div>
 
         <div class="weui_cell">
           <div class="weui_cell_hd"><label class="weui_label">密码</label></div>
           <div class="weui_cell_bd weui_cell_primary">
-            <input class="weui_input" type="password" name="password" placeholder="请输密码"/>
+            <input class="weui_input" type="password" name="password" placeholder="请输入密码"/>
           </div>
         </div>
 
-      <input type="hidden" value="<%=@code%>" name="code">
-
         <div class="weui_btn_area">
           <a class="weui_btn weui_btn_primary" id="submitForm">确定</a>
         </div>

From b48b1c97b3ed4368e4d6eeb078f08374e09cd176 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 26 May 2016 13:02:27 +0800
Subject: [PATCH 144/668] weixin

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index c1d235d75..43bab082a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -153,7 +153,7 @@ class WechatsController < ActionController::Base
 
 
   ###  controller method
-  include Controllers
+
 
   module Controllers
     def get_open_id
@@ -254,4 +254,7 @@ class WechatsController < ActionController::Base
     end
   end
 
+
+  include Controllers
+
 end

From 7bb94d9df4aea4c575d43ceed506ae28d2d80003 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 13:47:23 +0800
Subject: [PATCH 145/668] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B0=86=E5=86=85=E5=AE=B9=E5=92=8C=E6=A1=86=E6=9E=B6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         | 74 +++++++--------
 public/assets/wechat/course_discussion.html   | 89 ++++++++++---------
 public/assets/wechat/course_notice.html       |  2 +
 public/assets/wechat/homework_detail.html     |  4 +-
 public/assets/wechat/issue_detail.html        |  2 +
 public/assets/wechat/jour_message_detail.html | 70 ++++++++-------
 public/assets/wechat/project_discussion.html  |  8 +-
 7 files changed, 132 insertions(+), 117 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index ce7945872..fa3a9f341 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -1,46 +1,48 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<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><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;">
-                <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
+<div ng-if="blog.act_type == 'BlogComment'">
+    <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"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
+                <div class="cl"></div>
+                <div class="post-content" style="height:auto;">
+                    <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
+                </div>
+                <div class="cl"></div>
+                <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
+                <div class="cl"></div>
             </div>
-            <div class="cl"></div>
-            <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
-            <div class="cl"></div>
-        </div>
-        <div class="post-interactive border-bottom">
-            <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
-            <div class="post-interactive-column c-grey" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
-            <div class="post-interactive-column c-grey" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
-        </div>
-        <div id="all_blog_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in blog.blog_comment_children">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+            <div class="post-interactive border-bottom">
+                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
+                <div class="post-interactive-column c-grey" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
+                <div class="post-interactive-column c-grey" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
+            </div>
+            <div id="all_blog_reply">
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in blog.blog_comment_children">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-        </div>
-        <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">
-                    <textarea class="copy-input"></textarea>
-                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+            <div 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">
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                    </div>
+                    <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <div class="cl"></div>
                 </div>
-                <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                <div class="cl"></div>
             </div>
         </div>
     </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index f464369ae..d1b65e629 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -1,52 +1,55 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-    <div class="post-container">
-        <div class="post-wrapper">
-            <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>{{discussion.user.realname}}</td>
-                    </tr>
-                    <tr>
-                    <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                    <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
-                </tr></table>
-                <div class="post-content c-grey3 mt10" style="height:auto;">
-                    <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                </div>
-                <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
-                <div class="cl"></div>
-            </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
-            </div>
-            <div id="all_course_message_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+    <div ng-if="discussion.act_type == 'Message'">
+        <div class="post-container">
+            <div loading-spinner></div>
+            <div class="post-wrapper">
+                <div class="post-main">
+                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                    <table class="post-detail-info"><tr>
+                        <td class="text-nowrap v-top">发布者：</td>
+                        <td>{{discussion.user.realname}}</td>
+                        </tr>
+                        <tr>
+                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
+                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
+                    </tr></table>
+                    <div class="post-content c-grey3 mt10" style="height:auto;">
+                        <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                     </div>
                     <div class="cl"></div>
+                    <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
+                    <div class="cl"></div>
                 </div>
-            </div>
-            </div>
-            <div ng-if="!discussion.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">
-                        <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                <div class="post-interactive border-bottom">
+                    <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
+                    <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
+                    <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
+                </div>
+                <div id="all_course_message_reply">
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+                </div>
+                <div 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">
+                            <textarea class="copy-input"></textarea>
+                            <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        </div>
+                        <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
         </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index ac1f7dcea..c10763bf8 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="news.act_type == 'News'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -51,3 +52,4 @@
             </div>
         </div>
     </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 41ff56f57..2783bd317 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -56,4 +57,5 @@
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 08eb9a39d..035a7c98d 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -55,3 +56,4 @@
             </div>
         </div>
     </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index f813d19c1..5ccbf6248 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -1,44 +1,46 @@
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<div class="post-container">
-    <div class="post-wrapper">
-        <div class="post-main">
-            <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
-            <div class="post-title">{{message.created_on}}</div>
-            <div class="cl"></div>
-            <div class="post-content c-grey2 mt10" style="height:auto;">
-                <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
+<div ng-if="message.act_type == 'JournalsForMessage'">
+    <div class="post-container">
+        <div class="post-wrapper">
+            <div class="post-main">
+                <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
+                <div class="post-title">{{message.created_on}}</div>
+                <div class="cl"></div>
+                <div class="post-content c-grey2 mt10" style="height:auto;">
+                    <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
+                </div>
+                <div class="cl"></div>
             </div>
-            <div class="cl"></div>
-        </div>
-        <div class="post-interactive border-bottom">
-            <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{message.reply_count}})</span></div>
-            <div class="post-interactive-column c-grey" ng-if="message.has_praise" ng-click="decreasePraise(message);">已赞 ({{message.praise_count}})</div>
-            <div class="post-interactive-column c-grey" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.praise_count}})</div>
-        </div>
-        <div id="all_message_reply">
+            <div class="post-interactive border-bottom">
+                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{message.reply_count}})</span></div>
+                <div class="post-interactive-column c-grey" ng-if="message.has_praise" ng-click="decreasePraise(message);">已赞 ({{message.praise_count}})</div>
+                <div class="post-interactive-column c-grey" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.praise_count}})</div>
+            </div>
+            <div id="all_message_reply">
 
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in message.child_reply">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in message.child_reply">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-        </div>
-        <div 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">
-                    <textarea class="copy-input"></textarea>
-                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+            <div 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">
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                    </div>
+                    <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <div class="cl"></div>
                 </div>
-                <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                <div class="cl"></div>
             </div>
         </div>
     </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 31aa0b16a..be639c1a0 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -1,9 +1,10 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +39,7 @@
                     </div>
                 </div>
             </div>
-            <div ng-if="!discussion.locked" class="post-input-wrap">
+            <div 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">
@@ -50,4 +51,5 @@
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file

From 9603115a86414a051a4bfbe2ca940b0861eddd88 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 26 May 2016 14:02:17 +0800
Subject: [PATCH 146/668] =?UTF-8?q?KE=E7=BC=96=E8=BE=91=E6=97=B6=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E7=9A=84=E9=A2=9C=E8=89=B2=E6=94=B9=E4=B8=BA=E5=92=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E5=B9=B6=E5=B0=86=E4=B8=8B=E5=88=92=E7=BA=BF=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/code/previewcode.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 459fbd5d6..cf9c219e9 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -53,4 +53,6 @@ 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;}
-.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
\ No newline at end of file
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
+.ke-content a{color: #15bccf;}
+.ke-content a:link,.ke-content a:visited{text-decoration:none;}

From 4d5ee5a72294e10278dc82fc938614d9855d9b65 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 May 2016 15:27:31 +0800
Subject: [PATCH 147/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9A=84=E6=AC=A2?=
 =?UTF-8?q?=E8=BF=8E=E5=9B=BE=E7=89=87=E5=8F=8A=E6=AC=A2=E8=BF=8E=E8=AF=8D?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9,=E6=B5=8B=E8=AF=95=E7=89=88?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb |   5 +++--
 app/views/wechats/login.html.erb      |   4 ++--
 config/menu.yml                       |   6 +++---
 config/wechat.yml                     |   4 ++--
 public/images/weixin_pic.jpg          | Bin 0 -> 63438 bytes
 5 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 public/images/weixin_pic.jpg

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 7ee0552fb..170c92791 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -139,12 +139,13 @@ class WechatsController < ActionController::Base
   end
 
   def sendBind(request)
-    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "您还未绑定确实的用户,请先绑定." } }
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！ 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
+我们将会与微信不断结合，为您提供更有价值的服务。  您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
       article.item title: "#{n[:title]}",
                    description: n[:content],
-                   pic_url: 'https://www.trustie.net/images/trustie_logo2.png',
+                   pic_url: 'https://www.trustie.net/images/weixin_pic.jpg',
                    url: url
     end
   end
diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index 0e6fd8695..adde6d776 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -12,14 +12,14 @@
         <div class="weui_cell">
           <div class="weui_cell_hd"><label class="weui_label">用户名</label></div>
           <div class="weui_cell_bd weui_cell_primary">
-            <input class="weui_input" autocapitalize="off" type="text" name="username" placeholder="请输入邮箱地址或昵称"/>
+            <input class="weui_input" autocapitalize="off" type="text" name="username" placeholder="请输入邮箱/登录名"/>
           </div>
         </div>
 
         <div class="weui_cell">
           <div class="weui_cell_hd"><label class="weui_label">密码</label></div>
           <div class="weui_cell_bd weui_cell_primary">
-            <input class="weui_input" type="password" name="password" placeholder="请输密码"/>
+            <input class="weui_input" type="password" name="password" placeholder="请输入密码"/>
           </div>
         </div>
 
diff --git a/config/menu.yml b/config/menu.yml
index 0c0e5c17d..de1952503 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
@@ -13,8 +13,8 @@ button:
   -
     type: "view"
     name: "进入网站"
-    url:  "https://www.trustie.net/"
+    url:  "https://test.course.trustie.net/"
   -
     type: "view"
     name: "使用手册"
-    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    url:  "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/config/wechat.yml b/config/wechat.yml
index 53141df40..5b528487b 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,8 +3,8 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
diff --git a/public/images/weixin_pic.jpg b/public/images/weixin_pic.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b9696dfa368743c836fb2aa5d6a0105307ac78d5
GIT binary patch
literal 63438
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

literal 0
HcmV?d00001


From 54e62c778a27aeb3ec210da17623f27daa63af57 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 26 May 2016 15:49:50 +0800
Subject: [PATCH 148/668] =?UTF-8?q?=E4=BF=9D=E8=AF=81python=E7=BC=96?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E4=B8=AD=E6=96=87=E6=B3=A8=E9=87=8A=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/homework.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 45d8de48b..e9ef7ad6c 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -487,6 +487,7 @@ int main()\n\
 ';
            } else if(language==3){
 src = '\
+#-*-coding:utf-8-*-\n\
 #注意\n\
     #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
     #2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\

From 6fea9c2ba8dcfabcd915951254670c34f8afcb5c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 May 2016 17:14:52 +0800
Subject: [PATCH 149/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BE=E7=89=87=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index b80d32455..e6f78bec7 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -139,13 +139,16 @@ class WechatsController < ActionController::Base
   end
 
   def sendBind(request)
-    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！ 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
-我们将会与微信不断结合，为您提供更有价值的服务。  您还未绑定确实的用户，请先绑定，谢谢！" } }
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
+在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
+我们将会与微信不断结合，为您提供更有价值的服务。
+
+您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
       article.item title: "#{n[:title]}",
                    description: n[:content],
-                   pic_url: 'https://www.trustie.net/images/weixin_pic.jpg',
+                   pic_url: 'https://test.course.trustie.net/images/weixin_pic.jpg',
                    url: url
     end
   end

From 0cac1e99c77f55b8730ddc72c19fd0090c3e3df0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 May 2016 17:18:58 +0800
Subject: [PATCH 150/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E8=BF=87=E6=BB=A4=E6=8E=89html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/activity.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 3ba82bcb9..a90ff323d 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -41,11 +41,11 @@ module Mobile
                   end
                 when :description
                   if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
-                    ac.act.description unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.description) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
-                    ac.act.content unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.content) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "JournalsForMessage"
-                    ac.act.notes unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.notes) unless ac.nil? || ac.act.nil?
                   end
                 when :latest_update
                   time_from_now ac.updated_at unless ac.nil?

From e7039df8758cc88b9a9cc3b3d1eb21c7b824fae6 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 17:21:02 +0800
Subject: [PATCH 151/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8C=BA=E5=9F=9F=E6=9B=B4=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 172 +++++++++++++++------------
 1 file changed, 93 insertions(+), 79 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index dbf5e8b27..018c98f32 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -5,26 +5,28 @@
     <div ng-repeat="act in activities">
       <div ng-if="act.container_type=='Course'">
         <div ng-if="act.act_type=='HomeworkCommon'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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">
-                  <a herf="javascript:void(0);">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
-                  </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 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> <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 class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+                  <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">
+                    <a herf="javascript:void(0);">
+                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    </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 mt5 mb5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
+                    <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -39,19 +41,21 @@
         </div>
 
         <div ng-if="act.act_type=='News'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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"><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"><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 class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+                  <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"><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 mb5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <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 mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -66,19 +70,21 @@
         </div>
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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"><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"><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 class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+                  <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"><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 mb5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <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 mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -109,21 +115,23 @@
 
       <div ng-if="act.container_type=='Project'">
         <div ng-if="act.act_type=='Issue'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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"><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"><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 />
-                  <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+                  <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"><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 mb5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
+                    <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -139,19 +147,21 @@
 
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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"><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"><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 class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+                  <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"><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 mb5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <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 mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -181,19 +191,21 @@
 
       <div ng-if="act.container_type=='Principal'">
         <div ng-if="act.act_type=='JournalsForMessage'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <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 mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
-                <div class="cl"></div>
-                <div class="cl"></div>
-                <div class="post-content c-grey2 mt5">
-                  <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+                  <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 mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
+                  <div class="cl"></div>
+                  <div class="cl"></div>
+                  <div class="post-content c-grey3 mt5 mb5">
+                    <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 mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><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"><span class="reply-icon"></span>{{act.reply_count}}</a>
@@ -208,19 +220,21 @@
       </div>
 
       <div ng-if="act.act_type=='BlogComment'">
-        <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+        <div class="post-container">
           <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"><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"><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 class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+                <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"><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 mb5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                <div class="post-content c-grey3">
+                  <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 mr20 undis" text-auto-height>点击展开</a>-->
+                <div class="cl"></div>
               </div>
-              <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-              <div class="cl"></div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
               <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
               <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>

From 9134e5560675f58e23c35121212071c7b58b0bce Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 17:40:22 +0800
Subject: [PATCH 152/668] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=BA=AF=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=9B=BE=E6=A0=87=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/wechat/icon_list.gif  | Bin 2780 -> 4387 bytes
 public/images/wechat/icon_list2.gif | Bin 0 -> 2780 bytes
 public/stylesheets/weui/weixin.css  |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100755 public/images/wechat/icon_list2.gif

diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif
index 1d7dcb061e6f401767d8ada7c18c38ac178fa6f3..8b38366c68f15430370c1223f667c839ed1ba9d1 100755
GIT binary patch
delta 3362
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
I3IQDcU!%<Ex&QzG

delta 1743
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

diff --git a/public/images/wechat/icon_list2.gif b/public/images/wechat/icon_list2.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1d7dcb061e6f401767d8ada7c18c38ac178fa6f3
GIT binary patch
literal 2780
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

literal 0
HcmV?d00001

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 5f0e5343f..ba3eac3df 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -52,7 +52,7 @@ a.underline {text-decoration:underline;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:13px; line-height:18px; 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,

From b0651847546b0c5b7ef2474aeb0b5e59645b4c9c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 08:54:31 +0800
Subject: [PATCH 153/668] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E7=BB=84=E7=BB=87=E7=9A=84=E5=8C=BF=E5=90=8D=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20160526093715_delete_anonymous_reply.rb  | 11 +++++++
 db/schema.rb                                  | 31 ++++++++-----------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 db/migrate/20160526093715_delete_anonymous_reply.rb

diff --git a/db/migrate/20160526093715_delete_anonymous_reply.rb b/db/migrate/20160526093715_delete_anonymous_reply.rb
new file mode 100644
index 000000000..443a07999
--- /dev/null
+++ b/db/migrate/20160526093715_delete_anonymous_reply.rb
@@ -0,0 +1,11 @@
+class DeleteAnonymousReply < ActiveRecord::Migration
+  def up
+    anonymous_replys = OrgDocumentComment.where("organization_id = 23 AND creator_id = 2")
+    if anonymous_replys
+      anonymous_replys.destroy_all
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9c4b4b333..8911cefef 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 => 20160519070718) do
+ActiveRecord::Schema.define(:version => 20160526093715) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -77,6 +77,18 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
   create_table "at_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "at_message_id"
@@ -1107,23 +1119,6 @@ ActiveRecord::Schema.define(:version => 20160519070718) 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"

From ab4aa0f06fdd9164ed6d1bad2230764235278623 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 09:32:24 +0800
Subject: [PATCH 154/668] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=B5=84=E6=BA=90=E5=8F=91=E9=80=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb                        | 6 +++---
 app/views/users/_resource_share_for_orgs.html.erb          | 3 ++-
 app/views/users/_resource_share_for_project_popup.html.erb | 3 ++-
 app/views/users/_resource_share_popup.html.erb             | 3 ++-
 public/javascripts/application.js                          | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fa286b43b..2ebcec009 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1987,7 +1987,7 @@ class UsersController < ApplicationController
         end
       end
     elsif params[:send_ids].present?
-      send_ids = params[:send_ids].split(" ")
+      send_ids = params[:send_ids].split(",")
       course_ids = params[:course_ids]
       if course_ids.nil?
         @flag = false
@@ -2139,7 +2139,7 @@ class UsersController < ApplicationController
         @ori = ori
       end
     elsif params[:send_ids].present?
-      send_ids = params[:send_ids].split(" ")
+      send_ids = params[:send_ids].split(",")
       project_ids = params[:projects_ids]
       if project_ids.nil?
         @flag = false
@@ -2286,7 +2286,7 @@ class UsersController < ApplicationController
       end
       @ori = ori
     elsif params[:send_ids].present?
-      send_ids = params[:send_ids].split(" ")
+      send_ids = params[:send_ids].split(",")
       subfield_id = params[:subfield]
       if subfield_id.nil?
         @flag = false
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index b1736a378..dac52e360 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -1,7 +1,8 @@
 <div >
     <div class="relateText fl mb10 mr5">发送到</div>
     <div class="resourcesSendTo mr15">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
+      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3" selected>组织</option>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 23be825da..65031befa 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -2,7 +2,8 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file');">
+      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <select class="resourcesSendType" onclick="chooseSendType2(<%= send_id %>,<%= send_ids %>,'<%= User.current.id %>','file',  '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2" selected>项目</option>
         <option value="3">组织</option>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 93e0d0c47..bfb1d9761 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -4,7 +4,8 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>','<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
+      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>', '<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3">组织</option>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 6eb464f64..69698417b 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1192,6 +1192,7 @@ function chooseSendType2(res_id,res_ids, user_id, send_type, type){
                 data:{send_id:res_id, send_ids:res_ids ,send_type:send_type}
             });
         } else if(sendType == '2') {
+            console.log(res_ids);
             $.ajax({
                 type: 'get',
                 url: '/users/' + user_id + '/search_user_project' + '?' + "&type=" + type,

From 74384d10a57832939d6eb1d75785e74dbf5f08bd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 10:06:25 +0800
Subject: [PATCH 155/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=20=E8=AE=BA=E5=9D=9B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/edit.html.erb | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index a36397677..fc3410eb0 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -27,8 +27,37 @@
 <div class="cl"></div>
 <div>
   <div class="resources" nhname="new_topic_form">
-      <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
+    <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
+        <div>
+          <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
+        </div>
+        <div id="doc_title_hint"></div>
+        <div class="cl"></div>
+        <div>
+          <div class="mt10">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
+            <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+          </div>
+          <div class="cl"></div>
 
+          <p id="homework_course_id_span" class="c_red mt5"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
+          <div class="cl"></div>
+
+          <div class="mt10">
+            <div class="fl" id="topic_attachments">
+              <%= render :partial => 'org_document_comments/attachment', :locals => {:container => @org_document} %>
+            </div>
+          </div>
+          <div class="cl"></div>
+          <div class="mt5">
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+            <span class="fr mr10 mt3">或</span>
+            <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
+            <div class="cl"></div>
+          </div>
+        </div>
     <% end %>
-    </div>
+  </div>
 </div>
\ No newline at end of file

From fb460626400763bab642d6226ab451e5e70179b6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 10:20:15 +0800
Subject: [PATCH 156/668] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=81=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=91=E9=80=81=E6=97=A0=E6=B3=95=E5=BC=B9=E6=A1=86?=
 =?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/_resource_share_for_orgs.html.erb          | 4 +++-
 app/views/users/_resource_share_for_project_popup.html.erb | 4 +++-
 app/views/users/_resource_share_popup.html.erb             | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index dac52e360..6788161f0 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -1,7 +1,9 @@
 <div >
     <div class="relateText fl mb10 mr5">发送到</div>
     <div class="resourcesSendTo mr15">
-      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% unless send_ids.blank? %>
+          <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% end %>
       <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2">项目</option>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 65031befa..00d6bd7a7 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -2,7 +2,9 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% unless send_ids.blank? %>
+          <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% end %>
       <select class="resourcesSendType" onclick="chooseSendType2(<%= send_id %>,<%= send_ids %>,'<%= User.current.id %>','file',  '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2" selected>项目</option>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index bfb1d9761..68c059a1d 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -4,7 +4,9 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% unless send_ids.blank? %>
+          <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+      <% end %>
       <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>', '<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2">项目</option>

From 7b6a62e9723cc17ef1ddafef8abf4c3e55fb0bd1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 10:34:57 +0800
Subject: [PATCH 157/668] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD403=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4d92808d4..8c060bfbf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2098,7 +2098,7 @@ module ApplicationHelper
   def attachment_history_candown attachment_history
     if attachment_history.container_type == "Course"
       course = Course.find(attachment_history.container_id)
-      candown = User.current.member_of?(course) || (course.is_public && attachment_history.is_public == 1)
+      candown = User.current.member_of_course?(course) || (course.is_public && attachment_history.is_public == 1)
     elsif attachment_history.container_type == "Project"
       project = Project.find(attachment_history.container_id)
       candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)

From f3a1a7371df91306ba99a8a858d5993d75e20a01 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 10:43:50 +0800
Subject: [PATCH 158/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=BF=87=E5=A4=9A?=
 =?UTF-8?q?=E6=9C=80=E4=B8=8B=E9=9D=A2=E7=82=B9=E5=87=BB=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/attachment_versions.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachments/attachment_versions.js.erb b/app/views/attachments/attachment_versions.js.erb
index a5bb6672b..ff704a869 100644
--- a/app/views/attachments/attachment_versions.js.erb
+++ b/app/views/attachments/attachment_versions.js.erb
@@ -2,6 +2,6 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/sh
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","40%").css("left","50%");
+$('#ajax-modal').parent().css("top","40%").css("left","50%").css("position","fixed");
 $('#ajax-modal').parent().addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file

From afedaf3fe56c4d6008ecf9026f4c550bd8f61123 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 10:48:28 +0800
Subject: [PATCH 159/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E4=B8=8B=E8=BD=BD=E6=9D=83?=
 =?UTF-8?q?=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/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8c060bfbf..691c2b0ad 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2103,7 +2103,7 @@ module ApplicationHelper
       project = Project.find(attachment_history.container_id)
       candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)
     elsif attachment_history.container_type == "OrgSubfield"
-      org = OrgSubfield.find(attachment_history.container_id)
+      org = OrgSubfield.find(attachment_history.container_id).organization
       candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1 && (User.current.logged? || org.organization.allow_guest_download?))
     end
   end

From 25aaa4b5bccf5f07cd5830ae7c5138af84ade8f7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 11:07:27 +0800
Subject: [PATCH 160/668] =?UTF-8?q?=E9=93=83=E9=93=9B=E3=80=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/nav_icon.png | Bin 3432 -> 17834 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/nav_icon.png b/public/images/nav_icon.png
index 1b4e61aecd889a092918fb73596cb84999c9b070..c9144e074960f56907c82d888cc287ccfe964779 100644
GIT binary patch
literal 17834
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
Is>mJx0{A+2Jpcdz

literal 3432
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


From 1fa6ac89cec75db5b3b9f74b38c1f405b53a581c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 11:07:27 +0800
Subject: [PATCH 161/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            | 2 ++
 app/controllers/wechats_controller.rb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0727a920a..38f29a661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@ vendor/cache
 /public/files
 /tags
 /config/initializers/gitlab_config.rb
+/config/wechat.yml
+/config/menu.yml
 1234567
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e6f78bec7..a37b5aaa2 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -146,9 +146,10 @@ class WechatsController < ActionController::Base
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
-                   pic_url: 'https://test.course.trustie.net/images/weixin_pic.jpg',
+                   pic_url: pic_url,
                    url: url
     end
   end

From c7bf29b0c97ef9c73633124c01ca7dfed6d110f2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 12:46:11 +0800
Subject: [PATCH 162/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=87=E6=8D=A2?=
 =?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/_resource_share_for_project_popup.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 00d6bd7a7..07f4abe38 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -5,7 +5,7 @@
       <% unless send_ids.blank? %>
           <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
       <% end %>
-      <select class="resourcesSendType" onclick="chooseSendType2(<%= send_id %>,<%= send_ids %>,'<%= User.current.id %>','file',  '<%= @type %>');">
+      <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file',  '<%= @type %>');">
         <option value="1">课程</option>
         <option value="2" selected>项目</option>
         <option value="3">组织</option>

From 29faa015ab11bbefb36d8a8c138864bd8c785e75 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 27 May 2016 14:01:16 +0800
Subject: [PATCH 163/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E8=B5=9E=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html |  70 +++++++++++++--------------
 public/images/wechat/w_praise.png    | Bin 0 -> 4563 bytes
 public/images/wechat/w_praised.png   | Bin 0 -> 3768 bytes
 public/images/wechat/w_reply.png     | Bin 0 -> 6529 bytes
 4 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100755 public/images/wechat/w_praise.png
 create mode 100755 public/images/wechat/w_praised.png
 create mode 100755 public/images/wechat/w_reply.png

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 018c98f32..1bab8dfb4 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -29,11 +29,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -58,11 +58,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -87,11 +87,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -134,11 +134,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -164,11 +164,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -207,11 +207,11 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><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"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -236,11 +236,11 @@
                 <div class="cl"></div>
               </div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-              <div class="c-grey fr f12 mr25" 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 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
               <div class="cl"></div>
             </div>
           </div>
diff --git a/public/images/wechat/w_praise.png b/public/images/wechat/w_praise.png
new file mode 100755
index 0000000000000000000000000000000000000000..6c0a5f7eb3ac7891fcd612118fa36711ea6d2f16
GIT binary patch
literal 4563
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/w_praised.png b/public/images/wechat/w_praised.png
new file mode 100755
index 0000000000000000000000000000000000000000..3b80c9c0b9be09253cdc4b98d0c4f2f93c655fea
GIT binary patch
literal 3768
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/w_reply.png b/public/images/wechat/w_reply.png
new file mode 100755
index 0000000000000000000000000000000000000000..d18e19508c71116d3a457bb8f5fae0a836e840db
GIT binary patch
literal 6529
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

literal 0
HcmV?d00001


From 3b33732e6f68e8436e766fc4da2c07b0363804fc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 14:15:26 +0800
Subject: [PATCH 164/668] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E5=88=86=E7=8F=AD=E5=92=8C=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=81=9A=E6=88=90=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 8 ++++----
 public/stylesheets/public.css               | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index ef8a43d5c..bff16e053 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -22,9 +22,9 @@
 
     <div class="st_box">
       <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: 160px;"><a href="">分班</a></li>
+        <li  class="ml50" style="padding-right: 5px;"><span class="fontGrey6 fb">姓名</span></li>
+        <li  class="ml10" style="padding-right: 15px;"><span class="fontGrey6 fb">学号</span></li>
+        <li style="padding-right: 55px; margin-left: 160px;"><span class="fontGrey6 fb">分班</span></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' %>
@@ -41,7 +41,7 @@
               <a id="pic" href="javascript:" class= "st_up"></a>
           <% end %>
         </li>
-        <li class="ml20"><a href="javascript:void(0)" >加入时间</a></li>
+        <li class="ml20"><span class="fontGrey6 fb">加入时间</span></li>
       </ul>
       <div class="cl"></div><!--st_box_top end-->
 
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2ca221d5c..4ffc33776 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -243,6 +243,7 @@ a.c_green{ color:#28be6c;}
 .fontGrey3 {color:#484848;}
 .fontGrey4{color:#999999;}
 .fontGrey5 {color:#a1a1a1;}
+.fontGrey6 {color:#7a7a7a;}
 .fontBlue {color:#3498db;}
 .fontBlue2 {color:#269ac9 !important;}
 a.underline {text-decoration:underline;}
@@ -1139,4 +1140,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .likeNum{color: #7f7f7f}
 
 /*弹框*/
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}

From 03d70e8c9ac5043cac33069b52c2c2cdebed4c5e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 14:27:54 +0800
Subject: [PATCH 165/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9A=E5=BD=93=E5=85=88=E8=BF=9B=E8=A1=8C=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=88=96=E9=80=89=E6=8B=A9=E5=88=86=E7=8F=AD?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=8E=EF=BC=8C=E7=84=B6=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E2=80=9C=E9=9A=90=E8=97=8F=E4=BD=9C=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E2=80=9D=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E4=BF=A1=E6=81=AF=E2=80=9D?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=20=EF=BC=88=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B9=9F=E4=B8=80=E8=B5=B7=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_exercise.html.erb        |  2 +-
 .../exercise/_student_exercise_archive.html.erb      |  2 +-
 app/views/exercise/student_exercise_list.html.erb    | 12 +++++++++---
 app/views/student_work/_student_work_list.html.erb   |  2 +-
 app/views/student_work/index.html.erb                | 12 +++++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index f9fd114dd..2f567796a 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -17,7 +17,7 @@
       </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>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" onclick="show_or_hide_info();" style="display: none">[ 显示测验信息 ]</a> </span>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/exercise/_student_exercise_archive.html.erb b/app/views/exercise/_student_exercise_archive.html.erb
index abc604b73..3afac2dc2 100644
--- a/app/views/exercise/_student_exercise_archive.html.erb
+++ b/app/views/exercise/_student_exercise_archive.html.erb
@@ -17,7 +17,7 @@
       </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>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" onclick="show_or_hide_info();" style="display: none">[ 显示测验信息 ]</a> </span>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index c96f8156a..02f161589 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -5,8 +5,14 @@
         $("#Container").css("width","1000px");
     });
 
+    function show_or_hide_info(){
+        $("#homeworkInformation").toggle();
+        $("#homework_info_hidden").toggle();
+        $("#homework_info_show").toggle();
+    }
+
     $(function(){
-        $("#homework_info_hidden").click(function(){
+        /*$("#homework_info_hidden").click(function(){
             $("#homeworkInformation").hide();
             $("#homework_info_hidden").hide();
             $("#homework_info_show").show();
@@ -15,7 +21,7 @@
             $("#homework_info_show").hide();
             $("#homeworkInformation").show();
             $("#homework_info_hidden").show();
-        });
+        });*/
 
         if($("#homework_description").height() > 54) {
             $("#homeworkDetailShow").show();
@@ -88,7 +94,7 @@
             <% elsif @exercise.exercise_status == 3 %>
                 <span class="grey_homework_btn_cir ml5">已截止</span>
             <% end%>
-        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏测验信息 ]</a> </span>
+        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" onclick="show_or_hide_info();" id="homework_info_hidden">[ 隐藏测验信息 ]</a> </span>
         <div class="cl"></div>
         <div class="fontGrey2 db mb5">发布者：<%= @exercise.user.show_name %></div>
         <div class="homeworkDetail upload_img break_word list_style max_h54" id="homeworkDetail">
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 1c699d331..bc7ab947f 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -24,7 +24,7 @@
           <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %>
       <% end %>
   <% end%>
-  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" style="display: none">[ 显示作业信息 ]</a> </span>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" onclick="show_or_hide_info();" style="display: none">[ 显示作业信息 ]</a> </span>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 96e43af46..d0aa0d329 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -33,8 +33,14 @@
       $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed").css("border","3px solid #269ac9");
   }
 
+  function show_or_hide_info(){
+      $("#homeworkInformation").toggle();
+      $("#homework_info_hidden").toggle();
+      $("#homework_info_show").toggle();
+  }
+
   $(function(){
-      $("#homework_info_hidden").click(function(){
+      /*$("#homework_info_hidden").click(function(){
           $("#homeworkInformation").hide();
           $("#homework_info_hidden").hide();
           $("#homework_info_show").show();
@@ -43,7 +49,7 @@
           $("#homework_info_show").hide();
           $("#homeworkInformation").show();
           $("#homework_info_hidden").show();
-      });
+      });*/
 
       if($("#homework_description").height() > 54) {
           $("#homeworkDetailShow").show();
@@ -161,7 +167,7 @@
                 <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
             <% end%>
         <% end%>
-        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span>
+        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" onclick="show_or_hide_info();" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span>
         <div class="cl"></div>
         <div class="fontGrey2 db mb5">发布者：<%= @homework.user.show_name %></div>
         <div class="homeworkDetail upload_img break_word list_style max_h54" id="homeworkDetail">

From 400a470a2b80b22f05b40c5143a2244346eeb00e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 14:42:12 +0800
Subject: [PATCH 166/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   |  5 ++-
 .../_evaluation_un_title.html.erb             |  7 +++--
 .../student_work/_evaluation_un_work.html.erb | 31 +++++++++++++------
 .../student_work/_evaluation_work.html.erb    | 19 ++++++++++++
 public/stylesheets/courses.css                |  3 ++
 public/stylesheets/public.css                 |  1 +
 6 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 064444f04..b2bf0bd59 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -2,8 +2,8 @@
   <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 %>
+        <th class="hworkList260" style="text-align:left;">作品名称</th>
         <th class="hworkList80">
           <span class="HomeworkStuTitle f14 fb fl">姓名</span>
         </th>
@@ -11,9 +11,12 @@
           <span class="HomeworkStuTitle f14 fb fl">学号</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <th class="hworkList260" style="text-align:left;">作品名称</th>
         <th class="hworkList160">
           <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
         </th>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+        <th class="hworkList420" style="text-align:left;">作品名称</th>
     <% end %>
     <th class="hworkList130 pl10">
       时间
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 98e9f1f64..b52f34580 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -2,9 +2,9 @@
   <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 %>
-    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10">
+      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10' : 'hworkList130 pr10'%>" style="text-align:left;">作品名称</th>
+      <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%>
@@ -17,9 +17,12 @@
       <% end%>
     </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <th class="hworkList130 pr10" style="text-align:left;">作品名称</th>
         <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList220' : 'hworkList160'%>">
           <span class="c_dark f14 fb">关联项目</span>
         </th>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+        <th class="hworkList290 pr10" style="text-align:left;">作品名称</th>
     <% end %>
     <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%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index ecdde77d8..a184d4140 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -5,20 +5,26 @@
   <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)) %>
   </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>
-    </td>
-      <% if @homework.homework_type != 3 %>
+  <% if @homework.homework_type != 3 %>
+      <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>
+      </td>
         <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%>
         </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: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 %>
+  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> 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>
+      </td>
         <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
             <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))%>
@@ -28,7 +34,14 @@
               <%= student_work.project.name %>
             </td>
         <% end %>
-      <% end %>
+  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width290" 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>
+      </td>
+  <% end %>
   <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;
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 0259fddf7..5007b7e47 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -20,6 +20,12 @@
         </div>
       </td>
         <% if @homework.homework_type != 3 %>
+          <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>
+          </td>
           <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%>
           </td>
@@ -27,6 +33,12 @@
             <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 %>
+          <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>
+          </td>
             <% 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))%>
@@ -36,6 +48,13 @@
                 <%= student_work.project.name %>
               </td>
             <% end %>
+      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+          <td class="hworkName pr10 w410 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>
+          </td>
         <% end %>
   <% else%>
       <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 55f2a0ffc..101a54efc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -61,6 +61,8 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkList160 {width:160px; text-align:center;}
 .hworkList220 {width:220px; text-align:center;}
 .hworkList260 {width:260px; text-align:left;}
+.hworkList290 {width:290px; text-align:left;}
+.hworkList420 {width:420px; 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;}
 .hworkName div{max-height: 36px;overflow: hidden;}
@@ -91,6 +93,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width130{width: 130px;}
 .width165{width: 165px;}
 .width180{width: 180px;}
+.width290{width: 290px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
 .width255{width: 255px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4ffc33776..9e1d97608 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -159,6 +159,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w230{width:230px !important;}
 .w235{ width:235px !important;}
 .w250{ width:250px !important;}
+.w410{ width:410px !important;}
 .w280{ width:280px;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}

From 9e17db376a1fb704dd186f669e3ae6e9b28e81d5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 14:44:28 +0800
Subject: [PATCH 167/668] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=BA=8C=E7=BA=A7=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_document_comments_controller.rb | 8 ++++++++
 app/controllers/sub_document_comments_controller.rb | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 82062d3dd..d7e38f370 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -1,5 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
+  before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
   layout 'base_org'
 
@@ -101,6 +102,13 @@ class OrgDocumentCommentsController < ApplicationController
     @organization = Organization.find(params[:organization_id])
   end
 
+  def authorize_allowed
+    unless User.current.logged?
+      redirect_to signin_url
+      return
+    end
+  end
+
   def destroy
     @org_document_comment = OrgDocumentComment.find(params[:id])
     @org_sub_id = @org_document_comment.org_subfield_id
diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index cdf153a20..80c14f004 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -1,6 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
+  before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 
@@ -207,4 +208,11 @@ class SubDocumentCommentsController < ApplicationController
   def find_subfield_content
     @subfield_content = @organization.org_subfields.order("priority")
   end
+
+  def authorize_allowed
+    unless User.current.logged?
+      redirect_to signin_url
+      return
+    end
+  end
 end

From 5f27519c6754babbc1bec5cf52ceb8a7a4b65bb2 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 27 May 2016 14:44:32 +0800
Subject: [PATCH 168/668] =?UTF-8?q?table=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   |  2 +-
 .../_evaluation_un_title.html.erb             |  4 +-
 app/views/student_work/index.html.erb         |  1 +
 public/javascripts/resizeable_table.js        | 76 +++++++++++++++++++
 public/stylesheets/courses.css                |  6 +-
 5 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 public/javascripts/resizeable_table.js

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 064444f04..73bd5d4f2 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,10)">
   <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 98e9f1f64..f25edc5ce 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,10)">
   <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
@@ -17,7 +17,7 @@
       <% end%>
     </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList220' : 'hworkList160'%>">
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList210' : 'hworkList160'%>">
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% end %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 8e7d87302..3c077c6ea 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -1,5 +1,6 @@
 <% content_for :header_tags do %>
 <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c"  %>
+<%= javascript_include_tag "resizeable_table"  %>
 <%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
 <% end %>
 
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
new file mode 100644
index 000000000..eac4a1f36
--- /dev/null
+++ b/public/javascripts/resizeable_table.js
@@ -0,0 +1,76 @@
+/**
+ * Created by ttang on 2016/5/24.
+ */
+    $(document).ready(function(){
+       resizeable_table = function(colS,colE,padding){
+           var headerTds = document.getElementById("homework_table").rows[0].cells;
+           var mousedown = false;
+           var resizeable = false;
+           var targetTd;
+           var screenXStart =0;
+           var tdWidth = 0;
+           var headerWidth = 0;
+           var tblObj = document.getElementById("homework_table");
+           var tblWidth = tblObj.offsetWidth;
+           for(var i = colS;i<colE;i++){
+               addListener(headerTds[i],"mousedown",onmousedown);
+               addListener(headerTds[i],"mousemove",onmousemove);
+           }
+
+           function onmousedown(event){
+               if (resizeable == true){
+                   var evt =event||window.event;
+                   mousedown = true;
+                   screenXStart = evt.screenX;
+                   tdWidth = targetTd.offsetWidth;
+                   tdWidth2 = targetTd.nextElementSibling.offsetWidth;
+               }
+           }
+           function onmousemove(event){
+               var evt =event||window.event;
+               var srcObj = getTarget(evt);
+               var offsetX = evt.offsetX || (evt.clientX - srcObj.getBoundingClientRect().left);//这个比较关键，解决了Firefox无offsetX属性的问题
+               if (mousedown == true){
+                   var width = (tdWidth + (evt.screenX - screenXStart)) - 10 + "px";//计算后的新的宽度
+                   var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - 10 + "px";
+                   console.log(width, width2);
+                   if (width<60){
+                       targetTd.style.width = "60px";
+                       console.log("width<60");
+                   }else if(width2<60){
+                       targetTd.nextElementSibling.style.width2 = "60px";
+                       console.log("width2<60");
+                   }else{
+                       targetTd.style.width = width;
+                       targetTd.nextElementSibling.style.width = width2;
+                   }
+               }else{
+                   var trObj = tblObj.rows[0];
+                   if(srcObj.offsetWidth - offsetX <=4){//实际改变本单元格列宽
+                       targetTd=srcObj;
+                       resizeable = true;
+                       srcObj.style.cursor='col-resize';//修改光标样式
+                   }else if(offsetX <=4 && srcObj.cellIndex > 0){//实际改变前一单元格列宽，但是表格左边框线不可拖动
+                       targetTd=trObj.cells[srcObj.cellIndex - 1];
+                       resizeable = true;
+                       srcObj.style.cursor='col-resize';
+                   }else{
+                       resizeable = false;
+                       srcObj.style.cursor='default';
+                   }
+               }
+           }
+           document.onmouseup = function(event){
+               tartgetTd = null;
+               resizeable = false;
+               mousedown = false;
+               document.body.style.cursor='default';
+           }
+           function getTarget(evt){
+               return evt.target || evt.srcElement;
+           }
+           function addListener(element,type,listener,useCapture){
+               element.addEventListener?element.addEventListener(type,listener,useCapture):element.attachEvent("on" + type,listener);
+           }
+       }
+    });
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 49f87416c..a76ec5464 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -59,7 +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;}
+.hworkList210 {width:210px; 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;}
@@ -103,7 +103,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .pr10{padding-right: 10px;}
 
 /*20160520作品列表table*/
-.hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle;}
+.hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
 .hwork-table-wrap th {font-size:14px; color:#2d2d2d;}
 
 /*作业信息*/
@@ -1252,7 +1252,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .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; 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;}
+.hworkPrName2 {width:210px; 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 7599bf75a3c20f191ba9bdefcd36de349d75b5ac Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 15:04:56 +0800
Subject: [PATCH 169/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=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  | 2 +-
 app/views/users/_user_homework_detail.html.erb       | 2 +-
 public/stylesheets/courses.css                       | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index b52f34580..1a3220df6 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -22,7 +22,7 @@
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-        <th class="hworkList290 pr10" style="text-align:left;">作品名称</th>
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %> pr10" style="text-align:left;">作品名称</th>
     <% end %>
     <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%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index a184d4140..688e31451 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -35,7 +35,7 @@
             </td>
         <% end %>
   <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width290" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width340' : 'width290' %>" 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'}"%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 650ced5dc..a01418d2f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -201,7 +201,7 @@
     <% end %>
 
     <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
-        <% projects = homework_common.student_work_projects.where("is_leader = 1") %>
+        <% projects = homework_common.student_work_projects.where("is_leader = 1 and project_id != -1") %>
         <% unless projects.empty? %>
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=homework_common.id %>">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 101a54efc..63abab281 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -62,6 +62,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkList220 {width:220px; text-align:center;}
 .hworkList260 {width:260px; text-align:left;}
 .hworkList290 {width:290px; text-align:left;}
+.hworkList340 {width:340px; text-align:left;}
 .hworkList420 {width:420px; 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;}
@@ -94,6 +95,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width165{width: 165px;}
 .width180{width: 180px;}
 .width290{width: 290px;}
+.width340{width: 340px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
 .width255{width: 255px;}

From 227a66841394f61644fefda5dffec6215ba5d139 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 15:15:14 +0800
Subject: [PATCH 170/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_work.html.erb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 5007b7e47..ba017af5f 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -12,12 +12,6 @@
       <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;") %>
-      </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>
       </td>
         <% if @homework.homework_type != 3 %>
           <td class="hworkName pr10 w250 float-none student_work_<%= student_work.id%>">

From 649b3918c43f5035fa147c4bc59e5446f056b8df Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 15:25:27 +0800
Subject: [PATCH 171/668] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=9B=E5=BB=BA=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message.rb | 18 +++++++++++++++++-
 app/models/news.rb    | 29 +++++++++++++++++++----------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index fdc3c6bdc..cf9adab4e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -83,7 +83,7 @@ class Message < ActiveRecord::Base
   # after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
   after_update :update_messages_board, :update_activity
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
-  after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count, :act_as_system_message
+  after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count, :act_as_system_message, :delay_message_send
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -308,6 +308,22 @@ class Message < ActiveRecord::Base
     end
   end
 
+  def delay_message_send
+    if self.course
+      if self.parent_id.nil?   # 发帖
+        self.delay.contain_messages_message
+      end
+    end
+  end
+
+  def contain_messages_message
+    self.course.members.includes(:user).each do |m|
+      if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
+        self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
+      end
+    end
+  end
+
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖
diff --git a/app/models/news.rb b/app/models/news.rb
index beb58799f..0b03dcc48 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, :act_as_system_message
+  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, :delay_news_send
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -167,7 +167,17 @@ class News < ActiveRecord::Base
   # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
   def act_as_system_message
     if self.course
-      self.delay.send_message
+      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)
+          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
+            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)}", content, format_time(self.created_on)
+          end
+        end
+      end
     else
       if !self.project.nil?
         self.project.members.each do |m|
@@ -179,17 +189,16 @@ class News < ActiveRecord::Base
     end
   end
 
-  def send_message
+  def delay_news_send
+    if self.course
+      self.delay.contain_news_message
+    end
+  end
+
+  def contain_news_message
     self.course.members.each do |m|
       if m.user_id != self.author_id
         self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_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
-          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)}", content, format_time(self.created_on)
-        end
       end
     end
   end

From 9d9e2ff6131efbe9e87e6eae017bedd6c15cd18e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 27 May 2016 15:31:13 +0800
Subject: [PATCH 172/668] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=ABURL?=
 =?UTF-8?q?=E6=AD=A3=E5=88=99=E5=8C=B9=E9=85=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 01bb164a9..3f35f8491 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1322,7 +1322,7 @@ function autoUrl(id){
         $("#"+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();
-                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) {
+                html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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){
@@ -1341,7 +1341,7 @@ function autoUrl(id){
     }
     else{
         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) {
+        html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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){

From 1535c4cd0703acc6514bdcc344f214fc96c1cfe1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 15:54:55 +0800
Subject: [PATCH 173/668] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E7=9A=84=E5=9F=BA=E4=BA=8E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E6=80=BB=E6=98=AF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 48c303a29..681f158e7 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -10,7 +10,7 @@
 </div>
 <div class="mb10 mt10">
   <label>
-    <input type="checkbox" class="mr5" name="base_on_project" checked value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
+    <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
     <span class="f14 fontGrey3 mr10">基于项目实施</span>
   </label>
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>

From 98244d2a3d6ba36e46873165620ac7d8b481b7ae Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 27 May 2016 16:42:05 +0800
Subject: [PATCH 174/668] =?UTF-8?q?=E5=B0=86=E6=96=87=E7=AB=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E9=A2=9C=E8=89=B2=E6=81=A2=E5=A4=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css  | 2 --
 public/stylesheets/new_user.css | 2 --
 2 files changed, 4 deletions(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index a7c98e750..8d27be744 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -144,8 +144,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDes {float:left; width:655px; margin-left:15px;}
 .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;}
-.homepagePostTitle a{color: #15bccf;}
 .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;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 923caf2a9..0231f6a8a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -672,8 +672,6 @@ 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;}
-.homepagePostTitle a{color: #15bccf;}
 .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;}

From 086ccedc08b9304f7497ac0c4756258ab8a37cf5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 16:45:04 +0800
Subject: [PATCH 175/668] =?UTF-8?q?=E5=85=88=E9=9A=90=E8=97=8F=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=96=E5=88=86=E7=8F=AD=E5=90=8E=E2=80=9C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E4=BF=A1=E6=81=AF=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E4=B8=8D=E8=A7=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_student_work_list.html.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index bc7ab947f..eaf6b9304 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -39,6 +39,10 @@
 
 <script type="text/javascript">
   $(function(){
+      if($("#homework_info_hidden").is(":hidden"))
+      {
+          $("#homework_info_show").show();
+      }
       <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
           <% if @message_student_work_id %>
             <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>

From e650dca1ed50cfa92591aff569caaa7b5e583d2c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 27 May 2016 17:06:34 +0800
Subject: [PATCH 176/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=B8=AD=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=20=E5=9B=9E=E5=A4=8D=E6=A1=86=E4=B8=8D=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 08bfc9d01..dc7cdc5fc 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -25,6 +25,12 @@
               <%= reply.notes.html_safe %>
             </p>
         </div>
+        <script type="text/javascript">
+            $(function(){
+                showNormalImage('reply__<%= reply.id %>');
+                autoUrl('reply_<%= reply.id %>');
+            });
+        </script>
         <div class="cl"></div>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
@@ -57,9 +63,3 @@
       <div class="cl"></div>
     </div>
 <% end %>
-<script type="text/javascript">
-    $(function(){
-        showNormalImage('reply__<%= reply.id %>');
-        autoUrl('reply_<%= reply.id %>');
-    });
-</script>

From 12ac353de97454634db40f99dc4213fe151ed19c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 27 May 2016 17:08:50 +0800
Subject: [PATCH 177/668] =?UTF-8?q?=E5=8C=97=E6=96=97=E6=96=B0base?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_custom.thml.erb | 67 ++++++++++++++++++++++
 app/views/organizations/_math_js.html.erb  | 11 ++++
 2 files changed, 78 insertions(+)
 create mode 100644 app/views/layouts/base_org_custom.thml.erb
 create mode 100644 app/views/organizations/_math_js.html.erb

diff --git a/app/views/layouts/base_org_custom.thml.erb b/app/views/layouts/base_org_custom.thml.erb
new file mode 100644
index 000000000..a453d1cd7
--- /dev/null
+++ b/app/views/layouts/base_org_custom.thml.erb
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
+
+  <%#= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <%=render :partial => "math_js" %>
+</head>
+
+<!--add by huang-->
+<body onload="prettyPrint();">
+<!--内容开始-->
+<header>
+  <div class="sn-header">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-logo">
+        <%= render :partial => 'org_avater_swap', :org_logo_attchment => @org_logo_attchment %>
+        <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
+        <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
+        <%= render :partial => 'organizations/org_logined_header' %>
+      </div>
+    </div>
+    <!--导航-->
+    <div class="sn-row sn-bg-blue sn-p-relative">
+      <%= render :partial => "org_field_menu", :locals => {:subfield_content => @subfield_content} %>
+    </div>
+  </div>
+</header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<%  update_visiti_count @organization %>
+<%# over %>
+<!--内容开始-->
+<div class="sn-content">
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
+</div>
+<!--内容结束-->
+<footer>
+  <%= render :partial => "org2_footer" %>
+</footer>
+
+<!--页面底部-->
+<div class="cl"></div>
+<%# 弹框 %>
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+<%= call_hook :view_layouts_base_body_bottom %>
+<%# JS提前加载 %>
+<%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+<%= javascript_include_tag 'attachments' %>
+</body>
+
+
+
+</html>
+
diff --git a/app/views/organizations/_math_js.html.erb b/app/views/organizations/_math_js.html.erb
new file mode 100644
index 000000000..7ac522061
--- /dev/null
+++ b/app/views/organizations/_math_js.html.erb
@@ -0,0 +1,11 @@
+<script type="text/javascript"
+        src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+</script>
+<!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+<script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
\ No newline at end of file

From 0cafebb3a24ad9007f59996e982d40f12902842e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 17:14:37 +0800
Subject: [PATCH 178/668] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_project_news.html.erb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 55e2182b5..b354bc668 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -66,11 +66,7 @@
       <div class="homepagePostReplyBannerCount">回复
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
         </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -108,11 +104,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
+                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                       </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">

From 622d71c47654b12f310a85231fe350b14ed2a4c5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 27 May 2016 22:14:41 +0800
Subject: [PATCH 179/668] =?UTF-8?q?=E5=B7=B2=E7=BB=91=E5=AE=9A=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E7=9A=84=EF=BC=8C=E7=9B=B4=E6=8E=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb |  4 +++-
 app/views/wechats/login.html.erb      | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 43bab082a..30a39e86e 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -162,7 +162,6 @@ class WechatsController < ActionController::Base
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-
         raise "无法获取到微信openid" unless openid
         render :json => {status:0, openid: openid}
       rescue Exception=>e
@@ -197,6 +196,9 @@ class WechatsController < ActionController::Base
 
     def login
       session[:wechat_code] = params[:code] if params[:code]
+      openid = get_openid_from_code(code)
+      @wechat_user = user_binded?(openid)
+
       render 'wechats/login', layout: 'base_wechat'
     end
 
diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index dc39b9f23..6de7b9bd8 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -1,4 +1,22 @@
+<% if @wechat_user %>
 
+    <div class="page">
+      <div class="weui_msg">
+        <div class="weui_icon_area"><i class="weui_icon_success weui_icon_msg"></i></div>
+        <div class="weui_text_area">
+          <h2 class="weui_msg_title">操作成功</h2>
+          <p class="weui_msg_desc">您已经绑定过微信了,用户名: (<%= @wechat_user.user.login %>)</p>
+        </div>
+        <div class="weui_opr_area">
+          <p class="weui_btn_area">
+            <a href="javascript:close();" class="weui_btn weui_btn_primary">确定</a>
+          </p>
+        </div>
+
+      </div>
+    </div>
+
+<% else %>
 <div class="loginIn">
   <div>
     <p class="weui_cells_title wechat-error">
@@ -63,4 +81,7 @@
 
     })
   });
-</script>
\ No newline at end of file
+</script>
+
+
+<% end %>
\ No newline at end of file

From 4561bdfd0deae1eb761a8455b9f9ad831daffff5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 27 May 2016 22:18:03 +0800
Subject: [PATCH 180/668] code=>params[:code]

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 30a39e86e..8570d3140 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -196,7 +196,7 @@ class WechatsController < ActionController::Base
 
     def login
       session[:wechat_code] = params[:code] if params[:code]
-      openid = get_openid_from_code(code)
+      openid = get_openid_from_code(params[:code])
       @wechat_user = user_binded?(openid)
 
       render 'wechats/login', layout: 'base_wechat'

From be94d445a947aec1054a15c40e7742643d81a8f1 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 27 May 2016 22:19:49 +0800
Subject: [PATCH 181/668] window close

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

diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index 6de7b9bd8..65a8b1857 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -9,7 +9,7 @@
         </div>
         <div class="weui_opr_area">
           <p class="weui_btn_area">
-            <a href="javascript:close();" class="weui_btn weui_btn_primary">确定</a>
+            <a href="javascript:window.close();" class="weui_btn weui_btn_primary">确定</a>
           </p>
         </div>
 

From 63b9aaefe2c38424bba40a6eec81b164a948126d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 27 May 2016 22:22:09 +0800
Subject: [PATCH 182/668] window close

---
 app/views/wechats/login.html.erb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index 65a8b1857..39e188664 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -1,5 +1,11 @@
 <% if @wechat_user %>
 
+    <script type="text/javascript">
+      function close(){
+        window.close();
+      }
+    </script>
+
     <div class="page">
       <div class="weui_msg">
         <div class="weui_icon_area"><i class="weui_icon_success weui_icon_msg"></i></div>
@@ -9,7 +15,7 @@
         </div>
         <div class="weui_opr_area">
           <p class="weui_btn_area">
-            <a href="javascript:window.close();" class="weui_btn weui_btn_primary">确定</a>
+            <a href="javascript:close();" class="weui_btn weui_btn_primary">确定</a>
           </p>
         </div>
 

From bb30709fa110dd96e787c15482e6bed159b67d14 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 27 May 2016 22:54:57 +0800
Subject: [PATCH 183/668] window close

---
 app/views/wechats/login.html.erb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/views/wechats/login.html.erb b/app/views/wechats/login.html.erb
index 39e188664..17878e318 100644
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@@ -1,11 +1,5 @@
 <% if @wechat_user %>
 
-    <script type="text/javascript">
-      function close(){
-        window.close();
-      }
-    </script>
-
     <div class="page">
       <div class="weui_msg">
         <div class="weui_icon_area"><i class="weui_icon_success weui_icon_msg"></i></div>
@@ -15,7 +9,7 @@
         </div>
         <div class="weui_opr_area">
           <p class="weui_btn_area">
-            <a href="javascript:close();" class="weui_btn weui_btn_primary">确定</a>
+            <a onclick="WeixinJSBridge.call('closeWindow');" class="weui_btn weui_btn_primary">确定</a>
           </p>
         </div>
 

From 389172e5b2ed9f641d21e1cbb1d0f11c7c168bbf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 30 May 2016 10:45:00 +0800
Subject: [PATCH 184/668] =?UTF-8?q?CSS=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/org_custom.css | 136 ++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 public/stylesheets/org_custom.css

diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
new file mode 100644
index 000000000..790877660
--- /dev/null
+++ b/public/stylesheets/org_custom.css
@@ -0,0 +1,136 @@
+/* 门户样式重置 */
+body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#fff;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{color:#000;text-decoration:none;}
+a:hover,a:active{color:#3b94d6;}
+
+
+
+/* 公共 */
+.clear:after {content:".";height:0;visibility:hidden;display:block;clear:both;}
+.fl{ float:left;}
+.fr{ float:right;}
+.cl{ clear:both; overflow:hidden;}
+.mt5{ margin-top:5px;}
+.mt10{ margin-top:10px;}
+.mb5{ margin-bottom:5px;}
+.mb10{ margin-bottom:10px;}
+.ml5{ margin-left:5px;}
+.ml10{ margin-left:10px;}
+.ml15{ margin-left:15px;}
+.mr5{ margin-right:5px;}
+.mr10{ margin-right:15px;}
+.mr15{ margin-right:10px;}
+a.c_red{color:#df0600;}
+.c_red{color:#df0600;}
+/* 门户首页 */
+#por_header{ width:100%; height:70px; background-color:#3b94d6; }
+.por_header_con{ width:1000px; margin:0 auto;}
+.por_logo{ margin-top:5px;}
+.por_login li{ float:left;}
+.por_login li a{ display:block; padding:0 15px; height:70px; line-height:70px;font-size:16px; color:#fff; }
+.por_login li a:hover{ background-color:#1173bc;}
+.por_search{ margin-top:15px; margin-right:20px;}
+.pro_input_search{ background-color:#daeefc; height:36px; width:355px; border:none; padding:0 5px; color:#3b94d6;}
+a.por_search_btn{ display:block;background:#daeefc url(../images/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
+a:hover.por_search_btn{background:#daeefc url(../images/icons_por.png) -35px 8px  no-repeat; }
+
+#por_container{ width:1000px; margin:10px auto;}
+.por_left{ width:685px; margin-right:15px; float:left; }
+.por_right{ width:300px; float:left;}
+.por_nav{ width:1000px; overflow:hidden; position:relative;height:53px; border-bottom:7px solid #ccc; margin-bottom:10px;}
+a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
+.por_nav ul li{ float:left;}
+.por_nav ul li a{ display: block;  height:53px; padding:0 20px; line-height:53px; font-size:18px; color:#333;}
+.por_nav ul li a:hover{ border-bottom:7px solid #3b94d6;}
+.por_icons_hot{ background:url(../images/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
+.por_h2_index{ font-size:20px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
+a.por_more_index{ font-size:12px; color:#999; }
+.por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
+a.por_hot_title{ font-size:16px; display:block; font-weight:bold; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hot_txt{ color:#666; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
+.por_time{ color:#999;}
+a.por_hot_name{color:#3b94d6;}
+.por_hotbar_right{ border:1px solid #e8e5e5; padding:5px; margin-top:15px; width:300px;}
+.por_hotbar_right img{ width:300px; height:246px;}
+.por_hot_title_r{ font-size:16px; display:block; font-weight:bold; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hot_txt_r{color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
+.por_course{ }
+.por_course_bar{ width:328px; margin:0 7px; padding:20px 0; border-bottom:1px solid #e8e5e5;}
+a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_course_bar img{ width:140px; height:100px; }
+.por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
+a.por_course_time{color:#3b94d6; margin-left:5px;}
+.por_post{ border-bottom:1px solid #e8e5e5; padding-bottom:5px;}
+.por_post_left{ width:394px; margin-top:15px;}
+.por_post_leftbar img{ width:377px; height:163px;}
+.por_post_leftbar { border-bottom:1px dashed #e8e5e5; padding-bottom:5px; margin-bottom:10px;}
+a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_post_txt{color:#666; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
+.post_icons_grey{ width:5px; height:5px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
+.por_post_list li{ height:20px; height:30px;}
+.por_post_list li a{ font-size:14px; }
+a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_post_right{ width:280px; border-left:1px solid #e8e5e5; margin-top:15px; padding-left:10px;}
+.por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
+.por_users_img{ width:40px; height:40px; border:1px solid #e8e5e5;}
+.por_news_txt{ width:245px; margin-left:10px;}
+.por_news_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
+a.por_zan{ background:url(../images/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
+a.por_zan:hover{background:url(../images/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
+.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_projects{border-bottom:1px solid #e8e5e5; padding-bottom:10px; margin-top:10px;}
+.por_projects ul li{ padding:5px 0;}
+.por_projects ul{ margin-top:5px;}
+.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#666;  }
+.por_project_li{border-bottom:1px dashed #ccc; padding-bottom:10px; margin-bottom:5px;}
+.por_time a{ color:#3b94d6;}
+.por_teachers{ margin-top:20px; }
+#por_teachers_nav {border-bottom:1px solid #d0d0d0; height:31px;}
+#por_teachers_nav li {float:left; padding:0px 5px; text-align:center;  }
+#por_teachers_nav li a{font-size:20px;}
+.por_teachers_hover {border:1px solid #d0d0d0; border-bottom:1px solid #fff;  }
+.por_teachers_hover a{color:#3b94d6;}
+.por_teachers_nomal {border-bottom:none; }
+.por_teachers_nomal a{color:#999;}
+.undis {display:none;}
+.dis {display:block;}
+a.por_more_teacher{ font-size:12px; }
+.por_teachers_li{ margin-top:10px;}
+.por_teachers_li li{ padding:10px 0;border-bottom:1px solid #e8e5e5;}
+.por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
+a.por_teachers_name{ display:block; width:80px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_teachers_span{ color:#999;}
+.por_teachers_span a{ margin:0 5px; color:#999;}
+.por_footer{ padding:35px 0; width:100%; background-color:#efeded; margin-top:30px;}
+.por_footer_con{ width:1000px; margin:0 auto;}
+.por_footer_con ul{ width:350px; margin:0 auto;}
+.por_footer_con ul li{ float:left; text-align:center;}
+.por_footer_con ul li a{ font-size:14px;}
+.por_footer_con ul li a span{ color:#999; margin:0 15px ;}
+.por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
+
+.por_index_position{ position:relative;}
+a.por_xiang_index{ position:absolute; color:red; background:#fff; top:40px;  left:292px;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

From 46e4f2c14321f744d416f8236994c8254ed499a9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 30 May 2016 14:23:52 +0800
Subject: [PATCH 185/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=B0base?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  2 +-
 app/views/layouts/_org_custom_footer.html.erb | 10 +++
 ...stom.thml.erb => base_org_custom.html.erb} | 40 +++--------
 .../organizations/_org_custom_header.html.erb | 67 +++++++++++++++++++
 .../organizations/_org_custom_left1.html.erb  |  0
 .../organizations/_org_custom_left2.html.erb  |  0
 .../organizations/_org_custom_left3.html.erb  |  0
 .../organizations/_org_custom_right1.html.erb |  0
 .../organizations/_org_custom_right2.html.erb |  0
 .../organizations/_org_custom_right3.html.erb |  0
 app/views/organizations/show.html.erb         |  2 +-
 public/stylesheets/org_custom.css             | 24 +++----
 12 files changed, 100 insertions(+), 45 deletions(-)
 create mode 100644 app/views/layouts/_org_custom_footer.html.erb
 rename app/views/layouts/{base_org_custom.thml.erb => base_org_custom.html.erb} (50%)
 create mode 100644 app/views/organizations/_org_custom_header.html.erb
 create mode 100644 app/views/organizations/_org_custom_left1.html.erb
 create mode 100644 app/views/organizations/_org_custom_left2.html.erb
 create mode 100644 app/views/organizations/_org_custom_left3.html.erb
 create mode 100644 app/views/organizations/_org_custom_right1.html.erb
 create mode 100644 app/views/organizations/_org_custom_right2.html.erb
 create mode 100644 app/views/organizations/_org_custom_right3.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 2ab724728..3cf36a781 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -91,7 +91,7 @@ class OrganizationsController < ApplicationController
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           @project_acts = get_project_activities_org @organization, project_ids
           @course_acts = get_course_activities_org @organization, course_ids
-        render :layout => 'base_org2'
+        render :layout => 'base_org_custom'
       else
         render_403
       end
diff --git a/app/views/layouts/_org_custom_footer.html.erb b/app/views/layouts/_org_custom_footer.html.erb
new file mode 100644
index 000000000..a9c4a7e36
--- /dev/null
+++ b/app/views/layouts/_org_custom_footer.html.erb
@@ -0,0 +1,10 @@
+<div class="por_footer_con">
+  <ul>
+    <li ><a href="<%= about_us_path %>" target="_blank" class="" >关于我们<span>|</span></a></li>
+    <li ><a href="<%= agreement_path %>" target="_blank" class="" >服务协议<span>|</span></a></li>
+    <li ><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="" >帮助中心<span>|</span></a></li>
+    <li ><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="" > 贴吧交流</a></li>
+    <div class="cl"></div>
+  </ul>
+  <p>Copyright 2007~2016, All Rights Reserved     湘ICP备09019772</p>
+</div>
diff --git a/app/views/layouts/base_org_custom.thml.erb b/app/views/layouts/base_org_custom.html.erb
similarity index 50%
rename from app/views/layouts/base_org_custom.thml.erb
rename to app/views/layouts/base_org_custom.html.erb
index a453d1cd7..4a9ba4dce 100644
--- a/app/views/layouts/base_org_custom.thml.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -9,36 +9,18 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
-
-  <%#= call_hook :view_layouts_base_html_head %>
+  <%= stylesheet_link_tag  'org_custom', 'new_user', 'public','jquery/jquery-ui-1.9.2' %>
+  <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
   <%=render :partial => "math_js" %>
 </head>
-
-<!--add by huang-->
-<body onload="prettyPrint();">
-<!--内容开始-->
-<header>
-  <div class="sn-header">
-    <div class="sn-row sn-bg-white">
-      <div class="sn-logo">
-        <%= render :partial => 'org_avater_swap', :org_logo_attchment => @org_logo_attchment %>
-        <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
-        <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
-        <%= render :partial => 'organizations/org_logined_header' %>
-      </div>
-    </div>
-    <!--导航-->
-    <div class="sn-row sn-bg-blue sn-p-relative">
-      <%= render :partial => "org_field_menu", :locals => {:subfield_content => @subfield_content} %>
-    </div>
-  </div>
+<body>
+<% update_visiti_count @organization %>
+<header id="por_header">
+  <%= render :partial => 'org_custom_header' %>
 </header>
-<%# 更新访问数,刷新的时候更新访问次数 %>
-<%  update_visiti_count @organization %>
-<%# over %>
+
 <!--内容开始-->
 <div class="sn-content">
   <%= render_flash_messages %>
@@ -46,10 +28,8 @@
   <%= call_hook :view_layouts_base_content %>
 </div>
 <!--内容结束-->
-<footer>
-  <%= render :partial => "org2_footer" %>
-</footer>
-
+<footer class="por_footer">
+  <%= render :partial => "layouts/org_custom_footer" %></footer>
 <!--页面底部-->
 <div class="cl"></div>
 <%# 弹框 %>
@@ -60,7 +40,7 @@
 <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
 <%= javascript_include_tag 'attachments' %>
 </body>
-
+</html>
 
 
 </html>
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
new file mode 100644
index 000000000..027e4e8ec
--- /dev/null
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -0,0 +1,67 @@
+<div class="por_header_top">
+  <div class="por_header_con" >
+    <a href="javascript:void(0);" target="_blank" class="por_logo fl "><img src="images/porlogo.png" alt="logo" width="67" height="61"  /></a>
+    <% if User.current.logged? %>
+        <div class="navHomepageProfile" id="navHomepageProfile">
+          <ul>
+            <li class="homepageProfileMenuIcon fr mt15" id="homepageProfileMenuIcon">
+              <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+              <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
+                <li><%= link_to "修改资料", my_account_path, :class => "menuGrey"%></li>
+                <li><%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%></li>
+                <li><%= link_to "新建组织", new_organization_path, :class => "menuGrey"%></li>
+                <li><%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+    <% else %>
+        <ul class="por_login fr">
+          <li><a href="<%= signin_url_without_domain %>" target="_blank" class=" ">登录</a></li>
+          <li><a href="<%= register_url_without_domain %>" target="_blank" class=" ">注册</a></li>
+        </ul>
+    <% end %>
+    <div class="por_search fr">
+      <input type="text" class="pro_input_search fl" value="00000" />
+      <a href="javascript:void(0);"  class="por_search_btn fl"></a>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<div class="por_nav"   >
+  <ul >
+    <li><a href="javascript:void(0);" target="_blank" class="por_index_act ">首页</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">网站头条</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">精品课程</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">热点项目</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">精华帖子</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">最新动态</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">名师风采1</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜</a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
+    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
+  </ul>
+  <a href="javascript:void(0);" target="_blank" class=" fr por_edit_index">配置 </a>
+  <div class="cl"></div>
+</div><!--por_nav end-->
+
+
+<script type="text/javascript">
+    $("#navHomepageProfile").mouseenter(function(){
+        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").show();
+    });
+    $("#navHomepageProfile").mouseleave(function(){
+        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").hide();
+    });
+
+    function signout(){
+        $.post(
+                '<%= signout_path%>',
+                {}
+        );
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index c490efb85..ba18438e5 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,6 +1,6 @@
 <%# 区分两种模式 params[:org_subfield_id] 不为空的时候则跳到栏目%>
 <% if @organization.switch_type && params[:org_subfield_id].nil? %>
-    <%= render :partial => 'show_type2' %>
+    <%#= render :partial => 'show_type2' %>
 <% else %>
     <%= javascript_include_tag "jquery.infinitescroll.js" %>
 
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 790877660..ce4bff32f 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -7,8 +7,6 @@ ol,ul,li{ list-style-type:none}
 a:link,a:visited{color:#000;text-decoration:none;}
 a:hover,a:active{color:#3b94d6;}
 
-
-
 /* 公共 */
 .clear:after {content:".";height:0;visibility:hidden;display:block;clear:both;}
 .fl{ float:left;}
@@ -24,11 +22,11 @@ a:hover,a:active{color:#3b94d6;}
 .mr5{ margin-right:5px;}
 .mr10{ margin-right:15px;}
 .mr15{ margin-right:10px;}
-a.c_red{color:#df0600;}
-.c_red{color:#df0600;}
+
 /* 门户首页 */
-#por_header{ width:100%; height:70px; background-color:#3b94d6; }
-.por_header_con{ width:1000px; margin:0 auto;}
+#por_header{ width:100%;   }
+.por_header_top{ width:100%; height:70px; background:#3b94d6; }
+.por_header_con{ width:1000px; margin:0 auto; height:70px;  }
 .por_logo{ margin-top:5px;}
 .por_login li{ float:left;}
 .por_login li a{ display:block; padding:0 15px; height:70px; line-height:70px;font-size:16px; color:#fff; }
@@ -37,15 +35,17 @@ a.c_red{color:#df0600;}
 .pro_input_search{ background-color:#daeefc; height:36px; width:355px; border:none; padding:0 5px; color:#3b94d6;}
 a.por_search_btn{ display:block;background:#daeefc url(../images/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
 a:hover.por_search_btn{background:#daeefc url(../images/icons_por.png) -35px 8px  no-repeat; }
+.por_nav{ width:1000px; height:70px;  overflow:hidden;   margin: 0 auto; position:relative; }
+a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:20px;}
+.por_nav ul{ border-bottom:7px solid #ccc; height:63px;}
+.por_nav ul li{ float:left; }
+.por_nav ul li a{ display: block;  height:63px; padding:0 20px; line-height:63px; font-size:18px; color:#333; }
+.por_nav ul li a:hover{ border-bottom:7px solid #3b94d6; }
+.por_index_act{border-bottom:7px solid #3b94d6; }
 
 #por_container{ width:1000px; margin:10px auto;}
 .por_left{ width:685px; margin-right:15px; float:left; }
 .por_right{ width:300px; float:left;}
-.por_nav{ width:1000px; overflow:hidden; position:relative;height:53px; border-bottom:7px solid #ccc; margin-bottom:10px;}
-a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
-.por_nav ul li{ float:left;}
-.por_nav ul li a{ display: block;  height:53px; padding:0 20px; line-height:53px; font-size:18px; color:#333;}
-.por_nav ul li a:hover{ border-bottom:7px solid #3b94d6;}
 .por_icons_hot{ background:url(../images/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
 .por_h2_index{ font-size:20px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
 a.por_more_index{ font-size:12px; color:#999; }
@@ -115,8 +115,6 @@ a.por_teachers_name{ display:block; width:80px; font-size:18px;overflow:hidden;
 .por_footer_con ul li a span{ color:#999; margin:0 15px ;}
 .por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
 
-.por_index_position{ position:relative;}
-a.por_xiang_index{ position:absolute; color:red; background:#fff; top:40px;  left:292px;}
 
 
 

From 9cc749bd57dbd97558d549aae8bf3331ec149f67 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 30 May 2016 14:38:57 +0800
Subject: [PATCH 186/668] =?UTF-8?q?=E9=97=A8=E6=88=B7=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_custom.html.erb    |  2 +-
 .../organizations/_org_custom_header.html.erb |  2 +-
 public/stylesheets/org_custom.css             | 25 -------------------
 public/stylesheets/public.css                 |  4 ++-
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb
index 4a9ba4dce..4742eab4f 100644
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -15,7 +15,7 @@
   <!-- MathJax的配置 -->
   <%=render :partial => "math_js" %>
 </head>
-<body>
+<body background="#fff">
 <% update_visiti_count @organization %>
 <header id="por_header">
   <%= render :partial => 'org_custom_header' %>
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 027e4e8ec..349aef8c6 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -43,7 +43,7 @@
     <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
     <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
   </ul>
-  <a href="javascript:void(0);" target="_blank" class=" fr por_edit_index">配置 </a>
+  <a href="javascript:void(0);" target="_blank" class="link-black fr por_edit_index">配置 </a>
   <div class="cl"></div>
 </div><!--por_nav end-->
 
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index ce4bff32f..85f056438 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -1,28 +1,3 @@
-/* 门户样式重置 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#fff;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#000;text-decoration:none;}
-a:hover,a:active{color:#3b94d6;}
-
-/* 公共 */
-.clear:after {content:".";height:0;visibility:hidden;display:block;clear:both;}
-.fl{ float:left;}
-.fr{ float:right;}
-.cl{ clear:both; overflow:hidden;}
-.mt5{ margin-top:5px;}
-.mt10{ margin-top:10px;}
-.mb5{ margin-bottom:5px;}
-.mb10{ margin-bottom:10px;}
-.ml5{ margin-left:5px;}
-.ml10{ margin-left:10px;}
-.ml15{ margin-left:15px;}
-.mr5{ margin-right:5px;}
-.mr10{ margin-right:15px;}
-.mr15{ margin-right:10px;}
-
 /* 门户首页 */
 #por_header{ width:100%;   }
 .por_header_top{ width:100%; height:70px; background:#3b94d6; }
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2ca221d5c..115e48223 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -270,6 +270,8 @@ a.linkGrey6 {color:#484848 !important;}
 a.linkGrey6:hover {color:#ffffff !important;}
 a.linkGrey7 {color:#888888;}
 a.linkGrey7:hover {color:#269ac9;}
+a.link-black {color:#000;}
+a.link-black:hover {color:#3b94d6;}
 a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
@@ -1139,4 +1141,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .likeNum{color: #7f7f7f}
 
 /*弹框*/
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}

From 698e4bd7b3a1a5c855e6aafd6a0dc11368098bf2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 30 May 2016 14:41:53 +0800
Subject: [PATCH 187/668] header

---
 app/views/layouts/base_org_custom.html.erb    |  2 +-
 .../organizations/_org_custom_header.html.erb | 52 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb
index 4a9ba4dce..355ec23ec 100644
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -18,7 +18,7 @@
 <body>
 <% update_visiti_count @organization %>
 <header id="por_header">
-  <%= render :partial => 'org_custom_header' %>
+  <%= render :partial => 'org_custom_header', :locals => {:subfield_content => @subfield_content} %>
 </header>
 
 <!--内容开始-->
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 027e4e8ec..4be46e789 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -30,20 +30,45 @@
 <div class="cl"></div>
 <div class="por_nav"   >
   <ul >
-    <li><a href="javascript:void(0);" target="_blank" class="por_index_act ">首页</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">网站头条</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">精品课程</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">热点项目</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">精华帖子</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">最新动态</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">名师风采1</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜</a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
-    <li><a href="javascript:void(0);" target="_blank" class=" ">学生英雄榜 </a></li>
+    <% subfield_content.each do |field| %>
+        <% if is_default_field?(field) %>
+            <% case field.name %>
+            <% when 'activity' %>
+                <li style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+                  <%= link_to "首页", organization_path(@organization), :class => "por_index_act" %>
+                </li>
+            <% when 'course' %>
+                <li style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+                  <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                </li>
+            <% when 'project' %>
+                <li style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+                  <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                </li>
+            <% end %>
+        <% else %>
+            <% if field.field_type == "Post" && field.hide == 0 %>
+                <li><a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a></li>
+                <!--二级目录-->
+                <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                  <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                    <% field.sub_domains.each do |subdomain| %>
+                        <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                        <li class="sn-subnav-slice">|</li>
+                    <% end %>
+                  </ul>
+                </div>
+            <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                <li class="nav-element">
+                  <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                </li>
+            <% end %>
+        <% end %>
+    <% end %>
   </ul>
-  <a href="javascript:void(0);" target="_blank" class=" fr por_edit_index">配置 </a>
+  <% if User.current.admin_of_org?(@organization) %>
+      <a href="<%= setting_organization_path(@organization) %>" class="fr por_edit_index">配置</a>
+  <% end %>
   <div class="cl"></div>
 </div><!--por_nav end-->
 
@@ -57,7 +82,6 @@
         $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").hide();
     });
-
     function signout(){
         $.post(
                 '<%= signout_path%>',

From d4c0e9754ac6332a5af1fd5d2c7e5d8b0f153ff8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 30 May 2016 14:51:54 +0800
Subject: [PATCH 188/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=90=8E=E5=BA=94=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb |  4 ++--
 public/javascripts/course.js            | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index a9e859448..c3f3a4a60 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -157,9 +157,9 @@
           </div>
         </div>
         <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
-          <%= l(:label_expend_information)%>
+          <label id="expend_more_information"  value="show_more"><%= l(:label_expend_information)%></label>
           <span class="g-arr-down">
-            <img src="/images/jiantou.jpg" width="12" height="6" />
+            <img id="arrow" src="/images/jiantou.jpg" width="12" height="6" />
           </span>
         </div>
       </div><!--项目简介 end-->
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 7cfad6005..73ab065ea 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -475,6 +475,19 @@ function submitMemberSerch(content)
 function show_more_msg()
 {
     $("#course_description").toggleClass("course_description_none");
+    var information = $("#expend_more_information");
+    var arrow = $("#arrow");
+    var val = information.attr("value");
+    if (val == "show_more") {
+        $("#expend_more_information").text("收起描述信息");
+        information.attr("value", "hide_more");
+        arrow.attr("src", "/images/jiantouup.jpg")
+    }
+    else {
+        $("#expend_more_information").text("展开更多信息");
+        information.attr("value", "show_more");
+        arrow.attr("src", "/images/jiantou.jpg")
+    }
 }
 //作业描述显示更多信息
 function news_show_more_des(id)

From 471ed7cbd230355be723404a01ea9540826c7a9a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 30 May 2016 14:58:46 +0800
Subject: [PATCH 189/668] =?UTF-8?q?=E7=BB=84=E7=BB=87logo=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A0=B7=E5=BC=8F=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_header.html.erb   |   2 +-
 public/images/org_custom/homepageImage.jpg      | Bin 0 -> 2756 bytes
 public/images/org_custom/icons_por.png          | Bin 0 -> 19736 bytes
 public/images/org_custom/por_img.jpg            | Bin 0 -> 39793 bytes
 public/images/org_custom/porlogo.png            | Bin 0 -> 21343 bytes
 public/stylesheets/org_custom.css               |  10 +++++-----
 6 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 public/images/org_custom/homepageImage.jpg
 create mode 100644 public/images/org_custom/icons_por.png
 create mode 100644 public/images/org_custom/por_img.jpg
 create mode 100644 public/images/org_custom/porlogo.png

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 166b4991e..4d00550a8 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,6 +1,6 @@
 <div class="por_header_top">
   <div class="por_header_con" >
-    <a href="javascript:void(0);" target="_blank" class="por_logo fl "><img src="images/porlogo.png" alt="logo" width="67" height="61"  /></a>
+    <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
     <% if User.current.logged? %>
         <div class="navHomepageProfile" id="navHomepageProfile">
           <ul>
diff --git a/public/images/org_custom/homepageImage.jpg b/public/images/org_custom/homepageImage.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bd2597dd2a623d59dea9b37ed4452281a69496d3
GIT binary patch
literal 2756
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
JwKT%?;6G!sTH^o!

literal 0
HcmV?d00001

diff --git a/public/images/org_custom/icons_por.png b/public/images/org_custom/icons_por.png
new file mode 100644
index 0000000000000000000000000000000000000000..952ea0194863d331256791f567366698659527ee
GIT binary patch
literal 19736
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
AqW}N^

literal 0
HcmV?d00001

diff --git a/public/images/org_custom/por_img.jpg b/public/images/org_custom/por_img.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f76ab94c27ae8a937fa00422baf880343f712b0b
GIT binary patch
literal 39793
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
Wem~O`HN|-Sq4s_M0Gs83i~rfKx){;`

literal 0
HcmV?d00001

diff --git a/public/images/org_custom/porlogo.png b/public/images/org_custom/porlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9c7a2f0b3866718a63c10a695a9139dc4900bd6
GIT binary patch
literal 21343
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

literal 0
HcmV?d00001

diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 85f056438..cb3400031 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -8,8 +8,8 @@
 .por_login li a:hover{ background-color:#1173bc;}
 .por_search{ margin-top:15px; margin-right:20px;}
 .pro_input_search{ background-color:#daeefc; height:36px; width:355px; border:none; padding:0 5px; color:#3b94d6;}
-a.por_search_btn{ display:block;background:#daeefc url(../images/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
-a:hover.por_search_btn{background:#daeefc url(../images/icons_por.png) -35px 8px  no-repeat; }
+a.por_search_btn{ display:block;background:#daeefc url(../images/org_custom/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
+a:hover.por_search_btn{background:#daeefc url(../images/org_custom/icons_por.png) -35px 8px  no-repeat; }
 .por_nav{ width:1000px; height:70px;  overflow:hidden;   margin: 0 auto; position:relative; }
 a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:20px;}
 .por_nav ul{ border-bottom:7px solid #ccc; height:63px;}
@@ -21,7 +21,7 @@ a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:20px;}
 #por_container{ width:1000px; margin:10px auto;}
 .por_left{ width:685px; margin-right:15px; float:left; }
 .por_right{ width:300px; float:left;}
-.por_icons_hot{ background:url(../images/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
+.por_icons_hot{ background:url(../images/org_custom/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
 .por_h2_index{ font-size:20px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
 a.por_more_index{ font-size:12px; color:#999; }
 .por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
@@ -55,8 +55,8 @@ a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: now
 .por_users_img{ width:40px; height:40px; border:1px solid #e8e5e5;}
 .por_news_txt{ width:245px; margin-left:10px;}
 .por_news_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
-a.por_zan{ background:url(../images/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
-a.por_zan:hover{background:url(../images/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
+a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
+a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
 .por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_projects{border-bottom:1px solid #e8e5e5; padding-bottom:10px; margin-top:10px;}
 .por_projects ul li{ padding:5px 0;}

From f024764e29b32d5cd5ac22588aea4bfb8dbf0644 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 30 May 2016 14:59:05 +0800
Subject: [PATCH 190/668] =?UTF-8?q?=E8=AF=BE=E5=86=85=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E7=9A=84=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=A6=E7=94=9F=E2=80=9C=E5=A7=93=E5=90=8D=E2=80=9D?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E6=98=BE=E7=A4=BA=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index bff16e053..d8a2c6ed8 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -51,17 +51,9 @@
               <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
             </a>
             <ul>
-              <% if @canShowCode %>
-                  <li>
-                    <% if member.user.show_name == ''%>
-                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
-                    <% else%>
-                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
-                    <%end%>
-                  </li>
-              <% else %>
-                  <li><%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe, user_path(member.user)) %></li>
-              <% end %>
+              <li>
+                <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
+              </li>
               <br/>
               <% unless member.user.user_extensions.student_id == ''%>
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>

From c57c575c84a80cfd004f2ef3bdae569a66da5b3e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 30 May 2016 16:24:51 +0800
Subject: [PATCH 191/668] =?UTF-8?q?=E6=96=B0=E7=89=88=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           | 56 +++++-------
 app/views/layouts/base_org_custom.html.erb    | 14 +--
 .../organizations/_org_custom_left1.html.erb  | 27 ++++++
 .../organizations/_org_custom_left2.html.erb  | 28 ++++++
 .../organizations/_org_custom_left3.html.erb  | 37 ++++++++
 .../organizations/_org_custom_right1.html.erb | 71 +++++++++++++++
 .../organizations/_org_custom_right2.html.erb | 32 +++++++
 .../organizations/_org_custom_right3.html.erb | 91 +++++++++++++++++++
 app/views/organizations/_show_custom.html.erb | 31 +++++++
 app/views/organizations/show.html.erb         |  2 +-
 public/stylesheets/org_custom.css             |  2 +-
 11 files changed, 348 insertions(+), 43 deletions(-)
 create mode 100644 app/views/organizations/_show_custom.html.erb

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index cba4fa210..ab3b3715c 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -66,34 +66,26 @@ module OrganizationsHelper
     option1 << "左一"
     option1 << "1"
     type << option1
-    # option2 = []
-    # option2 << "中一"
-    # option2 << "2"
-    # type << option2
+    option2 = []
+    option2 << "左二"
+    option2 << "2"
+    type << option2
     option3 = []
-    option3 << "左二"
-    option3 << "3"
+    option3 << "左三"
+    option3 << "2"
     type << option3
     option4 = []
-    option4 << "左三"
-    option4 << "4"
+    option4 << "右一"
+    option4 << "3"
     type << option4
     option5 = []
-    option5 << "左四"
+    option5 << "右二"
     option5 << "5"
     type << option5
     option6 = []
-    option6 << "右一"
+    option6 << "右三"
     option6 << "6"
     type << option6
-    option7 = []
-    option7 << "右二"
-    option7 << "7"
-    type << option7
-    option8 = []
-    option8 << "右三"
-    option8 << "8"
-    type << option8
     type
   end
 
@@ -104,18 +96,22 @@ module OrganizationsHelper
     option1 << "左一"
     option1 << "1"
     type << option1
+    option2 = []
+    option2 << "左二"
+    option2 << "2"
+    type << option2
     option3 = []
-    option3 << "左二"
-    option3 << "3"
+    option3 << "左三"
+    option3 << "2"
     type << option3
     option4 = []
-    option4 << "左三"
-    option4 << "4"
+    option4 << "右一"
+    option4 << "3"
     type << option4
-    option6 = []
-    option6 << "右一"
-    option6 << "6"
-    type << option6
+    option5 = []
+    option5 << "右二"
+    option5 << "5"
+    type << option5
     type
   end
 
@@ -128,14 +124,10 @@ module OrganizationsHelper
       when 3
         resulet = "左二"
       when 4
-        resulet = "左三"
-      when 5
-        resulet = "左四"
-      when 6
         resulet = "右一"
-      when 7
+      when 5
         resulet = "右二"
-      when 8
+      when 6
         resulet = "右三"
     end
   end
diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb
index 052dea860..0eb764e5e 100644
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -21,16 +21,15 @@
   <%= render :partial => 'org_custom_header', :locals => {:subfield_content => @subfield_content} %>
 </header>
 
-<!--内容开始-->
-<div class="sn-content">
+<%# 内容开始 %>
+<div id="por_container">
   <%= render_flash_messages %>
   <%= yield %>
   <%= call_hook :view_layouts_base_content %>
 </div>
-<!--内容结束-->
-<footer class="por_footer">
-  <%= render :partial => "layouts/org_custom_footer" %></footer>
-<!--页面底部-->
+<%# 内容结束 %>
+<%# 页面底部 %>
+<footer class="por_footer"><%= render :partial => "layouts/org_custom_footer" %></footer>
 <div class="cl"></div>
 <%# 弹框 %>
 <div id="ajax-modal" style="display:none;"></div>
@@ -42,6 +41,3 @@
 </body>
 </html>
 
-
-</html>
-
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index e69de29bb..4410f9545 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -0,0 +1,27 @@
+<div class="por_hotbar clear">
+  <h2 class="por_h2_index clear">网站头条<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
+  <ul class="por_hotbar_left fl">
+    <li>
+      <a href="javascript:void(0);" target="_blank" class="por_hot_title "><span class="por_icons_hot fl">热门推荐</span>阿里前副总裁：阿里巴巴给我上的10</a>
+      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+      <p class="por_hot_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class="por_hot_title "><span class="por_icons_hot fl">热门推荐</span>阿里前副总裁：阿里巴巴给我上的10</a>
+      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+      <p class="por_hot_txt">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class="por_hot_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+      <p class="por_hot_txt">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+    </li>
+  </ul>
+  <div class="por_hotbar_right fl">
+    <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
+    <a href="javascript:void(0);" target="_blank" class="por_hot_title_r ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+    <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+    <p class="por_hot_txt_r ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+  </div>
+  <div class="cl"></div>
+</div><!--por_hotbar end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index e69de29bb..649a1dd55 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -0,0 +1,28 @@
+<div class="por_course mt10 clear">
+  <h2 class="por_h2_index clear">精品课程<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
+  <div class="por_course_bar fl clear">
+    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2算机程序设计(Z2班)算机程序设计(Z2班)班)</a>
+    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
+    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的算机程序设计(Z2班)算机程序设计(Z2班)算机程序设计(Z2班)学习需要多思考。学习程序设计</p>
+    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
+  </div>
+  <div class="por_course_bar fl clear">
+    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
+    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
+    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
+    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
+  </div>
+  <div class="por_course_bar fl clear">
+    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
+    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
+    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
+    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
+  </div>
+  <div class="por_course_bar fl clear">
+    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
+    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
+    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
+    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
+  </div>
+  <div class="cl"></div>
+</div><!--por_course end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index e69de29bb..db20d42a1 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -0,0 +1,37 @@
+<div class="por_post mt10 ">
+  <h2 class="por_h2_index clear">精华帖子<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
+  <div class="por_post_left fl">
+    <div class="por_post_leftbar ">
+      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
+      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+    </div>
+    <ul class="por_post_list">
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+    </ul>
+  </div>
+  <div class="fl">
+    <ul class="por_post_right por_post_list">
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
+</div><!--por_post end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index e69de29bb..6fc24555f 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -0,0 +1,71 @@
+<div class="por_news">
+  <h2 class="por_h2_index clear">最新动态<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
+  <ul class="por_news_list clear">
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下，比以前好用很多....
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl"> 当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下很多了...
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+      <div class="por_news_txt fl">
+        <p class="por_news_p fl">
+          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
+          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
+        </p>
+        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+      </div>
+      <div class="cl"></div>
+    </li>
+  </ul>
+</div><!--por_news end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index e69de29bb..3cef2f622 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -0,0 +1,32 @@
+<div class="por_projects">
+  <h2 class="por_h2_index clear">热点项目<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
+  <ul>
+    <li class="por_project_li">
+      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+
+      <div class="cl"></div>
+      <p class="por_project_p ">众所周知，系统读取数据时，从内存中读取要比从硬盘上速度要快好几上速度要快好几百倍。故现在绝大上速度要快好几百倍。故现在绝大百倍。故现在绝大部分应用系...</p>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+      <div class="cl"></div>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+      <div class="cl"></div>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+      <div class="cl"></div>
+    </li>
+    <li>
+      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+      <div class="cl"></div>
+    </li>
+  </ul>
+</div><!--por_projects end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index e69de29bb..698a2ea25 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -0,0 +1,91 @@
+<div class="por_teachers">
+  <ul id="por_teachers_nav">
+    <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
+      <a href="javascript:void(0);" class="por_teachers_type" >名师风采</a>
+    </li>
+    <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
+      <a href="javascript:void(0);" class="por_teachers_type" >学生英雄榜</a>
+    </li>
+    <a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>
+    <div class="cl"></div>
+  </ul>
+  <div id="por_teachers_content_1" >
+    <ul class="por_teachers_li">
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
+          <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+          <p class="por_teachers_p fr">国防科学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+          <p class="por_teachers_p fr">国防科学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+          <p class="por_teachers_p fr">国防科学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+          <p class="por_teachers_p fr">国防科学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+
+    </ul>
+  </div>
+  <div id="por_teachers_content_2" class="undis">
+    <ul class="por_teachers_li">
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
+          <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+        <div class="por_teachers_txt fl mt5">
+          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+          <p class="por_teachers_p fr">国防科学技术大学</p>
+          <div class="cl"></div>
+          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_show_custom.html.erb b/app/views/organizations/_show_custom.html.erb
new file mode 100644
index 000000000..fbcc0c5f3
--- /dev/null
+++ b/app/views/organizations/_show_custom.html.erb
@@ -0,0 +1,31 @@
+<div class="por_left">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_custom_left1', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%#= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+            <%= render :partial => 'organizations/org_custom_left3', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 2 %>
+          <%= render :partial => 'organizations/org_custom_left2', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="por_right">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_custom_right1', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_custom_right2', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
+      <%# elsif field.status.to_i == 23 %>
+          <%#= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index ba18438e5..72e95ded9 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,6 +1,6 @@
 <%# 区分两种模式 params[:org_subfield_id] 不为空的时候则跳到栏目%>
 <% if @organization.switch_type && params[:org_subfield_id].nil? %>
-    <%#= render :partial => 'show_type2' %>
+    <%= render :partial => 'show_custom' %>
 <% else %>
     <%= javascript_include_tag "jquery.infinitescroll.js" %>
 
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index cb3400031..6f68ba47f 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -78,7 +78,7 @@ a.por_more_teacher{ font-size:12px; }
 .por_teachers_li{ margin-top:10px;}
 .por_teachers_li li{ padding:10px 0;border-bottom:1px solid #e8e5e5;}
 .por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-a.por_teachers_name{ display:block; width:80px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_teachers_span{ color:#999;}
 .por_teachers_span a{ margin:0 5px; color:#999;}

From acc323e46df6aa156e077f9e13519995945804f5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 30 May 2016 18:35:47 +0800
Subject: [PATCH 192/668] =?UTF-8?q?issue7890=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/zipdown_controller.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 386e5733d..1ce834f61 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -10,14 +10,14 @@ class ZipdownController < ApplicationController
   #勿删 before_filter :authorize, :only => [:assort,:download_user_homework]
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
+  MAX_PATH = 250
 
   #统一下载功能 
   def download
     if User.current.logged?
       begin
         if params[:base64file]
-          file = Base64.decode64(params[:base64file])
-          file = file.sub('*', '+')
+          file = decode64(params[:base64file])
           send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file)
         else
           send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
@@ -125,7 +125,11 @@ class ZipdownController < ApplicationController
   end
 
   def encode64(str)
-    Base64.encode64(str).sub('+', '*')
+    Base64.urlsafe_encode64(str)
+  end
+
+  def decode64(str)
+    Base64.urlsafe_decode64(str)
   end
 
   def zip_homework_common homework_common
@@ -242,6 +246,12 @@ class ZipdownController < ApplicationController
 
   def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
     rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
+    # 文件名过长
+
+    if rename_zipfile.size > MAX_PATH
+      rename_zipfile = rename_zipfile[0,rename_zipfile.size-4][0,MAX_PATH-4] + rename_zipfile[-4,4]
+    end
+
     zipfile_name = "#{output_path}/#{rename_zipfile}"
 
     Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))

From 858ad47338e1b9d16dcf981f9c8eeb736c4121a4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 30 May 2016 18:40:22 +0800
Subject: [PATCH 193/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E5=AE=9A=E4=B8=BA50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 1ce834f61..d9a9e1def 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -10,7 +10,7 @@ class ZipdownController < ApplicationController
   #勿删 before_filter :authorize, :only => [:assort,:download_user_homework]
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
-  MAX_PATH = 250
+  MAX_PATH = 50
 
   #统一下载功能 
   def download

From c421933cf61748ccb166ce972503aa6b2070db55 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 08:57:08 +0800
Subject: [PATCH 194/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=9C=80=E6=96=B0?=
 =?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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index cbd43bb79..2275a550e 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -33,14 +33,14 @@ 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.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(",") + ")"
+          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')"
           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 + ")"
-          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
+          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
           blog_ids = "(" + watched_user_blog_ids + ")"
 
           activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +

From c333a0c55d1656740a1a656d2b1c6432fe42c492 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 10:31:08 +0800
Subject: [PATCH 195/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=8F=90=E4=BE=9B=E5=AD=A6=E9=9C=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   |  8 ++--
 app/controllers/organizations_controller.rb   | 42 ++++++++++++-----
 app/helpers/organizations_helper.rb           |  5 ++-
 app/models/org_subfield.rb                    |  2 +
 app/models/organization.rb                    |  4 +-
 app/views/org_subfields/create.js.erb         |  2 +-
 app/views/org_subfields/destroy.js.erb        |  2 +-
 .../organizations/_org_custom_admin.html.erb  | 12 +++++
 .../organizations/_org_custom_header.html.erb |  2 +-
 .../organizations/_org_students_list.html.erb | 45 +++++++++++++++++++
 .../_setting_excellent_students.html.erb      | 12 +++++
 .../organizations/_subfield_list.html.erb     |  2 +-
 .../reset_excellent_teacher.js.erb            |  2 +-
 app/views/organizations/setting.html.erb      | 14 +++---
 app/views/organizations/students.html.erb     | 30 +++++++++++++
 app/views/organizations/students.js.erb       |  3 ++
 config/routes.rb                              |  3 ++
 ...531021244_add_excellent_student_to_user.rb |  5 +++
 db/schema.rb                                  |  3 +-
 19 files changed, 167 insertions(+), 31 deletions(-)
 create mode 100644 app/views/organizations/_org_custom_admin.html.erb
 create mode 100644 app/views/organizations/_org_students_list.html.erb
 create mode 100644 app/views/organizations/_setting_excellent_students.html.erb
 create mode 100644 app/views/organizations/students.html.erb
 create mode 100644 app/views/organizations/students.js.erb
 create mode 100644 db/migrate/20160531021244_add_excellent_student_to_user.rb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index c628b25fc..01a36d5b9 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -15,11 +15,9 @@ class OrgSubfieldsController < ApplicationController
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])
-      # 如果栏目是教师，不参入类型的配置，定义为右三模式
-      # 新增模块命名规则，左边1开头，右边2开头，以前的不变
-      # eg：23 右三
-      if params[:field_type] == "Comptec"
-        @subfield.update_attributes(:status => 23)
+      # 如果栏目是教师或学生，不参入类型的配置，默认定义为右三模式
+      if params[:field_type] == "Comptec" || params[:field_type] == "Compstu"
+        @subfield.update_attribute(:status, 6)
       end
     else
       @res = false
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 3cf36a781..fc0a8b35e 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -28,7 +28,7 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students]
   layout 'base_org'
   def index
 
@@ -159,7 +159,7 @@ class OrganizationsController < ApplicationController
   end
 
   def teachers
-    unless @organization.allow_set_teachers
+    unless User.current.admin?
       render_403
       return
     end
@@ -169,12 +169,6 @@ class OrganizationsController < ApplicationController
     if @type == "courses" || @type.nil?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif @type == "students"
-      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
-                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif @type == "resources"
-      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from attachments where attachments.author_id = u.id) as course_count
-                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
     elsif @type == "famous"
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
@@ -192,6 +186,34 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def students
+    unless User.current.admin?
+      render_403
+      return
+    end
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type == "courses" || @type.nil?
+      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "famous"
+      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and u.excellent_student =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    end
+    limit = 10
+    # @is_remote = true
+    @students_count = @org_students.count
+    @atta_pages = Paginator.new @students_count, limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @org_students = paginateHelper @org_students, limit
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
   def searchmember_by_name  members, name
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
@@ -474,13 +496,13 @@ class OrganizationsController < ApplicationController
   # 设置为名师
   def set_excellent_teacher
     @ex_teacher = User.find(params[:user])
-    @ex_teacher.update_column(:excellent_teacher, 1)
+    params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 1) : @ex_teacher.update_column(:excellent_teacher, 1)
   end
 
   # 取消名师
   def reset_excellent_teacher
     @ex_teacher = User.find(params[:user])
-    @ex_teacher.update_column(:excellent_teacher, 0)
+    params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 0) : @ex_teacher.update_column(:excellent_teacher, 0)
   end
 
   def hide_org_subfield
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index ab3b3715c..7298841b1 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -140,10 +140,13 @@ module OrganizationsHelper
     org_acts
   end
 
+  def allow_to_create?(org, type)
+    !org_subfield_had_created?(org, type) && User.current.admin?
+  end
+
   def org_subfield_had_created?(org, type)
     sub_field = org.org_subfields.select{|subfield| subfield.field_type == type}
     result = sub_field.length > 0 ? true : false
-    result
   end
 
   def org_subfield_type(field)
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 1151426e3..76d472ad9 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -11,6 +11,8 @@ class OrgSubfield < ActiveRecord::Base
   acts_as_attachable
   after_create :create_board_sync
   after_destroy :update_priority
+  # status 为栏目定制决定参数，1 左一 2 左二 3 左三 4 右一 5 右二 6 右三
+
   # 创建资源栏目讨论区
   def create_board_sync
     @board = self.boards.build
diff --git a/app/models/organization.rb b/app/models/organization.rb
index c35d0591d..7aa259528 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -24,11 +24,11 @@ class Organization < ActiveRecord::Base
   end
 
   def switch_type
-    self.show_mode.to_i == 1 ? true : false
+    self.show_mode.to_i == 1
   end
 
   def allow_set_teachers
-    self.allow_teacher.to_i == 1 ? true : false
+    self.allow_teacher.to_i == 1
   end
 
   def secdomain_name
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 5cc6d5c91..f1661ba87 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,7 +4,7 @@
         :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-    $("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");
+    $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");
\ No newline at end of file
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
index c14eeae8f..60ce47fe6 100644
--- a/app/views/org_subfields/destroy.js.erb
+++ b/app/views/org_subfields/destroy.js.erb
@@ -3,4 +3,4 @@ $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organiza
     :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-$("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");
\ No newline at end of file
+$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_admin.html.erb b/app/views/organizations/_org_custom_admin.html.erb
new file mode 100644
index 000000000..559b52b63
--- /dev/null
+++ b/app/views/organizations/_org_custom_admin.html.erb
@@ -0,0 +1,12 @@
+<% if allow_to_create?(@organization, "Comptec") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgTec" value="Comptec" name="field_type" />
+      <label for="Comptec">教师</label>
+    </li>
+<% end %>
+<% if allow_to_create?(@organization, "Compstu") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgStu" value="Compstu" name="field_type" />
+      <label for="Comptec">学生</label>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 4d00550a8..fc556255a 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -67,7 +67,7 @@
     <% end %>
   </ul>
   <% if User.current.admin_of_org?(@organization) %>
-      <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index">配置</a>
+      <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index" target="_blank">配置</a>
   <% end %>
   <div class="cl"></div>
 </div><!--por_nav end-->
diff --git a/app/views/organizations/_org_students_list.html.erb b/app/views/organizations/_org_students_list.html.erb
new file mode 100644
index 000000000..4f768d29f
--- /dev/null
+++ b/app/views/organizations/_org_students_list.html.erb
@@ -0,0 +1,45 @@
+<% org_students.each do |org_student| %>
+    <% school = School.where("id =?", org_student.school_id).first %>
+    <div class="teacher-list-row">
+      <div>
+        <div class="teacher-avatar">
+          <%= link_to image_tag(url_to_avatar(org_student), :width => "90", :height => "90"), user_url_in_org(org_student), :alt => "用户头像" %>
+        </div>
+        <div class="fl">
+          <div class="ml25 mb20"><span class="teacher-name"><%=link_to org_student.try(:realname).nil? ? org_student.try(:login) : org_student.try(:realname), user_url_in_org(org_student) %></span>
+            <% unless school.nil? %>
+                <span class="f12 fontGrey2 mr15"><%= school.name %></span>
+            <% end %>
+          </div>
+          <div class="teacher-social-block">
+            <div class="block-num"><%= org_student.courses.count %></div>
+            <div class="block-title">课程数</div>
+          </div>
+          <div class="block-slice"></div>
+          <div class="teacher-social-block">
+            <div class="block-num"><%= org_teacher_resource_count(org_student) %></div>
+            <div class="block-title">资源数</div>
+          </div>
+        </div>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_student.id %>');" id="hide_<%= org_student.id %>"><%= org_student.excellent_student ==0 ? "设为学霸" : "取消设置" %></a>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end %>
+
+<script>
+    function hide(content, id){
+        if (content.text() == '设为学霸')
+            $.ajax({
+                url: "/organizations/set_excellent_teacher?user=" + id + "&type=student",
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student",
+                type: "post"
+            });
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_setting_excellent_students.html.erb b/app/views/organizations/_setting_excellent_students.html.erb
new file mode 100644
index 000000000..696d85378
--- /dev/null
+++ b/app/views/organizations/_setting_excellent_students.html.erb
@@ -0,0 +1,12 @@
+<% if @organization.allow_set_teachers && !org_subfield_had_created?(@organization, "Comptec") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgTec" value="Comptec" name="field_type" />
+      <label for="Comptec">教师</label>
+    </li>
+<% end %>
+<% if User.current.admin? && !org_subfield_had_created?(@organization, "Compstu") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgStu" value="Compstu" name="field_type" />
+      <label for="Comptec">学生</label>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index f16e53b0e..9307f3eb0 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -92,7 +92,7 @@
             <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
             <span class="fr">|</span>
             <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-            <% unless field.field_type == "Resource" || field.field_type == "Comptec" %>
+            <% unless field.field_type == "Resource" || field.field_type == "Comptec" || field.field_type == "Compstu" %>
                 <span class="fr">|</span>
                 <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
                 <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->
diff --git a/app/views/organizations/reset_excellent_teacher.js.erb b/app/views/organizations/reset_excellent_teacher.js.erb
index fdf160bc4..8b7c6cc71 100644
--- a/app/views/organizations/reset_excellent_teacher.js.erb
+++ b/app/views/organizations/reset_excellent_teacher.js.erb
@@ -1 +1 @@
-$("#hide_<%= @ex_teacher.id %>").text("设为名师");
\ No newline at end of file
+$("#hide_<%= @ex_teacher.id %>").text(<%= params[:type]== "student" ? "设为学霸" : "设为名师"%>);
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 0c8af8471..1920213cb 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -87,11 +87,11 @@
           &nbsp;<span>允许游客下载</span>
           <span class="c_green f12" id="allow_down_hint"><%= @organization.is_public? ? "" : "（私有组织不允许游客下载资源）" %></span>
         </div>
-        <% if User.current.admin? %>
-                <div class="orgRow mb10 mt5"><span style="margin-left:10px;">允许设置名师榜&nbsp;: </span>
-                  <input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />
-                </div>
-        <% end %>
+        <!--<%# if User.current.admin? %>-->
+                <!--<div class="orgRow mb10 mt5"><span style="margin-left:10px;">允许设置名师榜&nbsp;: </span>-->
+                  <!--<input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%#= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />-->
+                <!--</div>-->
+        <!--<%# end %>-->
         <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
         <% end %>
       </div>
@@ -162,8 +162,8 @@
                 <input type="radio" id="orgMeb" value="Resource" name="field_type" />
                 <label for="orgMeb">资源</label>
               </li>
-              <div id="org_excellent_teachers">
-                <%= render :partial => 'organizations/setting_excellent_teachers' %>
+              <div id="org_custom_admin">
+                <%= render :partial => 'organizations/org_custom_admin' %>
               </div>
               <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
               <li class="cl"></li>
diff --git a/app/views/organizations/students.html.erb b/app/views/organizations/students.html.erb
new file mode 100644
index 000000000..770967210
--- /dev/null
+++ b/app/views/organizations/students.html.erb
@@ -0,0 +1,30 @@
+<div class="homepageRightBanner">
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+        学霸列表
+    <% else %>
+        <%= @field.name %>
+    <% end %>
+  </div>
+</div>
+<div class="resources mt10">
+  <div class="function-row" id="org_student_search">
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'students', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入学生名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <div class="sn-font-grey fr">
+      <%= link_to "学霸列表", students_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div id="org_students_list">
+    <%=render 'organizations/org_students_list', :org_students => @org_students %>
+  </div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 15px;">
+      <%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :flag => true %>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/students.js.erb b/app/views/organizations/students.js.erb
new file mode 100644
index 000000000..c65f8f861
--- /dev/null
+++ b/app/views/organizations/students.js.erb
@@ -0,0 +1,3 @@
+$("#org_students_list").html('<%= escape_javascript( render :partial => 'organizations/org_students_list', :locals => {:org_students => @org_students})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_student_search").attr('href','<%= students_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 2863d49a4..71b8f298e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,6 +77,7 @@ RedmineApp::Application.routes.draw do
       get 'more_org_courses'
       get 'search_courses'
       get 'teachers'
+      get 'students'
       post 'join_course_menu'
       post 'join_courses'
       get 'search_projects'
@@ -94,7 +95,9 @@ RedmineApp::Application.routes.draw do
       post 'hide_org_subfield'
       post 'show_org_subfield'
       post 'set_excellent_teacher'
+      post 'set_excellent_student'
       post 'reset_excellent_teacher'
+      post 'reset_excellent_student'
       post 'agree_apply_subdomain'
     end
   end
diff --git a/db/migrate/20160531021244_add_excellent_student_to_user.rb b/db/migrate/20160531021244_add_excellent_student_to_user.rb
new file mode 100644
index 000000000..08378bca5
--- /dev/null
+++ b/db/migrate/20160531021244_add_excellent_student_to_user.rb
@@ -0,0 +1,5 @@
+class AddExcellentStudentToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :excellent_student, :integer, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7462c304e..f7d61f57c 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 => 20160523085440) do
+ActiveRecord::Schema.define(:version => 20160531021244) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -2426,6 +2426,7 @@ ActiveRecord::Schema.define(:version => 20160523085440) do
     t.integer  "gid"
     t.integer  "visits",                          :default => 0
     t.integer  "excellent_teacher",               :default => 0
+    t.integer  "excellent_student",               :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

From 19de82359a7db0686cbea05a16a0418860885a3b Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 10:53:11 +0800
Subject: [PATCH 196/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         | 1 +
 public/assets/wechat/course_discussion.html   | 1 +
 public/assets/wechat/course_notice.html       | 1 +
 public/assets/wechat/homework_detail.html     | 1 +
 public/assets/wechat/issue_detail.html        | 1 +
 public/assets/wechat/jour_message_detail.html | 1 +
 public/assets/wechat/project_discussion.html  | 1 +
 7 files changed, 7 insertions(+)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index fa3a9f341..bd398c988 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="blog.act_type == 'BlogComment'">
     <div class="post-container">
         <div class="post-wrapper">
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index d1b65e629..46ef95cfa 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+    <div loading-spinner></div>
     <div ng-if="discussion.act_type == 'Message'">
         <div class="post-container">
             <div loading-spinner></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index c10763bf8..a4bca9809 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="news.act_type == 'News'">
     <div class="post-container">
         <div class="post-wrapper">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 2783bd317..0671da049 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
         <div class="post-wrapper">
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 035a7c98d..0be7ba5ac 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
         <div class="post-wrapper">
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 5ccbf6248..9b1494abe 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -1,4 +1,5 @@
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="message.act_type == 'JournalsForMessage'">
     <div class="post-container">
         <div class="post-wrapper">
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index be639c1a0..69625c0c5 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
 <div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
         <div class="post-wrapper">

From 79c106a1c6bd5f0e3d9e698304749d58a0315f16 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 11:04:20 +0800
Subject: [PATCH 197/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb    | 20 ++------------------
 public/assets/wechat/activities.html |  2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 2275a550e..af17e0f44 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -13,28 +13,12 @@ module Mobile
         end
         post do
           user = UserWechat.find_by_openid(params[:openid]).user
-=begin
-          shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
-          shield_course_ids = ShieldActivity.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.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')"
-          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(','))+")"
-          activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                              "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
-                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
-=end
 
           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.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(",") + ")"
+          user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 1bab8dfb4..30b4dafaa 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -175,7 +175,7 @@
           </div>
         </div>
 
-        <div ng-if="act.act_type=='ProjectCreateInfo'">
+        <div ng-if="act.act_type=='Project'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">

From c369b271a0d967dd2edb309ddbf91d27930c8f3f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 11:24:47 +0800
Subject: [PATCH 198/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E9=85=8D=E7=BD=AE=E5=90=8E=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=8A=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb                      | 8 ++++++++
 app/views/org_subfields/create.js.erb                    | 3 +--
 app/views/org_subfields/destroy.js.erb                   | 5 ++---
 app/views/org_subfields/update.js.erb                    | 3 ++-
 app/views/org_subfields/update_priority.js.erb           | 4 ++--
 app/views/organizations/_org_left_subfield_list.html.erb | 8 +++++---
 app/views/organizations/setting.html.erb                 | 2 +-
 app/views/sub_domains/create.js.erb                      | 2 +-
 app/views/sub_domains/destroy.js.erb                     | 2 +-
 app/views/sub_domains/domain_update_priority.js.erb      | 2 +-
 app/views/sub_domains/update.js.erb                      | 3 ++-
 11 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 7298841b1..4a712c0f0 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -132,6 +132,14 @@ module OrganizationsHelper
     end
   end
 
+  # 系统栏目只有管理员才能看到
+  def subfield_to_addmin?(org)
+    if User.current.admin?
+      @organization.org_subfields.order("priority")
+    else
+      @organization.org_subfields.select { |os| (os.field_type != "Comptec" && os.field_type != "Compstu") }.sort_by {|os| os.priority}
+    end
+  end
 
   def get_subfield_acts field
     org_subfield = OrgSubfield.find(field.id)
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index f1661ba87..952ed7b2c 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,7 +1,6 @@
 <% if @res %>
     $("#org_subfield_list").html("");
-    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
-        :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
index 60ce47fe6..f61e1c100 100644
--- a/app/views/org_subfields/destroy.js.erb
+++ b/app/views/org_subfields/destroy.js.erb
@@ -1,6 +1,5 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
-    :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
\ No newline at end of file
+$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
diff --git a/app/views/org_subfields/update.js.erb b/app/views/org_subfields/update.js.erb
index 06982ccfc..c030b7767 100644
--- a/app/views/org_subfields/update.js.erb
+++ b/app/views/org_subfields/update.js.erb
@@ -1,3 +1,4 @@
 $("#subfield_show_<%= @subfield.id %>").html("<%= @subfield.name %>");
 $("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
\ No newline at end of file
diff --git a/app/views/org_subfields/update_priority.js.erb b/app/views/org_subfields/update_priority.js.erb
index 475649aac..043e8acbd 100644
--- a/app/views/org_subfields/update_priority.js.erb
+++ b/app/views/org_subfields/update_priority.js.erb
@@ -1,2 +1,2 @@
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields.order("priority")}) %>");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 4340213a4..12edd4201 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -101,13 +101,15 @@
                         <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% else %>
-                    <% if field.field_type == "Comptec" %>
+                    <% if field.field_type == "Comptec" && User.current.admin? %>
                         <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% else %>
+                    <% elsif field.field_type == "Compstu" && User.current.admin? %>
+                        <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% elsif field.field_type != "Comptec" && field.field_type != "Compstu" %>
                         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% end %>
-                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec"  %>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec" && field.field_type != "Compstu" %>
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
               </div>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 1920213cb..06420363a 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -172,7 +172,7 @@
       </div>
 <!--over-->
         <div class="orgColumnList" id="org_subfield_list">
-          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
+          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)} %>
         </div>
     </div>
 </div>
diff --git a/app/views/sub_domains/create.js.erb b/app/views/sub_domains/create.js.erb
index 0990e35de..d793efd6e 100644
--- a/app/views/sub_domains/create.js.erb
+++ b/app/views/sub_domains/create.js.erb
@@ -1,6 +1,6 @@
 <% if @res %>
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
 <% end %>
diff --git a/app/views/sub_domains/destroy.js.erb b/app/views/sub_domains/destroy.js.erb
index 913c400f7..4d8ef21de 100644
--- a/app/views/sub_domains/destroy.js.erb
+++ b/app/views/sub_domains/destroy.js.erb
@@ -1,4 +1,4 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/sub_domains/domain_update_priority.js.erb b/app/views/sub_domains/domain_update_priority.js.erb
index 475649aac..e4de7c931 100644
--- a/app/views/sub_domains/domain_update_priority.js.erb
+++ b/app/views/sub_domains/domain_update_priority.js.erb
@@ -1,2 +1,2 @@
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields.order("priority")}) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/sub_domains/update.js.erb b/app/views/sub_domains/update.js.erb
index 02810eee7..2c0af9c42 100644
--- a/app/views/sub_domains/update.js.erb
+++ b/app/views/sub_domains/update.js.erb
@@ -1,3 +1,4 @@
 $("#subsubdomain_show_<%= @subdomain.id %>").html("<%= @subdomain.name %>");
 $("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
\ No newline at end of file

From 8f897cbf89a5395727e985628d7346c3f77dc096 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 13:47:05 +0800
Subject: [PATCH 199/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=A8=A1=E5=BC=8F=EF=BC=8C=E4=BA=8C=E7=BA=A7=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sub_domains_controller.rb     |  3 ++
 .../_org_left_subfield_list.html.erb          | 29 ++++++++++++++++++-
 app/views/organizations/setting.html.erb      |  2 +-
 app/views/sub_domains/_new.html.erb           |  9 ------
 app/views/sub_domains/create.js.erb           |  3 --
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb
index e32935789..438b67eec 100644
--- a/app/controllers/sub_domains_controller.rb
+++ b/app/controllers/sub_domains_controller.rb
@@ -18,6 +18,9 @@ class SubDomainsController < ApplicationController
     else
       @res = false
     end
+    respond_to do |format|
+      format.js
+    end
   end
 
   def update
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 12edd4201..b51b57afb 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -91,7 +91,34 @@
         <% end %>
     <% else %>
         <div style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-          <% if field.field_type == "Post" || field.field_type == "Complex" || field.field_type == "Compstu" || field.field_type == "Comptec" %> <!--讨论帖子-->
+          <% if field.field_type == "Post" || field.field_type == "Complex" %> <!--讨论帖子-->
+              <div class="homepageLeftMenuBlock">
+                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
+                <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                    <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
+                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% else %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% end %>
+                <% else %>
+                    <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                <% end %>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+                    <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
+                <% end %>
+              </div>
+              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+                <ul>
+                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
+                </ul>
+              </div>
+
+              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
+                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
+                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
+                  </li>
+              <% end %>
+          <% elsif field.field_type == "Comptec" %>
               <div class="homepageLeftMenuBlock">
                 <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
                 <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 06420363a..775bc7e6a 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -184,7 +184,7 @@
   function add_org_subfield_subdomain(){
       if ($("#subfield_name_subdomain").val().trim() != "")
       $("#add_subfield_form_subdomain").submit();
-      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")}  )) %>');
+      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)})) %>');
   }
   var $is_exist = false;
   function apply_subdomain(id, domain){
diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb
index 25b660750..865eae785 100644
--- a/app/views/sub_domains/_new.html.erb
+++ b/app/views/sub_domains/_new.html.erb
@@ -9,10 +9,6 @@
           <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
           <label for="orgMng">帖子</label>
         </li>
-        <!--<li class="fl mr15">-->
-          <!--<input type="radio" id="orgMeb" value="Resource" name="field_type" />-->
-          <!--<label for="orgMeb">资源</label>-->
-        <!--</li>-->
         <li class="cl"></li>
       </ul>
       <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="add_org_subfield_subdomain();hideModal()">确定</a></div>
@@ -20,8 +16,3 @@
   <% end %>
   <div class="cl"></div>
 </div>
-
-
-<script type="javascript">
-
-</script>
\ No newline at end of file
diff --git a/app/views/sub_domains/create.js.erb b/app/views/sub_domains/create.js.erb
index d793efd6e..8c7b7f64a 100644
--- a/app/views/sub_domains/create.js.erb
+++ b/app/views/sub_domains/create.js.erb
@@ -1,8 +1,5 @@
 <% if @res %>
-$("#org_subfield_list").html("");
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
 <% end %>
-$("#subfield_name").val("");
-$("#sub_dir").val("");
\ No newline at end of file

From f166a951f3665c7edbdaed54927f341f258a1ba8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 13:49:39 +0800
Subject: [PATCH 200/668] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         |  4 +---
 public/assets/wechat/course_discussion.html   |  4 +---
 public/assets/wechat/course_notice.html       |  4 +---
 public/assets/wechat/homework_detail.html     | 12 +++++-------
 public/assets/wechat/issue_detail.html        | 12 +++++-------
 public/assets/wechat/jour_message_detail.html |  4 +---
 public/assets/wechat/project_discussion.html  |  4 +---
 7 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index bd398c988..4e0fb3577 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -8,9 +8,7 @@
                 <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</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;">
-                    <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
-                </div>
+                <div class="f13 c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 46ef95cfa..0d7beb9e6 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -15,9 +15,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
                     </tr></table>
-                    <div class="post-content c-grey3 mt10" style="height:auto;">
-                        <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                    </div>
+                    <div class="f13 c-grey3 mt10" ng-bind-html="discussion.content|safeHtml"></div>
                     <div class="cl"></div>
                     <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index a4bca9809..22906af39 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -14,9 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
                     </tr></table>
-                <div class="post-content c-grey3 mt10" style="height:auto;">
-                    <div class="post-all-content" ng-bind-html="news.description|safeHtml"></div>
-                </div>
+                <div class="f13 c-grey3 mt10" ng-bind-html="news.description|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{news.created_on}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 0671da049..b822f9866 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -16,13 +16,11 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
                     </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}}分</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="f13 c-grey3 mt10 mb10" ng-bind-html="homework.description|safeHtml"></div>
+                <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
+                <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>
+                <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评开启时间：{{homework.evaluation_start}}<br /></span>
+                <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评关闭时间：{{homework.evaluation_end}}</span>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{homework.publish_time}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 0be7ba5ac..28b02c5aa 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -14,13 +14,11 @@
                         <td class="text-nowrap v-top">来&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>
-                    <span class="c-grey">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
-                    优先级：{{issue.issue_priority}}<br />
-                    指派给：{{issue.issue_assigned_to}}<br />
-                    完成度：{{issue.done_ratio}}%</span>
-                </div>
+                <div class="f13 c-grey3 mt10 mb10" ng-bind-html="issue.description|safeHtml"></div>
+                <span class="c-grey f13">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
+                优先级：{{issue.issue_priority}}<br />
+                指派给：{{issue.issue_assigned_to}}<br />
+                完成度：{{issue.done_ratio}}%</span>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{issue.created_on}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 9b1494abe..a4ad7a0dd 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -7,9 +7,7 @@
                 <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
                 <div class="post-title">{{message.created_on}}</div>
                 <div class="cl"></div>
-                <div class="post-content c-grey2 mt10" style="height:auto;">
-                    <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
-                </div>
+                <div class="f13 c-grey3 mt10" ng-bind-html="message.notes|safeHtml"></div>
                 <div class="cl"></div>
             </div>
             <div class="post-interactive border-bottom">
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 69625c0c5..4b86eaf28 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -14,9 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</td>
                     </tr></table>
-                <div class="post-content c-grey3 mt10" style="height:auto;">
-                    <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                </div>
+                <div class="f13 c-grey3 mt10" ng-bind-html="discussion.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                 <div class="cl"></div>

From 6bfe344cbf8cfe0cf6b72af36590173f7a391c0b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 13:59:29 +0800
Subject: [PATCH 201/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=80=E5=B7=A6=E4=BE=A7=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

---
 .../_org_left_subfield_list.html.erb          | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index b51b57afb..e621df8bd 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -112,46 +112,20 @@
                   <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
                 </ul>
               </div>
-
               <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
                   <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
                     <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
                   </li>
               <% end %>
-          <% elsif field.field_type == "Comptec" %>
+          <% elsif field.field_type == "Comptec" && User.current.admin?  %>
               <div class="homepageLeftMenuBlock">
-                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
-                <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
-                    <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% else %>
-                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% end %>
-                <% else %>
-                    <% if field.field_type == "Comptec" && User.current.admin? %>
-                        <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% elsif field.field_type == "Compstu" && User.current.admin? %>
-                        <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% elsif field.field_type != "Comptec" && field.field_type != "Compstu" %>
-                        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% end %>
-                <% end %>
-                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec" && field.field_type != "Compstu" %>
-                    <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
-                <% end %>
+                <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
-                <ul>
-                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq.limit(5), :org_subfield_id => field.id} %>
-                </ul>
+          <% elsif field.field_type == "Compstu" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-
-              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
-                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
-                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
-                  </li>
-              <% end %>
-          <% else %>
+          <% elsif field.field_type == "Resource" %>
               <div class="homepageLeftMenuBlock">
                   <% if !field.subfield_subdomain_dir.nil? %>
                       <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>

From 796125bd1c70813f194eeb2f95eba76fe38b78ff Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 14:18:40 +0800
Subject: [PATCH 202/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E6=97=B6=E9=97=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index 49640d889..3f7adcfa6 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -182,7 +182,7 @@ module ApiHelper
     timeIntoFormat = 0
     updateAtValue = ""
     if timePassed < 0
-        updateAtValue = "时间有问题"
+        updateAtValue = "1分钟前"
     elsif timePassed < ONE_MINUTE
         updateAtValue = "1分钟前"
     elsif timePassed < ONE_HOUR

From 91be3b9f85c8c2df8ee68b8f11dddff4dc32c02a Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 14:37:45 +0800
Subject: [PATCH 203/668] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=97=B6=E6=8C=89=E9=92=AE=E5=8F=98=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         | 3 ++-
 public/assets/wechat/course_discussion.html   | 3 ++-
 public/assets/wechat/course_notice.html       | 3 ++-
 public/assets/wechat/homework_detail.html     | 3 ++-
 public/assets/wechat/issue_detail.html        | 5 +++--
 public/assets/wechat/jour_message_detail.html | 3 ++-
 public/assets/wechat/project_discussion.html  | 3 ++-
 public/javascripts/wechat/app.js              | 6 +++---
 public/stylesheets/weui/weixin.css            | 2 ++
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 4e0fb3577..b820ed591 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -39,7 +39,8 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey 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 0d7beb9e6..f02c01ff6 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -46,7 +46,8 @@
                             <textarea class="copy-input"></textarea>
                             <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                         </div>
-                        <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey 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 22906af39..0a85ed089 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -45,7 +45,8 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addNoticeReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addNoticeReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey 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 b822f9866..e416b7313 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -51,7 +51,8 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment"></textarea>
                     </div>
-                    <button ng-click="addHomeworkReply(formData)" ng-disabled="formData.disabled" value="回复" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addHomeworkReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey 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 28b02c5aa..7b5db0afa 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -49,8 +49,9 @@
                             <textarea class="copy-input"></textarea>
                             <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                         </div>
-                        <button ng-click="addIssueReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                        <div class="cl"></div>
+                        <button ng-click="addIssueReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
+                    <div class="cl"></div>
                 </div>
             </div>
         </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index a4ad7a0dd..fada796f8 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -37,7 +37,8 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addJournalReply(formData)" ng-hide="formData.disabled" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey 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 4b86eaf28..bd863f5ed 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -45,7 +45,8 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
             </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 8f00a2b96..267fefb43 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){
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ba3eac3df..b09c54109 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -84,3 +84,5 @@ a.underline {text-decoration:underline;}
 
 /*帖子锁定样式*/
 .locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
+
+.bg-grey {background-color:#c1c1c1;}

From 80452ceef92553d98fbaf6cc288e7fb29a2ec701 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 14:38:55 +0800
Subject: [PATCH 204/668] =?UTF-8?q?app.js=E6=96=87=E4=BB=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 267fefb43..8f00a2b96 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 bb7204846fff4a57a66c8a69eec9c761dd689767 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 14:41:50 +0800
Subject: [PATCH 205/668] =?UTF-8?q?=E6=96=B0=E7=89=88=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E5=88=B6=E6=A8=A1=E5=BC=8F6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           |   5 +-
 .../organizations/_org_custom_right3.html.erb | 233 +++++++++++-------
 2 files changed, 146 insertions(+), 92 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 4a712c0f0..cd3322283 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -44,9 +44,8 @@ module OrganizationsHelper
 
   def get_attach_org2(field)
     org_attachments = field.attachments
-    attachments = User.current.admin? ? org_attachments : visable_attachemnts(org_attachments)
-    return attachments.sort_by{|x| x.created_on}.reverse.first(6)
-    # Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;")
+    attachments = User.current.admin? ? org_attachments.first(5) : visable_attachemnts(org_attachments).first(5)
+    attachments.sort_by{|x| x.created_on}.reverse
   end
 
   # 从内容中获取路径
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index 698a2ea25..c29097400 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -1,91 +1,146 @@
-<div class="por_teachers">
-  <ul id="por_teachers_nav">
-    <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
-      <a href="javascript:void(0);" class="por_teachers_type" >名师风采</a>
-    </li>
-    <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
-      <a href="javascript:void(0);" class="por_teachers_type" >学生英雄榜</a>
-    </li>
-    <a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>
-    <div class="cl"></div>
-  </ul>
-  <div id="por_teachers_content_1" >
-    <ul class="por_teachers_li">
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
-          <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
+<% if field.field_type == "Resource" %>
+    <div class="por_teachers" style="display:<%= field.hide == 0?'block':'none' %>;">
+      <h2 class="por_h2_index clear"><%= field.name %><%= link_to "更多", org_subfield_files_path(field), :target => "_blank", :class => "por_more_index fr" %></h2>
+      <div id="por_teachers_content_1" >
+        <ul class="por_teachers_li">
+          <% get_attach_org2(field).each do |attach| %>
+              <li >
+                <%= link_to image_tag(url_to_avatar(attach.author),:width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(attach.author), :target => "_blank", :class => "fl" %>
+                <!--<a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>-->
+                <div class="por_teachers_txt fl mt5">
+                  <%= link_to attach.author, user_path(attach.author), :class => " por_teachers_name fl", :target => "_blank"  %>
+                  <p class="por_teachers_p fr">
+                    <%= link_to truncate(attach.filename,length: 20, omission: '...'),
+                             download_named_attachment_path(attach.id, attach.filename),
+                             :title => attach.filename+"\n"+attach.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %>
+                  </p>
+                  <div class="cl"></div>
+                  <p class="por_teachers_span ">
+                    <span class="mr10">类型：<span><%= attach.tag_list[0] %></span></span>
+                    <span class="mr10">下载：<span><%= attach.downloads %></span></span>
+                    <span class="mr10">引用：<span><%= attach.quotes.nil? ? 0 : attach.quotes %></span></span>
+                  </p>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div id="por_teachers_content_2" class="undis">
+        <ul class="por_teachers_li">
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
+              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+        </ul>
+      </div>
+    </div>
+<% else %>
+    <div class="por_teachers">
+      <ul id="por_teachers_nav">
+        <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
+          <a href="javascript:void(0);" class="por_teachers_type" >名师风采</a>
+        </li>
+        <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
+          <a href="javascript:void(0);" class="por_teachers_type" >学生英雄榜</a>
+        </li>
+        <a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>
         <div class="cl"></div>
-      </li>
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-          <p class="por_teachers_p fr">国防科学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-          <p class="por_teachers_p fr">国防科学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-          <p class="por_teachers_p fr">国防科学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-          <p class="por_teachers_p fr">国防科学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
+      </ul>
+      <div id="por_teachers_content_1" >
+        <ul class="por_teachers_li">
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
+              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
 
-    </ul>
-  </div>
-  <div id="por_teachers_content_2" class="undis">
-    <ul class="por_teachers_li">
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
-          <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-        <div class="por_teachers_txt fl mt5">
-          <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-          <p class="por_teachers_p fr">国防科学技术大学</p>
-          <div class="cl"></div>
-          <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-    </ul>
-  </div>
-</div>
\ No newline at end of file
+        </ul>
+      </div>
+      <div id="por_teachers_content_2" class="undis">
+        <ul class="por_teachers_li">
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
+              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+          <li >
+            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
+            <div class="por_teachers_txt fl mt5">
+              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
+              <p class="por_teachers_p fr">国防科学技术大学</p>
+              <div class="cl"></div>
+              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+        </ul>
+      </div>
+    </div>
+<% end %>

From e121d7d9270cdffefab90a1b154e0da97e280cfe Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 14:55:25 +0800
Subject: [PATCH 206/668] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BE=B9=E6=A1=86=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js   |  6 +++---
 public/stylesheets/weui/weixin.css | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 8f00a2b96..267fefb43 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){
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index b09c54109..4a88f9705 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -4,6 +4,16 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
 h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+blockquote {
+    border:1px solid #d4d4d4;
+    padding: 0.6em;
+    margin-left: 1.4em;
+    margin-right: 0.4em;
+    border-radius: 4px;
+    font-family: "Microsoft YaHei";
+    background-size: 100% 100%;
+    margin-top:5px;
+}
 .f12 {font-size:12px;}
 .f13 {font-size:13px;}
 .f15 {font-size:15px;}

From 7e93518d4149548b49663dbc6e23bb96f4948c14 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 31 May 2016 14:56:24 +0800
Subject: [PATCH 207/668] =?UTF-8?q?app.js=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 267fefb43..8f00a2b96 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 8d56d8556fb7cca93362e2be6464d6dd2ab5e1bb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 16:03:48 +0800
Subject: [PATCH 208/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E5=BC=8F6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           |  18 ++
 .../organizations/_org_custom_right3.html.erb | 165 +++++++-----------
 app/views/organizations/_show_custom.html.erb |   8 +-
 3 files changed, 85 insertions(+), 106 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index cd3322283..4d704ba5f 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -42,6 +42,11 @@ module OrganizationsHelper
     Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;")
   end
 
+  # 获取两种类型的隐藏状态，数量大于0说明是可见
+  def double_field_show org
+    OrgSubfield.find_by_sql("SELECT * FROM `org_subfields` where organization_id = #{org.id} and (field_type = 'Compstu' or field_type = 'Comptec') and hide = 0;").count
+  end
+
   def get_attach_org2(field)
     org_attachments = field.attachments
     attachments = User.current.admin? ? org_attachments.first(5) : visable_attachemnts(org_attachments).first(5)
@@ -189,4 +194,17 @@ module OrganizationsHelper
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 order by course_count desc").first(5)
   end
 
+  def excellent_students
+    User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity = 1 and u.excellent_student = 1 order by course_count desc").first(5)
+  end
+
+  def excellent_teachers_hide? org
+    org.org_subfields.where(:field_type => "Comptec").first.hide
+  end
+
+  def excellent_students_hide? org
+    org.org_subfields.where(:field_type => "Compstu").first.hide
+  end
+
 end
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index c29097400..34612a8ee 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -1,7 +1,7 @@
 <% if field.field_type == "Resource" %>
-    <div class="por_teachers" style="display:<%= field.hide == 0?'block':'none' %>;">
-      <h2 class="por_h2_index clear"><%= field.name %><%= link_to "更多", org_subfield_files_path(field), :target => "_blank", :class => "por_more_index fr" %></h2>
-      <div id="por_teachers_content_1" >
+    <div class="por_teachers" style="display:<%= field.hide == 0 ? 'block' : 'none' %>;">
+      <h2 class="por_h2_index clear"><%= field.name %><%= link_to "更多>", org_subfield_files_path(field), :target => "_blank", :class => "por_more_index fr" %></h2>
+      <div>
         <ul class="por_teachers_li">
           <% get_attach_org2(field).each do |attach| %>
               <li >
@@ -26,121 +26,80 @@
           <% end %>
         </ul>
       </div>
-      <div id="por_teachers_content_2" class="undis">
-        <ul class="por_teachers_li">
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
-              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-        </ul>
-      </div>
     </div>
-<% else %>
+<% elsif field.field_type == "Comptec" || field.field_type == "Compstu" %>
     <div class="por_teachers">
       <ul id="por_teachers_nav">
         <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
-          <a href="javascript:void(0);" class="por_teachers_type" >名师风采</a>
+          <a href="javascript:void(0);" class="por_teachers_type">名师风采</a>
         </li>
         <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
-          <a href="javascript:void(0);" class="por_teachers_type" >学生英雄榜</a>
+          <a href="javascript:void(0);" class="por_teachers_type">学生英雄榜</a>
         </li>
-        <a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>
+        <!--<a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>-->
         <div class="cl"></div>
       </ul>
-      <div id="por_teachers_content_1" >
+      <div id="por_teachers_content_1">
         <ul class="por_teachers_li">
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
-              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-
+          <% excellent_teachers.each do |teacher| %>
+              <li >
+                <%= link_to image_tag(url_to_avatar(teacher), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(teacher), :alt => "用户头像", :target => '_blank', :class => "fl" %>
+                <div class="por_teachers_txt fl mt5">
+                  <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "por_teachers_name fl", :target => '_blank' %>
+                  <p class="por_teachers_p fr" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></p>
+                  <div class="cl"></div>
+                  <p class="por_teachers_span ">
+                    <% unless teacher.my_blogs_count == 0 %>
+                        <span class=" mr10">博客 <%= teacher.my_blogs_count %></span>
+                    <% end %>
+                    <% unless teacher.courses.count == 0 %>
+                        <span class="mr10">课程 <%= teacher.courses.count %></span>
+                    <% end %>
+                    <% unless teacher.my_students == 0 %>
+                        <span class="mr10">学生 <%= teacher.my_students %></span>
+                    <% end %>
+                  </p>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
         </ul>
       </div>
       <div id="por_teachers_content_2" class="undis">
         <ul class="por_teachers_li">
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华张晓华张晓华张晓华 </a>
-              <p class="por_teachers_p fr">国防科学技术大学学技术大学学技术大学学技术大学学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
-          <li >
-            <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>
-            <div class="por_teachers_txt fl mt5">
-              <a href="javascript:void(0);" target="_blank" class=" por_teachers_name fl"> 张晓华  </a>
-              <p class="por_teachers_p fr">国防科学技术大学</p>
-              <div class="cl"></div>
-              <p class="por_teachers_span "><span class=" mr10">博客<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10"> 课程<a href="javascript:void(0);" target="_blank" >20</a></span><span class="mr10">学生 <a href="javascript:void(0);" target="_blank" >20</a></span></p>
-            </div>
-            <div class="cl"></div>
-          </li>
+          <% excellent_students.each do |student| %>
+              <li >
+                <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
+                <div class="por_teachers_txt fl mt5">
+                  <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name fl", :target => '_blank' %>
+                  <p class="por_teachers_p fr" title="<%= student.my_workplace %>"><%= student.my_workplace %></p>
+                  <div class="cl"></div>
+                  <p class="por_teachers_span ">
+                    <% unless student.my_blogs_count == 0 %>
+                        <span class=" mr10">博客 <%= student.my_blogs_count %></span>
+                    <% end %>
+                    <% unless student.courses.count == 0 %>
+                        <span class="mr10">课程 <%= student.courses.count %></span>
+                    <% end %>
+                  </p>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
         </ul>
       </div>
     </div>
+
+    <script>
+        //名师列表
+        function g(o){return document.getElementById(o);}
+        function HoverLi(n){
+            for(var i=1;i<=2;i++){
+                g('por_teachers_nav_'+i).className='por_teachers_nomal';
+                g('por_teachers_content_'+i).className='undis';
+            }
+            g('por_teachers_content_'+n).className='dis';
+            g('por_teachers_nav_'+n).className='por_teachers_hover';
+        }
+    </script>
 <% end %>
diff --git a/app/views/organizations/_show_custom.html.erb b/app/views/organizations/_show_custom.html.erb
index fbcc0c5f3..4d0d6470f 100644
--- a/app/views/organizations/_show_custom.html.erb
+++ b/app/views/organizations/_show_custom.html.erb
@@ -22,9 +22,11 @@
       <% elsif field.status.to_i == 5 %>
           <%= render :partial => 'organizations/org_custom_right2', :locals => {:field => field} %>
       <% elsif field.status.to_i == 6 %>
-          <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
-      <%# elsif field.status.to_i == 23 %>
-          <%#= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+          <% if field.field_type == "Resource" %>
+              <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
+          <% else %> <%# 只允许显示一个模块 %>
+              <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
+          <% end %>
       <% end %>
   <% end %>
 </div>

From ed84783f260306c7f97ef0b57e33412c806cd73b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 17:03:50 +0800
Subject: [PATCH 209/668] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=85=AC=E5=BC=80=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb           |  4 ++--
 .../_alert_open_student_works.html.erb               | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index dd178a1ce..10431f01a 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -390,7 +390,7 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
@@ -456,7 +456,7 @@ class StudentWorkController < ApplicationController
 
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
diff --git a/app/views/homework_common/_alert_open_student_works.html.erb b/app/views/homework_common/_alert_open_student_works.html.erb
index ef8fe3d08..73c7f0b47 100644
--- a/app/views/homework_common/_alert_open_student_works.html.erb
+++ b/app/views/homework_common/_alert_open_student_works.html.erb
@@ -1,10 +1,20 @@
 <div id="popbox02">
   <div class="ni_con">
-    <% if @homework.is_open == 0 %>
+    <% if @homework.is_open == 0 && @homework.course.is_public == 1 %>
         <h2>公开作品</h2>
         <p>
           本次作业的所有作品将对Trustie平台所有注册用户开放，请问是否确定公开作品？
         </p>
+    <% elsif @homework.is_open == 0 && @homework.course.is_public == 0 %>
+        <h2>公开作品</h2>
+        <p>
+          该作业是私有课程的作业，公开作品后本次作业的所有作品将对课程内的所有学生开放，请问是否确定公开作品？
+        </p>
+    <% elsif @homework.is_open == 1 && @homework.course.is_public == 0 %>
+        <h2>取消公开作品</h2>
+        <p>
+          您将取消“公开作品”的功能，该私有作业的作品将只在作业截止后对已提交作品的学生开放，请问是否确定？
+        </p>
     <% else %>
         <h2>取消公开作品</h2>
         <p>

From 8540b48091997f29509e2ca9da2bea3adaccf9d8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 17:34:56 +0800
Subject: [PATCH 210/668] =?UTF-8?q?=E6=9C=AA=E7=BB=91=E5=AE=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E8=B4=A6=E5=8F=B7=E6=97=B6=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E2=80=9D=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 8f00a2b96..1149ea131 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){
@@ -78,6 +78,9 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
             url: apiUrl+ "activities",
             data: {openid: auth.openid(), page: page}
         }).then(function successCallback(response) {
+            if(response.data.message == "undefined method `user' for nil:NilClass"){
+                alert("请先绑定确实的用户账号");
+            }
             $scope.current_page = 0;
             console.log($scope.current_page);
             console.log(response.data.page);

From a96fafd704284eeea52872105f6967bb447ec45b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 18:37:21 +0800
Subject: [PATCH 211/668] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=89=EF=BC=88?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           |   1 -
 .../_link_subfield_more.html.erb              |   6 +-
 .../organizations/_org_custom_left3.html.erb  | 235 +++++++++++++++---
 app/views/organizations/_show_custom.html.erb |  15 +-
 4 files changed, 205 insertions(+), 52 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 4d704ba5f..437014528 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -149,7 +149,6 @@ module OrganizationsHelper
     org_subfield = OrgSubfield.find(field.id)
     org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
     org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
-    org_acts
   end
 
   def allow_to_create?(org, type)
diff --git a/app/views/organizations/_link_subfield_more.html.erb b/app/views/organizations/_link_subfield_more.html.erb
index cb4a82ed1..59c12f1a1 100644
--- a/app/views/organizations/_link_subfield_more.html.erb
+++ b/app/views/organizations/_link_subfield_more.html.erb
@@ -1,9 +1,9 @@
 <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
     <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
-        <%= link_to "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+        <%= link_to "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "por_more_index fr" , :target => "_blank"  %>
     <% else %>
-        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "por_more_index fr" , :target => "_blank"  %>
     <% end %>
 <% else %>
-    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "more" , :target => "_blank"  %>
+    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "por_more_index fr" , :target => "_blank"  %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index db20d42a1..adc1840fb 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -1,37 +1,200 @@
-<div class="por_post mt10 ">
-  <h2 class="por_h2_index clear">精华帖子<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <div class="por_post_left fl">
-    <div class="por_post_leftbar ">
-      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
-      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-    </div>
-    <ul class="por_post_list">
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-    </ul>
-  </div>
-  <div class="fl">
-    <ul class="por_post_right por_post_list">
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-    </ul>
-  </div>
-  <div class="cl"></div>
+<div class="por_post mt10" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+  <% if acts.blank? %>
+      <h2 class="por_h2_index clear"><%= field.name %></h2>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有发布内容</p>
+  <% else %>
+      <h2 class="por_h2_index clear"><%= field.name %>
+        <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+      </h2>
+      <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+          <% document = activity.org_act %>
+          <% org_subfield_id = params[:org_subfield_id] %>
+          <% flag = 2 %>
+          <% iamge_path = get_image_path_from_content(document.content) %>
+          <div class="por_post_left fl">
+            <div class="por_post_leftbar ">
+              <% if iamge_path.nil? %>
+                  <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+              <% end %>
+              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title" %>
+              <p class="mt5 mb5">
+                <span class="por_time mr10"><%= time_from_now(document.created_at) %> </span>
+                <%= link_to document.creator, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+              </p>
+              <p class="por_post_txt ">
+                <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight => 40, :maxwordsnum => 60} %>
+                本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+            </div>
+            <ul class="por_post_list">
+              <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+            </ul>
+          </div>
+          <div class="fl">
+            <ul class="por_post_right por_post_list">
+              <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+            </ul>
+          </div>
+
+
+
+          <div class="sn-index-resourcesbox">
+            <% if iamge_path.nil? %>
+                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+            <% else %>
+                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+            <% end %>
+            <h3>
+              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+            </h3>
+            <div class="resources-tagbox">
+              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+              <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
+            </div>
+            <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
+
+          </div>
+      <% else activity.container_type == 'OrgSubfield' %>
+          <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+              <% message = Message.find(activity.org_act_id) %>
+              <% if message.parent_id.nil? %>
+                  <% content = message.content%>
+              <% else %>
+                  <% content = message.parent.content%>
+              <% end %>
+              <% iamge_path = get_image_path_from_content(content) %>
+              <% if message.board.org_subfield_id %>
+                  <div class="por_post_left fl">
+                    <div class="por_post_leftbar ">
+                      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
+                      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+                      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+                      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+                    </div>
+                    <ul class="por_post_list">
+                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                    </ul>
+                  </div>
+                  <div class="fl">
+                    <ul class="por_post_right por_post_list">
+                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                    </ul>
+                  </div>
+
+
+
+
+                  <div class="sn-index-resourcesbox">
+                    <% if iamge_path.nil? %>
+                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                    <% else %>
+                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                    <% end %>
+                    <h3>
+                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                          <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                      <% else %>
+                          <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                      <% end %>
+                    </h3>
+                    <div class="resources-tagbox">
+                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                      <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                    </div>
+                    <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
+                  </div>
+              <% else %>
+                  <div class="por_post_left fl">
+                    <div class="por_post_leftbar ">
+                      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
+                      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+                      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+                      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+                    </div>
+                    <ul class="por_post_list">
+                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                    </ul>
+                  </div>
+                  <div class="fl">
+                    <ul class="por_post_right por_post_list">
+                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                    </ul>
+                  </div>
+
+
+
+
+
+                  <div class="sn-index-resourcesbox">
+                    <% if iamge_path.nil? %>
+                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                    <% else %>
+                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                    <% end %>
+                    <h3>
+                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                          <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title sn-hidden" %>
+                      <% else %>
+                          <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title sn-hidden" %>
+                      <% end %>
+                    </h3>
+                    <div class="resources-tagbox">
+                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                      <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
+                    </div>
+                    <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
+                  </div>
+              <% end %>
+          <% end %>
+          <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+              <% news = News.find(activity.org_act_id) %>
+              <% iamge_path = get_image_path_from_content(news.description) %>
+              <div class="por_post_left fl">
+                <div class="por_post_leftbar ">
+                  <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
+                  <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
+                  <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
+                  <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
+                </div>
+                <ul class="por_post_list">
+                  <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                </ul>
+              </div>
+              <div class="fl">
+                <ul class="por_post_right por_post_list">
+                  <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
+                </ul>
+              </div>
+
+
+
+
+              <div class="sn-index-resourcesbox">
+                <% if iamge_path.nil? %>
+                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
+                <% else %>
+                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
+                <% end %>
+                <h3>
+                  <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
+                </h3>
+                <div class="resources-tagbox">
+                  <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
+                </div>
+                <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
+              </div>
+          <% end %>
+      <% end %>
+
+
+
+
+
+
+
+
+      <div class="cl"></div>
+  <% end %>
 </div><!--por_post end-->
\ No newline at end of file
diff --git a/app/views/organizations/_show_custom.html.erb b/app/views/organizations/_show_custom.html.erb
index 4d0d6470f..6f5c64379 100644
--- a/app/views/organizations/_show_custom.html.erb
+++ b/app/views/organizations/_show_custom.html.erb
@@ -2,15 +2,10 @@
   <% @subfield_content.each do |field| %>
       <% if field.status.to_i == 1 %>
           <%= render :partial => 'organizations/org_custom_left1', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
-          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <%#= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-            <%= render :partial => 'organizations/org_custom_left3', :locals => {:field => field} %>
-            <div class="cl"></div>
-          </div>
       <% elsif field.status.to_i == 2 %>
           <%= render :partial => 'organizations/org_custom_left2', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+          <%= render :partial => 'organizations/org_custom_left3', :locals => {:field => field, :acts => get_subfield_acts(field) }%>
       <% end %>
   <% end %>
 </div>
@@ -22,11 +17,7 @@
       <% elsif field.status.to_i == 5 %>
           <%= render :partial => 'organizations/org_custom_right2', :locals => {:field => field} %>
       <% elsif field.status.to_i == 6 %>
-          <% if field.field_type == "Resource" %>
-              <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
-          <% else %> <%# 只允许显示一个模块 %>
-              <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
-          <% end %>
+          <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
       <% end %>
   <% end %>
 </div>

From 7f811d7551b2be4660021e9fbcd40f7a4ea6edc0 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:20:15 +0800
Subject: [PATCH 212/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 43 +++++++--------------------
 config/menu.yml                       |  2 +-
 config/routes.rb                      |  1 +
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 4bf95fdbd..d4758283a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -154,12 +154,7 @@ class WechatsController < ActionController::Base
     end
   end
 
-
-
-
   ###  controller method
-
-
   module Controllers
     def get_open_id
       begin
@@ -228,37 +223,19 @@ class WechatsController < ActionController::Base
       uw = UserWechat.where(openid: openid).first
     end
 
-    def user_activity(user)
-      @user = user
-      shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
-      shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
-      @page = params[:page] ? params[:page].to_i + 1 : 0
-      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','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(','))+")"
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                                "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                                "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-                                                "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
-
+    def user_activities
+      session[:wechat_code] = params[:code] if params[:code]
+      code = params[:code] || session[:wechat_code]
+      openid = get_openid_from_code(code)
+      @wechat_user = user_binded?(openid)
+      unless @wechat_user
+        redirect_to :login
+        return
+      end
 
+      render File.join(Rails.root, "public/wechat/app.html"), layout: nil
     end
 
-    def process_activity(user_activity)
-      act= user_activity.act
-      case user_activity.container_type.to_s
-        when 'Course'
-        when 'Project'
-          case user_activity.act_type.to_s
-            when 'Issue'
-              [act.project.name.to_s+" | 项目问题", act.subject.to_s, url_to_avatar(act.author),"http://wechat.trustie.net/app.html#/issue/#{act.id}"]
-          end
-      end
-    end
   end
 
 
diff --git a/config/menu.yml b/config/menu.yml
index de1952503..ab6ae89ac 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
diff --git a/config/routes.rb b/config/routes.rb
index 2863d49a4..9abaef0ae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1237,6 +1237,7 @@ RedmineApp::Application.routes.draw do
   resource :wechat, only:[:show, :create] do
     collection do
       get :login
+      get :user_activities
       post :bind
       post :get_open_id
     end

From 7b5a7a93f535555d72b83a475a7228f62a182cee Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:40:54 +0800
Subject: [PATCH 213/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 24 +++++++++++++-----------
 config/menu.yml                       |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index d4758283a..1e87c7b96 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -202,6 +202,19 @@ class WechatsController < ActionController::Base
       render 'wechats/login', layout: 'base_wechat'
     end
 
+    def user_activities
+      session[:wechat_code] = params[:code] if params[:code]
+      code = params[:code] || session[:wechat_code]
+      openid = get_openid_from_code(code)
+      @wechat_user = user_binded?(openid)
+      unless @wechat_user
+        redirect_to :login
+        return
+      end
+
+      render File.join(Rails.root, "public/wechat/app.html"), layout: nil
+    end
+
     private
     def get_openid_from_code(code)
       openid = session[:wechat_openid]
@@ -223,18 +236,7 @@ class WechatsController < ActionController::Base
       uw = UserWechat.where(openid: openid).first
     end
 
-    def user_activities
-      session[:wechat_code] = params[:code] if params[:code]
-      code = params[:code] || session[:wechat_code]
-      openid = get_openid_from_code(code)
-      @wechat_user = user_binded?(openid)
-      unless @wechat_user
-        redirect_to :login
-        return
-      end
 
-      render File.join(Rails.root, "public/wechat/app.html"), layout: nil
-    end
 
   end
 
diff --git a/config/menu.yml b/config/menu.yml
index ab6ae89ac..3671ebb1b 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"

From e73c94680660701db79ea2059d290432b40bf957 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:43:27 +0800
Subject: [PATCH 214/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 1e87c7b96..b0901efd4 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -208,7 +208,7 @@ class WechatsController < ActionController::Base
       openid = get_openid_from_code(code)
       @wechat_user = user_binded?(openid)
       unless @wechat_user
-        redirect_to :login
+        redirect_to login_wechat_path
         return
       end
 

From 49a1a9de325b679579d9d01f3c12af6d27e37d63 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:46:30 +0800
Subject: [PATCH 215/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index b0901efd4..1074ebc3f 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
         return
       end
 
-      render File.join(Rails.root, "public/wechat/app.html"), layout: nil
+      render template: File.join(Rails.root, "public/wechat/app.html"), layout: nil
     end
 
     private

From 1c5a31e8f1a1970619f3b2974f7d74543514363d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:49:57 +0800
Subject: [PATCH 216/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 1074ebc3f..d5dfb88f7 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
         return
       end
 
-      render template: File.join(Rails.root, "public/wechat/app.html"), layout: nil
+      render file: File.join(Rails.root, "public/wechat/app.html")
     end
 
     private

From ac5d91a428981e7bd2ad5381bf8336585726993e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:51:38 +0800
Subject: [PATCH 217/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index d5dfb88f7..9c6ab33f6 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
         return
       end
 
-      render file: File.join(Rails.root, "public/wechat/app.html")
+      render template: File.join(Rails.root, "public/assets/wechat/app.html"), layout: nil
     end
 
     private

From e01da32c75a64f58a5b921366a7ae53d76e55a6a Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:54:45 +0800
Subject: [PATCH 218/668] tempate=>file

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 9c6ab33f6..e47c99cbd 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
         return
       end
 
-      render template: File.join(Rails.root, "public/assets/wechat/app.html"), layout: nil
+      render file: File.join(Rails.root, "public/assets/wechat/app.html"), layout: nil
     end
 
     private

From 4815dc3c7b3c6dc3e5ce2f804f8a4d5c7e163bae Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 19:59:34 +0800
Subject: [PATCH 219/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 8f00a2b96..f0881486e 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -482,7 +482,7 @@ app.directive('loadingSpinner', function ($http) {
 app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider) {
     $routeProvider
         .when('/activities', {
-            templateUrl: 'activities.html',
+            templateUrl: '/public/assets/wechat/activities.html',
             controller: 'ActivityController'
         })
         .when('/issues/:id', {

From 13d11e223934bac22a7b38975dc8a91f3d276a13 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:01:41 +0800
Subject: [PATCH 220/668] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=88=99?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index f0881486e..d18719cfe 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -480,37 +480,39 @@ app.directive('loadingSpinner', function ($http) {
 });
 
 app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider) {
+    var rootPath = '/assets/wechat/'
+
     $routeProvider
         .when('/activities', {
-            templateUrl: '/public/assets/wechat/activities.html',
+            templateUrl: rootPath + 'activities.html',
             controller: 'ActivityController'
         })
         .when('/issues/:id', {
-            templateUrl: 'issue_detail.html',
+            templateUrl: rootPath + 'issue_detail.html',
             controller: 'IssueController'
         })
         .when('/project_discussion/:id', {
-            templateUrl: 'project_discussion.html',
+            templateUrl: rootPath + 'project_discussion.html',
             controller: 'DiscussionController'
         })
         .when('/homework/:id', {
-            templateUrl: 'homework_detail.html',
+            templateUrl: rootPath + 'homework_detail.html',
             controller: 'HomeworkController'
         })
         .when('/course_notice/:id', {
-            templateUrl: 'course_notice.html',
+            templateUrl: rootPath + 'course_notice.html',
             controller: 'CourseNoticeController'
         })
         .when('/course_discussion/:id', {
-            templateUrl: 'course_discussion.html',
+            templateUrl: rootPath + 'course_discussion.html',
             controller: 'DiscussionController'
         })
         .when('/journal_for_message/:id', {
-            templateUrl: 'jour_message_detail.html',
+            templateUrl: rootPath + 'jour_message_detail.html',
             controller: 'JournalsController'
         })
         .when('/blog_comment/:id', {
-            templateUrl: 'blog_detail.html',
+            templateUrl: rootPath + 'blog_detail.html',
             controller: 'BlogController'
         })
         .otherwise({

From 814fde878e5743013963e9111eb232cf85ea9000 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:19:45 +0800
Subject: [PATCH 221/668] =?UTF-8?q?=E4=BB=8E=E5=90=8E=E5=8F=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96openid=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb      |  2 +-
 app/views/wechats/user_activities.html.erb | 30 ++++++++++++++++++++++
 config/menu.yml                            |  2 +-
 public/javascripts/wechat/app.js           |  4 +++
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 app/views/wechats/user_activities.html.erb

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e47c99cbd..ea230abe5 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
         return
       end
 
-      render file: File.join(Rails.root, "public/assets/wechat/app.html"), layout: nil
+      render 'wechats/user_activities', layout: nil
     end
 
     private
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
new file mode 100644
index 000000000..b45587ae0
--- /dev/null
+++ b/app/views/wechats/user_activities.html.erb
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html ng-app="wechat">
+<head>
+  <title>最新动态</title>
+  <meta charset='utf-8' />
+  <meta name="keywords" content="" />
+  <meta name="description" content="" />
+  <meta name="apple-mobile-web-app-capable" content="no">
+  <meta content='True' name='HandheldFriendly' />
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+
+  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+  <script type="text/javascript">
+    window.g_openid = '<%= @wechat_user.openid %>';
+  </script>
+</head>
+<body>
+<div ng-view>
+</div>
+
+
+<script src="/javascripts/wechat/angular.js"></script>
+<script src="/javascripts/wechat/angular-route.js"></script>
+<script src="/javascripts/wechat/angular-sanitize.min.js"></script>
+<script src="/javascripts/wechat/angular-cookies.js"></script>
+<script src="/javascripts/jquery-1.3.2.js"></script>
+<script src="/javascripts/wechat/app.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/config/menu.yml b/config/menu.yml
index 3671ebb1b..83b892037 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index d18719cfe..59605271c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -10,6 +10,10 @@ if(debug===true){
 app.factory('auth', function($http,$routeParams, $cookies, $q){
     var _openid = '';
 
+    if(typeof g_openid !== 'undefined'){
+        _openid = g_openid;
+    }
+
     if(debug===true){
         _openid = "1";
     }

From 9ecdf0892b370bc9837fa87f9395362d6d3d3622 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 20:45:54 +0800
Subject: [PATCH 222/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A6=E4=B8=89?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left3.html.erb  | 328 ++++++++----------
 .../_organization_content_extension.html.erb  |  23 ++
 2 files changed, 170 insertions(+), 181 deletions(-)
 create mode 100644 app/views/organizations/_organization_content_extension.html.erb

diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index adc1840fb..fdf06a023 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -6,195 +6,161 @@
       <h2 class="por_h2_index clear"><%= field.name %>
         <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
       </h2>
-      <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-          <% document = activity.org_act %>
-          <% org_subfield_id = params[:org_subfield_id] %>
-          <% flag = 2 %>
-          <% iamge_path = get_image_path_from_content(document.content) %>
-          <div class="por_post_left fl">
-            <div class="por_post_leftbar ">
-              <% if iamge_path.nil? %>
-                  <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
-              <% else %>
-                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
-              <% end %>
-              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title" %>
-              <p class="mt5 mb5">
-                <span class="por_time mr10"><%= time_from_now(document.created_at) %> </span>
-                <%= link_to document.creator, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
-              </p>
-              <p class="por_post_txt ">
-                <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight => 40, :maxwordsnum => 60} %>
-                本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-            </div>
-            <ul class="por_post_list">
-              <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-            </ul>
-          </div>
-          <div class="fl">
-            <ul class="por_post_right por_post_list">
-              <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-            </ul>
-          </div>
-
-
-
-          <div class="sn-index-resourcesbox">
-            <% if iamge_path.nil? %>
-                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-            <% else %>
-                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-            <% end %>
-            <h3>
-              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
-            </h3>
-            <div class="resources-tagbox">
-              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
-              <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
-            </div>
-            <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
-
-          </div>
-      <% else activity.container_type == 'OrgSubfield' %>
-          <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-              <% message = Message.find(activity.org_act_id) %>
-              <% if message.parent_id.nil? %>
-                  <% content = message.content%>
-              <% else %>
-                  <% content = message.parent.content%>
-              <% end %>
-              <% iamge_path = get_image_path_from_content(content) %>
-              <% if message.board.org_subfield_id %>
-                  <div class="por_post_left fl">
-                    <div class="por_post_leftbar ">
-                      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
-                      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-                      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-                      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-                    </div>
-                    <ul class="por_post_list">
-                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                    </ul>
+      <div class="por_post_left fl">
+        <div class="por_post_leftbar ">
+          <% activity = acts.first %>
+              <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% document = activity.org_act %>
+                  <% if get_image_path_from_content(acts.first.org_act.content).nil? %>
+                      <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => "_blank" %>
+                  <% else %>
+                      <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(acts.first.org_act.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => "_blank" %>
+                  <% end %>
+                  <%= link_to acts.first.org_act.title, org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => '_blank', :class => "por_post_title" %>
+                  <p class="mt5 mb5">
+                    <span class="por_time mr10"><%= time_from_now(acts.first.org_act.created_at) %> </span>
+                    <%= link_to acts.first.org_act.creator, user_path(acts.first.org_act.creator), :class => "por_hot_name", :target => "_blank" %>
+                  </p>
+                  <div class="por_post_txt">
+                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
                   </div>
-                  <div class="fl">
-                    <ul class="por_post_right por_post_list">
-                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                    </ul>
-                  </div>
-
-
-
-
-                  <div class="sn-index-resourcesbox">
-                    <% if iamge_path.nil? %>
-                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                    <% else %>
-                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                    <% end %>
-                    <h3>
-                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                          <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+              <% else activity.container_type == 'OrgSubfield' %>
+                  <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                      <% message = Message.find(activity.org_act_id) %>
+                      <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                      <% iamge_path = get_image_path_from_content(content) %>
+                      <% if message.board.org_subfield_id %>
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <% end %>
+                          <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                              <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title" %>
+                          <% else %>
+                              <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title" %>
+                          <% end %>
+                          <p class="mt5 mb5">
+                            <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
+                            <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                          </p>
+                          <div class="por_post_txt">
+                            <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
+                          </div>
                       <% else %>
-                          <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
+                          <% end %>
+                          <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                              <%= link_to message.subject.to_s.html_safe, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title" %>
+                          <% else %>
+                              <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title" %>
+                          <% end %>
+                          <p class="mt5 mb5">
+                            <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
+                            <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                          </p>
+                          <div class="por_post_txt">
+                            <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
+                          </div>
                       <% end %>
-                    </h3>
-                    <div class="resources-tagbox">
-                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
-                      <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
-                    </div>
-                    <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
-                  </div>
-              <% else %>
-                  <div class="por_post_left fl">
-                    <div class="por_post_leftbar ">
-                      <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
-                      <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-                      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-                      <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-                    </div>
-                    <ul class="por_post_list">
-                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                    </ul>
-                  </div>
-                  <div class="fl">
-                    <ul class="por_post_right por_post_list">
-                      <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                    </ul>
-                  </div>
-
-
-
-
-
-                  <div class="sn-index-resourcesbox">
-                    <% if iamge_path.nil? %>
-                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
-                    <% else %>
-                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
-                    <% end %>
-                    <h3>
-                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                          <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title sn-hidden" %>
+                  <% end %>
+                  <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                      <% news = News.find(activity.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(news.description) %>
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                       <% else %>
-                          <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title sn-hidden" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                       <% end %>
-                    </h3>
-                    <div class="resources-tagbox">
-                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
-                      <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
-                    </div>
-                    <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
-                  </div>
+                      <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "por_post_title" %>
+                      <p class="mt5 mb5">
+                        <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
+                        <%= link_to news.author, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                      </p>
+                      <div class="por_post_txt">
+                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
+                      </div>
+                  <% end %>
+              <% end %>
+          
+
+          <% unless acts[1..5].nil? %>
+              <% acts[1..5].each do |activity| %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                      <% document = activity.org_act %>
+                      <ul class="por_post_list">
+                        <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                      </ul>
+                  <% else activity.container_type == 'OrgSubfield' %>
+                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                          <% message = Message.find(activity.org_act_id) %>
+                          <% if message.board.org_subfield_id %>
+                              <ul class="por_post_list">
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                <% else %>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                <% end %>
+                              </ul>
+                          <% else %>
+                              <ul class="por_post_list">
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                <% else %>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                <% end %>
+                              </ul>
+                          <% end %>
+                      <% end %>
+                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                          <% news = News.find(activity.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(news.description) %>
+                          <ul class="por_post_list">
+                            <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w390', :target => "_blank" %></li>
+                          </ul>
+                      <% end %>
+                  <% end %>
               <% end %>
           <% end %>
-          <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-              <% news = News.find(activity.org_act_id) %>
-              <% iamge_path = get_image_path_from_content(news.description) %>
-              <div class="por_post_left fl">
-                <div class="por_post_leftbar ">
-                  <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
-                  <a href="javascript:void(0);" target="_blank" class="por_post_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-                  <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-                  <p class="por_post_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-                </div>
-                <ul class="por_post_list">
-                  <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w390"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                </ul>
-              </div>
-              <div class="fl">
-                <ul class="por_post_right por_post_list">
-                  <li><a href="javascript:void(0);" target="_blank" class=" por_hidden_w270"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a></li>
-                </ul>
-              </div>
-
-
-
-
-              <div class="sn-index-resourcesbox">
-                <% if iamge_path.nil? %>
-                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
-                <% else %>
-                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
-                <% end %>
-                <h3>
-                  <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
-                </h3>
-                <div class="resources-tagbox">
-                  <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
-                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
-                </div>
-                <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
-              </div>
-          <% end %>
+        </div>
+      </div>
+      <% unless acts[6..19].nil? %>
+          <div class="fl">
+            <ul class="por_post_right por_post_list">
+              <% acts[6..19].each do |activity| %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                      <% document = activity.org_act %>
+                      <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                  <% else activity.container_type == 'OrgSubfield' %>
+                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                          <% message = Message.find(activity.org_act_id) %>
+                          <% if message.board.org_subfield_id %>
+                              <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                              <% else %>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                              <% end %>
+                          <% else %>
+                              <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w270', :target => "_blank" %></li>
+                              <% else %>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w270', :target => "_blank" %></li>
+                              <% end %>
+                          <% end %>
+                      <% end %>
+                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                          <% news = News.find(activity.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(news.description) %>
+                          <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w270', :target => "_blank" %></li>
+                      <% end %>
+                  <% end %>
+              <% end %>
+            </ul>
+          </div>
       <% end %>
-
-
-
-
-
-
-
-
       <div class="cl"></div>
   <% end %>
 </div><!--por_post end-->
\ No newline at end of file
diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb
new file mode 100644
index 000000000..c63011586
--- /dev/null
+++ b/app/views/organizations/_organization_content_extension.html.erb
@@ -0,0 +1,23 @@
+<p class="por_post_txt" id="activity_description_<%= user_activity_id %>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</p>
+
+<script type="text/javascript">
+    $("#intro_content_<%= user_activity_id %>").hide();
+    $(function() {
+        var heightType = <%= maxheight %>;
+
+        if (heightType > 0) {
+            $("#activity_description_<%= user_activity_id %>").css("max-height", heightType + "px");
+        }
+
+        var maxWidth = <%= maxwidth %>
+        if (maxWidth > 0) {
+            $("#intro_content_<%= user_activity_id%>").css("max-width", maxWidth + "px");
+        }
+
+        description_showwords_ellipsis(<%= user_activity_id %>,<%= maxwordsnum %>);
+    });
+</script>
\ No newline at end of file

From 48b36e5d169e1ca519df54bccc7482c47a8a7351 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:46:46 +0800
Subject: [PATCH 223/668] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html |  2 +-
 public/javascripts/wechat/app.js     | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 30b4dafaa..ab0e85faf 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -118,7 +118,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="goDetail('issues',act.act_id)" id="{{act.act_id}}">
                   <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"><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>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 59605271c..4c17027e0 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -7,6 +7,7 @@ if(debug===true){
     apiUrl = 'https://www.trustie.net/api/v1/';
 }
 
+
 app.factory('auth', function($http,$routeParams, $cookies, $q){
     var _openid = '';
 
@@ -66,7 +67,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.controller('ActivityController',function($scope, $http, auth, rms, common){
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -76,6 +77,12 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
     $scope.page = 0;
 
     var loadActData = function(page){
+        if (page <= 0 && $scope.activities.length >0){
+            var yOffset = rms.get("yoffset");
+            $location.hash(yOffset);
+            return;
+        }
+
         $scope.page = page;
         $http({
             method: 'POST',
@@ -109,6 +116,12 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
 
     $scope.loadActData = loadActData;
 
+    //跳到详情页
+    $scope.goDetail = function(type, id){
+        rms.save("yoffset", id);
+        $location.path('/'+type+'/'+id);
+    }
+
     $scope.addPraise = function(act){
         common.addCommonPraise(act);
     };
@@ -117,6 +130,8 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
         common.decreaseCommonPraise(act);
     };
 
+
+
 });
 
 app.factory('common', function($http, auth, $routeParams){

From 32ffd2a5b5372aab6c8d8802b63e0f1763de5ae7 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:55:46 +0800
Subject: [PATCH 224/668] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/activity.rb  | 1 +
 public/assets/wechat/activities.html | 2 +-
 public/javascripts/wechat/app.js     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index a90ff323d..9e2a39a5a 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -98,6 +98,7 @@ module Mobile
       end
       expose :act_type    #缺陷/作业/讨论区/留言等类型
       expose :act_id
+      expose :id
       expose :container_type     #课程/项目/博客/个人
       expose :author, using: Mobile::Entities::User do |a, opt|    #用户信息
         if a.is_a? ::UserActivity
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index ab0e85faf..85cfad7e4 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -118,7 +118,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="goDetail('issues',act.act_id)" id="{{act.act_id}}">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
                   <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"><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>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4c17027e0..51c91d152 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -117,9 +117,9 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.loadActData = loadActData;
 
     //跳到详情页
-    $scope.goDetail = function(type, id){
-        rms.save("yoffset", id);
-        $location.path('/'+type+'/'+id);
+    $scope.goDetail = function(type, act_id,id){
+        rms.save("yoffset", 'act_'+id);
+        $location.path('/'+type+'/'+act_id);
     }
 
     $scope.addPraise = function(act){

From c9eddad45d8b3036e9dec1be6ec0ffa222132f9c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:09:47 +0800
Subject: [PATCH 225/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html |  4 ++--
 public/javascripts/wechat/app.js     | 36 ++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 85cfad7e4..c610a9839 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -249,8 +249,8 @@
 
     </div>
 
-  <div ng-if="(count + page * 10) < all_count">
-    <div id="more_activities" class="more-events mt10" ng-click="loadActData(current_page+1);">更多</div>
+  <div ng-if="has_more">
+    <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
   </div>
 
 </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 51c91d152..a129a795c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -73,11 +73,35 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     };
 
     console.log("ActivityController load");
-    $scope.activities = rms.get("activities") || [];
+
     $scope.page = 0;
+    $scope.activities = rms.get("activities") || [];
+
+    var savePageConfig = function(){
+        rms.save('current_page', $scope.current_page);
+        rms.save('has_more', $scope.has_more);
+        rms.save('activities', $scope.activities);
+    }
+
+    var loadPageConfig = function(){
+        var current_page = rms.get('current_page');
+        var has_more = rms.get('has_more');
+        var activities = rms.get('activities');
+
+        if(typeof current_page !== 'undefined'){
+            $scope.page = current_page;
+        }
+        if(typeof has_more !== 'undefined'){
+            $scope.has_more = has_more;
+        }
+        if(typeof activities !== 'undefined'){
+            $scope.activities = activities;
+        }
+    }
 
     var loadActData = function(page){
-        if (page <= 0 && $scope.activities.length >0){
+        if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
+            loadPageConfig();
             var yOffset = rms.get("yoffset");
             $location.hash(yOffset);
             return;
@@ -97,10 +121,12 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
             } else {
                 $scope.activities = response.data.data;
             }
-            $scope.current_page = response.data.page;
-            $scope.all_count = response.data.all_count;
-            $scope.count = response.data.count;
+            $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+
             console.log(response.data);
+
+            rms.save('current_page', $scope.page);
+            rms.save('has_more', $scope.has_more);
             rms.save('activities', $scope.activities);
         }, function errorCallback(response) {
         });

From c26d544772370e6b18b8e29830b99909d73764a3 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:15:31 +0800
Subject: [PATCH 226/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index a129a795c..82c41a53c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -103,7 +103,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
         if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
             loadPageConfig();
             var yOffset = rms.get("yoffset");
-            $location.hash(yOffset);
+            $location.yOffset = yOffset;
             return;
         }
 
@@ -144,7 +144,9 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", 'act_'+id);
+        console.log($anchorScroll.yOffset);
+        rms.save("yoffset", $anchorScroll.yOffset);
+
         $location.path('/'+type+'/'+act_id);
     }
 

From 553a02c89dbbba10ce7cb69cb5c9a269eb5961cc Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:22:44 +0800
Subject: [PATCH 227/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 82c41a53c..5232b91c4 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -103,7 +103,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
         if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
             loadPageConfig();
             var yOffset = rms.get("yoffset");
-            $location.yOffset = yOffset;
+            $location.hash(yOffset);
             return;
         }
 
@@ -144,8 +144,8 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        console.log($anchorScroll.yOffset);
-        rms.save("yoffset", $anchorScroll.yOffset);
+        console.log($anchorScroll());
+        rms.save("yoffset", $anchorScroll());
 
         $location.path('/'+type+'/'+act_id);
     }

From 03357388bdda524c1951eb661af3c0586191e74c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:26:31 +0800
Subject: [PATCH 228/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 5232b91c4..e0e436fda 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -103,7 +103,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
         if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
             loadPageConfig();
             var yOffset = rms.get("yoffset");
-            $location.hash(yOffset);
+            $location.yOffset = yOffset;
             return;
         }
 
@@ -144,9 +144,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        console.log($anchorScroll());
-        rms.save("yoffset", $anchorScroll());
-
+        rms.save("yoffset",'act_'+id);
         $location.path('/'+type+'/'+act_id);
     }
 

From ceffa6c2c82c74e60982838041ffb5863abdb8ca Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:27:00 +0800
Subject: [PATCH 229/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index e0e436fda..8cc3d053a 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -103,7 +103,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
         if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
             loadPageConfig();
             var yOffset = rms.get("yoffset");
-            $location.yOffset = yOffset;
+            $location.hash(yOffset);
             return;
         }
 

From 51d3fc3aad760b2113b78f7d1b0aa9aad1311bd8 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 21:31:36 +0800
Subject: [PATCH 230/668] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 8cc3d053a..641e95bed 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -94,9 +94,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
         if(typeof has_more !== 'undefined'){
             $scope.has_more = has_more;
         }
-        if(typeof activities !== 'undefined'){
-            $scope.activities = activities;
-        }
+
     }
 
     var loadActData = function(page){

From 0cc8cb9928a1ade5d069a2ca7897901160e2769c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 08:57:27 +0800
Subject: [PATCH 231/668] =?UTF-8?q?=E5=88=9A=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E5=88=9A=E5=88=9A=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index 3f7adcfa6..fb1231287 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -182,7 +182,7 @@ module ApiHelper
     timeIntoFormat = 0
     updateAtValue = ""
     if timePassed < 0
-        updateAtValue = "1分钟前"
+        updateAtValue = "刚刚"
     elsif timePassed < ONE_MINUTE
         updateAtValue = "1分钟前"
     elsif timePassed < ONE_HOUR

From 5c27aee2bd0ac8f2d53ed58c7db2546b4445fb9f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 1 Jun 2016 09:08:08 +0800
Subject: [PATCH 232/668] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=BA=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=A8=A1=E5=9D=97=20=20=20=E5=AE=9A=E4=B9=89=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=96=B9=E6=B3=95=EF=BC=88=E6=98=BE=E7=A4=BA=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=86=85=E5=AE=B9=E4=BB=A5=E7=9C=81=E7=95=A5=E5=8F=B7?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left2.html.erb  | 300 ++++++++++++++++--
 .../organizations/_org_custom_left3.html.erb  |  19 +-
 .../_organization_content_extension.html.erb  |   6 +-
 3 files changed, 289 insertions(+), 36 deletions(-)

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 649a1dd55..6dd7e0e66 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -1,4 +1,282 @@
-<div class="por_course mt10 clear">
+<div class="por_course mt10 clear" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <h2 class="por_h2_index clear">课程动态</h2>
+        <% if @course_acts.blank? %>
+            <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+        <% else %>
+            <% @course_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = act.org_act %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="por_course_bar fl clear">
+                      <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.name.to_s %>
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                      <% end %>
+
+                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+
+                      <a href="javascript:void(0);" target="_blank" class=" por_course_time"><%= time_from_now(activity.updated_at) %>  </a>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = act.org_act %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="por_course_bar fl clear">
+                      <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title" %>
+                      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
+                      <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的算机程序设计(Z2班)算机程序设计(Z2班)算机程序设计(Z2班)学习需要多思考。学习程序设计</p>
+                      <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
+                    </div>
+
+
+
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.created_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+
+                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date activity.published_at %></span>
+                          <div class="sn-news-txt">
+                            <div class="sn-news-wrap"><%= activity.polls_description.to_s.html_safe %></div>
+                          </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <h2 class="h2-title">项目动态</h2>
+            <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+        <% else %>
+            <h2 class="h2-title">项目动态</h2>
+            <div class="cl"></div>
+            <% @project_acts.first(1).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3> <!--+"(帖子标题)"-->
+                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>",  board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey">2016-04-08</span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <h2 class="h2-title"><%= field.name %>
+              <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+            </h2>
+            <div class="cl"></div>
+            <% org_acts.first(1).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date document.created_at %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= document.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% end %>
+                              <h3> <!--+"(帖子标题)"-->
+                                <%= link_to message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
+                              </div>
+                              <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                            </div>
+                        <% else %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
+                              </div>
+                              <div class="sn-read-more">
+                                <% if message.parent_id.nil? %>
+                                    <%=link_to "查看全文>>", board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% else %>
+                                    <%=link_to "查看全文>>", board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% end %>
+                              </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date news.created_on %></span>
+                          <div class="sn-news-txt">
+                            <div class="sn-news-wrap"><%= news.description.to_s.html_safe %></div>
+                          </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+
+
+
+
   <h2 class="por_h2_index clear">精品课程<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
   <div class="por_course_bar fl clear">
     <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2算机程序设计(Z2班)算机程序设计(Z2班)班)</a>
@@ -6,23 +284,7 @@
     <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的算机程序设计(Z2班)算机程序设计(Z2班)算机程序设计(Z2班)学习需要多思考。学习程序设计</p>
     <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
   </div>
-  <div class="por_course_bar fl clear">
-    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
-    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
-    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
-    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
-  </div>
-  <div class="por_course_bar fl clear">
-    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
-    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
-    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
-    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
-  </div>
-  <div class="por_course_bar fl clear">
-    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2班)</a>
-    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
-    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的学习需要多思考。学习程序设计</p>
-    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
-  </div>
+
+
   <div class="cl"></div>
 </div><!--por_course end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index fdf06a023..63cb584cc 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -1,7 +1,7 @@
 <div class="por_post mt10" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
   <% if acts.blank? %>
       <h2 class="por_h2_index clear"><%= field.name %></h2>
-      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有发布内容</p>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
   <% else %>
       <h2 class="por_h2_index clear"><%= field.name %>
         <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
@@ -21,9 +21,7 @@
                     <span class="por_time mr10"><%= time_from_now(acts.first.org_act.created_at) %> </span>
                     <%= link_to acts.first.org_act.creator, user_path(acts.first.org_act.creator), :class => "por_hot_name", :target => "_blank" %>
                   </p>
-                  <div class="por_post_txt">
-                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
-                  </div>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
               <% else activity.container_type == 'OrgSubfield' %>
                   <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
                       <% message = Message.find(activity.org_act_id) %>
@@ -44,9 +42,7 @@
                             <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                             <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                           </p>
-                          <div class="por_post_txt">
-                            <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
-                          </div>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                       <% else %>
                           <% if iamge_path.nil? %>
                               <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
@@ -62,9 +58,7 @@
                             <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                             <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                           </p>
-                          <div class="por_post_txt">
-                            <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
-                          </div>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                       <% end %>
                   <% end %>
                   <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
@@ -80,12 +74,9 @@
                         <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
                         <%= link_to news.author, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
                       </p>
-                      <div class="por_post_txt">
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0} %>
-                      </div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                   <% end %>
               <% end %>
-          
 
           <% unless acts[1..5].nil? %>
               <% acts[1..5].each do |activity| %>
diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb
index c63011586..a486edd65 100644
--- a/app/views/organizations/_organization_content_extension.html.erb
+++ b/app/views/organizations/_organization_content_extension.html.erb
@@ -1,7 +1,7 @@
-<p class="por_post_txt" id="activity_description_<%= user_activity_id %>">
-  <div id="intro_content_<%= user_activity_id%>">
+<p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
+  <span id="intro_content_<%= user_activity_id%>">
     <%= content.to_s.html_safe%>
-  </div>
+  </span>
 </p>
 
 <script type="text/javascript">

From 2acc545896c6e44de42d9742b86b0f8191451728 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 1 Jun 2016 10:24:50 +0800
Subject: [PATCH 233/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=B7=A6=E4=BA=8C=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left2.html.erb  | 254 ++++++------------
 .../organizations/_org_custom_left3.html.erb  |  19 +-
 2 files changed, 87 insertions(+), 186 deletions(-)

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 6dd7e0e66..ee9530d32 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -17,147 +17,104 @@
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-
-                      <a href="javascript:void(0);" target="_blank" class=" por_course_time"><%= time_from_now(activity.updated_at) %>  </a>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now(activity.updated_at) %></a>
                     </div>
                 <% elsif act.org_act_type == "Message" %>
                     <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title" %>
-                      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
-                      <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的算机程序设计(Z2班)算机程序设计(Z2班)算机程序设计(Z2班)学习需要多思考。学习程序设计</p>
-                      <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
-                    </div>
-
-
-
-                    <div class="sn-news-bigbox fl">
+                      <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title", :title => activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3>
-                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
-                      </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
                     </div>
                 <% elsif act.org_act_type == "News" %>
                     <% activity = News.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
+                    <div class="por_course_bar fl clear">
+                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3>
-                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.created_on %></span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
-                      </div>
-
-                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now activity.created_on %></a>
                     </div>
                 <% elsif act.org_act_type == "Poll" %>
-                    <% activity = Poll.find(act.org_act_id) %>
+                    <% activity = act.org_act %>
                     <% has_commit = has_commit_poll?(activity.id ,User.current)%>
                     <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
                     <% iamge_path = get_image_path_from_content(activity.polls_description) %>
                     <% if ( activity.polls_status==2) %>
-                        <div class="sn-news-bigbox fl">
+                        <div class="por_course_bar fl clear">
+                          <% if has_commit %>
+                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title", :title => poll_name %>
+                          <% else %>
+                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title", :title => poll_name %>
+                          <% end %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% end %>
-                          <h3>
-                            <% if has_commit %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
-                            <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
-                            <% end %>
-                          </h3>
-                          <span class="txt-grey"><%= format_date activity.published_at %></span>
-                          <div class="sn-news-txt">
-                            <div class="sn-news-wrap"><%= activity.polls_description.to_s.html_safe %></div>
-                          </div>
-                          <div class="sn-read-more"><%=link_to "查看全文>>", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.polls_description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                          <a class=" por_course_time"><%= time_from_now activity.published_at %></a>
                         </div>
                     <% end %>
                 <% end %>
             <% end %>
         <% end %>
     <% when 'project' %>
+        <h2 class="h2-title">项目动态</h2>
         <% if @project_acts.blank? %>
-            <h2 class="h2-title">项目动态</h2>
             <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>
-            <h2 class="h2-title">项目动态</h2>
-            <div class="cl"></div>
-            <% @project_acts.first(1).each do |act| %>
+            <% @project_acts.first(4).each do |act| %>
                 <% if act.org_act_type == "Issue" %>
-                    <% activity = Issue.find(act.org_act_id) %>
+                    <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
+                    <div class="por_course_bar fl clear">
+                      <%= link_to activity.subject, issue_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3>
-                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
-                      </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
                     </div>
                 <% elsif act.org_act_type == "Message" %>
-                    <% activity = Message.find(act.org_act_id) %>
+                    <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.content) %>
-                    <div class="sn-news-bigbox fl">
+                    <% subject = activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
+                    <div class="por_course_bar fl clear">
+                      <%= link_to subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title", :title => subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3> <!--+"(帖子标题)"-->
-                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
-                      </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>",  board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
                     </div>
                 <% elsif act.org_act_type == "News" %>
-                    <% activity = News.find(act.org_act_id) %>
+                    <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
+                    <div class="por_course_bar fl clear">
+                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3>
-                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey">2016-04-08</span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
-                      </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now activity.created_on %></a>
                     </div>
                 <% end %>
             <% end %>
@@ -168,104 +125,68 @@
         <% org_acts = get_subfield_acts field %>
         <% if org_acts.blank? %>
             <h2 class="h2-title"><%= field.name %></h2>
-            <div class="cl"></div>
-            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+            <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>
             <h2 class="h2-title"><%= field.name %>
               <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
             </h2>
-            <div class="cl"></div>
-            <% org_acts.first(1).each do |activity| %>
+            <% org_acts.first(4).each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
-                    <% flag = 2 %>
                     <% iamge_path = get_image_path_from_content(document.content) %>
-                    <div class="sn-news-bigbox fl">
+                    <div class="por_course_bar fl clear">
+                      <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_course_title", :title => document.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <h3>
-                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date document.created_at %></span>
-                      <div class="sn-news-txt">
-                        <div class="sn-news-wrap"><%= document.content.to_s.html_safe %></div>
-                      </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <a class=" por_course_time"><%= time_from_now document.created_at %></a>
                     </div>
                 <% else activity.container_type == 'OrgSubfield' %>
-                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                        <% message = Message.find(activity.org_act_id) %>
-                        <% if message.parent_id.nil? %>
-                            <% content = message.content%>
-                        <% else %>
-                            <% content = message.parent.content%>
-                        <% end %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where(:id => activity.org_act_id).count > 0 %>
+                        <% message = activity.org_act %>
+                        <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                        <% content = message.parent_id.nil? ? message.content : message.parent.content%>
                         <% iamge_path = get_image_path_from_content(content) %>
                         <% if message.board.org_subfield_id %>
-                            <div class="sn-news-bigbox fl">
+                            <div class="por_course_bar fl clear">
+                              <%= link_to title, board_message_url_in_org(message.board.id, message.id), :target => '_blank', :class => "por_course_title", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
-                              <h3> <!--+"(帖子标题)"-->
-                                <%= link_to message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
-                              </h3>
-                              <span class="txt-grey"><%= format_date message.created_on %></span>
-                              <div class="sn-news-txt">
-                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
-                              </div>
-                              <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                              <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                              <a class=" por_course_time"><%= time_from_now  message.created_on %></a>
                             </div>
                         <% else %>
-                            <div class="sn-news-bigbox fl">
+                            <div class="por_course_bar fl clear">
+                              <%= link_to title, board_message_path(message.board, message.id), :target => '_blank', :class => "por_course_title", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
-                                <% end %>
-                              </h3>
-                              <span class="txt-grey"><%= format_date message.created_on %></span>
-                              <div class="sn-news-txt">
-                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
-                              </div>
-                              <div class="sn-read-more">
-                                <% if message.parent_id.nil? %>
-                                    <%=link_to "查看全文>>", board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
-                                <% else %>
-                                    <%=link_to "查看全文>>", board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
-                                <% end %>
-                              </div>
+                              <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                              <a class=" por_course_time"><%= time_from_now  message.created_on %></a>
                             </div>
                         <% end %>
                     <% end %>
-                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                        <% news = News.find(activity.org_act_id) %>
+                    <% if activity.org_act_type == 'News' and News.where(:id => activity.org_act_id).count > 0 %>
+                        <% news = activity.org_act %>
                         <% iamge_path = get_image_path_from_content(news.description) %>
-                        <div class="sn-news-bigbox fl">
+                        <div class="por_course_bar fl clear">
+                          <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_course_title", :title => news.title %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% end %>
-                          <h3>
-                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
-                          </h3>
-                          <span class="txt-grey"><%= format_date news.created_on %></span>
-                          <div class="sn-news-txt">
-                            <div class="sn-news-wrap"><%= news.description.to_s.html_safe %></div>
-                          </div>
-                          <div class="sn-read-more"><%=link_to "查看全文>>", news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                          <a class=" por_course_time"><%= time_from_now  news.created_on %></a>
                         </div>
                     <% end %>
                 <% end %>
@@ -273,18 +194,5 @@
         <% end %>
     <% end %>
 <% end %>
-
-
-
-
-  <h2 class="por_h2_index clear">精品课程<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <div class="por_course_bar fl clear">
-    <a href="javascript:void(0);" target="_blank" class="por_course_title ">2016春计算机程序设计(Z2算机程序设计(Z2班)算机程序设计(Z2班)班)</a>
-    <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/por_img.jpg" width="140" height="100" alt=""/></a>
-    <p class="por_course_txt fl">学习程序设计，要学习语言的语法更重要的是求解问题的算法思想。语法的学习需要多尝试，算法的算机程序设计(Z2班)算机程序设计(Z2班)算机程序设计(Z2班)学习需要多思考。学习程序设计</p>
-    <a href="javascript:void(0);" target="_blank" class=" por_course_time"> 2016春季学期  </a>
-  </div>
-
-
-  <div class="cl"></div>
+<div class="cl"></div>
 </div><!--por_course end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 63cb584cc..822aa7f78 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -16,7 +16,7 @@
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(acts.first.org_act.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => "_blank" %>
                   <% end %>
-                  <%= link_to acts.first.org_act.title, org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => '_blank', :class => "por_post_title" %>
+                  <%= link_to activity.org_act.title, org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => '_blank', :class => "por_post_title", :title => activity.org_act.title %>
                   <p class="mt5 mb5">
                     <span class="por_time mr10"><%= time_from_now(acts.first.org_act.created_at) %> </span>
                     <%= link_to acts.first.org_act.creator, user_path(acts.first.org_act.creator), :class => "por_hot_name", :target => "_blank" %>
@@ -24,8 +24,9 @@
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
               <% else activity.container_type == 'OrgSubfield' %>
                   <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                      <% message = Message.find(activity.org_act_id) %>
+                      <% message = activity.org_act %>
                       <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                      <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                       <% iamge_path = get_image_path_from_content(content) %>
                       <% if message.board.org_subfield_id %>
                           <% if iamge_path.nil? %>
@@ -33,11 +34,7 @@
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                           <% end %>
-                          <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                              <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title" %>
-                          <% else %>
-                              <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title" %>
-                          <% end %>
+                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title", :title => title %>
                           <p class="mt5 mb5">
                             <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                             <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
@@ -49,11 +46,7 @@
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                           <% end %>
-                          <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                              <%= link_to message.subject.to_s.html_safe, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title" %>
-                          <% else %>
-                              <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title" %>
-                          <% end %>
+                          <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title", :title => title %>
                           <p class="mt5 mb5">
                             <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                             <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
@@ -69,7 +62,7 @@
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                       <% end %>
-                      <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "por_post_title" %>
+                      <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title", :title => news.title %>
                       <p class="mt5 mb5">
                         <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
                         <%= link_to news.author, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>

From 513fe1a93d6e098eb82f15ff7d8d3f34f300c9bc Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 1 Jun 2016 13:46:05 +0800
Subject: [PATCH 234/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   |  2 +-
 .../_evaluation_un_title.html.erb             |  8 ++---
 .../student_work/_evaluation_un_work.html.erb |  2 +-
 public/javascripts/resizeable_table.js        | 29 ++++++++++---------
 public/stylesheets/courses.css                |  2 +-
 public/stylesheets/public.css                 |  1 +
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 73bd5d4f2..bcb7f853f 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,10)">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,11,11)">
   <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index f25edc5ce..1c8de2923 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,16 +1,16 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,10)">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(2,4,11,11)">
   <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>
+    <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10 hide-text' : 'hworkList130 pr10 hide-text'%>" style="text-align:left;">作品名称</th>
     <% if @homework.homework_type != 3 %>
-    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10">
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10 hide-text">
       <%= 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">
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> pr10 hide-text">
       <%= 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%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index ecdde77d8..0fc4ae480 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -12,7 +12,7 @@
       </div>
     </td>
       <% if @homework.homework_type != 3 %>
-        <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;">
+        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10 float-none 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%>
         </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;">
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index eac4a1f36..6221b501c 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -2,7 +2,7 @@
  * Created by ttang on 2016/5/24.
  */
     $(document).ready(function(){
-       resizeable_table = function(colS,colE,padding){
+       resizeable_table = function(colS,colE,p1,p2){
            var headerTds = document.getElementById("homework_table").rows[0].cells;
            var mousedown = false;
            var resizeable = false;
@@ -24,6 +24,7 @@
                    screenXStart = evt.screenX;
                    tdWidth = targetTd.offsetWidth;
                    tdWidth2 = targetTd.nextElementSibling.offsetWidth;
+                   totalWidth = tdWidth + tdWidth2;
                }
            }
            function onmousemove(event){
@@ -31,18 +32,22 @@
                var srcObj = getTarget(evt);
                var offsetX = evt.offsetX || (evt.clientX - srcObj.getBoundingClientRect().left);//这个比较关键，解决了Firefox无offsetX属性的问题
                if (mousedown == true){
-                   var width = (tdWidth + (evt.screenX - screenXStart)) - 10 + "px";//计算后的新的宽度
-                   var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - 10 + "px";
-                   console.log(width, width2);
-                   if (width<60){
-                       targetTd.style.width = "60px";
-                       console.log("width<60");
-                   }else if(width2<60){
-                       targetTd.nextElementSibling.style.width2 = "60px";
-                       console.log("width2<60");
+                   var width = (tdWidth + (evt.screenX - screenXStart)) - p1 + "px";//计算后的新的宽度
+                   var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - p2 + "px";
+                   console.log(width, width2, totalWidth);
+                   if (parseInt(width)<0  || parseInt(width2)<58 || tdWidth > totalWidth || tdWidth2 > totalWidth){
+                       tartgetTd = null;
+                       resizeable = false;
+                       mousedown = false;
                    }else{
                        targetTd.style.width = width;
                        targetTd.nextElementSibling.style.width = width2;
+                       document.onmouseup = function(event){
+                           tartgetTd = null;
+                           resizeable = false;
+                           mousedown = false;
+                           document.body.style.cursor='default';
+                       }
                    }
                }else{
                    var trObj = tblObj.rows[0];
@@ -50,10 +55,6 @@
                        targetTd=srcObj;
                        resizeable = true;
                        srcObj.style.cursor='col-resize';//修改光标样式
-                   }else if(offsetX <=4 && srcObj.cellIndex > 0){//实际改变前一单元格列宽，但是表格左边框线不可拖动
-                       targetTd=trObj.cells[srcObj.cellIndex - 1];
-                       resizeable = true;
-                       srcObj.style.cursor='col-resize';
                    }else{
                        resizeable = false;
                        srcObj.style.cursor='default';
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index a76ec5464..b41696779 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -104,7 +104,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index a5c1ada12..2ef518bbd 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -56,6 +56,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .white_space{white-space:nowrap;}
 .pr {position:relative;}
+.hide-text {overflow:hidden; white-space:nowrap;}
 
 /* Spacing */
 .ml2{ margin-left:2px;}

From cba5b246bcbe9ed691611877076f8d18efdd556f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 14:14:24 +0800
Subject: [PATCH 235/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index c610a9839..d7f48c4b2 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -8,7 +8,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
                   <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">
                     <a herf="javascript:void(0);">
@@ -18,7 +18,7 @@
                   <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 mb5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-title mt5 mb5 hidden"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
                     <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
@@ -29,8 +29,8 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -44,12 +44,12 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
                   <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"><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 mb5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
@@ -58,8 +58,8 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -73,12 +73,12 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                   <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"><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 mb5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
@@ -87,8 +87,8 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -123,7 +123,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 mb5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
                     <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
@@ -134,8 +134,8 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -150,12 +150,12 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                   <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"><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 mb5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
@@ -164,8 +164,8 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -194,7 +194,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
                   <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 mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
                   <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
@@ -207,8 +207,8 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
@@ -223,12 +223,12 @@
         <div class="post-container">
           <div class="post-wrapper">
             <div class="post-main">
-              <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+              <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('blog_comment',act.act_id, act.id)" id="act_{{act.id}}">
                 <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"><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 mb5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                 <div class="post-content c-grey3">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
@@ -236,8 +236,8 @@
                 <div class="cl"></div>
               </div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+              <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+              <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
               <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
               <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
               <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>

From b1cb4e5f94c991a69eae25c578f609b2f2bd2a0d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 1 Jun 2016 14:31:42 +0800
Subject: [PATCH 236/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A6=E4=B8=80?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left1.html.erb  | 192 +++++++++++++++---
 .../organizations/_org_custom_left3.html.erb  | 104 +++++-----
 app/views/organizations/_show_custom.html.erb |   2 +-
 3 files changed, 220 insertions(+), 78 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 4410f9545..6a2cea552 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -1,27 +1,169 @@
-<div class="por_hotbar clear">
-  <h2 class="por_h2_index clear">网站头条<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <ul class="por_hotbar_left fl">
-    <li>
-      <a href="javascript:void(0);" target="_blank" class="por_hot_title "><span class="por_icons_hot fl">热门推荐</span>阿里前副总裁：阿里巴巴给我上的10</a>
-      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-      <p class="por_hot_txt ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class="por_hot_title "><span class="por_icons_hot fl">热门推荐</span>阿里前副总裁：阿里巴巴给我上的10</a>
-      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-      <p class="por_hot_txt">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class="por_hot_title ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-      <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-      <p class="por_hot_txt">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-    </li>
-  </ul>
-  <div class="por_hotbar_right fl">
-    <a href="javascript:void(0);" target="_blank" class=""><img src="/images/org_custom/por_img.jpg" width="299" height="246" alt=""/></a>
-    <a href="javascript:void(0);" target="_blank" class="por_hot_title_r ">阿里前副总裁里前副总裁：里前副总裁：里前副总裁：：阿里巴巴给我上的10</a>
-    <p class="mt5 mb5"><span class="por_time mr10">1分钟前 </span><a href="javascript:void(0);" target="_blank" class=" por_hot_name"> 窦豆</a></p>
-    <p class="por_hot_txt_r ">本文选自阿本文选自阿里本文选自阿里本文选自阿里本文选自阿里本文选自阿里里巴巴前副总裁、首任美籍高管波特·埃里斯曼《阿里传》在这本书里，波特概括了他在阿里巴巴任职的8年中，学到的40堂课这40堂课简单明了地概括了马云的经营理念，以及阿里终成帝国的必</p>
-  </div>
+<div class="por_hotbar clear" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
+  <% if acts.blank? %>
+      <h2 class="por_h2_index clear"><%= field.name %></h2>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+  <% else %>
+      <h2 class="por_h2_index clear"><%= field.name %>
+        <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+      </h2>
+      <ul class="por_hotbar_left fl">
+        <% if acts.count > 0 %>
+            <% acts.first(2).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <li>
+                      <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title', :target => "_blank", :title => document.title %>
+                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
+                        <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+                      </p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                    </li>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = activity.org_act %>
+                        <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                        <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                        <% if message.board.org_subfield_id %>
+                            <li>
+                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                              <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
+                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                              </p>
+                              <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                            </li>
+                        <% else %>
+                            <li>
+                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                              <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
+                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                              </p>
+                              <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                            </li>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = activity.org_act %>
+                        <li>
+                          <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title', :target => "_blank", :title => news.title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
+                            <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                          </p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                        </li>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+
+        <% if acts.count > 2 %>
+            <% activity = acts[2] %>
+            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                <% document = activity.org_act %>
+                <li>
+                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title', :target => "_blank", :title => document.title %>
+                  <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
+                    <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+                  </p>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                </li>
+            <% else activity.container_type == 'OrgSubfield' %>
+                <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                    <% message = activity.org_act %>
+                    <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                    <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                    <% if message.board.org_subfield_id %>
+                        <li>
+                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
+                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                          </p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                        </li>
+                    <% else %>
+                        <li>
+                          <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
+                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                          </p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                        </li>
+                    <% end %>
+                <% end %>
+                <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                    <% news = activity.org_act %>
+                    <li>
+                      <%= link_to news.title, news_path(news), class: 'por_hot_title', :target => "_blank", :title => news.title %>
+                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
+                        <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                      </p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
+                    </li>
+                <% end %>
+            <% end %>
+        <% end %>
+
+      </ul>
+
+      <% if acts.count > 3 %>
+          <% activity = acts[3] %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+              <% document = activity.org_act %>
+              <div class="por_hotbar_right fl">
+                <% if get_image_path_from_content(document.content).nil? %>
+                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                <% else %>
+                    <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                <% end %>
+                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => document.title %>
+                <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %></p>
+                <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+              </div>
+          <% else activity.container_type == 'OrgSubfield' %>
+              <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                  <% message = activity.org_act %>
+                  <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                  <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                  <% if message.board.org_subfield_id %>
+                      <div class="por_hotbar_right fl">
+                        <% if get_image_path_from_content(document.content).nil? %>
+                            <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                        <% end %>
+                        <%= link_to title, board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => title %>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
+                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                      </div>
+                  <% else %>
+                      <div class="por_hotbar_right fl">
+                        <% if get_image_path_from_content(document.content).nil? %>
+                            <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                        <% end %>
+                        <%= link_to title, board_message_path(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => title %>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
+                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                      </div>
+                  <% end %>
+              <% end %>
+              <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                  <% news = activity.org_act %>
+                  <% path = get_image_path_from_content(news.description) %>
+                  <div class="por_hotbar_right fl">
+                    <% if path.nil? %>
+                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                    <% else %>
+                        <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                    <% end %>
+                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r', :target => "_blank", :title => news.title %>
+                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %></p>
+                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                  </div>
+              <% end %>
+          <% end %>
+      <% end %>
+
+  <% end %>
   <div class="cl"></div>
 </div><!--por_hotbar end-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 822aa7f78..cdc4f62f3 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -9,67 +9,67 @@
       <div class="por_post_left fl">
         <div class="por_post_leftbar ">
           <% activity = acts.first %>
-              <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                  <% document = activity.org_act %>
-                  <% if get_image_path_from_content(acts.first.org_act.content).nil? %>
-                      <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => "_blank" %>
-                  <% else %>
-                      <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(acts.first.org_act.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => "_blank" %>
-                  <% end %>
-                  <%= link_to activity.org_act.title, org_document_comment_path(:id => acts.first.org_act.id, :organization_id => acts.first.org_act.organization.id), :target => '_blank', :class => "por_post_title", :title => activity.org_act.title %>
-                  <p class="mt5 mb5">
-                    <span class="por_time mr10"><%= time_from_now(acts.first.org_act.created_at) %> </span>
-                    <%= link_to acts.first.org_act.creator, user_path(acts.first.org_act.creator), :class => "por_hot_name", :target => "_blank" %>
-                  </p>
-                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
-              <% else activity.container_type == 'OrgSubfield' %>
-                  <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                      <% message = activity.org_act %>
-                      <% content = message.parent_id.nil? ? message.content : message.parent.content %>
-                      <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
-                      <% iamge_path = get_image_path_from_content(content) %>
-                      <% if message.board.org_subfield_id %>
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
-                          <% end %>
-                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title", :title => title %>
-                          <p class="mt5 mb5">
-                            <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
-                            <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+              <% document = activity.org_act %>
+              <% if get_image_path_from_content(document.content).nil? %>
+                  <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+              <% end %>
+              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title", :title => document.title %>
+              <p class="mt5 mb5">
+                <span class="por_time mr10"><%= time_from_now(document.created_at) %> </span>
+                <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+              </p>
+              <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+          <% else activity.container_type == 'OrgSubfield' %>
+              <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                  <% message = activity.org_act %>
+                  <% content = message.parent_id.nil? ? message.content : message.parent.content %>
+                  <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                  <% iamge_path = get_image_path_from_content(content) %>
+                  <% if message.board.org_subfield_id %>
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% else %>
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
-                          <% end %>
-                          <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title", :title => title %>
-                          <p class="mt5 mb5">
-                            <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
-                            <%= link_to message.author, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% end %>
-                  <% end %>
-                  <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                      <% news = News.find(activity.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(news.description) %>
+                      <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title", :title => title %>
+                      <p class="mt5 mb5">
+                        <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
+                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                      </p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+                  <% else %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% end %>
-                      <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title", :title => news.title %>
+                      <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title", :title => title %>
                       <p class="mt5 mb5">
-                        <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
-                        <%= link_to news.author, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                        <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
+                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                       </p>
-                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
+                  <% end %>
+              <% end %>
+              <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                  <% news = News.find(activity.org_act_id) %>
+                  <% iamge_path = get_image_path_from_content(news.description) %>
+                  <% if iamge_path.nil? %>
+                      <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                  <% else %>
+                      <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% end %>
+                  <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title", :title => news.title %>
+                  <p class="mt5 mb5">
+                    <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
+                    <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                  </p>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
               <% end %>
+          <% end %>
 
           <% unless acts[1..5].nil? %>
               <% acts[1..5].each do |activity| %>
diff --git a/app/views/organizations/_show_custom.html.erb b/app/views/organizations/_show_custom.html.erb
index 6f5c64379..a7d7f4f78 100644
--- a/app/views/organizations/_show_custom.html.erb
+++ b/app/views/organizations/_show_custom.html.erb
@@ -1,7 +1,7 @@
 <div class="por_left">
   <% @subfield_content.each do |field| %>
       <% if field.status.to_i == 1 %>
-          <%= render :partial => 'organizations/org_custom_left1', :locals => {:field => field} %>
+          <%= render :partial => 'organizations/org_custom_left1', :locals => {:field => field, :acts => get_subfield_acts(field) } %>
       <% elsif field.status.to_i == 2 %>
           <%= render :partial => 'organizations/org_custom_left2', :locals => {:field => field} %>
       <% elsif field.status.to_i == 3 %>

From fa731718185db09ea8cdf9e3c43f65d02adfbc21 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 14:58:59 +0800
Subject: [PATCH 237/668] =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=B4=BB=E8=B7=83=E5=BA=A6=E2=80=9D=E5=92=8C=E2=80=9C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=8B=B1=E9=9B=84=E6=A6=9C=E2=80=9D=E8=B7=B3?=
 =?UTF-8?q?=E5=88=B0=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E4=BB=A5=E2=80=9C=E6=B4=BB=E8=B7=83=E5=BA=A6?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E8=8B=B1=E9=9B=84=E6=A6=9C=E2=80=9D?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb             | 4 ++--
 app/views/courses/_course_activity_users.html.erb | 7 ++++++-
 app/views/courses/_course_heroes.html.erb         | 7 ++++++-
 app/views/courses/_new_member_list.html.erb       | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 17f62f18c..e421b8c69 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -304,7 +304,7 @@ class CoursesController < ApplicationController
 
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
-      @sort_type = "score"
+      @sort_type = params[:sort_type] ? params[:sort_type] : "score"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
       @role = params[:role].nil? ?  '2':params[:role]
       @is_remote = true
@@ -319,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,@score_sort_by)
+            @all_members = student_homework_score(0,page, 10,@score_sort_by,@sort_type)
             @members =  @all_members
           else
             render_403
diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index a0cac45f7..93e0e7b77 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -1,6 +1,11 @@
 <% unless contributor_course_scor(course.id).count == 0 %>
     <ul class="rankList">
-      <h4>课程活跃度
+      <h4>
+        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
+            <%= link_to "课程活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => '' %>
+        <% else %>
+            课程活跃度
+        <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
       </h4>
       <div  class="numIntro undis" style="cursor:pointer;">
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index 5e9851594..9542f87a9 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -1,7 +1,12 @@
 <% hero_homework_scores = hero_homework_score(course, "desc") %>
 <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
     <ul class="rankList">
-      <h4><span>课程英雄榜</span>
+      <h4>
+        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
+            <%= link_to "课程英雄榜", course_member_path(course, :role => 2), :class => '' %>
+        <% else %>
+            <span>课程英雄榜</span>
+        <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
       <div  style="cursor:pointer;" class="numIntro undis">
         <div class="hero-degree-rule">积分规则<br/>
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index d8a2c6ed8..747b37c03 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -26,7 +26,7 @@
         <li  class="ml10" style="padding-right: 15px;"><span class="fontGrey6 fb">学号</span></li>
         <li style="padding-right: 55px; margin-left: 160px;"><span class="fontGrey6 fb">分班</span></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'%>
+          <%= 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 => 'ml35'%>
           <% if @sort_type == "score" && @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
           <% elsif @sort_type == "score" && @score_sort_by == 'asc' %>

From 32dca93b596f409fbdb84a38b717f265db2dcd4a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 15:35:26 +0800
Subject: [PATCH 238/668] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E3=80=81=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9A=E6=98=BE=E7=A4=BA=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E8=80=85=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb        | 2 +-
 app/views/courses/_history.html.erb           | 2 +-
 app/views/projects/_history.html.erb          | 2 +-
 app/views/words/_journal_reply_items.html.erb | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b1d16debb..8ef399d10 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -304,7 +304,7 @@ class MessagesController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
     @temp = Message.new
-    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 7f016d046..067064c07 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -9,7 +9,7 @@
             <div class="ping_distop f14">
               <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
+                    <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
                   </span>
                   <span class="c_grey fr f14">
                     <%= format_time(journal.created_on) %>
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index 4f7fb7f4a..e5c03628c 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -6,7 +6,7 @@
               <div class="ping_discon" style="width: 610px;">
                 <div class="ping_distop f14">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>
+                  <span><%= link_to journal.user.show_name, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>
                   </span><span class="c_grey fr f14"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index dc7cdc5fc..8a2c14e07 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -13,10 +13,10 @@
       </div>
       <div class="recall_con f14">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
-        <%= link_to "#{reply.user.show_name}(#{reply.user.login})", user_path(reply.user) %>
+        <%= link_to reply.user.show_name, user_path(reply.user) %>
         <%= l(:label_reply_to)%>
         <% if show_name %>
-            <%= link_to "#{parent_jour.user.show_name}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
+            <%= link_to parent_jour.user.show_name, user_path(parent_jour.user) %>
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>

From 308f247c711614fb4b1df92a15648ac3d470d8e3 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 1 Jun 2016 16:09:01 +0800
Subject: [PATCH 239/668] =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb    |  2 +-
 .../student_work/_evaluation_un_title.html.erb | 12 ++++++------
 .../student_work/_evaluation_un_work.html.erb  |  2 +-
 public/javascripts/resizeable_table.js         | 18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 89ded10b3..8381a479b 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,5 +1,5 @@
 <table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,11,11)">
-  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
+  <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 1a3220df6..d3b8c3443 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,16 +1,16 @@
-<table class="hwork-table-wrap">
-  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
+  <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10' : 'hworkList130 pr10'%>" style="text-align:left;">作品名称</th>
-      <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10">
+      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10 hide-text' : 'hworkList130 pr10 hide-text'%>" style="text-align:left;">作品名称</th>
+      <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10 hide-text">
       <%= 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">
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> pr10 hide-text">
       <%= 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%>
@@ -18,7 +18,7 @@
     </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
         <th class="hworkList130 pr10" style="text-align:left;">作品名称</th>
-        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList220' : 'hworkList160'%>">
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList210' : 'hworkList160'%>">
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 688e31451..052230612 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -12,7 +12,7 @@
           <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
         </div>
       </td>
-        <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;">
+        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10 float-none 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%>
         </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;">
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index 6221b501c..d7e48bb2e 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -2,6 +2,12 @@
  * Created by ttang on 2016/5/24.
  */
     $(document).ready(function(){
+        window.onload = function(){
+            $("th").each(function(){
+                $(this).css("width",$(this).width()-1);
+            });
+        }
+
        resizeable_table = function(colS,colE,p1,p2){
            var headerTds = document.getElementById("homework_table").rows[0].cells;
            var mousedown = false;
@@ -34,20 +40,13 @@
                if (mousedown == true){
                    var width = (tdWidth + (evt.screenX - screenXStart)) - p1 + "px";//计算后的新的宽度
                    var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - p2 + "px";
-                   console.log(width, width2, totalWidth);
-                   if (parseInt(width)<0  || parseInt(width2)<58 || tdWidth > totalWidth || tdWidth2 > totalWidth){
+                   if (parseInt(width)<0  || parseInt(width2)<0 || tdWidth > totalWidth || tdWidth2 > totalWidth){
                        tartgetTd = null;
                        resizeable = false;
                        mousedown = false;
                    }else{
                        targetTd.style.width = width;
                        targetTd.nextElementSibling.style.width = width2;
-                       document.onmouseup = function(event){
-                           tartgetTd = null;
-                           resizeable = false;
-                           mousedown = false;
-                           document.body.style.cursor='default';
-                       }
                    }
                }else{
                    var trObj = tblObj.rows[0];
@@ -57,11 +56,12 @@
                        srcObj.style.cursor='col-resize';//修改光标样式
                    }else{
                        resizeable = false;
+                       mousedown = false;
                        srcObj.style.cursor='default';
                    }
                }
            }
-           document.onmouseup = function(event){
+           document.body.onmouseup = function(event){
                tartgetTd = null;
                resizeable = false;
                mousedown = false;

From 27a9170318938750c20ee927fc4f5fc24d701844 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 1 Jun 2016 17:38:41 +0800
Subject: [PATCH 240/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E7=B2=BE=E5=93=81=E9=A1=B9=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=83=AD=E9=97=A8=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   | 24 +++++--
 app/controllers/organizations_controller.rb   | 68 ++++++++++++++++---
 app/helpers/organizations_helper.rb           |  5 ++
 app/models/org_subfield.rb                    |  2 +-
 .../organizations/_org_container.html.erb     | 39 +++++++++++
 .../organizations/_org_custom_admin.html.erb  | 18 +++++
 .../_org_left_subfield_list.html.erb          | 16 +++++
 app/views/organizations/courses.html.erb      | 30 ++++++++
 app/views/organizations/courses.js.erb        |  3 +
 app/views/organizations/projects.html.erb     | 30 ++++++++
 app/views/organizations/projects.js.erb       |  3 +
 config/routes.rb                              |  5 ++
 .../20160601073753_add_hot_to_project.rb      |  5 ++
 db/schema.rb                                  |  3 +-
 public/javascripts/org.js                     | 19 ++++++
 15 files changed, 254 insertions(+), 16 deletions(-)
 create mode 100644 app/views/organizations/_org_container.html.erb
 create mode 100644 app/views/organizations/courses.html.erb
 create mode 100644 app/views/organizations/courses.js.erb
 create mode 100644 app/views/organizations/projects.html.erb
 create mode 100644 app/views/organizations/projects.js.erb
 create mode 100644 db/migrate/20160601073753_add_hot_to_project.rb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 01a36d5b9..496c3aa92 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -6,7 +6,7 @@ class OrgSubfieldsController < ApplicationController
     if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0
       @res = true
       @organization = Organization.find(params[:organization_id])
-      @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id],:priority => @organization.org_subfields.order("priority").last.priority + 1)
+      @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id], :priority => @organization.org_subfields.order("priority").last.priority + 1)
       if !params[:sub_dir].blank?
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
               "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
@@ -15,15 +15,29 @@ class OrgSubfieldsController < ApplicationController
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])
-      # 如果栏目是教师或学生，不参入类型的配置，默认定义为右三模式
-      if params[:field_type] == "Comptec" || params[:field_type] == "Compstu"
-        @subfield.update_attribute(:status, 6)
-      end
+      # admin配置的类型
+      update_status_by_type(@subfield, params[:field_type])
     else
       @res = false
     end
   end
 
+  # status类型说明，详见SubField
+  def update_status_by_type subfield, type
+    case type
+      when "Comptec"
+        subfield.update_attribute(:status, 6)
+      when "Compstu"
+        subfield.update_attribute(:status, 7)
+      when "Comppro"
+        subfield.update_attribute(:status, 8)
+      when "Compcou"
+        subfield.update_attribute(:status, 9)
+      when "Compact"
+        subfield.update_attribute(:status, 10)
+    end
+  end
+
   def show
     @flag = params[:flag] || false
     sort = ""
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index fc0a8b35e..1b328ad7e 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -28,7 +28,8 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses]
+  before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts]
   layout 'base_org'
   def index
 
@@ -159,10 +160,6 @@ class OrganizationsController < ApplicationController
   end
 
   def teachers
-    unless User.current.admin?
-      render_403
-      return
-    end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comptec").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
@@ -187,10 +184,6 @@ class OrganizationsController < ApplicationController
   end
 
   def students
-    unless User.current.admin?
-      render_403
-      return
-    end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
@@ -214,6 +207,56 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def atta_page_public container
+    limit = 10
+    @containers_count = container.count
+    @atta_pages = Paginator.new @containers_count, limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @containers = paginateHelper container, limit
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def projects
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comppro").first : OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type.nil?
+      @containers = Project.find_by_sql("SELECT * FROM `projects` where status = 1 and is_public = 1 and name like '%#{q}%' order by updated_on desc;")
+    elsif @type == "famous"
+      @containers = Project.find_by_sql("SELECT * FROM `projects` where status =1 and is_public = 1 and hot = 1 and name like '%#{q}%' order by updated_on desc;")
+    end
+    atta_page_public @containers
+  end
+
+  def courses
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type.nil?
+      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and name like '%#{q}%' order by updated_at desc;")
+    elsif @type == "famous"
+      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and hot = 1 and name like '%#{q}%' order by updated_at desc;")
+    end
+    atta_page_public @containers
+  end
+
+  def acts
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type == "courses" || @type.nil?
+      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "famous"
+      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and u.excellent_student =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    end
+    atta_page_public container @containers
+  end
+
   def searchmember_by_name  members, name
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
@@ -344,6 +387,13 @@ class OrganizationsController < ApplicationController
     @organization = Organization.find(params[:id])
   end
 
+  def allow_as_admin
+    unless User.current.admin?
+      render_403
+      return
+    end
+  end
+
   def setting
     @organization = Organization.find(params[:id])
 
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 437014528..8e75ec5d1 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -175,6 +175,11 @@ module OrganizationsHelper
     end
   end
 
+  # 获取最新动态
+  def get_latest_acts
+    acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'news', 'message', 'Issue') and (container_type = 'Course' or container_type = 'Project') order by created_at limit 10;")
+  end
+
   def org_teacher_resource_count user
     results = Attachment.find_by_sql("SELECT * FROM attachments where author_id = #{user.id};").count
   end
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 76d472ad9..32212a0e8 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -11,7 +11,7 @@ class OrgSubfield < ActiveRecord::Base
   acts_as_attachable
   after_create :create_board_sync
   after_destroy :update_priority
-  # status 为栏目定制决定参数，1 左一 2 左二 3 左三 4 右一 5 右二 6 右三
+  # status 为栏目定制决定参数，1 左一 2 左二 3 左三 4 右一 5 右二 6 右三 默认的 7 学霸 8 热门项目 9 精品课程  10 最新动态
 
   # 创建资源栏目讨论区
   def create_board_sync
diff --git a/app/views/organizations/_org_container.html.erb b/app/views/organizations/_org_container.html.erb
new file mode 100644
index 000000000..42c216879
--- /dev/null
+++ b/app/views/organizations/_org_container.html.erb
@@ -0,0 +1,39 @@
+<% containers.each do |container| %>
+    <div class="teacher-list-row">
+      <div>
+        <div class="teacher-avatar">
+          <%= link_to image_tag(url_to_avatar(container), :width => "90", :height => "90"), container.class == Course ? course_path(container) : project_path(container) %>
+        </div>
+        <div class="fl">
+          <div class="ml25 mb20"><span class="teacher-name"><%=link_to container.name, container.class == Course ? course_path(container) : project_path(container) %></span></div>
+          <div class="teacher-social-block">
+            <div class="block-num"><%= container.members.count %></div>
+            <div class="block-title">成员</div>
+          </div>
+          <div class="block-slice"></div>
+          <div class="teacher-social-block">
+            <div class="block-num"><%= container.attachments.count %></div>
+            <div class="block-title">资源</div>
+          </div>
+        </div>
+        <a href="javascript:void(0);" class="fr teacher-select" onclick="admin_hide_org($(this),'<%= container.id %>');" id="hide_<%= container.id %>">
+          <%= (container.class == Course ? container.is_excellent == 0 : container.hot ==0) ? "设为热门" : "取消设置" %></a>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end %>
+
+<script>
+    function hide(content, id){
+        if (content.text() == '设为热门')
+            $.ajax({
+                url: "/organizations/set_excellent_teacher?user=" + id + "&type=student",
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student",
+                type: "post"
+            });
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_admin.html.erb b/app/views/organizations/_org_custom_admin.html.erb
index 559b52b63..2f454819c 100644
--- a/app/views/organizations/_org_custom_admin.html.erb
+++ b/app/views/organizations/_org_custom_admin.html.erb
@@ -9,4 +9,22 @@
       <input type="radio" id="orgStu" value="Compstu" name="field_type" />
       <label for="Comptec">学生</label>
     </li>
+<% end %>
+<% if allow_to_create?(@organization, "Comppro") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgPro" value="Comppro" name="field_type" />
+      <label for="Comppro">热门项目</label>
+    </li>
+<% end %>
+<% if allow_to_create?(@organization, "Compcou") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgCou" value="Compcou" name="field_type" />
+      <label for="Compcou">精品课程</label>
+    </li>
+<% end %>
+<% if allow_to_create?(@organization, "Compact") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgAct" value="Compact" name="field_type" />
+      <label for="Compact">最新动态</label>
+    </li>
 <% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index e621df8bd..30234c300 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -125,6 +125,22 @@
               <div class="homepageLeftMenuBlock">
                 <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
+          <% elsif field.field_type == "Compstu" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+              </div>
+          <% elsif field.field_type == "Comppro" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", projects_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+              </div>
+          <% elsif field.field_type == "Compcou" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", courses_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+              </div>
+          <% elsif field.field_type == "Compact" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", acts_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+              </div>
           <% elsif field.field_type == "Resource" %>
               <div class="homepageLeftMenuBlock">
                   <% if !field.subfield_subdomain_dir.nil? %>
diff --git a/app/views/organizations/courses.html.erb b/app/views/organizations/courses.html.erb
new file mode 100644
index 000000000..875fc3340
--- /dev/null
+++ b/app/views/organizations/courses.html.erb
@@ -0,0 +1,30 @@
+<div class="homepageRightBanner">
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+        精品课程
+    <% else %>
+        <%= @field.name %>
+    <% end %>
+  </div>
+</div>
+<div class="resources mt10">
+  <div class="function-row" id="org_student_search">
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'courses', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入项目名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <div class="sn-font-grey fr">
+      <%= link_to "精品课程", courses_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div id="org_container_list">
+    <%=render 'organizations/org_container', :containers => @containers %>
+  </div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 15px;">
+      <%= pagination_links_full @atta_pages, @containers_count, :per_page_links => false, :flag => true %>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/courses.js.erb b/app/views/organizations/courses.js.erb
new file mode 100644
index 000000000..dc42c115c
--- /dev/null
+++ b/app/views/organizations/courses.js.erb
@@ -0,0 +1,3 @@
+$("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_student_search").attr('href','<%= courses_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
diff --git a/app/views/organizations/projects.html.erb b/app/views/organizations/projects.html.erb
new file mode 100644
index 000000000..1c6cfa1d1
--- /dev/null
+++ b/app/views/organizations/projects.html.erb
@@ -0,0 +1,30 @@
+<div class="homepageRightBanner">
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+        热门项目
+    <% else %>
+        <%= @field.name %>
+    <% end %>
+  </div>
+</div>
+<div class="resources mt10">
+  <div class="function-row" id="org_student_search">
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'projects', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入项目名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <div class="sn-font-grey fr">
+      <%= link_to "热门项目", projects_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div id="org_container_list">
+    <%=render 'organizations/org_container', :containers => @containers %>
+  </div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 15px;">
+      <%= pagination_links_full @atta_pages, @containers_count, :per_page_links => false, :flag => true %>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/projects.js.erb b/app/views/organizations/projects.js.erb
new file mode 100644
index 000000000..e8d4f244a
--- /dev/null
+++ b/app/views/organizations/projects.js.erb
@@ -0,0 +1,3 @@
+$("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_student_search").attr('href','<%= projects_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 71b8f298e..0349fc122 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,9 @@ RedmineApp::Application.routes.draw do
       get 'search_courses'
       get 'teachers'
       get 'students'
+      get 'projects'
+      get 'courses'
+      get 'acts'
       post 'join_course_menu'
       post 'join_courses'
       get 'search_projects'
@@ -99,6 +102,8 @@ RedmineApp::Application.routes.draw do
       post 'reset_excellent_teacher'
       post 'reset_excellent_student'
       post 'agree_apply_subdomain'
+      post 'update_field_by_admin'
+      post 'reset_update_field_by_admin'
     end
   end
 
diff --git a/db/migrate/20160601073753_add_hot_to_project.rb b/db/migrate/20160601073753_add_hot_to_project.rb
new file mode 100644
index 000000000..f35afa97f
--- /dev/null
+++ b/db/migrate/20160601073753_add_hot_to_project.rb
@@ -0,0 +1,5 @@
+class AddHotToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :hot, :integer, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f7d61f57c..05a6f4e22 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 => 20160531021244) do
+ActiveRecord::Schema.define(:version => 20160601073753) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1810,6 +1810,7 @@ ActiveRecord::Schema.define(:version => 20160531021244) do
     t.integer  "journals_count",         :default => 0
     t.integer  "boards_reply_count",     :default => 0
     t.integer  "visits",                 :default => 0
+    t.integer  "hot",                    :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index 5b18372ed..05ae5e717 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -108,4 +108,23 @@ function chooseTeacherType(org_id){
         }
     }
     lastSendType = sendType;
+}
+
+//修改状态
+function admin_hide_org(content, id){
+    if (content.text() == '设为热门')
+        $.ajax({
+            url: "/organizations/update_field_by_admin?user=" + id + "&type=project",
+            type: "post"
+        });
+    else if (content.text() == '设为精品')
+        $.ajax({
+            url: "/organizations/update_field_by_admin?user=" + id + "&type=course",
+            type: "post"
+        });
+    else if (content.text() == '取消设置')
+        $.ajax({
+            url: "/organizations/reset_update_field_by_admin?user=" + id + "&type=student",
+            type: "post"
+        });
 }
\ No newline at end of file

From e5eeba90f634634381e1da7df239155e8992049c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 09:52:06 +0800
Subject: [PATCH 241/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=B2=BE=E5=93=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=83=AD=E9=97=A8=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   | 25 ++++++++++---------
 .../organizations/_org_container.html.erb     | 17 +------------
 .../update_field_by_admin.js.erb              |  5 ++++
 public/javascripts/org.js                     | 21 +++++++++++-----
 4 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 app/views/organizations/update_field_by_admin.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 1b328ad7e..c63cf8c7f 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -238,23 +238,12 @@ class OrganizationsController < ApplicationController
     if @type.nil?
       @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and name like '%#{q}%' order by updated_at desc;")
     elsif @type == "famous"
-      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and hot = 1 and name like '%#{q}%' order by updated_at desc;")
+      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and is_excellent = 1 and name like '%#{q}%' order by updated_at desc;")
     end
     atta_page_public @containers
   end
 
   def acts
-    q = params[:search].nil? ? "" : "#{params[:search].strip}"
-    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
-    @type = params[:type]
-    if @type == "courses" || @type.nil?
-      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
-                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif @type == "famous"
-      @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
-                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and u.excellent_student =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    end
-    atta_page_public container @containers
   end
 
   def searchmember_by_name  members, name
@@ -543,6 +532,18 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def update_field_by_admin
+    @type = params[:type]
+    @status = params[:status]
+    if @type == "project"
+      @container = Project.find(params[:container])
+      @status == "reset" ? @container.update_column(:hot, 0) : @container.update_column(:hot, 1)
+    else
+      @container = Course.find(params[:container])
+      @status == "reset" ? @container.update_column(:is_excellent, 0) : @container.update_column(:is_excellent, 1)
+    end
+  end
+
   # 设置为名师
   def set_excellent_teacher
     @ex_teacher = User.find(params[:user])
diff --git a/app/views/organizations/_org_container.html.erb b/app/views/organizations/_org_container.html.erb
index 42c216879..59ac4d95c 100644
--- a/app/views/organizations/_org_container.html.erb
+++ b/app/views/organizations/_org_container.html.erb
@@ -16,24 +16,9 @@
             <div class="block-title">资源</div>
           </div>
         </div>
-        <a href="javascript:void(0);" class="fr teacher-select" onclick="admin_hide_org($(this),'<%= container.id %>');" id="hide_<%= container.id %>">
-          <%= (container.class == Course ? container.is_excellent == 0 : container.hot ==0) ? "设为热门" : "取消设置" %></a>
+        <a href="javascript:void(0);" class="fr teacher-select" onclick="admin_hide_org($(this),'<%= container.id %>');" id="hide_<%= container.id %>"><%= container.class == Course ? (container.is_excellent == 0 ? "设为精品" : "取消精品") : (container.hot ==0 ? "设为热门" : "取消热门") %></a>
       </div>
       <div class="cl"></div>
     </div>
 <% end %>
 
-<script>
-    function hide(content, id){
-        if (content.text() == '设为热门')
-            $.ajax({
-                url: "/organizations/set_excellent_teacher?user=" + id + "&type=student",
-                type: "post"
-            });
-        else
-            $.ajax({
-                url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student",
-                type: "post"
-            });
-    }
-</script>
\ No newline at end of file
diff --git a/app/views/organizations/update_field_by_admin.js.erb b/app/views/organizations/update_field_by_admin.js.erb
new file mode 100644
index 000000000..ba218c746
--- /dev/null
+++ b/app/views/organizations/update_field_by_admin.js.erb
@@ -0,0 +1,5 @@
+<% if @type == "course" %>
+$("#hide_<%= @container.id %>").text("<%= (@status == 'reset' ? '设为精品' : '取消精品') %>");
+<% elsif @type == "project" %>
+$("#hide_<%= @container.id %>").text("<%= (@status == 'reset' ? '设为热门' : '取消热门') %>");
+<% end %>
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index 05ae5e717..a2b2bd361 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -112,19 +112,28 @@ function chooseTeacherType(org_id){
 
 //修改状态
 function admin_hide_org(content, id){
-    if (content.text() == '设为热门')
+    if (content.text() == '设为热门'){
         $.ajax({
-            url: "/organizations/update_field_by_admin?user=" + id + "&type=project",
+            url: "/organizations/update_field_by_admin?container=" + id + "&type=project",
             type: "post"
         });
-    else if (content.text() == '设为精品')
+    }
+    else if (content.text() == '设为精品'){
         $.ajax({
-            url: "/organizations/update_field_by_admin?user=" + id + "&type=course",
+            url: "/organizations/update_field_by_admin?container=" + id + "&type=course",
             type: "post"
         });
-    else if (content.text() == '取消设置')
+    }
+    else if (content.text() == '取消热门'){
         $.ajax({
-            url: "/organizations/reset_update_field_by_admin?user=" + id + "&type=student",
+            url: "/organizations/update_field_by_admin?container=" + id + "&type=project" + "&status=reset",
             type: "post"
         });
+    }
+    else if (content.text() == '取消精品'){
+        $.ajax({
+            url: "/organizations/update_field_by_admin?container=" + id + "&type=course" + "&status=reset",
+            type: "post"
+        });
+    }
 }
\ No newline at end of file

From b72ad364db9e2cac67c5b8af1d10c70bf1aade4d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 2 Jun 2016 10:39:11 +0800
Subject: [PATCH 242/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=9A=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E3=80=81=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80=E3=80=81=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            |   2 -
 app/controllers/wechats_controller.rb |   2 +
 app/models/blog_comment.rb            |  24 ++---
 app/models/comment.rb                 |  12 +--
 app/models/homework_common.rb         |  20 ++--
 app/models/issue.rb                   |  42 ++++----
 app/models/journal.rb                 |  14 +--
 app/models/journals_for_message.rb    |  34 +++----
 app/models/message.rb                 |  42 ++++----
 app/models/news.rb                    |   2 +-
 app/services/wechat_service.rb        | 140 ++++++++++++++++++++++++++
 config/locales/zh.yml                 |   2 +-
 config/wechat.yml                     |   6 ++
 13 files changed, 244 insertions(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38f29a661..0727a920a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,4 @@ vendor/cache
 /public/files
 /tags
 /config/initializers/gitlab_config.rb
-/config/wechat.yml
-/config/menu.yml
 1234567
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 4bf95fdbd..679b6382f 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -193,6 +193,8 @@ class WechatsController < ActionController::Base
             openid: openid,
             user: user
         )
+        ws = WechatService.new
+        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
         render :json => {status:0, msg: "绑定成功"}
       rescue Exception=>e
         render :json => {status: -1, msg: e.message}
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index af21b4f69..255410a89 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -77,16 +77,16 @@ class BlogComment < ActiveRecord::Base
   end
 
   #博客回复微信模板消息
-  def blog_wechat_message
-    ws = WechatService.new
-    if self.parent_id.nil?
-      self.author.watcher_users.each do |watcher|
-        content = strip_html self.author.try(:realname) + " 发表了博客：" + self.title.html_safe, 200
-        ws.message_update_template watcher.id, "blog_comment", self.id, "#{l(:label_new_blog_template)}", content, format_time(self.created_at)
-      end
-    else
-      content = strip_html self.content.html_safe, 200
-      ws.comment_template self.parent.author_id, "blog_comment", self.parent_id, "#{l(:label_blog_comment_template)}", self.author.try(:realname), format_time(self.created_at), content
-    end
-  end
+  # def blog_wechat_message
+  #   ws = WechatService.new
+  #   if self.parent_id.nil?
+  #     self.author.watcher_users.each do |watcher|
+  #       content = strip_html self.author.try(:realname) + " 发表了博客：" + self.title.html_safe, 200
+  #       ws.message_update_template watcher.id, "blog_comment", self.id, "#{l(:label_new_blog_template)}", content, format_time(self.created_at)
+  #     end
+  #   else
+  #     content = strip_html self.content.html_safe, 200
+  #     ws.comment_template self.parent.author_id, "blog_comment", self.parent_id, "#{l(:label_blog_comment_template)}", self.author.try(:realname), format_time(self.created_at), content
+  #   end
+  # end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 8632c243a..edb5e472f 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -41,15 +41,15 @@ class Comment < ActiveRecord::Base
   after_destroy :down_course_score
 
   def act_as_system_message
-    ws = WechatService.new
+    #ws = WechatService.new
     if self.commented.course
       if self.author_id != self.commented.author_id
         self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
-        count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.commented.author_id} and shield_type='Course' and shield_id=#{self.commented.course.id}").count
-        if count == 0
-          content = strip_html self.comments.html_safe, 200
-          ws.comment_template self.commented.author_id, "course_notice", self.id, "#{l(:label_notice_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
-        end
+        # count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.commented.author_id} and shield_type='Course' and shield_id=#{self.commented.course.id}").count
+        # if count == 0
+        #   content = strip_html self.comments.html_safe, 200
+        #   ws.comment_template self.commented.author_id, "course_notice", self.id, "#{l(:label_notice_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
+        # end
       end
     else  # 项目相关
       if self.author_id != self.commented.author_id
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index e4426e78f..325b599e3 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -63,7 +63,7 @@ class HomeworkCommon < ActiveRecord::Base
           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")
+            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}：", self.course.name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
           end
           # end
         end
@@ -108,15 +108,15 @@ class HomeworkCommon < ActiveRecord::Base
   end
 
   #修改作业后发送微信模板消息
-  def wechat_message
-    self.course.members.each do |member|
-      count = ShieldWechatMessage.where("container_type='User' and container_id=#{member.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
-      if count == 0
-        ws = WechatService.new
-        ws.homework_template(member.user_id, "homework", self.id, "#{l(:label_update_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
-      end
-    end
-  end
+  # def wechat_message
+  #   self.course.members.each do |member|
+  #     count = ShieldWechatMessage.where("container_type='User' and container_id=#{member.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
+  #     if count == 0
+  #       ws = WechatService.new
+  #       ws.homework_template(member.user_id, "homework", self.id, "#{l(:label_update_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+  #     end
+  #   end
+  # end
 
   delegate :language_name, :language, :to => :homework_detail_programing
 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index b5e87feea..4cfea1f43 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -160,27 +160,27 @@ class Issue < ActiveRecord::Base
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     end
-    self.project.members.each do |m|
-      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
-        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
+    # self.project.members.each do |m|
+    #   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
+    #     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
     if self.tracker_id == 5
       self.project.members.each do |m|
         if m.roles.first.to_s.include?("Manager") && m.user_id != self.author_id && m.user_id != self.assigned_to_id
diff --git a/app/models/journal.rb b/app/models/journal.rb
index eeaa17dd6..6d59c7414 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -238,11 +238,11 @@ class Journal < ActiveRecord::Base
   end
 
   #缺陷回复微信模板消息
-  def issue_wechat_message
-    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
+  # def issue_wechat_message
+  #   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
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index d0113744c..d8819515c 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -259,24 +259,24 @@ 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
+          # 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
+          # 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
     end
@@ -293,7 +293,7 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
           receivers << self.jour
           content = strip_html self.notes, 200
-          ws.message_update_template self.jour_id, "journal_for_message", self.id, "#{l(:label_new_journals_template)}", content, format_time(self.created_on)
+          ws.journal_notice self.jour_id, "journal_for_message", self.id, "#{l(:label_new_journals_template)}", self.user.show_name, format_time(self.created_on),content
         end
       else # 留言回复
         reply_to = User.find(self.reply_id)
@@ -303,8 +303,8 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
           receivers << self.parent.jour
         end
-        content = strip_html self.notes, 200
-        ws.comment_template self.reply_id, "journal_for_message", self.parent.id, "#{l(:label_journals_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+        #content = strip_html self.notes, 200
+        #ws.comment_template self.reply_id, "journal_for_message", self.parent.id, "#{l(:label_journals_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
       end
       receivers.each do |r|
         self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
diff --git a/app/models/message.rb b/app/models/message.rb
index cf9adab4e..393fd3a60 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -258,28 +258,28 @@ class Message < ActiveRecord::Base
   # 主贴项目成员都能收到
   # 回帖：帖子的发布人收到
   def act_as_system_message
-    ws = WechatService.new
+    #ws = WechatService.new
     if self.course
       if self.parent_id.nil?   # 主贴
         self.course.members.includes(:user).each do |m|
           if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
             #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.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
-              content = strip_html self.subject, 200
-              ws.topic_publish_template m.user_id, "course_discussion", self.id, "#{l(:label_course_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
-            end
+            # 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
+            #   content = strip_html self.subject, 200
+            #   ws.topic_publish_template m.user_id, "course_discussion", self.id, "#{l(:label_course_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
+            # end
           end
         end
       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)
-          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
-            ws.comment_template parent_author_id, "course_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
-          end
+          # 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
+          #   ws.comment_template parent_author_id, "course_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
+          # end
         end
       end
     elsif self.project  # 项目相关
@@ -287,22 +287,22 @@ class Message < ActiveRecord::Base
         self.project.members.includes(:user).each do |m|
           if  m.user_id != self.author_id
             #self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
-            count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Project' and shield_id=#{self.project.id}").count
-            if count == 0
-              content = strip_html self.subject, 200
-              ws.topic_publish_template m.user_id, "project_discussion", self.id, "#{l(:label_project_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
-            end
+            # count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Project' and shield_id=#{self.project.id}").count
+            # if count == 0
+            #   content = strip_html self.subject, 200
+            #   ws.topic_publish_template m.user_id, "project_discussion", self.id, "#{l(:label_project_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
+            # end
           end
         end
       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)
-          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
-            ws.comment_template parent_author_id, "project_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
-          end
+          # 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
+          #   ws.comment_template parent_author_id, "project_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
+          # end
         end
       end
     end
diff --git a/app/models/news.rb b/app/models/news.rb
index 0b03dcc48..54f6fce08 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)}", content, format_time(self.created_on)
+            ws.class_notice m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.course.name, self.author.show_name, format_time(self.created_on), content, "点击查看通知详情"
           end
         end
       end
diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index 6d8c0f234..e0c7811fd 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -110,4 +110,144 @@ class WechatService
       Rails.logger.info "send over. #{req}"
     end
   end
+
+  def two_keys_template(openid, template_id, type, id, first, key1, key2, remark="")
+    data = {
+        touser:openid,
+        template_id:template_id,
+        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+        topcolor:"#FF0000",
+        data:{
+            first: {
+                value:first,
+                color:"#707070"
+            },
+            keyword1:{
+                value:key1,
+                color:"#707070"
+            },
+            keyword2:{
+                value:key2,
+                color:"#707070"
+            },
+            remark:{
+                value:remark,
+                color:"#707070"
+            }
+        }
+    }
+    data
+  end
+
+  def four_keys_template(openid, template_id, type, id, first, key1, key2, key3, key4, remark="")
+    data = {
+    touser:openid,
+    template_id:template_id,
+    url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+    topcolor:"#FF0000",
+    data:{
+        first: {
+            value:first,
+            color:"#707070"
+        },
+        keyword1:{
+            value:key1,
+            color:"#707070"
+        },
+        keyword2:{
+            value:key2,
+            color:"#707070"
+        },
+        keyword3:{
+            value:key3,
+            color:"#707070"
+        },
+        keyword4:{
+            value:key4,
+            color:"#707070"
+        },
+        remark:{
+            value:remark,
+            color:"#707070"
+        }
+      }
+    }
+    data
+  end
+
+  def binding_succ_notice(user_id, first, key1, key2)
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = {
+          touser:uw.openid,
+          template_id:Wechat.config.binding_succ_notice,
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          topcolor:"#FF0000",
+          data:{
+              first: {
+                  value:first,
+                  color:"#707070"
+              },
+              keyword1:{
+                  value:key1,
+                  color:"#707070"
+              },
+              keyword2:{
+                  value:key2,
+                  color:"#707070"
+              },
+              remark:{
+                  value:"绑定成功后可使用微信查看Trustie平台最新动态",
+                  color:"#707070"
+              }
+          }
+      }
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[homework] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
+  def journal_notice(user_id, type, id, first, key1, key2, remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = two_keys_template uw.openid,Wechat.config.journal_notice, type, id, first, key1, key2, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[homework] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
+  def homework_message_notice(user_id, type, id, first, key1, key2, remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = two_keys_template uw.openid,Wechat.config.homework_message_notice, type, id, first, key1, key2, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[homework] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
+  def class_notice(user_id, type, id, first, key1, key2, key3, key4, remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = four_keys_template uw.openid,Wechat.config.class_notice, type, id, first, key1, key2, key3, key4, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[homework] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a347359bb..94be8af6d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2128,7 +2128,7 @@ zh:
   label_resource_belongs_project: 所属项目
 
   #微信模板消息
-  label_new_homework_template: 您的课程有新作业了
+  label_new_homework_template: 您有新作业了
   label_update_homework_template: 您的作业已被修改
   label_course_topic_template: 课程问答区有新帖子发布了
   label_topic_comment_template: 您的帖子有新回复了
diff --git a/config/wechat.yml b/config/wechat.yml
index 5b528487b..3d679c4ce 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -11,6 +11,12 @@ default: &default
   encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
+  #template
+  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
+  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
+  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
+  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+
 production:
   <<: *default
 

From b20dc06e231a8ce68646b4fd2ce6d483013f0e9f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 2 Jun 2016 10:56:04 +0800
Subject: [PATCH 243/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=89=88=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/wechat_service.rb   | 2 +-
 config/menu.yml                  | 2 +-
 public/javascripts/wechat/app.js | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index e0c7811fd..f9a59e080 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -181,7 +181,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:Wechat.config.binding_succ_notice,
-          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect",
           topcolor:"#FF0000",
           data:{
               first: {
diff --git a/config/menu.yml b/config/menu.yml
index 83b892037..79659fb90 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 9d0b045c3..ee849aad8 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/';
 }
 
 

From 76732a3034b4ea0b17cf80dfb317986f97f479c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 13:17:38 +0800
Subject: [PATCH 244/668] =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=BC=8F=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  33 +++--
 app/helpers/organizations_helper.rb           |  16 ++-
 .../organizations/_org_custom_right1.html.erb | 115 +++++++-----------
 .../_organization_content_extension.html.erb  |  18 ++-
 public/stylesheets/org_custom.css             |   2 +-
 5 files changed, 94 insertions(+), 90 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c63cf8c7f..4021560bf 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -79,19 +79,28 @@ class OrganizationsController < ApplicationController
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
     if @organization.switch_type && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
-        # REDO:时间紧，暂时先这样
-        @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
-        @org_banner_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 1 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
-
         @subfield_content = @organization.org_subfields.order("priority")
-        @organization = Organization.find(params[:id])
-          shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
-          shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
-          project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
-          course_ids = (@organization.courses.map(&:id)-shield_course_ids) << 0
-          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          @project_acts = get_project_activities_org @organization, project_ids
-          @course_acts = get_course_activities_org @organization, course_ids
+        shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
+        shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
+        project_ids = (@organization.projects.map(&:id) - shield_project_ids) << 0
+        course_ids = (@organization.courses.map(&:id) - shield_course_ids) << 0
+        course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+        @project_acts = get_project_activities_org @organization, project_ids
+        @course_acts = get_course_activities_org @organization, course_ids
+        # 精品课程, 不符合条件的组织则不查询
+        if @organization.org_subfields.where(:field_type => "Compcou", :hide => 0).count > 0
+          @excellent_courses = Course.where(:is_public => true, :is_delete => false, :is_excellent => true)
+        end
+        # 热门项目
+        if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
+          @excellent_courses = Course.where(:is_public => true, :status => true)
+        end
+        # 最新动态, 来自我关联的项目和课程
+        if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
+          @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
+                                        ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
+                                        order by created_at desc limit 6;")
+        end
         render :layout => 'base_org_custom'
       else
         render_403
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 8e75ec5d1..4c6089b51 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -63,6 +63,16 @@ module OrganizationsHelper
     end
   end
 
+  def org_user_by_type obj
+    case obj.act_type
+      when "Message"
+      when "News"
+      when "HomeworkCommon"
+      when "Issue"
+    end
+
+  end
+
   #排列下拉框
   def subfield_status_option
     type = []
@@ -176,9 +186,9 @@ module OrganizationsHelper
   end
 
   # 获取最新动态
-  def get_latest_acts
-    acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'news', 'message', 'Issue') and (container_type = 'Course' or container_type = 'Project') order by created_at limit 10;")
-  end
+  # def get_latest_acts
+  #   acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'news', 'message', 'Issue') and (container_type = 'Course' or container_type = 'Project') order by created_at limit 10;")
+  # end
 
   def org_teacher_resource_count user
     results = Attachment.find_by_sql("SELECT * FROM attachments where author_id = #{user.id};").count
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index 6fc24555f..4fed81a6b 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -1,71 +1,48 @@
 <div class="por_news">
-  <h2 class="por_h2_index clear">最新动态<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <ul class="por_news_list clear">
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下，比以前好用很多....
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl"> 当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下很多了...
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-      <div class="por_news_txt fl">
-        <p class="por_news_p fl">
-          <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当叮当叮当叮当 </a><span class="fl">&nbsp;:&nbsp;</span>
-          Trustie社区新版上线了必须支持一下，比以前好用很多了。Trustie社区新版上线了必须支持一下，比以前好用很多了...
-        </p>
-        <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-      </div>
-      <div class="cl"></div>
-    </li>
-  </ul>
+  <h2 class="por_h2_index clear"><%= field.name %></h2>
+  <% if @acts.blank? %>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+  <% else %>
+      <ul class="por_news_list clear">
+        <% @acts.each do |obj| %>
+            <% if obj.act_type = "Message" %>
+                <% user = org_user_by_type(obj) %>
+                <% title = org_title_by_type(obj) %>
+                <% content = org_content_by_type(obj) %>
+                <% message = obj.act %>
+                <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
+                <li>
+                  <%= link_to image_tag(url_to_avatar(user),:width => "43", :height => "43", :class => "por_users_img"), user_path(user), :target => "_blank", :class => "fl" %>
+                  <div class="por_news_txt fl">
+                    <p class="por_news_p fl">
+                      <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name fl", :target => "_blank" %>
+                      <span class="fl">&nbsp;:&nbsp;</span>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 28, :maxwidth => 0, :cl => ""} %>
+                    </p>
+                    <p><span class="por_time fl"><%= time_from_now(message.created_on) %> </span>
+                      <!--<a href="javascript:void(0);" target="_blank" class="por_zan fr">50</a>-->
+                    </p>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% elsif obj.act_type = "News" %>
+
+            <% elsif obj.act_type = "HomeworkCommon" %>
+            <% elsif obj.act_type = "Issue" %>
+            <% end %>
+        <% end %>
+        <li >
+          <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
+          <div class="por_news_txt fl">
+            <p class="por_news_p fl">
+              <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当当 </a><span class="fl">&nbsp;:&nbsp;</span>
+              Trustie社区新版上线了必须支持一下，比以前好用很多....
+            </p>
+            <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
+          </div>
+          <div class="cl"></div>
+        </li>
+
+      </ul>
+  <% end %>
 </div><!--por_news end-->
\ No newline at end of file
diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb
index a486edd65..be5343d61 100644
--- a/app/views/organizations/_organization_content_extension.html.erb
+++ b/app/views/organizations/_organization_content_extension.html.erb
@@ -1,8 +1,16 @@
-<p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
-  <span id="intro_content_<%= user_activity_id%>">
-    <%= content.to_s.html_safe%>
-  </span>
-</p>
+<% if cl.nil? %>
+    <span class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
+        <span id="intro_content_<%= user_activity_id%>">
+            <%= content.to_s.html_safe%>
+        </span>
+    </span>
+<% else %>
+    <p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
+        <span id="intro_content_<%= user_activity_id%>">
+            <%= content.to_s.html_safe%>
+        </span>
+    </p>
+<% end %>
 
 <script type="text/javascript">
     $("#intro_content_<%= user_activity_id %>").hide();
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 6f68ba47f..8daba2718 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -54,7 +54,7 @@ a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: now
 .por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
 .por_users_img{ width:40px; height:40px; border:1px solid #e8e5e5;}
 .por_news_txt{ width:245px; margin-left:10px;}
-.por_news_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
+.por_news_p{ line-height:20px;max-height:40px;min-width:240px;overflow:hidden;text-overflow:ellipsis;  }
 a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
 a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
 .por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}

From eecf12eda61d3b17173011f220768ca1582bab01 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 13:32:50 +0800
Subject: [PATCH 245/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 799aaa42b..c11aac2c8 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -98,7 +98,7 @@
             <% else %>
                 <% if field.field_type == "Post" && field.hide == 0 %>
                     <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
                     </li>
                     <!--二级目录-->
                     <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
@@ -111,14 +111,14 @@
                     </div>
                 <% elsif field.field_type == "Resource" && field.hide == 0 %>
                     <li class="nav-element">
-                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
                     </li>
                 <% end %>
             <% end %>
         <% end %>
         <% if User.current.admin_of_org?(@organization) %>
             <li class="nav-element">
-              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white" target ="_blank">配置</a>
             </li>
         <% end %>
       </ul>

From 31f3d74b0fe1bec7734931ce6da85356dd3c684a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 13:37:38 +0800
Subject: [PATCH 246/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_document_comments_controller.rb | 2 +-
 app/controllers/sub_document_comments_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index d7e38f370..2e63a1589 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_org'
 
diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 80c14f004..d6b335006 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -1,7 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 

From 22cafdbd05cb15c39c876eede4ed40d59bfd23fd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 13:43:30 +0800
Subject: [PATCH 247/668] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index c11aac2c8..1da347b16 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -104,7 +104,7 @@
                     <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                       <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
                         <% field.sub_domains.each do |subdomain| %>
-                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey", :target => "_blank" %></li>
                             <li class="sn-subnav-slice">|</li>
                         <% end %>
                       </ul>

From ed46ca0735afd15fff99b9eb768c97a260d2ac76 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 2 Jun 2016 13:45:06 +0800
Subject: [PATCH 248/668] =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_work.html.erb | 2 +-
 public/javascripts/resizeable_table.js              | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 052230612..93c800879 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:80px;" class="hidden fl"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
+          <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
         </td>
   <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
       <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index d7e48bb2e..0d79ba737 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -2,12 +2,9 @@
  * Created by ttang on 2016/5/24.
  */
     $(document).ready(function(){
-        window.onload = function(){
-            $("th").each(function(){
-                $(this).css("width",$(this).width()-1);
-            });
-        }
-
+        $("th").each(function(){
+            $(this).css("width",$(this).width()-1);
+        });
        resizeable_table = function(colS,colE,p1,p2){
            var headerTds = document.getElementById("homework_table").rows[0].cells;
            var mousedown = false;

From 0d38fa53a20fc030adbb66026e69184a49720f70 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 2 Jun 2016 13:55:40 +0800
Subject: [PATCH 249/668] =?UTF-8?q?1.issue=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=AE=9A=E4=B8=8B=E6=9C=80=E9=AB=98=E9=AB=98=E5=BA=A6=E5=88=B0?=
 =?UTF-8?q?=E4=BA=86=E6=94=B9=E4=B8=BA=E6=BB=9A=E5=8A=A8=E6=9D=A1=202.?=
 =?UTF-8?q?=E6=8F=90=E9=97=AE=E5=92=8C=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=203.KE=E6=8F=92=E5=85=A5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A1=86=E5=8E=BB=E6=8E=89=E6=88=91=E8=A6=81=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E5=AD=97=E6=A0=B7=204.=E8=87=AA=E5=8A=A8=E8=AF=86?=
 =?UTF-8?q?=E5=88=ABURL=E4=BC=98=E5=8C=96=E5=8F=AF=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=EF=BC=9F=20=E5=92=8Ccn=E7=AD=89=205.KE=E7=BC=A9=E8=BF=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/commons/zh.yml                 |  2 +-
 public/assets/kindeditor/kindeditor.js        | 63 ++++++++++++++++---
 .../plugins/autoheight/autoheight.js          | 12 +++-
 public/assets/kindeditor/plugins/code/code.js |  3 +
 .../kindeditor/plugins/code/previewcode.css   |  2 +-
 public/javascripts/application.js             |  4 +-
 public/stylesheets/courses.css                |  4 ++
 public/stylesheets/new_user.css               |  3 +
 public/stylesheets/project.css                |  3 +
 public/stylesheets/public.css                 |  2 +
 10 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index d65606678..70236d9ba 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -358,7 +358,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "请在此提问平台问题，或直接加入师姐答疑群，谢谢！"
+  label_feedback_tips: "请在此发布平台问题和建议，或直接加入答疑群，谢谢！"
   label_technical_support: "QQ 在线支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 6b0f1621b..5503af1fe 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -83,7 +83,8 @@ function _inString(val, str, delimiter) {
 }
 function _addUnit(val, unit) {
 	unit = unit || 'px';
-	return val && /^\d+$/.test(val) ? val + unit : val;
+	//return val && /^\d+$/.test(val) ? val + unit : val;
+	return val && /^-?\d+(?:\.\d+)?$/.test(val) ? val + unit : val;
 }
 function _removeUnit(val) {
 	var match;
@@ -304,7 +305,7 @@ K.options = {
 		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
-			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left', '.margin', '.border', '.padding'
 		],
 		pre : ['id', 'class'],
 		hr : ['id', 'class', '.page-break-after'],
@@ -597,7 +598,7 @@ function _ready(fn) {
 	}
 	_bind(window, 'load', readyFunc);
 }
-if (_IE) {
+if (window.attachEvent) {
 	window.attachEvent('onunload', function() {
 		_each(_eventData, function(key, events) {
 			if (events.el) {
@@ -2531,6 +2532,7 @@ K.START_TO_START = _START_TO_START;
 K.START_TO_END = _START_TO_END;
 K.END_TO_END = _END_TO_END;
 K.END_TO_START = _END_TO_START;
+
 function _nativeCommand(doc, key, val) {
 	try {
 		doc.execCommand(key, false, val);
@@ -3361,6 +3363,10 @@ function _drag(options) {
 		});
 	}
 	clickEl.mousedown(function(e) {
+		//新加的
+		if(e.button !== 0 && e.button !== 1) {
+			return;
+		}
 		e.stopPropagation();
 		var self = clickEl.get(),
 			x = _removeUnit(moveEl.css('left')),
@@ -3681,13 +3687,20 @@ _extend(KEdit, KWidget, {
 			if (isDocumentDomain) {
 				doc.domain = document.domain;
 			}
+
 			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
 			doc.close();
 			self.win = self.iframe[0].contentWindow;
 			self.doc = doc;
 			var cmd = _cmd(doc);
 			self.afterChange(function(e) {
-				cmd.selection();
+//                if (e.which == 8) {
+//                    var range = cmd.range
+//                    var bookmark = range.createBookmark();
+//                    cmd.doc.body.innerHTML = cmd.doc.body.innerHTML.replace(/<p>\s*<\/p>/g,"");
+//                    range.moveToBookmark(bookmark);
+//                }
+                cmd.selection();
 			});
 			if (_WEBKIT) {
 				K(doc).click(function(e) {
@@ -3824,9 +3837,20 @@ _extend(KEdit, KWidget, {
 			if (!self.designMode) {
 				val = self.html();
 				self.designMode = true;
-				self.html(val);
+				
+				//self.html(val);
+				//self.textarea.hide();
+				//self.iframe.show();
+				//新加
 				self.textarea.hide();
-				self.iframe.show();
+				self.html(val);
+				var iframe = self.iframe;
+				var height = _removeUnit(self.height);
+				iframe.height(height - 2);
+				iframe.show();
+				setTimeout(function() {
+					iframe.height(height);
+				}, 0);
 			}
 		} else {
 			if (self.designMode) {
@@ -3958,7 +3982,7 @@ _extend(KToolbar, KWidget, {
 		}else if(!$("#full",container).is(':hidden')){
 			pdiv = $("#full",container);
 		}
-		return (this._itemMap[name] = K('span.ke-icon-' + name, pdiv).parent());
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
 	},
 	select : function(name) {
 		_selectToolbar.call(this, name, function(knode) {
@@ -4864,6 +4888,11 @@ KEditor.prototype = {
 	},
 	loadPlugin : function(name, fn) {
 		var self = this;
+		//新加
+		var _pluginStatus = this._pluginStatus;
+		if (!_pluginStatus) {
+			_pluginStatus = this._pluginStatus = {};
+		}
 		if (_plugins[name]) {
 			if (!_isFunction(_plugins[name])) {
 				setTimeout(function() {
@@ -4871,7 +4900,12 @@ KEditor.prototype = {
 				}, 100);
 				return self;
 			}
-			_plugins[name].call(self, KindEditor);
+			//_plugins[name].call(self, KindEditor);
+			//新加
+			if(!_pluginStatus[name]) {
+				_plugins[name].call(self, KindEditor);
+				_pluginStatus[name] = 'inited';
+			}
 			if (fn) {
 				fn.call(self);
 			}
@@ -5510,6 +5544,11 @@ function _create(expr, options) {
 		_each(_plugins, function(name, fn) {
 			if (_isFunction(fn)) {
 				fn.call(editor, KindEditor);
+				//新加
+				if (!editor._pluginStatus) {
+					editor._pluginStatus = {};
+				}
+				editor._pluginStatus[name] = 'inited';
 			}
 		});
 		return editor.create();
@@ -5772,13 +5811,14 @@ _plugin('core', function(K) {
 				click : function() {
 					self.select().exec('formatblock', '<' + key + '>').hideMenu();
                     //by yk利用html的特性使h1 h2 h3 h4标签之间不能相互包含 并将空的标签去掉
-                    if (key != "p"){
+//                    if (key != "p"){
                         var val = self.select().html();
                         self.select().html(val);
+                        self.cmd.doc.body.innerHTML = self.cmd.doc.body.innerHTML.replace(/<p>\s*<\/p>/g,"");
                         val = self.select().html().replace(/(<h1>\s*<\/h1>)|(<h2>\s*<\/h2>)|(<h3>\s*<\/h3>)|(<h4>\s*<\/h4>)/g,"");
                         self.select().html(val);
                         self.select();
-                    }
+//                    }
 				}
 			});
 		});
@@ -6059,6 +6099,9 @@ _plugin('core', function(K) {
 			} else {
 				cmd.range.selectNodeContents(div[0]);
 				cmd.select();
+				//新加
+				div[0].tabIndex = -1;
+				div[0].focus();
 			}
 			setTimeout(function() {
 				movePastedData();
diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
index cdd3f94f8..1a067e134 100644
--- a/public/assets/kindeditor/plugins/autoheight/autoheight.js
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -27,9 +27,19 @@ KindEditor.plugin('autoheight', function(K) {
 		var edit = self.edit;
 		var body = edit.doc.body;
 		edit.iframe.height(minHeight);
+
+        //最高418 超过用滚动条
 		self.resize(null, Math.max(
-            (K.IE ? body.scrollHeight : body.offsetHeight)
+            (K.IE ? body.scrollHeight : body.offsetHeight) > 385 ? 385+33 : (K.IE ? body.scrollHeight : body.offsetHeight)
                 + 33, minHeight));
+
+        if( self.height == "418px" ){
+            edit.iframe[0].scroll = 'yes';
+            body.style.overflowY = 'auto';
+        }
+        else{
+            hideScroll();
+        }
 	}
 
 	function init() {
diff --git a/public/assets/kindeditor/plugins/code/code.js b/public/assets/kindeditor/plugins/code/code.js
index 760f20bc7..3a3a982ea 100644
--- a/public/assets/kindeditor/plugins/code/code.js
+++ b/public/assets/kindeditor/plugins/code/code.js
@@ -42,6 +42,9 @@ KindEditor.plugin('code', function(K) {
 				yesBtn : {
 					name : self.lang('yes'),
 					click : function(e) {
+                        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){
+                            self.edit.html('');
+                        }
 						var type = K('.ke-code-type', dialog.div).val(),
 							code = textarea.val(),
 							cls = type === '' ? '' :  ' lang-' + type,
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index cf9c219e9..8c0f07af4 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -46,7 +46,7 @@
 .ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
 
 
-.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
+.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;}
 span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 303fc3ac9..633ade4aa 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1353,7 +1353,7 @@ function autoUrl(id){
         $("#"+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();
-                html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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) {
+                html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel|cn)|(([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-Za-z0-9_\-\.~]+)*(\?[A-Za-z0-9+_\-\.%=&]*)?(\/([A-Za-z0-9_\-\.]*)(\?[A-Za-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
                     //没有://的都加上http://
                     var reStr = full;
                     if (full.length > 0){
@@ -1372,7 +1372,7 @@ function autoUrl(id){
     }
     else{
         var html = $("#"+id).text();
-        html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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) {
+        html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel|cn)|(([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-Za-z0-9_\-\.~]+)*(\?[A-Za-z0-9+_\-\.%=&]*)?(\/([A-Za-z0-9_\-\.]*)(\?[A-Za-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) {
             //没有://的都加上http://
             var reStr = full;
             if (full.length > 0){
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 8d27be744..27f836a15 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,6 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro blockquote{background: none;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -194,6 +195,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent blockquote{background: none;}
 .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;}
@@ -301,6 +303,7 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px !important;}
 .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;}
+.talk_info a{ color:#15bccf; }
 a.talk_edit{ color:#269ac9; margin-right:5px;}
 a:hover.talk_edit{ color:#297fb8;}
 .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
@@ -1141,6 +1144,7 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #15bccf;}
+.postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0231f6a8a..c456d3075 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,6 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro blockquote{background: none;}
 .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;}
@@ -723,6 +724,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent blockquote{background: none;}
 .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;}
@@ -868,6 +870,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #15bccf;}
+.postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f5690a12c..4247d092d 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -219,6 +219,7 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{  margin-left:60px; margin-top:10px;}
+.talk_info a{ color:#15bccf; }
 /*.issue_desc li{list-style-type: decimal;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;}
@@ -977,6 +978,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro blockquote{background: none;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1119,6 +1121,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #15bccf;}
+.postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 98fd0ec20..0ea98c79d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -614,6 +614,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro blockquote{background: none;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -651,6 +652,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent blockquote{background: none;}
 .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;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}

From 2431ef69860c63a10cf425ed5b3bfaa46aa2318f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 2 Jun 2016 13:56:11 +0800
Subject: [PATCH 250/668] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/blog_comment.rb       | 2 +-
 app/models/homework_common.rb    | 2 +-
 app/models/journal.rb            | 1 -
 public/javascripts/wechat/app.js | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 255410a89..05ae02fe2 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -21,7 +21,7 @@ class BlogComment < ActiveRecord::Base
 
   after_save :add_user_activity
   after_update :update_activity
-  after_create :update_parent_time, :blog_wechat_message
+  after_create :update_parent_time
   before_destroy :destroy_user_activity
 
   scope :like, lambda {|arg|
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 325b599e3..a915b1545 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -30,7 +30,7 @@ class HomeworkCommon < ActiveRecord::Base
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
   after_create :act_as_activity, :send_mail,:act_as_course_message
-  after_update :update_activity, :wechat_message
+  after_update :update_activity
   after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 6d59c7414..bea273a41 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -55,7 +55,6 @@ class Journal < ActiveRecord::Base
   
   # fq
   after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
-  after_create :issue_wechat_message
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ee849aad8..641e95bed 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -111,9 +111,6 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
             url: apiUrl+ "activities",
             data: {openid: auth.openid(), page: page}
         }).then(function successCallback(response) {
-            if(response.data.message == "undefined method `user' for nil:NilClass"){
-                alert("请先绑定确实的用户账号");
-            }
             $scope.current_page = 0;
             console.log($scope.current_page);
             console.log(response.data.page);

From 1f073c19ae799f8a38e35a5b137fed89f0967e1d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 13:57:07 +0800
Subject: [PATCH 251/668] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 1da347b16..610af6857 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -98,7 +98,15 @@
             <% else %>
                 <% if field.field_type == "Post" && field.hide == 0 %>
                     <li class="nav-element">
-                      <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                      <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                              <%= link_to field.name, show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to field.name, show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                      <% end %>
                     </li>
                     <!--二级目录-->
                     <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">

From 135e50b2e78b7ce4d5bb7590713d0cc26f972897 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 14:54:04 +0800
Subject: [PATCH 252/668] =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb            |  2 +-
 .../sub_document_comments_controller.rb            |  2 +-
 app/views/layouts/base_org2.html.erb               | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index d7e38f370..2e63a1589 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_org'
 
diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 80c14f004..d6b335006 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -1,7 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 799aaa42b..c3c00f00b 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -98,13 +98,21 @@
             <% else %>
                 <% if field.field_type == "Post" && field.hide == 0 %>
                     <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                              <%= link_to field.name, show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to field.name, show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                      <% end %>
                     </li>
                     <!--二级目录-->
                     <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                       <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
                         <% field.sub_domains.each do |subdomain| %>
-                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey", :target => "_blank" %></li>
                             <li class="sn-subnav-slice">|</li>
                         <% end %>
                       </ul>
@@ -118,7 +126,7 @@
         <% end %>
         <% if User.current.admin_of_org?(@organization) %>
             <li class="nav-element">
-              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white" target = "_blank">配置</a>
             </li>
         <% end %>
       </ul>

From e374b1679f2004cd7d4ea2f64d6862eb38938ca0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 14:54:54 +0800
Subject: [PATCH 253/668] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_project_show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 39990e215..43b0798aa 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -104,10 +104,11 @@
               <ul>
                 <li class="homepagePostSettingIcon">
                   <ul class="homepagePostSettiongText">
-                    <% if @topic.author.id == User.current.id %>
+
                         <li>
                           <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
                         </li>
+                    <% if @topic.author.id == User.current.id %>
                         <li>
                           <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
                                       :data => {:confirm => l(:text_are_you_sure)},

From d532cd3c6c7dba8d5c7cb7445db214d5bdaa7857 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 14:58:13 +0800
Subject: [PATCH 254/668] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index c3c00f00b..42b26c0b9 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -181,7 +181,7 @@
         <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
         <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
         <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+        
       </ul>
       <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
       <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />

From ba344a86b5742434b97a88121bad91a806850433 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 14:59:32 +0800
Subject: [PATCH 255/668] =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 2 +-
 public/javascripts/application.js    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 42b26c0b9..c560b35fb 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -181,7 +181,7 @@
         <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
         <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
         <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-        
+
       </ul>
       <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
       <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 303fc3ac9..96dd99ed2 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1358,10 +1358,10 @@ function autoUrl(id){
                     var reStr = full;
                     if (full.length > 0){
                         if (full.indexOf("://") >= 0){
-                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                         }
                         else{
-                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                         }
                     }
                     return reStr ;
@@ -1377,10 +1377,10 @@ function autoUrl(id){
             var reStr = full;
             if (full.length > 0){
                 if (full.indexOf("://") >= 0){
-                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                 }
                 else{
-                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                 }
             }
             return reStr ;

From c3c639aa77d88dbb58450c24a11436e4b5ed42bf Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 2 Jun 2016 15:27:16 +0800
Subject: [PATCH 256/668] =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=8E=A5=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/code/previewcode.css | 2 +-
 public/javascripts/application.js                     | 8 ++++----
 public/stylesheets/courses.css                        | 8 ++++----
 public/stylesheets/css.css                            | 2 +-
 public/stylesheets/new_user.css                       | 6 +++---
 public/stylesheets/project.css                        | 6 +++---
 public/stylesheets/public.css                         | 4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 8c0f07af4..f9f7c4b78 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -54,5 +54,5 @@ span.at a{color:#269ac9;text-decoration: none;}
 .ke-content ol li{list-style-type: decimal;}
 .ke-content ul li{list-style-type: disc;}
 .ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
-.ke-content a{color: #15bccf;}
+.ke-content a{color: #136ec2;}
 .ke-content a:link,.ke-content a:visited{text-decoration:none;}
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 633ade4aa..468bf64e9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1358,10 +1358,10 @@ function autoUrl(id){
                     var reStr = full;
                     if (full.length > 0){
                         if (full.indexOf("://") >= 0){
-                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                         }
                         else{
-                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                         }
                     }
                     return reStr ;
@@ -1377,10 +1377,10 @@ function autoUrl(id){
             var reStr = full;
             if (full.length > 0){
                 if (full.indexOf("://") >= 0){
-                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                 }
                 else{
-                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                 }
             }
             return reStr ;
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 27f836a15..98976d044 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -151,7 +151,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
-.homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro a{color: #136ec2;}
 .homepagePostIntro blockquote{background: none;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
@@ -194,7 +194,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent a{color: #136ec2;}
 .homepagePostReplyContent blockquote{background: none;}
 .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;}
@@ -444,7 +444,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
 .ping_discon{ float:left; width:610px; margin-left:10px; }
-.ping_journal a{color: #15bccf;}
+.ping_journal a{color: #136ec2;}
 /*.ping_distop span{ float:left;}*/
 .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;}
@@ -1143,7 +1143,7 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
-.postDetailDes a{color: #15bccf;}
+.postDetailDes a{color: #136ec2;}
 .postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 74a9d9aaf..623ee5c4e 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -123,7 +123,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .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;}
-.ping_journal a{color: #15bccf;}
+.ping_journal a{color: #136ec2;}
 
 /* 创建作业 */
 .Newwork{ width:940px; border:1px solid #c3c3c3;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index c456d3075..063e2b301 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -682,7 +682,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
-.homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro a{color: #136ec2;}
 .homepagePostIntro blockquote{background: none;}
 .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;}
@@ -723,7 +723,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .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;}
-.homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent a{color: #136ec2;}
 .homepagePostReplyContent blockquote{background: none;}
 .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;}
@@ -869,7 +869,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
-.postDetailDes a{color: #15bccf;}
+.postDetailDes a{color: #136ec2;}
 .postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 4247d092d..5af57bc5f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -334,7 +334,7 @@ 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_disfoot span a span{ color: #6883b6;}
-.ping_journal a{color: #15bccf;}
+.ping_journal a{color: #136ec2;}
 /*.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: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
@@ -977,7 +977,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .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;}
-.homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro a{color: #136ec2;}
 .homepagePostIntro blockquote{background: none;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
@@ -1120,7 +1120,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
-.postDetailDes a{color: #15bccf;}
+.postDetailDes a{color: #136ec2;}
 .postDetailDes blockquote{background: none;}
 .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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0ea98c79d..f2e4dabc9 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -613,7 +613,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
-.homepagePostIntro a{color: #15bccf;}
+.homepagePostIntro a{color: #136ec2;}
 .homepagePostIntro blockquote{background: none;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
@@ -651,7 +651,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .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;}
-.homepagePostReplyContent a{color: #15bccf;}
+.homepagePostReplyContent a{color: #136ec2;}
 .homepagePostReplyContent blockquote{background: none;}
 .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 184c17d52f42ebe101b0464cd0e7b27cc45a0d3e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 2 Jun 2016 15:34:43 +0800
Subject: [PATCH 257/668] =?UTF-8?q?=E2=80=9C=E6=98=BE=E7=A4=BA=E6=98=8E?=
 =?UTF-8?q?=E7=A0=81=E2=80=9D=E5=BC=B9=E5=87=BAundefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 73ab065ea..9f6b6aabd 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -904,7 +904,11 @@ function regexDeadLine()
 //新建、修改课程明码显示
 $(function(){
     $("#psw_btn").click(function() {
-        alert("密码: "+$("#course_course_password").val());
+        if($("#new_course_course_password").length > 0) {
+            alert("密码: "+$("#new_course_course_password").val());
+        } else if($("#edit_course_course_password").length > 0){
+            alert("密码: "+$("#edit_course_course_password").val());
+        }
     });
 });
 

From 74ee3205bdecd704469e08953980b5d7f6c4f3fd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 15:47:17 +0800
Subject: [PATCH 258/668] =?UTF-8?q?=E6=B7=98=E5=AE=9D=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                 | 2 +-
 lib/dalli-2.7.2/Gemfile                 | 2 +-
 lib/gitlab-cli/Gemfile                  | 2 +-
 lib/grack/Gemfile                       | 2 +-
 lib/plugins/acts-as-taggable-on/Gemfile | 2 +-
 lib/rails_kindeditor/Gemfile            | 2 +-
 lib/wechat/Gemfile                      | 2 +-
 plugins/redmine_ckeditor/Gemfile        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index a599613ba..d392c6561 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org/'
+source 'https://ruby.taobao.org/'
 ### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
diff --git a/lib/dalli-2.7.2/Gemfile b/lib/dalli-2.7.2/Gemfile
index aeb2bb358..59c3c15a0 100644
--- a/lib/dalli-2.7.2/Gemfile
+++ b/lib/dalli-2.7.2/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://ruby.taobao.org/'
 
 gemspec
 
diff --git a/lib/gitlab-cli/Gemfile b/lib/gitlab-cli/Gemfile
index 54fbdf177..846f49bed 100644
--- a/lib/gitlab-cli/Gemfile
+++ b/lib/gitlab-cli/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://ruby.taobao.org/'
 
 # Specify your gem's dependencies in gitlab.gemspec
 gemspec
diff --git a/lib/grack/Gemfile b/lib/grack/Gemfile
index 2aa7df2fe..360e439a0 100644
--- a/lib/grack/Gemfile
+++ b/lib/grack/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org/'
+source 'https://ruby.taobao.org/'
 
 gemspec
 
diff --git a/lib/plugins/acts-as-taggable-on/Gemfile b/lib/plugins/acts-as-taggable-on/Gemfile
index e37a382a0..4e6730add 100644
--- a/lib/plugins/acts-as-taggable-on/Gemfile
+++ b/lib/plugins/acts-as-taggable-on/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://ruby.taobao.org/'
 
 gemspec
 
diff --git a/lib/rails_kindeditor/Gemfile b/lib/rails_kindeditor/Gemfile
index 9a36070cb..c4b60f19b 100644
--- a/lib/rails_kindeditor/Gemfile
+++ b/lib/rails_kindeditor/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source "https://ruby.taobao.org/"
 
 gemspec
 
diff --git a/lib/wechat/Gemfile b/lib/wechat/Gemfile
index ee4ef6e9e..8627d2525 100644
--- a/lib/wechat/Gemfile
+++ b/lib/wechat/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://ruby.taobao.org/'
 
 gemspec
 
diff --git a/plugins/redmine_ckeditor/Gemfile b/plugins/redmine_ckeditor/Gemfile
index 115107d18..568df01b4 100644
--- a/plugins/redmine_ckeditor/Gemfile
+++ b/plugins/redmine_ckeditor/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org/'
+source 'https://ruby.taobao.org/'
 
 gem 'rich', '1.4.6'
 gem 'kaminari'

From d047409d315b894bfb08eac29731a92ed57da3fc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 16:01:58 +0800
Subject: [PATCH 259/668] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index c560b35fb..9ba1a9653 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -86,14 +86,6 @@
                     <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
                       <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
                     </li>
-                <% when 'course' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-                    </li>
-                <% when 'project' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-                    </li>
                 <% end %>
             <% else %>
                 <% if field.field_type == "Post" && field.hide == 0 %>

From fb1a13a5228c08ea1bf97d255472100a59d6cf56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 17:05:51 +0800
Subject: [PATCH 260/668] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_edit.html.erb |  5 +++++
 app/views/projects/show.html.erb               | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index eef87bc9b..1fa96e602 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -30,6 +30,11 @@
           <input id="project_is_public" name="project[is_public]" type="checkbox" <%= @project.is_public ? "checked" : ""%>>
           <div class="cl"></div>
         </li>
+        <li >
+          <label class="label02">隐藏代码库&nbsp;&nbsp;：</label>
+          <input id="project_hidden_repo" name="project[hidden_repo]" type="checkbox" <%= @project.hidden_repo ? "checked" : ""%>>
+          <div class="cl"></div>
+        </li>
     </ul>
     <a href="javascript:void(0)" class="blue_btn ml110" onclick="submit_edit_project(<%= @project.id %>);" >保存</a>
 <% end %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index c0bb15ab4..30c15c03d 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -29,13 +29,16 @@
     <!--CONTENT LIST-->
 
   </div>
-  <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %>
-  <div class="resources mt10">
-    <div class="homepagePostBrief">
-      <%= render :partial => "rep_static" %>
-      <div class="cl"></div>
-    </div>
-  </div>
+  <%# 时间紧，权限待优化 %>
+  <% unless @project.hidden_repo && !User.current.member_of?(@project) && !User.current.admin? %>
+      <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank?  %>
+          <div class="resources mt10">
+            <div class="homepagePostBrief">
+              <%= render :partial => "rep_static" %>
+              <div class="cl"></div>
+            </div>
+          </div>
+      <% end %>
   <% end %>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>

From 5d880db18e7fd71ab5f6ee290f32dae4e1fcae5b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 17:54:12 +0800
Subject: [PATCH 261/668] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B2=A1=E7=99=BB=E9=99=86=E5=8F=AF=E4=BB=A5=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 4fc9482d4..3d9527b8b 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -124,7 +124,7 @@
         </div>
         <div class="cl"></div>
     <%# end %>
-    <% if User.current.logged?%>
+    <%# if User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">
           <em class="talkWrapArrow"></em>
           <div class="cl"></div>
@@ -137,7 +137,7 @@
             <div class="cl"></div>
           </div>
         </div>
-    <% end %>
+    <%# end %>
   </div>
 </div>
 

From e05e6ba53d03029239217e23970036f59aee3e40 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 18:04:00 +0800
Subject: [PATCH 262/668] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=AF=B9=E9=BD=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/org_document_comments/_new.html.erb | 2 +-
 app/views/org_document_comments/show.html.erb | 2 +-
 app/views/sub_document_comments/_new.html.erb | 2 +-
 app/views/sub_document_comments/show.html.erb | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb
index f462df2c9..aacd8f00a 100644
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@@ -36,7 +36,7 @@
         $('#doc_title_hint').hide();
     }
 </script>
-    <div class="resources" nhname="new_topic_form">
+    <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" nhname="new_topic_form">
       <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
       <div>
         <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 3d9527b8b..c7adc39fb 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -5,7 +5,7 @@
         showNormalImage('message_description_<%= @document.id %>');
     });
 </script>
-<div class="resources" id="organization_document_<%= @document.id %>">
+<div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" id="organization_document_<%= @document.id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
diff --git a/app/views/sub_document_comments/_new.html.erb b/app/views/sub_document_comments/_new.html.erb
index c6cc13164..aec91c878 100644
--- a/app/views/sub_document_comments/_new.html.erb
+++ b/app/views/sub_document_comments/_new.html.erb
@@ -36,7 +36,7 @@
         $('#doc_title_hint').hide();
     }
 </script>
-<div class="resources" nhname="new_topic_form">
+<div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;"  nhname="new_topic_form">
   <%= form_tag org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
       <div>
         <input class="postDetailInput fl" maxlength="250" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题" />
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index 7050c1c66..f85f3ed25 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -8,7 +8,7 @@
             showNormalImage('message_description_<%= @document.id %>');
         });
     </script>
-    <div class="resources" id="organization_document_<%= @document.id %>">
+    <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;"  id="organization_document_<%= @document.id %>">
       <div class="homepagePostBrief">
         <div class="homepagePostPortrait">
           <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
@@ -138,7 +138,7 @@
         </div>
         <div class="cl"></div>
         <%# end %>
-        <% if User.current.logged?%>
+        <%# if User.current.logged?%>
             <div class="talkWrapMsg" nhname="about_talk_reply">
               <em class="talkWrapArrow"></em>
               <div class="cl"></div>
@@ -151,7 +151,7 @@
                 <div class="cl"></div>
               </div>
             </div>
-        <% end %>
+        <%# end %>
       </div>
     </div>
 

From 0b3ec0322f80c7036a88af1dcc9295491e958a4c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 18:41:00 +0800
Subject: [PATCH 263/668] =?UTF-8?q?=E5=8F=B3=E4=B8=80=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           | 29 +++++++++
 .../organizations/_org_custom_right1.html.erb | 62 ++++++++-----------
 .../_organization_content_extension.html.erb  | 13 +---
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 4c6089b51..a5a3d6aaa 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -66,11 +66,40 @@ module OrganizationsHelper
   def org_user_by_type obj
     case obj.act_type
       when "Message"
+        user = obj.act.author
       when "News"
+        user = obj.act.author
       when "HomeworkCommon"
+        user = obj.act.user
       when "Issue"
+        user = obj.act.author
     end
+  end
 
+  def org_title_by_type obj
+    case obj.act_type
+      when "Message"
+        user = obj.act.parent_id.nil? ? obj.act.subject : obj.act.parent.subject
+      when "News"
+        user = obj.act.title
+      when "HomeworkCommon"
+        user = obj.act.name
+      when "Issue"
+        user = obj.act.subject
+    end
+  end
+
+  def org_content_by_type obj
+    case obj.act_type
+      when "Message"
+        user = obj.act.parent_id.nil? ? obj.act.content : obj.act.parent.content
+      when "News"
+        user = obj.act.description
+      when "HomeworkCommon"
+        user = obj.act.description
+      when "Issue"
+        user = obj.act.description
+    end
   end
 
   #排列下拉框
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index 4fed81a6b..882c994cc 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -5,44 +5,32 @@
   <% else %>
       <ul class="por_news_list clear">
         <% @acts.each do |obj| %>
-            <% if obj.act_type = "Message" %>
-                <% user = org_user_by_type(obj) %>
-                <% title = org_title_by_type(obj) %>
-                <% content = org_content_by_type(obj) %>
-                <% message = obj.act %>
-                <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
-                <li>
-                  <%= link_to image_tag(url_to_avatar(user),:width => "43", :height => "43", :class => "por_users_img"), user_path(user), :target => "_blank", :class => "fl" %>
-                  <div class="por_news_txt fl">
-                    <p class="por_news_p fl">
-                      <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name fl", :target => "_blank" %>
-                      <span class="fl">&nbsp;:&nbsp;</span>
-                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 28, :maxwidth => 0, :cl => ""} %>
-                    </p>
-                    <p><span class="por_time fl"><%= time_from_now(message.created_on) %> </span>
-                      <!--<a href="javascript:void(0);" target="_blank" class="por_zan fr">50</a>-->
-                    </p>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% elsif obj.act_type = "News" %>
-
-            <% elsif obj.act_type = "HomeworkCommon" %>
-            <% elsif obj.act_type = "Issue" %>
-            <% end %>
+            <% user = org_user_by_type(obj) %>
+            <% title = org_title_by_type(obj) %>
+            <% content = org_content_by_type(obj) %>
+            <li>
+              <%= link_to image_tag(url_to_avatar(user),:width => "43", :height => "43", :class => "por_users_img"), user_path(user), :target => "_blank", :class => "fl" %>
+              <div class="por_news_txt fl">
+                <p class="por_news_p fl">
+                  <%= link_to user.show_name, user_path(user), :class => "por_hot_name fl", :target => "_blank" %>
+                  <span class="fl">&nbsp;:&nbsp;</span>
+                  <% if obj.act_type = "Message" %>
+                      <%= link_to title, board_message_path(obj.act.board.id, obj.act.id) %>
+                  <% elsif obj.act_type = "News" %>
+                      <%= link_to title, news_path(obj.act.id) %>
+                  <% elsif obj.act_type = "HomeworkCommon" %>
+                      <%= link_to title, student_work_index_url_in_org(obj.act.id) %>
+                  <% elsif obj.act_type = "Issue" %>
+                      <%= link_to title, issue_path(obj.act.id) %>
+                  <% end %>
+                </p>
+                <p><span class="por_time fl"><%= time_from_now(obj.act.created_on) %> </span>
+                  <!--<a href="javascript:void(0);" target="_blank" class="por_zan fr">50</a>-->
+                </p>
+              </div>
+              <div class="cl"></div>
+            </li>
         <% end %>
-        <li >
-          <a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_users_img"/></a>
-          <div class="por_news_txt fl">
-            <p class="por_news_p fl">
-              <a href="javascript:void(0);" target="_blank" class=" por_hot_name fl">  叮当当 </a><span class="fl">&nbsp;:&nbsp;</span>
-              Trustie社区新版上线了必须支持一下，比以前好用很多....
-            </p>
-            <p><span class="por_time fl">1分钟前 </span><a href="javascript:void(0);" target="_blank" class="por_zan fr">500</a></p>
-          </div>
-          <div class="cl"></div>
-        </li>
-
       </ul>
   <% end %>
 </div><!--por_news end-->
\ No newline at end of file
diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb
index be5343d61..48abd48b9 100644
--- a/app/views/organizations/_organization_content_extension.html.erb
+++ b/app/views/organizations/_organization_content_extension.html.erb
@@ -1,16 +1,9 @@
-<% if cl.nil? %>
-    <span class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
+<p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
         <span id="intro_content_<%= user_activity_id%>">
             <%= content.to_s.html_safe%>
         </span>
-    </span>
-<% else %>
-    <p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
-        <span id="intro_content_<%= user_activity_id%>">
-            <%= content.to_s.html_safe%>
-        </span>
-    </p>
-<% end %>
+</p>
+
 
 <script type="text/javascript">
     $("#intro_content_<%= user_activity_id %>").hide();

From 52bc4aab81f30a57b7e9c66bc8266846f7308ff4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 18:46:15 +0800
Subject: [PATCH 264/668] =?UTF-8?q?=E5=8F=B3=E4=BA=8C=EF=BC=88=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  2 +-
 .../organizations/_org_custom_right2.html.erb | 35 +++++--------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 4021560bf..8be34a318 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -93,7 +93,7 @@ class OrganizationsController < ApplicationController
         end
         # 热门项目
         if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
-          @excellent_courses = Course.where(:is_public => true, :status => true)
+          @excellent_projects = Course.where(:is_public => true, :status => true, :hot => true)
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 3cef2f622..34e3682f6 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -1,32 +1,13 @@
 <div class="por_projects">
   <h2 class="por_h2_index clear">热点项目<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
   <ul>
-    <li class="por_project_li">
-      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-
-      <div class="cl"></div>
-      <p class="por_project_p ">众所周知，系统读取数据时，从内存中读取要比从硬盘上速度要快好几上速度要快好几百倍。故现在绝大上速度要快好几百倍。故现在绝大百倍。故现在绝大部分应用系...</p>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-      <div class="cl"></div>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-      <div class="cl"></div>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-      <div class="cl"></div>
-    </li>
-    <li>
-      <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-      <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-      <div class="cl"></div>
-    </li>
+    <% cotainers.each do |container| %>
+        <li>
+          <%= link_to container.name, project_path(container) %>
+          <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
+          <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
+          <div class="cl"></div>
+        </li>
+    <% end %>
   </ul>
 </div><!--por_projects end-->
\ No newline at end of file

From dc4f927c3992373ddc9e03ebdddeaccd8ac2ea75 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 21:01:39 +0800
Subject: [PATCH 265/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8F=B3=E4=BA=8C?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_right2.html.erb | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 34e3682f6..7bb2cbf93 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -1,13 +1,22 @@
 <div class="por_projects">
-  <h2 class="por_h2_index clear">热点项目<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <ul>
-    <% cotainers.each do |container| %>
-        <li>
-          <%= link_to container.name, project_path(container) %>
-          <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-          <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-          <div class="cl"></div>
-        </li>
-    <% end %>
-  </ul>
-</div><!--por_projects end-->
\ No newline at end of file
+  <h2 class="por_h2_index clear">热点项目</h2>
+  <% if containers.blank? %>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+  <% else %>
+      <% container = cotainers.first %>
+      <li class="por_project_li">
+        <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+        <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+        <div class="cl"></div>
+        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
+      </li>
+
+      <% cotainers[1..4].each do |container| %>
+          <li>
+            <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+            <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+            <div class="cl"></div>
+          </li>
+      <% end %>
+  <% end %>
+</div><!--por_projects end-->

From e2848f4dec87c73a491e6794dfe2da46d854353d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 21:10:07 +0800
Subject: [PATCH 266/668] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb         | 2 ++
 app/views/organizations/_org_custom_header.html.erb | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 496c3aa92..78049e545 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -25,6 +25,8 @@ class OrgSubfieldsController < ApplicationController
   # status类型说明，详见SubField
   def update_status_by_type subfield, type
     case type
+      when "Resource"
+        subfield.update_attribute(:status, 6)
       when "Comptec"
         subfield.update_attribute(:status, 6)
       when "Compstu"
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index fc556255a..6368fef90 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -38,14 +38,9 @@
                   <%= link_to "首页", organization_path(@organization), :class => "por_index_act" %>
                 </li>
             <% when 'course' %>
-                <li style="display:<%= field.hide == 0 ? 'block':'none' %>;">
-                  <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-                </li>
             <% when 'project' %>
-                <li style="display:<%= field.hide == 0 ? 'block':'none' %>;">
-                  <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-                </li>
             <% end %>
+
         <% else %>
             <% if field.field_type == "Post" && field.hide == 0 %>
                 <li><a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a></li>

From 257165dbaf56168b7cf0b6112b4c9c2c64714b7c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 21:32:56 +0800
Subject: [PATCH 267/668] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=BA=8C=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=AE=9A=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb        | 6 +++---
 app/helpers/application_helper.rb                  | 2 +-
 app/views/organizations/_org_custom_left2.html.erb | 9 +++++++++
 app/views/organizations/_show_custom.html.erb      | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 78049e545..159648f34 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -32,11 +32,11 @@ class OrgSubfieldsController < ApplicationController
       when "Compstu"
         subfield.update_attribute(:status, 7)
       when "Comppro"
-        subfield.update_attribute(:status, 8)
+        subfield.update_attribute(:status, 5)
       when "Compcou"
-        subfield.update_attribute(:status, 9)
+        subfield.update_attribute(:status, 2)
       when "Compact"
-        subfield.update_attribute(:status, 10)
+        subfield.update_attribute(:status, 4)
     end
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a2285a678..42a033bee 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3105,7 +3105,7 @@ def named_attachment_url_without_domain(id, filename, option={})
 end
 #判断是否为默认的组织栏目
 def is_default_field? field
-  (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
+  (field.name == 'activity' || field.name == 'course' || field.name == 'project' || field.name == "Comppro" || field.name == "Comppro" || field.name == "Compact") && field.field_type == 'default'
 end
 
 def host_with_protocol
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index ee9530d32..83d9dea17 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -119,6 +119,15 @@
                 <% end %>
             <% end %>
         <% end %>
+    <% when 'Compcou' %>
+      <% @excellent_courses.first(4).each do |course| %>
+              <div class="por_course_bar fl clear">
+                <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title", :title => course.name %>
+                <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), user_path(attach.author), :target => "_blank", :class => "fl" %>
+                <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                <a class=" por_course_time"><%= time_from_now course.updated_at %></a>
+              </div>
+      <% end %>
     <% end %>
 <% else %>
     <% if field.field_type == "Post" %>
diff --git a/app/views/organizations/_show_custom.html.erb b/app/views/organizations/_show_custom.html.erb
index a7d7f4f78..ad77f4286 100644
--- a/app/views/organizations/_show_custom.html.erb
+++ b/app/views/organizations/_show_custom.html.erb
@@ -15,7 +15,7 @@
       <% if field.status.to_i == 4 %>
           <%= render :partial => 'organizations/org_custom_right1', :locals => {:field => field} %>
       <% elsif field.status.to_i == 5 %>
-          <%= render :partial => 'organizations/org_custom_right2', :locals => {:field => field} %>
+          <%= render :partial => 'organizations/org_custom_right2', :locals => {:field => field, :containers => @excellent_projects} %>
       <% elsif field.status.to_i == 6 %>
           <%= render :partial => 'organizations/org_custom_right3', :locals => {:field => field} %>
       <% end %>

From 709ceca1a8504b9e0f6eebfb6718e5db88a52bec Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 3 Jun 2016 08:41:14 +0800
Subject: [PATCH 268/668] =?UTF-8?q?=E6=89=98=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

---
 .../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 6fbad6d53decfc2bea1b230634532a9af67ba62c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 08:45:43 +0800
Subject: [PATCH 269/668] =?UTF-8?q?=E5=8F=B3=E4=BA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb         |  2 +-
 app/views/organizations/_org_custom_right2.html.erb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 8be34a318..66e3d6e05 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -93,7 +93,7 @@ class OrganizationsController < ApplicationController
         end
         # 热门项目
         if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
-          @excellent_projects = Course.where(:is_public => true, :status => true, :hot => true)
+          @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true)
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 7bb2cbf93..335087731 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -3,18 +3,18 @@
   <% if containers.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
   <% else %>
-      <% container = cotainers.first %>
+      <% container = containers.first %>
       <li class="por_project_li">
         <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
-        <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+        <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
         <div class="cl"></div>
-        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
+        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
       </li>
 
-      <% cotainers[1..4].each do |container| %>
+      <% containers[1..4].each do |container| %>
           <li>
             <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
-            <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+            <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
             <div class="cl"></div>
           </li>
       <% end %>

From fa03867cc2f884e880e929c68362c7f9faac8dff Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 08:56:54 +0800
Subject: [PATCH 270/668] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=A5=9E=E7=95=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_organization_content_extension.html.erb           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb
index 48abd48b9..919961057 100644
--- a/app/views/organizations/_organization_content_extension.html.erb
+++ b/app/views/organizations/_organization_content_extension.html.erb
@@ -1,8 +1,8 @@
-<p class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
-        <span id="intro_content_<%= user_activity_id%>">
-            <%= content.to_s.html_safe%>
-        </span>
-</p>
+<div class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
+  <span id="intro_content_<%= user_activity_id%>">
+      <%= content.to_s.html_safe%>
+  </span>
+</div>
 
 
 <script type="text/javascript">

From 1396cae14c9a29d5afad0fba4692eb46c2256759 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 3 Jun 2016 08:59:17 +0800
Subject: [PATCH 271/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                         |  4 ++++
 app/views/layouts/_logined_header.html.erb | 24 +++++++++++++++++++++-
 public/stylesheets/new_user.css            | 12 +++++++++++
 public/stylesheets/public.css              | 11 ++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 44ef54c95..a07f2421f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -370,6 +370,10 @@ class User < Principal
     messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count
   end
 
+  def user_messages_unviewed
+
+  end
+
   # 查询指派给我的缺陷记录
   def issue_status_update
     self.status_updates
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index f5b421f62..e3fad5c6a 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -78,12 +78,28 @@
     </ul>
   </div>
 
-  <div class="navHomepageNews">
+  <div class="navHomepageNews" id="user_messages">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target =>"_Blank", :title => "您的所有消息" %>
     <% if User.current.count_new_message.to_i >0 %>
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
+    <div class="shadowbox_news undis" id="user_messages_list">
+      <font></font>
+      <h4 class="shadowbox_news_title">未读消息</h4>
+      <ul class="shadowbox_news_list">
+        <% user_messages = User.current.user_messages_unviewed %>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+
+      </ul>
+      <%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
+
+    </div>
   </div>
 </div>
 
@@ -95,6 +111,12 @@
         $("#navHomepageSearchType").hide();
     });
 
+    $("#user_messages").mouseover(function(){
+        $("#user_messages_list").show();
+    }).mouseout(function(){
+        $("#user_messages_list").hide();
+    });
+
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").show();
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0231f6a8a..1edb4ff80 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1616,3 +1616,15 @@ ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/
 .wlist_select a{background-color: #64bdd9;cursor: default;}
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+a.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 98fd0ec20..c28560506 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1144,3 +1144,14 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 
 /*弹框*/
 .apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+a.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}

From bb9c9ddddf451f9fe22322954f96801f65c2cab3 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 3 Jun 2016 09:11:49 +0800
Subject: [PATCH 272/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E8=A6=86=E7=9B=96=E8=93=9D=E8=89=B2=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left1.html.erb  | 24 +++++++-------
 .../organizations/_org_custom_left2.html.erb  | 26 +++++++--------
 .../organizations/_org_custom_left3.html.erb  | 32 +++++++++----------
 .../organizations/_org_custom_right2.html.erb |  4 +--
 .../organizations/_org_custom_right3.html.erb |  6 ++--
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 6a2cea552..f104a8450 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -12,7 +12,7 @@
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <li>
-                      <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title', :target => "_blank", :title => document.title %>
+                      <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
                         <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
                       </p>
@@ -25,7 +25,7 @@
                         <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                         <% if message.board.org_subfield_id %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                               </p>
@@ -33,7 +33,7 @@
                             </li>
                         <% else %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                               </p>
@@ -44,7 +44,7 @@
                     <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
                         <% news = activity.org_act %>
                         <li>
-                          <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title', :target => "_blank", :title => news.title %>
+                          <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
                             <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
                           </p>
@@ -60,7 +60,7 @@
             <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                 <% document = activity.org_act %>
                 <li>
-                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title', :target => "_blank", :title => document.title %>
+                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                   <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
                     <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
                   </p>
@@ -73,7 +73,7 @@
                     <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                     <% if message.board.org_subfield_id %>
                         <li>
-                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                             <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                           </p>
@@ -81,7 +81,7 @@
                         </li>
                     <% else %>
                         <li>
-                          <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title', :target => "_blank", :title => title %>
+                          <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                             <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
                           </p>
@@ -92,7 +92,7 @@
                 <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
                     <% news = activity.org_act %>
                     <li>
-                      <%= link_to news.title, news_path(news), class: 'por_hot_title', :target => "_blank", :title => news.title %>
+                      <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
                         <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
                       </p>
@@ -114,7 +114,7 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => document.title %>
+                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => document.title %>
                 <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %></p>
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
               </div>
@@ -130,7 +130,7 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => title %>
+                        <%= link_to title, board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
                         <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
@@ -141,7 +141,7 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title_r', :target => "_blank", :title => title %>
+                        <%= link_to title, board_message_path(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
                         <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
@@ -156,7 +156,7 @@
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
-                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r', :target => "_blank", :title => news.title %>
+                    <%= link_to news.title, news_path(news), :class => 'por_hot_title link-black_r', :target => "_blank", :title => news.title %>
                     <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %></p>
                     <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                   </div>
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 83d9dea17..b4ab0e2a4 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -11,7 +11,7 @@
                     <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.name.to_s %>
+                      <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.name.to_s %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -24,7 +24,7 @@
                     <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title", :title => activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
+                      <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -37,7 +37,7 @@
                     <% activity = News.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.title %>
+                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -54,9 +54,9 @@
                     <% if ( activity.polls_status==2) %>
                         <div class="por_course_bar fl clear">
                           <% if has_commit %>
-                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title", :title => poll_name %>
+                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title link-black", :title => poll_name %>
                           <% else %>
-                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title", :title => poll_name %>
+                              <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title link-black", :title => poll_name %>
                           <% end %>
                           <% if iamge_path.nil? %>
                               <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
@@ -80,7 +80,7 @@
                     <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.subject, issue_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.subject %>
+                      <%= link_to activity.subject, issue_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.subject %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -94,7 +94,7 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <% subject = activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title", :title => subject %>
+                      <%= link_to subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => subject %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -107,7 +107,7 @@
                     <% activity = act.org_act %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title", :title => activity.title %>
+                      <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -122,7 +122,7 @@
     <% when 'Compcou' %>
       <% @excellent_courses.first(4).each do |course| %>
               <div class="por_course_bar fl clear">
-                <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title", :title => course.name %>
+                <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
                 <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), user_path(attach.author), :target => "_blank", :class => "fl" %>
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
                 <a class=" por_course_time"><%= time_from_now course.updated_at %></a>
@@ -145,7 +145,7 @@
                     <% org_subfield_id = params[:org_subfield_id] %>
                     <% iamge_path = get_image_path_from_content(document.content) %>
                     <div class="por_course_bar fl clear">
-                      <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_course_title", :title => document.title %>
+                      <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_course_title link-black", :title => document.title %>
                       <% if iamge_path.nil? %>
                           <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
@@ -162,7 +162,7 @@
                         <% iamge_path = get_image_path_from_content(content) %>
                         <% if message.board.org_subfield_id %>
                             <div class="por_course_bar fl clear">
-                              <%= link_to title, board_message_url_in_org(message.board.id, message.id), :target => '_blank', :class => "por_course_title", :title => title %>
+                              <%= link_to title, board_message_url_in_org(message.board.id, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
                                   <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
@@ -173,7 +173,7 @@
                             </div>
                         <% else %>
                             <div class="por_course_bar fl clear">
-                              <%= link_to title, board_message_path(message.board, message.id), :target => '_blank', :class => "por_course_title", :title => title %>
+                              <%= link_to title, board_message_path(message.board, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
                                   <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
@@ -188,7 +188,7 @@
                         <% news = activity.org_act %>
                         <% iamge_path = get_image_path_from_content(news.description) %>
                         <div class="por_course_bar fl clear">
-                          <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_course_title", :title => news.title %>
+                          <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_course_title link-black", :title => news.title %>
                           <% if iamge_path.nil? %>
                               <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% else %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index cdc4f62f3..16340b4ba 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -16,7 +16,7 @@
               <% else %>
                   <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
               <% end %>
-              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title", :title => document.title %>
+              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title link-black", :title => document.title %>
               <p class="mt5 mb5">
                 <span class="por_time mr10"><%= time_from_now(document.created_at) %> </span>
                 <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
@@ -34,7 +34,7 @@
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% end %>
-                      <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title", :title => title %>
+                      <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title link-black", :title => title %>
                       <p class="mt5 mb5">
                         <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                         <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
@@ -46,7 +46,7 @@
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% end %>
-                      <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title", :title => title %>
+                      <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title link-black", :title => title %>
                       <p class="mt5 mb5">
                         <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
                         <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
@@ -62,7 +62,7 @@
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% end %>
-                  <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title", :title => news.title %>
+                  <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title link-black", :title => news.title %>
                   <p class="mt5 mb5">
                     <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
                     <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
@@ -76,7 +76,7 @@
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                       <% document = activity.org_act %>
                       <ul class="por_post_list">
-                        <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                        <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                       </ul>
                   <% else activity.container_type == 'OrgSubfield' %>
                       <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
@@ -84,17 +84,17 @@
                           <% if message.board.org_subfield_id %>
                               <ul class="por_post_list">
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                                 <% else %>
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                                 <% end %>
                               </ul>
                           <% else %>
                               <ul class="por_post_list">
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                                 <% else %>
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w390', :target => "_blank" %></li>
+                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                                 <% end %>
                               </ul>
                           <% end %>
@@ -103,7 +103,7 @@
                           <% news = News.find(activity.org_act_id) %>
                           <% iamge_path = get_image_path_from_content(news.description) %>
                           <ul class="por_post_list">
-                            <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w390', :target => "_blank" %></li>
+                            <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
                           </ul>
                       <% end %>
                   <% end %>
@@ -117,28 +117,28 @@
               <% acts[6..19].each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                       <% document = activity.org_act %>
-                      <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                      <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                   <% else activity.container_type == 'OrgSubfield' %>
                       <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
                           <% message = Message.find(activity.org_act_id) %>
                           <% if message.board.org_subfield_id %>
                               <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                               <% else %>
-                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270', :target => "_blank" %></li>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                               <% end %>
                           <% else %>
                               <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w270', :target => "_blank" %></li>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                               <% else %>
-                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w270', :target => "_blank" %></li>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                               <% end %>
                           <% end %>
                       <% end %>
                       <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
                           <% news = News.find(activity.org_act_id) %>
                           <% iamge_path = get_image_path_from_content(news.description) %>
-                          <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w270', :target => "_blank" %></li>
+                          <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                       <% end %>
                   <% end %>
               <% end %>
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 7bb2cbf93..27b434ecb 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -5,7 +5,7 @@
   <% else %>
       <% container = cotainers.first %>
       <li class="por_project_li">
-        <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+        <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
         <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
         <div class="cl"></div>
         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
@@ -13,7 +13,7 @@
 
       <% cotainers[1..4].each do |container| %>
           <li>
-            <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+            <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
             <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
             <div class="cl"></div>
           </li>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index 34612a8ee..d91c63cbe 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -8,7 +8,7 @@
                 <%= link_to image_tag(url_to_avatar(attach.author),:width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(attach.author), :target => "_blank", :class => "fl" %>
                 <!--<a href="javascript:void(0);" target="_blank" class="fl"><img src="/images/org_custom/homepageImage.jpg" width="43" height="43" alt="" class="por_teachers_img fl mr15"/></a>-->
                 <div class="por_teachers_txt fl mt5">
-                  <%= link_to attach.author, user_path(attach.author), :class => " por_teachers_name fl", :target => "_blank"  %>
+                  <%= link_to attach.author, user_path(attach.author), :class => " por_teachers_name link-black fl", :target => "_blank"  %>
                   <p class="por_teachers_p fr">
                     <%= link_to truncate(attach.filename,length: 20, omission: '...'),
                              download_named_attachment_path(attach.id, attach.filename),
@@ -45,7 +45,7 @@
               <li >
                 <%= link_to image_tag(url_to_avatar(teacher), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(teacher), :alt => "用户头像", :target => '_blank', :class => "fl" %>
                 <div class="por_teachers_txt fl mt5">
-                  <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "por_teachers_name fl", :target => '_blank' %>
+                  <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "por_teachers_name link-black fl", :target => '_blank' %>
                   <p class="por_teachers_p fr" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></p>
                   <div class="cl"></div>
                   <p class="por_teachers_span ">
@@ -71,7 +71,7 @@
               <li >
                 <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
                 <div class="por_teachers_txt fl mt5">
-                  <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name fl", :target => '_blank' %>
+                  <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %>
                   <p class="por_teachers_p fr" title="<%= student.my_workplace %>"><%= student.my_workplace %></p>
                   <div class="cl"></div>
                   <p class="por_teachers_span ">

From 432baebdc39d6e55016961a1d0d4c2b01b756ee1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 09:38:24 +0800
Subject: [PATCH 273/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=BB=98=E8=AE=A4act?=
 =?UTF-8?q?ivite=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 159648f34..d38c68c2a 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -25,6 +25,8 @@ class OrgSubfieldsController < ApplicationController
   # status类型说明，详见SubField
   def update_status_by_type subfield, type
     case type
+      when "activity"
+        subfield.update_attribute(:status, 0)
       when "Resource"
         subfield.update_attribute(:status, 6)
       when "Comptec"

From 3c6c617d09a8ac7cfb587ad93c62098ac7ec05f1 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 3 Jun 2016 10:08:54 +0800
Subject: [PATCH 274/668] =?UTF-8?q?=E9=97=A8=E6=88=B7=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_link_subfield_more.html.erb              |  6 ++---
 .../organizations/_org_custom_left1.html.erb  | 24 +++++++++----------
 .../organizations/_org_custom_left2.html.erb  | 24 +++++++++----------
 .../organizations/_org_custom_left3.html.erb  |  8 +++----
 .../organizations/_org_custom_right1.html.erb |  2 +-
 .../organizations/_org_custom_right3.html.erb |  4 ++--
 public/stylesheets/org_custom.css             |  2 +-
 public/stylesheets/public.css                 |  1 +
 8 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/views/organizations/_link_subfield_more.html.erb b/app/views/organizations/_link_subfield_more.html.erb
index 59c12f1a1..0bf6cb530 100644
--- a/app/views/organizations/_link_subfield_more.html.erb
+++ b/app/views/organizations/_link_subfield_more.html.erb
@@ -1,9 +1,9 @@
 <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
     <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
-        <%= link_to "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "por_more_index fr" , :target => "_blank"  %>
+        <%= link_to "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "f12 fontGrey2 fr" , :target => "_blank"  %>
     <% else %>
-        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "por_more_index fr" , :target => "_blank"  %>
+        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "f12 fontGrey2 fr" , :target => "_blank"  %>
     <% end %>
 <% else %>
-    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "por_more_index fr" , :target => "_blank"  %>
+    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "f12 fontGrey2 fr" , :target => "_blank"  %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index f104a8450..627f2f9f7 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -14,7 +14,7 @@
                     <li>
                       <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
-                        <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+                        <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                     </li>
@@ -27,7 +27,7 @@
                             <li>
                               <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
                               <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                             </li>
@@ -35,7 +35,7 @@
                             <li>
                               <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                                <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
                               <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                             </li>
@@ -46,7 +46,7 @@
                         <li>
                           <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
-                            <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                            <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                           </p>
                           <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                         </li>
@@ -62,7 +62,7 @@
                 <li>
                   <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                   <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
-                    <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+                    <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
                   </p>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                 </li>
@@ -75,7 +75,7 @@
                         <li>
                           <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                           </p>
                           <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                         </li>
@@ -83,7 +83,7 @@
                         <li>
                           <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                           </p>
                           <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                         </li>
@@ -94,7 +94,7 @@
                     <li>
                       <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
-                        <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                        <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
                     </li>
@@ -115,7 +115,7 @@
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
                 <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => document.title %>
-                <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %></p>
+                <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
               </div>
           <% else activity.container_type == 'OrgSubfield' %>
@@ -131,7 +131,7 @@
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
                         <% end %>
                         <%= link_to title, board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
                   <% else %>
@@ -142,7 +142,7 @@
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
                         <% end %>
                         <%= link_to title, board_message_path(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %></p>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
                   <% end %>
@@ -157,7 +157,7 @@
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
                     <%= link_to news.title, news_path(news), :class => 'por_hot_title link-black_r', :target => "_blank", :title => news.title %>
-                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %></p>
+                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                     <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                   </div>
               <% end %>
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index b4ab0e2a4..82e923147 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -18,7 +18,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now(activity.updated_at) %></a>
+                      <span class=" por_course_time"><%= time_from_now(activity.updated_at) %></span>
                     </div>
                 <% elsif act.org_act_type == "Message" %>
                     <% activity = act.org_act %>
@@ -31,7 +31,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
+                      <span class=" por_course_time"><%= time_from_now activity.updated_on %></span>
                     </div>
                 <% elsif act.org_act_type == "News" %>
                     <% activity = News.find(act.org_act_id) %>
@@ -44,7 +44,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now activity.created_on %></a>
+                      <span class=" por_course_time"><%= time_from_now activity.created_on %></span>
                     </div>
                 <% elsif act.org_act_type == "Poll" %>
                     <% activity = act.org_act %>
@@ -64,7 +64,7 @@
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% end %>
                           <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.polls_description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                          <a class=" por_course_time"><%= time_from_now activity.published_at %></a>
+                          <span class=" por_course_time"><%= time_from_now activity.published_at %></span>
                         </div>
                     <% end %>
                 <% end %>
@@ -87,7 +87,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
+                      <span class=" por_course_time"><%= time_from_now activity.updated_on %></span>
                     </div>
                 <% elsif act.org_act_type == "Message" %>
                     <% activity = act.org_act %>
@@ -101,7 +101,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now activity.updated_on %></a>
+                      <span class=" por_course_time"><%= time_from_now activity.updated_on %></span>
                     </div>
                 <% elsif act.org_act_type == "News" %>
                     <% activity = act.org_act %>
@@ -114,7 +114,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now activity.created_on %></a>
+                      <span class=" por_course_time"><%= time_from_now activity.created_on %></span>
                     </div>
                 <% end %>
             <% end %>
@@ -125,7 +125,7 @@
                 <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
                 <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), user_path(attach.author), :target => "_blank", :class => "fl" %>
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                <a class=" por_course_time"><%= time_from_now course.updated_at %></a>
+                <span class=" por_course_time"><%= time_from_now course.updated_at %></span>
               </div>
       <% end %>
     <% end %>
@@ -152,7 +152,7 @@
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                      <a class=" por_course_time"><%= time_from_now document.created_at %></a>
+                      <span class=" por_course_time"><%= time_from_now document.created_at %></span>
                     </div>
                 <% else activity.container_type == 'OrgSubfield' %>
                     <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where(:id => activity.org_act_id).count > 0 %>
@@ -169,7 +169,7 @@
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
                               <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                              <a class=" por_course_time"><%= time_from_now  message.created_on %></a>
+                              <span class=" por_course_time"><%= time_from_now  message.created_on %></span>
                             </div>
                         <% else %>
                             <div class="por_course_bar fl clear">
@@ -180,7 +180,7 @@
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
                               <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                              <a class=" por_course_time"><%= time_from_now  message.created_on %></a>
+                              <span class=" por_course_time"><%= time_from_now  message.created_on %></span>
                             </div>
                         <% end %>
                     <% end %>
@@ -195,7 +195,7 @@
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% end %>
                           <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                          <a class=" por_course_time"><%= time_from_now  news.created_on %></a>
+                          <span class=" por_course_time"><%= time_from_now  news.created_on %></span>
                         </div>
                     <% end %>
                 <% end %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 16340b4ba..ed6cd5ed9 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -19,7 +19,7 @@
               <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_post_title link-black", :title => document.title %>
               <p class="mt5 mb5">
                 <span class="por_time mr10"><%= time_from_now(document.created_at) %> </span>
-                <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name", :target => "_blank" %>
+                <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
               </p>
               <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => acts.first.org_act.id, :content=> acts.first.org_act.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
           <% else activity.container_type == 'OrgSubfield' %>
@@ -37,7 +37,7 @@
                       <%= link_to title, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "por_post_title link-black", :title => title %>
                       <p class="mt5 mb5">
                         <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
-                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                   <% else %>
@@ -49,7 +49,7 @@
                       <%= link_to title, board_message_path(message.board, message), :target => '_blank', :class => "por_post_title link-black", :title => title %>
                       <p class="mt5 mb5">
                         <span class="por_time mr10"><%= time_from_now(message.created_on) %> </span>
-                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name", :target => "_blank" %>
+                        <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                   <% end %>
@@ -65,7 +65,7 @@
                   <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_post_title link-black", :title => news.title %>
                   <p class="mt5 mb5">
                     <span class="por_time mr10"><%= time_from_now(news.created_on) %> </span>
-                    <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name", :target => "_blank" %>
+                    <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                   </p>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
               <% end %>
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index 882c994cc..bd7c8b89e 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -12,7 +12,7 @@
               <%= link_to image_tag(url_to_avatar(user),:width => "43", :height => "43", :class => "por_users_img"), user_path(user), :target => "_blank", :class => "fl" %>
               <div class="por_news_txt fl">
                 <p class="por_news_p fl">
-                  <%= link_to user.show_name, user_path(user), :class => "por_hot_name fl", :target => "_blank" %>
+                  <%= link_to user.show_name, user_path(user), :class => "por_hot_name link-blue fl", :target => "_blank" %>
                   <span class="fl">&nbsp;:&nbsp;</span>
                   <% if obj.act_type = "Message" %>
                       <%= link_to title, board_message_path(obj.act.board.id, obj.act.id) %>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index d91c63cbe..afb901282 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -1,6 +1,6 @@
 <% if field.field_type == "Resource" %>
     <div class="por_teachers" style="display:<%= field.hide == 0 ? 'block' : 'none' %>;">
-      <h2 class="por_h2_index clear"><%= field.name %><%= link_to "更多>", org_subfield_files_path(field), :target => "_blank", :class => "por_more_index fr" %></h2>
+      <h2 class="por_h2_index clear"><%= field.name %><%= link_to "更多>", org_subfield_files_path(field), :target => "_blank", :class => "f12 fontGrey2 fr" %></h2>
       <div>
         <ul class="por_teachers_li">
           <% get_attach_org2(field).each do |attach| %>
@@ -36,7 +36,7 @@
         <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
           <a href="javascript:void(0);" class="por_teachers_type">学生英雄榜</a>
         </li>
-        <!--<a href="javascript:void(0);" target="_blank" class="por_more_index fr mt5">更多></a>-->
+        <!--<a href="javascript:void(0);" target="_blank" class="f12 fontGrey2 fr mt5">更多></a>-->
         <div class="cl"></div>
       </ul>
       <div id="por_teachers_content_1">
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 8daba2718..0bdc8a670 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -38,7 +38,7 @@ a.por_hot_name{color:#3b94d6;}
 a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_course_bar img{ width:140px; height:100px; }
 .por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
-a.por_course_time{color:#3b94d6; margin-left:5px;}
+.por_course_time{color:#3b94d6; margin-left:5px;}
 .por_post{ border-bottom:1px solid #e8e5e5; padding-bottom:5px;}
 .por_post_left{ width:394px; margin-top:15px;}
 .por_post_leftbar img{ width:377px; height:163px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 9c5761079..beefe3abd 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -274,6 +274,7 @@ a.linkGrey7 {color:#888888;}
 a.linkGrey7:hover {color:#269ac9;}
 a.link-black {color:#000;}
 a.link-black:hover {color:#3b94d6;}
+a.link-blue {color:#3b94d6;}
 a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}

From ca3b072f855880ebd98a7f886396c6db5814b587 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 10:31:29 +0800
Subject: [PATCH 275/668] =?UTF-8?q?=E7=83=AD=E9=97=A8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb     |  5 ++++-
 app/helpers/application_helper.rb               |  3 ++-
 app/helpers/organizations_helper.rb             | 16 ----------------
 app/views/organizations/_subfield_list.html.erb |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 66e3d6e05..671ebb702 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -93,7 +93,10 @@ class OrganizationsController < ApplicationController
         end
         # 热门项目
         if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
-          @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true)
+          # @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true).order("project_score")
+          @excellent_projects = Project.find_by_sql("SELECT p.* FROM `projects` p, project_scores ps where p.id = ps.project_id and  p.is_public =1 and
+                                                 status =1 and hot =1 order by (ps.issue_num * 4 + ps.issue_journal_num + ps.changeset_num * 4 + ps.board_num * 2 +
+                                                 ps.board_message_num + ps.news_num + ps.attach_num * 5) desc limit 5;")
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 42a033bee..3aa7d8a4a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3103,9 +3103,10 @@ def named_attachment_url_without_domain(id, filename, option={})
   attachment_id = (Attachment === id ? id.id : id)
   Setting.protocol + "://" + Setting.host_name + "/attachments/" + attachment_id.to_s + "/" + filename
 end
+
 #判断是否为默认的组织栏目
 def is_default_field? field
-  (field.name == 'activity' || field.name == 'course' || field.name == 'project' || field.name == "Comppro" || field.name == "Comppro" || field.name == "Compact") && field.field_type == 'default'
+  (field.name == 'activity' || field.name == 'course' || field.name == 'project' ) && field.field_type == 'default'
 end
 
 def host_with_protocol
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index a5a3d6aaa..fe27083a0 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -105,10 +105,6 @@ module OrganizationsHelper
   #排列下拉框
   def subfield_status_option
     type = []
-    option1 = []
-    option1 << "左一"
-    option1 << "1"
-    type << option1
     option2 = []
     option2 << "左二"
     option2 << "2"
@@ -117,18 +113,6 @@ module OrganizationsHelper
     option3 << "左三"
     option3 << "2"
     type << option3
-    option4 = []
-    option4 << "右一"
-    option4 << "3"
-    type << option4
-    option5 = []
-    option5 << "右二"
-    option5 << "5"
-    type << option5
-    option6 = []
-    option6 << "右三"
-    option6 << "6"
-    type << option6
     type
   end
 
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 9307f3eb0..fd648cc29 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -57,7 +57,7 @@
           </li>
           <li class="orgListStatus">新增</li>
           <li class="orgListStatusList">
-            <% if field.field_type == "Resource" || field.field_type == "Comptec" %>
+            <% if field.field_type == "Resource" || field.field_type == "Comptec" || field.field_type == "Comppro" || field.field_type == "Compcou" || field.field_type == "Compact" || field.field_type == "Compstu" %>
                 默认
             <% else %>
                 <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>

From a0f722837b06d929f0c72a41c78065d08e63ea29 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 10:47:57 +0800
Subject: [PATCH 276/668] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=B0=E5=B7=A6=E6=A8=A1=E5=BC=8F=E4=BA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left2.html.erb  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 82e923147..3e4651d8c 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -71,7 +71,7 @@
             <% end %>
         <% end %>
     <% when 'project' %>
-        <h2 class="h2-title">项目动态</h2>
+        <h2 class="por_h2_index clear">项目动态</h2>
         <% if @project_acts.blank? %>
             <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>
@@ -119,24 +119,15 @@
                 <% end %>
             <% end %>
         <% end %>
-    <% when 'Compcou' %>
-      <% @excellent_courses.first(4).each do |course| %>
-              <div class="por_course_bar fl clear">
-                <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
-                <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), user_path(attach.author), :target => "_blank", :class => "fl" %>
-                <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                <span class=" por_course_time"><%= time_from_now course.updated_at %></span>
-              </div>
-      <% end %>
     <% end %>
 <% else %>
     <% if field.field_type == "Post" %>
         <% org_acts = get_subfield_acts field %>
         <% if org_acts.blank? %>
-            <h2 class="h2-title"><%= field.name %></h2>
+            <h2 class="por_h2_index clear"><%= field.name %></h2>
             <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>
-            <h2 class="h2-title"><%= field.name %>
+            <h2 class="por_h2_index clear"><%= field.name %>
               <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
             </h2>
             <% org_acts.first(4).each do |activity| %>
@@ -201,6 +192,20 @@
                 <% end %>
             <% end %>
         <% end %>
+    <% elsif 'Compcou' %>
+        <h2 class="por_h2_index clear"><%= field.name %></h2>
+        <% if @excellent_courses.blank? %>
+            <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+        <% else %>
+            <% @excellent_courses.first(4).each do |course| %>
+                <div class="por_course_bar fl clear">
+                  <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
+                  <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), course_path(course), :target => "_blank", :class => "fl" %>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                  <span class=" por_course_time"><%= time_from_now course.updated_at %></span>
+                </div>
+            <% end %>
+        <% end %>
     <% end %>
 <% end %>
 <div class="cl"></div>

From 3af115ee54620125ea8b0d2d24101d4652418e8b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 12:42:02 +0800
Subject: [PATCH 277/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=8F=8A=E6=96=B9=E6=B3=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb         |  2 --
 app/helpers/organizations_helper.rb                 | 13 +++++++++++++
 app/models/organization.rb                          |  6 +++---
 app/views/layouts/base_org_custom.html.erb          |  2 +-
 app/views/organizations/_org_custom_right1.html.erb | 11 ++++++-----
 app/views/organizations/_subfield_list.html.erb     |  2 +-
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index d38c68c2a..159648f34 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -25,8 +25,6 @@ class OrgSubfieldsController < ApplicationController
   # status类型说明，详见SubField
   def update_status_by_type subfield, type
     case type
-      when "activity"
-        subfield.update_attribute(:status, 0)
       when "Resource"
         subfield.update_attribute(:status, 6)
       when "Comptec"
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index fe27083a0..aaaf05d21 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -102,6 +102,19 @@ module OrganizationsHelper
     end
   end
 
+  def org_time_by_type obj
+    case obj.act_type
+      when "Message"
+        time = obj.act.updated_on
+      when "News"
+        user = obj.act.created_on
+      when "HomeworkCommon"
+        user = obj.act.updated_at
+      when "Issue"
+        user = obj.act.updated_on
+    end
+  end
+
   #排列下拉框
   def subfield_status_option
     type = []
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 7aa259528..50f62ea11 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -18,9 +18,9 @@ class Organization < ActiveRecord::Base
   end
 
   def add_default_subfields
-    OrgSubfield.create(:organization_id => self.id, :name => 'activity', :field_type => 'default', :priority => 1)
-    OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default', :priority => 2)
-    OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default', :priority => 3)
+    OrgSubfield.create(:organization_id => self.id, :name => 'activity', :field_type => 'default', :priority => 1, :status => 0)
+    OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default', :priority => 2, :status => 2)
+    OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default', :priority => 3, :status => 2)
   end
 
   def switch_type
diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb
index 0eb764e5e..bfa76a221 100644
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -9,7 +9,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'org_custom', 'new_user', 'public','jquery/jquery-ui-1.9.2' %>
+  <%= stylesheet_link_tag  'new_user', 'public', 'org_custom','jquery/jquery-ui-1.9.2' %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index bd7c8b89e..192c7bb64 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -8,23 +8,24 @@
             <% user = org_user_by_type(obj) %>
             <% title = org_title_by_type(obj) %>
             <% content = org_content_by_type(obj) %>
+            <% time = org_time_by_type(obj) %>
             <li>
               <%= link_to image_tag(url_to_avatar(user),:width => "43", :height => "43", :class => "por_users_img"), user_path(user), :target => "_blank", :class => "fl" %>
               <div class="por_news_txt fl">
                 <p class="por_news_p fl">
                   <%= link_to user.show_name, user_path(user), :class => "por_hot_name link-blue fl", :target => "_blank" %>
                   <span class="fl">&nbsp;:&nbsp;</span>
-                  <% if obj.act_type = "Message" %>
+                  <% if obj.act_type == "Message" %>
                       <%= link_to title, board_message_path(obj.act.board.id, obj.act.id) %>
-                  <% elsif obj.act_type = "News" %>
+                  <% elsif obj.act_type == "News" %>
                       <%= link_to title, news_path(obj.act.id) %>
-                  <% elsif obj.act_type = "HomeworkCommon" %>
+                  <% elsif obj.act_type == "HomeworkCommon" %>
                       <%= link_to title, student_work_index_url_in_org(obj.act.id) %>
-                  <% elsif obj.act_type = "Issue" %>
+                  <% elsif obj.act_type == "Issue" %>
                       <%= link_to title, issue_path(obj.act.id) %>
                   <% end %>
                 </p>
-                <p><span class="por_time fl"><%= time_from_now(obj.act.created_on) %> </span>
+                <p><span class="por_time fl"><%= time_from_now(time) %> </span>
                   <!--<a href="javascript:void(0);" target="_blank" class="por_zan fr">50</a>-->
                 </p>
               </div>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index fd648cc29..684a917a1 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -23,7 +23,7 @@
           <li class="orgListUser" title="<%= name %>"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
-            <% if field.name == "activity" %>
+            <% if field.name == "activity" || field.name == "course" || field.name == "project" %>
                 默认
             <% else %>
                 <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>

From 5ec9e31626ab95730e15694e9c33faafed6a9fbb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 13:10:03 +0800
Subject: [PATCH 278/668] =?UTF-8?q?=E7=B2=BE=E5=93=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=95=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 671ebb702..3cbfc8466 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -89,14 +89,14 @@ class OrganizationsController < ApplicationController
         @course_acts = get_course_activities_org @organization, course_ids
         # 精品课程, 不符合条件的组织则不查询
         if @organization.org_subfields.where(:field_type => "Compcou", :hide => 0).count > 0
-          @excellent_courses = Course.where(:is_public => true, :is_delete => false, :is_excellent => true)
+          @excellent_courses = Course.find_by_sql("select c.*, (select count(*) from course_activities where course_activities.course_id = c.id) as course_count
+                                   from courses c where c.is_delete =0 and c.is_public =1 and is_excellent =1 order by course_count desc limit 5;")
         end
         # 热门项目
         if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
           # @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true).order("project_score")
-          @excellent_projects = Project.find_by_sql("SELECT p.* FROM `projects` p, project_scores ps where p.id = ps.project_id and  p.is_public =1 and
-                                                 status =1 and hot =1 order by (ps.issue_num * 4 + ps.issue_journal_num + ps.changeset_num * 4 + ps.board_num * 2 +
-                                                 ps.board_message_num + ps.news_num + ps.attach_num * 5) desc limit 5;")
+          @excellent_projects = Project.find_by_sql("select p.*, (select count(*) from forge_activities where forge_activities.project_id = p.id) as project_count
+                                   from projects p where p.status =1 and p.is_public =1 and hot =1 order by project_count desc limit 5;")
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
@@ -236,9 +236,11 @@ class OrganizationsController < ApplicationController
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comppro").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type.nil?
-      @containers = Project.find_by_sql("SELECT * FROM `projects` where status = 1 and is_public = 1 and name like '%#{q}%' order by updated_on desc;")
+      @containers = Project.find_by_sql("select p.*, (select count(*) from forge_activities where forge_activities.project_id = p.id) as project_count
+                                   from projects p where p.status =1 and p.is_public =1 and name like '%#{q}%' order by project_count desc;")
     elsif @type == "famous"
-      @containers = Project.find_by_sql("SELECT * FROM `projects` where status =1 and is_public = 1 and hot = 1 and name like '%#{q}%' order by updated_on desc;")
+      @containers = Project.find_by_sql("select p.*, (select count(*) from forge_activities where forge_activities.project_id = p.id) as project_count
+                                   from projects p where p.status =1 and p.is_public =1 and hot =1 and name like '%#{q}%' order by project_count desc;")
     end
     atta_page_public @containers
   end
@@ -248,9 +250,11 @@ class OrganizationsController < ApplicationController
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type.nil?
-      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and name like '%#{q}%' order by updated_at desc;")
+      @containers = Course.find_by_sql("select c.*, (select count(*) from course_activities where course_activities.course_id = c.id) as course_count
+                                   from courses c where c.is_delete =0 and c.is_public =1 and name like '%#{q}%' order by course_count desc;")
     elsif @type == "famous"
-      @containers = Course.find_by_sql("SELECT * FROM `courses` where is_delete = 0 and is_public = 1 and is_excellent = 1 and name like '%#{q}%' order by updated_at desc;")
+      @containers = Course.find_by_sql("select c.*, (select count(*) from course_activities where course_activities.course_id = c.id) as course_count
+                                   from courses c where c.is_delete =0 and c.is_public =1 and is_excellent = 1 and name like '%#{q}%' order by course_count desc;")
     end
     atta_page_public @containers
   end

From 7be18b80b4ad459f6272cb6b2e97c7ff8be75808 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 13:45:53 +0800
Subject: [PATCH 279/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_header.html.erb      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 6368fef90..cc6920f33 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -43,7 +43,17 @@
 
         <% else %>
             <% if field.field_type == "Post" && field.hide == 0 %>
-                <li><a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a></li>
+                <li>
+                  <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                      <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                          <%= link_to field.name, show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                      <% else %>
+                          <%= link_to field.name, show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                      <% end %>
+                  <% else %>
+                      <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                  <% end %>
+                </li>
                 <!--二级目录-->
                 <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                   <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
@@ -55,7 +65,7 @@
                 </div>
             <% elsif field.field_type == "Resource" && field.hide == 0 %>
                 <li class="nav-element">
-                  <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                  <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% end %>
         <% end %>

From 2d2e9c540a17c81e2dfe2bae5b6dc31d12e2636f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:14:50 +0800
Subject: [PATCH 280/668] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8F=8A=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left1.html.erb  |  33 +++++++++---------
 public/images/default_blank/mo-1.jpg          | Bin 0 -> 42943 bytes
 public/images/default_blank/mo-2.jpg          | Bin 0 -> 27704 bytes
 public/images/default_blank/mo-3.jpg          | Bin 0 -> 35319 bytes
 4 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 public/images/default_blank/mo-1.jpg
 create mode 100644 public/images/default_blank/mo-2.jpg
 create mode 100644 public/images/default_blank/mo-3.jpg

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 627f2f9f7..2d97fdbe2 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -7,8 +7,8 @@
         <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
       </h2>
       <ul class="por_hotbar_left fl">
-        <% if acts.count > 0 %>
-            <% acts.first(2).each do |activity| %>
+        <% if acts.count > 1 %>
+            <% acts[1..2].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <li>
@@ -55,8 +55,8 @@
             <% end %>
         <% end %>
 
-        <% if acts.count > 2 %>
-            <% activity = acts[2] %>
+        <% if acts.count > 3 %>
+            <% activity = acts[3] %>
             <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                 <% document = activity.org_act %>
                 <li>
@@ -104,13 +104,13 @@
 
       </ul>
 
-      <% if acts.count > 3 %>
-          <% activity = acts[3] %>
+      <%# if acts.count > 3 %>
+          <% activity = acts.first %>
           <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
               <% document = activity.org_act %>
               <div class="por_hotbar_right fl">
                 <% if get_image_path_from_content(document.content).nil? %>
-                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                    <%= link_to image_tag("/images/default_blank/mo-1.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
@@ -119,29 +119,30 @@
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
               </div>
           <% else activity.container_type == 'OrgSubfield' %>
+              <!--发送过来的帖子-->
               <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
                   <% message = activity.org_act %>
                   <% content = message.parent_id.nil? ? message.content : message.parent.content %>
                   <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                   <% if message.board.org_subfield_id %>
                       <div class="por_hotbar_right fl">
-                        <% if get_image_path_from_content(document.content).nil? %>
-                            <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                        <% if get_image_path_from_content(content).nil? %>
+                            <%= link_to image_tag("/images/default_blank/mo-1.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
+                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
                         <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
                   <% else %>
                       <div class="por_hotbar_right fl">
                         <% if get_image_path_from_content(document.content).nil? %>
-                            <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                            <%= link_to image_tag("/images/default_blank/mo-1.jpg", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(:id => message.id, :organization_id => message.organization.id), :target => "_blank" %>
+                            <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(:id => message.id, :organization_id => message.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
+                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
                         <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
@@ -152,7 +153,7 @@
                   <% path = get_image_path_from_content(news.description) %>
                   <div class="por_hotbar_right fl">
                     <% if path.nil? %>
-                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                        <%= link_to image_tag("/images/default_blank/mo-1.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
@@ -164,6 +165,6 @@
           <% end %>
       <% end %>
 
-  <% end %>
+  <%# end %>
   <div class="cl"></div>
 </div><!--por_hotbar end-->
\ No newline at end of file
diff --git a/public/images/default_blank/mo-1.jpg b/public/images/default_blank/mo-1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fb6152611904fa4bc07adb5374db2765459e3278
GIT binary patch
literal 42943
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

literal 0
HcmV?d00001

diff --git a/public/images/default_blank/mo-2.jpg b/public/images/default_blank/mo-2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9bd406d3097015a1c788b0bb498d3bfb7c2c9b80
GIT binary patch
literal 27704
zcmeHv2UJtd^XN_Jy(68_1nD*O-g~d22uXklB#?xzB8sS>prC*tAVm;q(h)@zR7Au=
zQxHU?h#&|EO6T1K+xPwI`Tx&5=biIdxcAP^&d$!xmfU1!XZy|eC@;5h1lkt>tgQh_
z005`~DhMk;20{?<4}kCh6eJh`d?38P;KLA!A2d*qMgaitfB<;mAc`cI9fU8OMg!zO
z>K1~}mjLa?aR3l!{`u5LVtr6BJAW(zi}%L{!wenaFbP*Q28j*F?*kO&72q23;J*?~
zUR^^;MMFgy0LZREe#>?Z`iuX$Yh=G*1lSfaQ9{Um&{F={4~W3;en9sA*$*h>Cl81$
z^cQdLu^o1R8TbS>vh&=2v;BeI&D_w?%g({p#N5glfPiK6W>#nn7Rn3&K^Owg!PEfe
z=I#NbdJgJ@2A~8K0Kgl854LtRaU$|GH#UUfK_VjjJALaXwF30WnAyQ#zw!SS#DWOM
z5kN8RKx!o<3J>Z65(mP8;e=o!ejbF`eFBIulsGo*I8Z<k<|4v=JFql~W(U?I!pI;D
z5~Lx@9E=P?65)p+d?qXu1;S)jARHftMumfLF9?eUh6bTQcm;&ngHYah03fF);t42(
zKM2c%Fg?!6!4QPCzzIk1_Xq6r2TVXkfN}zWAvQP?hxYR)z$6g+U<&H$YA`cYcp!>E
zkg@Yd1bE|+Fhgumus0?W0CxIJtOc+VbqfQP3|CNx!(|j@LG}Mi|F-ZK)xQUbW4lA~
z)t)qF5YA`6alh;S#$odTKy4Y+&4u4MpDO^+a0&pp27lv3uK@s4901h6_@h6Z#QEY+
zAOvg3$%Ti9%c4;TS)xLJrT<9qi}GIsf3zn{Z10!uU`8lk@6bR3jHpxuHV_+%gW-d{
z5h$3<-zV|^xZ)pT{UL|61IibLLt((CT)<g|#`uB5jX|ObXe<VX#{8=h{vTHRLk1$a
zGp|8_t#Auq_mTyeU$6sYv(Er>HadXJGY2ez{2Dha8W(`L@>~T!?#z1-2FpqJzuch7
zU>1r;`@x84LkA}qA`}-!guyjIyiowO029CtaD%(52p|E-0E&Prpb6*!#()K23pfGp
zz(D{3_ya)z4hRR10I@(kkO*7=E(4iBE>H-R02M$r&;Z;89srMlPH^|_1KtAffeBy+
zm<PTA>ktTp3c>(kgK$FxAz~0Ih$2J{q60C8SV0^h?vO(eKL`dA3ONEf2}y*cKr$hD
zkP=80<Tm61qyzE_G5{Hce1a@O)}UlidMG=TAG#MR2UUaWLoK0B&;w9EXb3b48V5~+
zW<c|yWzc%)1866-5BeTD16>9;W;!xXG9fY<GBq+oGFvhaGG8(r*)g&NvNW=MvI?>$
zvUai_viD@4$yUiJ$=S$Z<TB)%<Ywf~<OuQ*@?+%Z$TP`rkk^wxB<~>~C7&nXqF|ul
zqmZJ|pfIO!qwu2$r--LWqbQ=Nqj*HoM=?S1jgpd*lTw^gmC}sTo$@ecH03$UY|2W?
z`;@OJ$0(PnsHnK9q^Pv1Y^l7d2vqS@SE$OUTBy3ICa6}Z>8J&%6{$_AJ*Y9%C#ch?
zZ&Kf*?xy}oy-veSBSxb^V@rdiiKI!UDWqwlc|kKlvrfxGD^9CT>qL8)HkLMnwu1H%
z?GWu(IyyRGI(0gGIyBvJx(vEobWi9;=~n4k=_Tn6={@N~>67S->F?7I(0^rMVA#u`
z$Kb(0U`S#pVQ6D`$FRc4#wg2Z&WL1;Va#HzXY6L2W1?XaW720j$P~qt##F=fg6T6e
z4f9@RLuPO0W6W91x0zovFSD?*D6rVF1hJfBxyjPOGQ~>8x|h|M70DXMTEN=II>tuE
zCc<XOhG09%R><~<ZGxSWU7X#V{V;nXdpY}a_IVCg4rLA(jtGt{j%JScoMfDPIn6l(
zIg>f7Ir}-+_VDk~--Ft7c2C8g?mgeRc)9erP+SRIm0W#XYuqqyW9|U%i`)&|!#w0X
zl05c2;XFA!k9a=wvh!;4B6t&ct9b|cpnQ^i4t&vk1$@u=miYzvP5FcQukg3=e-_{r
z&=WW;a7o~vz$ZaAK^;M~;3dHp!D$!=Odl2q%YZ$E%?t4fnF)mo<q16(S{D`<b{0M%
zTq!&(LMx&s;wy4Vq*Y{IR8Z7f^oVGw=%5&ln3|ZsSh`rd*!R8SdtLXQ-rKNuN}NmF
zTs%s=RD4K+K|)s|L?U0JcOT_GwS58mviH4|gi5MN`b%a>zL0`S!KKhr*;22hDWuh<
zG1B?cuVv_E^ku?iN@Yf6Ic2S6PsldN&dG_&dB|OqYnR)SSCJ2tFO+|)z^Y)Oa6+L;
zVNp?15uuo+*sH{#WTF(K)Tp$eETxQ6&QX4&!lq)aa$2QTWfQIn$H6P$pHxLv52;>N
zeXYi>W~X*e?TI>tx`BF(`d#%^4Y&qDqgvyOri^BQ=1t8hEpaWBR-x9Iwy?IhcAoZo
z9hlA`oohPpb%k`jb@O#U=!xhd^@{X9>hIG(tY4--XCQBYGpIB8Zm3~+)bPF$nUSec
zg3)thR%2)5OyhSZ!X|zur6%*HDyGq<_suBGEX^*Oy*B4JN0^tG&s(Tk9JP38NpI<B
znQ8gKO415v)npB|wy;jM9<mX$!Pqp|0=DM1skXy*;&vf+ckC(c?d-GcCmj?VjySYC
zvN?J=-gNxtWZ;zS^wwFzIn=q;g~`R!rNrgCtC4Gp>w7mjx1(;I?mX^j_eKvY4;POj
zkLCTw`!DaG@Ko`P_v}9)ejwsN$3dQhfd`wtn7q8bY7S8xay@kO(1y3IcfR+skGaoP
zpLv8KA{{Y<)I(lEenM%ZQcxd#wS7~3r~I`2QvE*p>-wkpe?}XkGtmo&%?{@t{vKc(
zP#mxw=o(lVL>+V}=r)EG6M%V$6~IPdUj<7A#|OU;(FnO5GLN&w72zTH1NcS)JNPp7
zEL0-&ROo1!PFPmhO1MjSO$18>CgNG7WaQb%k5ML3*Q3d!5z(zjgpR}>89l0hH18PX
zn9s4+7?GH`n2F=2$8W^a#s<W8osd6~a$@PE>&d1#{<!0DW2a0{mBus1<KkbR);yhi
zhWrfr%=5EKXRn;yN<bz&O_WbeOWZhzIQR6t!ugEz+eyAj&y(TFITt7|U@r7u)V+8k
zg(W2_Wh~V?wf++9Qo^OB%U+i|(v;J3(`nN~)8A)UWi(z9y>j8oMy7veUzR~u<yF3`
zXRm(GMrL>C=;c)8^5-Vzu3bZ4dy{9HSD(K(KdpeWAgo}r(50~by4v-UBA%keqRnDV
z@%tMNHy)O#mXzG&yO~@HEe$RGROVUsvfQY=u|lRIuadJe@fL6^^wxCMp{o9B%j(t|
zwVH}rvD&M3Y;_6skow5_`3C=n_l@q2uWno1Zf(+Rs=Fh5r}(bW-K=Jg=Hz>{_u}qt
zw?wrp-w(e3`GMbqu~x6vw{321y$|glK7VBS=*eS~$8GKU?JZBVpWN-x=(zn<?P)_N
zytDq9%CovIm9Dzy@aOd}R9`f{RDap@O6%3VZr$z&Jw`o`d(C@0`)vAN^*i^!dF}c7
z{Tt+)se!<Og~71F^|!}|D25V-nTONf@x99***8-89{#?0)M)hC2geU@#}H#P<M{E7
ziMUCI$+VAxA4{ebr|y0-`Sfyn|MbL6@XY$>_*s_Ot8)@_wO{nUJezl$pIE>xY%iYs
z%Kf!?NqMPt*>3sWx1ew9-xF52S8lATt+ubZu6<k&-=Nya*xa|-v}L(9v>mj)y*&%i
zlfD~y8CnC7?Kyyvlmn2*!8ZfQ_FEthpr@v$rlF>%p`mA?qorfvV4|mI;^1Oq<6vXs
zVxcFcACH~P-|r9xIyweM24+S^W_CtKMt0(jk$tBM%YVaQ`#!)z4ZeV!BZCM7P!<Ro
z3uJp3e0QPQehAS8rKA8~FTex}OiW||1WHapNkvUVO9y_f{A(cufRg<zWCkGQ5Hct^
zl!A(qnu3g82`pqGBNt*-pwPGXW)lvHRitFUm{(;WBFf?Lz(+|LcjA>Hl~{`7{OAG#
zufmyMeR8i+suR+<wSWNM)9w5LwOA9^))PAR)kOSK;i=lo4|~U#uGc;4n^<=74U11J
zs(;)+`AyZ-)i3;XdT~Sh>yO`A04NlcmYgIL6(xlVNdzGUR&r2+5Mee7#n_ANL<t@^
zyqZ@M^%=#TNHKKeK;V@Z#3+dZQ0-M|?FNM?*n>27h7(X9eu?m}B@q8D!uB9QPey8!
z1<(cV9JIbTcPY%XTSZFe?ll6eq(zf6g`$XN^zNOF$Lpz9uFxsUx*@Sonl%Z98aXh`
z)Gf$R)%|_1`a))PTEAF5S*DJE!p2iHZ}yqC@%T^=viiZtuhvbkp6FgSPfz4+YEWr=
z$l;|kSM=16;aSkNDe58W`M3E%fT{88qRb*rw<8wKCmlcMjaOBsE*-q>xSU#!Kws&}
zI>gtM?{RGGw%g;i<?gK6j++~Z5qvmgvq(HROo~3~p$5NYk>i@KYax6AQU7M`4CcYs
zh1u`wj+N7XeWMo?_b~>X?#^$UR%p8u=04|2)qgB2-5#^YzPw&QHA7?_KI_VTVO>(7
zRH`HSg?I87(*(m{7j^e+IWmTv3UTZ9;IrS;<+p*4cR0iLc%pjO%J1L2c)RQT!%en^
z>~fD`BX7_4sJW-t%e@6s&80<W=9V^}d&a-Zb$n8BIw(0`fAUy*V_tiYiykD3YV#1D
z@=~vktkYuCd~^Jr!+CAb%?0~lWd%nOQ;03SxX-1U3g=cXnf56&`yCIE%}WYReRfBG
z<FZ$gx3Bg$kG0SAy2g(xPR_f!=d1+=B}Y@Esn9%JD-{>hU-f1kbWzDIh*t3zHy9Rp
zu<5jZF_~t+p5+;;oMRlbm=ApYD_5MGHIE*+ll-nJ)jY74VYHQ6E8xS8V_lWK%dpvu
zfwC8Kb5`#c4z$1D2DV=o_s5_S4otQs_3DG>y|pW|&LQ(rT^Y-bcU=Qwmxo2w+Z!4w
zy6+v)k-RfoUZi<#ucM8W2K-Rix+25#*?R|dyOw$Sv^p0TN)eT<>jw~nUP&L?k84Iz
z^_3hxU7IcBk)QB+;>o#`vsJ}uXD%Ux95}TO`rd2q@igP+9BqE=`7ECE>^5+&pbxuA
zPXD~-ykp(digx_%$|2pU^>j40?-^g_Hem5sCz_el)PC)J_ks+nyiC0!yYI~Fb=#mM
zzi+JERL+n$Z#x@i9N)wk2c@-7)}3nG2FM5Nn&4rku6O&gdg{k!MLoX-iGJgwyy0hm
zz_6#i{po!MjTZj0T9$=OIVUuRZ7wV7O3{NQ<64jQ81xI-p}6y(<vM~Fl)sE`+J90#
zOTRP}LpY_s4LIVeo^R0K*{5BfuDVrt^NMN<cNcnEFd%S_qsKmEb@2OZN8Q=pkp_*D
z*z^1SlV4QL)s1}Xi<ZQ0Dj!cj^VMFY)#i&$jO)Wf`(F33K(*8Wx`Q7^hTnX_<z=1f
zul^!VS3D#o`k<kw)OPj`?%h<j^?+KSZ1Xpyl4XNDjc!L#gZ8>^b?yFacg+J0;m75_
ztYf+=Enb8+?58?kJRRQ8dscnV*h`uWvHnITCVy1SQd+!jue9Ckqj%slLnbG#4SFyo
z<rG|Paz!fDz6d6412-LpJ`BVz7*iVGFP*mSo3<HEp1JeA0-w8Ks5@2aSLE~BHqY6r
zy^I@sefH$~OX#Z*?e^887-=EaR-e#$4Z%k;E+dJV@@HTJ=&CNoo?6xM$@R>otwe1v
zNB?0ZdEuB+Ue;$XLOCgqroBFaz#GNs4suxO4{s$~Zv&GU)BMnw?N@J#`ujgJ55IkA
zdm;~O-Fv%v*`>^Pct7nV@0D-+u~p?EW&Q$&`*r(q=S05;=bBeu=2<-8exXjWDG7G>
zWynB{J0VGb^F2qj;=YPbe=gqAQcHg6D<KKXvKwD!u(o#I>j)T}_xla{tBLoIrm>nr
z2^;o-Ej(H7hVv&a+sqk*MX~rRtM`iMFl&d0U0lAst>MVJ8HupWD<kl?Sn$tnwX$D$
zwd|>r)<VH6^{DxJgF+?Mg?Z`?=V=^o=-l;{%kX-$>c>rbu%n!F70q*7`DZ%X@P@o+
zzM7W}+=VoWf7+DGKecx#_YJ><?olfhwt*zgnArx5-|CINrK=`5x^18gb+AEIkYn;@
zNGwcsXp#Ihu(f_^rt_g#WtdXt;zyM-|6#Ff>TfefhKFLwm(65stH&VF`up?DnUA9x
zj+Nk<Ry6Y;$7Eq9F!zcRebqXS>2w;~M!R{0X`;^y3Vi9Zk8x_1m05?$<X*paK_v3b
zmZL+yMycVeuH^%I$49W|ZSgVls%v#O9CJ}jd+!!!kG!uo73`}^^cc#?ZSHGfde{EB
zOfPU7fU9iv-GEQ}R2BF#V0gp%$IUcHY<048r?!DeEwkl5^l=^PnVIldxZ^bAT*-s6
zt(Eb^YmYg$22O_~;skF`L7$2Dg?@w<Wpc@2hE>h+y02=!I}HUdN*|L7@b~s#Dhu@u
zZzA-SzpYv87_y%|Xc@sou$?|2C-#y5aR*uv2*%`S>Z&mHPx1Qr4=5-UZUg(jr-hDv
z9*`^EoAOOLt+DsRfZ(#%Qoq-#=Bstx0?h2!ngdlzAClRlOOJnx+3p@ZYCRFp6l?V8
zQ1!X1kqp)S%r7HS=ul8wTmgQl-`Ws=M<UkC3Kym0-spZiNvFW`V@N^R;gK1`<}<EK
z>5U%!)hTaf;0pb$o}#Wz%HchD*3RXloXuO^CV779JtJ}J9%Kbr%cIHV_Z{sJhK5`R
z7*DIe)JYmXADz8PSUDiGR5#*(GkxoPY`N&|qQ_s-TcVGpHXJ+LDbZEY3K<r;bk>us
z^lWUhU36fOAiC;#G|x-Mm&X#_KJ?!iyr$te^U&Xa_{uGX=kN3a!qS2SULQ+b<#pz)
zemuj<%6YpmomGs^I-+UM(z+KukTKwm6uoAS9-~0}EU(vU$<(J>c+=sI=<|6mr2VUg
z_<6|U+c$wnSH0Ve$!-^!ujU;t`l@lj$vdH}*7eeKuDfgq9)5QnY+6_KyIpqoV%Ow@
zL&5J_89%~3;Mh$z)8h3h$m2G~-j!?jhTx5L{j<T{Vl0)$JpB8=6E<dKMpUN09wKC0
z=I-B0o~v$ZIm$3BrSPC&2^oJy>`~KN+S}Q0ZeI!x=LfcJylr7`aS7f!cFcc%MYuiO
zq$2f_RP`Ng$pL?afSY+*-Sg@fg}h(zHhqWhMlCGr^f;gXd@uFnceju04REIB=NtWH
znveihXW#dll9TJe$yR4`p6iXgd>_?1LQ-rq%cssi2}8Z1H#y@KM94F5*zW0O-1i1~
zL$%8~_S%b3I?03i{hMb@rO2mTo}*?tg2L$-XEGUM)%ZD&yFZ&MyM3yhB1OvuQQkb#
zRj<{bwAVPvKj`jCp~ZWSnZcggysNi9u3?0oKlTr2#g|e%+<GNL8z_HnR5AQaz+|Tc
zvYn;2YmXD_JI1rwy4((L^jMW8-YlKgIHG1(FPj+|c1}86EjPMRARrr`cotuWKbJb$
zBwNspd0NXnR&|$2#dyTEa&toB8rPT7ByZKdRN{Jd2bRO-s_ZNCkdB9{+hj1e63Uc(
zT~uxJt3m+HD<+$_yS-MsJS+RH3ViJf`K5R^T<pX|%%aD7qb#=p^^$w9x+Bvn=+$+;
zez;7byWOi2=~!?vE3m9bDPKmFGeb+_2@>lTUQgTAbmFzy=m93G6WLt>@g*hr{X#6)
z7FmXq81sY<_NLtYOklQnT-E+9%l68C<0fgo)Ee!=t;IV}ll#U67-KZdy5hD0_i66h
z{_Z)E%TbvNUAXSsIR(9+OR1KEMB7oOMVtQ0eGNj7D(0x2^Uh@jJ@=rEwv)=BP^fhO
zeB1YEz{6pkYc4S#ZA9KOMC2yK)Vs}&L}$KI<P>zDE-Olh8?{zq4;J<x9sA;$>oJ{E
zljs&XZ+W6_AEV2GqR;7XLQ~@N#V?Dd@6#$W=g{5mqqcI*D9m`Wc3tbcsTQMaifE?8
z+WN7C*ojCUGYXx?2=~a4>Ey}PFN$}E#dKtnwgD5q7Ui(Dd*!q1sw)Dz8s0vrz}IVX
zFL0x*27=D~@6ttja@P&FffJJ0rI@+mZ%3WarChWr-IUk{s1}zwOxL1Y9&7_W&JKDd
zHM3i`n__GNUI|b$F-5a|qQ%<-+p{9TZ{w7btURD*U~Ww=M*2p>OuGMZBb8~85U;^I
zv3%#-4_z=0jUm{E5`sgC)(oOG4Y0!#9DT6ZKoW&HhJZq0LW76}M40ppBK<VXM5^nE
zjv!JPpb5k}#Nr*ED4dOV5X#BejcA$KX>6y09S)22bwm+DgKd2dgC-z=!e7W=HSt~y
zhFBS(4gOUQ=13I{0tuKOGSK^kq5}zN42cO?PD7$Lw05`L>AxnC1ylyS{q7^{AAPh9
zCjKxF8hwC0L`uV80_LaKfMK8y?pMaa4{!Y|V~E2T{?1?szcW@of%sn~HhzS#Um4?|
zK%-w7P;<Xo8z2Jwesq0DF92w@0PRgAdm!L|gu#&5P#-<)d!mG-WQxQ51I{4uAL$Hm
zNGE3u!9>I%kYt<sS>GTK3HxVw2Yeubgtv<b)N}Yr4bX<65CkmF$eZ9z>;XwgJ3l-8
z&v`(EiNxTOC^le)^4($cw`QF{v*|x;))5i7gSW#W^xTOYNQoJN!v?$hqrkxh=Ok!J
z`KdleVu1rFlL3}Mzy<|kF@8U)(EltUitq=X;V0gKXqo$?fbM4jDBCYIadnW*?#S@N
zkP7|zB(0piq%y`Ije-x|<DjXGxZW5@IHFY~f|Td}l@}m!{YuKyknZ3OLaGHCnTd(^
z$Fcw?EQuC0y@AOLkn{BgO9H_=Xc`6+<Oe42O6D(&A_)%~M}J{dNEqVG|51y?lW67y
z4Wj@6{&4e864?~7_@5MjsQ*nFNf$)cVBdCnM-C<Bc4XVpojeIcM*Ja$L{F5RC_Qn$
zk&!UeB+QSM4Aldff!7bs6Ak)5>`^3I9%7aZ{B`F?|A|=u{0#^I&Vd(&pQJxkMh3}L
z^>aHSmj6yamLds3tU;{#m-HvW&w?MK5wn=kK;rI4>?WlTHWY)z|80#U2t*Sv$$&;&
z7{6v8i2U2^1q^=Aa*`Mhzb7$KG)jCR8iB&Q1X>Z7A>=RZP>{+%G%I*fkuv5+f3!vA
zhr@;j{{=;f1?|`9UpuU^Bayo;2?z3E@D3$lO;H#W&YM8Ar~`mgWbn_A1lk>9B8FIE
zzVpHGf4l!=p}4@me6Wy||5uDP-tVs;K9t^p1SfC5zfdtEP=SF?pdsHJZ{}oe^>eeM
z{)zqzF^xYK7o{JF_WP+Rrk&24{X~NbphE80p+S%)422{76LOcI=)aQF`S=-vc5B=p
z%4ON%Z(#bX0IUMoU@=5p(-5%1;Kw!|_2=$J8whTL|A3|UA#I!gfTtt5E&L5lT1yhd
zh5&l-g6htb;GGr9PJ)S3cxQbQDFE(m@J3u5#Hk5RS4bfM<OhQIF@OvFL3q~{W!DvD
z*A->g6$RWFc3n|+T~T&jQFdKXc3n|+T~T&jQFdKXc3n~a?rpN`ibC>+*>y$Pbw$~A
zMcH*l*>y$Pbw$~AMcH*l*>y$Pbw$~AMfrc#6=laZBm`Q20Kgf%NRIVPfIff(uz(MM
z0$|{|Lw^t^fES(w1%qU4|A7Jq7y^y}oXBveg&o^570HAOwy{0R==0;iDF!d=O+2nG
zi@*lSMR*6xDagvp0b05d;1SRO6anUg0_~gH!e8#R2*c1wZDCgxYkBKnLzF+-EDDEm
zjIwb;L<Jz!k;1w<Fs%rUh@jvg6u}!75fq5QYeZ-ZlbCCOFcB>$3?q>c0<?umM;~Br
z)^^~bPaF!SBC8~WkXKNE!QrwB$|`WUf;0>~DXu6d5B|et6qGeo;2MgmupdbnYz>F>
z)o?H}`Oy}b(-!{Y6m7VYEEeY{2c9ZcC-P8KlmRJZ@R1mTcZ3WEFY=Rv5qOvyhbH;9
zz=#|{zl~6WwlFB^P8WiLf3f|iy846A+WOy<1_conKw^t07>9wa{JTNG6YZID4k$c$
zA{T)&4ntuGB0sAK|2$j&&sqE`CXMFLN=U>n>R`|eOi~XLA%_Y?1%bTrAguyPzF-YQ
z9LgK?VsQdJSbh%FZ-=SBoaQI;{y~odonBDd!o=hKGT?~GD>?l<-Y+GurXerCLuw69
z10?7j^WPC;k!at@|Ay4sTEiTJCwPO0iOr3)g+ZZY(P*TGvWbzrv5B#QqQ0WKF<e1G
zO;ydvfC#G^sH(vA)k!jeb&aryP@)ok)<qKQ8vl27cg+3Xf&ViezlKVKWU98tB0(K0
z3B!Kl!B_;K%a$)X5G?qIlkdVXBtpX%iwp7wXA?Te+YcpoI2h$eoZO%ez@C|*@!&{C
z{#Y)KsE{8}AR0!RgBsolqFa}?FoHPdD5UTYH2R-u^FL~2hh;eEi1cqK!VVc8>q`jt
z#-a56K+XTBc_#O-<i>l4{RgT4;~e<EC-o0yBK*BEekgGFloKZQLyox5><oq6-$&{9
zxc{6_`rw=<jv@Ys1`NFYe(6GoIMIodRY6(V7;XSJRyI;pAWn3Bc@qN@xPgJOqM@p?
zzLMcin}O(`t?w|A`}eJp<osiQ{8<^?bcx`v-CpPCuDtu))xfR>b~Ui8fn5#kYT*AP
z4gCJTh{AxcIpN^9!QC)gyJ56;!)PIP!)WdLF7AfW+6|+%8%Aq4jMi=#t=%wMyJ58c
z_hGbt2hIX5Tt5P5QIeCBQ;<_qP*BoPf)^b%B_%Z-JuNLAEiFAWJt_To>}39ahk&6X
z8R!|fn3=i$*MYOZNK?N9XR(5Tv+_YPss4<c1&~vaK`9}?kHA?_DDfyK<mWNTzXr~N
zLdb}LvnZ*^z#9|~fs(P10~BE7EPZ=QHg7O;7Q5obJSvWzz*VD4oIdlSxDyLvhRTj9
z`PB$~tBR3$YC#Qrj}wy6*8PEc?@1b3F7CKX#wLZeE<Mf?Jd0yriNUi_p{FkI1km~y
z@w3#--25ZXWZY<c@@8sfpSrm_I`Zt5lG_~vpH?L`EIbZJC1l=gdOA40wi9TJjDi9T
z{zXnrMi%rd)|WnoJt#3{NbE($ysCNj2d_p&3^*Koa0^PJ%7!O6Qyj(e5!J0!_->UC
zMkn_;rGjC_xVZPijd{e81ZUO7f|@poeLZ7e<1Q7}{#9g?KZ1V!8T0EeGXEQq{~DW1
zv!S=bjIR@N*+Tk(sc|?ryKl*YI+R<A+?=X4e05wV^;F@ByPnAi&mfnK3fJOCi{cd5
zz0)Q%N|W1pTxA}$5$KPdOr|*q%b5yGd4W)nZ&z_kw(&}TGRnz=V|E+4qE&^oqWt*O
zJgTPS(@<C7bWVccckeM1@2#7YMv7h@TQ#<#nM@tIoqfG7TYbnR<C2ueVQj5qP4lTA
z)(nwJ=HU{<u5OEuPhK}%&Q|KoJaX2?>C#;p{lz5xm2vVHE}wjalKpeS6XssbuuQ@0
zOQ*HG$<IBmYG4g`fHS&8E#kLvKSk_XO}$0L6C9^|gttVW)=I;z4A~&*aRUjdj*OU_
z`Zro>yy&&QA260z8Zi2zE408S22E|@SysQ8Xy>CR?#mtgSZ}t;YvTMK*EICp_4-CP
zHv!gaHOG5PqS%YQS>rEkq_Tu^jhmC??BhxVZA=O(d|u(C#d2Mn)?OD+tL*dW9d+G)
zd2qzhW#Ga&^1YWQ`<L!Glm?ITH@H1=f6>8Ne&M|sye!AB+gW{~(TU%!_5CpssyGMH
zO2lNd&Q!ATRXt0x;F(8~`GuIn$Ihis_(oE)zTo<*eC0t@1It-hiaPTWN@eDfE%(`c
zi3UU1g{nr&y7d=I#=bU}Ma>C?9Hw^DPc=D2`D*x%Pqo_BbS0=xnr16+)?sDET9fO<
zYN`br<GI5NZ_Ov@T5l{b<_p@|)i(EJEXxV1P;DYrHWU>fGP!6e(w~Y^I?`}+Ki5)>
z!v1#L2%`T`VNBH}Sr@{@Suxf4E%dD2us-EAJ;8f%v0fn-vERql#0APK#4`;ih4P0V
z2;EJ0tUWIrx^`2uR@P=2YnA4s>s!pGzD)m~%3zVnw)0!htrJi6IT%DFd&jLUncMFf
zg@i0>DUZ}Cf3Kg`#TV1AT%elo44*S#J>W1d7|-Ridi4UU#I0h+X6^Ea;jEoBEVn{<
zVUqp<hMpHrN6|zXx%TTEN*J;4DHe!(#b^&TcRBa!C4ipKg{1JR;5_<+xCu_nX~qSV
z>&iOnvWG9m#LsTk%)DIlY>d+EZ|Ur8+bBC7FVpZy8H`)@O5$t!N~%q*W8QwThbevP
z@XzO>1hmyg&&Be7HK&lg^>SkZo{JT+O8YL$^cpGMDb;{@LUv2A#<?RTsnlX2Qqzr<
z#;=#>Q@g(EKD(GIMagZT^}P~5o5kRxZ>7ciABoMKQ?U%zhG#x@iFeX}$wi$eGB;9p
zg{uyC=0;|Sl7C)`r;)qm`>$Wp#>0(!F@!7QDiPSxh}Y@1Utr6wUyPo1kPl#hht9CN
zWOZ~}rD4ef&F*}&$z`f{b=WrkldwystHoL-X|I)rdcFyt&5jw*^Xj`OEMA}^iOR8g
z9m=FUqFrA((VYerZe4VXP}23bpcvVARVu}(XV!Ev`Du8mbDZ96&&iSvMi((y4$OhO
zW$*HS%4LGJ$A`Z7v7T_-m9s@=zS=JN?o8>vU&GRU(>#_`Guydo0vg@L@Z3{(dCu31
zi!J(uh<fxVemvl?`PS^E9OppBd~~HjufrXuJGc$SBViW}Z=TN`|2WApfH)fMjVya`
zqQ)FItp(U!%w3TVqJr6$=?W2UC9feo?ly<9JJ-?pCL9T4RXVEnmh3_iyd@<!z5jGZ
zPuKX#Z(qbxu&sHzqrq<(g|l*{(ZK_Wn)}@XgZge?tAlE&+BlI_@Y10ul}${UwBLG~
zo$ufhzIJVj`<PfvF>OTpQ47JcwIQm~gU%mnE7xjAw*k6SoZu|z*14o`L&_ucDVg%U
zfKvZA=Wj+cUV+^VP*ivW@w_bDv!7QgI@TnlB{0@eIdo*A|J02KTdDMpxX(|S#*$eO
z9~1-?j+v}_SvJK_Y7z)3cV}NGKQzVIR4c~Z;#Qj!($cbW++S5+Z)?zQ)4L>p`a@2u
zgzV)@p+gzsBb$NZLfY;oD&5_h61C>oNYBWOLC^A|%D1a;CwP1tf9|F_a(M-(m55EE
zGIF_oR5oYowAZG@<;nVQX<Z_Y?_5*VQnyUDfm<DId~4f4wYPMY)`^jY_ROq=PcKdV
zY*IZfWuBehiZpQ$ThEn!&+o7NHL4}$Zs*>Df``a^nMX|o<3DRj9&hm|Q>baQozTLS
z(2hSm!Oa&nQH5c&Q-6B~Bj>f!F23i<;64{?6P_a+6GP09^^9{DhAHgKMNFujM}phe
z=q2ngW_^3P@p5s4fstpwp_0+#*qb9yM`+g1E97&w3G^+mN*6P4B{pTSQkC#P@2p@`
z=%-wjbw91!5I!9BTJ>8w>b1h?uEQy}-IL*dpq)O2<BaZ2wKVcT{VDxtF0HImxiZIR
zg~L_W7f1K<nbDLB(Dr6G&kyQ5HuM%YM3sz?$+EX^c;ApdVuu|&c`6xjJYZ?p40ZqL
z8&Z8DjI8YlIpraTg-{9hDES2{k=CdEw%F_MOb~bC)h{fY+j|~UdC+L#x&>LhmEPZQ
ze6WgrjP9bqHn6ZCr@!@3mMz8EC5grVhE{RmquUHJx+8J7)=RA_1_m{k4rbn9-*5Vm
z@Bt7RH(?RJiElIW5G<>?A2T*Mm(CJ%zw>GCXB<N4P{@gNx)SMFXN&eXZ><)3wjyt*
z>8>PsDvrQwPB)gg2lNa)?P4rdqM;FfYwu{RQrRYn(MfHWrljh)F?Qjr_4}{o^Ljl4
zYoFd(y1Jj<0ArS&5il;xoMcJc3Vu~7B`B-NRL6cYk!&&QklF;to9i{J=}%vORY|NJ
zEf7zMyKL8kaL5W-9p&si9;e&Caq?47c5XpuvaImc84FzTV1=MV%XV+dkO4yUx(?D;
z$$wvevZ#n<)7@;5um(Zs(@~MV*>v#Md#h@7W}<7k8MW7&1NQceE}4mqPu`I~1dK!Y
zw}C8ayV%Cwz-x`SYYtFlH<xox+61RDh&X7lj?{TgPPTL=sx<6b3%Wi8$4w>jKCMb)
z)kyPlG132aR4>fN3(H|$ULiAKnQLm1*jIPu{rSRCK3R^&&%M}$6SbqquUmB5C(V7c
zG_Ngnd!KkA=Yu+g_P%SvVv<f!&u2c`qRgD6g);@+z5(zCRZ6=X$PY|!D<v1MACq;1
zTV(gw6o2ZetE<Soe#z*l`2jsC;nQC_aWwWDFOoV@9wV;ZeC<-7x(mBR3hhkp6$>YD
z-xgjP>-=2(ew3!Ve&pHOfyX&2G-cXSRYB4V51$y>e!2jUvTu-74_S#s=m*(gmHp#Q
z&V7=2<+MT2cP6J&ma@Mi$FdEu+%K)DlOgL*qah@}Yf~-2<k_pogfW<D3OH2oI`Q{c
zU4O(wO;F>f#d|B!mMCe7vVD58&utaw`?x#a@;pz#{yUFfmKVV7%6ku9xpqNGF;qc(
z@%88GQC4Fq3qthFS;E5xeY(fF&bK4@a-BQKF$u1x_I#^;GA<N*Tv~S7I=)z?BF`6f
ziq2GIzgb6@P2ZOHR;5;YV!&un4Y=WDhfjOiuVue3o&LIXI3nbuN9elp_l}h+#AwHM
zUuIW;z$_hw4ugXd>sz#!#VNn4-ayHckWd!0zVqy9E*{?(_!Xa|Dbm;!OfY!9E8HrS
zeH`)5G|%w?EvswgV8IdYLx-3f?m1lUpHohFm7g<F0ZSRpF0}ig*sF}Ke-i19oT-$0
zq1E3_QCsh3Z)eD6{@}^Q3`q6D`--kD$88`r!PWnsOIp9`o^NTXF7Lz=6y0A{uw@@u
zEh$iyJ9`OfDT+zG_Qs>EYRDKFx^E)IU&NTIo19Vdob!HgLwBX@7&bprBCTN+z=Q7t
z!-1znO*k_@c07|`=kuj4`O(IkZW)K~o!=GTwFiqP`MXfWt)*0-y1>ZvkRrsO;0XKW
zZ#te;NpzY)2H~m}UzJ(P<^UIEJFeg;a+;0C!EQ!DslkCyGyx%m`n9WRJ$jGE{SxEK
z$T&=3Os9(l1V7)(qup}p>sq~PlLAq;Dnk+`c!EE!U#HYfNRCf?{cbhJGiRoc0WzlK
zDSb7guP{e-U3q;UpXGWCCnNh{T#idWlI7%bSf~MaVzvENm2?Zu(zy5h(`L1XRW~)4
zzH+VNo6>tYzixuT{$04P`@6rXMN65B4?1fNn0YGKUwQj!-fdd2Fz6%p)rmpl^s9@O
z>(3ACLk3O{xNtcie;1!=nqt^7E_Nju7ybk;*5YXEI70h&yFcAIwiG`6m8IEY5iN51
zaubcHAd=0>;996x*`~Ev+Kp!t_xbO+2cxIk4;u86_h-x3Q&hh6x#Xd*DV!5Z6~+Jk
zY3Cuyg$Kb|3pZwB$?F>&L^#7x6a9^7&mpAO>AVq425bIfBaD@qc9Qbt84*uaZXFTp
zH!FwoPuQgl`!762L{~80VX@nHa3JEbN0KpTuBq_ZX#LM^_bl5a7Wi~cn!ZGP`Iu-?
z95HU7br1-9O=-kmYJdEJaM<za^-~UIaBWko^Kh}(8g;Ez5DBf2>jqm{sp<E?SF!Ea
z7t4}NJ<dHW7CItYbFofK!9x6*ecmgV+(1Wh&ZIJy^IRv>;2L$;7SuRX#bXQ3TfxrX
z47gbDR3uk%Ax@>_OUk*xZc%@alhZSz?@nH@jYlH8GZI7OXGGM4ll)KlWHYtmIlA_X
ziws>DuCfqxxnnJ28%b04T%urTi5sJ~jJ{gwmt!e(anM{x9OwSxtU8XJt1_O#ar%Ml
zESvr*cY;SncAne)bPT(CUdft`=zcomWUWXC@4Ho7+)VW4<yeJC2e0qQn0Ntbj&RM)
zmgD-7g4Nm6u@Q;eFE5xLTs`A?D#Ag2qlu3*tuAq@zgHxoT+v>}m-klm+s3w(<5z3W
zUO21QfsYmvh$DPgXWQ!|oovx7E1;4zP8(}65%#1A_x91JJpg<FLpII8lYH&gJ{oZA
zQj~qWq~6lI4d4X)YGNLXb~cMUA2jq)%5Au5{HZ@cq<2Zs@8cP7C3D@3yCu;j!<3Az
z5?ih7E0b1809~76+xd3-rCGpYM+n6SL(A3B(y*8|Ub=_H*zp4<-J=*;F0Qe6m%hX?
z-?i1=c+zLJmhT~QgqfD*%ejOqXPhGZa;qo&)VtCch2j@thly|Kd$2c88pT|jR8PFX
z@@kkhOfzD9pUhB0DYwbcAxqxoDgw?a=#)gn>iH@s1F2=IBhLKT5ST$>&XusMQG+VF
z`rfHeOt09N_MLft+D;d@n4K**fAUL|l_x`O5NyR?5}&U1?jg=rdbW&bB!%VHwBk#;
zv+8q$<&DbpG#x#Rdvk_x6SoA^%F8d08OuBgIxll8Sv~S5-F|gDc?LrZ)U8C=YK?PK
zK)D6_P46AHxHPk<59zK)?3x;#x4S6=o)$>rSi;iFk{>likDEC?@^cyDi?zg=@|N3>
zUmNe~-LO36QeI`{Z1+gdS`+m~r|7)tOE-bS4>F-#OHA1U2NtyA&#~Ol?YF)AXfitS
z0NbVj9JdD}eCMM&-@)Rlu>q0Ak;#)DgIr&-3sS$GJZXDv(*3xsbZqShrmh1L+Q)94
zew)|cO7F<FT3p!0<#ah<E;vFmzUk{kmR|2=#^EfcxXQg>D>HTKL_}?<btrFh2M%&s
z^v*?HEl*kFlYGPF{HAofhq_rYT__-QE90i@^SaH-Heq-2$Z{&r6Q#v(wwgnn_s*PR
zP#w@#e1Z??=tw+#SEpWTDs;2LvxR=(=}OGmz7G|;V1(!+IU9lnEn_{Ow?;I4$s=zs
zdV5qBEX1@cZRVC<ft+ON)hU1SdP#00y>j%_KC2eTkuCL@&pI`y?7BA{&ldM>18<J{
v<|avA>RLV)ebj5q(skkKQ-c@7VM|-djw|mi+S=bvRY>+rzCPl-J@9`3H-?($

literal 0
HcmV?d00001

diff --git a/public/images/default_blank/mo-3.jpg b/public/images/default_blank/mo-3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b0b961ab96f194b8e8ea8d2517bd5462bddc73b4
GIT binary patch
literal 35319
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
Sg)2@JIP}GfLkkyTum9PgJYgvS

literal 0
HcmV?d00001


From 1f43ecb8ed452b46667225fcf98f5d0bfe51ee7f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:19:52 +0800
Subject: [PATCH 281/668] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8E=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=B8=80=E8=87=B4=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left2.html.erb  | 22 +++++++++----------
 .../organizations/_org_custom_left3.html.erb  |  8 +++----
 .../organizations/_org_custom_right1.html.erb |  2 +-
 .../organizations/_org_custom_right2.html.erb |  2 +-
 .../organizations/_org_custom_right3.html.erb |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 3e4651d8c..16e22a1f2 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -13,7 +13,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.name.to_s %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -26,7 +26,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -39,7 +39,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -59,7 +59,7 @@
                               <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title link-black", :title => poll_name %>
                           <% end %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
+                              <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% end %>
@@ -82,7 +82,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.subject, issue_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -96,7 +96,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -109,7 +109,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -138,7 +138,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_course_title link-black", :title => document.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -155,7 +155,7 @@
                             <div class="por_course_bar fl clear">
                               <%= link_to title, board_message_url_in_org(message.board.id, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
+                                  <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
@@ -166,7 +166,7 @@
                             <div class="por_course_bar fl clear">
                               <%= link_to title, board_message_path(message.board, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
+                                  <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
@@ -181,7 +181,7 @@
                         <div class="por_course_bar fl clear">
                           <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_course_title link-black", :title => news.title %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
+                              <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% end %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index ed6cd5ed9..bcfac4933 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -12,7 +12,7 @@
           <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
               <% document = activity.org_act %>
               <% if get_image_path_from_content(document.content).nil? %>
-                  <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
               <% else %>
                   <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
               <% end %>
@@ -30,7 +30,7 @@
                   <% iamge_path = get_image_path_from_content(content) %>
                   <% if message.board.org_subfield_id %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% end %>
@@ -42,7 +42,7 @@
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                   <% else %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% end %>
@@ -58,7 +58,7 @@
                   <% news = News.find(activity.org_act_id) %>
                   <% iamge_path = get_image_path_from_content(news.description) %>
                   <% if iamge_path.nil? %>
-                      <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                      <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% end %>
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index 192c7bb64..9d710ba54 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -1,4 +1,4 @@
-<div class="por_news">
+<div class="por_news" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
   <h2 class="por_h2_index clear"><%= field.name %></h2>
   <% if @acts.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index b6229cd69..b31d2ba70 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -1,4 +1,4 @@
-<div class="por_projects">
+<div class="por_projects" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
   <h2 class="por_h2_index clear">热点项目</h2>
   <% if containers.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index afb901282..a461a38dc 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -28,7 +28,7 @@
       </div>
     </div>
 <% elsif field.field_type == "Comptec" || field.field_type == "Compstu" %>
-    <div class="por_teachers">
+    <div class="por_teachers" style="display:<%= field.hide == 0 ? 'block' : 'none' %>;">
       <ul id="por_teachers_nav">
         <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
           <a href="javascript:void(0);" class="por_teachers_type">名师风采</a>

From fa2437cdf636e7393de0192e8614201a2737f0f3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:28:12 +0800
Subject: [PATCH 282/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=AD=A6=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb              | 16 ++++++++++++++++
 .../organizations/_org_custom_left2.html.erb     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index aaaf05d21..2c8c24b39 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -247,4 +247,20 @@ module OrganizationsHelper
     org.org_subfields.where(:field_type => "Compstu").first.hide
   end
 
+  #当前学期(2015春季学期)
+  def current_time_and_term course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term.to_s
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term.to_s
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term.to_s
+    else
+      str = Time.now.year.to_s + cur_course_term.to_s
+    end
+    str
+  end
+
 end
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 16e22a1f2..53169506e 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -202,7 +202,7 @@
                   <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
                   <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), course_path(course), :target => "_blank", :class => "fl" %>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                  <span class=" por_course_time"><%= time_from_now course.updated_at %></span>
+                  <span class=" por_course_time"><%= current_time_and_term course %></span>
                 </div>
             <% end %>
         <% end %>

From 875a604780229ce3d2bdae87f8a16f2688214b5e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:31:49 +0800
Subject: [PATCH 283/668] =?UTF-8?q?=E7=83=AD=E7=82=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=86=85=E5=AE=B9=E7=9A=84=E5=AD=97=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index b31d2ba70..2555372df 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -8,7 +8,7 @@
         <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
         <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
         <div class="cl"></div>
-        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
+        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 40, :maxwordsnum => 48, :maxwidth => 0, :cl => "por_project_p"} %>
       </li>
 
       <% containers[1..4].each do |container| %>

From 1e34a4f17490132af96cecfa36a61ace274d4672 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:43:20 +0800
Subject: [PATCH 284/668] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BA=A7=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb             | 6 ++++++
 app/views/organizations/_subfield_list.html.erb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 2c8c24b39..7a835ecad 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -208,6 +208,12 @@ module OrganizationsHelper
         result = "教师"
       when "Complex"
         result = "综合"
+      when "Compcou"
+        result = "课程"
+      when "Comppro"
+        result = "项目"
+      when "Compact"
+        result = "动态"
     end
   end
 
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 684a917a1..946043a62 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -92,7 +92,7 @@
             <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
             <span class="fr">|</span>
             <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-            <% unless field.field_type == "Resource" || field.field_type == "Comptec" || field.field_type == "Compstu" %>
+            <% unless field.field_type == "Resource" || field.field_type == "Comptec" || field.field_type == "Compstu" || field.field_type == "Comppro" || field.field_type == "Compcou" || field.field_type == "Compact" %>
                 <span class="fr">|</span>
                 <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
                 <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->

From e726a362d8de5b0dcdda999327d77d1e092bb8e9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:56:38 +0800
Subject: [PATCH 285/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E7=9A=84=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 7a835ecad..e6fd7591f 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -118,13 +118,17 @@ module OrganizationsHelper
   #排列下拉框
   def subfield_status_option
     type = []
+    option1 = []
+    option1 << "左一"
+    option1 << "1"
+    type << option1
     option2 = []
     option2 << "左二"
     option2 << "2"
     type << option2
     option3 = []
     option3 << "左三"
-    option3 << "2"
+    option3 << "3"
     type << option3
     type
   end

From 0b869aaaed518c76b8345cba232ba270a3aa9159 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 15:40:11 +0800
Subject: [PATCH 286/668] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/_form.html.erb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/org_document_comments/_form.html.erb b/app/views/org_document_comments/_form.html.erb
index 502da97ad..51400f3cd 100644
--- a/app/views/org_document_comments/_form.html.erb
+++ b/app/views/org_document_comments/_form.html.erb
@@ -14,10 +14,6 @@
   <p id="e_tip" class="c_grey"></p>
   <p id="e_tips" class="c_grey"></p>
   <div class="cl"></div>
-  <div class="f14 fontGrey2">置顶显示&nbsp;:
-    <input type="checkbox" id="is_public"   name="org_document_comment[status]" class="ml3" />（仅限模式二）
-  </div>
-  <div class="cl"></div>
   <div class="mt10">
     <div class="fl" id="topic_attachments">
       <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>

From 43e586aa90b864d73c26a02f721e984d23887e0e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 15:50:52 +0800
Subject: [PATCH 287/668] =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_custom_left1.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 2d97fdbe2..335ed1b2c 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -114,7 +114,7 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => document.title %>
+                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
                 <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                 <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
               </div>
@@ -131,8 +131,8 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_title_r link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
                   <% else %>
@@ -142,7 +142,7 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title link-black_r', :target => "_blank", :title => title %>
+                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
                         <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
@@ -157,7 +157,7 @@
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
-                    <%= link_to news.title, news_path(news), :class => 'por_hot_title link-black_r', :target => "_blank", :title => news.title %>
+                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
                     <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                     <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                   </div>

From edbe882cc9dfd7828b702290ecea33a3a7570b02 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 15:56:04 +0800
Subject: [PATCH 288/668] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E5=85=B6=E5=AE=83=E6=88=90=E5=91=98=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index e6fd7591f..fa0d33f6e 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -181,7 +181,7 @@ module OrganizationsHelper
     if User.current.admin?
       @organization.org_subfields.order("priority")
     else
-      @organization.org_subfields.select { |os| (os.field_type != "Comptec" && os.field_type != "Compstu") }.sort_by {|os| os.priority}
+      @organization.org_subfields.select { |os| (os.field_type != "Comptec" && os.field_type != "Compstu" && os.field_type != "Comppro" && os.field_type != "Compcou" && os.field_type != "Compact") }.sort_by {|os| os.priority}
     end
   end
 

From c7866af1e86420f970a865488f8261f1e9fe41bb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 16:14:45 +0800
Subject: [PATCH 289/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E6=97=B6=E5=80=99=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_member_list.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index 0059a2be5..8e8a23b60 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -31,8 +31,9 @@
         <% end %>
       </li>
         <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
-        <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height(70);$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
+        <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height();$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
             <%= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
       <div class="cl"></div>
     </ul>
+    <div class="cl"></div>
 <% end %>
\ No newline at end of file

From d27a050ffa428c7f09d0f5805e0eda8de7ba9f1b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 3 Jun 2016 16:28:11 +0800
Subject: [PATCH 290/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 14 ++++
 app/models/user.rb                            |  4 -
 app/views/layouts/_logined_header.html.erb    | 23 ++----
 app/views/layouts/_message_loading.html.erb   |  6 ++
 .../layouts/_show_messages_list.html.erb      | 74 +++++++++++++++++++
 app/views/users/_user_message_course.html.erb |  4 +-
 app/views/users/user_messages_unviewed.js.erb |  1 +
 config/routes.rb                              |  1 +
 public/stylesheets/new_user.css               |  2 +-
 public/stylesheets/public.css                 |  2 +-
 10 files changed, 107 insertions(+), 24 deletions(-)
 create mode 100644 app/views/layouts/_message_loading.html.erb
 create mode 100644 app/views/layouts/_show_messages_list.html.erb
 create mode 100644 app/views/users/user_messages_unviewed.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4cb838b8c..e201d8611 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -123,6 +123,20 @@ class UsersController < ApplicationController
 
   end
 
+  #未读消息弹窗
+  def user_messages_unviewed
+    @message_alls = []
+    messages = MessageAll.where("user_id =?", User.current.id).includes(:message).order("created_at desc")
+    onclick_time = User.current.onclick_time.onclick_time
+    messages.each do |message_all|
+      # 未读的消息存放在数组
+      if (message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0) || (message_all.message_type == "SystemMessage"&& !message_all.message.nil? && message_all.message.created_at > onclick_time)
+        @message_alls << message_all.message
+        break if @message_alls.length == 5
+      end
+    end
+  end
+
   # 用户消息
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复,exercise:课程测验
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
diff --git a/app/models/user.rb b/app/models/user.rb
index a07f2421f..44ef54c95 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -370,10 +370,6 @@ class User < Principal
     messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count
   end
 
-  def user_messages_unviewed
-
-  end
-
   # 查询指派给我的缺陷记录
   def issue_status_update
     self.status_updates
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e3fad5c6a..7ba0a23be 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -85,20 +85,7 @@
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
     <div class="shadowbox_news undis" id="user_messages_list">
-      <font></font>
-      <h4 class="shadowbox_news_title">未读消息</h4>
-      <ul class="shadowbox_news_list">
-        <% user_messages = User.current.user_messages_unviewed %>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-        <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-
-      </ul>
-      <%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
-
+      <%=render :partial => 'layouts/message_loading' %>
     </div>
   </div>
 </div>
@@ -111,10 +98,14 @@
         $("#navHomepageSearchType").hide();
     });
 
-    $("#user_messages").mouseover(function(){
+    $("#user_messages").mouseenter(function(){
         $("#user_messages_list").show();
-    }).mouseout(function(){
+        $.get('<%=user_messages_unviewed_users_path %>');
+        $("#ajax-indicator").hide();
+    }).mouseleave(function(){
         $("#user_messages_list").hide();
+        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+
     });
 
     $("#navHomepageProfile").mouseenter(function(){
diff --git a/app/views/layouts/_message_loading.html.erb b/app/views/layouts/_message_loading.html.erb
new file mode 100644
index 000000000..aae55205c
--- /dev/null
+++ b/app/views/layouts/_message_loading.html.erb
@@ -0,0 +1,6 @@
+<font></font>
+<div style="margin: 5px auto;width:150px;">
+  <img class="mr5 fl mt2" src="/images/loading.gif">
+  <span class="fl">正在加载中，请稍后...</span>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
new file mode 100644
index 000000000..27e1d8896
--- /dev/null
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -0,0 +1,74 @@
+<font></font>
+<h4 class="shadowbox_news_title">未读消息</h4>
+<ul class="shadowbox_news_list">
+  <%# user_messages = User.current.user_messages_unviewed %>
+  <% messages.each do |ma| %>
+    <% if ma.class == SystemMessage %>
+      <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
+    <% elsif ma.class == CourseMessage %>
+      <% if ma.course_message_type == "News" %>
+        <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
+      <% elsif ma.course_message_type == "Comment" %>
+        <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
+          <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程作业：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了</a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)</a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=User.find(ma.apply_user_id).show_name %> 申请引用作业：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=User.find(ma.apply_user_id).show_name %> </span>申请引用作业：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
+          <li><a href="<%= (User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 1)) ? student_work_index_path(:homework => ma.course_message.id) : 'javascript:void(0)' %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "ApplyResource" && ma.status == 0 %>
+          <% if ma.course_message.container_type == "Course" %>
+              <% href = course_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "Project" %>
+              <% href = project_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "OrgSubfield" %>
+              <% href = org_subfield_files_path(ma.course_message.container_id) %>
+          <% else %>
+              <% href = 'javascript:void(0)' %>
+          <% end %>
+          <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.user.show_name %> 申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+          <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+              <% if ma.course_message.container_type == "Course" %>
+                  <% href = course_files_path(ma.course_message.container_id) %>
+              <% elsif ma.course_message.container_type == "Project" %>
+                  <% href = project_files_path(ma.course_message.container_id) %>
+              <% elsif ma.course_message.container_type == "OrgSubfield" %>
+                  <% href = org_subfield_files_path(ma.course_message.container_id) %>
+              <% else %>
+                  <% href = 'javascript:void(0)' %>
+              <% end %>
+              <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+          <% elsif ma.course_message_type == "Poll" %>
+              <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
+          <% elsif ma.course_message_type == "Message" %>
+              <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
+              <% href = 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) %>
+              <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%></a></li>
+          <% elsif ma.course_message_type == "StudentWorksScore" %>
+              <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
+          <% elsif ma.course_message_type == "JournalsForMessage" %>
+              <% if ma.course_message.jour_type == 'Course' %>
+                  <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
+              <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+                  <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
+              <% else %>
+                  <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
+              <% end %>
+          <% end %>
+    <% end %>
+  <% end %>
+  <!--<li><span class="shadowbox_news_user">教辅测试老师</span><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+-->
+</ul>
+<%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 60d5b6ed8..0c18dbcc3 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -259,7 +259,7 @@
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || ma.course_message.is_open == 1 %>
+            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 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>
@@ -399,7 +399,7 @@
                   <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                 </ul>
             <% end %>
-            <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+        <% 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), :target => '_blank' %></a>
diff --git a/app/views/users/user_messages_unviewed.js.erb b/app/views/users/user_messages_unviewed.js.erb
new file mode 100644
index 000000000..1019050c9
--- /dev/null
+++ b/app/views/users/user_messages_unviewed.js.erb
@@ -0,0 +1 @@
+$("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/show_messages_list', :locals => {:messages => @message_alls}) %>");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 9abaef0ae..ed936115a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -538,6 +538,7 @@ RedmineApp::Application.routes.draw do
       get  'new_user_commit_homework'
       get 'reply_to'
       get 'show_all_replies'
+      get 'user_messages_unviewed'
       post "user_commit_homework"
       post 'user_select_homework'
     end
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 1edb4ff80..0d00f604d 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1625,6 +1625,6 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
-a.shadowbox_news_user{ color:#3b94d6;}
+span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
 
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c28560506..b0f4df679 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1153,5 +1153,5 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
-a.shadowbox_news_user{ color:#3b94d6;}
+span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}

From ea19f199734318ccc62e32812b2863409b1b4041 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 16:30:20 +0800
Subject: [PATCH 291/668] =?UTF-8?q?500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 53169506e..f07053566 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -30,7 +30,7 @@
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
-                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
                       <span class=" por_course_time"><%= time_from_now activity.updated_on %></span>
                     </div>
                 <% elsif act.org_act_type == "News" %>

From 65bf816ea4ea9abafde502cce55af54b014a5a41 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 17:03:35 +0800
Subject: [PATCH 292/668] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=BA=8C=E4=B8=AD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_custom_left1.html.erb | 6 +++---
 app/views/organizations/_org_custom_left2.html.erb | 2 +-
 app/views/organizations/_org_custom_left3.html.erb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 335ed1b2c..91c0e320e 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -9,7 +9,7 @@
       <ul class="por_hotbar_left fl">
         <% if acts.count > 1 %>
             <% acts[1..2].each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <li>
                       <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
@@ -57,7 +57,7 @@
 
         <% if acts.count > 3 %>
             <% activity = acts[3] %>
-            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                 <% document = activity.org_act %>
                 <li>
                   <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
@@ -106,7 +106,7 @@
 
       <%# if acts.count > 3 %>
           <% activity = acts.first %>
-          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment'  %>
               <% document = activity.org_act %>
               <div class="por_hotbar_right fl">
                 <% if get_image_path_from_content(document.content).nil? %>
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index f07053566..2c389766f 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -131,7 +131,7 @@
               <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
             </h2>
             <% org_acts.first(4).each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
                     <% iamge_path = get_image_path_from_content(document.content) %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index bcfac4933..cdd683944 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -9,7 +9,7 @@
       <div class="por_post_left fl">
         <div class="por_post_leftbar ">
           <% activity = acts.first %>
-          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
               <% document = activity.org_act %>
               <% if get_image_path_from_content(document.content).nil? %>
                   <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
@@ -73,7 +73,7 @@
 
           <% unless acts[1..5].nil? %>
               <% acts[1..5].each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <ul class="por_post_list">
                         <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
@@ -115,7 +115,7 @@
           <div class="fl">
             <ul class="por_post_right por_post_list">
               <% acts[6..19].each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                   <% else activity.container_type == 'OrgSubfield' %>

From 07941233d8f6793895341994599a371034b808bb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 3 Jun 2016 17:03:53 +0800
Subject: [PATCH 293/668] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=88=B0=E5=90=8E=EF=BC=8C=E5=85=88=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E4=B8=80=E4=B8=AA=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8BID=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E5=9C=A8=E5=87=BA=E7=8E=B0=E8=AF=B7=E5=85=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=E8=BE=93=E5=85=A5=E7=9A=84ID?=
 =?UTF-8?q?=EF=BC=8C=E6=AD=A4=E6=97=B6=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=87=BA?=
 =?UTF-8?q?=E8=AF=A5=E7=94=A8=E6=88=B7=E6=89=80=E6=9C=89=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=B7=B2=E7=BB=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4cb838b8c..009d5c4d6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -575,7 +575,7 @@ class UsersController < ApplicationController
     end
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
-      @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and (#{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p)",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
     else
       @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id}").select { |course|  @user.allowed_to?(:as_teacher,course)}
     end

From 429deefadf78f669f3a1975c495b3c9ab965bb51 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 17:14:28 +0800
Subject: [PATCH 294/668] =?UTF-8?q?=E5=8F=B3=E4=B8=80=E7=BA=BF=E6=9D=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_right2.html.erb | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 2555372df..9d206ff93 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -3,20 +3,22 @@
   <% if containers.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
   <% else %>
-      <% container = containers.first %>
-      <li class="por_project_li">
-        <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
-        <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
-        <div class="cl"></div>
-        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 40, :maxwordsnum => 48, :maxwidth => 0, :cl => "por_project_p"} %>
-      </li>
+      <ul>
+        <% container = containers.first %>
+        <li class="por_project_li">
+          <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
+          <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
+          <div class="cl"></div>
+          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 40, :maxwordsnum => 55, :maxwidth => 0, :cl => "por_project_p"} %>
+        </li>
 
-      <% containers[1..4].each do |container| %>
-          <li>
-            <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
-            <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
-            <div class="cl"></div>
-          </li>
-      <% end %>
+        <% containers[1..4].each do |container| %>
+            <li>
+              <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
+              <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
   <% end %>
 </div><!--por_projects end-->

From dab24567f2aa9947ce21d3f69a52c5d2b0cedff7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 3 Jun 2016 17:21:36 +0800
Subject: [PATCH 295/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index f9a59e080..3169763c4 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -115,7 +115,7 @@ class WechatService
     data = {
         touser:openid,
         template_id:template_id,
-        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+        url:"#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}",
         topcolor:"#FF0000",
         data:{
             first: {
@@ -143,7 +143,7 @@ class WechatService
     data = {
     touser:openid,
     template_id:template_id,
-    url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+    url:"#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}",
     topcolor:"#FF0000",
     data:{
         first: {
@@ -181,7 +181,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:Wechat.config.binding_succ_notice,
-          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities",
           topcolor:"#FF0000",
           data:{
               first: {

From acc808f0037b36990b091f18bf92cbb97967e2dd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 17:24:45 +0800
Subject: [PATCH 296/668] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left3.html.erb  | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index cdd683944..3d5d01dee 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -70,46 +70,45 @@
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
               <% end %>
           <% end %>
-
-          <% unless acts[1..5].nil? %>
-              <% acts[1..5].each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
-                      <% document = activity.org_act %>
-                      <ul class="por_post_list">
-                        <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                      </ul>
-                  <% else activity.container_type == 'OrgSubfield' %>
-                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                          <% message = Message.find(activity.org_act_id) %>
-                          <% if message.board.org_subfield_id %>
-                              <ul class="por_post_list">
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                                <% else %>
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                                <% end %>
-                              </ul>
-                          <% else %>
-                              <ul class="por_post_list">
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                                <% else %>
-                                    <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                                <% end %>
-                              </ul>
-                          <% end %>
-                      <% end %>
-                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                          <% news = News.find(activity.org_act_id) %>
-                          <% iamge_path = get_image_path_from_content(news.description) %>
-                          <ul class="por_post_list">
-                            <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
-                          </ul>
-                      <% end %>
-                  <% end %>
-              <% end %>
-          <% end %>
         </div>
+        <% unless acts[1..5].nil? %>
+            <% acts[1..5].each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
+                    <% document = activity.org_act %>
+                    <ul class="por_post_list">
+                      <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                    </ul>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.board.org_subfield_id %>
+                            <ul class="por_post_list">
+                              <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                              <% else %>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_url_in_org(message.board.id, message.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                              <% end %>
+                            </ul>
+                        <% else %>
+                            <ul class="por_post_list">
+                              <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.subject}".html_safe, board_message_path(message.board,message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                              <% else %>
+                                  <li><%= link_to "<span class='post_icons_grey fl'></span>#{message.parent.subject}".html_safe, board_message_path(message.board, message), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                              <% end %>
+                            </ul>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <ul class="por_post_list">
+                          <li><%= link_to "<span class='post_icons_grey fl'></span>#{news.title}".html_safe, news_path(news), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
+                        </ul>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
       </div>
       <% unless acts[6..19].nil? %>
           <div class="fl">

From 57f3cf713caf1b8a58b60231384737987a77feeb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 17:50:40 +0800
Subject: [PATCH 297/668] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb        | 14 ++++++++++++--
 .../organizations/_org_custom_header.html.erb      |  8 ++++----
 .../organizations/_org_students_list.html.erb      |  4 ++--
 .../organizations/reset_excellent_student.js.erb   |  1 +
 .../organizations/reset_excellent_teacher.js.erb   |  2 +-
 .../organizations/set_excellent_student.js.erb     |  1 +
 6 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 app/views/organizations/reset_excellent_student.js.erb
 create mode 100644 app/views/organizations/set_excellent_student.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 3cbfc8466..a0ef84798 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -563,13 +563,23 @@ class OrganizationsController < ApplicationController
   # 设置为名师
   def set_excellent_teacher
     @ex_teacher = User.find(params[:user])
-    params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 1) : @ex_teacher.update_column(:excellent_teacher, 1)
+    @ex_teacher.update_column(:excellent_teacher, 1)
   end
 
   # 取消名师
   def reset_excellent_teacher
     @ex_teacher = User.find(params[:user])
-    params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 0) : @ex_teacher.update_column(:excellent_teacher, 0)
+    @ex_teacher.update_column(:excellent_teacher, 0)
+  end
+
+  def set_excellent_student
+    @ex_student = User.find(params[:user])
+    @ex_student.update_column(:excellent_student, 1)
+  end
+
+  def reset_excellent_student
+    @ex_student = User.find(params[:user])
+    @ex_student.update_column(:excellent_student, 0)
   end
 
   def hide_org_subfield
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index cc6920f33..e05d52747 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -21,10 +21,10 @@
           <li><a href="<%= register_url_without_domain %>" target="_blank" class=" ">注册</a></li>
         </ul>
     <% end %>
-    <div class="por_search fr">
-      <input type="text" class="pro_input_search fl" value="00000" />
-      <a href="javascript:void(0);"  class="por_search_btn fl"></a>
-    </div>
+    <!--<div class="por_search fr">-->
+      <!--<input type="text" class="pro_input_search fl" value="00000" />-->
+      <!--<a href="javascript:void(0);"  class="por_search_btn fl"></a>-->
+    <!--</div>-->
   </div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/organizations/_org_students_list.html.erb b/app/views/organizations/_org_students_list.html.erb
index 4f768d29f..d3db6fbf6 100644
--- a/app/views/organizations/_org_students_list.html.erb
+++ b/app/views/organizations/_org_students_list.html.erb
@@ -33,12 +33,12 @@
     function hide(content, id){
         if (content.text() == '设为学霸')
             $.ajax({
-                url: "/organizations/set_excellent_teacher?user=" + id + "&type=student",
+                url: "/organizations/set_excellent_student?user=" + id ,
                 type: "post"
             });
         else
             $.ajax({
-                url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student",
+                url: "/organizations/reset_excellent_student?user=" + id ,
                 type: "post"
             });
     }
diff --git a/app/views/organizations/reset_excellent_student.js.erb b/app/views/organizations/reset_excellent_student.js.erb
new file mode 100644
index 000000000..29684c7e4
--- /dev/null
+++ b/app/views/organizations/reset_excellent_student.js.erb
@@ -0,0 +1 @@
+$("#hide_<%= @ex_student.id %>").text("设为学霸");
\ No newline at end of file
diff --git a/app/views/organizations/reset_excellent_teacher.js.erb b/app/views/organizations/reset_excellent_teacher.js.erb
index 8b7c6cc71..fdf160bc4 100644
--- a/app/views/organizations/reset_excellent_teacher.js.erb
+++ b/app/views/organizations/reset_excellent_teacher.js.erb
@@ -1 +1 @@
-$("#hide_<%= @ex_teacher.id %>").text(<%= params[:type]== "student" ? "设为学霸" : "设为名师"%>);
\ No newline at end of file
+$("#hide_<%= @ex_teacher.id %>").text("设为名师");
\ No newline at end of file
diff --git a/app/views/organizations/set_excellent_student.js.erb b/app/views/organizations/set_excellent_student.js.erb
new file mode 100644
index 000000000..a8bb963c8
--- /dev/null
+++ b/app/views/organizations/set_excellent_student.js.erb
@@ -0,0 +1 @@
+$("#hide_<%= @ex_student.id %>").text("取消设置");
\ No newline at end of file

From 7cce01872d7bf9ef0daaa56ade4770b1344f496b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 18:11:42 +0800
Subject: [PATCH 298/668] =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 91c0e320e..4c1271ab8 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -132,7 +132,7 @@
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
                         <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_title_r link-blue", :target => "_blank" %></p>
+                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                         <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
                       </div>
                   <% else %>

From 4c92e73cf1400f20f1213a03218e679b2db10c9a Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 6 Jun 2016 09:34:45 +0800
Subject: [PATCH 299/668] =?UTF-8?q?=E6=A0=B9=E6=8D=AEhttp=E5=92=8Chttps?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 39 ++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 468bf64e9..b8d9da240 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1347,6 +1347,43 @@ function pop_up_box(value,tWidth,tTop,tLeft){
     }
 }
 
+//显示的时候根据当前网址是http 还是https 选择视频显示方式直接显示还是弹框
+function autoMedia(id){
+    var rootPath = getRootPath();
+
+    function _mediaType(src) {
+        if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+            return 'audio/x-pn-realaudio-plugin';
+        }
+        if (/\.(swf|flv)(\?|$)/i.test(src)) {
+            return 'application/x-shockwave-flash';
+        }
+        return 'video/x-ms-asf-plugin';
+    }
+
+    if (rootPath.indexOf("https") < 0){
+        $("#"+id+" img").each(function(){
+            if ($(this).attr("class") == "mediaIco"){
+                var href = $(this).parent().attr("href");
+                //正则取地址
+                if (href){
+                    var url = href.split("open('")[1].split("',")[0];
+                    if (url != ""){
+                        var type = _mediaType(url);
+                        //1.video/x-ms-asf-plugin 类型的视频播放不了,2.audio/x-pn-realaudio-plugin没试过3.application/x-shockwave-flash可以播放
+                        if (type != "video/x-ms-asf-plugin"){
+                            var width = 550;
+                            var height = 400;
+                            var html = '<embed src="'+url+'" allowFullScreen="true" quality="high" width="'+width+'" height="'+height+'" align="middle" allowScriptAccess="always" type="'+type+'"></embed>';
+                            $(this).parent().replaceWith(html);
+                        }
+                    }
+                }
+            }
+        });
+    }
+}
+
 //yk 自动识别URL 并加上链接
 function autoUrl(id){
     if ($("#"+id).children().length > 0 ){
@@ -1387,6 +1424,6 @@ function autoUrl(id){
         });
         $("#"+id).html(html);
     }
+    autoMedia(id);
 }
 
-

From ee12b3540bd88b1806133498eea8eba78637c235 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 11:05:25 +0800
Subject: [PATCH 300/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E8=BF=98=E5=8E=9F=E3=80=81=E5=BE=AE=E4=BF=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                 |  2 ++
 app/views/layouts/_logined_header.html.erb | 14 +++++++-------
 config/menu.yml                            |  6 +++---
 config/wechat.yml                          | 14 +++++++-------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0727a920a..38f29a661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@ vendor/cache
 /public/files
 /tags
 /config/initializers/gitlab_config.rb
+/config/wechat.yml
+/config/menu.yml
 1234567
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7ba0a23be..a87e83238 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -84,9 +84,9 @@
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-    <div class="shadowbox_news undis" id="user_messages_list">
-      <%=render :partial => 'layouts/message_loading' %>
-    </div>
+    <!--<div class="shadowbox_news undis" id="user_messages_list">
+      <%#=render :partial => 'layouts/message_loading' %>
+    </div>-->
   </div>
 </div>
 
@@ -98,15 +98,15 @@
         $("#navHomepageSearchType").hide();
     });
 
-    $("#user_messages").mouseenter(function(){
+    /*$("#user_messages").mouseenter(function(){
         $("#user_messages_list").show();
-        $.get('<%=user_messages_unviewed_users_path %>');
+        $.get('<%#=user_messages_unviewed_users_path %>');
         $("#ajax-indicator").hide();
     }).mouseleave(function(){
         $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        $("#user_messages_list").html("<%#=escape_javascript(render :partial => 'layouts/message_loading') %>");
 
-    });
+    });*/
 
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
diff --git a/config/menu.yml b/config/menu.yml
index 79659fb90..56966cb5f 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
@@ -13,8 +13,8 @@ button:
   -
     type: "view"
     name: "进入网站"
-    url:  "https://test.course.trustie.net/"
+    url:  "https://www.trustie.net/"
   -
     type: "view"
     name: "使用手册"
-    url:  "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/config/wechat.yml b/config/wechat.yml
index 3d679c4ce..d9a091db9 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,19 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
 
 production:
   <<: *default

From 6a25adb37ecd019f31822cae5fde1999d1e2fab5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 11:13:35 +0800
Subject: [PATCH 301/668] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=88=91=E7=9A=84=E5=8A=A8=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 2 +-
 config/menu.yml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index ef59e0ed4..3ccdc3257 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -121,7 +121,7 @@ class WechatsController < ActionController::Base
   on :fallback, respond: 'fallback message'
 
   on :click, with: 'FEEDBACK' do |request, key|
-    request.reply.text "如有反馈问题,请直接切入至输入框,发微信给我们即可"
+    request.reply.text "如有反馈问题，请直接切换至输入框，发微信给我们即可"
   end
 
   on :click, with: 'MY_NEWS' do |request, key|
diff --git a/config/menu.yml b/config/menu.yml
index 56966cb5f..155553bc2 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -1,7 +1,7 @@
 button:
  -
   type: "view"
-  name: "最新动态"
+  name: "我的动态"
   url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"

From 5ea6913278981da15473f6c97bd1f6e760f50955 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 11:19:10 +0800
Subject: [PATCH 302/668] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        |  2 --
 config/menu.yml   |  6 +++---
 config/wechat.yml | 14 +++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38f29a661..0727a920a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,4 @@ vendor/cache
 /public/files
 /tags
 /config/initializers/gitlab_config.rb
-/config/wechat.yml
-/config/menu.yml
 1234567
diff --git a/config/menu.yml b/config/menu.yml
index 155553bc2..3787be2e2 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
@@ -13,8 +13,8 @@ button:
   -
     type: "view"
     name: "进入网站"
-    url:  "https://www.trustie.net/"
+    url:  "https://test.course.trustie.net/"
   -
     type: "view"
     name: "使用手册"
-    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    url:  "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/config/wechat.yml b/config/wechat.yml
index d9a091db9..3d679c4ce 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,19 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
+  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
-  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
-  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
-  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
+  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
+  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
+  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
+  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
 
 production:
   <<: *default

From 91f7e950eec9cb5edf4b20d0f22c4ed1a94efc29 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 12:22:52 +0800
Subject: [PATCH 303/668] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb |  2 +-
 config/menu.yml                            |  6 +++---
 config/wechat.yml                          | 14 +++++++-------
 public/assets/wechat/app.html              |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index b45587ae0..79e2e05e2 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
-  <title>最新动态</title>
+  <title>我的动态</title>
   <meta charset='utf-8' />
   <meta name="keywords" content="" />
   <meta name="description" content="" />
diff --git a/config/menu.yml b/config/menu.yml
index 3787be2e2..155553bc2 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
@@ -13,8 +13,8 @@ button:
   -
     type: "view"
     name: "进入网站"
-    url:  "https://test.course.trustie.net/"
+    url:  "https://www.trustie.net/"
   -
     type: "view"
     name: "使用手册"
-    url:  "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/config/wechat.yml b/config/wechat.yml
index 3d679c4ce..d9a091db9 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,19 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
 
 production:
   <<: *default
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 63e88490f..b4920838a 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
-    <title>最新动态</title>
+    <title>我的动态</title>
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />

From c6d36bd73890e8da7c1d2425e4b3272c82fff1bf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 14:21:58 +0800
Subject: [PATCH 304/668] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb       |  2 +-
 .../organizations/_show_org_document.html.erb | 24 +++++++++++--------
 app/views/users/_show_unlogged.html.erb       |  0
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 app/views/users/_show_unlogged.html.erb

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index c938a2d4b..dd237de17 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  before_filter :authorize_allowed, :only => [:create]
+  before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
   layout 'base_org'
 
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 3042ca9ae..594063629 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -115,17 +115,21 @@
         <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
       </div>
       <div class="homepagePostReplyInputContainer">
-        <div nhname='new_message_<%= act.id %>' style="display:none;">
-          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
-              <div nhname='toolbar_container_<%= act.id %>'></div>
-              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
-              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= act.id %>' style="display:none;">
+              <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
+                  <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+                  <div nhname='toolbar_container_<%= act.id %>'></div>
+                  <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
+                  <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
 
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= act.id %>'></p>
-          <% end %>
-        </div>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= act.id %>'></p>
+              <% end %>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
new file mode 100644
index 000000000..e69de29bb

From d3c6c0ca99d9e13b29c0194006902269cc28f857 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 14:29:33 +0800
Subject: [PATCH 305/668] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E5=9B=9E=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sub_document_comments_controller.rb       |  2 +-
 .../_show_sub_document.html.erb               | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index d6b335006..80c14f004 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -1,7 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
-  before_filter :authorize_allowed, :only => [:create]
+  before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 
diff --git a/app/views/sub_document_comments/_show_sub_document.html.erb b/app/views/sub_document_comments/_show_sub_document.html.erb
index 135a48268..2eec92209 100644
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -123,17 +123,20 @@
         <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
       </div>
       <div class="homepagePostReplyInputContainer">
-        <div nhname='new_message_<%= act.id %>' style="display:none;">
-          <%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
-              <div nhname='toolbar_container_<%= act.id %>'></div>
-              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
-              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
-
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= act.id %>'></p>
-          <% end %>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= act.id %>' style="display:none;">
+              <%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
+                  <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+                  <div nhname='toolbar_container_<%= act.id %>'></div>
+                  <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
+                  <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= act.id %>'></p>
+              <% end %>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
       </div>
       <div class="cl"></div>
     </div>

From a44cb47a269eb252fe7fbf941cbb5a689631bb98 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 6 Jun 2016 14:41:18 +0800
Subject: [PATCH 306/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=9B=9E=E5=A4=8D=E6=A1=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_unlogged.html.erb | 1 +
 public/stylesheets/org.css              | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index e69de29bb..48cf73f15 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -0,0 +1 @@
+<div class="visitor-box fontGrey2"><a href="javascript:vod(0);" class="linkBlue">登录</a> 后可添加回复</div>
\ No newline at end of file
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 3e3f59f18..459d050e1 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -178,3 +178,6 @@ a.teacher-select {font-size:13px; color:#fff; padding:3px 18px; background-color
 a.teacher-select:hover {background-color:#297fb8;}
 a.follow-button {font-size:13px; color:#272727; padding:3px 5px; background-color:#f2efef;}
 a.follow-button:hover {background-color:#c1c1c1;}
+
+/*组织未登录提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}

From 4ea12a6dc581dd3facddcc9211973aa38f712cb2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 14:55:13 +0800
Subject: [PATCH 307/668] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8C=BF=E5=90=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20160606064856_delete_anonymous_org.rb | 8 ++++++++
 db/schema.rb                                      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160606064856_delete_anonymous_org.rb

diff --git a/db/migrate/20160606064856_delete_anonymous_org.rb b/db/migrate/20160606064856_delete_anonymous_org.rb
new file mode 100644
index 000000000..c1bc895cb
--- /dev/null
+++ b/db/migrate/20160606064856_delete_anonymous_org.rb
@@ -0,0 +1,8 @@
+class DeleteAnonymousOrg < ActiveRecord::Migration
+  def up
+    OrgDocumentComment.where(:organization_id => 23, :creator_id => 2).delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 05a6f4e22..504849d39 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 => 20160601073753) do
+ActiveRecord::Schema.define(:version => 20160606064856) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From df8df117a8538968df8f269448abd5aa837ecfb3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 15:02:11 +0800
Subject: [PATCH 308/668] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8C=BF=E5=90=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=EF=BC=88?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E5=92=8Cview=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_unlogged.html.erb | 4 +++-
 public/stylesheets/users.css            | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index 48cf73f15..258ebe7af 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -1 +1,3 @@
-<div class="visitor-box fontGrey2"><a href="javascript:vod(0);" class="linkBlue">登录</a> 后可添加回复</div>
\ No newline at end of file
+<div class="visitor-box fontGrey2">
+  <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
+</div>
\ No newline at end of file
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 6fa7ec6a0..eaefb8d1b 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -1,4 +1,7 @@
 #RSide{ min-height:1px;}
+
+
+
 /* 左侧信息*/
 .users_info{background:#fff; padding:10px; width:230px;  padding-right:0px; margin-bottom:10px; }
 .pic_head{ width:214px; height:214px; border:1px solid #cbcbcb; padding:2px; position:relative;}

From 0bf46f2ecd736d8006a0874a67b07d6fe9145bf5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 15:03:21 +0800
Subject: [PATCH 309/668] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer_public.html.erb | 2 +-
 app/views/layouts/_footer.html.erb             | 2 +-
 app/views/memos/show.html.erb                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index eb2e83ba2..7c5ab571e 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
         <select class="languageBox">
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 1db3091d7..a639e1203 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 3524de0c8..ca179f9fc 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -95,7 +95,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <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 class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content%></div>
       </div>
       <script type="text/javascript">
           $(function(){

From bfa447c19589f558cab90eb3c6b5d576d75cd011 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 15:11:07 +0800
Subject: [PATCH 310/668] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8Banonymos=E6=94=B9=E4=B8=BA=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3aa7d8a4a..46fdb02f3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1080,7 +1080,7 @@ module ApplicationHelper
       elsif @user
         title << @user.try(:realname)
       else
-        title << User.current.try(:realname)
+        title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
       end
       if first_page.nil? || first_page.web_title.nil?
         title << Setting.app_title unless Setting.app_title == title.last

From 793978f1962e8ba57b51efb39b3e4c5701b51281 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 16:15:35 +0800
Subject: [PATCH 311/668] =?UTF-8?q?=E7=BB=84=E7=BB=87--=E5=90=8D=E5=B8=88?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E9=9C=B8=EF=BC=9A=E5=A6=82=E5=9B=BE=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=9C=89=E5=A4=9A=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E5=90=8E=E5=BB=BA=E8=AE=AE=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BB=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E6=90=9C=E7=B4=A2=E6=A1=86=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/courses.js.erb  | 4 ++--
 app/views/organizations/projects.js.erb | 3 +--
 app/views/organizations/students.js.erb | 3 +--
 app/views/organizations/teachers.js.erb | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/organizations/courses.js.erb b/app/views/organizations/courses.js.erb
index dc42c115c..48868be39 100644
--- a/app/views/organizations/courses.js.erb
+++ b/app/views/organizations/courses.js.erb
@@ -1,3 +1,3 @@
 $("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= courses_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => true, :flag => true %>');
+//$("#org_student_search").attr('href','<%#= courses_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
diff --git a/app/views/organizations/projects.js.erb b/app/views/organizations/projects.js.erb
index e8d4f244a..cf3216fdf 100644
--- a/app/views/organizations/projects.js.erb
+++ b/app/views/organizations/projects.js.erb
@@ -1,3 +1,2 @@
 $("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= projects_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => true, :flag => true %>');
diff --git a/app/views/organizations/students.js.erb b/app/views/organizations/students.js.erb
index c65f8f861..7a427c1ac 100644
--- a/app/views/organizations/students.js.erb
+++ b/app/views/organizations/students.js.erb
@@ -1,3 +1,2 @@
 $("#org_students_list").html('<%= escape_javascript( render :partial => 'organizations/org_students_list', :locals => {:org_students => @org_students})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= students_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :remote => true, :flag => true %>');
diff --git a/app/views/organizations/teachers.js.erb b/app/views/organizations/teachers.js.erb
index cd7323a4a..04eecb810 100644
--- a/app/views/organizations/teachers.js.erb
+++ b/app/views/organizations/teachers.js.erb
@@ -1,3 +1,2 @@
 $("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list', :locals => {:org_teachers => @org_teachers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_teacher_search").attr('href','<%= teachers_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => true, :flag => true %>');
\ No newline at end of file

From 5b2c22d26453fbe8bc45fb9f629e8b442860a3c8 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 6 Jun 2016 16:42:41 +0800
Subject: [PATCH 312/668] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E6=8A=98?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/attachments/_attachment_history_download.html.erb b/app/views/attachments/_attachment_history_download.html.erb
index c805960f0..c3e586fb1 100644
--- a/app/views/attachments/_attachment_history_download.html.erb
+++ b/app/views/attachments/_attachment_history_download.html.erb
@@ -13,7 +13,7 @@
     <span class="attachment">
       <%= link_to truncate(@attachment.filename,length: 35, omission: '...'),
                   download_named_attachment_path(@attachment.id, @attachment.filename),
-                  :title => @attachment.filename+"\n"+@attachment.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+                  :title => @attachment.filename+"\n"+@attachment.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:280px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
     </span>
   <span class="fr">版本号：当前</span>
   <div class="cl"></div>

From b8d49f0079e88028dd9bde0aeb2f8b5ac756869b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 6 Jun 2016 18:24:12 +0800
Subject: [PATCH 313/668] 0

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

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 531f0cb90..857f98afc 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -325,13 +325,10 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
-    if !User.current.member_of?(@project)
-      if @project.hidden_repo
-        render_403
-        return -1
-      end
+    if !User.current.member_of?(@project) && @project.hidden_repo
+      render_403
+      return
     end
-
     @entries = @repository.entries(@path, @rev)
     @changeset = @repository.find_changeset_by_name(@rev)
     if request.xhr?

From 1553eadc58294f8bf98a9164487941b1853a61c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 10:17:16 +0800
Subject: [PATCH 314/668] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=94=B9=E6=88=90100?=
 =?UTF-8?q?0=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BA=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sub_document_comments_controller.rb       |  6 +++---
 .../layouts/_org_subdomain_footer.html.erb    | 13 ++++++++++++
 app/views/layouts/base_org_custom.html.erb    |  6 +++---
 app/views/layouts/base_sub_domain.html.erb    | 20 ++-----------------
 public/stylesheets/org2.css                   | 16 +++++++--------
 5 files changed, 29 insertions(+), 32 deletions(-)
 create mode 100644 app/views/layouts/_org_subdomain_footer.html.erb

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 80c14f004..2e0890e27 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -3,7 +3,7 @@ class SubDocumentCommentsController < ApplicationController
   before_filter :find_subfield_content, :only => [:show, :index]
   before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
-  layout 'base_sub_domain'
+  layout 'base_org_custom'
 
   def new
     @sub_document_comment = SubDocumentComment.new
@@ -41,7 +41,7 @@ class SubDocumentCommentsController < ApplicationController
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @document = SubDocumentComment.find(params[:id])
       respond_to do |format|
-        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+        format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'}
       end
     else
       render_403
@@ -58,7 +58,7 @@ class SubDocumentCommentsController < ApplicationController
       @offset ||= @atta_pages.offset
       @documents = paginateHelper @documents,20
       respond_to do |format|
-        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+        format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'}
       end
     else
       render_403
diff --git a/app/views/layouts/_org_subdomain_footer.html.erb b/app/views/layouts/_org_subdomain_footer.html.erb
new file mode 100644
index 000000000..dd991d900
--- /dev/null
+++ b/app/views/layouts/_org_subdomain_footer.html.erb
@@ -0,0 +1,13 @@
+<div class="sn-row sn-bg-grey2">
+  <div class="sn-footer">
+    <ul class="sn-footer-link">
+      <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+      <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+      <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+      <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+    </ul>
+    <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+    <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+      卫星导航仿真与测试开放实验室</div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb
index bfa76a221..8f071bfb2 100644
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@@ -9,16 +9,16 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'new_user', 'public', 'org_custom','jquery/jquery-ui-1.9.2' %>
+  <%= stylesheet_link_tag  'new_user', 'public', 'org_custom','jquery/jquery-ui-1.9.2', 'org2' %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
-  <%=render :partial => "math_js" %>
+  <%#=render :partial => "math_js" %>
 </head>
 <body style="background: #fff">
 <% update_visiti_count @organization %>
 <header id="por_header">
-  <%= render :partial => 'org_custom_header', :locals => {:subfield_content => @subfield_content} %>
+  <%= render :partial => 'organizations/org_custom_header', :locals => {:subfield_content => @subfield_content} %>
 </header>
 
 <%# 内容开始 %>
diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
index 871e2cdea..0e6509e70 100644
--- a/app/views/layouts/base_sub_domain.html.erb
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -160,30 +160,14 @@
   <div style="clear:both;"></div>
 
   <footer>
-    <!--footer-->
-    <div class="sn-row sn-bg-grey2">
-      <div class="sn-footer">
-        <ul class="sn-footer-link">
-          <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
-          <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
-          <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-          <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
-        </ul>
-        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
-        <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
-          卫星导航仿真与测试开放实验室</div>
-      </div>
-    </div>
+    <%= render :partial => "layouts/org_custom_footer" %>
   </footer>
 </div>
 
 <!--页面底部-->
 <div class="cl"></div>
 <div id="ajax-modal" style="display:none;"></div>
-
-<div id="ajax-indicator" style="display:none;">
-  <span><%= l(:label_loading) %></span>
-</div>
+<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 </body>
 </html>
 
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 3d46a9296..6672eb073 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -166,17 +166,17 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
 
 /* 内页新闻列表 */
 .sn-inner-body{ width:100%; background-color:#fff;}
-.sn-innner-content{ width:1200px; margin:0 auto;}
+.sn-innner-content{ width:1000px; margin:0 auto;}
 .sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:5px; border-bottom:1px dashed #eee;}
 .sn-circle{ margin:18px 5px 0 5px ;border:1px solid #24366e; width:5px; height:5px; -webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px; }
 .sn-inner-newslist ul li{ line-height:42px; font-size:15px; border-bottom:1px solid #eee;}
 .sn-inner-newslist a{font-size:15px; color:#888;}
 .sn-inner-newslist a:hover{ color:#24366e;}
-a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+a.sn-newslist-titile{ font-size:15px;width:700px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
 a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
 
 /* 内页新闻展示 */
-.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
+.sn-inner-newscon{ width:1000px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
 .sn-inner-pcon{text-indent:2em; overflow:hidden;}
 .sn-inner-newscon img{ display:block; max-width:830px; margin:25px auto 5px;}
 .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
@@ -186,8 +186,8 @@ a:hover.sn-newslist-zan{ background:url(../images/zan.gif) 0 -21px no-repeat; }
 /* 留言 */
 .sn-replybox{ margin-bottom:100px;}
 .sn-reply-h2{ font-size:18px; font-weight:normal; color:#24366e; margin-bottom:6px;}
-.sn-reply-form{ width:1200px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; }
-.sn-reply-text{ width:1200px; height:130px; background:#fff; border:none; resize:none;}
+.sn-reply-form{ width:1000px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; }
+.sn-reply-text{ width:1000px; height:130px; background:#fff; border:none; resize:none;}
 .sn-reply-btnbox{border-top:1px solid #e8e8e8; height:48px;}
 a.submit-btn{ display:block; color:#fff; text-align:center; font-size:14px; line-height:27px; width:79px; height:27px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#24366e; margin:8px 0 0 10px;}
 a:hover.submit-btn{ color:#16275c; color:#fff;}
@@ -196,10 +196,10 @@ a:hover.submit-btn{ color:#16275c; color:#fff;}
 .sn-reply-userpic img{ width:40px; height:40px;-webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px;}
 a.sn-reply-zan{ display:block; background:url(../images/zan.gif) 0 4px no-repeat; width:54px; height:16px; padding-left:12px; color:#999;  }
 a:hover.sn-reply-zan{ background:url(../images/zan.gif) 0 -32px no-repeat; }
-.sn-comment-listbox{ padding:23px 0; width:1200px;border-bottom:1px solid #e8e8e8;}
+.sn-comment-listbox{ padding:23px 0; width:1000px;border-bottom:1px solid #e8e8e8;}
 a.sn-reply-username { color:#24366e; margin-right:15px; }
-.sn-reply-usertxt{ width:1145px; font-size:14px; }
-.sn-reply-more{ width:1200px; height:25px; background:#ddd; text-align:center; line-height:25px;}
+.sn-reply-usertxt{ width:945px; font-size:14px; }
+.sn-reply-more{ width:1000px; height:25px; background:#ddd; text-align:center; line-height:25px;}
 
 /*用户图像*/
 .topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;}

From 59988f17da95111fffeaf8e3173d0248f485ad38 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 14:48:43 +0800
Subject: [PATCH 315/668] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  7 ++-
 app/helpers/organizations_helper.rb           | 43 ++++++++++++++++--
 .../_show_custom_org_subfield.html.erb        | 44 +++++++++++++++++++
 app/views/organizations/show.html.erb         |  9 +++-
 4 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 app/views/organizations/_show_custom_org_subfield.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index a0ef84798..ef11dc9da 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -28,6 +28,7 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
+  include OrganizationsHelper
   before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses]
   before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts]
   layout 'base_org'
@@ -77,8 +78,12 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.switch_type && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.switch_type && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+        unless params[:org_subfield_id].nil?
+          @org_subfield = OrgSubfield.where(:id => params[:org_subfield_id]).first
+          @subfield_acts = get_subfield_acts(@org_subfield)
+        end
         @subfield_content = @organization.org_subfields.order("priority")
         shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
         shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index fa0d33f6e..c523ec287 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -115,6 +115,41 @@ module OrganizationsHelper
     end
   end
 
+  # 组织的栏目类型标题
+  def subfield_title_type obj
+    case obj.org_act_type
+      when "OrgDocumentComment"
+        obj.org_act.title
+      when "Message"
+        obj.org_act.parent_id.nil? ? obj.org_act.subject : obj.org_act.parent.subject
+      when "News"
+        obj.org_act.title
+    end
+  end
+
+  # 组织的栏目类型时间
+  def subfield_time_type obj
+    case obj.org_act_type
+      when "OrgDocumentComment"
+        obj.org_act.updated_at
+      when "Message"
+        obj.org_act.updated_on
+      when "News"
+        obj.org_act.created_on
+    end
+  end
+
+  def subfield_reply_count_type obj
+    case obj.org_act_type
+      when "OrgDocumentComment"
+        obj.org_act.children.count
+      when "Message"
+        obj.org_act.children.count
+      when "News"
+        obj.org_act.comments_count
+    end
+  end
+
   #排列下拉框
   def subfield_status_option
     type = []
@@ -186,9 +221,11 @@ module OrganizationsHelper
   end
 
   def get_subfield_acts field
-    org_subfield = OrgSubfield.find(field.id)
-    org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
-    org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
+    unless field.nil?
+      org_subfield = OrgSubfield.find(field.id)
+      org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
+      org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
+    end
   end
 
   def allow_to_create?(org, type)
diff --git a/app/views/organizations/_show_custom_org_subfield.html.erb b/app/views/organizations/_show_custom_org_subfield.html.erb
new file mode 100644
index 000000000..473a5757d
--- /dev/null
+++ b/app/views/organizations/_show_custom_org_subfield.html.erb
@@ -0,0 +1,44 @@
+<% if @subfield_acts.blank? %>
+<% else %>
+    <div class="sn-inner-body">
+      <div class="sn-innner-content">
+        <div class="sn-row sn-bg-white">
+          <div class="sn-content-position">
+            您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+            <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %>
+          </div>
+        </div>
+        <div class="sn-inner-newslist">
+          <h2 class="sn-inner-newsh2"><%= @organization.name %></h2>
+          <ul>
+            <% @subfield_acts.each do |act| %>
+                <% title = subfield_title_type(act) %>
+                <% time = subfield_time_type(act) %>
+                <% reply_count = subfield_reply_count_type(act) %>
+                <% document = act.org_act %>
+                <li>
+                  <div class="sn-circle fl"></div>
+                  <% if act.org_act_type == "OrgDocumentComment" %>
+                      <%=link_to title, org_document_comment_path(act.org_act, :organization_id => @organization.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif act.org_act_type == "News" %>
+                      <%=link_to title, news_path(act.org_act), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif act.org_act_type == "Message" %>
+                      <%=link_to title, board_message_path(act.org_act.board.id, act.org_act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% end %>
+                  <span class=" txt-grey fr"><%= format_date(time) %></span>
+                  <span class="sn-newslist-reply fr mr10 txt-grey">回复（<%= reply_count %>）</span>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+
+          <!--<div>-->
+            <!--<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">-->
+              <!--<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>-->
+              <!--<div class="cl"></div>-->
+            <!--</ul>-->
+          <!--</div>-->
+        </div>
+      </div>
+    </div>
+<% end %>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index 72e95ded9..ab3120a5d 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,6 +1,11 @@
 <%# 区分两种模式 params[:org_subfield_id] 不为空的时候则跳到栏目%>
-<% if @organization.switch_type && params[:org_subfield_id].nil? %>
-    <%= render :partial => 'show_custom' %>
+<% if @organization.switch_type %>
+    <% if params[:org_subfield_id].nil? %>
+        <%= render :partial => 'show_custom' %>
+    <% else %>
+        <%#= 单个栏目模式二中显示 %>
+        <%= render :partial => 'show_custom_org_subfield' %>
+    <% end %>
 <% else %>
     <%= javascript_include_tag "jquery.infinitescroll.js" %>
 

From 1d44116841d672d8d5dbd5d3b1057cc2bb566d86 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 7 Jun 2016 15:30:17 +0800
Subject: [PATCH 316/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   |   12 +-
 .../_evaluation_un_title.html.erb             |   18 +-
 app/views/student_work/index.js.erb           |    5 +-
 public/javascripts/resizeable_table.js        |   13 +-
 .../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 +-
 public/stylesheets/courses.css                |    2 +
 24 files changed, 3058 insertions(+), 3046 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 8381a479b..950c1660a 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,14 +1,14 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="resizeable_table(3,4,11,11)">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-        <th class="hworkList260" style="text-align:left;">作品名称</th>
-        <th class="hworkList80">
-          <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        <th class="hworkList260 hide-text" style="text-align:left;">作品名称</th>
+        <th class="hworkList80 hide-text">
+          <span class="HomeworkStuTitle f14 fb">姓名</span>
         </th>
-        <th class="hworkList80">
-          <span class="HomeworkStuTitle f14 fb fl">学号</span>
+        <th class="hworkList80 hide-text">
+          <span class="HomeworkStuTitle f14 fb">学号</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
         <th class="hworkList260" style="text-align:left;">作品名称</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index d3b8c3443..540c5f315 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -3,26 +3,26 @@
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pr10 hide-text' : 'hworkList130 pr10 hide-text'%>" style="text-align:left;">作品名称</th>
-      <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> pr10 hide-text">
-      <%= 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%>
+      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pl5 pr5 hide-text' : 'hworkList130  pl5 pr5 hide-text'%>" style="text-align:left;">作品名称</th>
+      <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%>  pl5 pr5 hide-text">
+      <%= 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" ,: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",:remote => true%>
       <% end%>
     </th>
-    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> pr10 hide-text">
-      <%= 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%>
+    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%>  pl5 pr5 hide-text">
+      <%= 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" ,: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",:remote => true%>
       <% end%>
     </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <th class="hworkList130 pr10" style="text-align:left;">作品名称</th>
+        <th class="hworkList130  pl5 pr5" style="text-align:left;">作品名称</th>
         <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList210' : 'hworkList160'%>">
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %> pr10" style="text-align:left;">作品名称</th>
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %>  pl5 pr5" style="text-align:left;">作品名称</th>
     <% end %>
     <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%>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index 73b94260d..709561f1a 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,2 +1,3 @@
-$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
-$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
\ No newline at end of file
+$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
+$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
+$("th").each(function(){$(this).css("width",$(this).width()-1);});
\ No newline at end of file
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index 0d79ba737..a17fc9109 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -18,6 +18,7 @@
            for(var i = colS;i<colE;i++){
                addListener(headerTds[i],"mousedown",onmousedown);
                addListener(headerTds[i],"mousemove",onmousemove);
+               addListener(headerTds[i],"mouseup",onmouseup);
            }
 
            function onmousedown(event){
@@ -47,10 +48,12 @@
                    }
                }else{
                    var trObj = tblObj.rows[0];
-                   if(srcObj.offsetWidth - offsetX <=4){//实际改变本单元格列宽
+                   if(srcObj.offsetWidth - offsetX <=5){//实际改变本单元格列宽
                        targetTd=srcObj;
                        resizeable = true;
-                       srcObj.style.cursor='col-resize';//修改光标样式
+                       for(var i = colS;i<colE;i++){
+                           headerTds[i].style.cursor='col-resize';//修改光标样式
+                       };
                    }else{
                        resizeable = false;
                        mousedown = false;
@@ -58,6 +61,12 @@
                    }
                }
            }
+           function onmouseup(event){
+               tartgetTd = null;
+               resizeable = false;
+               mousedown = false;
+               document.body.style.cursor='default';
+           }
            document.body.onmouseup = function(event){
                tartgetTd = null;
                resizeable = false;
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;
+}
+
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 720d358d0..aa0178dec 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -559,6 +559,8 @@ a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3
 .st_box_top  a:hover{ color:#1c9ec7;}
 a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;}
 a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
+a.sort_up{ display: inline-block; width:8px; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat;}
+a.sort_down{ display: inline-block; width:8px; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat;}
 a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;}
 a:hover.st_img { border:1px solid #1c9ec7; }
 .st_boxlist{ border-bottom:1px dashed #CCC; height:43px; margin-bottom:10px; }

From f5da2ba5f670ec2a14082bdaa2492c3735baf181 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 15:40:16 +0800
Subject: [PATCH 317/668] =?UTF-8?q?=E5=B0=86current=20page=E6=8F=90?=
 =?UTF-8?q?=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 641e95bed..edd8b5386 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -75,6 +75,11 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     console.log("ActivityController load");
 
     $scope.page = 0;
+    var current_page = rms.get('current_page');
+    if(typeof current_page !== 'undefined'){
+        $scope.page = current_page;
+    }
+
     $scope.activities = rms.get("activities") || [];
 
     var savePageConfig = function(){
@@ -84,13 +89,11 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     }
 
     var loadPageConfig = function(){
-        var current_page = rms.get('current_page');
+
         var has_more = rms.get('has_more');
         var activities = rms.get('activities');
 
-        if(typeof current_page !== 'undefined'){
-            $scope.page = current_page;
-        }
+
         if(typeof has_more !== 'undefined'){
             $scope.has_more = has_more;
         }
@@ -98,7 +101,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     }
 
     var loadActData = function(page){
-        if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
+        if (page > 0 && $scope.activities.length >0){ //应该是返回过来的
             loadPageConfig();
             var yOffset = rms.get("yoffset");
             $location.hash(yOffset);

From acf4a64e6ae833a2a9662df644094d2a0c941712 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 15:40:28 +0800
Subject: [PATCH 318/668] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb       |   7 +-
 ..._show_custom_org_document_comment.html.erb | 111 ++++++++++
 app/views/org_document_comments/show.html.erb | 196 +++++++++---------
 3 files changed, 217 insertions(+), 97 deletions(-)
 create mode 100644 app/views/org_document_comments/_show_custom_org_document_comment.html.erb

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index dd237de17..43e95a0e9 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -38,6 +38,11 @@ class OrgDocumentCommentsController < ApplicationController
 
   def show
     @document = OrgDocumentComment.find(params[:id])
+    @org_subfield = OrgSubfield.where(:id => @document.org_subfield_id).first
+    @subfield_content = @organization.org_subfields.order("priority")
+    respond_to do |format|
+      format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'}
+    end
   end
 
   def index
@@ -91,7 +96,7 @@ class OrgDocumentCommentsController < ApplicationController
   def add_reply_in_doc
     @document = OrgDocumentComment.find(params[:id]).root
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
-    @comment.content = params[:org_comment][:org_content]
+    @comment.content = params[:org_content]
     @document.children << @comment
     @document.save
     respond_to do |format|
diff --git a/app/views/org_document_comments/_show_custom_org_document_comment.html.erb b/app/views/org_document_comments/_show_custom_org_document_comment.html.erb
new file mode 100644
index 000000000..ec2a1ca8f
--- /dev/null
+++ b/app/views/org_document_comments/_show_custom_org_document_comment.html.erb
@@ -0,0 +1,111 @@
+<div class="sn-innner-content">
+  <div class="sn-row sn-bg-white">
+    <div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+      <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %> &gt;
+      <a class = "sn-link-grey2 sn-hidden" ><%= @document.title %></a>
+    </div>
+  </div>
+  <div class="sn-inner-newslist">
+    <h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
+    <div class="sn-inner-newscon">
+      <p class=" sn-inner-psmall">来源：<%= @org_subfield.name %> 发布时间：<%= format_date(@document.created_at) %></p>
+      <p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>
+    </div>
+  </div>
+  <!--回复-->
+  <% if User.current.logged? %>
+      <% comments_for_doc = @document.children.reorder("created_at desc") %>
+      <% count = @document.children.count() %>
+      <div class="sn-replybox">
+        <h2 class="sn-reply-h2">留言板<span class="sn-fr sn-f14 sn-font-grey3 sn-mt10"><%= count %>条留言</span></h2>
+        <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'org_document_comments', :id => @document.id, :flag => true}, :html => {:multipart => true, :id => 'message_form', :class => "sn-reply-form", } do |f| %>
+            <textarea class="sn-reply-text" name="org_content" id="text_submain"></textarea>
+            <%#= f.kindeditor :sub_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor', :class => "sn-reply-text" %>
+            <div class="sn-reply-btnbox">
+              <a href="javascript:void(0)" onclick = "org_new_files_upload()" class = "submit-btn">发表</a>
+            </div>
+            <p id="sub_domain_reply" style="display: none;color: #ff0000">内容不能为空</p>
+            <%#= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+        <% end %>
+
+        <div class="sn-reply-comment">
+          <h2 class="sn-comment-h2">全部评论</h2>
+
+          <div id="newstyle_reply_div_<%= @document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
+            <% comments_for_doc.each_with_index  do |reply,i| %>
+                <div class="sn-comment-listbox">
+                  <a href="javascript:void(0)"  class="sn-reply-userpic fl"><img  src="images/img-news-con.jpg" width="824" height="522" alt="" /></a>
+                  <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "sn-reply-username fl" %><span class="fl"><%= time_from_now(reply.created_at) %></span>
+                  <div class="fl sn-reply-usertxt ">
+                    <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => reply.id, :content=> reply.content} %>
+                    <%#= reply.content.html_safe unless reply.content.nil? %>
+                  </div>
+                  <!--<a href="javascript:void(0)" target="_blank" class="sn-reply-zan fl">（100）</a>-->
+                  <div class="cl"></div>
+                </div>
+            <% end %>
+          </div>
+          <% if count > 3 %>
+              <div class="sn-reply-more">
+                <a id="reply_btn_<%= @document.id %>" onclick="expand_reply('#newstyle_reply_div_<%= @document.id %>','#reply_btn_<%= @document.id%>')" data-count="<%= count %>" data-init="0" href="javascript:void(0)" value="show_help">
+                  展开更多
+                </a>
+              </div>
+          <% end %>
+        </div>
+      </div>
+  <% end %>
+</div>
+
+<script>
+    $(document).ready(function(){
+        var replyCount = $(".sn-comment-listbox").size();
+        if (replyCount >3){
+            for(var i= 3; i < replyCount+1; i++){
+                $(".sn-comment-listbox").eq(i).hide();
+            }
+        }
+    });
+    function expand_reply(container, btnid) {
+        var target = $(container).children();
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+
+    //验证搜索时输入字
+    function regexName_submain(content) {
+        var name = $.trim($("#name").val());
+        if (name.length == 0) {
+            $("#project_name_span").text(content);
+            $("#project_name_span").css('color', '#ff0000');
+            $("#project_name_span").focus();
+            return false;
+        }
+        else {
+            $("#project_name_span").text("");
+            return true;
+        }
+    }
+
+    function org_new_files_upload(){
+        var name = $.trim($("#text_submain").val());
+//        content = $("#text_submain").val();
+        if (name.length == 0) {
+            $("#sub_domain_reply").show();
+        }
+        else {
+            $("#message_form").submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index c7adc39fb..dfa37bfb6 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -1,72 +1,75 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
-<script>
-    $(function() {
-        sd_create_editor_from_data(<%= @document.id%>,null,"100%", "<%=@document.class.to_s%>");
-        showNormalImage('message_description_<%= @document.id %>');
-    });
-</script>
-<div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" id="organization_document_<%= @document.id %>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo">
-        <%= link_to User.find(@document.creator_id), user_url_in_org(@document.creator_id), :class => "newsBlue mr15" %>
-        TO&nbsp;&nbsp;<%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %>
-        |
-        <% if @document.organization.home_id == @document.id %>
-            <span style="color:#269ac9;">首页</span>
-        <% else %>
-            <span style="color:#269ac9;">组织文章</span>
-        <% end %>
-      </div>
-      <div class="homepagePostTitle postGrey"><%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %></div>
-      <div class="homepagePostDate">
-        发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
-      <% unless @document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
-            <%= @document.content.html_safe %>
+<% if @organization.switch_type %>
+    <%= render :partial => 'show_custom_org_document_comment' %>
+<% else %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
+    <script>
+        $(function() {
+            sd_create_editor_from_data(<%= @document.id%>,null,"100%", "<%=@document.class.to_s%>");
+            showNormalImage('message_description_<%= @document.id %>');
+        });
+    </script>
+    <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" id="organization_document_<%= @document.id %>">
+      <div class="homepagePostBrief">
+        <div class="homepagePostPortrait">
+          <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo">
+            <%= link_to User.find(@document.creator_id), user_url_in_org(@document.creator_id), :class => "newsBlue mr15" %>
+            TO&nbsp;&nbsp;<%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %>
+            |
+            <% if @document.organization.home_id == @document.id %>
+                <span style="color:#269ac9;">首页</span>
+            <% else %>
+                <span style="color:#269ac9;">组织文章</span>
+            <% end %>
           </div>
-      <% end %>
-      <div class=" fl">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
-        <%#= link_to_attachments_course @document, :author => false %>
-      </div>
-      <!--    <%# if defined?(home_id) %>
+          <div class="homepagePostTitle postGrey"><%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %></div>
+          <div class="homepagePostDate">
+            发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
+          <% unless @document.content.blank? %>
+              <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
+                <%= @document.content.html_safe %>
+              </div>
+          <% end %>
+          <div class=" fl">
+            <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
+            <%#= link_to_attachments_course @document, :author => false %>
+          </div>
+          <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(@document.organization_id) || User.current.id == @document.creator_id) %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
-                  </li>
-                  <li>
-                    <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :remote => true, :class => 'postOptionLink' %>
+          <% if User.current.admin? || User.current.admin_of_org?(Organization.find(@document.organization_id) || User.current.id == @document.creator_id) %>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <li>
+                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
+                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                        <% end %>
+                      </li>
+                      <li>
+                        <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
+                      </li>
+                      <li>
+                        <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :remote => true, :class => 'postOptionLink' %>
+                      </li>
+                    </ul>
                   </li>
                 </ul>
-              </li>
-            </ul>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-  </div>
-  <% comments_for_doc = @document.children.reorder("created_at desc") %>
-  <% count = @document.children.count() %>
+              </div>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+      </div>
+      <% comments_for_doc = @document.children.reorder("created_at desc") %>
+      <% count = @document.children.count() %>
 
-  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
-    <%# if count > 0 %>
+      <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
+        <%# if count > 0 %>
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复
             <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
@@ -123,50 +126,51 @@
           <% end %>
         </div>
         <div class="cl"></div>
-    <%# end %>
-    <%# if User.current.logged?%>
+        <%# end %>
+        <%# if User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">
           <em class="talkWrapArrow"></em>
           <div class="cl"></div>
           <div class="talkConIpt ml5 mb10" id="reply<%= @document.id %>">
             <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'org_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
-               <%= f.kindeditor :org_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
+                <%= f.kindeditor :org_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
                 <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
                 <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %>
             <% end %>
             <div class="cl"></div>
           </div>
         </div>
-    <%# end %>
-  </div>
-</div>
+        <%# end %>
+      </div>
+    </div>
 
-<script type="text/javascript">
-    $(function(){
-        $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
-            var postContent = $(this).html();
-            postContent = postContent.replace(/&nbsp;/g," ");
-            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-            $(this).html(postContent);
+    <script type="text/javascript">
+        $(function(){
+            $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+                var postContent = $(this).html();
+                postContent = postContent.replace(/&nbsp;/g," ");
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                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);
-        if (btn.data('init') == '0') {
-            btn.data('init', 1);
-            btn.html('收起回复');
-            target.show();
-        } else {
-            btn.data('init', 0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
+        function expand_reply(container, btnid) {
+            var target = $(container);
+            var btn = $(btnid);
+            if (btn.data('init') == '0') {
+                btn.data('init', 1);
+                btn.html('收起回复');
+                target.show();
+            } else {
+                btn.data('init', 0);
+                btn.html('展开更多');
+                target.hide();
+                target.eq(0).show();
+                target.eq(1).show();
+                target.eq(2).show();
+            }
         }
-    }
-</script>
\ No newline at end of file
+    </script>
+<% end %>

From 196c92f9c4c0c0c514010e566886a8a13421e4ea Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 7 Jun 2016 16:02:00 +0800
Subject: [PATCH 319/668] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=80=E5=A4=9A=E5=8F=AA=E5=8A=A0=E8=B5=9E=E4=B8=89=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=97=B6=E6=89=8D=E5=8A=A0=E8=BD=BD=E4=BD=99=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 34 +++++++-
 app/models/blog_comment.rb                    | 12 +++
 app/models/comment.rb                         | 12 +++
 app/models/journal.rb                         | 12 +++
 app/models/journals_for_message.rb            | 12 +++
 app/models/message.rb                         | 12 +++
 app/models/org_document_comment.rb            | 11 +++
 app/views/courses/_course_activity.html.erb   | 17 ----
 app/views/news/_project_news_detail.html.erb  | 17 ----
 .../organizations/_org_activities.html.erb    | 20 ++---
 .../_org_subfield_message.html.erb            | 37 +-------
 .../organizations/_org_subfield_news.html.erb | 37 +-------
 .../organizations/_show_org_document.html.erb | 51 +----------
 .../projects/_project_activities.html.erb     | 17 ----
 app/views/projects/_project_news.html.erb     | 37 +-------
 app/views/users/_all_replies.html.erb         | 39 +++++++++
 app/views/users/_comment_reply.html.erb       | 21 +----
 app/views/users/_course_homework.html.erb     | 80 +-----------------
 .../users/_course_journalsformessage.html.erb | 39 +--------
 app/views/users/_course_message.html.erb      | 39 +--------
 app/views/users/_course_news.html.erb         | 37 +-------
 app/views/users/_homework_replies.html.erb    | 78 +++++++++++++++++
 app/views/users/_project_issue_reply.html.erb | 43 +---------
 app/views/users/_project_message.html.erb     | 37 +-------
 app/views/users/_project_news.html.erb        | 37 +-------
 app/views/users/_user_activities.html.erb     | 17 ----
 app/views/users/_user_blog.html.erb           | 37 +-------
 .../users/_user_homework_detail.html.erb      | 84 +------------------
 .../users/_user_journalsformessage.html.erb   | 46 +---------
 app/views/users/_user_jours_list.html.erb     | 16 ----
 app/views/users/all_journals.js.erb           |  5 ++
 config/routes.rb                              |  1 +
 public/javascripts/application.js             | 81 ++++++++++++++----
 33 files changed, 347 insertions(+), 728 deletions(-)
 create mode 100644 app/views/users/_all_replies.html.erb
 create mode 100644 app/views/users/_homework_replies.html.erb
 create mode 100644 app/views/users/all_journals.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 88a524d1e..cad57b49f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -100,7 +100,7 @@ class UsersController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course]
+        @is_in_course = params[:is_in_course].to_i
         @course_activity = params[:course_activity].to_i
     end
     respond_to do |format|
@@ -3236,6 +3236,38 @@ class UsersController < ApplicationController
     end
   end
 
+  def all_journals
+    if params[:type].present?
+      case params[:type]
+        when 'OrgDocumentComment'
+          obj = OrgDocumentComment.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_at desc")
+        when 'Message'
+          obj = Message.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'News'
+          obj = News.where('id = ?', params[:id].to_i).first
+          @journals = obj.comments.reorder("created_on desc")
+        when 'JournalsForMessage'
+          obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'Issue'
+          obj = Issue.where('id = ?', params[:id].to_i).first
+          @journals = obj.journals.reorder("created_on desc")
+        when 'BlogComment'
+          obj = BlogComment.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'HomeworkCommon'
+          obj = HomeworkCommon.where('id = ?', params[:id].to_i).first
+          @journals = obj.journals_for_messages.reorder("created_on desc")
+          @is_in_course = params[:is_in_course].to_i if params[:is_in_course]
+          @course_activity = params[:course_activity].to_i if params[:course_activity]
+          @is_teacher = User.current.allowed_to?(:as_teacher,obj.course)
+          @user_activity_id = params[:user_activity_id].to_i if params[:user_activity_id]
+      end
+    end
+  end
+
   private
 
   def find_user
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 05ae02fe2..8959e9c29 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -76,6 +76,18 @@ class BlogComment < ActiveRecord::Base
   def project
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_at
+  end
+
+  def content_detail
+    self.content
+  end
+
   #博客回复微信模板消息
   # def blog_wechat_message
   #   ws = WechatService.new
diff --git a/app/models/comment.rb b/app/models/comment.rb
index edb5e472f..80b52a8f4 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -104,4 +104,16 @@ class Comment < ActiveRecord::Base
     end
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.comments
+  end
+
 end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index bea273a41..0f88fcb7f 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -137,6 +137,18 @@ class Journal < ActiveRecord::Base
   end
   ##
 
+  def creator_user
+    self.user
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.notes
+  end
+
   private
 
   def split_private_notes
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index d8819515c..68cb9da15 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -329,4 +329,16 @@ class JournalsForMessage < ActiveRecord::Base
       down_course_score_num(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
+
+  def creator_user
+    self.user
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.notes
+  end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 393fd3a60..14add0d02 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -221,6 +221,18 @@ class Message < ActiveRecord::Base
     update_org_activity(self.class, self.id)
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.content
+  end
+
   private
 
   def add_author_as_watcher
diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb
index dd070c825..dd7734a54 100644
--- a/app/models/org_document_comment.rb
+++ b/app/models/org_document_comment.rb
@@ -35,4 +35,15 @@ class OrgDocumentComment < ActiveRecord::Base
 
   end
 
+  def creator_user
+    self.creator
+  end
+
+  def created_time
+    self.created_at
+  end
+
+  def content_detail
+    self.content
+  end
 end
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index 763748ad7..16d151d83 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -52,23 +52,6 @@
 </style>
 <% course_activities.includes(:course_act).each do |activity| if course_activities %>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             $(function () {
                 sd_create_editor_from_data(<%= activity.id%>, null, "100%", "<%= activity.class.to_s %>");
             });
diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb
index b3e6de5cf..e1a5237ab 100644
--- a/app/views/news/_project_news_detail.html.erb
+++ b/app/views/news/_project_news_detail.html.erb
@@ -6,23 +6,6 @@
 <% if all_news %>
     <% all_news.each do |news| %>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             function expand_reply_input(id) {
                 $(id).toggle();
             }
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 2c135cd2e..7ee94215c 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -53,34 +53,34 @@
         <% if act.container_type == 'Project' %>
             <% case act.org_act_type.to_s %>
             <% when 'Issue' %>
-                <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/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} %>
+                <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Project'%>
-                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
         <% if act.container_type ==  'Course' %>
             <% case act.org_act_type.to_s %>
             <% when 'HomeworkCommon' %>
-                <%= render :partial => 'org_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
+                <%= render :partial => 'users/course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
             <% when 'News' %>
-                <%= render :partial => 'org_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message'%>
-                <%= render :partial => 'org_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id,:is_course=>0,:is_board=>0} %>
             <% when 'Poll' %>
-                <%= render :partial => 'org_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
+                <%= render :partial => 'users/course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
             <% when 'Course'%>
-                <%= render :partial => 'org_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
+                <%= render :partial => 'users/course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'OrgSubfield' %>
             <% if act.org_act_type == 'Message' and act.org_act_id and Message.where("id=#{act.org_act_id}").count > 0 %>
                 <% message = Message.find(act.org_act_id) %>
                 <% if !message.board.course_id.nil? %>
-                    <%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                    <%= render :partial => 'users/course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
                 <% elsif message.board.project_id != -1 %>
-                    <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                    <%= render :partial => 'users/project_message', :locals => {:activity => message,:user_activity_id =>act.id,:is_course=>0,:is_board=>0} %>
                 <% elsif message.board.org_subfield_id %>
                     <%= render :partial => 'organizations/org_subfield_message', :locals => {:activity => message, :user_activity_id  => act.id} %>
                 <% end %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index bcc43610e..ef8ea55d9 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -88,46 +88,15 @@
         </span>
       </div>
       <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 662a965e9..a822b4a0d 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -70,48 +70,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                        <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 3042ca9ae..f9ca06d90 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -6,7 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo">
-        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
+        <%= link_to document.creator.show_name, user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
             <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
@@ -61,7 +61,7 @@
       <% end %>
     </div>
   </div>
-  <% comments_for_doc = document.children.reorder("created_at desc") %>
+  <% comments_for_doc = document.children.reorder("created_at desc").limit(3) %>
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
@@ -74,41 +74,14 @@
       </div>
       <% if count > 3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>',<%= document.id %>,'OrgDocumentComment',<%= document.id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
               展开更多
             </a>
           </div>
       <% end %>
     </div>
     <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
-      <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>
-              <div class="homepagePostReplyDes">
-                <div class="homepagePostReplyPublisher">
-                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
-                  <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
-                  <span id="reply_praise_count_<%=comment.id %>">
-                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                  </span>
-                </div>
-                <% unless comment.content.blank? %>
-                    <div class="homepagePostReplyContent" id="reply_content_<%= comment.id %>"><%= comment.content.html_safe %></div>
-                <% end %>
-              </div>
-              <div class="cl"></div>
-            </li>
-        <% end %>
-      </ul>
+      <%= render :partial => 'users/all_replies', :locals => {:comments => comments_for_doc}%>
     </div>
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
@@ -134,22 +107,6 @@
 </div>
 
 <script type="text/javascript">
-    function expand_reply(container, btnid) {
-        var target = $(container);
-        var btn = $(btnid);
-        if (btn.data('init') == '0') {
-            btn.data('init', 1);
-            btn.html('收起回复');
-            target.show();
-        } else {
-            btn.data('init', 0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
     $(function(){
         user_card_show_hide();
     });
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index bb6cdad0c..6322a532a 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -50,23 +50,6 @@
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             $(function () {
                 sd_create_editor_from_data(<%= activity.id %>, null, "100%", "<%= activity.class.to_s %>");
             });
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 7baf93e4f..b974b4499 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -50,48 +50,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
new file mode 100644
index 000000000..15c8944fd
--- /dev/null
+++ b/app/views/users/_all_replies.html.erb
@@ -0,0 +1,39 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+            <%= format_activity_day(comment.created_time) %> <%= format_time(comment.created_time, false) %>
+            <span id="reply_praise_count_<%=comment.id %>">
+                 <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+            </span>
+          </div>
+          <% unless comment.content_detail.blank? %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <% if comment.class == 'Journal' %>
+                    <% if comment.details.any? %>
+                        <% details_to_strings(comment.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= comment.notes.html_safe %></P>
+                <% else %>
+                    <%= comment.content_detail.html_safe %>
+                <% end %>
+              </div>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
index 895eda8a9..77dcea1f2 100644
--- a/app/views/users/_comment_reply.html.erb
+++ b/app/views/users/_comment_reply.html.erb
@@ -4,24 +4,5 @@
         <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
       </div>
   <% end %>
-  <!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
-      <%# if comment.user == User.current %>
-        <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-      <%# else %>
-        <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-      <%# end %>
-  </span>-->
-  <div class="orig_user fl">
-    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
-  </div>
-  <div class="orig_right fl">
-    <% if comment.try(:user).try(:realname) == ' ' %>
-        <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
-    <% else %>
-        <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
-    <% end %>
-    <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-    <div class="orig_content "><%= comment.notes.html_safe %></div>
-  </div>
-  <div class="cl"></div>
+  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment} %>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index e694f471e..701f81da1 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -302,91 +302,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply_homework('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'HomeworkCommon',<%=user_activity_id %>,-1,<%=course_activity %>,<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals_for_messages.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= time_from_now(comment.created_on) %>
-                    </div>
-                    <% unless comment.m_parent_id.nil? %>
-                        <% parents_rely = [] %>
-                        <% parents_rely = get_reply_parents parents_rely, comment %>
-                        <% length = parents_rely.length %>
-                        <div id="comment_reply_<%=comment.id %>">
-                          <% if length <= 3 %>
-                              <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                          <% else %>
-                              <div class="orig_cont clearfix">
-                                <div class="orig_cont clearfix">
-                                  <div id="comment_reply_<%=parents_rely[length - 1].id %>">
-                                    <%=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>
-                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                              </div>
-                          <% end %>
-                        </div>
-                    <% end %>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <div class="orig_reply mb10 mt-10">
-                      <div class="reply">
-                                <span class="reply-right">
-                                    <span id="reply_praise_count_<%=comment.id %>">
-                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                    </span>
-                                    <span style="position: relative" class="fr mr20">
-                                        <%= link_to(
-                                                    l(:button_reply),
-                                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
-                                                    :remote => true,
-                                                    :method => 'get',
-                                                    :title => l(:button_reply)) %>
-                                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                                    </span>
-                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
-                                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
-                                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                                    <% end %>
-                                </span>
-                        <div class="cl"></div>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= comment.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index a76081859..e04dd3006 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -43,50 +43,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index c0e667396..76971e240 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -97,7 +97,7 @@
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
@@ -105,43 +105,10 @@
     </div>
 
     <% activity= activity.parent ? activity.parent : activity%>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <%  if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.includes(:author).reorder("created_on desc").each do |reply|%>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% 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 %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index b89873b43..5ffa78158 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -75,48 +75,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
new file mode 100644
index 000000000..de6e96ae3
--- /dev/null
+++ b/app/views/users/_homework_replies.html.erb
@@ -0,0 +1,78 @@
+<ul>
+  <% comments.reorder("created_on desc").each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <% if comment.try(:user).try(:realname) == ' ' %>
+                <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+            <% else %>
+                <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+            <% end %>
+            <%= time_from_now(comment.created_on) %>
+          </div>
+          <% unless comment.m_parent_id.nil? %>
+              <% parents_rely = [] %>
+              <% parents_rely = get_reply_parents parents_rely, comment %>
+              <% length = parents_rely.length %>
+              <div id="comment_reply_<%=comment.id %>">
+                <% if length <= 3 %>
+                    <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+                <% else %>
+                    <div class="orig_cont clearfix">
+                      <div class="orig_cont clearfix">
+                        <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>
+                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                    </div>
+                <% end %>
+              </div>
+          <% end %>
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
+            <%= comment.notes.html_safe %></div>
+          <div class="orig_reply mb10 mt-10">
+            <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
+                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => course_activity},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                    <% end %>
+                </span>
+              <div class="cl"></div>
+            </div>
+          </div>
+          <p id="reply_message_<%= comment.id%>"></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ 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 2b43d8acf..1f4c4b44b 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -10,54 +10,17 @@
     <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
     <% if count > 3 %>
         <div class="homepagePostReplyBannerMore">
-          <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+          <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Issue',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
             展开更多
           </a>
         </div>
     <% end %>
   </div>
 
-  <% replies_all_i = 0 %>
+  <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
       <div class="" id="reply_div_<%= user_activity_id %>">
-        <ul>
-          <% activity.journals.includes(:user, :details).reorder("created_on desc").each do |reply| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_content_<%= reply.id %>');
-                      autoUrl('reply_content_<%= reply.id %>');
-                  });
-              </script>
-              <% replies_all_i=replies_all_i + 1 %>
-              <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                <div class="homepagePostReplyPortrait">
-                  <%= 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">
-                    <% if reply.try(:user).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                    <%= format_time(reply.created_on) %>
-                    <span id="reply_praise_count_<%= reply.id %>">
-                       <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                    </span>
-                  </div>
-                  <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                    <% if reply.details.any? %>
-                        <% details_to_strings(reply.details).each do |string| %>
-                            <p><%= string %></p>
-                        <% end %>
-                    <% end %>
-                    <P><%= reply.notes.html_safe %></P>
-                  </div>
-                </div>
-                <div class="cl"></div>
-              </li>
-          <% end %>
-        </ul>
+        <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
       </div>
   <% end %>
 
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index b3c2fea59..f82dc35e7 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -95,46 +95,15 @@
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.includes(:author).reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index b354bc668..43b22b193 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -72,48 +72,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 432074191..3b327c080 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -29,23 +29,6 @@
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
-            function expand_reply(container,btnid){
-                var target = $(container);
-                var btn = $(btnid);
-                if(btn.data('init')=='0'){
-                    btn.data('init',1);
-                    btn.html('收起回复');
-                    target.show();
-                }else{
-                    btn.data('init',0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             function expand_reply_input(id) {
                 $(id).toggle();
             }
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 522bdc835..97b2737c8 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -56,48 +56,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'BlogComment',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= 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">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index a01418d2f..97eeec89f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -312,95 +312,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply_homework('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.id%>',<%= homework_common.id %>,'HomeworkCommon',<%=homework_common.id %>,<%=is_in_course %>,-1, -1)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = homework_common.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= homework_common.id %>">
-          <ul>
-            <% homework_common.journals_for_messages.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= time_from_now(comment.created_on) %>
-                    </div>
-                    <% unless comment.m_parent_id.nil? %>
-                        <% parents_rely = [] %>
-                        <% parents_rely = get_reply_parents parents_rely, comment %>
-                        <% length = parents_rely.length %>
-                        <div id="comment_reply_<%=comment.id %>">
-                          <% if length <= 3 %>
-                            <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                          <% else %>
-                            <div class="orig_cont clearfix">
-                              <div class="orig_cont clearfix">
-                                <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>
-                              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                            </div>
-                          <% end %>
-                        </div>
-                    <% end %>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <div class="orig_reply mb10 mt-10">
-                      <div class="reply">
-                                <span class="reply-right">
-                                    <span id="reply_praise_count_<%=comment.id %>">
-                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                    </span>
-                                    <span style="position: relative" class="fr mr20">
-                                        <%= link_to(
-                                                  l(:button_reply),
-                                                  {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :course_activity => -1},
-                                                  :remote => true,
-                                                  :method => 'get',
-                                                  :title => l(:button_reply)) %>
-                                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                                    </span>
-                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
-                                    <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => -1},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                                    <% end %>
-                                </span>
-                        <div class="cl"></div>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= comment.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => is_in_course, :course_activity=> -1, :is_teacher => is_teacher, :user_activity_id => -1} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 6967bb398..e7f42c661 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -70,57 +70,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <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_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.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">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                      <div id="message_delete_<%=comment.id %>" style="display: none" class="mr10 fr">
-                          <% if comment.user == User.current|| User.current.admin? %>
-                              <%= link_to(l(:label_bid_respond_delete),
-                                          {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
-                                          :class => "delete", :title => l(:button_delete))  %>
-                          <% end %>
-                      </div>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 94d2998ae..afd498d06 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -7,22 +7,6 @@
     <% jours.each do |jour|%>
         <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
             <script type="text/javascript">
-                function expand_reply(container,btnid){
-                    var target = $(container);
-                    var btn = $(btnid);
-                    if(btn.data('init')=='0'){
-                        btn.data('init',1);
-                        btn.html('收起回复');
-                        target.show();
-                    }else{
-                        btn.data('init',0);
-                        btn.html('展开更多');
-                        target.hide();
-                        target.eq(0).show();
-                        target.eq(1).show();
-                        target.eq(2).show();
-                    }
-                }
                 $(function(){
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");
                 });
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
new file mode 100644
index 000000000..c18c6aae4
--- /dev/null
+++ b/app/views/users/all_journals.js.erb
@@ -0,0 +1,5 @@
+<% if params[:type] == 'HomeworkCommon' %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+<% else %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 3a34f0a6b..e4b462d93 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -549,6 +549,7 @@ RedmineApp::Application.routes.draw do
       get 'user_messages_unviewed'
       post "user_commit_homework"
       post 'user_select_homework'
+      get 'all_journals'
     end
 
     member do
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 468bf64e9..9e77249c6 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1283,21 +1283,72 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container,btnid){
-  var target = $(container);
-  var btn = $(btnid);
-  if(btn.data('init')=='0'){
-    btn.data('init',1);
-    btn.html('收起回复');
-    target.show();
-  }else{
-    btn.data('init',0);
-    btn.html('展开更多');
-    target.hide();
-    target.eq(0).show();
-    target.eq(1).show();
-    target.eq(2).show();
-  }
+function expand_reply(container, btnid, id, type, div_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
+function expand_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id,
+                is_in_course: is_in_course,
+                course_activity: course_activity,
+                user_activity_id: user_activity_id
+            },
+            function(data) {
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
 }
 
 //by yk 列表描述将文字和起来去掉空格多于100就显示省略号

From c5e6514c18e66226df900ef811397fcf503c680b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 7 Jun 2016 16:02:20 +0800
Subject: [PATCH 320/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=9B=BE=E6=A0=87float=E6=B6=88=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_evaluation_un_title.html.erb             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 540c5f315..5ed2e82d6 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -25,43 +25,43 @@
         <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %>  pl5 pr5" style="text-align:left;">作品名称</th>
     <% end %>
     <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%>
+      <%= 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" ,: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",: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%>
+      <%= 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" ,: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",: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%>
+      <%= 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",: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",: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%>
+          <%= 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",: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%>
+              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
           <% end%>
         </th>
     <% end%>
     <% 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%>
+          <%= 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",: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%>
+              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",: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%>
+      <%= 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",: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%>
+          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
       <% end%>
     </th>
   </tr>

From c5bccf1adbfedfbd03c522b8e5863d3a57d7e723 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 16:02:46 +0800
Subject: [PATCH 321/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=8C=89=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb |  4 +--
 app/helpers/organizations_helper.rb         | 32 ++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index ef11dc9da..b247f5a41 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -105,9 +105,9 @@ class OrganizationsController < ApplicationController
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
-          @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
+          @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue', 'JournalsForMessage') and
                                         ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
-                                        order by created_at desc limit 6;")
+                                        order by updated_at desc limit 6;")
         end
         render :layout => 'base_org_custom'
       else
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index c523ec287..181dfccb9 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -66,52 +66,52 @@ module OrganizationsHelper
   def org_user_by_type obj
     case obj.act_type
       when "Message"
-        user = obj.act.author
+        obj.act.author
       when "News"
-        user = obj.act.author
+        obj.act.author
       when "HomeworkCommon"
-        user = obj.act.user
+        obj.act.user
       when "Issue"
-        user = obj.act.author
+        obj.act.author
     end
   end
 
   def org_title_by_type obj
     case obj.act_type
       when "Message"
-        user = obj.act.parent_id.nil? ? obj.act.subject : obj.act.parent.subject
+        obj.act.parent_id.nil? ? obj.act.subject : obj.act.parent.subject
       when "News"
-        user = obj.act.title
+        obj.act.title
       when "HomeworkCommon"
-        user = obj.act.name
+        obj.act.name
       when "Issue"
-        user = obj.act.subject
+        obj.act.subject
     end
   end
 
   def org_content_by_type obj
     case obj.act_type
       when "Message"
-        user = obj.act.parent_id.nil? ? obj.act.content : obj.act.parent.content
+        obj.act.parent_id.nil? ? obj.act.content : obj.act.parent.content
       when "News"
-        user = obj.act.description
+        obj.act.description
       when "HomeworkCommon"
-        user = obj.act.description
+        obj.act.description
       when "Issue"
-        user = obj.act.description
+        obj.act.description
     end
   end
 
   def org_time_by_type obj
     case obj.act_type
       when "Message"
-        time = obj.act.updated_on
+        obj.act.updated_on
       when "News"
-        user = obj.act.created_on
+        obj.act.created_on
       when "HomeworkCommon"
-        user = obj.act.updated_at
+        obj.act.updated_at
       when "Issue"
-        user = obj.act.updated_on
+        obj.act.updated_on
     end
   end
 

From 768d91278d7ec28bb6ec117aeddb163e516c8731 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 7 Jun 2016 16:15:25 +0800
Subject: [PATCH 322/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 3ccdc3257..169a33fce 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -6,7 +6,7 @@ class WechatsController < ActionController::Base
 
   # default text responder when no other match
   on :text do |request, content|
-    request.reply.text "您的意见已收到" # Just echo
+    request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
   end
 
   # When receive 'help', will trigger this responder
@@ -179,7 +179,7 @@ class WechatsController < ActionController::Base
         raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
 
         user, last_login_on = User.try_to_login(params[:username], params[:password])
-        raise "用户名或密码错误,请重新登录" unless user
+        raise "用户名或密码错误,请重新输入" unless user
         #补全用户信息
 
         raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat

From 3e2810129b0ade5745db75c34a427d1c5741fa3d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 16:24:02 +0800
Subject: [PATCH 323/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=BF=87=E6=BB=A4=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b247f5a41..a75a0e698 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -105,7 +105,7 @@ class OrganizationsController < ApplicationController
         end
         # 最新动态, 来自我关联的项目和课程
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
-          @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue', 'JournalsForMessage') and
+          @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
                                         ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
                                         order by updated_at desc limit 6;")
         end

From 33780759a92f16047af1292badb9a3e2dc861ddf Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 16:39:42 +0800
Subject: [PATCH 324/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAhtml5mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/wechat.yml                    | 4 ++--
 public/javascripts/wechat/app.js     | 4 ++--
 public/javascripts/wechat/vue.min.js | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 public/javascripts/wechat/vue.min.js

diff --git a/config/wechat.yml b/config/wechat.yml
index 3d679c4ce..c8337521e 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,8 +3,8 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wxf694495398c7d470"
+  secret: "743e038392f1d89540e95f8f7645849a"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index edd8b5386..730226df8 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -525,9 +525,9 @@ app.directive('loadingSpinner', function ($http) {
     };
 });
 
-app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider) {
+app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider, $locationProvider) {
     var rootPath = '/assets/wechat/'
-
+    $locationProvider.html5Mode(true);
     $routeProvider
         .when('/activities', {
             templateUrl: rootPath + 'activities.html',
diff --git a/public/javascripts/wechat/vue.min.js b/public/javascripts/wechat/vue.min.js
new file mode 100644
index 000000000..c8e12c31b
--- /dev/null
+++ b/public/javascripts/wechat/vue.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Vue.js v1.0.24
+ * (c) 2016 Evan You
+ * Released under the MIT License.
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.Vue=e()}(this,function(){"use strict";function t(e,n,r){if(i(e,n))return void(e[n]=r);if(e._isVue)return void t(e._data,n,r);var s=e.__ob__;if(!s)return void(e[n]=r);if(s.convert(n,r),s.dep.notify(),s.vms)for(var o=s.vms.length;o--;){var a=s.vms[o];a._proxy(n),a._digest()}return r}function e(t,e){if(i(t,e)){delete t[e];var n=t.__ob__;if(!n)return void(t._isVue&&(delete t._data[e],t._digest()));if(n.dep.notify(),n.vms)for(var r=n.vms.length;r--;){var s=n.vms[r];s._unproxy(e),s._digest()}}}function i(t,e){return Ai.call(t,e)}function n(t){return Oi.test(t)}function r(t){var e=(t+"").charCodeAt(0);return 36===e||95===e}function s(t){return null==t?"":t.toString()}function o(t){if("string"!=typeof t)return t;var e=Number(t);return isNaN(e)?t:e}function a(t){return"true"===t?!0:"false"===t?!1:t}function h(t){var e=t.charCodeAt(0),i=t.charCodeAt(t.length-1);return e!==i||34!==e&&39!==e?t:t.slice(1,-1)}function l(t){return t.replace(Ti,c)}function c(t,e){return e?e.toUpperCase():""}function u(t){return t.replace(Ni,"$1-$2").toLowerCase()}function f(t){return t.replace(ji,c)}function p(t,e){return function(i){var n=arguments.length;return n?n>1?t.apply(e,arguments):t.call(e,i):t.call(e)}}function d(t,e){e=e||0;for(var i=t.length-e,n=new Array(i);i--;)n[i]=t[i+e];return n}function v(t,e){for(var i=Object.keys(e),n=i.length;n--;)t[i[n]]=e[i[n]];return t}function m(t){return null!==t&&"object"==typeof t}function g(t){return Ei.call(t)===Si}function _(t,e,i,n){Object.defineProperty(t,e,{value:i,enumerable:!!n,writable:!0,configurable:!0})}function y(t,e){var i,n,r,s,o,a=function h(){var a=Date.now()-s;e>a&&a>=0?i=setTimeout(h,e-a):(i=null,o=t.apply(r,n),i||(r=n=null))};return function(){return r=this,n=arguments,s=Date.now(),i||(i=setTimeout(a,e)),o}}function b(t,e){for(var i=t.length;i--;)if(t[i]===e)return i;return-1}function w(t){var e=function i(){return i.cancelled?void 0:t.apply(this,arguments)};return e.cancel=function(){e.cancelled=!0},e}function C(t,e){return t==e||(m(t)&&m(e)?JSON.stringify(t)===JSON.stringify(e):!1)}function $(t){this.size=0,this.limit=t,this.head=this.tail=void 0,this._keymap=Object.create(null)}function k(){var t,e=Xi.slice(rn,en).trim();if(e){t={};var i=e.match(un);t.name=i[0],i.length>1&&(t.args=i.slice(1).map(x))}t&&(Yi.filters=Yi.filters||[]).push(t),rn=en+1}function x(t){if(fn.test(t))return{value:o(t),dynamic:!1};var e=h(t),i=e===t;return{value:i?t:e,dynamic:i}}function A(t){var e=cn.get(t);if(e)return e;for(Xi=t,sn=on=!1,an=hn=ln=0,rn=0,Yi={},en=0,nn=Xi.length;nn>en;en++)if(tn=Ki,Ki=Xi.charCodeAt(en),sn)39===Ki&&92!==tn&&(sn=!sn);else if(on)34===Ki&&92!==tn&&(on=!on);else if(124===Ki&&124!==Xi.charCodeAt(en+1)&&124!==Xi.charCodeAt(en-1))null==Yi.expression?(rn=en+1,Yi.expression=Xi.slice(0,en).trim()):k();else switch(Ki){case 34:on=!0;break;case 39:sn=!0;break;case 40:ln++;break;case 41:ln--;break;case 91:hn++;break;case 93:hn--;break;case 123:an++;break;case 125:an--}return null==Yi.expression?Yi.expression=Xi.slice(0,en).trim():0!==rn&&k(),cn.put(t,Yi),Yi}function O(t){return t.replace(dn,"\\$&")}function T(){var t=O(Cn.delimiters[0]),e=O(Cn.delimiters[1]),i=O(Cn.unsafeDelimiters[0]),n=O(Cn.unsafeDelimiters[1]);mn=new RegExp(i+"((?:.|\\n)+?)"+n+"|"+t+"((?:.|\\n)+?)"+e,"g"),gn=new RegExp("^"+i+".*"+n+"$"),vn=new $(1e3)}function N(t){vn||T();var e=vn.get(t);if(e)return e;if(!mn.test(t))return null;for(var i,n,r,s,o,a,h=[],l=mn.lastIndex=0;i=mn.exec(t);)n=i.index,n>l&&h.push({value:t.slice(l,n)}),r=gn.test(i[0]),s=r?i[1]:i[2],o=s.charCodeAt(0),a=42===o,s=a?s.slice(1):s,h.push({tag:!0,value:s.trim(),html:r,oneTime:a}),l=n+i[0].length;return l<t.length&&h.push({value:t.slice(l)}),vn.put(t,h),h}function j(t,e){return t.length>1?t.map(function(t){return E(t,e)}).join("+"):E(t[0],e,!0)}function E(t,e,i){return t.tag?t.oneTime&&e?'"'+e.$eval(t.value)+'"':S(t.value,i):'"'+t.value+'"'}function S(t,e){if(_n.test(t)){var i=A(t);return i.filters?"this._applyFilters("+i.expression+",null,"+JSON.stringify(i.filters)+",false)":"("+t+")"}return e?t:"("+t+")"}function F(t,e,i,n){R(t,1,function(){e.appendChild(t)},i,n)}function D(t,e,i,n){R(t,1,function(){V(t,e)},i,n)}function P(t,e,i){R(t,-1,function(){z(t)},e,i)}function R(t,e,i,n,r){var s=t.__v_trans;if(!s||!s.hooks&&!Bi||!n._isCompiled||n.$parent&&!n.$parent._isCompiled)return i(),void(r&&r());var o=e>0?"enter":"leave";s[o](i,r)}function L(t){if("string"==typeof t){t=document.querySelector(t)}return t}function H(t){if(!t)return!1;var e=t.ownerDocument.documentElement,i=t.parentNode;return e===t||e===i||!(!i||1!==i.nodeType||!e.contains(i))}function I(t,e){var i=t.getAttribute(e);return null!==i&&t.removeAttribute(e),i}function M(t,e){var i=I(t,":"+e);return null===i&&(i=I(t,"v-bind:"+e)),i}function W(t,e){return t.hasAttribute(e)||t.hasAttribute(":"+e)||t.hasAttribute("v-bind:"+e)}function V(t,e){e.parentNode.insertBefore(t,e)}function B(t,e){e.nextSibling?V(t,e.nextSibling):e.parentNode.appendChild(t)}function z(t){t.parentNode.removeChild(t)}function U(t,e){e.firstChild?V(t,e.firstChild):e.appendChild(t)}function J(t,e){var i=t.parentNode;i&&i.replaceChild(e,t)}function q(t,e,i,n){t.addEventListener(e,i,n)}function Q(t,e,i){t.removeEventListener(e,i)}function G(t){var e=t.className;return"object"==typeof e&&(e=e.baseVal||""),e}function Z(t,e){Hi&&!/svg$/.test(t.namespaceURI)?t.className=e:t.setAttribute("class",e)}function X(t,e){if(t.classList)t.classList.add(e);else{var i=" "+G(t)+" ";i.indexOf(" "+e+" ")<0&&Z(t,(i+e).trim())}}function Y(t,e){if(t.classList)t.classList.remove(e);else{for(var i=" "+G(t)+" ",n=" "+e+" ";i.indexOf(n)>=0;)i=i.replace(n," ");Z(t,i.trim())}t.className||t.removeAttribute("class")}function K(t,e){var i,n;if(it(t)&&at(t.content)&&(t=t.content),t.hasChildNodes())for(tt(t),n=e?document.createDocumentFragment():document.createElement("div");i=t.firstChild;)n.appendChild(i);return n}function tt(t){for(var e;e=t.firstChild,et(e);)t.removeChild(e);for(;e=t.lastChild,et(e);)t.removeChild(e)}function et(t){return t&&(3===t.nodeType&&!t.data.trim()||8===t.nodeType)}function it(t){return t.tagName&&"template"===t.tagName.toLowerCase()}function nt(t,e){var i=Cn.debug?document.createComment(t):document.createTextNode(e?" ":"");return i.__v_anchor=!0,i}function rt(t){if(t.hasAttributes())for(var e=t.attributes,i=0,n=e.length;n>i;i++){var r=e[i].name;if(xn.test(r))return l(r.replace(xn,""))}}function st(t,e,i){for(var n;t!==e;)n=t.nextSibling,i(t),t=n;i(e)}function ot(t,e,i,n,r){function s(){if(a++,o&&a>=h.length){for(var t=0;t<h.length;t++)n.appendChild(h[t]);r&&r()}}var o=!1,a=0,h=[];st(t,e,function(t){t===e&&(o=!0),h.push(t),P(t,i,s)})}function at(t){return t&&11===t.nodeType}function ht(t){if(t.outerHTML)return t.outerHTML;var e=document.createElement("div");return e.appendChild(t.cloneNode(!0)),e.innerHTML}function lt(t,e){var i=t.tagName.toLowerCase(),n=t.hasAttributes();if(An.test(i)||On.test(i)){if(n)return ct(t,e)}else{if(gt(e,"components",i))return{id:i};var r=n&&ct(t,e);if(r)return r}}function ct(t,e){var i=t.getAttribute("is");if(null!=i){if(gt(e,"components",i))return t.removeAttribute("is"),{id:i}}else if(i=M(t,"is"),null!=i)return{id:i,dynamic:!0}}function ut(e,n){var r,s,o;for(r in n)s=e[r],o=n[r],i(e,r)?m(s)&&m(o)&&ut(s,o):t(e,r,o);return e}function ft(t,e){var i=Object.create(t||null);return e?v(i,vt(e)):i}function pt(t){if(t.components)for(var e,i=t.components=vt(t.components),n=Object.keys(i),r=0,s=n.length;s>r;r++){var o=n[r];An.test(o)||On.test(o)||(e=i[o],g(e)&&(i[o]=bi.extend(e)))}}function dt(t){var e,i,n=t.props;if(Fi(n))for(t.props={},e=n.length;e--;)i=n[e],"string"==typeof i?t.props[i]=null:i.name&&(t.props[i.name]=i);else if(g(n)){var r=Object.keys(n);for(e=r.length;e--;)i=n[r[e]],"function"==typeof i&&(n[r[e]]={type:i})}}function vt(t){if(Fi(t)){for(var e,i={},n=t.length;n--;){e=t[n];var r="function"==typeof e?e.options&&e.options.name||e.id:e.name||e.id;r&&(i[r]=e)}return i}return t}function mt(t,e,n){function r(i){var r=Tn[i]||Nn;o[i]=r(t[i],e[i],n,i)}pt(e),dt(e);var s,o={};if(e["extends"]&&(t="function"==typeof e["extends"]?mt(t,e["extends"].options,n):mt(t,e["extends"],n)),e.mixins)for(var a=0,h=e.mixins.length;h>a;a++)t=mt(t,e.mixins[a],n);for(s in t)r(s);for(s in e)i(t,s)||r(s);return o}function gt(t,e,i,n){if("string"==typeof i){var r,s=t[e],o=s[i]||s[r=l(i)]||s[r.charAt(0).toUpperCase()+r.slice(1)];return o}}function _t(){this.id=jn++,this.subs=[]}function yt(t){Dn=!1,t(),Dn=!0}function bt(t){if(this.value=t,this.dep=new _t,_(t,"__ob__",this),Fi(t)){var e=Di?wt:Ct;e(t,Sn,Fn),this.observeArray(t)}else this.walk(t)}function wt(t,e){t.__proto__=e}function Ct(t,e,i){for(var n=0,r=i.length;r>n;n++){var s=i[n];_(t,s,e[s])}}function $t(t,e){if(t&&"object"==typeof t){var n;return i(t,"__ob__")&&t.__ob__ instanceof bt?n=t.__ob__:Dn&&(Fi(t)||g(t))&&Object.isExtensible(t)&&!t._isVue&&(n=new bt(t)),n&&e&&n.addVm(e),n}}function kt(t,e,i){var n=new _t,r=Object.getOwnPropertyDescriptor(t,e);if(!r||r.configurable!==!1){var s=r&&r.get,o=r&&r.set,a=$t(i);Object.defineProperty(t,e,{enumerable:!0,configurable:!0,get:function(){var e=s?s.call(t):i;if(_t.target&&(n.depend(),a&&a.dep.depend(),Fi(e)))for(var r,o=0,h=e.length;h>o;o++)r=e[o],r&&r.__ob__&&r.__ob__.dep.depend();return e},set:function(e){var r=s?s.call(t):i;e!==r&&(o?o.call(t,e):i=e,a=$t(e),n.notify())}})}}function xt(t){t.prototype._init=function(t){t=t||{},this.$el=null,this.$parent=t.parent,this.$root=this.$parent?this.$parent.$root:this,this.$children=[],this.$refs={},this.$els={},this._watchers=[],this._directives=[],this._uid=Rn++,this._isVue=!0,this._events={},this._eventsCount={},this._isFragment=!1,this._fragment=this._fragmentStart=this._fragmentEnd=null,this._isCompiled=this._isDestroyed=this._isReady=this._isAttached=this._isBeingDestroyed=this._vForRemoving=!1,this._unlinkFn=null,this._context=t._context||this.$parent,this._scope=t._scope,this._frag=t._frag,this._frag&&this._frag.children.push(this),this.$parent&&this.$parent.$children.push(this),t=this.$options=mt(this.constructor.options,t,this),this._updateRef(),this._data={},this._callHook("init"),this._initState(),this._initEvents(),this._callHook("created"),t.el&&this.$mount(t.el)}}function At(t){if(void 0===t)return"eof";var e=t.charCodeAt(0);switch(e){case 91:case 93:case 46:case 34:case 39:case 48:return t;case 95:case 36:return"ident";case 32:case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return e>=97&&122>=e||e>=65&&90>=e?"ident":e>=49&&57>=e?"number":"else"}function Ot(t){var e=t.trim();return"0"===t.charAt(0)&&isNaN(t)?!1:n(e)?h(e):"*"+e}function Tt(t){function e(){var e=t[c+1];return u===qn&&"'"===e||u===Qn&&'"'===e?(c++,n="\\"+e,p[Hn](),!0):void 0}var i,n,r,s,o,a,h,l=[],c=-1,u=Vn,f=0,p=[];for(p[In]=function(){void 0!==r&&(l.push(r),r=void 0)},p[Hn]=function(){void 0===r?r=n:r+=n},p[Mn]=function(){p[Hn](),f++},p[Wn]=function(){if(f>0)f--,u=Jn,p[Hn]();else{if(f=0,r=Ot(r),r===!1)return!1;p[In]()}};null!=u;)if(c++,i=t[c],"\\"!==i||!e()){if(s=At(i),h=Xn[u],o=h[s]||h["else"]||Zn,o===Zn)return;if(u=o[0],a=p[o[1]],a&&(n=o[2],n=void 0===n?i:n,a()===!1))return;if(u===Gn)return l.raw=t,l}}function Nt(t){var e=Ln.get(t);return e||(e=Tt(t),e&&Ln.put(t,e)),e}function jt(t,e){return Ht(e).get(t)}function Et(e,i,n){var r=e;if("string"==typeof i&&(i=Tt(i)),!i||!m(e))return!1;for(var s,o,a=0,h=i.length;h>a;a++)s=e,o=i[a],"*"===o.charAt(0)&&(o=Ht(o.slice(1)).get.call(r,r)),h-1>a?(e=e[o],m(e)||(e={},t(s,o,e))):Fi(e)?e.$set(o,n):o in e?e[o]=n:t(e,o,n);return!0}function St(t,e){var i=ur.length;return ur[i]=e?t.replace(sr,"\\n"):t,'"'+i+'"'}function Ft(t){var e=t.charAt(0),i=t.slice(1);return er.test(i)?t:(i=i.indexOf('"')>-1?i.replace(ar,Dt):i,e+"scope."+i)}function Dt(t,e){return ur[e]}function Pt(t){nr.test(t),ur.length=0;var e=t.replace(or,St).replace(rr,"");return e=(" "+e).replace(lr,Ft).replace(ar,Dt),Rt(e)}function Rt(t){try{return new Function("scope","return "+t+";")}catch(e){}}function Lt(t){var e=Nt(t);return e?function(t,i){Et(t,e,i)}:void 0}function Ht(t,e){t=t.trim();var i=Kn.get(t);if(i)return e&&!i.set&&(i.set=Lt(i.exp)),i;var n={exp:t};return n.get=It(t)&&t.indexOf("[")<0?Rt("scope."+t):Pt(t),e&&(n.set=Lt(t)),Kn.put(t,n),n}function It(t){return hr.test(t)&&!cr.test(t)&&"Math."!==t.slice(0,5)}function Mt(){pr.length=0,dr.length=0,vr={},mr={},gr=!1}function Wt(){for(var t=!0;t;)t=!1,Vt(pr),Vt(dr),pr.length?t=!0:(Ri&&Cn.devtools&&Ri.emit("flush"),Mt())}function Vt(t){for(var e=0;e<t.length;e++){var i=t[e],n=i.id;vr[n]=null,i.run()}t.length=0}function Bt(t){var e=t.id;if(null==vr[e]){var i=t.user?dr:pr;vr[e]=i.length,i.push(t),gr||(gr=!0,Qi(Wt))}}function zt(t,e,i,n){n&&v(this,n);var r="function"==typeof e;if(this.vm=t,t._watchers.push(this),this.expression=e,this.cb=i,this.id=++_r,this.active=!0,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new Gi,this.newDepIds=new Gi,this.prevError=null,r)this.getter=e,this.setter=void 0;else{var s=Ht(e,this.twoWay);this.getter=s.get,this.setter=s.set}this.value=this.lazy?void 0:this.get(),this.queued=this.shallow=!1}function Ut(t,e){var i=void 0,n=void 0;e||(e=yr,e.clear());var r=Fi(t),s=m(t);if(r||s){if(t.__ob__){var o=t.__ob__.dep.id;if(e.has(o))return;e.add(o)}if(r)for(i=t.length;i--;)Ut(t[i],e);else if(s)for(n=Object.keys(t),i=n.length;i--;)Ut(t[n[i]],e)}}function Jt(t){return it(t)&&at(t.content)}function qt(t,e){var i=e?t:t.trim(),n=wr.get(i);if(n)return n;var r=document.createDocumentFragment(),s=t.match(kr),o=xr.test(t);if(s||o){var a=s&&s[1],h=$r[a]||$r.efault,l=h[0],c=h[1],u=h[2],f=document.createElement("div");for(f.innerHTML=c+t+u;l--;)f=f.lastChild;for(var p;p=f.firstChild;)r.appendChild(p)}else r.appendChild(document.createTextNode(t));return e||tt(r),wr.put(i,r),r}function Qt(t){if(Jt(t))return qt(t.innerHTML);if("SCRIPT"===t.tagName)return qt(t.textContent);for(var e,i=Gt(t),n=document.createDocumentFragment();e=i.firstChild;)n.appendChild(e);return tt(n),n}function Gt(t){if(!t.querySelectorAll)return t.cloneNode();var e,i,n,r=t.cloneNode(!0);if(Ar){var s=r;if(Jt(t)&&(t=t.content,s=r.content),i=t.querySelectorAll("template"),i.length)for(n=s.querySelectorAll("template"),e=n.length;e--;)n[e].parentNode.replaceChild(Gt(i[e]),n[e])}if(Or)if("TEXTAREA"===t.tagName)r.value=t.value;else if(i=t.querySelectorAll("textarea"),i.length)for(n=r.querySelectorAll("textarea"),e=n.length;e--;)n[e].value=i[e].value;return r}function Zt(t,e,i){var n,r;return at(t)?(tt(t),e?Gt(t):t):("string"==typeof t?i||"#"!==t.charAt(0)?r=qt(t,i):(r=Cr.get(t),r||(n=document.getElementById(t.slice(1)),n&&(r=Qt(n),Cr.put(t,r)))):t.nodeType&&(r=Qt(t)),r&&e?Gt(r):r)}function Xt(t,e,i,n,r,s){this.children=[],this.childFrags=[],this.vm=e,this.scope=r,this.inserted=!1,this.parentFrag=s,s&&s.childFrags.push(this),this.unlink=t(e,i,n,r,this);var o=this.single=1===i.childNodes.length&&!i.childNodes[0].__v_anchor;o?(this.node=i.childNodes[0],this.before=Yt,this.remove=Kt):(this.node=nt("fragment-start"),this.end=nt("fragment-end"),this.frag=i,U(this.node,i),i.appendChild(this.end),this.before=te,this.remove=ee),this.node.__v_frag=this}function Yt(t,e){this.inserted=!0;var i=e!==!1?D:V;i(this.node,t,this.vm),H(this.node)&&this.callHook(ie)}function Kt(){this.inserted=!1;var t=H(this.node),e=this;this.beforeRemove(),P(this.node,this.vm,function(){t&&e.callHook(ne),e.destroy()})}function te(t,e){this.inserted=!0;var i=this.vm,n=e!==!1?D:V;st(this.node,this.end,function(e){n(e,t,i)}),H(this.node)&&this.callHook(ie)}function ee(){this.inserted=!1;var t=this,e=H(this.node);this.beforeRemove(),ot(this.node,this.end,this.vm,this.frag,function(){e&&t.callHook(ne),t.destroy()})}function ie(t){!t._isAttached&&H(t.$el)&&t._callHook("attached")}function ne(t){t._isAttached&&!H(t.$el)&&t._callHook("detached")}function re(t,e){this.vm=t;var i,n="string"==typeof e;n||it(e)&&!e.hasAttribute("v-if")?i=Zt(e,!0):(i=document.createDocumentFragment(),i.appendChild(e)),this.template=i;var r,s=t.constructor.cid;if(s>0){var o=s+(n?e:ht(e));r=jr.get(o),r||(r=Fe(i,t.$options,!0),jr.put(o,r))}else r=Fe(i,t.$options,!0);this.linker=r}function se(t,e,i){var n=t.node.previousSibling;if(n){for(t=n.__v_frag;!(t&&t.forId===i&&t.inserted||n===e);){if(n=n.previousSibling,!n)return;t=n.__v_frag}return t}}function oe(t){var e=t.node;if(t.end)for(;!e.__vue__&&e!==t.end&&e.nextSibling;)e=e.nextSibling;return e.__vue__}function ae(t){for(var e=-1,i=new Array(Math.floor(t));++e<t;)i[e]=e;return i}function he(t,e,i,n){return n?"$index"===n?t:n.charAt(0).match(/\w/)?jt(i,n):i[n]:e||i}function le(t,e,i){for(var n,r,s,o=e?[]:null,a=0,h=t.options.length;h>a;a++)if(n=t.options[a],s=i?n.hasAttribute("selected"):n.selected){if(r=n.hasOwnProperty("_value")?n._value:n.value,!e)return r;o.push(r)}return o}function ce(t,e){for(var i=t.length;i--;)if(C(t[i],e))return i;return-1}function ue(t,e){var i=e.map(function(t){var e=t.charCodeAt(0);return e>47&&58>e?parseInt(t,10):1===t.length&&(e=t.toUpperCase().charCodeAt(0),e>64&&91>e)?e:Xr[t]});return i=[].concat.apply([],i),function(e){return i.indexOf(e.keyCode)>-1?t.call(this,e):void 0}}function fe(t){return function(e){return e.stopPropagation(),t.call(this,e)}}function pe(t){return function(e){return e.preventDefault(),t.call(this,e)}}function de(t){return function(e){return e.target===e.currentTarget?t.call(this,e):void 0}}function ve(t){if(is[t])return is[t];var e=me(t);return is[t]=is[e]=e,e}function me(t){t=u(t);var e=l(t),i=e.charAt(0).toUpperCase()+e.slice(1);ns||(ns=document.createElement("div"));var n,r=Kr.length;if("filter"!==e&&e in ns.style)return{kebab:t,camel:e};for(;r--;)if(n=ts[r]+i,n in ns.style)return{kebab:Kr[r]+t,camel:n}}function ge(t){var e=[];if(Fi(t))for(var i=0,n=t.length;n>i;i++){var r=t[i];if(r)if("string"==typeof r)e.push(r);else for(var s in r)r[s]&&e.push(s)}else if(m(t))for(var o in t)t[o]&&e.push(o);return e}function _e(t,e,i){if(e=e.trim(),-1===e.indexOf(" "))return void i(t,e);for(var n=e.split(/\s+/),r=0,s=n.length;s>r;r++)i(t,n[r])}function ye(t,e,i){function n(){++s>=r?i():t[s].call(e,n)}var r=t.length,s=0;t[0].call(e,n)}function be(t,e,i){for(var r,s,o,a,h,c,f,p=[],d=Object.keys(e),v=d.length;v--;)s=d[v],r=e[s]||ys,h=l(s),bs.test(h)&&(f={name:s,path:h,options:r,mode:_s.ONE_WAY,raw:null},o=u(s),null===(a=M(t,o))&&(null!==(a=M(t,o+".sync"))?f.mode=_s.TWO_WAY:null!==(a=M(t,o+".once"))&&(f.mode=_s.ONE_TIME)),null!==a?(f.raw=a,c=A(a),a=c.expression,f.filters=c.filters,n(a)&&!c.filters?f.optimizedLiteral=!0:f.dynamic=!0,f.parentPath=a):null!==(a=I(t,o))&&(f.raw=a),p.push(f));return we(p)}function we(t){return function(e,n){e._props={};for(var r,s,l,c,f,p=e.$options.propsData,d=t.length;d--;)if(r=t[d],f=r.raw,s=r.path,l=r.options,e._props[s]=r,p&&i(p,s)&&$e(e,r,p[s]),null===f)$e(e,r,void 0);else if(r.dynamic)r.mode===_s.ONE_TIME?(c=(n||e._context||e).$get(r.parentPath),$e(e,r,c)):e._context?e._bindDir({name:"prop",def:Cs,prop:r},null,null,n):$e(e,r,e.$get(r.parentPath));else if(r.optimizedLiteral){var v=h(f);c=v===f?a(o(f)):v,$e(e,r,c)}else c=l.type!==Boolean||""!==f&&f!==u(r.name)?f:!0,$e(e,r,c)}}function Ce(t,e,i,n){var r=e.dynamic&&It(e.parentPath),s=i;void 0===s&&(s=xe(t,e)),s=Oe(e,s);var o=s!==i;Ae(e,s,t)||(s=void 0),r&&!o?yt(function(){n(s)}):n(s)}function $e(t,e,i){Ce(t,e,i,function(i){kt(t,e.path,i)})}function ke(t,e,i){Ce(t,e,i,function(i){t[e.path]=i})}function xe(t,e){var n=e.options;if(!i(n,"default"))return n.type===Boolean?!1:void 0;var r=n["default"];return m(r),"function"==typeof r&&n.type!==Function?r.call(t):r}function Ae(t,e,i){if(!t.options.required&&(null===t.raw||null==e))return!0;var n=t.options,r=n.type,s=!r,o=[];if(r){Fi(r)||(r=[r]);for(var a=0;a<r.length&&!s;a++){var h=Te(e,r[a]);o.push(h.expectedType),s=h.valid}}if(!s)return!1;var l=n.validator;return l&&!l(e)?!1:!0}function Oe(t,e){var i=t.options.coerce;return i?i(e):e}function Te(t,e){var i,n;return e===String?(n="string",i=typeof t===n):e===Number?(n="number",i=typeof t===n):e===Boolean?(n="boolean",i=typeof t===n):e===Function?(n="function",i=typeof t===n):e===Object?(n="object",i=g(t)):e===Array?(n="array",i=Fi(t)):i=t instanceof e,{valid:i,expectedType:n}}function Ne(t){$s.push(t),ks||(ks=!0,Qi(je))}function je(){for(var t=document.documentElement.offsetHeight,e=0;e<$s.length;e++)$s[e]();return $s=[],ks=!1,t}function Ee(t,e,i,n){this.id=e,this.el=t,this.enterClass=i&&i.enterClass||e+"-enter",this.leaveClass=i&&i.leaveClass||e+"-leave",this.hooks=i,this.vm=n,this.pendingCssEvent=this.pendingCssCb=this.cancel=this.pendingJsCb=this.op=this.cb=null,this.justEntered=!1,this.entered=this.left=!1,this.typeCache={},this.type=i&&i.type;var r=this;["enterNextTick","enterDone","leaveNextTick","leaveDone"].forEach(function(t){r[t]=p(r[t],r)})}function Se(t){if(/svg$/.test(t.namespaceURI)){var e=t.getBoundingClientRect();return!(e.width||e.height)}return!(t.offsetWidth||t.offsetHeight||t.getClientRects().length)}function Fe(t,e,i){var n=i||!e._asComponent?Me(t,e):null,r=n&&n.terminal||ni(t)||!t.hasChildNodes()?null:Je(t.childNodes,e);return function(t,e,i,s,o){var a=d(e.childNodes),h=De(function(){n&&n(t,e,i,s,o),r&&r(t,a,i,s,o)},t);return Re(t,h)}}function De(t,e){e._directives=[];var i=e._directives.length;t();var n=e._directives.slice(i);n.sort(Pe);for(var r=0,s=n.length;s>r;r++)n[r]._bind();return n}function Pe(t,e){return t=t.descriptor.def.priority||Is,e=e.descriptor.def.priority||Is,t>e?-1:t===e?0:1}function Re(t,e,i,n){function r(r){Le(t,e,r),i&&n&&Le(i,n)}return r.dirs=e,r}function Le(t,e,i){for(var n=e.length;n--;)e[n]._teardown()}function He(t,e,i,n){var r=be(e,i,t),s=De(function(){r(t,n)},t);return Re(t,s)}function Ie(t,e,i){var n,r,s=e._containerAttrs,o=e._replacerAttrs;return 11!==t.nodeType&&(e._asComponent?(s&&i&&(n=Ke(s,i)),o&&(r=Ke(o,e))):r=Ke(t.attributes,e)),e._containerAttrs=e._replacerAttrs=null,function(t,e,i){var s,o=t._context;o&&n&&(s=De(function(){n(o,e,null,i)},o));var a=De(function(){r&&r(t,e)},t);return Re(t,a,o,s)}}function Me(t,e){var i=t.nodeType;return 1!==i||ni(t)?3===i&&t.data.trim()?Ve(t,e):null:We(t,e)}function We(t,e){if("TEXTAREA"===t.tagName){var i=N(t.value);i&&(t.setAttribute(":value",j(i)),t.value="")}var n,r=t.hasAttributes(),s=r&&d(t.attributes);return r&&(n=Ze(t,s,e)),n||(n=Qe(t,e)),n||(n=Ge(t,e)),!n&&r&&(n=Ke(s,e)),n}function Ve(t,e){if(t._skip)return Be;var i=N(t.wholeText);if(!i)return null;for(var n=t.nextSibling;n&&3===n.nodeType;)n._skip=!0,n=n.nextSibling;for(var r,s,o=document.createDocumentFragment(),a=0,h=i.length;h>a;a++)s=i[a],r=s.tag?ze(s,e):document.createTextNode(s.value),o.appendChild(r);return Ue(i,o,e)}function Be(t,e){z(e)}function ze(t,e){function i(e){if(!t.descriptor){var i=A(t.value);t.descriptor={name:e,def:vs[e],expression:i.expression,filters:i.filters}}}var n;return t.oneTime?n=document.createTextNode(t.value):t.html?(n=document.createComment("v-html"),i("html")):(n=document.createTextNode(" "),i("text")),n}function Ue(t,e){return function(i,n,r,s){for(var o,a,h,l=e.cloneNode(!0),c=d(l.childNodes),u=0,f=t.length;f>u;u++)o=t[u],a=o.value,o.tag&&(h=c[u],o.oneTime?(a=(s||i).$eval(a),o.html?J(h,Zt(a,!0)):h.data=a):i._bindDir(o.descriptor,h,r,s));J(n,l)}}function Je(t,e){for(var i,n,r,s=[],o=0,a=t.length;a>o;o++)r=t[o],i=Me(r,e),n=i&&i.terminal||"SCRIPT"===r.tagName||!r.hasChildNodes()?null:Je(r.childNodes,e),s.push(i,n);return s.length?qe(s):null}function qe(t){return function(e,i,n,r,s){for(var o,a,h,l=0,c=0,u=t.length;u>l;c++){o=i[c],a=t[l++],h=t[l++];var f=d(o.childNodes);a&&a(e,o,n,r,s),h&&h(e,f,n,r,s)}}}function Qe(t,e){var i=t.tagName.toLowerCase();if(!An.test(i)){var n=gt(e,"elementDirectives",i);return n?Ye(t,i,"",e,n):void 0}}function Ge(t,e){var i=lt(t,e);if(i){var n=rt(t),r={name:"component",ref:n,expression:i.id,def:Fs.component,modifiers:{literal:!i.dynamic}},s=function(t,e,i,s,o){n&&kt((s||t).$refs,n,null),t._bindDir(r,e,i,s,o)};return s.terminal=!0,s}}function Ze(t,e,i){if(null!==I(t,"v-pre"))return Xe;if(t.hasAttribute("v-else")){var n=t.previousElementSibling;if(n&&n.hasAttribute("v-if"))return Xe}for(var r,s,o,a,h,l,c,u,f,p,d=0,v=e.length;v>d;d++)r=e[d],s=r.name.replace(Ls,""),(h=s.match(Rs))&&(f=gt(i,"directives",h[1]),f&&f.terminal&&(!p||(f.priority||Ms)>p.priority)&&(p=f,c=r.name,a=ti(r.name),o=r.value,l=h[1],u=h[2]));return p?Ye(t,l,o,i,p,c,u,a):void 0}function Xe(){}function Ye(t,e,i,n,r,s,o,a){var h=A(i),l={name:e,arg:o,expression:h.expression,filters:h.filters,raw:i,attr:s,modifiers:a,def:r};("for"===e||"router-view"===e)&&(l.ref=rt(t));var c=function(t,e,i,n,r){l.ref&&kt((n||t).$refs,l.ref,null),t._bindDir(l,e,i,n,r)};return c.terminal=!0,c}function Ke(t,e){function i(t,e,i){var n=i&&ii(i),r=!n&&A(s);v.push({name:t,attr:o,raw:a,def:e,arg:l,modifiers:c,expression:r&&r.expression,filters:r&&r.filters,interp:i,hasOneTime:n})}for(var n,r,s,o,a,h,l,c,u,f,p,d=t.length,v=[];d--;)if(n=t[d],r=o=n.name,s=a=n.value,f=N(s),l=null,c=ti(r),r=r.replace(Ls,""),f)s=j(f),l=r,i("bind",vs.bind,f);else if(Hs.test(r))c.literal=!Ds.test(r),i("transition",Fs.transition);else if(Ps.test(r))l=r.replace(Ps,""),i("on",vs.on);else if(Ds.test(r))h=r.replace(Ds,""),"style"===h||"class"===h?i(h,Fs[h]):(l=h,i("bind",vs.bind));else if(p=r.match(Rs)){if(h=p[1],l=p[2],"else"===h)continue;u=gt(e,"directives",h,!0),u&&i(h,u)}return v.length?ei(v):void 0}function ti(t){var e=Object.create(null),i=t.match(Ls);if(i)for(var n=i.length;n--;)e[i[n].slice(1)]=!0;return e}function ei(t){return function(e,i,n,r,s){for(var o=t.length;o--;)e._bindDir(t[o],i,n,r,s)}}function ii(t){for(var e=t.length;e--;)if(t[e].oneTime)return!0}function ni(t){return"SCRIPT"===t.tagName&&(!t.hasAttribute("type")||"text/javascript"===t.getAttribute("type"))}function ri(t,e){return e&&(e._containerAttrs=oi(t)),it(t)&&(t=Zt(t)),e&&(e._asComponent&&!e.template&&(e.template="<slot></slot>"),e.template&&(e._content=K(t),t=si(t,e))),at(t)&&(U(nt("v-start",!0),t),t.appendChild(nt("v-end",!0))),t}function si(t,e){var i=e.template,n=Zt(i,!0);if(n){var r=n.firstChild,s=r.tagName&&r.tagName.toLowerCase();return e.replace?(t===document.body,n.childNodes.length>1||1!==r.nodeType||"component"===s||gt(e,"components",s)||W(r,"is")||gt(e,"elementDirectives",s)||r.hasAttribute("v-for")||r.hasAttribute("v-if")?n:(e._replacerAttrs=oi(r),ai(t,r),r)):(t.appendChild(n),t)}}function oi(t){return 1===t.nodeType&&t.hasAttributes()?d(t.attributes):void 0}function ai(t,e){for(var i,n,r=t.attributes,s=r.length;s--;)i=r[s].name,n=r[s].value,e.hasAttribute(i)||Ws.test(i)?"class"===i&&!N(n)&&(n=n.trim())&&n.split(/\s+/).forEach(function(t){X(e,t)}):e.setAttribute(i,n)}function hi(t,e){if(e){for(var i,n,r=t._slotContents=Object.create(null),s=0,o=e.children.length;o>s;s++)i=e.children[s],(n=i.getAttribute("slot"))&&(r[n]||(r[n]=[])).push(i);for(n in r)r[n]=li(r[n],e);if(e.hasChildNodes()){var a=e.childNodes;if(1===a.length&&3===a[0].nodeType&&!a[0].data.trim())return;r["default"]=li(e.childNodes,e)}}}function li(t,e){var i=document.createDocumentFragment();t=d(t);for(var n=0,r=t.length;r>n;n++){var s=t[n];!it(s)||s.hasAttribute("v-if")||s.hasAttribute("v-for")||(e.removeChild(s),s=Zt(s,!0)),i.appendChild(s)}return i}function ci(t){function e(){}function n(t,e){var i=new zt(e,t,null,{lazy:!0});return function(){return i.dirty&&i.evaluate(),_t.target&&i.depend(),i.value}}Object.defineProperty(t.prototype,"$data",{get:function(){return this._data},set:function(t){t!==this._data&&this._setData(t)}}),t.prototype._initState=function(){this._initProps(),this._initMeta(),this._initMethods(),this._initData(),this._initComputed()},t.prototype._initProps=function(){var t=this.$options,e=t.el,i=t.props;e=t.el=L(e),this._propsUnlinkFn=e&&1===e.nodeType&&i?He(this,e,i,this._scope):null},t.prototype._initData=function(){var t=this.$options.data,e=this._data=t?t():{};g(e)||(e={});var n,r,s=this._props,o=Object.keys(e);for(n=o.length;n--;)r=o[n],s&&i(s,r)||this._proxy(r);$t(e,this)},t.prototype._setData=function(t){t=t||{};var e=this._data;this._data=t;var n,r,s;for(n=Object.keys(e),s=n.length;s--;)r=n[s],r in t||this._unproxy(r);for(n=Object.keys(t),s=n.length;s--;)r=n[s],i(this,r)||this._proxy(r);e.__ob__.removeVm(this),$t(t,this),this._digest()},t.prototype._proxy=function(t){if(!r(t)){var e=this;Object.defineProperty(e,t,{configurable:!0,enumerable:!0,get:function(){return e._data[t]},set:function(i){e._data[t]=i}})}},t.prototype._unproxy=function(t){r(t)||delete this[t]},t.prototype._digest=function(){for(var t=0,e=this._watchers.length;e>t;t++)this._watchers[t].update(!0)},t.prototype._initComputed=function(){var t=this.$options.computed;if(t)for(var i in t){var r=t[i],s={enumerable:!0,configurable:!0};"function"==typeof r?(s.get=n(r,this),s.set=e):(s.get=r.get?r.cache!==!1?n(r.get,this):p(r.get,this):e,s.set=r.set?p(r.set,this):e),Object.defineProperty(this,i,s)}},t.prototype._initMethods=function(){var t=this.$options.methods;if(t)for(var e in t)this[e]=p(t[e],this)},t.prototype._initMeta=function(){var t=this.$options._meta;if(t)for(var e in t)kt(this,e,t[e])}}function ui(t){function e(t,e){for(var i,n,r,s=e.attributes,o=0,a=s.length;a>o;o++)i=s[o].name,Bs.test(i)&&(i=i.replace(Bs,""),n=s[o].value,It(n)&&(n+=".apply(this, $arguments)"),r=(t._scope||t._context).$eval(n,!0),r._fromParent=!0,t.$on(i.replace(Bs),r))}function i(t,e,i){if(i){var r,s,o,a;for(s in i)if(r=i[s],Fi(r))for(o=0,a=r.length;a>o;o++)n(t,e,s,r[o]);else n(t,e,s,r)}}function n(t,e,i,r,s){var o=typeof r;if("function"===o)t[e](i,r,s);else if("string"===o){var a=t.$options.methods,h=a&&a[r];h&&t[e](i,h,s)}else r&&"object"===o&&n(t,e,i,r.handler,r)}function r(){this._isAttached||(this._isAttached=!0,this.$children.forEach(s))}function s(t){!t._isAttached&&H(t.$el)&&t._callHook("attached")}function o(){this._isAttached&&(this._isAttached=!1,this.$children.forEach(a))}function a(t){t._isAttached&&!H(t.$el)&&t._callHook("detached")}t.prototype._initEvents=function(){var t=this.$options;t._asComponent&&e(this,t.el),i(this,"$on",t.events),i(this,"$watch",t.watch)},t.prototype._initDOMHooks=function(){this.$on("hook:attached",r),this.$on("hook:detached",o)},t.prototype._callHook=function(t){this.$emit("pre-hook:"+t);var e=this.$options[t];if(e)for(var i=0,n=e.length;n>i;i++)e[i].call(this);this.$emit("hook:"+t)}}function fi(){}function pi(t,e,i,n,r,s){this.vm=e,this.el=i,this.descriptor=t,this.name=t.name,this.expression=t.expression,this.arg=t.arg,this.modifiers=t.modifiers,this.filters=t.filters,this.literal=this.modifiers&&this.modifiers.literal,this._locked=!1,this._bound=!1,this._listeners=null,this._host=n,this._scope=r,this._frag=s}function di(t){t.prototype._updateRef=function(t){var e=this.$options._ref;if(e){var i=(this._scope||this._context).$refs;t?i[e]===this&&(i[e]=null):i[e]=this}},t.prototype._compile=function(t){var e=this.$options,i=t;if(t=ri(t,e),this._initElement(t),1!==t.nodeType||null===I(t,"v-pre")){var n=this._context&&this._context.$options,r=Ie(t,e,n);hi(this,e._content);var s,o=this.constructor;e._linkerCachable&&(s=o.linker,s||(s=o.linker=Fe(t,e)));var a=r(this,t,this._scope),h=s?s(this,t):Fe(t,e)(this,t);this._unlinkFn=function(){a(),h(!0)},e.replace&&J(i,t),this._isCompiled=!0,this._callHook("compiled")}},t.prototype._initElement=function(t){at(t)?(this._isFragment=!0,this.$el=this._fragmentStart=t.firstChild,this._fragmentEnd=t.lastChild,3===this._fragmentStart.nodeType&&(this._fragmentStart.data=this._fragmentEnd.data=""),this._fragment=t):this.$el=t,this.$el.__vue__=this,this._callHook("beforeCompile")},t.prototype._bindDir=function(t,e,i,n,r){this._directives.push(new pi(t,this,e,i,n,r))},t.prototype._destroy=function(t,e){if(this._isBeingDestroyed)return void(e||this._cleanup());var i,n,r=this,s=function(){!i||n||e||r._cleanup()};t&&this.$el&&(n=!0,this.$remove(function(){n=!1,s()})),this._callHook("beforeDestroy"),this._isBeingDestroyed=!0;var o,a=this.$parent;for(a&&!a._isBeingDestroyed&&(a.$children.$remove(this),
+this._updateRef(!0)),o=this.$children.length;o--;)this.$children[o].$destroy();for(this._propsUnlinkFn&&this._propsUnlinkFn(),this._unlinkFn&&this._unlinkFn(),o=this._watchers.length;o--;)this._watchers[o].teardown();this.$el&&(this.$el.__vue__=null),i=!0,s()},t.prototype._cleanup=function(){this._isDestroyed||(this._frag&&this._frag.children.$remove(this),this._data&&this._data.__ob__&&this._data.__ob__.removeVm(this),this.$el=this.$parent=this.$root=this.$children=this._watchers=this._context=this._scope=this._directives=null,this._isDestroyed=!0,this._callHook("destroyed"),this.$off())}}function vi(t){t.prototype._applyFilters=function(t,e,i,n){var r,s,o,a,h,l,c,u,f;for(l=0,c=i.length;c>l;l++)if(r=i[n?c-l-1:l],s=gt(this.$options,"filters",r.name,!0),s&&(s=n?s.write:s.read||s,"function"==typeof s)){if(o=n?[t,e]:[t],h=n?2:1,r.args)for(u=0,f=r.args.length;f>u;u++)a=r.args[u],o[u+h]=a.dynamic?this.$get(a.value):a.value;t=s.apply(this,o)}return t},t.prototype._resolveComponent=function(e,i){var n;if(n="function"==typeof e?e:gt(this.$options,"components",e,!0))if(n.options)i(n);else if(n.resolved)i(n.resolved);else if(n.requested)n.pendingCallbacks.push(i);else{n.requested=!0;var r=n.pendingCallbacks=[i];n.call(this,function(e){g(e)&&(e=t.extend(e)),n.resolved=e;for(var i=0,s=r.length;s>i;i++)r[i](e)},function(t){})}}}function mi(t){function i(t){return JSON.parse(JSON.stringify(t))}t.prototype.$get=function(t,e){var i=Ht(t);if(i){if(e){var n=this;return function(){n.$arguments=d(arguments);var t=i.get.call(n,n);return n.$arguments=null,t}}try{return i.get.call(this,this)}catch(r){}}},t.prototype.$set=function(t,e){var i=Ht(t,!0);i&&i.set&&i.set.call(this,this,e)},t.prototype.$delete=function(t){e(this._data,t)},t.prototype.$watch=function(t,e,i){var n,r=this;"string"==typeof t&&(n=A(t),t=n.expression);var s=new zt(r,t,e,{deep:i&&i.deep,sync:i&&i.sync,filters:n&&n.filters,user:!i||i.user!==!1});return i&&i.immediate&&e.call(r,s.value),function(){s.teardown()}},t.prototype.$eval=function(t,e){if(zs.test(t)){var i=A(t),n=this.$get(i.expression,e);return i.filters?this._applyFilters(n,null,i.filters):n}return this.$get(t,e)},t.prototype.$interpolate=function(t){var e=N(t),i=this;return e?1===e.length?i.$eval(e[0].value)+"":e.map(function(t){return t.tag?i.$eval(t.value):t.value}).join(""):t},t.prototype.$log=function(t){var e=t?jt(this._data,t):this._data;if(e&&(e=i(e)),!t){var n;for(n in this.$options.computed)e[n]=i(this[n]);if(this._props)for(n in this._props)e[n]=i(this[n])}console.log(e)}}function gi(t){function e(t,e,n,r,s,o){e=i(e);var a=!H(e),h=r===!1||a?s:o,l=!a&&!t._isAttached&&!H(t.$el);return t._isFragment?(st(t._fragmentStart,t._fragmentEnd,function(i){h(i,e,t)}),n&&n()):h(t.$el,e,t,n),l&&t._callHook("attached"),t}function i(t){return"string"==typeof t?document.querySelector(t):t}function n(t,e,i,n){e.appendChild(t),n&&n()}function r(t,e,i,n){V(t,e),n&&n()}function s(t,e,i){z(t),i&&i()}t.prototype.$nextTick=function(t){Qi(t,this)},t.prototype.$appendTo=function(t,i,r){return e(this,t,i,r,n,F)},t.prototype.$prependTo=function(t,e,n){return t=i(t),t.hasChildNodes()?this.$before(t.firstChild,e,n):this.$appendTo(t,e,n),this},t.prototype.$before=function(t,i,n){return e(this,t,i,n,r,D)},t.prototype.$after=function(t,e,n){return t=i(t),t.nextSibling?this.$before(t.nextSibling,e,n):this.$appendTo(t.parentNode,e,n),this},t.prototype.$remove=function(t,e){if(!this.$el.parentNode)return t&&t();var i=this._isAttached&&H(this.$el);i||(e=!1);var n=this,r=function(){i&&n._callHook("detached"),t&&t()};if(this._isFragment)ot(this._fragmentStart,this._fragmentEnd,this,this._fragment,r);else{var o=e===!1?s:P;o(this.$el,this,r)}return this}}function _i(t){function e(t,e,n){var r=t.$parent;if(r&&n&&!i.test(e))for(;r;)r._eventsCount[e]=(r._eventsCount[e]||0)+n,r=r.$parent}t.prototype.$on=function(t,i){return(this._events[t]||(this._events[t]=[])).push(i),e(this,t,1),this},t.prototype.$once=function(t,e){function i(){n.$off(t,i),e.apply(this,arguments)}var n=this;return i.fn=e,this.$on(t,i),this},t.prototype.$off=function(t,i){var n;if(!arguments.length){if(this.$parent)for(t in this._events)n=this._events[t],n&&e(this,t,-n.length);return this._events={},this}if(n=this._events[t],!n)return this;if(1===arguments.length)return e(this,t,-n.length),this._events[t]=null,this;for(var r,s=n.length;s--;)if(r=n[s],r===i||r.fn===i){e(this,t,-1),n.splice(s,1);break}return this},t.prototype.$emit=function(t){var e="string"==typeof t;t=e?t:t.name;var i=this._events[t],n=e||!i;if(i){i=i.length>1?d(i):i;var r=e&&i.some(function(t){return t._fromParent});r&&(n=!1);for(var s=d(arguments,1),o=0,a=i.length;a>o;o++){var h=i[o],l=h.apply(this,s);l!==!0||r&&!h._fromParent||(n=!0)}}return n},t.prototype.$broadcast=function(t){var e="string"==typeof t;if(t=e?t:t.name,this._eventsCount[t]){var i=this.$children,n=d(arguments);e&&(n[0]={name:t,source:this});for(var r=0,s=i.length;s>r;r++){var o=i[r],a=o.$emit.apply(o,n);a&&o.$broadcast.apply(o,n)}return this}},t.prototype.$dispatch=function(t){var e=this.$emit.apply(this,arguments);if(e){var i=this.$parent,n=d(arguments);for(n[0]={name:t,source:this};i;)e=i.$emit.apply(i,n),i=e?i.$parent:null;return this}};var i=/^hook:/}function yi(t){function e(){this._isAttached=!0,this._isReady=!0,this._callHook("ready")}t.prototype.$mount=function(t){return this._isCompiled?void 0:(t=L(t),t||(t=document.createElement("div")),this._compile(t),this._initDOMHooks(),H(this.$el)?(this._callHook("attached"),e.call(this)):this.$once("hook:attached",e),this)},t.prototype.$destroy=function(t,e){this._destroy(t,e)},t.prototype.$compile=function(t,e,i,n){return Fe(t,this.$options,!0)(this,t,e,i,n)}}function bi(t){this._init(t)}function wi(t,e,i){return i=i?parseInt(i,10):0,e=o(e),"number"==typeof e?t.slice(i,i+e):t}function Ci(t,e,i){if(t=Qs(t),null==e)return t;if("function"==typeof e)return t.filter(e);e=(""+e).toLowerCase();for(var n,r,s,o,a="in"===i?3:2,h=Array.prototype.concat.apply([],d(arguments,a)),l=[],c=0,u=t.length;u>c;c++)if(n=t[c],s=n&&n.$value||n,o=h.length){for(;o--;)if(r=h[o],"$key"===r&&ki(n.$key,e)||ki(jt(s,r),e)){l.push(n);break}}else ki(n,e)&&l.push(n);return l}function $i(t){function e(t,e,i){var r=n[i];return r&&("$key"!==r&&(m(t)&&"$value"in t&&(t=t.$value),m(e)&&"$value"in e&&(e=e.$value)),t=m(t)?jt(t,r):t,e=m(e)?jt(e,r):e),t===e?0:t>e?s:-s}var i=null,n=void 0;t=Qs(t);var r=d(arguments,1),s=r[r.length-1];"number"==typeof s?(s=0>s?-1:1,r=r.length>1?r.slice(0,-1):r):s=1;var o=r[0];return o?("function"==typeof o?i=function(t,e){return o(t,e)*s}:(n=Array.prototype.concat.apply([],r),i=function(t,r,s){return s=s||0,s>=n.length-1?e(t,r,s):e(t,r,s)||i(t,r,s+1)}),t.slice().sort(i)):t}function ki(t,e){var i;if(g(t)){var n=Object.keys(t);for(i=n.length;i--;)if(ki(t[n[i]],e))return!0}else if(Fi(t)){for(i=t.length;i--;)if(ki(t[i],e))return!0}else if(null!=t)return t.toString().toLowerCase().indexOf(e)>-1}function xi(i){function n(t){return new Function("return function "+f(t)+" (options) { this._init(options) }")()}i.options={directives:vs,elementDirectives:qs,filters:Zs,transitions:{},components:{},partials:{},replace:!0},i.util=Pn,i.config=Cn,i.set=t,i["delete"]=e,i.nextTick=Qi,i.compiler=Vs,i.FragmentFactory=re,i.internalDirectives=Fs,i.parsers={path:Yn,text:yn,template:Tr,directive:pn,expression:fr},i.cid=0;var r=1;i.extend=function(t){t=t||{};var e=this,i=0===e.cid;if(i&&t._Ctor)return t._Ctor;var s=t.name||e.options.name,o=n(s||"VueComponent");return o.prototype=Object.create(e.prototype),o.prototype.constructor=o,o.cid=r++,o.options=mt(e.options,t),o["super"]=e,o.extend=e.extend,Cn._assetTypes.forEach(function(t){o[t]=e[t]}),s&&(o.options.components[s]=o),i&&(t._Ctor=o),o},i.use=function(t){if(!t.installed){var e=d(arguments,1);return e.unshift(this),"function"==typeof t.install?t.install.apply(t,e):t.apply(null,e),t.installed=!0,this}},i.mixin=function(t){i.options=mt(i.options,t)},Cn._assetTypes.forEach(function(t){i[t]=function(e,n){return n?("component"===t&&g(n)&&(n.name=e,n=i.extend(n)),this.options[t+"s"][e]=n,n):this.options[t+"s"][e]}}),v(i.transition,kn)}var Ai=Object.prototype.hasOwnProperty,Oi=/^\s?(true|false|-?[\d\.]+|'[^']*'|"[^"]*")\s?$/,Ti=/-(\w)/g,Ni=/([a-z\d])([A-Z])/g,ji=/(?:^|[-_\/])(\w)/g,Ei=Object.prototype.toString,Si="[object Object]",Fi=Array.isArray,Di="__proto__"in{},Pi="undefined"!=typeof window&&"[object Object]"!==Object.prototype.toString.call(window),Ri=Pi&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__,Li=Pi&&window.navigator.userAgent.toLowerCase(),Hi=Li&&Li.indexOf("msie 9.0")>0,Ii=Li&&Li.indexOf("android")>0,Mi=Li&&/(iphone|ipad|ipod|ios)/i.test(Li),Wi=Li&&Li.indexOf("micromessenger")>0,Vi=void 0,Bi=void 0,zi=void 0,Ui=void 0;if(Pi&&!Hi){var Ji=void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend,qi=void 0===window.onanimationend&&void 0!==window.onwebkitanimationend;Vi=Ji?"WebkitTransition":"transition",Bi=Ji?"webkitTransitionEnd":"transitionend",zi=qi?"WebkitAnimation":"animation",Ui=qi?"webkitAnimationEnd":"animationend"}var Qi=function(){function t(){n=!1;var t=i.slice(0);i=[];for(var e=0;e<t.length;e++)t[e]()}var e,i=[],n=!1;if("undefined"==typeof MutationObserver||Wi&&Mi){var r=Pi?window:"undefined"!=typeof global?global:{};e=r.setImmediate||setTimeout}else{var s=1,o=new MutationObserver(t),a=document.createTextNode(s);o.observe(a,{characterData:!0}),e=function(){s=(s+1)%2,a.data=s}}return function(r,s){var o=s?function(){r.call(s)}:r;i.push(o),n||(n=!0,e(t,0))}}(),Gi=void 0;"undefined"!=typeof Set&&Set.toString().match(/native code/)?Gi=Set:(Gi=function(){this.set=Object.create(null)},Gi.prototype.has=function(t){return void 0!==this.set[t]},Gi.prototype.add=function(t){this.set[t]=1},Gi.prototype.clear=function(){this.set=Object.create(null)});var Zi=$.prototype;Zi.put=function(t,e){var i;this.size===this.limit&&(i=this.shift());var n=this.get(t,!0);return n||(n={key:t},this._keymap[t]=n,this.tail?(this.tail.newer=n,n.older=this.tail):this.head=n,this.tail=n,this.size++),n.value=e,i},Zi.shift=function(){var t=this.head;return t&&(this.head=this.head.newer,this.head.older=void 0,t.newer=t.older=void 0,this._keymap[t.key]=void 0,this.size--),t},Zi.get=function(t,e){var i=this._keymap[t];if(void 0!==i)return i===this.tail?e?i:i.value:(i.newer&&(i===this.head&&(this.head=i.newer),i.newer.older=i.older),i.older&&(i.older.newer=i.newer),i.newer=void 0,i.older=this.tail,this.tail&&(this.tail.newer=i),this.tail=i,e?i:i.value)};var Xi,Yi,Ki,tn,en,nn,rn,sn,on,an,hn,ln,cn=new $(1e3),un=/[^\s'"]+|'[^']*'|"[^"]*"/g,fn=/^in$|^-?\d+/,pn=Object.freeze({parseDirective:A}),dn=/[-.*+?^${}()|[\]\/\\]/g,vn=void 0,mn=void 0,gn=void 0,_n=/[^|]\|[^|]/,yn=Object.freeze({compileRegex:T,parseText:N,tokensToExp:j}),bn=["{{","}}"],wn=["{{{","}}}"],Cn=Object.defineProperties({debug:!1,silent:!1,async:!0,warnExpressionErrors:!0,devtools:!1,_delimitersChanged:!0,_assetTypes:["component","directive","elementDirective","filter","transition","partial"],_propBindingModes:{ONE_WAY:0,TWO_WAY:1,ONE_TIME:2},_maxUpdateCount:100},{delimiters:{get:function(){return bn},set:function(t){bn=t,T()},configurable:!0,enumerable:!0},unsafeDelimiters:{get:function(){return wn},set:function(t){wn=t,T()},configurable:!0,enumerable:!0}}),$n=void 0,kn=Object.freeze({appendWithTransition:F,beforeWithTransition:D,removeWithTransition:P,applyTransition:R}),xn=/^v-ref:/,An=/^(div|p|span|img|a|b|i|br|ul|ol|li|h1|h2|h3|h4|h5|h6|code|pre|table|th|td|tr|form|label|input|select|option|nav|article|section|header|footer)$/i,On=/^(slot|partial|component)$/i,Tn=Cn.optionMergeStrategies=Object.create(null);Tn.data=function(t,e,i){return i?t||e?function(){var n="function"==typeof e?e.call(i):e,r="function"==typeof t?t.call(i):void 0;return n?ut(n,r):r}:void 0:e?"function"!=typeof e?t:t?function(){return ut(e.call(this),t.call(this))}:e:t},Tn.el=function(t,e,i){if(i||!e||"function"==typeof e){var n=e||t;return i&&"function"==typeof n?n.call(i):n}},Tn.init=Tn.created=Tn.ready=Tn.attached=Tn.detached=Tn.beforeCompile=Tn.compiled=Tn.beforeDestroy=Tn.destroyed=Tn.activate=function(t,e){return e?t?t.concat(e):Fi(e)?e:[e]:t},Cn._assetTypes.forEach(function(t){Tn[t+"s"]=ft}),Tn.watch=Tn.events=function(t,e){if(!e)return t;if(!t)return e;var i={};v(i,t);for(var n in e){var r=i[n],s=e[n];r&&!Fi(r)&&(r=[r]),i[n]=r?r.concat(s):[s]}return i},Tn.props=Tn.methods=Tn.computed=function(t,e){if(!e)return t;if(!t)return e;var i=Object.create(null);return v(i,t),v(i,e),i};var Nn=function(t,e){return void 0===e?t:e},jn=0;_t.target=null,_t.prototype.addSub=function(t){this.subs.push(t)},_t.prototype.removeSub=function(t){this.subs.$remove(t)},_t.prototype.depend=function(){_t.target.addDep(this)},_t.prototype.notify=function(){for(var t=d(this.subs),e=0,i=t.length;i>e;e++)t[e].update()};var En=Array.prototype,Sn=Object.create(En);["push","pop","shift","unshift","splice","sort","reverse"].forEach(function(t){var e=En[t];_(Sn,t,function(){for(var i=arguments.length,n=new Array(i);i--;)n[i]=arguments[i];var r,s=e.apply(this,n),o=this.__ob__;switch(t){case"push":r=n;break;case"unshift":r=n;break;case"splice":r=n.slice(2)}return r&&o.observeArray(r),o.dep.notify(),s})}),_(En,"$set",function(t,e){return t>=this.length&&(this.length=Number(t)+1),this.splice(t,1,e)[0]}),_(En,"$remove",function(t){if(this.length){var e=b(this,t);return e>-1?this.splice(e,1):void 0}});var Fn=Object.getOwnPropertyNames(Sn),Dn=!0;bt.prototype.walk=function(t){for(var e=Object.keys(t),i=0,n=e.length;n>i;i++)this.convert(e[i],t[e[i]])},bt.prototype.observeArray=function(t){for(var e=0,i=t.length;i>e;e++)$t(t[e])},bt.prototype.convert=function(t,e){kt(this.value,t,e)},bt.prototype.addVm=function(t){(this.vms||(this.vms=[])).push(t)},bt.prototype.removeVm=function(t){this.vms.$remove(t)};var Pn=Object.freeze({defineReactive:kt,set:t,del:e,hasOwn:i,isLiteral:n,isReserved:r,_toString:s,toNumber:o,toBoolean:a,stripQuotes:h,camelize:l,hyphenate:u,classify:f,bind:p,toArray:d,extend:v,isObject:m,isPlainObject:g,def:_,debounce:y,indexOf:b,cancellable:w,looseEqual:C,isArray:Fi,hasProto:Di,inBrowser:Pi,devtools:Ri,isIE9:Hi,isAndroid:Ii,isIos:Mi,isWechat:Wi,get transitionProp(){return Vi},get transitionEndEvent(){return Bi},get animationProp(){return zi},get animationEndEvent(){return Ui},nextTick:Qi,get _Set(){return Gi},query:L,inDoc:H,getAttr:I,getBindAttr:M,hasBindAttr:W,before:V,after:B,remove:z,prepend:U,replace:J,on:q,off:Q,setClass:Z,addClass:X,removeClass:Y,extractContent:K,trimNode:tt,isTemplate:it,createAnchor:nt,findRef:rt,mapNodeRange:st,removeNodeRange:ot,isFragment:at,getOuterHTML:ht,mergeOptions:mt,resolveAsset:gt,checkComponentAttr:lt,commonTagRE:An,reservedTagRE:On,warn:$n}),Rn=0,Ln=new $(1e3),Hn=0,In=1,Mn=2,Wn=3,Vn=0,Bn=1,zn=2,Un=3,Jn=4,qn=5,Qn=6,Gn=7,Zn=8,Xn=[];Xn[Vn]={ws:[Vn],ident:[Un,Hn],"[":[Jn],eof:[Gn]},Xn[Bn]={ws:[Bn],".":[zn],"[":[Jn],eof:[Gn]},Xn[zn]={ws:[zn],ident:[Un,Hn]},Xn[Un]={ident:[Un,Hn],0:[Un,Hn],number:[Un,Hn],ws:[Bn,In],".":[zn,In],"[":[Jn,In],eof:[Gn,In]},Xn[Jn]={"'":[qn,Hn],'"':[Qn,Hn],"[":[Jn,Mn],"]":[Bn,Wn],eof:Zn,"else":[Jn,Hn]},Xn[qn]={"'":[Jn,Hn],eof:Zn,"else":[qn,Hn]},Xn[Qn]={'"':[Jn,Hn],eof:Zn,"else":[Qn,Hn]};var Yn=Object.freeze({parsePath:Nt,getPath:jt,setPath:Et}),Kn=new $(1e3),tr="Math,Date,this,true,false,null,undefined,Infinity,NaN,isNaN,isFinite,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,parseInt,parseFloat",er=new RegExp("^("+tr.replace(/,/g,"\\b|")+"\\b)"),ir="break,case,class,catch,const,continue,debugger,default,delete,do,else,export,extends,finally,for,function,if,import,in,instanceof,let,return,super,switch,throw,try,var,while,with,yield,enum,await,implements,package,protected,static,interface,private,public",nr=new RegExp("^("+ir.replace(/,/g,"\\b|")+"\\b)"),rr=/\s/g,sr=/\n/g,or=/[\{,]\s*[\w\$_]+\s*:|('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`)|new |typeof |void /g,ar=/"(\d+)"/g,hr=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\]|\[\d+\]|\[[A-Za-z_$][\w$]*\])*$/,lr=/[^\w$\.](?:[A-Za-z_$][\w$]*)/g,cr=/^(?:true|false)$/,ur=[],fr=Object.freeze({parseExpression:Ht,isSimplePath:It}),pr=[],dr=[],vr={},mr={},gr=!1,_r=0;zt.prototype.get=function(){this.beforeGet();var t,e=this.scope||this.vm;try{t=this.getter.call(e,e)}catch(i){}return this.deep&&Ut(t),this.preProcess&&(t=this.preProcess(t)),this.filters&&(t=e._applyFilters(t,null,this.filters,!1)),this.postProcess&&(t=this.postProcess(t)),this.afterGet(),t},zt.prototype.set=function(t){var e=this.scope||this.vm;this.filters&&(t=e._applyFilters(t,this.value,this.filters,!0));try{this.setter.call(e,e,t)}catch(i){}var n=e.$forContext;if(n&&n.alias===this.expression){if(n.filters)return;n._withLock(function(){e.$key?n.rawValue[e.$key]=t:n.rawValue.$set(e.$index,t)})}},zt.prototype.beforeGet=function(){_t.target=this},zt.prototype.addDep=function(t){var e=t.id;this.newDepIds.has(e)||(this.newDepIds.add(e),this.newDeps.push(t),this.depIds.has(e)||t.addSub(this))},zt.prototype.afterGet=function(){_t.target=null;for(var t=this.deps.length;t--;){var e=this.deps[t];this.newDepIds.has(e.id)||e.removeSub(this)}var i=this.depIds;this.depIds=this.newDepIds,this.newDepIds=i,this.newDepIds.clear(),i=this.deps,this.deps=this.newDeps,this.newDeps=i,this.newDeps.length=0},zt.prototype.update=function(t){this.lazy?this.dirty=!0:this.sync||!Cn.async?this.run():(this.shallow=this.queued?t?this.shallow:!1:!!t,this.queued=!0,Bt(this))},zt.prototype.run=function(){if(this.active){var t=this.get();if(t!==this.value||(m(t)||this.deep)&&!this.shallow){var e=this.value;this.value=t;this.prevError;this.cb.call(this.vm,t,e)}this.queued=this.shallow=!1}},zt.prototype.evaluate=function(){var t=_t.target;this.value=this.get(),this.dirty=!1,_t.target=t},zt.prototype.depend=function(){for(var t=this.deps.length;t--;)this.deps[t].depend()},zt.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||this.vm._vForRemoving||this.vm._watchers.$remove(this);for(var t=this.deps.length;t--;)this.deps[t].removeSub(this);this.active=!1,this.vm=this.cb=this.value=null}};var yr=new Gi,br={bind:function(){this.attr=3===this.el.nodeType?"data":"textContent"},update:function(t){this.el[this.attr]=s(t)}},wr=new $(1e3),Cr=new $(1e3),$r={efault:[0,"",""],legend:[1,"<fieldset>","</fieldset>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]};$r.td=$r.th=[3,"<table><tbody><tr>","</tr></tbody></table>"],$r.option=$r.optgroup=[1,'<select multiple="multiple">',"</select>"],$r.thead=$r.tbody=$r.colgroup=$r.caption=$r.tfoot=[1,"<table>","</table>"],$r.g=$r.defs=$r.symbol=$r.use=$r.image=$r.text=$r.circle=$r.ellipse=$r.line=$r.path=$r.polygon=$r.polyline=$r.rect=[1,'<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"version="1.1">',"</svg>"];var kr=/<([\w:-]+)/,xr=/&#?\w+?;/,Ar=function(){if(Pi){var t=document.createElement("div");return t.innerHTML="<template>1</template>",!t.cloneNode(!0).firstChild.innerHTML}return!1}(),Or=function(){if(Pi){var t=document.createElement("textarea");return t.placeholder="t","t"===t.cloneNode(!0).value}return!1}(),Tr=Object.freeze({cloneNode:Gt,parseTemplate:Zt}),Nr={bind:function(){8===this.el.nodeType&&(this.nodes=[],this.anchor=nt("v-html"),J(this.el,this.anchor))},update:function(t){t=s(t),this.nodes?this.swap(t):this.el.innerHTML=t},swap:function(t){for(var e=this.nodes.length;e--;)z(this.nodes[e]);var i=Zt(t,!0,!0);this.nodes=d(i.childNodes),V(i,this.anchor)}};Xt.prototype.callHook=function(t){var e,i;for(e=0,i=this.childFrags.length;i>e;e++)this.childFrags[e].callHook(t);for(e=0,i=this.children.length;i>e;e++)t(this.children[e])},Xt.prototype.beforeRemove=function(){var t,e;for(t=0,e=this.childFrags.length;e>t;t++)this.childFrags[t].beforeRemove(!1);for(t=0,e=this.children.length;e>t;t++)this.children[t].$destroy(!1,!0);var i=this.unlink.dirs;for(t=0,e=i.length;e>t;t++)i[t]._watcher&&i[t]._watcher.teardown()},Xt.prototype.destroy=function(){this.parentFrag&&this.parentFrag.childFrags.$remove(this),this.node.__v_frag=null,this.unlink()};var jr=new $(5e3);re.prototype.create=function(t,e,i){var n=Gt(this.template);return new Xt(this.linker,this.vm,n,t,e,i)};var Er=700,Sr=800,Fr=850,Dr=1100,Pr=1500,Rr=1500,Lr=1750,Hr=2100,Ir=2200,Mr=2300,Wr=0,Vr={priority:Ir,terminal:!0,params:["track-by","stagger","enter-stagger","leave-stagger"],bind:function(){var t=this.expression.match(/(.*) (?:in|of) (.*)/);if(t){var e=t[1].match(/\((.*),(.*)\)/);e?(this.iterator=e[1].trim(),this.alias=e[2].trim()):this.alias=t[1].trim(),this.expression=t[2]}if(this.alias){this.id="__v-for__"+ ++Wr;var i=this.el.tagName;this.isOption=("OPTION"===i||"OPTGROUP"===i)&&"SELECT"===this.el.parentNode.tagName,this.start=nt("v-for-start"),this.end=nt("v-for-end"),J(this.el,this.end),V(this.start,this.end),this.cache=Object.create(null),this.factory=new re(this.vm,this.el)}},update:function(t){this.diff(t),this.updateRef(),this.updateModel()},diff:function(t){var e,n,r,s,o,a,h=t[0],l=this.fromObject=m(h)&&i(h,"$key")&&i(h,"$value"),c=this.params.trackBy,u=this.frags,f=this.frags=new Array(t.length),p=this.alias,d=this.iterator,v=this.start,g=this.end,_=H(v),y=!u;for(e=0,n=t.length;n>e;e++)h=t[e],s=l?h.$key:null,o=l?h.$value:h,a=!m(o),r=!y&&this.getCachedFrag(o,e,s),r?(r.reused=!0,r.scope.$index=e,s&&(r.scope.$key=s),d&&(r.scope[d]=null!==s?s:e),(c||l||a)&&yt(function(){r.scope[p]=o})):(r=this.create(o,p,e,s),r.fresh=!y),f[e]=r,y&&r.before(g);if(!y){var b=0,w=u.length-f.length;for(this.vm._vForRemoving=!0,e=0,n=u.length;n>e;e++)r=u[e],r.reused||(this.deleteCachedFrag(r),this.remove(r,b++,w,_));this.vm._vForRemoving=!1,b&&(this.vm._watchers=this.vm._watchers.filter(function(t){return t.active}));var C,$,k,x=0;for(e=0,n=f.length;n>e;e++)r=f[e],C=f[e-1],$=C?C.staggerCb?C.staggerAnchor:C.end||C.node:v,r.reused&&!r.staggerCb?(k=se(r,v,this.id),k===C||k&&se(k,v,this.id)===C||this.move(r,$)):this.insert(r,x++,$,_),r.reused=r.fresh=!1}},create:function(t,e,i,n){var r=this._host,s=this._scope||this.vm,o=Object.create(s);o.$refs=Object.create(s.$refs),o.$els=Object.create(s.$els),o.$parent=s,o.$forContext=this,yt(function(){kt(o,e,t)}),kt(o,"$index",i),n?kt(o,"$key",n):o.$key&&_(o,"$key",null),this.iterator&&kt(o,this.iterator,null!==n?n:i);var a=this.factory.create(r,o,this._frag);return a.forId=this.id,this.cacheFrag(t,a,i,n),a},updateRef:function(){var t=this.descriptor.ref;if(t){var e,i=(this._scope||this.vm).$refs;this.fromObject?(e={},this.frags.forEach(function(t){e[t.scope.$key]=oe(t)})):e=this.frags.map(oe),i[t]=e}},updateModel:function(){if(this.isOption){var t=this.start.parentNode,e=t&&t.__v_model;e&&e.forceUpdate()}},insert:function(t,e,i,n){t.staggerCb&&(t.staggerCb.cancel(),t.staggerCb=null);var r=this.getStagger(t,e,null,"enter");if(n&&r){var s=t.staggerAnchor;s||(s=t.staggerAnchor=nt("stagger-anchor"),s.__v_frag=t),B(s,i);var o=t.staggerCb=w(function(){t.staggerCb=null,t.before(s),z(s)});setTimeout(o,r)}else{var a=i.nextSibling;a||(B(this.end,i),a=this.end),t.before(a)}},remove:function(t,e,i,n){if(t.staggerCb)return t.staggerCb.cancel(),void(t.staggerCb=null);var r=this.getStagger(t,e,i,"leave");if(n&&r){var s=t.staggerCb=w(function(){t.staggerCb=null,t.remove()});setTimeout(s,r)}else t.remove()},move:function(t,e){e.nextSibling||this.end.parentNode.appendChild(this.end),t.before(e.nextSibling,!1)},cacheFrag:function(t,e,n,r){var s,o=this.params.trackBy,a=this.cache,h=!m(t);r||o||h?(s=he(n,r,t,o),a[s]||(a[s]=e)):(s=this.id,i(t,s)?null===t[s]&&(t[s]=e):Object.isExtensible(t)&&_(t,s,e)),e.raw=t},getCachedFrag:function(t,e,i){var n,r=this.params.trackBy,s=!m(t);if(i||r||s){var o=he(e,i,t,r);n=this.cache[o]}else n=t[this.id];return n&&(n.reused||n.fresh),n},deleteCachedFrag:function(t){var e=t.raw,n=this.params.trackBy,r=t.scope,s=r.$index,o=i(r,"$key")&&r.$key,a=!m(e);if(n||o||a){var h=he(s,o,e,n);this.cache[h]=null}else e[this.id]=null,t.raw=null},getStagger:function(t,e,i,n){n+="Stagger";var r=t.node.__v_trans,s=r&&r.hooks,o=s&&(s[n]||s.stagger);return o?o.call(t,e,i):e*parseInt(this.params[n]||this.params.stagger,10)},_preProcess:function(t){return this.rawValue=t,t},_postProcess:function(t){if(Fi(t))return t;if(g(t)){for(var e,i=Object.keys(t),n=i.length,r=new Array(n);n--;)e=i[n],r[n]={$key:e,$value:t[e]};return r}return"number"!=typeof t||isNaN(t)||(t=ae(t)),t||[]},unbind:function(){if(this.descriptor.ref&&((this._scope||this.vm).$refs[this.descriptor.ref]=null),this.frags)for(var t,e=this.frags.length;e--;)t=this.frags[e],this.deleteCachedFrag(t),t.destroy()}},Br={priority:Hr,terminal:!0,bind:function(){var t=this.el;if(t.__vue__)this.invalid=!0;else{var e=t.nextElementSibling;e&&null!==I(e,"v-else")&&(z(e),this.elseEl=e),this.anchor=nt("v-if"),J(t,this.anchor)}},update:function(t){this.invalid||(t?this.frag||this.insert():this.remove())},insert:function(){this.elseFrag&&(this.elseFrag.remove(),this.elseFrag=null),this.factory||(this.factory=new re(this.vm,this.el)),this.frag=this.factory.create(this._host,this._scope,this._frag),this.frag.before(this.anchor)},remove:function(){this.frag&&(this.frag.remove(),this.frag=null),this.elseEl&&!this.elseFrag&&(this.elseFactory||(this.elseFactory=new re(this.elseEl._context||this.vm,this.elseEl)),this.elseFrag=this.elseFactory.create(this._host,this._scope,this._frag),this.elseFrag.before(this.anchor))},unbind:function(){this.frag&&this.frag.destroy(),this.elseFrag&&this.elseFrag.destroy()}},zr={bind:function(){var t=this.el.nextElementSibling;t&&null!==I(t,"v-else")&&(this.elseEl=t)},update:function(t){this.apply(this.el,t),this.elseEl&&this.apply(this.elseEl,!t)},apply:function(t,e){function i(){t.style.display=e?"":"none"}H(t)?R(t,e?1:-1,i,this.vm):i()}},Ur={bind:function(){var t=this,e=this.el,i="range"===e.type,n=this.params.lazy,r=this.params.number,s=this.params.debounce,a=!1;if(Ii||i||(this.on("compositionstart",function(){a=!0}),this.on("compositionend",function(){a=!1,n||t.listener()})),this.focused=!1,i||n||(this.on("focus",function(){t.focused=!0}),this.on("blur",function(){t.focused=!1,(!t._frag||t._frag.inserted)&&t.rawListener()})),this.listener=this.rawListener=function(){if(!a&&t._bound){var n=r||i?o(e.value):e.value;t.set(n),Qi(function(){t._bound&&!t.focused&&t.update(t._watcher.value)})}},s&&(this.listener=y(this.listener,s)),this.hasjQuery="function"==typeof jQuery,this.hasjQuery){var h=jQuery.fn.on?"on":"bind";jQuery(e)[h]("change",this.rawListener),n||jQuery(e)[h]("input",this.listener)}else this.on("change",this.rawListener),n||this.on("input",this.listener);!n&&Hi&&(this.on("cut",function(){Qi(t.listener)}),this.on("keyup",function(e){(46===e.keyCode||8===e.keyCode)&&t.listener()})),(e.hasAttribute("value")||"TEXTAREA"===e.tagName&&e.value.trim())&&(this.afterBind=this.listener)},update:function(t){this.el.value=s(t)},unbind:function(){var t=this.el;if(this.hasjQuery){var e=jQuery.fn.off?"off":"unbind";jQuery(t)[e]("change",this.listener),jQuery(t)[e]("input",this.listener)}}},Jr={bind:function(){var t=this,e=this.el;this.getValue=function(){if(e.hasOwnProperty("_value"))return e._value;var i=e.value;return t.params.number&&(i=o(i)),i},this.listener=function(){t.set(t.getValue())},this.on("change",this.listener),e.hasAttribute("checked")&&(this.afterBind=this.listener)},update:function(t){this.el.checked=C(t,this.getValue())}},qr={bind:function(){var t=this,e=this.el;this.forceUpdate=function(){t._watcher&&t.update(t._watcher.get())};var i=this.multiple=e.hasAttribute("multiple");this.listener=function(){var n=le(e,i);n=t.params.number?Fi(n)?n.map(o):o(n):n,t.set(n)},this.on("change",this.listener);var n=le(e,i,!0);(i&&n.length||!i&&null!==n)&&(this.afterBind=this.listener),this.vm.$on("hook:attached",this.forceUpdate)},update:function(t){var e=this.el;e.selectedIndex=-1;for(var i,n,r=this.multiple&&Fi(t),s=e.options,o=s.length;o--;)i=s[o],n=i.hasOwnProperty("_value")?i._value:i.value,i.selected=r?ce(t,n)>-1:C(t,n)},unbind:function(){this.vm.$off("hook:attached",this.forceUpdate)}},Qr={bind:function(){function t(){var t=i.checked;return t&&i.hasOwnProperty("_trueValue")?i._trueValue:!t&&i.hasOwnProperty("_falseValue")?i._falseValue:t}var e=this,i=this.el;this.getValue=function(){return i.hasOwnProperty("_value")?i._value:e.params.number?o(i.value):i.value},this.listener=function(){var n=e._watcher.value;if(Fi(n)){var r=e.getValue();i.checked?b(n,r)<0&&n.push(r):n.$remove(r)}else e.set(t())},this.on("change",this.listener),i.hasAttribute("checked")&&(this.afterBind=this.listener)},update:function(t){var e=this.el;Fi(t)?e.checked=b(t,this.getValue())>-1:e.hasOwnProperty("_trueValue")?e.checked=C(t,e._trueValue):e.checked=!!t}},Gr={text:Ur,radio:Jr,select:qr,checkbox:Qr},Zr={priority:Sr,twoWay:!0,handlers:Gr,params:["lazy","number","debounce"],bind:function(){this.checkFilters(),this.hasRead&&!this.hasWrite;var t,e=this.el,i=e.tagName;if("INPUT"===i)t=Gr[e.type]||Gr.text;else if("SELECT"===i)t=Gr.select;else{if("TEXTAREA"!==i)return;t=Gr.text}e.__v_model=this,t.bind.call(this),this.update=t.update,this._unbind=t.unbind},checkFilters:function(){var t=this.filters;if(t)for(var e=t.length;e--;){var i=gt(this.vm.$options,"filters",t[e].name);("function"==typeof i||i.read)&&(this.hasRead=!0),i.write&&(this.hasWrite=!0)}},unbind:function(){this.el.__v_model=null,this._unbind&&this._unbind()}},Xr={esc:27,tab:9,enter:13,space:32,"delete":[8,46],up:38,left:37,right:39,down:40},Yr={priority:Er,acceptStatement:!0,keyCodes:Xr,bind:function(){if("IFRAME"===this.el.tagName&&"load"!==this.arg){var t=this;this.iframeBind=function(){q(t.el.contentWindow,t.arg,t.handler,t.modifiers.capture)},this.on("load",this.iframeBind)}},update:function(t){if(this.descriptor.raw||(t=function(){}),"function"==typeof t){this.modifiers.stop&&(t=fe(t)),this.modifiers.prevent&&(t=pe(t)),this.modifiers.self&&(t=de(t));var e=Object.keys(this.modifiers).filter(function(t){return"stop"!==t&&"prevent"!==t&&"self"!==t&&"capture"!==t});e.length&&(t=ue(t,e)),this.reset(),this.handler=t,this.iframeBind?this.iframeBind():q(this.el,this.arg,this.handler,this.modifiers.capture)}},reset:function(){var t=this.iframeBind?this.el.contentWindow:this.el;this.handler&&Q(t,this.arg,this.handler)},unbind:function(){this.reset()}},Kr=["-webkit-","-moz-","-ms-"],ts=["Webkit","Moz","ms"],es=/!important;?$/,is=Object.create(null),ns=null,rs={deep:!0,update:function(t){"string"==typeof t?this.el.style.cssText=t:Fi(t)?this.handleObject(t.reduce(v,{})):this.handleObject(t||{})},handleObject:function(t){var e,i,n=this.cache||(this.cache={});for(e in n)e in t||(this.handleSingle(e,null),delete n[e]);for(e in t)i=t[e],i!==n[e]&&(n[e]=i,this.handleSingle(e,i))},handleSingle:function(t,e){if(t=ve(t))if(null!=e&&(e+=""),e){var i=es.test(e)?"important":"";i?(e=e.replace(es,"").trim(),this.el.style.setProperty(t.kebab,e,i)):this.el.style[t.camel]=e}else this.el.style[t.camel]=""}},ss="http://www.w3.org/1999/xlink",os=/^xlink:/,as=/^v-|^:|^@|^(?:is|transition|transition-mode|debounce|track-by|stagger|enter-stagger|leave-stagger)$/,hs=/^(?:value|checked|selected|muted)$/,ls=/^(?:draggable|contenteditable|spellcheck)$/,cs={value:"_value","true-value":"_trueValue","false-value":"_falseValue"},us={priority:Fr,bind:function(){var t=this.arg,e=this.el.tagName;t||(this.deep=!0);var i=this.descriptor,n=i.interp;n&&(i.hasOneTime&&(this.expression=j(n,this._scope||this.vm)),(as.test(t)||"name"===t&&("PARTIAL"===e||"SLOT"===e))&&(this.el.removeAttribute(t),this.invalid=!0))},update:function(t){if(!this.invalid){var e=this.arg;this.arg?this.handleSingle(e,t):this.handleObject(t||{})}},handleObject:rs.handleObject,handleSingle:function(t,e){var i=this.el,n=this.descriptor.interp;if(this.modifiers.camel&&(t=l(t)),!n&&hs.test(t)&&t in i){var r="value"===t&&null==e?"":e;i[t]!==r&&(i[t]=r)}var s=cs[t];if(!n&&s){i[s]=e;var o=i.__v_model;o&&o.listener()}return"value"===t&&"TEXTAREA"===i.tagName?void i.removeAttribute(t):void(ls.test(t)?i.setAttribute(t,e?"true":"false"):null!=e&&e!==!1?"class"===t?(i.__v_trans&&(e+=" "+i.__v_trans.id+"-transition"),
+Z(i,e)):os.test(t)?i.setAttributeNS(ss,t,e===!0?"":e):i.setAttribute(t,e===!0?"":e):i.removeAttribute(t))}},fs={priority:Pr,bind:function(){if(this.arg){var t=this.id=l(this.arg),e=(this._scope||this.vm).$els;i(e,t)?e[t]=this.el:kt(e,t,this.el)}},unbind:function(){var t=(this._scope||this.vm).$els;t[this.id]===this.el&&(t[this.id]=null)}},ps={bind:function(){}},ds={bind:function(){var t=this.el;this.vm.$once("pre-hook:compiled",function(){t.removeAttribute("v-cloak")})}},vs={text:br,html:Nr,"for":Vr,"if":Br,show:zr,model:Zr,on:Yr,bind:us,el:fs,ref:ps,cloak:ds},ms={deep:!0,update:function(t){t?"string"==typeof t?this.setClass(t.trim().split(/\s+/)):this.setClass(ge(t)):this.cleanup()},setClass:function(t){this.cleanup(t);for(var e=0,i=t.length;i>e;e++){var n=t[e];n&&_e(this.el,n,X)}this.prevKeys=t},cleanup:function(t){var e=this.prevKeys;if(e)for(var i=e.length;i--;){var n=e[i];(!t||t.indexOf(n)<0)&&_e(this.el,n,Y)}}},gs={priority:Rr,params:["keep-alive","transition-mode","inline-template"],bind:function(){this.el.__vue__||(this.keepAlive=this.params.keepAlive,this.keepAlive&&(this.cache={}),this.params.inlineTemplate&&(this.inlineTemplate=K(this.el,!0)),this.pendingComponentCb=this.Component=null,this.pendingRemovals=0,this.pendingRemovalCb=null,this.anchor=nt("v-component"),J(this.el,this.anchor),this.el.removeAttribute("is"),this.el.removeAttribute(":is"),this.descriptor.ref&&this.el.removeAttribute("v-ref:"+u(this.descriptor.ref)),this.literal&&this.setComponent(this.expression))},update:function(t){this.literal||this.setComponent(t)},setComponent:function(t,e){if(this.invalidatePending(),t){var i=this;this.resolveComponent(t,function(){i.mountComponent(e)})}else this.unbuild(!0),this.remove(this.childVM,e),this.childVM=null},resolveComponent:function(t,e){var i=this;this.pendingComponentCb=w(function(n){i.ComponentName=n.options.name||("string"==typeof t?t:null),i.Component=n,e()}),this.vm._resolveComponent(t,this.pendingComponentCb)},mountComponent:function(t){this.unbuild(!0);var e=this,i=this.Component.options.activate,n=this.getCached(),r=this.build();i&&!n?(this.waitingFor=r,ye(i,r,function(){e.waitingFor===r&&(e.waitingFor=null,e.transition(r,t))})):(n&&r._updateRef(),this.transition(r,t))},invalidatePending:function(){this.pendingComponentCb&&(this.pendingComponentCb.cancel(),this.pendingComponentCb=null)},build:function(t){var e=this.getCached();if(e)return e;if(this.Component){var i={name:this.ComponentName,el:Gt(this.el),template:this.inlineTemplate,parent:this._host||this.vm,_linkerCachable:!this.inlineTemplate,_ref:this.descriptor.ref,_asComponent:!0,_isRouterView:this._isRouterView,_context:this.vm,_scope:this._scope,_frag:this._frag};t&&v(i,t);var n=new this.Component(i);return this.keepAlive&&(this.cache[this.Component.cid]=n),n}},getCached:function(){return this.keepAlive&&this.cache[this.Component.cid]},unbuild:function(t){this.waitingFor&&(this.keepAlive||this.waitingFor.$destroy(),this.waitingFor=null);var e=this.childVM;return!e||this.keepAlive?void(e&&(e._inactive=!0,e._updateRef(!0))):void e.$destroy(!1,t)},remove:function(t,e){var i=this.keepAlive;if(t){this.pendingRemovals++,this.pendingRemovalCb=e;var n=this;t.$remove(function(){n.pendingRemovals--,i||t._cleanup(),!n.pendingRemovals&&n.pendingRemovalCb&&(n.pendingRemovalCb(),n.pendingRemovalCb=null)})}else e&&e()},transition:function(t,e){var i=this,n=this.childVM;switch(n&&(n._inactive=!0),t._inactive=!1,this.childVM=t,i.params.transitionMode){case"in-out":t.$before(i.anchor,function(){i.remove(n,e)});break;case"out-in":i.remove(n,function(){t.$before(i.anchor,e)});break;default:i.remove(n),t.$before(i.anchor,e)}},unbind:function(){if(this.invalidatePending(),this.unbuild(),this.cache){for(var t in this.cache)this.cache[t].$destroy();this.cache=null}}},_s=Cn._propBindingModes,ys={},bs=/^[$_a-zA-Z]+[\w$]*$/,ws=Cn._propBindingModes,Cs={bind:function(){var t=this.vm,e=t._context,i=this.descriptor.prop,n=i.path,r=i.parentPath,s=i.mode===ws.TWO_WAY,o=this.parentWatcher=new zt(e,r,function(e){ke(t,i,e)},{twoWay:s,filters:i.filters,scope:this._scope});if($e(t,i,o.value),s){var a=this;t.$once("pre-hook:created",function(){a.childWatcher=new zt(t,n,function(t){o.set(t)},{sync:!0})})}},unbind:function(){this.parentWatcher.teardown(),this.childWatcher&&this.childWatcher.teardown()}},$s=[],ks=!1,xs="transition",As="animation",Os=Vi+"Duration",Ts=zi+"Duration",Ns=Pi&&window.requestAnimationFrame,js=Ns?function(t){Ns(function(){Ns(t)})}:function(t){setTimeout(t,50)},Es=Ee.prototype;Es.enter=function(t,e){this.cancelPending(),this.callHook("beforeEnter"),this.cb=e,X(this.el,this.enterClass),t(),this.entered=!1,this.callHookWithCb("enter"),this.entered||(this.cancel=this.hooks&&this.hooks.enterCancelled,Ne(this.enterNextTick))},Es.enterNextTick=function(){var t=this;this.justEntered=!0,js(function(){t.justEntered=!1});var e=this.enterDone,i=this.getCssTransitionType(this.enterClass);this.pendingJsCb?i===xs&&Y(this.el,this.enterClass):i===xs?(Y(this.el,this.enterClass),this.setupCssCb(Bi,e)):i===As?this.setupCssCb(Ui,e):e()},Es.enterDone=function(){this.entered=!0,this.cancel=this.pendingJsCb=null,Y(this.el,this.enterClass),this.callHook("afterEnter"),this.cb&&this.cb()},Es.leave=function(t,e){this.cancelPending(),this.callHook("beforeLeave"),this.op=t,this.cb=e,X(this.el,this.leaveClass),this.left=!1,this.callHookWithCb("leave"),this.left||(this.cancel=this.hooks&&this.hooks.leaveCancelled,this.op&&!this.pendingJsCb&&(this.justEntered?this.leaveDone():Ne(this.leaveNextTick)))},Es.leaveNextTick=function(){var t=this.getCssTransitionType(this.leaveClass);if(t){var e=t===xs?Bi:Ui;this.setupCssCb(e,this.leaveDone)}else this.leaveDone()},Es.leaveDone=function(){this.left=!0,this.cancel=this.pendingJsCb=null,this.op(),Y(this.el,this.leaveClass),this.callHook("afterLeave"),this.cb&&this.cb(),this.op=null},Es.cancelPending=function(){this.op=this.cb=null;var t=!1;this.pendingCssCb&&(t=!0,Q(this.el,this.pendingCssEvent,this.pendingCssCb),this.pendingCssEvent=this.pendingCssCb=null),this.pendingJsCb&&(t=!0,this.pendingJsCb.cancel(),this.pendingJsCb=null),t&&(Y(this.el,this.enterClass),Y(this.el,this.leaveClass)),this.cancel&&(this.cancel.call(this.vm,this.el),this.cancel=null)},Es.callHook=function(t){this.hooks&&this.hooks[t]&&this.hooks[t].call(this.vm,this.el)},Es.callHookWithCb=function(t){var e=this.hooks&&this.hooks[t];e&&(e.length>1&&(this.pendingJsCb=w(this[t+"Done"])),e.call(this.vm,this.el,this.pendingJsCb))},Es.getCssTransitionType=function(t){if(!(!Bi||document.hidden||this.hooks&&this.hooks.css===!1||Se(this.el))){var e=this.type||this.typeCache[t];if(e)return e;var i=this.el.style,n=window.getComputedStyle(this.el),r=i[Os]||n[Os];if(r&&"0s"!==r)e=xs;else{var s=i[Ts]||n[Ts];s&&"0s"!==s&&(e=As)}return e&&(this.typeCache[t]=e),e}},Es.setupCssCb=function(t,e){this.pendingCssEvent=t;var i=this,n=this.el,r=this.pendingCssCb=function(s){s.target===n&&(Q(n,t,r),i.pendingCssEvent=i.pendingCssCb=null,!i.pendingJsCb&&e&&e())};q(n,t,r)};var Ss={priority:Dr,update:function(t,e){var i=this.el,n=gt(this.vm.$options,"transitions",t);t=t||"v",i.__v_trans=new Ee(i,t,n,this.vm),e&&Y(i,e+"-transition"),X(i,t+"-transition")}},Fs={style:rs,"class":ms,component:gs,prop:Cs,transition:Ss},Ds=/^v-bind:|^:/,Ps=/^v-on:|^@/,Rs=/^v-([^:]+)(?:$|:(.*)$)/,Ls=/\.[^\.]+/g,Hs=/^(v-bind:|:)?transition$/,Is=1e3,Ms=2e3;Xe.terminal=!0;var Ws=/[^\w\-:\.]/,Vs=Object.freeze({compile:Fe,compileAndLinkProps:He,compileRoot:Ie,transclude:ri,resolveSlots:hi}),Bs=/^v-on:|^@/;pi.prototype._bind=function(){var t=this.name,e=this.descriptor;if(("cloak"!==t||this.vm._isCompiled)&&this.el&&this.el.removeAttribute){var i=e.attr||"v-"+t;this.el.removeAttribute(i)}var n=e.def;if("function"==typeof n?this.update=n:v(this,n),this._setupParams(),this.bind&&this.bind(),this._bound=!0,this.literal)this.update&&this.update(e.raw);else if((this.expression||this.modifiers)&&(this.update||this.twoWay)&&!this._checkStatement()){var r=this;this.update?this._update=function(t,e){r._locked||r.update(t,e)}:this._update=fi;var s=this._preProcess?p(this._preProcess,this):null,o=this._postProcess?p(this._postProcess,this):null,a=this._watcher=new zt(this.vm,this.expression,this._update,{filters:this.filters,twoWay:this.twoWay,deep:this.deep,preProcess:s,postProcess:o,scope:this._scope});this.afterBind?this.afterBind():this.update&&this.update(a.value)}},pi.prototype._setupParams=function(){if(this.params){var t=this.params;this.params=Object.create(null);for(var e,i,n,r=t.length;r--;)e=u(t[r]),n=l(e),i=M(this.el,e),null!=i?this._setupParamWatcher(n,i):(i=I(this.el,e),null!=i&&(this.params[n]=""===i?!0:i))}},pi.prototype._setupParamWatcher=function(t,e){var i=this,n=!1,r=(this._scope||this.vm).$watch(e,function(e,r){if(i.params[t]=e,n){var s=i.paramWatchers&&i.paramWatchers[t];s&&s.call(i,e,r)}else n=!0},{immediate:!0,user:!1});(this._paramUnwatchFns||(this._paramUnwatchFns=[])).push(r)},pi.prototype._checkStatement=function(){var t=this.expression;if(t&&this.acceptStatement&&!It(t)){var e=Ht(t).get,i=this._scope||this.vm,n=function(t){i.$event=t,e.call(i,i),i.$event=null};return this.filters&&(n=i._applyFilters(n,null,this.filters)),this.update(n),!0}},pi.prototype.set=function(t){this.twoWay&&this._withLock(function(){this._watcher.set(t)})},pi.prototype._withLock=function(t){var e=this;e._locked=!0,t.call(e),Qi(function(){e._locked=!1})},pi.prototype.on=function(t,e,i){q(this.el,t,e,i),(this._listeners||(this._listeners=[])).push([t,e])},pi.prototype._teardown=function(){if(this._bound){this._bound=!1,this.unbind&&this.unbind(),this._watcher&&this._watcher.teardown();var t,e=this._listeners;if(e)for(t=e.length;t--;)Q(this.el,e[t][0],e[t][1]);var i=this._paramUnwatchFns;if(i)for(t=i.length;t--;)i[t]();this.vm=this.el=this._watcher=this._listeners=null}};var zs=/[^|]\|[^|]/;xt(bi),ci(bi),ui(bi),di(bi),vi(bi),mi(bi),gi(bi),_i(bi),yi(bi);var Us={priority:Mr,params:["name"],bind:function(){var t=this.params.name||"default",e=this.vm._slotContents&&this.vm._slotContents[t];e&&e.hasChildNodes()?this.compile(e.cloneNode(!0),this.vm._context,this.vm):this.fallback()},compile:function(t,e,i){if(t&&e){if(this.el.hasChildNodes()&&1===t.childNodes.length&&1===t.childNodes[0].nodeType&&t.childNodes[0].hasAttribute("v-if")){var n=document.createElement("template");n.setAttribute("v-else",""),n.innerHTML=this.el.innerHTML,n._context=this.vm,t.appendChild(n)}var r=i?i._scope:this._scope;this.unlink=e.$compile(t,i,r,this._frag)}t?J(this.el,t):z(this.el)},fallback:function(){this.compile(K(this.el,!0),this.vm)},unbind:function(){this.unlink&&this.unlink()}},Js={priority:Lr,params:["name"],paramWatchers:{name:function(t){Br.remove.call(this),t&&this.insert(t)}},bind:function(){this.anchor=nt("v-partial"),J(this.el,this.anchor),this.insert(this.params.name)},insert:function(t){var e=gt(this.vm.$options,"partials",t,!0);e&&(this.factory=new re(this.vm,e),Br.insert.call(this))},unbind:function(){this.frag&&this.frag.destroy()}},qs={slot:Us,partial:Js},Qs=Vr._postProcess,Gs=/(\d{3})(?=\d)/g,Zs={orderBy:$i,filterBy:Ci,limitBy:wi,json:{read:function(t,e){return"string"==typeof t?t:JSON.stringify(t,null,Number(e)||2)},write:function(t){try{return JSON.parse(t)}catch(e){return t}}},capitalize:function(t){return t||0===t?(t=t.toString(),t.charAt(0).toUpperCase()+t.slice(1)):""},uppercase:function(t){return t||0===t?t.toString().toUpperCase():""},lowercase:function(t){return t||0===t?t.toString().toLowerCase():""},currency:function(t,e,i){if(t=parseFloat(t),!isFinite(t)||!t&&0!==t)return"";e=null!=e?e:"$",i=null!=i?i:2;var n=Math.abs(t).toFixed(i),r=i?n.slice(0,-1-i):n,s=r.length%3,o=s>0?r.slice(0,s)+(r.length>3?",":""):"",a=i?n.slice(-1-i):"",h=0>t?"-":"";return h+e+o+r.slice(s).replace(Gs,"$1,")+a},pluralize:function(t){var e=d(arguments,1);return e.length>1?e[t%10-1]||e[e.length-1]:e[0]+(1===t?"":"s")},debounce:function(t,e){return t?(e||(e=300),y(t,e)):void 0}};return xi(bi),bi.version="1.0.24",setTimeout(function(){Cn.devtools&&Ri&&Ri.emit("init",bi)},0),bi});
\ No newline at end of file

From c3db6afd75fcb78a58bf79d732e90b0a8fa59846 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 16:42:33 +0800
Subject: [PATCH 325/668] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=BA=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_header.html.erb | 22 ++++++++++++++++++-
 .../_org_left_subfield_list.html.erb          |  4 ----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index e05d52747..7d2043904 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -63,8 +63,28 @@
                     <% end %>
                   </ul>
                 </div>
+            <% elsif field.field_type == "Comptec" %>
+                <li>
+                  <%= link_to "#{field.name}", teachers_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                </li>
+            <% elsif field.field_type == "Compstu" %>
+                <li>
+                  <%= link_to "#{field.name}", students_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                </li>
+            <% elsif field.field_type == "Comppro" %>
+                <li>
+                  <%= link_to "#{field.name}", projects_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                </li>
+            <% elsif field.field_type == "Compcou" %>
+                <li>
+                  <%= link_to "#{field.name}", courses_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                </li>
+            <% elsif field.field_type == "Compact" %>
+                <li>
+                  <%= link_to "#{field.name}", acts_organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                </li>
             <% elsif field.field_type == "Resource" && field.hide == 0 %>
-                <li class="nav-element">
+                <li>
                   <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% end %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 30234c300..c1cc3a20f 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -125,10 +125,6 @@
               <div class="homepageLeftMenuBlock">
                 <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-          <% elsif field.field_type == "Compstu" && User.current.admin? %>
-              <div class="homepageLeftMenuBlock">
-                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-              </div>
           <% elsif field.field_type == "Comppro" && User.current.admin? %>
               <div class="homepageLeftMenuBlock">
                 <%= link_to "#{field.name}", projects_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>

From eee8a8adb683be02a0243a3e59e30049297cbd59 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 16:43:37 +0800
Subject: [PATCH 326/668] fix

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 730226df8..3fc14f60c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -525,7 +525,7 @@ app.directive('loadingSpinner', function ($http) {
     };
 });
 
-app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider, $locationProvider) {
+app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
     var rootPath = '/assets/wechat/'
     $locationProvider.html5Mode(true);
     $routeProvider

From 90ac57ed6abeda7810c34d106519f2a2dbcf7561 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 16:46:10 +0800
Subject: [PATCH 327/668]     base

---
 public/assets/wechat/app.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 63e88490f..98363b36e 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
+    <base href="/">
     <title>最新动态</title>
     <meta charset='utf-8' />
     <meta name="keywords" content="" />

From 81e35de2b650c397d576c174a2c72138c351cfb6 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 16:47:06 +0800
Subject: [PATCH 328/668]     base

---
 app/views/wechats/user_activities.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index b45587ae0..7eddb2861 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
+  <base href="/">
   <title>最新动态</title>
   <meta charset='utf-8' />
   <meta name="keywords" content="" />

From 09ff5954bd9cf9a6e6ebecb2dc7a45b1584f5717 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 16:56:20 +0800
Subject: [PATCH 329/668] =?UTF-8?q?=E5=AD=97=E4=BD=93=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=88=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BA=8C=E5=AD=90=E9=A1=B5=E9=9D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_custom_org_document_comment.html.erb            | 6 +++---
 .../organizations/_show_custom_org_subfield.html.erb      | 8 ++++----
 public/stylesheets/org2.css                               | 8 --------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/views/org_document_comments/_show_custom_org_document_comment.html.erb b/app/views/org_document_comments/_show_custom_org_document_comment.html.erb
index ec2a1ca8f..d3c98da13 100644
--- a/app/views/org_document_comments/_show_custom_org_document_comment.html.erb
+++ b/app/views/org_document_comments/_show_custom_org_document_comment.html.erb
@@ -1,11 +1,11 @@
 <div class="sn-innner-content">
   <div class="sn-row sn-bg-white">
-    <div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+    <div class="sn-font-grey3 f14"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
       <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %> &gt;
-      <a class = "sn-link-grey2 sn-hidden" ><%= @document.title %></a>
+      <a class = "sn-link-grey2" ><%= @document.title %></a>
     </div>
   </div>
-  <div class="sn-inner-newslist">
+  <div class="sn-inner-newslist mt15">
     <h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
     <div class="sn-inner-newscon">
       <p class=" sn-inner-psmall">来源：<%= @org_subfield.name %> 发布时间：<%= format_date(@document.created_at) %></p>
diff --git a/app/views/organizations/_show_custom_org_subfield.html.erb b/app/views/organizations/_show_custom_org_subfield.html.erb
index 473a5757d..10ac31637 100644
--- a/app/views/organizations/_show_custom_org_subfield.html.erb
+++ b/app/views/organizations/_show_custom_org_subfield.html.erb
@@ -3,13 +3,13 @@
     <div class="sn-inner-body">
       <div class="sn-innner-content">
         <div class="sn-row sn-bg-white">
-          <div class="sn-content-position">
+          <div class="sn-font-grey3 f14">
             您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
-            <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %>
+            <a class = "sn-link-grey2"><%= @org_subfield.name %></a>
           </div>
         </div>
-        <div class="sn-inner-newslist">
-          <h2 class="sn-inner-newsh2"><%= @organization.name %></h2>
+        <div class="sn-inner-newslist mt15">
+          <h2 class="sn-inner-newsh2"><%= @org_subfield.name %></h2>
           <ul>
             <% @subfield_acts.each do |act| %>
                 <% title = subfield_title_type(act) %>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 6672eb073..9e19fb5cb 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -1,14 +1,6 @@
 @charset "utf-8";
 /* CSS Document */
 /* 样式重置 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.9; background:#f2f2f2;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#000;text-decoration:none;}
-a:hover,a:active{color:#24366e;}
-
 .sn-fl {float:left;}
 .sn-fr {float:right;}
 .sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}

From b01a671fb40e5dc294635b6f83994fe4c67ed815 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 16:59:26 +0800
Subject: [PATCH 330/668]     base

---
 public/javascripts/wechat/app.js | 55 +++++++++-----------------------
 1 file changed, 15 insertions(+), 40 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 3fc14f60c..5e201fca4 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -75,38 +75,10 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     console.log("ActivityController load");
 
     $scope.page = 0;
-    var current_page = rms.get('current_page');
-    if(typeof current_page !== 'undefined'){
-        $scope.page = current_page;
-    }
-
     $scope.activities = rms.get("activities") || [];
 
-    var savePageConfig = function(){
-        rms.save('current_page', $scope.current_page);
-        rms.save('has_more', $scope.has_more);
-        rms.save('activities', $scope.activities);
-    }
-
-    var loadPageConfig = function(){
-
-        var has_more = rms.get('has_more');
-        var activities = rms.get('activities');
-
-
-        if(typeof has_more !== 'undefined'){
-            $scope.has_more = has_more;
-        }
-
-    }
 
     var loadActData = function(page){
-        if (page > 0 && $scope.activities.length >0){ //应该是返回过来的
-            loadPageConfig();
-            var yOffset = rms.get("yoffset");
-            $location.hash(yOffset);
-            return;
-        }
 
         $scope.page = page;
         $http({
@@ -126,19 +98,22 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
             console.log(response.data);
 
-            rms.save('current_page', $scope.page);
-            rms.save('has_more', $scope.has_more);
-            rms.save('activities', $scope.activities);
         }, function errorCallback(response) {
         });
     };
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadActData($scope.page);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
+
+    if($scope.activities.length<=0){
+
+        auth.getOpenId().then(
+            function successCallback(response){
+                loadActData($scope.page);
+            }, function errorCallback(response) {
+                alert("获取openid出错:"+response);
+            }
+        );
+
+    }
+
 
 
     $scope.loadActData = loadActData;
@@ -529,7 +504,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($rou
     var rootPath = '/assets/wechat/'
     $locationProvider.html5Mode(true);
     $routeProvider
-        .when('/activities', {
+        .when('/', {
             templateUrl: rootPath + 'activities.html',
             controller: 'ActivityController'
         })
@@ -562,7 +537,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($rou
             controller: 'BlogController'
         })
         .otherwise({
-            redirectTo: '/activities'
+            redirectTo: '/'
         });
 
         //监听异步请求,实现加载中显隐标记

From 5fe41d80e97b85127c32363f2836a7b794f099c3 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:06:13 +0800
Subject: [PATCH 331/668]     base

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 5e201fca4..b1b1f3858 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -77,6 +77,10 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.page = 0;
     $scope.activities = rms.get("activities") || [];
 
+    if($scope.activities.length>0){
+        return;
+    }
+
 
     var loadActData = function(page){
 
@@ -94,6 +98,9 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
             } else {
                 $scope.activities = response.data.data;
             }
+
+            rms.save("activities", $scope.activities);
+
             $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
 
             console.log(response.data);

From 8fb88dfdead7e3e78f923ac4e175250e175cd092 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:17:14 +0800
Subject: [PATCH 332/668]     base

---
 public/javascripts/wechat/app.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index b1b1f3858..91dc41015 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -67,7 +67,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, auth, rms, common){
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $document,$window, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -78,6 +78,12 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.activities = rms.get("activities") || [];
 
     if($scope.activities.length>0){
+
+        $timeout(function () {
+            $window.scroll(0,rms.get("yoffset"));
+        });
+
+
         return;
     }
 
@@ -101,6 +107,8 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
             rms.save("activities", $scope.activities);
 
+            rms.save("yoffset", $document.body.scrollHeight);
+
             $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
 
             console.log(response.data);

From f993fa87ff6ec497cfd49dfe757a5b4302bf286c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:18:28 +0800
Subject: [PATCH 333/668]     base

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 91dc41015..5dc1e90fd 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -107,7 +107,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
             rms.save("activities", $scope.activities);
 
-            rms.save("yoffset", $document.body.scrollHeight);
+
 
             $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
 
@@ -135,7 +135,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset",'act_'+id);
+        rms.save("yoffset", $document.body.scrollHeight);
         $location.path('/'+type+'/'+act_id);
     }
 

From a8b68d64ee4873ee43dac2216f32343d4095af56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 17:19:19 +0800
Subject: [PATCH 334/668] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb    | 10 +++++-----
 .../organizations/_org_container.html.erb      |  4 +++-
 .../organizations/_org_custom_header.html.erb  |  8 ++++----
 .../_org_left_subfield_list.html.erb           | 18 +++++++++---------
 .../organizations/_org_students_list.html.erb  |  2 +-
 .../organizations/_org_teachers_list.html.erb  |  9 +--------
 6 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index a75a0e698..ae1119609 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -30,7 +30,7 @@ class OrganizationsController < ApplicationController
   include UsersHelper
   include OrganizationsHelper
   before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses]
-  before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts]
+  # before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts]
   layout 'base_org'
   def index
 
@@ -180,7 +180,7 @@ class OrganizationsController < ApplicationController
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comptec").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
-    if @type == "courses" || @type.nil?
+    if @type.blank?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
     elsif @type == "famous"
@@ -204,7 +204,7 @@ class OrganizationsController < ApplicationController
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
-    if @type == "courses" || @type.nil?
+    if @type.blank?
       @org_students = User.find_by_sql("select u.*, ue.student_id, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity= 1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
     elsif @type == "famous"
@@ -240,7 +240,7 @@ class OrganizationsController < ApplicationController
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comppro").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
-    if @type.nil?
+    if @type.blank?
       @containers = Project.find_by_sql("select p.*, (select count(*) from forge_activities where forge_activities.project_id = p.id) as project_count
                                    from projects p where p.status =1 and p.is_public =1 and name like '%#{q}%' order by project_count desc;")
     elsif @type == "famous"
@@ -254,7 +254,7 @@ class OrganizationsController < ApplicationController
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
     @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Compstu").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
-    if @type.nil?
+    if @type.blank?
       @containers = Course.find_by_sql("select c.*, (select count(*) from course_activities where course_activities.course_id = c.id) as course_count
                                    from courses c where c.is_delete =0 and c.is_public =1 and name like '%#{q}%' order by course_count desc;")
     elsif @type == "famous"
diff --git a/app/views/organizations/_org_container.html.erb b/app/views/organizations/_org_container.html.erb
index 59ac4d95c..d91ed649e 100644
--- a/app/views/organizations/_org_container.html.erb
+++ b/app/views/organizations/_org_container.html.erb
@@ -16,7 +16,9 @@
             <div class="block-title">资源</div>
           </div>
         </div>
-        <a href="javascript:void(0);" class="fr teacher-select" onclick="admin_hide_org($(this),'<%= container.id %>');" id="hide_<%= container.id %>"><%= container.class == Course ? (container.is_excellent == 0 ? "设为精品" : "取消精品") : (container.hot ==0 ? "设为热门" : "取消热门") %></a>
+        <% if User.current.admin? %>
+            <a href="javascript:void(0);" class="fr teacher-select" onclick="admin_hide_org($(this),'<%= container.id %>');" id="hide_<%= container.id %>"><%= container.class == Course ? (container.is_excellent == 0 ? "设为精品" : "取消精品") : (container.hot ==0 ? "设为热门" : "取消热门") %></a>
+        <% end %>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 7d2043904..91ca5aafb 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -65,19 +65,19 @@
                 </div>
             <% elsif field.field_type == "Comptec" %>
                 <li>
-                  <%= link_to "#{field.name}", teachers_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                  <%= link_to "#{field.name}", teachers_organization_path(@organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% elsif field.field_type == "Compstu" %>
                 <li>
-                  <%= link_to "#{field.name}", students_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                  <%= link_to "#{field.name}", students_organization_path(@organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% elsif field.field_type == "Comppro" %>
                 <li>
-                  <%= link_to "#{field.name}", projects_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                  <%= link_to "#{field.name}", projects_organization_path(@organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% elsif field.field_type == "Compcou" %>
                 <li>
-                  <%= link_to "#{field.name}", courses_organization_path(@organization, :org_subfield_id => field.id, :type => "famous"), :class => "sn-link-white", :target => "_blank" %>
+                  <%= link_to "#{field.name}", courses_organization_path(@organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% elsif field.field_type == "Compact" %>
                 <li>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index c1cc3a20f..ddc504640 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -117,23 +117,23 @@
                     <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
                   </li>
               <% end %>
-          <% elsif field.field_type == "Comptec" && User.current.admin?  %>
+          <% elsif field.field_type == "Comptec" %>
               <div class="homepageLeftMenuBlock">
-                <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-          <% elsif field.field_type == "Compstu" && User.current.admin? %>
+          <% elsif field.field_type == "Compstu" %>
               <div class="homepageLeftMenuBlock">
-                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-          <% elsif field.field_type == "Comppro" && User.current.admin? %>
+          <% elsif field.field_type == "Comppro" %>
               <div class="homepageLeftMenuBlock">
-                <%= link_to "#{field.name}", projects_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                <%= link_to "#{field.name}", projects_organization_path(organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-          <% elsif field.field_type == "Compcou" && User.current.admin? %>
+          <% elsif field.field_type == "Compcou" %>
               <div class="homepageLeftMenuBlock">
-                <%= link_to "#{field.name}", courses_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                <%= link_to "#{field.name}", courses_organization_path(organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-          <% elsif field.field_type == "Compact" && User.current.admin? %>
+          <% elsif field.field_type == "Compact" %>
               <div class="homepageLeftMenuBlock">
                 <%= link_to "#{field.name}", acts_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
diff --git a/app/views/organizations/_org_students_list.html.erb b/app/views/organizations/_org_students_list.html.erb
index d3db6fbf6..482447c56 100644
--- a/app/views/organizations/_org_students_list.html.erb
+++ b/app/views/organizations/_org_students_list.html.erb
@@ -21,7 +21,7 @@
             <div class="block-title">资源数</div>
           </div>
         </div>
-        <% if User.current.admin_of_org?(@organization) %>
+        <% if User.current.admin? %>
             <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_student.id %>');" id="hide_<%= org_student.id %>"><%= org_student.excellent_student ==0 ? "设为学霸" : "取消设置" %></a>
         <% end %>
       </div>
diff --git a/app/views/organizations/_org_teachers_list.html.erb b/app/views/organizations/_org_teachers_list.html.erb
index f2523fb9f..90467d870 100644
--- a/app/views/organizations/_org_teachers_list.html.erb
+++ b/app/views/organizations/_org_teachers_list.html.erb
@@ -28,15 +28,8 @@
               <div class="block-title">资源数</div>
             </div>
             </div>
-        <% if User.current.admin_of_org?(@organization) %>
+        <% if User.current.admin? %>
             <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_teacher.id %>');" id="hide_<%= org_teacher.id %>"><%= org_teacher.excellent_teacher==0?"设为名师":"取消设置" %></a>
-            <!--<a href="javascript:void(0);" class="fr teacher-select">设为名师</a>-->
-        <% else %>
-            <!--<%# if(org_teacher.watched_by?(User.current)) %>-->
-                <!--<%#= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "delete",:remote => "true", :title => "取消关注"%>-->
-            <!--<%# else %>-->
-                <!--<%#= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "post",:remote => "true", :title => "添加关注"%>-->
-            <!--<%# end %>-->
         <% end %>
       </div>
       <div class="cl"></div>

From fbfb382d789da8fad45249693dd70be11baddc3c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:22:57 +0800
Subject: [PATCH 335/668]     base

---
 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 5dc1e90fd..a2351b367 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -67,7 +67,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $document,$window, auth, rms, common){
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -80,7 +80,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     if($scope.activities.length>0){
 
         $timeout(function () {
-            $window.scroll(0,rms.get("yoffset"));
+            window.scroll(0,rms.get("yoffset"));
         });
 
 
@@ -135,7 +135,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", $document.body.scrollHeight);
+        rms.save("yoffset", window.document.body.scrollHeight);
         $location.path('/'+type+'/'+act_id);
     }
 

From 5b34f498c957a26c49e429ed41f2cc26da726e18 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:23:56 +0800
Subject: [PATCH 336/668]     base

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index a2351b367..06a1d86d9 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -67,7 +67,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, auth, rms, common){
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };

From 37975552c98e00c3d1a3c834b63ccac2db167b36 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:27:17 +0800
Subject: [PATCH 337/668]     base

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 06a1d86d9..0fceed85f 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -135,7 +135,7 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", window.document.body.scrollHeight);
+        rms.save("yoffset", window.document.body.scrollTop);
         $location.path('/'+type+'/'+act_id);
     }
 

From 1251e31061d781e2108ff3db2f9a0a9bf4d3dd49 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:36:11 +0800
Subject: [PATCH 338/668] =?UTF-8?q?=20=20=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 45 ++++++++------------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 0fceed85f..54c4bd90e 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -74,21 +74,11 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
 
     console.log("ActivityController load");
 
-    $scope.page = 0;
+    $scope.page = rms.get('page') || 0;
     $scope.activities = rms.get("activities") || [];
+    $scope.has_more = rms.get("has_more");
 
-    if($scope.activities.length>0){
-
-        $timeout(function () {
-            window.scroll(0,rms.get("yoffset"));
-        });
-
-
-        return;
-    }
-
-
-    var loadActData = function(page){
+    $scope.loadActData = function(page){
 
         $scope.page = page;
         $http({
@@ -96,20 +86,16 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
             url: apiUrl+ "activities",
             data: {openid: auth.openid(), page: page}
         }).then(function successCallback(response) {
-            $scope.current_page = 0;
-            console.log($scope.current_page);
-            console.log(response.data.page);
-            if($scope.current_page < response.data.page) {
+            if(response.data.page >0) {
                 $scope.activities = $scope.activities.concat(response.data.data);
             } else {
                 $scope.activities = response.data.data;
             }
 
             rms.save("activities", $scope.activities);
-
-
-
             $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+            rms.save('has_more', $scope.has_more);
+            rms.save('page', response.data.page);
 
             console.log(response.data);
 
@@ -118,20 +104,14 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     };
 
     if($scope.activities.length<=0){
-
         auth.getOpenId().then(
             function successCallback(response){
-                loadActData($scope.page);
+                $scope.loadActData(0);
             }, function errorCallback(response) {
                 alert("获取openid出错:"+response);
             }
         );
-
-    }
-
-
-
-    $scope.loadActData = loadActData;
+    };
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
@@ -146,9 +126,6 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-
-
-
 });
 
 app.factory('common', function($http, auth, $routeParams){
@@ -517,9 +494,9 @@ app.directive('loadingSpinner', function ($http) {
 
 app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
     var rootPath = '/assets/wechat/'
-    $locationProvider.html5Mode(true);
+    //$locationProvider.html5Mode(true);
     $routeProvider
-        .when('/', {
+        .when('/activites', {
             templateUrl: rootPath + 'activities.html',
             controller: 'ActivityController'
         })
@@ -552,7 +529,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($rou
             controller: 'BlogController'
         })
         .otherwise({
-            redirectTo: '/'
+            redirectTo: '/activites'
         });
 
         //监听异步请求,实现加载中显隐标记

From 9c01bb63e77a9a7997138ac7a8be4c4017465a90 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 7 Jun 2016 17:36:33 +0800
Subject: [PATCH 339/668] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=A0=8F=E7=9B=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb             | 10 +++++-----
 app/views/organizations/_subfield_list.html.erb |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 181dfccb9..60714f597 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -213,11 +213,11 @@ module OrganizationsHelper
 
   # 系统栏目只有管理员才能看到
   def subfield_to_addmin?(org)
-    if User.current.admin?
-      @organization.org_subfields.order("priority")
-    else
-      @organization.org_subfields.select { |os| (os.field_type != "Comptec" && os.field_type != "Compstu" && os.field_type != "Comppro" && os.field_type != "Compcou" && os.field_type != "Compact") }.sort_by {|os| os.priority}
-    end
+    # if User.current.admin?
+    @organization.org_subfields.order("priority")
+    # else
+    #   @organization.org_subfields.select { |os| (os.field_type != "Comptec" && os.field_type != "Compstu" && os.field_type != "Comppro" && os.field_type != "Compcou" && os.field_type != "Compact") }.sort_by {|os| os.priority}
+    # end
   end
 
   def get_subfield_acts field
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 946043a62..aa1084304 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -89,7 +89,11 @@
           <li class="orgListOperation">
             <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
             <span class="fr">|</span>
-            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <% if (field.field_type == "Comptec" || field.field_type == "Compstu" || field.field_type == "Comppro" || field.field_type == "Compcou" || field.field_type == "Compact") && !User.current.admin? %>
+                <span class = "linkGrey fr ml5 mr5">默认</span>
+            <% else %>
+                <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <% end %>
             <span class="fr">|</span>
             <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
             <% unless field.field_type == "Resource" || field.field_type == "Comptec" || field.field_type == "Compstu" || field.field_type == "Comppro" || field.field_type == "Compcou" || field.field_type == "Compact" %>

From 8b05b33e38747e7d0a9b23017ffb9526c867a689 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 7 Jun 2016 17:38:38 +0800
Subject: [PATCH 340/668] =?UTF-8?q?=20=20=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 54c4bd90e..4e1df0381 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -111,7 +111,12 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
                 alert("获取openid出错:"+response);
             }
         );
-    };
+    } else {
+        $timeout(function(){
+            window.scrollTo(0, rms.get("yoffset"));
+        });
+
+    }
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){

From 5999189f3a3e4b11502136398f99dfac7f2a05cc Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 8 Jun 2016 09:02:00 +0800
Subject: [PATCH 341/668] =?UTF-8?q?1.=E8=A7=86=E9=A2=91=E6=A0=B9=E6=8D=AEh?=
 =?UTF-8?q?ttp=E8=BF=98=E6=98=AFhttps=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E3=80=82=202.=E8=A1=A8=E6=A0=BC=E5=86=85=E5=AE=B9=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E8=A1=A8=E6=A0=BC=E7=9A=84=E6=94=B9=E4=B8=BA=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E3=80=82=203.=E6=9C=89=E4=BA=9B=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E7=BC=A9=E8=BF=9B=E4=BB=8D=E7=84=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E6=A1=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js                | 6 +++++-
 public/assets/kindeditor/plugins/code/previewcode.css | 2 +-
 public/assets/kindeditor/plugins/table/table.js       | 2 +-
 public/javascripts/application.js                     | 4 +++-
 public/stylesheets/courses.css                        | 6 +++---
 public/stylesheets/new_user.css                       | 6 +++---
 public/stylesheets/project.css                        | 4 ++--
 public/stylesheets/public.css                         | 4 ++--
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 5503af1fe..0354ed467 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -815,7 +815,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 				startNewline = endNewline = '';
 			}
 		}
-		if (attr !== '') {
+        //blockquote 单独加上style 之后再改成接口 给别的加上默认的
+		if (attr !== '' || (tagName === 'blockquote')) {
 			var attrMap = _getAttrList(full);
 			if (tagName === 'font') {
 				var fontStyleMap = {}, fontStyle = '';
@@ -877,6 +878,9 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 				}
 			});
 			attr = '';
+            if (tagName === 'blockquote') {
+                attrMap['style'] = "margin: 0 0 0 40px; border: none; padding: 0px;background: none;background-color: ;";
+            }
 			_each(attrMap, function(key, val) {
 				if (key === 'style' && val === '') {
 					return;
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index f9f7c4b78..0db8eb45b 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -46,7 +46,7 @@
 .ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
 
 
-.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;}
+.ke-content blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index 74b14b118..3f3cbb27c 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -284,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index b8d9da240..7b8f664e9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1424,6 +1424,8 @@ function autoUrl(id){
         });
         $("#"+id).html(html);
     }
-    autoMedia(id);
+    if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
+        autoMedia(id);
+    }
 }
 
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 98976d044..5c37f2fbf 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,7 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -195,7 +195,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
@@ -1144,7 +1144,7 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 063e2b301..827e0ce52 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,7 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 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;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -724,7 +724,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
@@ -870,7 +870,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 5af57bc5f..17e0c3554 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -978,7 +978,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1121,7 +1121,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0919d8ae0..b9416e91f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -617,7 +617,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -655,7 +655,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}

From 9b4a3a704d8c316ce33600bc2d690c659213ea92 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 09:15:35 +0800
Subject: [PATCH 342/668] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html        | 4 ++--
 public/assets/wechat/course_discussion.html  | 4 ++--
 public/assets/wechat/project_discussion.html | 4 ++--
 public/stylesheets/weui/weixin.css           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index b820ed591..424df2bc6 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -5,7 +5,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><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
                 <div class="cl"></div>
                 <div class="f13 c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
@@ -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/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index f02c01ff6..e8d347a88 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -6,7 +6,7 @@
             <div loading-spinner></div>
             <div class="post-wrapper">
                 <div class="post-main">
-                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                     <table class="post-detail-info"><tr>
                         <td class="text-nowrap v-top">发布者：</td>
                         <td>{{discussion.user.realname}}</td>
@@ -39,7 +39,7 @@
                     </div>
                 </div>
                 </div>
-                <div class="post-input-wrap">
+                <div ng-if="!discussion.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/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index bd863f5ed..abec64c50 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -5,7 +5,7 @@
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            <div class="post-input-wrap">
+            <div ng-if="!discussion.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/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 4a88f9705..ab5695e3d 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -4,6 +4,7 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
 h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+img {max-width:100%;}
 blockquote {
     border:1px solid #d4d4d4;
     padding: 0.6em;
@@ -63,7 +64,6 @@ a.underline {text-decoration:underline;}
 .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 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,
 .post-interactive-reply,

From e4f48f046be13c2a13992892da7fbc73d714b135 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 09:16:57 +0800
Subject: [PATCH 343/668] =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  9 +++-
 .../_show_custom_org_subfield.html.erb        |  1 +
 app/views/organizations/acts.html.erb         | 45 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 app/views/organizations/acts.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index ae1119609..098cefceb 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -29,7 +29,7 @@ class OrganizationsController < ApplicationController
   helper :issues
   include UsersHelper
   include OrganizationsHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses, :acts]
   # before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts]
   layout 'base_org'
   def index
@@ -265,6 +265,13 @@ class OrganizationsController < ApplicationController
   end
 
   def acts
+    @subfield_content = @organization.org_subfields.order("priority")
+    @org_subfield = OrgSubfield.where(:id => params[:org_subfield_id]).first
+    @subfield_acts = get_subfield_acts(@org_subfield)
+    respond_to do |format|
+      format.html{render :layout => 'base_org_custom'}
+      format.js
+    end
   end
 
   def searchmember_by_name  members, name
diff --git a/app/views/organizations/_show_custom_org_subfield.html.erb b/app/views/organizations/_show_custom_org_subfield.html.erb
index 10ac31637..54416b6f0 100644
--- a/app/views/organizations/_show_custom_org_subfield.html.erb
+++ b/app/views/organizations/_show_custom_org_subfield.html.erb
@@ -1,4 +1,5 @@
 <% if @subfield_acts.blank? %>
+    <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
 <% else %>
     <div class="sn-inner-body">
       <div class="sn-innner-content">
diff --git a/app/views/organizations/acts.html.erb b/app/views/organizations/acts.html.erb
new file mode 100644
index 000000000..da6b79ee6
--- /dev/null
+++ b/app/views/organizations/acts.html.erb
@@ -0,0 +1,45 @@
+<% if @subfield_acts.blank? %>
+    <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+<% else %>
+    <div class="sn-inner-body">
+      <div class="sn-innner-content">
+        <div class="sn-row sn-bg-white">
+          <div class="sn-font-grey3 f14">
+            您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+            <a class = "sn-link-grey2"><%= @org_subfield.name %></a>
+          </div>
+        </div>
+        <div class="sn-inner-newslist mt15">
+          <h2 class="sn-inner-newsh2"><%= @org_subfield.name %></h2>
+          <ul>
+            <% @subfield_acts.each do |act| %>
+                <% title = subfield_title_type(act) %>
+                <% time = subfield_time_type(act) %>
+                <% reply_count = subfield_reply_count_type(act) %>
+                <% document = act.org_act %>
+                <li>
+                  <div class="sn-circle fl"></div>
+                  <% if act.org_act_type == "OrgDocumentComment" %>
+                      <%=link_to title, org_document_comment_path(act.org_act, :organization_id => @organization.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif act.org_act_type == "News" %>
+                      <%=link_to title, news_path(act.org_act), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif act.org_act_type == "Message" %>
+                      <%=link_to title, board_message_path(act.org_act.board.id, act.org_act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% end %>
+                  <span class=" txt-grey fr"><%= format_date(time) %></span>
+                  <span class="sn-newslist-reply fr mr10 txt-grey">回复（<%= reply_count %>）</span>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+
+          <!--<div>-->
+          <!--<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">-->
+          <!--<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>-->
+          <!--<div class="cl"></div>-->
+          <!--</ul>-->
+          <!--</div>-->
+        </div>
+      </div>
+    </div>
+<% end %>

From 67f0cad331227dd5d3fe05718ec92553ea915d85 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 09:40:05 +0800
Subject: [PATCH 344/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=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/controllers/organizations_controller.rb |  8 +++++-
 app/helpers/organizations_helper.rb         | 15 ++++++++++
 app/views/organizations/acts.html.erb       | 31 +++++++++++++--------
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 098cefceb..97fd65aa7 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -267,7 +267,13 @@ class OrganizationsController < ApplicationController
   def acts
     @subfield_content = @organization.org_subfields.order("priority")
     @org_subfield = OrgSubfield.where(:id => params[:org_subfield_id]).first
-    @subfield_acts = get_subfield_acts(@org_subfield)
+    shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
+    shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
+    project_ids = (@organization.projects.map(&:id) - shield_project_ids) << 0
+    course_ids = (@organization.courses.map(&:id) - shield_course_ids) << 0
+    @org_acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
+                                        ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
+                                        order by updated_at desc limit 6;")
     respond_to do |format|
       format.html{render :layout => 'base_org_custom'}
       format.js
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 60714f597..4099ea451 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -115,6 +115,19 @@ module OrganizationsHelper
     end
   end
 
+  def org_reply_count_type obj
+    case obj.act_type
+      when "HomeworkCommon"
+        obj.act.journals_for_messages.count
+      when "Issue"
+        obj.act.journals.count
+      when "Message"
+        obj.act.children.count
+      when "News"
+        obj.act.comments_count
+    end
+  end
+
   # 组织的栏目类型标题
   def subfield_title_type obj
     case obj.org_act_type
@@ -124,6 +137,8 @@ module OrganizationsHelper
         obj.org_act.parent_id.nil? ? obj.org_act.subject : obj.org_act.parent.subject
       when "News"
         obj.org_act.title
+      when "Issue"
+        obj.org_act.subject
     end
   end
 
diff --git a/app/views/organizations/acts.html.erb b/app/views/organizations/acts.html.erb
index da6b79ee6..8bd664711 100644
--- a/app/views/organizations/acts.html.erb
+++ b/app/views/organizations/acts.html.erb
@@ -1,4 +1,4 @@
-<% if @subfield_acts.blank? %>
+<% if @org_acts.blank? %>
     <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
 <% else %>
     <div class="sn-inner-body">
@@ -12,20 +12,27 @@
         <div class="sn-inner-newslist mt15">
           <h2 class="sn-inner-newsh2"><%= @org_subfield.name %></h2>
           <ul>
-            <% @subfield_acts.each do |act| %>
-                <% title = subfield_title_type(act) %>
-                <% time = subfield_time_type(act) %>
-                <% reply_count = subfield_reply_count_type(act) %>
-                <% document = act.org_act %>
+            <% @org_acts.each do |obj| %>
+                <% user = org_user_by_type(obj) %>
+                <% title = org_title_by_type(obj) %>
+                <% content = org_content_by_type(obj) %>
+                <% time = org_time_by_type(obj) %>
+                <% reply_count = org_reply_count_type(obj) %>
                 <li>
                   <div class="sn-circle fl"></div>
-                  <% if act.org_act_type == "OrgDocumentComment" %>
-                      <%=link_to title, org_document_comment_path(act.org_act, :organization_id => @organization.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
-                  <% elsif act.org_act_type == "News" %>
-                      <%=link_to title, news_path(act.org_act), :class => "sn-newslist-titile fl", :target => "_blank" %>
-                  <% elsif act.org_act_type == "Message" %>
-                      <%=link_to title, board_message_path(act.org_act.board.id, act.org_act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% if obj.act_type == "Message" %>
+                      <%= link_to title, board_message_path(obj.act.board.id, obj.act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif obj.act_type == "News" %>
+                      <%= link_to title, news_path(obj.act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif obj.act_type == "HomeworkCommon" %>
+                      <%= link_to title, student_work_index_url_in_org(obj.act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
+                  <% elsif obj.act_type == "Issue" %>
+                      <%= link_to title, issue_path(obj.act.id), :class => "sn-newslist-titile fl", :target => "_blank" %>
                   <% end %>
+
+
+
+
                   <span class=" txt-grey fr"><%= format_date(time) %></span>
                   <span class="sn-newslist-reply fr mr10 txt-grey">回复（<%= reply_count %>）</span>
                   <div class="cl"></div>

From 49406681efc3b0167b12c61861e8e6ad4447d0a7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 10:02:10 +0800
Subject: [PATCH 345/668] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_document_comments_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 43e95a0e9..1b9280749 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -96,7 +96,12 @@ class OrgDocumentCommentsController < ApplicationController
   def add_reply_in_doc
     @document = OrgDocumentComment.find(params[:id]).root
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
-    @comment.content = params[:org_content]
+    if params[:org_comment].blank?
+      @comment.content = params[:org_content]
+    else
+      @comment.content = params[:org_comment][:org_content]
+    end
+
     @document.children << @comment
     @document.save
     respond_to do |format|

From 4cb4213a5211672a9b0833da5155cdfb9acf0d97 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 8 Jun 2016 10:44:58 +0800
Subject: [PATCH 346/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9blockquote=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css  | 3 ---
 public/stylesheets/new_user.css | 3 ---
 public/stylesheets/project.css  | 2 --
 public/stylesheets/public.css   | 2 --
 4 files changed, 10 deletions(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5c37f2fbf..967d49389 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,7 +152,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -195,7 +194,6 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
@@ -1144,7 +1142,6 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index cece47704..32e727ba4 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,7 +683,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 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;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -724,7 +723,6 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
@@ -870,7 +868,6 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 17e0c3554..90a94b52f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -978,7 +978,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1121,7 +1120,6 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 20385b3e9..311503489 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -617,7 +617,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -655,7 +654,6 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .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;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}

From 6cdccc3b084c665d0cb92d63c9f9656c1d0a7da4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 10:53:56 +0800
Subject: [PATCH 347/668] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_show_org_document.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 594063629..688497cfd 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -41,8 +41,14 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                    <% if document.organization.home_id == document.id %>
+                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                        <% end %>
+                    <% else %>
+                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
+                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                        <% end %>
                     <% end %>
                   </li>
                   <li>

From a138ee31ab7c59a05364466df2c618a278657bb4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 11:00:19 +0800
Subject: [PATCH 348/668] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/show.html.erb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index dfa37bfb6..dbeabfa72 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -23,6 +23,9 @@
             <% else %>
                 <span style="color:#269ac9;">组织文章</span>
             <% end %>
+            <% if @document.organization.home_id == @document.id %>
+                <span class="red_homework_btn_cir ml5">已设为首页</span>
+            <% end %>
           </div>
           <div class="homepagePostTitle postGrey"><%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %></div>
           <div class="homepagePostDate">
@@ -45,8 +48,14 @@
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
                       <li>
-                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
-                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                        <% if @document.organization.home_id == @document.id %>
+                            <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
+                                <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                            <% end %>
+                        <% else %>
+                            <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
+                                <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                            <% end %>
                         <% end %>
                       </li>
                       <li>

From e4312674c4a164033134132e6c79c4fc88f3d92e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 8 Jun 2016 11:11:32 +0800
Subject: [PATCH 349/668] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/table/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index 3f3cbb27c..c181449ea 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -284,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';">' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}

From fa58fbdca1f1a3acede4a9404365e8f7ba97f110 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Jun 2016 11:21:02 +0800
Subject: [PATCH 350/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9A=84menu.yml?=
 =?UTF-8?q?=E5=92=8Cwechat.yml=E4=B8=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0727a920a..e9f6c8b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 /config/database.yml
 /config/configuration.yml
 /config/additional_environment.rb
+/config/menu.yml
+/config/wechat.yml
 
 /files/*
 /log/*

From 2f9dcc8a31c8bc51a04be0a5549feb623b1eb356 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 11:23:16 +0800
Subject: [PATCH 351/668] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=82=B9=E5=87=BB500?=
 =?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/controllers/org_document_comments_controller.rb | 2 +-
 app/views/org_document_comments/show.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 1b9280749..264c1fc9f 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -41,7 +41,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_subfield = OrgSubfield.where(:id => @document.org_subfield_id).first
     @subfield_content = @organization.org_subfields.order("priority")
     respond_to do |format|
-      format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'}
+      format.html {render :layout => (@organization.switch_type && @document && !@document.org_subfield_id.blank?) ? 'base_org_custom' : 'base_org'}
     end
   end
 
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index dbeabfa72..bcb1a61ef 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -1,4 +1,4 @@
-<% if @organization.switch_type %>
+<% if @organization.switch_type && @document && !@document.org_subfield_id.blank? %>
     <%= render :partial => 'show_custom_org_document_comment' %>
 <% else %>
     <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>

From b6eb5a3668382604bcc99d1f4c87ccd1b974a5ce Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Jun 2016 11:28:20 +0800
Subject: [PATCH 352/668] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_title.html.erb    | 6 +++++-
 app/views/student_work/_evaluation_un_title.html.erb | 6 +++++-
 app/views/student_work/index.js.erb                  | 3 ++-
 public/javascripts/resizeable_table.js               | 3 ++-
 public/stylesheets/courses.css                       | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 950c1660a..6a89b51b1 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,4 +1,8 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
+<!--
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
+-->
+
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 5ed2e82d6..c4a6a3e9b 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,4 +1,8 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
+<!--
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
+-->
+
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index 709561f1a..da2428316 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,3 +1,4 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
 $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-$("th").each(function(){$(this).css("width",$(this).width()-1);});
\ No newline at end of file
+/*
+$("th").each(function(){$(this).css("width",$(this).width()-1);});*/
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index a17fc9109..a43078dee 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -1,7 +1,7 @@
 /**
  * Created by ttang on 2016/5/24.
  */
-    $(document).ready(function(){
+    /*$(document).ready(function(){
         $("th").each(function(){
             $(this).css("width",$(this).width()-1);
         });
@@ -81,3 +81,4 @@
            }
        }
     });
+*/
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6d710b9ec..46fbc5950 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}

From 90aaaa544a23810aaf6c28048427d141b52da74f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 11:36:32 +0800
Subject: [PATCH 353/668] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 4 ++--
 app/helpers/organizations_helper.rb         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 97fd65aa7..b36ef592d 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -107,7 +107,7 @@ class OrganizationsController < ApplicationController
         if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0
           @acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
                                         ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
-                                        order by updated_at desc limit 6;")
+                                        order by created_at desc limit 6;")
         end
         render :layout => 'base_org_custom'
       else
@@ -273,7 +273,7 @@ class OrganizationsController < ApplicationController
     course_ids = (@organization.courses.map(&:id) - shield_course_ids) << 0
     @org_acts = UserActivity.find_by_sql("SELECT * FROM `user_activities` where act_type in ('HomeworkCommon', 'News', 'Message', 'Issue') and
                                         ((container_type = 'Course' and container_id in (#{course_ids.join(',')})) or (container_type = 'Project' and container_id in (#{project_ids.join(',')})))
-                                        order by updated_at desc limit 6;")
+                                        order by created_at desc limit 6;")
     respond_to do |format|
       format.html{render :layout => 'base_org_custom'}
       format.js
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 4099ea451..cb06bd688 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -105,13 +105,13 @@ module OrganizationsHelper
   def org_time_by_type obj
     case obj.act_type
       when "Message"
-        obj.act.updated_on
+        obj.act.created_on
       when "News"
         obj.act.created_on
       when "HomeworkCommon"
-        obj.act.updated_at
+        obj.act.created_at
       when "Issue"
-        obj.act.updated_on
+        obj.act.created_on
     end
   end
 

From 871a4d2d7bbbba193c306bb40c97fa43c668578c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 8 Jun 2016 13:15:08 +0800
Subject: [PATCH 354/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5500=E9=97=AE=E9=A2=98?=
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 7ee94215c..8696cd426 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -55,7 +55,7 @@
             <% when 'Issue' %>
                 <%= render :partial => 'users/project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message' %>
-                <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id, :is_course=>0, :is_board=>0} %>
             <% when 'Project'%>
                 <%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>

From 5f26e9e3ee70e896cd2628d35a0696585ec5008a Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 15:02:06 +0800
Subject: [PATCH 355/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=A0=BC=E5=BC=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         |    4 +-
 public/assets/wechat/course_discussion.html   |    4 +-
 public/assets/wechat/course_notice.html       |    4 +-
 public/assets/wechat/homework_detail.html     |    4 +-
 public/assets/wechat/issue_detail.html        |    4 +-
 public/assets/wechat/jour_message_detail.html |    4 +-
 public/assets/wechat/project_discussion.html  |    4 +-
 public/javascripts/wechat/app.js              |    5 +-
 .../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 +-
 public/stylesheets/weui/weixin.css            |   14 +-
 28 files changed, 3047 insertions(+), 3054 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 424df2bc6..509e0171a 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -8,7 +8,7 @@
                 <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
                 <div class="cl"></div>
@@ -24,7 +24,7 @@
                         <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                         <div class="ml55">
                             <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
                             <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                             <div class="post-reply-trigger fr undis">回复</div>
                         </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index e8d347a88..2e7ed3151 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -15,7 +15,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
                     </tr></table>
-                    <div class="f13 c-grey3 mt10" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="f13 c-grey3 mt10 text-control" ng-bind-html="discussion.content|safeHtml"></div>
                     <div class="cl"></div>
                     <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                     <div class="cl"></div>
@@ -31,7 +31,7 @@
                         <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                         <div class="ml55">
                             <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
                             <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                             <div class="post-reply-trigger fr undis">回复</div>
                         </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 0a85ed089..cca135681 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10" ng-bind-html="news.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="news.description|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{news.created_on}}</span>
                 <div class="cl"></div>
@@ -30,7 +30,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{comments.author.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{comments.author.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="comments.comments|safeHtml"></pre>
+                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="comments.comments|safeHtml"></div>
                         <div class="post-reply-date fl">{{comments.created_on}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index e416b7313..e1b648051 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -16,7 +16,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 mb10" ng-bind-html="homework.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="homework.description|safeHtml"></div>
                 <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评开启时间：{{homework.evaluation_start}}<br /></span>
@@ -36,7 +36,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
+                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
                         <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 7b5db0afa..1d7f9a536 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目问题</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 mb10" ng-bind-html="issue.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="issue.description|safeHtml"></div>
                 <span class="c-grey f13">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
                 优先级：{{issue.issue_priority}}<br />
                 指派给：{{issue.issue_assigned_to}}<br />
@@ -34,7 +34,7 @@
                     <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
                         <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
+                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
                         <div class="post-reply-date fl">{{journal.created_on}}</div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index fada796f8..dc6b1409f 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -7,7 +7,7 @@
                 <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
                 <div class="post-title">{{message.created_on}}</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10" ng-bind-html="message.notes|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="message.notes|safeHtml"></div>
                 <div class="cl"></div>
             </div>
             <div class="post-interactive border-bottom">
@@ -22,7 +22,7 @@
                         <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                         <div class="ml55">
                             <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
+                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
                             <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                             <div class="post-reply-trigger fr undis">回复</div>
                         </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index abec64c50..4831e1521 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10" ng-bind-html="discussion.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="discussion.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                 <div class="cl"></div>
@@ -30,7 +30,7 @@
                         <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
                         <div class="ml55">
                             <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
                             <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
                             <div class="post-reply-trigger fr undis">回复</div>
                         </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4e1df0381..78925558e 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -140,12 +140,13 @@ app.factory('common', function($http, auth, $routeParams){
             return;
         }
 
+        var temp =  data.comment.replace(/\n/g,'<br/>');
+
         var userInfo = {
             type: type,
-            content: data.comment,
+            content: temp,
             openid: auth.openid()
         };
-
         //回复按钮禁用
         data.disabled = true;
 
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;
+}
+
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ab5695e3d..461f35d31 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -5,16 +5,8 @@
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
 h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
 img {max-width:100%;}
-blockquote {
-    border:1px solid #d4d4d4;
-    padding: 0.6em;
-    margin-left: 1.4em;
-    margin-right: 0.4em;
-    border-radius: 4px;
-    font-family: "Microsoft YaHei";
-    background-size: 100% 100%;
-    margin-top:5px;
-}
+blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
+.text-control {word-break:normal; word-wrap:break-word;}
 .f12 {font-size:12px;}
 .f13 {font-size:13px;}
 .f15 {font-size:15px;}
@@ -71,7 +63,7 @@ a.underline {text-decoration:underline;}
 .more-wrap {width:100%;}
 .more-events {width:98%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
 .border-bottom {border-bottom:1px solid #e6e6e6;}
-.post-reply-wrap, .post-input-wrap {width:100%; line-height:18px; background-color:#f8f9fb;}
+.post-reply-wrap, .post-input-wrap {width:100%; background-color:#f8f9fb;}
 .post-reply-row {padding:10px; color:#9a9a9a;}
 .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
 .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}

From c0d167d2e26a22630c44f2e1c107a7d498f912e8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Jun 2016 15:23:19 +0800
Subject: [PATCH 356/668] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=9B=9E=E5=A4=8D=E4=B8=8D=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/views/issues/_list.html.erb       | 17 -----------------
 app/views/users/_all_replies.html.erb |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 3ee20ee2a..0eb3b4a0c 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,22 +1,5 @@
  <% issue_list(issues) do |issue, level| -%>
      <script>
-         function expand_reply(container, btnid) {
-             var target = $(container);
-             var btn = $(btnid);
-             if (btn.data('init') == '0') {
-                 btn.data('init', 1);
-                 btn.html('收起回复');
-                 target.show();
-             } else {
-                 btn.data('init', 0);
-                 btn.html('展开更多');
-                 target.hide();
-                 target.eq(0).show();
-                 target.eq(1).show();
-                 target.eq(2).show();
-             }
-         }
-
          $(function () {
              sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>");
          });
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 15c8944fd..20a3289ff 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -18,9 +18,9 @@
                  <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
             </span>
           </div>
-          <% unless comment.content_detail.blank? %>
+          <% if !comment.content_detail.blank? || comment.class == Journal %>
               <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                <% if comment.class == 'Journal' %>
+                <% if comment.class == Journal %>
                     <% if comment.details.any? %>
                         <% details_to_strings(comment.details).each do |string| %>
                             <p><%= string %></p>

From 981b199a0f3bb4a542bcd66ec04b39a8daabf23d Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 15:34:14 +0800
Subject: [PATCH 357/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E4=B8=8E=E6=95=B0=E5=AD=97=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 77 +++++++++++++++-------------
 public/stylesheets/weui/weixin.css   |  1 +
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index d7f48c4b2..53aa69bd3 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -27,13 +27,16 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <span class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
+                <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
+                <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
+                <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
+                <span class="c-grey f12 fl mt2">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -58,11 +61,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -87,11 +90,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -134,11 +137,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -164,11 +167,11 @@
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -207,11 +210,11 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -236,11 +239,11 @@
                 <div class="cl"></div>
               </div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-              <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
-              <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+              <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+              <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
               <div class="cl"></div>
             </div>
           </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 461f35d31..5882b04e0 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -17,6 +17,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
 .ml10 {margin-left:10px;}
+.mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
 .mr15 {margin-right:15px;}

From 070b48d85f5ecad26a7061ff428bdae72c18d40d Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 15:48:24 +0800
Subject: [PATCH 358/668] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html      |  1 -
 public/assets/wechat/homework_detail.html | 10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 53aa69bd3..69ea8f1fa 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -27,7 +27,6 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
                 <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
                 <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index e1b648051..0fc39c735 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -15,7 +15,15 @@
                     <tr>
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
-                    </tr></table>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap v-top">类&nbsp;&nbsp;&nbsp;别：</td>
+                        <td><span ng-if="homework.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
+                            <span ng-if="homework.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
+                            <span ng-if="homework.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
+                        </td>
+                    </tr>
+                </table>
                 <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="homework.description|safeHtml"></div>
                 <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>

From 7504b353c943cca63da329e579a68eedb9e30f44 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 8 Jun 2016 16:50:13 +0800
Subject: [PATCH 359/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8A=A5500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
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 8696cd426..cc1404eb5 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -57,7 +57,7 @@
             <% when 'Message' %>
                 <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id, :is_course=>0, :is_board=>0} %>
             <% when 'Project'%>
-                <%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
         <% if act.container_type ==  'Course' %>

From 793b651393c1560658b7b21902f27eff328c4382 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 9 Jun 2016 19:48:58 +0800
Subject: [PATCH 360/668] =?UTF-8?q?=E5=8E=8B=E7=BC=A9angularjs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |    1 +
 app/views/wechats/user_activities.html.erb    |    6 +-
 public/assets/wechat/app.html                 |    6 +-
 public/javascripts/wechat/app.js              |   21 +-
 .../wechat/build/angular.all.min.js           |    8 +
 public/javascripts/wechat/gulpfile.js         |   10 +
 .../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 +-
 25 files changed, 3053 insertions(+), 3053 deletions(-)
 create mode 100644 public/javascripts/wechat/build/angular.all.min.js
 create mode 100644 public/javascripts/wechat/gulpfile.js

diff --git a/.gitignore b/.gitignore
index 0727a920a..c03e98428 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ vendor/cache
 /tags
 /config/initializers/gitlab_config.rb
 1234567
+public/javascripts/wechat/node_modules/
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index cf9ea7235..5ce5280d6 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -19,12 +19,8 @@
 <div ng-view>
 </div>
 
-
-<script src="/javascripts/wechat/angular.js"></script>
-<script src="/javascripts/wechat/angular-route.js"></script>
-<script src="/javascripts/wechat/angular-sanitize.min.js"></script>
-<script src="/javascripts/wechat/angular-cookies.js"></script>
 <script src="/javascripts/jquery-1.3.2.js"></script>
+<script src="/javascripts/wechat/build/angular.all.min.js"></script>
 <script src="/javascripts/wechat/app.js"></script>
 </body>
 
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 0b68eb0e8..8e3d38005 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -17,12 +17,8 @@
 <div ng-view>
 </div>
 
-
-<script src="/javascripts/wechat/angular.js"></script>
-<script src="/javascripts/wechat/angular-route.js"></script>
-<script src="/javascripts/wechat/angular-sanitize.min.js"></script>
-<script src="/javascripts/wechat/angular-cookies.js"></script>
 <script src="/javascripts/jquery-1.3.2.js"></script>
+<script src="/javascripts/wechat/build/angular.all.min.js"></script>
 <script src="/javascripts/wechat/app.js"></script>
 </body>
 
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4e1df0381..1a734b8e8 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -4,7 +4,7 @@ var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){
     //apiUrl = 'http://localhost:3000/api/v1/';
-    apiUrl = 'https://www.trustie.net/api/v1/';
+    apiUrl = 'http://www.trustie.net/api/v1/';
 }
 
 
@@ -16,7 +16,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
     }
 
     if(debug===true){
-        _openid = "1";
+        _openid = "orgVLv8TlS6e7FDiI6xdTGHRaaRo"; //guange的帐号
     }
 
     var getOpenId = function() {
@@ -478,24 +478,13 @@ app.directive('inputAuto',function(){
     }
 });
 
-app.directive('loadingSpinner', function ($http) {
+app.directive('loadingSpinner', ['$http', function ($http) {
     return {
         restrict: 'A',
         replace: true,
-        template: '<div class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
-        link: function (scope, element, attrs) {
-
-            scope.$watch('activeCalls', function (newVal, oldVal) {
-                if (newVal == 0) {
-                    $(element).hide();
-                }
-                else {
-                    $(element).show();
-                }
-            });
-        }
+        template: '<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
     };
-});
+}]);
 
 app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
     var rootPath = '/assets/wechat/'
diff --git a/public/javascripts/wechat/build/angular.all.min.js b/public/javascripts/wechat/build/angular.all.min.js
new file mode 100644
index 000000000..72e4e89cd
--- /dev/null
+++ b/public/javascripts/wechat/build/angular.all.min.js
@@ -0,0 +1,8 @@
+!function(e,t,n){"use strict";function r(e,t){return t=t||Error,function(){var n,r,i=2,o=arguments,a=o[0],s="["+(e?e+":":"")+a+"] ",u=o[1];for(s+=u.replace(/\{\d+\}/g,function(e){var t=+e.slice(1,-1),n=t+i;return n<o.length?ye(o[n]):e}),s+="\nhttp://errors.angularjs.org/1.4.6/"+(e?e+"/":"")+a,r=i,n="?";r<o.length;r++,n="&")s+=n+"p"+(r-i)+"="+encodeURIComponent(ye(o[r]));return new t(s)}}function i(e){if(null==e||O(e))return!1;var t="length"in Object(e)&&e.length;return e.nodeType===zr&&t?!0:S(e)||Ir(e)||0===t||"number"==typeof t&&t>0&&t-1 in e}function o(e,t,n){var r,a;if(e)if(k(e))for(r in e)"prototype"==r||"length"==r||"name"==r||e.hasOwnProperty&&!e.hasOwnProperty(r)||t.call(n,e[r],r,e);else if(Ir(e)||i(e)){var s="object"!=typeof e;for(r=0,a=e.length;a>r;r++)(s||r in e)&&t.call(n,e[r],r,e)}else if(e.forEach&&e.forEach!==o)e.forEach(t,n,e);else if(x(e))for(r in e)t.call(n,e[r],r,e);else if("function"==typeof e.hasOwnProperty)for(r in e)e.hasOwnProperty(r)&&t.call(n,e[r],r,e);else for(r in e)yr.call(e,r)&&t.call(n,e[r],r,e);return e}function a(e,t,n){for(var r=Object.keys(e).sort(),i=0;i<r.length;i++)t.call(n,e[r[i]],r[i]);return r}function s(e){return function(t,n){e(n,t)}}function u(){return++Pr}function c(e,t){t?e.$$hashKey=t:delete e.$$hashKey}function l(e,t,n){for(var r=e.$$hashKey,i=0,o=t.length;o>i;++i){var a=t[i];if(w(a)||k(a))for(var s=Object.keys(a),u=0,f=s.length;f>u;u++){var h=s[u],p=a[h];n&&w(p)?C(p)?e[h]=new Date(p.valueOf()):A(p)?e[h]=new RegExp(p):(w(e[h])||(e[h]=Ir(p)?[]:{}),l(e[h],[p],!0)):e[h]=p}}return c(e,r),e}function f(e){return l(e,Ar.call(arguments,1),!1)}function h(e){return l(e,Ar.call(arguments,1),!0)}function p(e){return parseInt(e,10)}function d(e,t){return f(Object.create(e),t)}function $(){}function v(e){return e}function m(e){return function(){return e}}function g(e){return k(e.toString)&&e.toString!==Object.prototype.toString}function y(e){return"undefined"==typeof e}function b(e){return"undefined"!=typeof e}function w(e){return null!==e&&"object"==typeof e}function x(e){return null!==e&&"object"==typeof e&&!Nr(e)}function S(e){return"string"==typeof e}function E(e){return"number"==typeof e}function C(e){return"[object Date]"===Tr.call(e)}function k(e){return"function"==typeof e}function A(e){return"[object RegExp]"===Tr.call(e)}function O(e){return e&&e.window===e}function M(e){return e&&e.$evalAsync&&e.$watch}function T(e){return"[object File]"===Tr.call(e)}function N(e){return"[object FormData]"===Tr.call(e)}function V(e){return"[object Blob]"===Tr.call(e)}function j(e){return"boolean"==typeof e}function P(e){return e&&k(e.then)}function D(e){return Rr.test(Tr.call(e))}function I(e){return!(!e||!(e.nodeName||e.prop&&e.attr&&e.find))}function R(e){var t,n={},r=e.split(",");for(t=0;t<r.length;t++)n[r[t]]=!0;return n}function _(e){return gr(e.nodeName||e[0]&&e[0].nodeName)}function q(e,t){var n=e.indexOf(t);return n>=0&&e.splice(n,1),n}function F(e,t,n,r){if(O(e)||M(e))throw Vr("cpws","Can't copy! Making copies of Window or Scope instances is not supported.");if(D(t))throw Vr("cpta","Can't copy! TypedArray destination cannot be mutated.");if(t){if(e===t)throw Vr("cpi","Can't copy! Source and destination are identical.");n=n||[],r=r||[],w(e)&&(n.push(e),r.push(t));var i;if(Ir(e)){t.length=0;for(var a=0;a<e.length;a++)t.push(F(e[a],null,n,r))}else{var s=t.$$hashKey;if(Ir(t)?t.length=0:o(t,function(e,n){delete t[n]}),x(e))for(i in e)t[i]=F(e[i],null,n,r);else if(e&&"function"==typeof e.hasOwnProperty)for(i in e)e.hasOwnProperty(i)&&(t[i]=F(e[i],null,n,r));else for(i in e)yr.call(e,i)&&(t[i]=F(e[i],null,n,r));c(t,s)}}else if(t=e,w(e)){var u;if(n&&-1!==(u=n.indexOf(e)))return r[u];if(Ir(e))return F(e,[],n,r);if(D(e))t=new e.constructor(e);else if(C(e))t=new Date(e.getTime());else if(A(e))t=new RegExp(e.source,e.toString().match(/[^\/]*$/)[0]),t.lastIndex=e.lastIndex;else{if(!k(e.cloneNode)){var l=Object.create(Nr(e));return F(e,l,n,r)}t=e.cloneNode(!0)}r&&(n.push(e),r.push(t))}return t}function U(e,t){if(Ir(e)){t=t||[];for(var n=0,r=e.length;r>n;n++)t[n]=e[n]}else if(w(e)){t=t||{};for(var i in e)"$"===i.charAt(0)&&"$"===i.charAt(1)||(t[i]=e[i])}return t||e}function B(e,t){if(e===t)return!0;if(null===e||null===t)return!1;if(e!==e&&t!==t)return!0;var n,r,i,o=typeof e,a=typeof t;if(o==a&&"object"==o){if(!Ir(e)){if(C(e))return C(t)?B(e.getTime(),t.getTime()):!1;if(A(e))return A(t)?e.toString()==t.toString():!1;if(M(e)||M(t)||O(e)||O(t)||Ir(t)||C(t)||A(t))return!1;i=ve();for(r in e)if("$"!==r.charAt(0)&&!k(e[r])){if(!B(e[r],t[r]))return!1;i[r]=!0}for(r in t)if(!(r in i)&&"$"!==r.charAt(0)&&b(t[r])&&!k(t[r]))return!1;return!0}if(!Ir(t))return!1;if((n=e.length)==t.length){for(r=0;n>r;r++)if(!B(e[r],t[r]))return!1;return!0}}return!1}function H(e,t,n){return e.concat(Ar.call(t,n))}function L(e,t){return Ar.call(e,t||0)}function z(e,t){var n=arguments.length>2?L(arguments,2):[];return!k(t)||t instanceof RegExp?t:n.length?function(){return arguments.length?t.apply(e,H(n,arguments,0)):t.apply(e,n)}:function(){return arguments.length?t.apply(e,arguments):t.call(e)}}function W(e,r){var i=r;return"string"==typeof e&&"$"===e.charAt(0)&&"$"===e.charAt(1)?i=n:O(r)?i="$WINDOW":r&&t===r?i="$DOCUMENT":M(r)&&(i="$SCOPE"),i}function G(e,t){return"undefined"==typeof e?n:(E(t)||(t=t?2:null),JSON.stringify(e,W,t))}function Y(e){return S(e)?JSON.parse(e):e}function J(e,t){var n=Date.parse("Jan 01, 1970 00:00:00 "+e)/6e4;return isNaN(n)?t:n}function K(e,t){return e=new Date(e.getTime()),e.setMinutes(e.getMinutes()+t),e}function Z(e,t,n){n=n?-1:1;var r=J(t,e.getTimezoneOffset());return K(e,n*(r-e.getTimezoneOffset()))}function X(e){e=Er(e).clone();try{e.empty()}catch(t){}var n=Er("<div>").append(e).html();try{return e[0].nodeType===Gr?gr(n):n.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(e,t){return"<"+gr(t)})}catch(t){return gr(n)}}function Q(e){try{return decodeURIComponent(e)}catch(t){}}function ee(e){var t={};return o((e||"").split("&"),function(e){var n,r,i;e&&(r=e=e.replace(/\+/g,"%20"),n=e.indexOf("="),-1!==n&&(r=e.substring(0,n),i=e.substring(n+1)),r=Q(r),b(r)&&(i=b(i)?Q(i):!0,yr.call(t,r)?Ir(t[r])?t[r].push(i):t[r]=[t[r],i]:t[r]=i))}),t}function te(e){var t=[];return o(e,function(e,n){Ir(e)?o(e,function(e){t.push(re(n,!0)+(e===!0?"":"="+re(e,!0)))}):t.push(re(n,!0)+(e===!0?"":"="+re(e,!0)))}),t.length?t.join("&"):""}function ne(e){return re(e,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function re(e,t){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,t?"%20":"+")}function ie(e,t){var n,r,i=Br.length;for(r=0;i>r;++r)if(n=Br[r]+t,S(n=e.getAttribute(n)))return n;return null}function oe(e,t){var n,r,i={};o(Br,function(t){var i=t+"app";!n&&e.hasAttribute&&e.hasAttribute(i)&&(n=e,r=e.getAttribute(i))}),o(Br,function(t){var i,o=t+"app";!n&&(i=e.querySelector("["+o.replace(":","\\:")+"]"))&&(n=i,r=i.getAttribute(o))}),n&&(i.strictDi=null!==ie(n,"strict-di"),t(n,r?[r]:[],i))}function ae(n,r,i){w(i)||(i={});var a={strictDi:!1};i=f(a,i);var s=function(){if(n=Er(n),n.injector()){var e=n[0]===t?"document":X(n);throw Vr("btstrpd","App Already Bootstrapped with this Element '{0}'",e.replace(/</,"&lt;").replace(/>/,"&gt;"))}r=r||[],r.unshift(["$provide",function(e){e.value("$rootElement",n)}]),i.debugInfoEnabled&&r.push(["$compileProvider",function(e){e.debugInfoEnabled(!0)}]),r.unshift("ng");var o=Xe(r,i.strictDi);return o.invoke(["$rootScope","$rootElement","$compile","$injector",function(e,t,n,r){e.$apply(function(){t.data("$injector",r),n(t)(e)})}]),o},u=/^NG_ENABLE_DEBUG_INFO!/,c=/^NG_DEFER_BOOTSTRAP!/;return e&&u.test(e.name)&&(i.debugInfoEnabled=!0,e.name=e.name.replace(u,"")),e&&!c.test(e.name)?s():(e.name=e.name.replace(c,""),jr.resumeBootstrap=function(e){return o(e,function(e){r.push(e)}),s()},void(k(jr.resumeDeferredBootstrap)&&jr.resumeDeferredBootstrap()))}function se(){e.name="NG_ENABLE_DEBUG_INFO!"+e.name,e.location.reload()}function ue(e){var t=jr.element(e).injector();if(!t)throw Vr("test","no injector found for element argument to getTestability");return t.get("$$testability")}function ce(e,t){return t=t||"_",e.replace(Hr,function(e,n){return(n?t:"")+e.toLowerCase()})}function le(){var t;if(!Lr){var r=Ur();Cr=y(r)?e.jQuery:r?e[r]:n,Cr&&Cr.fn.on?(Er=Cr,f(Cr.fn,{scope:fi.scope,isolateScope:fi.isolateScope,controller:fi.controller,injector:fi.injector,inheritedData:fi.inheritedData}),t=Cr.cleanData,Cr.cleanData=function(e){var n;if(Dr)Dr=!1;else for(var r,i=0;null!=(r=e[i]);i++)n=Cr._data(r,"events"),n&&n.$destroy&&Cr(r).triggerHandler("$destroy");t(e)}):Er=Oe,jr.element=Er,Lr=!0}}function fe(e,t,n){if(!e)throw Vr("areq","Argument '{0}' is {1}",t||"?",n||"required");return e}function he(e,t,n){return n&&Ir(e)&&(e=e[e.length-1]),fe(k(e),t,"not a function, got "+(e&&"object"==typeof e?e.constructor.name||"Object":typeof e)),e}function pe(e,t){if("hasOwnProperty"===e)throw Vr("badname","hasOwnProperty is not a valid {0} name",t)}function de(e,t,n){if(!t)return e;for(var r,i=t.split("."),o=e,a=i.length,s=0;a>s;s++)r=i[s],e&&(e=(o=e)[r]);return!n&&k(e)?z(o,e):e}function $e(e){for(var t,n=e[0],r=e[e.length-1],i=1;n!==r&&(n=n.nextSibling);i++)(t||e[i]!==n)&&(t||(t=Er(Ar.call(e,0,i))),t.push(n));return t||e}function ve(){return Object.create(null)}function me(e){function t(e,t,n){return e[t]||(e[t]=n())}var n=r("$injector"),i=r("ng"),o=t(e,"angular",Object);return o.$$minErr=o.$$minErr||r,t(o,"module",function(){var e={};return function(r,o,a){var s=function(e,t){if("hasOwnProperty"===e)throw i("badname","hasOwnProperty is not a valid {0} name",t)};return s(r,"module"),o&&e.hasOwnProperty(r)&&(e[r]=null),t(e,r,function(){function e(e,t,n,r){return r||(r=i),function(){return r[n||"push"]([e,t,arguments]),l}}function t(e,t){return function(n,o){return o&&k(o)&&(o.$$moduleName=r),i.push([e,t,arguments]),l}}if(!o)throw n("nomod","Module '{0}' is not available! You either misspelled the module name or forgot to load it. If registering a module ensure that you specify the dependencies as the second argument.",r);var i=[],s=[],u=[],c=e("$injector","invoke","push",s),l={_invokeQueue:i,_configBlocks:s,_runBlocks:u,requires:o,name:r,provider:t("$provide","provider"),factory:t("$provide","factory"),service:t("$provide","service"),value:e("$provide","value"),constant:e("$provide","constant","unshift"),decorator:t("$provide","decorator"),animation:t("$animateProvider","register"),filter:t("$filterProvider","register"),controller:t("$controllerProvider","register"),directive:t("$compileProvider","directive"),config:c,run:function(e){return u.push(e),this}};return a&&c(a),l})}})}function ge(e){var t=[];return JSON.stringify(e,function(e,n){if(n=W(e,n),w(n)){if(t.indexOf(n)>=0)return"...";t.push(n)}return n})}function ye(e){return"function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):y(e)?"undefined":"string"!=typeof e?ge(e):e}function be(t){f(t,{bootstrap:ae,copy:F,extend:f,merge:h,equals:B,element:Er,forEach:o,injector:Xe,noop:$,bind:z,toJson:G,fromJson:Y,identity:v,isUndefined:y,isDefined:b,isString:S,isFunction:k,isObject:w,isNumber:E,isElement:I,isArray:Ir,version:Zr,isDate:C,lowercase:gr,uppercase:br,callbacks:{counter:0},getTestability:ue,$$minErr:r,$$csp:Fr,reloadWithDebugInfo:se}),(kr=me(e))("ng",["ngLocale"],["$provide",function(e){e.provider({$$sanitizeUri:$n}),e.provider("$compile",ut).directive({a:fo,input:Mo,textarea:Mo,form:mo,script:wa,select:Ea,style:ka,option:Ca,ngBind:Vo,ngBindHtml:Po,ngBindTemplate:jo,ngClass:Io,ngClassEven:_o,ngClassOdd:Ro,ngCloak:qo,ngController:Fo,ngForm:go,ngHide:$a,ngIf:Ho,ngInclude:Lo,ngInit:Wo,ngNonBindable:aa,ngPluralize:la,ngRepeat:fa,ngShow:da,ngStyle:va,ngSwitch:ma,ngSwitchWhen:ga,ngSwitchDefault:ya,ngOptions:ca,ngTransclude:ba,ngModel:ra,ngList:Go,ngChange:Do,pattern:Oa,ngPattern:Oa,required:Aa,ngRequired:Aa,minlength:Ta,ngMinlength:Ta,maxlength:Ma,ngMaxlength:Ma,ngValue:No,ngModelOptions:oa}).directive({ngInclude:zo}).directive(ho).directive(Uo),e.provider({$anchorScroll:Qe,$animate:ki,$animateCss:Ai,$$animateQueue:Ci,$$AnimateRunner:Ei,$browser:ot,$cacheFactory:at,$controller:pt,$document:dt,$exceptionHandler:$t,$filter:Mn,$$forceReflow:Vi,$interpolate:Mt,$interval:Tt,$http:Ct,$httpParamSerializer:mt,$httpParamSerializerJQLike:gt,$httpBackend:At,$location:Lt,$log:zt,$parse:cn,$rootScope:dn,$q:ln,$$q:fn,$sce:yn,$sceDelegate:gn,$sniffer:bn,$templateCache:st,$templateRequest:wn,$$testability:xn,$timeout:Sn,$window:kn,$$rAF:pn,$$jqLite:Ge,$$HashMap:$i,$$cookieReader:On})}])}function we(){return++Qr}function xe(e){return e.replace(ni,function(e,t,n,r){return r?n.toUpperCase():n}).replace(ri,"Moz$1")}function Se(e){return!si.test(e)}function Ee(e){var t=e.nodeType;return t===zr||!t||t===Jr}function Ce(e){for(var t in Xr[e.ng339])return!0;return!1}function ke(e,t){var n,r,i,a,s=t.createDocumentFragment(),u=[];if(Se(e))u.push(t.createTextNode(e));else{for(n=n||s.appendChild(t.createElement("div")),r=(ui.exec(e)||["",""])[1].toLowerCase(),i=li[r]||li._default,n.innerHTML=i[1]+e.replace(ci,"<$1></$2>")+i[2],a=i[0];a--;)n=n.lastChild;u=H(u,n.childNodes),n=s.firstChild,n.textContent=""}return s.textContent="",s.innerHTML="",o(u,function(e){s.appendChild(e)}),s}function Ae(e,n){n=n||t;var r;return(r=ai.exec(e))?[n.createElement(r[1])]:(r=ke(e,n))?r.childNodes:[]}function Oe(e){if(e instanceof Oe)return e;var t;if(S(e)&&(e=_r(e),t=!0),!(this instanceof Oe)){if(t&&"<"!=e.charAt(0))throw oi("nosel","Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element");return new Oe(e)}t?_e(this,Ae(e)):_e(this,e)}function Me(e){return e.cloneNode(!0)}function Te(e,t){if(t||Ve(e),e.querySelectorAll)for(var n=e.querySelectorAll("*"),r=0,i=n.length;i>r;r++)Ve(n[r])}function Ne(e,t,n,r){if(b(r))throw oi("offargs","jqLite#off() does not support the `selector` argument");var i=je(e),a=i&&i.events,s=i&&i.handle;if(s)if(t)o(t.split(" "),function(t){if(b(n)){var r=a[t];if(q(r||[],n),r&&r.length>0)return}ti(e,t,s),delete a[t]});else for(t in a)"$destroy"!==t&&ti(e,t,s),delete a[t]}function Ve(e,t){var r=e.ng339,i=r&&Xr[r];if(i){if(t)return void delete i.data[t];i.handle&&(i.events.$destroy&&i.handle({},"$destroy"),Ne(e)),delete Xr[r],e.ng339=n}}function je(e,t){var r=e.ng339,i=r&&Xr[r];return t&&!i&&(e.ng339=r=we(),i=Xr[r]={events:{},data:{},handle:n}),i}function Pe(e,t,n){if(Ee(e)){var r=b(n),i=!r&&t&&!w(t),o=!t,a=je(e,!i),s=a&&a.data;if(r)s[t]=n;else{if(o)return s;if(i)return s&&s[t];f(s,t)}}}function De(e,t){return e.getAttribute?(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+t+" ")>-1:!1}function Ie(e,t){t&&e.setAttribute&&o(t.split(" "),function(t){e.setAttribute("class",_r((" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+_r(t)+" "," ")))})}function Re(e,t){if(t&&e.setAttribute){var n=(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");o(t.split(" "),function(e){e=_r(e),-1===n.indexOf(" "+e+" ")&&(n+=e+" ")}),e.setAttribute("class",_r(n))}}function _e(e,t){if(t)if(t.nodeType)e[e.length++]=t;else{var n=t.length;if("number"==typeof n&&t.window!==t){if(n)for(var r=0;n>r;r++)e[e.length++]=t[r]}else e[e.length++]=t}}function qe(e,t){return Fe(e,"$"+(t||"ngController")+"Controller")}function Fe(e,t,n){e.nodeType==Jr&&(e=e.documentElement);for(var r=Ir(t)?t:[t];e;){for(var i=0,o=r.length;o>i;i++)if(b(n=Er.data(e,r[i])))return n;e=e.parentNode||e.nodeType===Kr&&e.host}}function Ue(e){for(Te(e,!0);e.firstChild;)e.removeChild(e.firstChild)}function Be(e,t){t||Te(e);var n=e.parentNode;n&&n.removeChild(e)}function He(t,n){n=n||e,"complete"===n.document.readyState?n.setTimeout(t):Er(n).on("load",t)}function Le(e,t){var n=hi[t.toLowerCase()];return n&&pi[_(e)]&&n}function ze(e){return di[e]}function We(e,t){var n=function(n,r){n.isDefaultPrevented=function(){return n.defaultPrevented};var i=t[r||n.type],o=i?i.length:0;if(o){if(y(n.immediatePropagationStopped)){var a=n.stopImmediatePropagation;n.stopImmediatePropagation=function(){n.immediatePropagationStopped=!0,n.stopPropagation&&n.stopPropagation(),a&&a.call(n)}}n.isImmediatePropagationStopped=function(){return n.immediatePropagationStopped===!0},o>1&&(i=U(i));for(var s=0;o>s;s++)n.isImmediatePropagationStopped()||i[s].call(e,n)}};return n.elem=e,n}function Ge(){this.$get=function(){return f(Oe,{hasClass:function(e,t){return e.attr&&(e=e[0]),De(e,t)},addClass:function(e,t){return e.attr&&(e=e[0]),Re(e,t)},removeClass:function(e,t){return e.attr&&(e=e[0]),Ie(e,t)}})}}function Ye(e,t){var n=e&&e.$$hashKey;if(n)return"function"==typeof n&&(n=e.$$hashKey()),n;var r=typeof e;return n="function"==r||"object"==r&&null!==e?e.$$hashKey=r+":"+(t||u)():r+":"+e}function Je(e,t){if(t){var n=0;this.nextUid=function(){return++n}}o(e,this.put,this)}function Ke(e){var t=e.toString().replace(yi,""),n=t.match(vi);return n?"function("+(n[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function Ze(e,t,n){var r,i,a,s;if("function"==typeof e){if(!(r=e.$inject)){if(r=[],e.length){if(t)throw S(n)&&n||(n=e.name||Ke(e)),bi("strictdi","{0} is not using explicit annotation and cannot be invoked in strict mode",n);i=e.toString().replace(yi,""),a=i.match(vi),o(a[1].split(mi),function(e){e.replace(gi,function(e,t,n){r.push(n)})})}e.$inject=r}}else Ir(e)?(s=e.length-1,he(e[s],"fn"),r=e.slice(0,s)):he(e,"fn",!0);return r}function Xe(e,t){function r(e){return function(t,n){return w(t)?void o(t,s(e)):e(t,n)}}function i(e,t){if(pe(e,"service"),(k(t)||Ir(t))&&(t=E.instantiate(t)),!t.$get)throw bi("pget","Provider '{0}' must define $get factory method.",e);return x[e+v]=t}function a(e,t){return function(){var n=A.invoke(t,this);if(y(n))throw bi("undef","Provider '{0}' must return a value from $get factory method.",e);return n}}function u(e,t,n){return i(e,{$get:n!==!1?a(e,t):t})}function c(e,t){return u(e,["$injector",function(e){return e.instantiate(t)}])}function l(e,t){return u(e,m(t),!1)}function f(e,t){pe(e,"constant"),x[e]=t,C[e]=t}function h(e,t){var n=E.get(e+v),r=n.$get;n.$get=function(){var e=A.invoke(r,n);return A.invoke(t,null,{$delegate:e})}}function p(e){fe(y(e)||Ir(e),"modulesToLoad","not an array");var t,n=[];return o(e,function(e){function r(e){var t,n;for(t=0,n=e.length;n>t;t++){var r=e[t],i=E.get(r[0]);i[r[1]].apply(i,r[2])}}if(!b.get(e)){b.put(e,!0);try{S(e)?(t=kr(e),n=n.concat(p(t.requires)).concat(t._runBlocks),r(t._invokeQueue),r(t._configBlocks)):k(e)?n.push(E.invoke(e)):Ir(e)?n.push(E.invoke(e)):he(e,"module")}catch(i){throw Ir(e)&&(e=e[e.length-1]),i.message&&i.stack&&-1==i.stack.indexOf(i.message)&&(i=i.message+"\n"+i.stack),bi("modulerr","Failed to instantiate module {0} due to:\n{1}",e,i.stack||i.message||i)}}}),n}function d(e,n){function r(t,r){if(e.hasOwnProperty(t)){if(e[t]===$)throw bi("cdep","Circular dependency found: {0}",t+" <- "+g.join(" <- "));return e[t]}try{return g.unshift(t),e[t]=$,e[t]=n(t,r)}catch(i){throw e[t]===$&&delete e[t],i}finally{g.shift()}}function i(e,n,i,o){"string"==typeof i&&(o=i,i=null);var a,s,u,c=[],l=Xe.$$annotate(e,t,o);for(s=0,a=l.length;a>s;s++){if(u=l[s],"string"!=typeof u)throw bi("itkn","Incorrect injection token! Expected service name as string, got {0}",u);c.push(i&&i.hasOwnProperty(u)?i[u]:r(u,o))}return Ir(e)&&(e=e[a]),e.apply(n,c)}function o(e,t,n){var r=Object.create((Ir(e)?e[e.length-1]:e).prototype||null),o=i(e,r,t,n);return w(o)||k(o)?o:r}return{invoke:i,instantiate:o,get:r,annotate:Xe.$$annotate,has:function(t){return x.hasOwnProperty(t+v)||e.hasOwnProperty(t)}}}t=t===!0;var $={},v="Provider",g=[],b=new Je([],!0),x={$provide:{provider:r(i),factory:r(u),service:r(c),value:r(l),constant:r(f),decorator:h}},E=x.$injector=d(x,function(e,t){throw jr.isString(t)&&g.push(t),bi("unpr","Unknown provider: {0}",g.join(" <- "))}),C={},A=C.$injector=d(C,function(e,t){var r=E.get(e+v,t);return A.invoke(r.$get,r,n,e)});return o(p(e),function(e){e&&A.invoke(e)}),A}function Qe(){var e=!0;this.disableAutoScrolling=function(){e=!1},this.$get=["$window","$location","$rootScope",function(t,n,r){function i(e){var t=null;return Array.prototype.some.call(e,function(e){return"a"===_(e)?(t=e,!0):void 0}),t}function o(){var e=s.yOffset;if(k(e))e=e();else if(I(e)){var n=e[0],r=t.getComputedStyle(n);e="fixed"!==r.position?0:n.getBoundingClientRect().bottom}else E(e)||(e=0);return e}function a(e){if(e){e.scrollIntoView();var n=o();if(n){var r=e.getBoundingClientRect().top;t.scrollBy(0,r-n)}}else t.scrollTo(0,0)}function s(e){e=S(e)?e:n.hash();var t;e?(t=u.getElementById(e))?a(t):(t=i(u.getElementsByName(e)))?a(t):"top"===e&&a(null):a(null)}var u=t.document;return e&&r.$watch(function(){return n.hash()},function(e,t){e===t&&""===e||He(function(){r.$evalAsync(s)})}),s}]}function et(e,t){return e||t?e?t?(Ir(e)&&(e=e.join(" ")),Ir(t)&&(t=t.join(" ")),e+" "+t):e:t:""}function tt(e){for(var t=0;t<e.length;t++){var n=e[t];if(n.nodeType===xi)return n}}function nt(e){S(e)&&(e=e.split(" "));var t=ve();return o(e,function(e){e.length&&(t[e]=!0)}),t}function rt(e){return w(e)?e:{}}function it(e,t,n,r){function i(e){try{e.apply(null,L(arguments,1))}finally{if(g--,0===g)for(;b.length;)try{b.pop()()}catch(t){n.error(t)}}}function a(e){var t=e.indexOf("#");return-1===t?"":e.substr(t)}function s(){C=null,c(),l()}function u(){try{return p.state}catch(e){}}function c(){w=u(),w=y(w)?null:w,B(w,O)&&(w=O),O=w}function l(){S===f.url()&&x===w||(S=f.url(),x=w,o(k,function(e){e(f.url(),w)}))}var f=this,h=(t[0],e.location),p=e.history,d=e.setTimeout,v=e.clearTimeout,m={};f.isMock=!1;var g=0,b=[];f.$$completeOutstandingRequest=i,f.$$incOutstandingRequestCount=function(){g++},f.notifyWhenNoOutstandingRequests=function(e){0===g?e():b.push(e)};var w,x,S=h.href,E=t.find("base"),C=null;c(),x=w,f.url=function(t,n,i){if(y(i)&&(i=null),h!==e.location&&(h=e.location),p!==e.history&&(p=e.history),t){var o=x===i;if(S===t&&(!r.history||o))return f;var s=S&&Dt(S)===Dt(t);return S=t,x=i,!r.history||s&&o?(s&&!C||(C=t),n?h.replace(t):s?h.hash=a(t):h.href=t,h.href!==t&&(C=t)):(p[n?"replaceState":"pushState"](i,"",t),c(),x=w),f}return C||h.href.replace(/%27/g,"'")},f.state=function(){return w};var k=[],A=!1,O=null;f.onUrlChange=function(t){return A||(r.history&&Er(e).on("popstate",s),Er(e).on("hashchange",s),A=!0),k.push(t),t},f.$$applicationDestroyed=function(){Er(e).off("hashchange popstate",s)},f.$$checkUrlChange=l,f.baseHref=function(){var e=E.attr("href");return e?e.replace(/^(https?\:)?\/\/[^\/]*/,""):""},f.defer=function(e,t){var n;return g++,n=d(function(){delete m[n],i(e)},t||0),m[n]=!0,n},f.defer.cancel=function(e){return m[e]?(delete m[e],v(e),i($),!0):!1}}function ot(){this.$get=["$window","$log","$sniffer","$document",function(e,t,n,r){return new it(e,r,t,n)}]}function at(){this.$get=function(){function e(e,n){function i(e){e!=h&&(p?p==e&&(p=e.n):p=e,o(e.n,e.p),o(e,h),h=e,h.n=null)}function o(e,t){e!=t&&(e&&(e.p=t),t&&(t.n=e))}if(e in t)throw r("$cacheFactory")("iid","CacheId '{0}' is already taken!",e);var a=0,s=f({},n,{id:e}),u={},c=n&&n.capacity||Number.MAX_VALUE,l={},h=null,p=null;return t[e]={put:function(e,t){if(!y(t)){if(c<Number.MAX_VALUE){var n=l[e]||(l[e]={key:e});i(n)}return e in u||a++,u[e]=t,a>c&&this.remove(p.key),t}},get:function(e){if(c<Number.MAX_VALUE){var t=l[e];if(!t)return;i(t)}return u[e]},remove:function(e){if(c<Number.MAX_VALUE){var t=l[e];if(!t)return;t==h&&(h=t.p),t==p&&(p=t.n),o(t.n,t.p),delete l[e]}delete u[e],a--},removeAll:function(){u={},a=0,l={},h=p=null},destroy:function(){u=null,s=null,l=null,delete t[e]},info:function(){return f({},s,{size:a})}}}var t={};return e.info=function(){var e={};return o(t,function(t,n){e[n]=t.info()}),e},e.get=function(e){return t[e]},e}}function st(){this.$get=["$cacheFactory",function(e){return e("templates")}]}function ut(e,r){function i(e,t,n){var r=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,i={};return o(e,function(e,o){var a=e.match(r);if(!a)throw Oi("iscp","Invalid {3} for directive '{0}'. Definition: {... {1}: '{2}' ...}",t,o,e,n?"controller bindings definition":"isolate scope definition");i[o]={mode:a[1][0],collection:"*"===a[2],optional:"?"===a[3],attrName:a[4]||o}}),i}function a(e,t){var n={isolateScope:null,bindToController:null};if(w(e.scope)&&(e.bindToController===!0?(n.bindToController=i(e.scope,t,!0),n.isolateScope={}):n.isolateScope=i(e.scope,t,!1)),w(e.bindToController)&&(n.bindToController=i(e.bindToController,t,!0)),w(n.bindToController)){var r=e.controller,o=e.controllerAs;if(!r)throw Oi("noctrl","Cannot bind to controller without directive '{0}'s controller.",t);if(!ht(r,o))throw Oi("noident","Cannot bind to controller without identifier for directive '{0}'.",t)}return n}function u(e){var t=e.charAt(0);if(!t||t!==gr(t))throw Oi("baddir","Directive name '{0}' is invalid. The first character must be a lowercase letter",e);if(e!==e.trim())throw Oi("baddir","Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces",e)}var c={},l="Directive",h=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,p=/(([\w\-]+)(?:\:([^;]+))?;?)/,g=R("ngSrc,ngSrcset,src,srcset"),x=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,E=/^(on[a-z]+|formaction)$/;this.directive=function A(t,n){return pe(t,"directive"),S(t)?(u(t),fe(n,"directiveFactory"),c.hasOwnProperty(t)||(c[t]=[],e.factory(t+l,["$injector","$exceptionHandler",function(e,n){var r=[];return o(c[t],function(i,o){try{var s=e.invoke(i);k(s)?s={compile:m(s)}:!s.compile&&s.link&&(s.compile=m(s.link)),s.priority=s.priority||0,s.index=o,s.name=s.name||t,s.require=s.require||s.controller&&s.name,s.restrict=s.restrict||"EA";var u=s.$$bindings=a(s,s.name);w(u.isolateScope)&&(s.$$isolateBindings=u.isolateScope),s.$$moduleName=i.$$moduleName,r.push(s)}catch(c){n(c)}}),r}])),c[t].push(n)):o(t,s(A)),this},this.aHrefSanitizationWhitelist=function(e){return b(e)?(r.aHrefSanitizationWhitelist(e),this):r.aHrefSanitizationWhitelist()},this.imgSrcSanitizationWhitelist=function(e){return b(e)?(r.imgSrcSanitizationWhitelist(e),this):r.imgSrcSanitizationWhitelist()};var C=!0;this.debugInfoEnabled=function(e){return b(e)?(C=e,this):C},this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(e,r,i,a,s,u,m,b,A,O,T){function N(e,t){try{e.addClass(t)}catch(n){}}function V(e,t,n,r,i){e instanceof Er||(e=Er(e)),o(e,function(t,n){t.nodeType==Gr&&t.nodeValue.match(/\S+/)&&(e[n]=Er(t).wrap("<span></span>").parent()[0])});var a=P(e,t,e,n,r,i);V.$$addScopeClass(e);var s=null;return function(t,n,r){fe(t,"scope"),r=r||{};var i=r.parentBoundTranscludeFn,o=r.transcludeControllers,u=r.futureParentElement;i&&i.$$boundTransclude&&(i=i.$$boundTransclude),s||(s=j(u));var c;if(c="html"!==s?Er(Q(s,Er("<div>").append(e).html())):n?fi.clone.call(e):e,o)for(var l in o)c.data("$"+l+"Controller",o[l].instance);return V.$$addScopeInfo(c,t),n&&n(c,t),a&&a(t,c,c,i),c}}function j(e){var t=e&&e[0];return t&&"foreignobject"!==_(t)&&t.toString().match(/SVG/)?"svg":"html"}function P(e,t,r,i,o,a){function s(e,r,i,o){var a,s,u,c,l,f,h,p,v;if(d){var m=r.length;for(v=new Array(m),l=0;l<$.length;l+=3)h=$[l],v[h]=r[h]}else v=r;for(l=0,f=$.length;f>l;)if(u=v[$[l++]],a=$[l++],s=$[l++],a){if(a.scope){c=e.$new(),V.$$addScopeInfo(Er(u),c);var g=a.$$destroyBindings;g&&(a.$$destroyBindings=null,c.$on("$destroyed",g))}else c=e;p=a.transcludeOnThisElement?D(e,a.transclude,o):!a.templateOnThisElement&&o?o:!o&&t?D(e,t):null,a(s,c,u,i,p,a)}else s&&s(e,u.childNodes,n,o)}for(var u,c,l,f,h,p,d,$=[],v=0;v<e.length;v++)u=new ae,c=I(e[v],[],u,0===v?i:n,o),l=c.length?U(c,e[v],u,t,r,null,[],[],a):null,l&&l.scope&&V.$$addScopeClass(u.$$element),h=l&&l.terminal||!(f=e[v].childNodes)||!f.length?null:P(f,l?(l.transcludeOnThisElement||!l.templateOnThisElement)&&l.transclude:t),(l||h)&&($.push(v,l,h),p=!0,d=d||l),a=null;return p?s:null}function D(e,t,n){var r=function(r,i,o,a,s){return r||(r=e.$new(!1,s),r.$$transcluded=!0),t(r,i,{parentBoundTranscludeFn:n,transcludeControllers:o,futureParentElement:a})};return r}function I(e,t,n,r,i){var o,a,s=e.nodeType,u=n.$attr;switch(s){case zr:z(t,ct(_(e)),"E",r,i);for(var c,l,f,d,$,v,m=e.attributes,g=0,y=m&&m.length;y>g;g++){var b=!1,x=!1;c=m[g],l=c.name,$=_r(c.value),d=ct(l),(v=he.test(d))&&(l=l.replace(Mi,"").substr(8).replace(/_(.)/g,function(e,t){return t.toUpperCase()}));var E=d.replace(/(Start|End)$/,"");W(E)&&d===E+"Start"&&(b=l,x=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6)),f=ct(l.toLowerCase()),u[f]=l,!v&&n.hasOwnProperty(f)||(n[f]=$,Le(e,f)&&(n[f]=!0)),te(e,t,$,f,v),z(t,f,"A",r,i,b,x)}if(a=e.className,w(a)&&(a=a.animVal),S(a)&&""!==a)for(;o=p.exec(a);)f=ct(o[2]),z(t,f,"C",r,i)&&(n[f]=_r(o[3])),a=a.substr(o.index+o[0].length);break;case Gr:if(11===Sr)for(;e.parentNode&&e.nextSibling&&e.nextSibling.nodeType===Gr;)e.nodeValue=e.nodeValue+e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);Z(t,e.nodeValue);break;case Yr:try{o=h.exec(e.nodeValue),o&&(f=ct(o[1]),z(t,f,"M",r,i)&&(n[f]=_r(o[2])))}catch(C){}}return t.sort(J),t}function R(e,t,n){var r=[],i=0;if(t&&e.hasAttribute&&e.hasAttribute(t)){do{if(!e)throw Oi("uterdir","Unterminated attribute, found '{0}' but no matching '{1}' found.",t,n);e.nodeType==zr&&(e.hasAttribute(t)&&i++,e.hasAttribute(n)&&i--),r.push(e),e=e.nextSibling}while(i>0)}else r.push(e);return Er(r)}function F(e,t,n){return function(r,i,o,a,s){return i=R(i[0],t,n),e(r,i,o,a,s)}}function U(e,r,o,a,s,c,l,f,h){function p(e,t,n,r){e&&(n&&(e=F(e,n,r)),e.require=m.require,e.directiveName=g,(T===m||m.$$isolateScope)&&(e=re(e,{isolateScope:!0})),l.push(e)),t&&(n&&(t=F(t,n,r)),t.require=m.require,t.directiveName=g,(T===m||m.$$isolateScope)&&(t=re(t,{isolateScope:!0})),f.push(t))}function d(e,t,n,r){var i;if(S(t)){var o=t.match(x),a=t.substring(o[0].length),s=o[1]||o[3],u="?"===o[2];if("^^"===s?n=n.parent():(i=r&&r[a],i=i&&i.instance),!i){var c="$"+a+"Controller";i=s?n.inheritedData(c):n.data(c)}if(!i&&!u)throw Oi("ctreq","Controller '{0}', required by directive '{1}', can't be found!",a,e)}else if(Ir(t)){i=[];for(var l=0,f=t.length;f>l;l++)i[l]=d(e,t[l],n,r)}return i||null}function $(e,t,n,r,i,o){var a=ve();for(var s in r){var c=r[s],l={$scope:c===T||c.$$isolateScope?i:o,$element:e,$attrs:t,$transclude:n},f=c.controller;"@"==f&&(f=t[c.name]);var h=u(f,l,!0,c.controllerAs);a[c.name]=h,_||e.data("$"+c.name+"Controller",h.instance)}return a}function v(e,t,i,a,s,u){function c(e,t,r){var i;return M(e)||(r=t,t=e,e=n),_&&(i=y),r||(r=_?w.parent():w),s(e,t,i,r,j)}var h,p,v,m,g,y,b,w,x;if(r===i?(x=o,w=o.$$element):(w=Er(i),x=new ae(w,o)),T&&(g=t.$new(!0)),s&&(b=c,b.$$boundTransclude=s),O&&(y=$(w,x,b,O,g,t)),T&&(V.$$addScopeInfo(w,g,!0,!(N&&(N===T||N===T.$$originalDirective))),V.$$addScopeClass(w,!0),g.$$isolateBindings=T.$$isolateBindings,oe(t,x,g,g.$$isolateBindings,T,g)),y){var S,E,C=T||A;C&&y[C.name]&&(S=C.$$bindings.bindToController,m=y[C.name],m&&m.identifier&&S&&(E=m,u.$$destroyBindings=oe(t,x,m.instance,S,C)));for(h in y){m=y[h];var k=m();k!==m.instance&&(m.instance=k,w.data("$"+h+"Controller",k),m===E&&(u.$$destroyBindings(),u.$$destroyBindings=oe(t,x,k,S,C)))}}for(h=0,p=l.length;p>h;h++)v=l[h],ie(v,v.isolateScope?g:t,w,x,v.require&&d(v.directiveName,v.require,w,y),b);var j=t;for(T&&(T.template||null===T.templateUrl)&&(j=g),e&&e(j,i.childNodes,n,s),h=f.length-1;h>=0;h--)v=f[h],ie(v,v.isolateScope?g:t,w,x,v.require&&d(v.directiveName,v.require,w,y),b)}h=h||{};for(var m,g,y,b,E,C=-Number.MAX_VALUE,A=h.newScopeDirective,O=h.controllerDirectives,T=h.newIsolateScopeDirective,N=h.templateDirective,j=h.nonTlbTranscludeDirective,P=!1,D=!1,_=h.hasElementTranscludeDirective,q=o.$$element=Er(r),U=c,B=a,z=0,W=e.length;W>z;z++){m=e[z];var J=m.$$start,Z=m.$$end;if(J&&(q=R(r,J,Z)),y=n,C>m.priority)break;if((E=m.scope)&&(m.templateUrl||(w(E)?(K("new/isolated scope",T||A,m,q),T=m):K("new/isolated scope",T,m,q)),A=A||m),g=m.name,!m.templateUrl&&m.controller&&(E=m.controller,O=O||ve(),K("'"+g+"' controller",O[g],m,q),O[g]=m),
+(E=m.transclude)&&(P=!0,m.$$tlb||(K("transclusion",j,m,q),j=m),"element"==E?(_=!0,C=m.priority,y=q,q=o.$$element=Er(t.createComment(" "+g+": "+o[g]+" ")),r=q[0],ne(s,L(y),r),B=V(y,a,C,U&&U.name,{nonTlbTranscludeDirective:j})):(y=Er(Me(r)).contents(),q.empty(),B=V(y,a))),m.template)if(D=!0,K("template",N,m,q),N=m,E=k(m.template)?m.template(q,o):m.template,E=le(E),m.replace){if(U=m,y=Se(E)?[]:ft(Q(m.templateNamespace,_r(E))),r=y[0],1!=y.length||r.nodeType!==zr)throw Oi("tplrt","Template for directive '{0}' must have exactly one root element. {1}",g,"");ne(s,q,r);var ee={$attr:{}},te=I(r,[],ee),se=e.splice(z+1,e.length-(z+1));T&&H(te),e=e.concat(te).concat(se),G(o,ee),W=e.length}else q.html(E);if(m.templateUrl)D=!0,K("template",N,m,q),N=m,m.replace&&(U=m),v=Y(e.splice(z,e.length-z),q,o,s,P&&B,l,f,{controllerDirectives:O,newScopeDirective:A!==m&&A,newIsolateScopeDirective:T,templateDirective:N,nonTlbTranscludeDirective:j}),W=e.length;else if(m.compile)try{b=m.compile(q,o,B),k(b)?p(null,b,J,Z):b&&p(b.pre,b.post,J,Z)}catch(ue){i(ue,X(q))}m.terminal&&(v.terminal=!0,C=Math.max(C,m.priority))}return v.scope=A&&A.scope===!0,v.transcludeOnThisElement=P,v.templateOnThisElement=D,v.transclude=B,h.hasElementTranscludeDirective=_,v}function H(e){for(var t=0,n=e.length;n>t;t++)e[t]=d(e[t],{$$isolateScope:!0})}function z(t,n,r,o,a,s,u){if(n===a)return null;var f=null;if(c.hasOwnProperty(n))for(var h,p=e.get(n+l),$=0,v=p.length;v>$;$++)try{h=p[$],(y(o)||o>h.priority)&&-1!=h.restrict.indexOf(r)&&(s&&(h=d(h,{$$start:s,$$end:u})),t.push(h),f=h)}catch(m){i(m)}return f}function W(t){if(c.hasOwnProperty(t))for(var n,r=e.get(t+l),i=0,o=r.length;o>i;i++)if(n=r[i],n.multiElement)return!0;return!1}function G(e,t){var n=t.$attr,r=e.$attr,i=e.$$element;o(e,function(r,i){"$"!=i.charAt(0)&&(t[i]&&t[i]!==r&&(r+=("style"===i?";":" ")+t[i]),e.$set(i,r,!0,n[i]))}),o(t,function(t,o){"class"==o?(N(i,t),e["class"]=(e["class"]?e["class"]+" ":"")+t):"style"==o?(i.attr("style",i.attr("style")+";"+t),e.style=(e.style?e.style+";":"")+t):"$"==o.charAt(0)||e.hasOwnProperty(o)||(e[o]=t,r[o]=n[o])})}function Y(e,t,n,r,i,s,u,c){var l,f,h=[],p=t[0],$=e.shift(),v=d($,{templateUrl:null,transclude:null,replace:null,$$originalDirective:$}),m=k($.templateUrl)?$.templateUrl(t,n):$.templateUrl,g=$.templateNamespace;return t.empty(),a(m).then(function(a){var d,y,b,x;if(a=le(a),$.replace){if(b=Se(a)?[]:ft(Q(g,_r(a))),d=b[0],1!=b.length||d.nodeType!==zr)throw Oi("tplrt","Template for directive '{0}' must have exactly one root element. {1}",$.name,m);y={$attr:{}},ne(r,t,d);var S=I(d,[],y);w($.scope)&&H(S),e=S.concat(e),G(n,y)}else d=p,t.html(a);for(e.unshift(v),l=U(e,d,n,i,t,$,s,u,c),o(r,function(e,n){e==d&&(r[n]=t[0])}),f=P(t[0].childNodes,i);h.length;){var E=h.shift(),C=h.shift(),k=h.shift(),A=h.shift(),O=t[0];if(!E.$$destroyed){if(C!==p){var M=C.className;c.hasElementTranscludeDirective&&$.replace||(O=Me(d)),ne(k,Er(C),O),N(Er(O),M)}x=l.transcludeOnThisElement?D(E,l.transclude,A):A,l(f,E,O,r,x,l)}}h=null}),function(e,t,n,r,i){var o=i;t.$$destroyed||(h?h.push(t,n,r,o):(l.transcludeOnThisElement&&(o=D(t,l.transclude,i)),l(f,t,n,r,o,l)))}}function J(e,t){var n=t.priority-e.priority;return 0!==n?n:e.name!==t.name?e.name<t.name?-1:1:e.index-t.index}function K(e,t,n,r){function i(e){return e?" (module: "+e+")":""}if(t)throw Oi("multidir","Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}",t.name,i(t.$$moduleName),n.name,i(n.$$moduleName),e,X(r))}function Z(e,t){var n=r(t,!0);n&&e.push({priority:0,compile:function(e){var t=e.parent(),r=!!t.length;return r&&V.$$addBindingClass(t),function(e,t){var i=t.parent();r||V.$$addBindingClass(i),V.$$addBindingInfo(i,n.expressions),e.$watch(n,function(e){t[0].nodeValue=e})}}})}function Q(e,n){switch(e=gr(e||"html")){case"svg":case"math":var r=t.createElement("div");return r.innerHTML="<"+e+">"+n+"</"+e+">",r.childNodes[0].childNodes;default:return n}}function ee(e,t){if("srcdoc"==t)return A.HTML;var n=_(e);return"xlinkHref"==t||"form"==n&&"action"==t||"img"!=n&&("src"==t||"ngSrc"==t)?A.RESOURCE_URL:void 0}function te(e,t,n,i,o){var a=ee(e,i);o=g[i]||o;var s=r(n,!0,a,o);if(s){if("multiple"===i&&"select"===_(e))throw Oi("selmulti","Binding to the 'multiple' attribute is not supported. Element: {0}",X(e));t.push({priority:100,compile:function(){return{pre:function(e,t,u){var c=u.$$observers||(u.$$observers={});if(E.test(i))throw Oi("nodomevents","Interpolations for HTML DOM event attributes are disallowed.  Please use the ng- versions (such as ng-click instead of onclick) instead.");var l=u[i];l!==n&&(s=l&&r(l,!0,a,o),n=l),s&&(u[i]=s(e),(c[i]||(c[i]=[])).$$inter=!0,(u.$$observers&&u.$$observers[i].$$scope||e).$watch(s,function(e,t){"class"===i&&e!=t?u.$updateClass(e,t):u.$set(i,e)}))}}}})}}function ne(e,n,r){var i,o,a=n[0],s=n.length,u=a.parentNode;if(e)for(i=0,o=e.length;o>i;i++)if(e[i]==a){e[i++]=r;for(var c=i,l=c+s-1,f=e.length;f>c;c++,l++)f>l?e[c]=e[l]:delete e[c];e.length-=s-1,e.context===a&&(e.context=r);break}u&&u.replaceChild(r,a);var h=t.createDocumentFragment();h.appendChild(a),Er.hasData(a)&&(Er(r).data(Er(a).data()),Cr?(Dr=!0,Cr.cleanData([a])):delete Er.cache[a[Er.expando]]);for(var p=1,d=n.length;d>p;p++){var $=n[p];Er($).remove(),h.appendChild($),delete n[p]}n[0]=r,n.length=1}function re(e,t){return f(function(){return e.apply(null,arguments)},e,t)}function ie(e,t,n,r,o,a){try{e(t,n,r,o,a)}catch(s){i(s,X(n))}}function oe(e,t,n,i,a,u){var c;o(i,function(i,o){var u,l,f,h,p=i.attrName,d=i.optional,v=i.mode;switch(v){case"@":d||yr.call(t,p)||(n[o]=t[p]=void 0),t.$observe(p,function(e){S(e)&&(n[o]=e)}),t.$$observers[p].$$scope=e,S(t[p])&&(n[o]=r(t[p])(e));break;case"=":if(!yr.call(t,p)){if(d)break;t[p]=void 0}if(d&&!t[p])break;l=s(t[p]),h=l.literal?B:function(e,t){return e===t||e!==e&&t!==t},f=l.assign||function(){throw u=n[o]=l(e),Oi("nonassign","Expression '{0}' used with directive '{1}' is non-assignable!",t[p],a.name)},u=n[o]=l(e);var m=function(t){return h(t,n[o])||(h(t,u)?f(e,t=n[o]):n[o]=t),u=t};m.$stateful=!0;var g;g=i.collection?e.$watchCollection(t[p],m):e.$watch(s(t[p],m),null,l.literal),c=c||[],c.push(g);break;case"&":if(l=t.hasOwnProperty(p)?s(t[p]):$,l===$&&d)break;n[o]=function(t){return l(e,t)}}});var l=c?function(){for(var e=0,t=c.length;t>e;++e)c[e]()}:$;return u&&l!==$?(u.$on("$destroy",l),$):l}var ae=function(e,t){if(t){var n,r,i,o=Object.keys(t);for(n=0,r=o.length;r>n;n++)i=o[n],this[i]=t[i]}else this.$attr={};this.$$element=e};ae.prototype={$normalize:ct,$addClass:function(e){e&&e.length>0&&O.addClass(this.$$element,e)},$removeClass:function(e){e&&e.length>0&&O.removeClass(this.$$element,e)},$updateClass:function(e,t){var n=lt(e,t);n&&n.length&&O.addClass(this.$$element,n);var r=lt(t,e);r&&r.length&&O.removeClass(this.$$element,r)},$set:function(e,t,n,r){var a,s=this.$$element[0],u=Le(s,e),c=ze(e),l=e;if(u?(this.$$element.prop(e,t),r=u):c&&(this[c]=t,l=c),this[e]=t,r?this.$attr[e]=r:(r=this.$attr[e],r||(this.$attr[e]=r=ce(e,"-"))),a=_(this.$$element),"a"===a&&"href"===e||"img"===a&&"src"===e)this[e]=t=T(t,"src"===e);else if("img"===a&&"srcset"===e){for(var f="",h=_r(t),p=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,d=/\s/.test(h)?p:/(,)/,$=h.split(d),v=Math.floor($.length/2),m=0;v>m;m++){var g=2*m;f+=T(_r($[g]),!0),f+=" "+_r($[g+1])}var b=_r($[2*m]).split(/\s/);f+=T(_r(b[0]),!0),2===b.length&&(f+=" "+_r(b[1])),this[e]=t=f}n!==!1&&(null===t||y(t)?this.$$element.removeAttr(r):this.$$element.attr(r,t));var w=this.$$observers;w&&o(w[l],function(e){try{e(t)}catch(n){i(n)}})},$observe:function(e,t){var n=this,r=n.$$observers||(n.$$observers=ve()),i=r[e]||(r[e]=[]);return i.push(t),m.$evalAsync(function(){i.$$inter||!n.hasOwnProperty(e)||y(n[e])||t(n[e])}),function(){q(i,t)}}};var se=r.startSymbol(),ue=r.endSymbol(),le="{{"==se||"}}"==ue?v:function(e){return e.replace(/\{\{/g,se).replace(/}}/g,ue)},he=/^ngAttr[A-Z]/;return V.$$addBindingInfo=C?function(e,t){var n=e.data("$binding")||[];Ir(t)?n=n.concat(t):n.push(t),e.data("$binding",n)}:$,V.$$addBindingClass=C?function(e){N(e,"ng-binding")}:$,V.$$addScopeInfo=C?function(e,t,n,r){var i=n?r?"$isolateScopeNoTemplate":"$isolateScope":"$scope";e.data(i,t)}:$,V.$$addScopeClass=C?function(e,t){N(e,t?"ng-isolate-scope":"ng-scope")}:$,V}]}function ct(e){return xe(e.replace(Mi,""))}function lt(e,t){var n="",r=e.split(/\s+/),i=t.split(/\s+/);e:for(var o=0;o<r.length;o++){for(var a=r[o],s=0;s<i.length;s++)if(a==i[s])continue e;n+=(n.length>0?" ":"")+a}return n}function ft(e){e=Er(e);var t=e.length;if(1>=t)return e;for(;t--;){var n=e[t];n.nodeType===Yr&&Or.call(e,t,1)}return e}function ht(e,t){if(t&&S(t))return t;if(S(e)){var n=Ni.exec(e);if(n)return n[3]}}function pt(){var e={},t=!1;this.register=function(t,n){pe(t,"controller"),w(t)?f(e,t):e[t]=n},this.allowGlobals=function(){t=!0},this.$get=["$injector","$window",function(i,o){function a(e,t,n,i){if(!e||!w(e.$scope))throw r("$controller")("noscp","Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",i,t);e.$scope[t]=n}return function(r,s,u,c){var l,h,p,d;if(u=u===!0,c&&S(c)&&(d=c),S(r)){if(h=r.match(Ni),!h)throw Ti("ctrlfmt","Badly formed controller string '{0}'. Must match `__name__ as __id__` or `__name__`.",r);p=h[1],d=d||h[3],r=e.hasOwnProperty(p)?e[p]:de(s.$scope,p,!0)||(t?de(o,p,!0):n),he(r,p,!0)}if(u){var $=(Ir(r)?r[r.length-1]:r).prototype;l=Object.create($||null),d&&a(s,d,l,p||r.name);var v;return v=f(function(){var e=i.invoke(r,l,s,p);return e!==l&&(w(e)||k(e))&&(l=e,d&&a(s,d,l,p||r.name)),l},{instance:l,identifier:d})}return l=i.instantiate(r,s,p),d&&a(s,d,l,p||r.name),l}}]}function dt(){this.$get=["$window",function(e){return Er(e.document)}]}function $t(){this.$get=["$log",function(e){return function(t,n){e.error.apply(e,arguments)}}]}function vt(e){return w(e)?C(e)?e.toISOString():G(e):e}function mt(){this.$get=function(){return function(e){if(!e)return"";var t=[];return a(e,function(e,n){null===e||y(e)||(Ir(e)?o(e,function(e,r){t.push(re(n)+"="+re(vt(e)))}):t.push(re(n)+"="+re(vt(e))))}),t.join("&")}}}function gt(){this.$get=function(){return function(e){function t(e,r,i){null===e||y(e)||(Ir(e)?o(e,function(e,n){t(e,r+"["+(w(e)?n:"")+"]")}):w(e)&&!C(e)?a(e,function(e,n){t(e,r+(i?"":"[")+n+(i?"":"]"))}):n.push(re(r)+"="+re(vt(e))))}if(!e)return"";var n=[];return t(e,"",!0),n.join("&")}}}function yt(e,t){if(S(e)){var n=e.replace(Ri,"").trim();if(n){var r=t("Content-Type");(r&&0===r.indexOf(ji)||bt(n))&&(e=Y(n))}}return e}function bt(e){var t=e.match(Di);return t&&Ii[t[0]].test(e)}function wt(e){function t(e,t){e&&(r[e]=r[e]?r[e]+", "+t:t)}var n,r=ve();return S(e)?o(e.split("\n"),function(e){n=e.indexOf(":"),t(gr(_r(e.substr(0,n))),_r(e.substr(n+1)))}):w(e)&&o(e,function(e,n){t(gr(n),_r(e))}),r}function xt(e){var t;return function(n){if(t||(t=wt(e)),n){var r=t[gr(n)];return void 0===r&&(r=null),r}return t}}function St(e,t,n,r){return k(r)?r(e,t,n):(o(r,function(r){e=r(e,t,n)}),e)}function Et(e){return e>=200&&300>e}function Ct(){var e=this.defaults={transformResponse:[yt],transformRequest:[function(e){return!w(e)||T(e)||V(e)||N(e)?e:G(e)}],headers:{common:{Accept:"application/json, text/plain, */*"},post:U(Pi),put:U(Pi),patch:U(Pi)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer"},t=!1;this.useApplyAsync=function(e){return b(e)?(t=!!e,this):t};var i=!0;this.useLegacyPromiseExtensions=function(e){return b(e)?(i=!!e,this):i};var a=this.interceptors=[];this.$get=["$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector",function(s,u,c,l,h,p){function d(t){function a(e){var t=f({},e);return e.data?t.data=St(e.data,e.headers,e.status,c.transformResponse):t.data=e.data,Et(e.status)?t:h.reject(t)}function s(e,t){var n,r={};return o(e,function(e,i){k(e)?(n=e(t),null!=n&&(r[i]=n)):r[i]=e}),r}function u(t){var n,r,i,o=e.headers,a=f({},t.headers);o=f({},o.common,o[gr(t.method)]);e:for(n in o){r=gr(n);for(i in a)if(gr(i)===r)continue e;a[n]=o[n]}return s(a,U(t))}if(!jr.isObject(t))throw r("$http")("badreq","Http request configuration must be an object.  Received: {0}",t);var c=f({method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse,paramSerializer:e.paramSerializer},t);c.headers=u(t),c.method=br(c.method),c.paramSerializer=S(c.paramSerializer)?p.get(c.paramSerializer):c.paramSerializer;var l=function(t){var r=t.headers,i=St(t.data,xt(r),n,t.transformRequest);return y(i)&&o(r,function(e,t){"content-type"===gr(t)&&delete r[t]}),y(t.withCredentials)&&!y(e.withCredentials)&&(t.withCredentials=e.withCredentials),m(t,i).then(a,a)},d=[l,n],$=h.when(c);for(o(E,function(e){(e.request||e.requestError)&&d.unshift(e.request,e.requestError),(e.response||e.responseError)&&d.push(e.response,e.responseError)});d.length;){var v=d.shift(),g=d.shift();$=$.then(v,g)}return i?($.success=function(e){return he(e,"fn"),$.then(function(t){e(t.data,t.status,t.headers,c)}),$},$.error=function(e){return he(e,"fn"),$.then(null,function(t){e(t.data,t.status,t.headers,c)}),$}):($.success=qi("success"),$.error=qi("error")),$}function $(e){o(arguments,function(e){d[e]=function(t,n){return d(f({},n||{},{method:e,url:t}))}})}function v(e){o(arguments,function(e){d[e]=function(t,n,r){return d(f({},r||{},{method:e,url:t,data:n}))}})}function m(r,i){function o(e,n,r,i){function o(){a(n,e,r,i)}p&&(Et(e)?p.put(E,[e,n,wt(r),i]):p.remove(E)),t?l.$applyAsync(o):(o(),l.$$phase||l.$apply())}function a(e,t,n,i){t=t>=-1?t:0,(Et(t)?v.resolve:v.reject)({data:e,status:t,headers:xt(n),config:r,statusText:i})}function c(e){a(e.data,e.status,U(e.headers()),e.statusText)}function f(){var e=d.pendingRequests.indexOf(r);-1!==e&&d.pendingRequests.splice(e,1)}var p,$,v=h.defer(),m=v.promise,S=r.headers,E=g(r.url,r.paramSerializer(r.params));if(d.pendingRequests.push(r),m.then(f,f),!r.cache&&!e.cache||r.cache===!1||"GET"!==r.method&&"JSONP"!==r.method||(p=w(r.cache)?r.cache:w(e.cache)?e.cache:x),p&&($=p.get(E),b($)?P($)?$.then(c,c):Ir($)?a($[1],$[0],U($[2]),$[3]):a($,200,{},"OK"):p.put(E,m)),y($)){var C=Cn(r.url)?u()[r.xsrfCookieName||e.xsrfCookieName]:n;C&&(S[r.xsrfHeaderName||e.xsrfHeaderName]=C),s(r.method,E,i,o,S,r.timeout,r.withCredentials,r.responseType)}return m}function g(e,t){return t.length>0&&(e+=(-1==e.indexOf("?")?"?":"&")+t),e}var x=c("$http");e.paramSerializer=S(e.paramSerializer)?p.get(e.paramSerializer):e.paramSerializer;var E=[];return o(a,function(e){E.unshift(S(e)?p.get(e):p.invoke(e))}),d.pendingRequests=[],$("get","delete","head","jsonp"),v("post","put","patch"),d.defaults=e,d}]}function kt(){return new e.XMLHttpRequest}function At(){this.$get=["$browser","$window","$document",function(e,t,n){return Ot(e,kt,e.defer,t.angular.callbacks,n[0])}]}function Ot(e,t,n,r,i){function a(e,t,n){var o=i.createElement("script"),a=null;return o.type="text/javascript",o.src=e,o.async=!0,a=function(e){ti(o,"load",a),ti(o,"error",a),i.body.removeChild(o),o=null;var s=-1,u="unknown";e&&("load"!==e.type||r[t].called||(e={type:"error"}),u=e.type,s="error"===e.type?404:200),n&&n(s,u)},ei(o,"load",a),ei(o,"error",a),i.body.appendChild(o),a}return function(i,s,u,c,l,f,h,p){function d(){g&&g(),w&&w.abort()}function v(t,r,i,o,a){b(E)&&n.cancel(E),g=w=null,t(r,i,o,a),e.$$completeOutstandingRequest($)}if(e.$$incOutstandingRequestCount(),s=s||e.url(),"jsonp"==gr(i)){var m="_"+(r.counter++).toString(36);r[m]=function(e){r[m].data=e,r[m].called=!0};var g=a(s.replace("JSON_CALLBACK","angular.callbacks."+m),m,function(e,t){v(c,e,r[m].data,"",t),r[m]=$})}else{var w=t();w.open(i,s,!0),o(l,function(e,t){b(e)&&w.setRequestHeader(t,e)}),w.onload=function(){var e=w.statusText||"",t="response"in w?w.response:w.responseText,n=1223===w.status?204:w.status;0===n&&(n=t?200:"file"==En(s).protocol?404:0),v(c,n,t,w.getAllResponseHeaders(),e)};var x=function(){v(c,-1,null,null,"")};if(w.onerror=x,w.onabort=x,h&&(w.withCredentials=!0),p)try{w.responseType=p}catch(S){if("json"!==p)throw S}w.send(y(u)?null:u)}if(f>0)var E=n(d,f);else P(f)&&f.then(d)}}function Mt(){var e="{{",t="}}";this.startSymbol=function(t){return t?(e=t,this):e},this.endSymbol=function(e){return e?(t=e,this):t},this.$get=["$parse","$exceptionHandler","$sce",function(n,r,i){function o(e){return"\\\\\\"+e}function a(n){return n.replace(h,e).replace(p,t)}function s(e){if(null==e)return"";switch(typeof e){case"string":break;case"number":e=""+e;break;default:e=G(e)}return e}function u(o,u,h,p){function d(e){try{return e=O(e),p&&!b(e)?e:s(e)}catch(t){r(Fi.interr(o,t))}}p=!!p;for(var $,v,m,g=0,w=[],x=[],S=o.length,E=[],C=[];S>g;){if(-1==($=o.indexOf(e,g))||-1==(v=o.indexOf(t,$+c))){g!==S&&E.push(a(o.substring(g)));break}g!==$&&E.push(a(o.substring(g,$))),m=o.substring($+c,v),w.push(m),x.push(n(m,d)),g=v+l,C.push(E.length),E.push("")}if(h&&E.length>1&&Fi.throwNoconcat(o),!u||w.length){var A=function(e){for(var t=0,n=w.length;n>t;t++){if(p&&y(e[t]))return;E[C[t]]=e[t]}return E.join("")},O=function(e){return h?i.getTrusted(h,e):i.valueOf(e)};return f(function(e){var t=0,n=w.length,i=new Array(n);try{for(;n>t;t++)i[t]=x[t](e);return A(i)}catch(a){r(Fi.interr(o,a))}},{exp:o,expressions:w,$$watchDelegate:function(e,t){var n;return e.$watchGroup(x,function(r,i){var o=A(r);k(t)&&t.call(this,o,r!==i?n:o,e),n=o})}})}}var c=e.length,l=t.length,h=new RegExp(e.replace(/./g,o),"g"),p=new RegExp(t.replace(/./g,o),"g");return u.startSymbol=function(){return e},u.endSymbol=function(){return t},u}]}function Tt(){this.$get=["$rootScope","$window","$q","$$q",function(e,t,n,r){function i(i,a,s,u){var c=arguments.length>4,l=c?L(arguments,4):[],f=t.setInterval,h=t.clearInterval,p=0,d=b(u)&&!u,$=(d?r:n).defer(),v=$.promise;return s=b(s)?s:0,v.then(null,null,c?function(){i.apply(null,l)}:i),v.$$intervalId=f(function(){$.notify(p++),s>0&&p>=s&&($.resolve(p),h(v.$$intervalId),delete o[v.$$intervalId]),d||e.$apply()},a),o[v.$$intervalId]=$,v}var o={};return i.cancel=function(e){return e&&e.$$intervalId in o?(o[e.$$intervalId].reject("canceled"),t.clearInterval(e.$$intervalId),delete o[e.$$intervalId],!0):!1},i}]}function Nt(e){for(var t=e.split("/"),n=t.length;n--;)t[n]=ne(t[n]);return t.join("/")}function Vt(e,t){var n=En(e);t.$$protocol=n.protocol,t.$$host=n.hostname,t.$$port=p(n.port)||Bi[n.protocol]||null}function jt(e,t){var n="/"!==e.charAt(0);n&&(e="/"+e);var r=En(e);t.$$path=decodeURIComponent(n&&"/"===r.pathname.charAt(0)?r.pathname.substring(1):r.pathname),t.$$search=ee(r.search),t.$$hash=decodeURIComponent(r.hash),t.$$path&&"/"!=t.$$path.charAt(0)&&(t.$$path="/"+t.$$path)}function Pt(e,t){return 0===t.indexOf(e)?t.substr(e.length):void 0}function Dt(e){var t=e.indexOf("#");return-1==t?e:e.substr(0,t)}function It(e){return e.replace(/(#.+)|#$/,"$1")}function Rt(e){return e.substr(0,Dt(e).lastIndexOf("/")+1)}function _t(e){return e.substring(0,e.indexOf("/",e.indexOf("//")+2))}function qt(e,t,n){this.$$html5=!0,n=n||"",Vt(e,this),this.$$parse=function(e){var n=Pt(t,e);if(!S(n))throw Hi("ipthprfx",'Invalid url "{0}", missing path prefix "{1}".',e,t);jt(n,this),this.$$path||(this.$$path="/"),this.$$compose()},this.$$compose=function(){var e=te(this.$$search),n=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(e?"?"+e:"")+n,this.$$absUrl=t+this.$$url.substr(1)},this.$$parseLinkUrl=function(r,i){if(i&&"#"===i[0])return this.hash(i.slice(1)),!0;var o,a,s;return b(o=Pt(e,r))?(a=o,s=b(o=Pt(n,o))?t+(Pt("/",o)||o):e+a):b(o=Pt(t,r))?s=t+o:t==r+"/"&&(s=t),s&&this.$$parse(s),!!s}}function Ft(e,t,n){Vt(e,this),this.$$parse=function(r){function i(e,t,n){var r,i=/^\/[A-Z]:(\/.*)/;return 0===t.indexOf(n)&&(t=t.replace(n,"")),i.exec(t)?e:(r=i.exec(e),r?r[1]:e)}var o,a=Pt(e,r)||Pt(t,r);y(a)||"#"!==a.charAt(0)?this.$$html5?o=a:(o="",y(a)&&(e=r,this.replace())):(o=Pt(n,a),y(o)&&(o=a)),jt(o,this),this.$$path=i(this.$$path,o,e),this.$$compose()},this.$$compose=function(){var t=te(this.$$search),r=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(t?"?"+t:"")+r,this.$$absUrl=e+(this.$$url?n+this.$$url:"")},this.$$parseLinkUrl=function(t,n){return Dt(e)==Dt(t)?(this.$$parse(t),!0):!1}}function Ut(e,t,n){this.$$html5=!0,Ft.apply(this,arguments),this.$$parseLinkUrl=function(r,i){if(i&&"#"===i[0])return this.hash(i.slice(1)),!0;var o,a;return e==Dt(r)?o=r:(a=Pt(t,r))?o=e+n+a:t===r+"/"&&(o=t),o&&this.$$parse(o),!!o},this.$$compose=function(){var t=te(this.$$search),r=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(t?"?"+t:"")+r,this.$$absUrl=e+n+this.$$url}}function Bt(e){return function(){return this[e]}}function Ht(e,t){return function(n){return y(n)?this[e]:(this[e]=t(n),this.$$compose(),this)}}function Lt(){var e="",t={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(t){return b(t)?(e=t,this):e},this.html5Mode=function(e){return j(e)?(t.enabled=e,this):w(e)?(j(e.enabled)&&(t.enabled=e.enabled),j(e.requireBase)&&(t.requireBase=e.requireBase),j(e.rewriteLinks)&&(t.rewriteLinks=e.rewriteLinks),this):t},this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(n,r,i,o,a){function s(e,t,n){var i=c.url(),o=c.$$state;try{r.url(e,t,n),c.$$state=r.state()}catch(a){throw c.url(i),c.$$state=o,a}}function u(e,t){n.$broadcast("$locationChangeSuccess",c.absUrl(),e,c.$$state,t)}var c,l,f,h=r.baseHref(),p=r.url();if(t.enabled){if(!h&&t.requireBase)throw Hi("nobase","$location in HTML5 mode requires a <base> tag to be present!");f=_t(p)+(h||"/"),l=i.history?qt:Ut}else f=Dt(p),l=Ft;var d=Rt(f);c=new l(f,d,"#"+e),c.$$parseLinkUrl(p,p),c.$$state=r.state();var $=/^\s*(javascript|mailto):/i;o.on("click",function(e){if(t.rewriteLinks&&!e.ctrlKey&&!e.metaKey&&!e.shiftKey&&2!=e.which&&2!=e.button){for(var i=Er(e.target);"a"!==_(i[0]);)if(i[0]===o[0]||!(i=i.parent())[0])return;var s=i.prop("href"),u=i.attr("href")||i.attr("xlink:href");w(s)&&"[object SVGAnimatedString]"===s.toString()&&(s=En(s.animVal).href),$.test(s)||!s||i.attr("target")||e.isDefaultPrevented()||c.$$parseLinkUrl(s,u)&&(e.preventDefault(),c.absUrl()!=r.url()&&(n.$apply(),a.angular["ff-684208-preventDefault"]=!0))}}),It(c.absUrl())!=It(p)&&r.url(c.absUrl(),!0);var v=!0;return r.onUrlChange(function(e,t){return y(Pt(d,e))?void(a.location.href=e):(n.$evalAsync(function(){var r,i=c.absUrl(),o=c.$$state;c.$$parse(e),c.$$state=t,r=n.$broadcast("$locationChangeStart",e,i,t,o).defaultPrevented,c.absUrl()===e&&(r?(c.$$parse(i),c.$$state=o,s(i,!1,o)):(v=!1,u(i,o)))}),void(n.$$phase||n.$digest()))}),n.$watch(function(){var e=It(r.url()),t=It(c.absUrl()),o=r.state(),a=c.$$replace,l=e!==t||c.$$html5&&i.history&&o!==c.$$state;(v||l)&&(v=!1,n.$evalAsync(function(){var t=c.absUrl(),r=n.$broadcast("$locationChangeStart",t,e,c.$$state,o).defaultPrevented;c.absUrl()===t&&(r?(c.$$parse(e),c.$$state=o):(l&&s(t,a,o===c.$$state?null:c.$$state),u(e,o)))})),c.$$replace=!1}),c}]}function zt(){var e=!0,t=this;this.debugEnabled=function(t){return b(t)?(e=t,this):e},this.$get=["$window",function(n){function r(e){return e instanceof Error&&(e.stack?e=e.message&&-1===e.stack.indexOf(e.message)?"Error: "+e.message+"\n"+e.stack:e.stack:e.sourceURL&&(e=e.message+"\n"+e.sourceURL+":"+e.line)),e}function i(e){var t=n.console||{},i=t[e]||t.log||$,a=!1;try{a=!!i.apply}catch(s){}return a?function(){var e=[];return o(arguments,function(t){e.push(r(t))}),i.apply(t,e)}:function(e,t){i(e,null==t?"":t)}}return{log:i("log"),info:i("info"),warn:i("warn"),error:i("error"),debug:function(){var n=i("debug");return function(){e&&n.apply(t,arguments)}}()}}]}function Wt(e,t){if(e=w(e)&&e.toString?e.toString():e,"__defineGetter__"===e||"__defineSetter__"===e||"__lookupGetter__"===e||"__lookupSetter__"===e||"__proto__"===e)throw zi("isecfld","Attempting to access a disallowed field in Angular expressions! Expression: {0}",t);return e}function Gt(e,t){if(e){if(e.constructor===e)throw zi("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e.window===e)throw zi("isecwindow","Referencing the Window in Angular expressions is disallowed! Expression: {0}",t);if(e.children&&(e.nodeName||e.prop&&e.attr&&e.find))throw zi("isecdom","Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}",t);if(e===Object)throw zi("isecobj","Referencing Object in Angular expressions is disallowed! Expression: {0}",t)}return e}function Yt(e,t){if(e){if(e.constructor===e)throw zi("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e===Wi||e===Gi||e===Yi)throw zi("isecff","Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}",t)}}function Jt(e,t){return"undefined"!=typeof e?e:t}function Kt(e,t){return"undefined"==typeof e?t:"undefined"==typeof t?e:e+t}function Zt(e,t){var n=e(t);return!n.$stateful}function Xt(e,t){var n,r;switch(e.type){case Xi.Program:n=!0,o(e.body,function(e){Xt(e.expression,t),n=n&&e.expression.constant}),e.constant=n;break;case Xi.Literal:e.constant=!0,e.toWatch=[];break;case Xi.UnaryExpression:Xt(e.argument,t),e.constant=e.argument.constant,e.toWatch=e.argument.toWatch;break;case Xi.BinaryExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=e.left.toWatch.concat(e.right.toWatch);break;case Xi.LogicalExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=e.constant?[]:[e];break;case Xi.ConditionalExpression:Xt(e.test,t),Xt(e.alternate,t),Xt(e.consequent,t),e.constant=e.test.constant&&e.alternate.constant&&e.consequent.constant,e.toWatch=e.constant?[]:[e];break;case Xi.Identifier:e.constant=!1,e.toWatch=[e];break;case Xi.MemberExpression:Xt(e.object,t),e.computed&&Xt(e.property,t),e.constant=e.object.constant&&(!e.computed||e.property.constant),e.toWatch=[e];break;case Xi.CallExpression:n=e.filter?Zt(t,e.callee.name):!1,r=[],o(e.arguments,function(e){Xt(e,t),n=n&&e.constant,e.constant||r.push.apply(r,e.toWatch)}),e.constant=n,e.toWatch=e.filter&&Zt(t,e.callee.name)?r:[e];break;case Xi.AssignmentExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=[e];break;case Xi.ArrayExpression:n=!0,r=[],o(e.elements,function(e){Xt(e,t),n=n&&e.constant,e.constant||r.push.apply(r,e.toWatch)}),e.constant=n,e.toWatch=r;break;case Xi.ObjectExpression:n=!0,r=[],o(e.properties,function(e){Xt(e.value,t),n=n&&e.value.constant,e.value.constant||r.push.apply(r,e.value.toWatch)}),e.constant=n,e.toWatch=r;break;case Xi.ThisExpression:e.constant=!1,e.toWatch=[]}}function Qt(e){if(1==e.length){var t=e[0].expression,r=t.toWatch;return 1!==r.length?r:r[0]!==t?r:n}}function en(e){return e.type===Xi.Identifier||e.type===Xi.MemberExpression}function tn(e){return 1===e.body.length&&en(e.body[0].expression)?{type:Xi.AssignmentExpression,left:e.body[0].expression,right:{type:Xi.NGValueParameter},operator:"="}:void 0}function nn(e){return 0===e.body.length||1===e.body.length&&(e.body[0].expression.type===Xi.Literal||e.body[0].expression.type===Xi.ArrayExpression||e.body[0].expression.type===Xi.ObjectExpression)}function rn(e){return e.constant}function on(e,t){this.astBuilder=e,this.$filter=t}function an(e,t){this.astBuilder=e,this.$filter=t}function sn(e){return"constructor"==e}function un(e){return k(e.valueOf)?e.valueOf():eo.call(e)}function cn(){var e=ve(),t=ve();this.$get=["$filter",function(r){function i(e,t){return null==e||null==t?e===t:"object"==typeof e&&(e=un(e),"object"==typeof e)?!1:e===t||e!==e&&t!==t}function a(e,t,r,o,a){var s,u=o.inputs;if(1===u.length){var c=i;return u=u[0],e.$watch(function(e){var t=u(e);return i(t,c)||(s=o(e,n,n,[t]),c=t&&un(t)),s},t,r,a)}for(var l=[],f=[],h=0,p=u.length;p>h;h++)l[h]=i,f[h]=null;return e.$watch(function(e){for(var t=!1,r=0,a=u.length;a>r;r++){var c=u[r](e);(t||(t=!i(c,l[r])))&&(f[r]=c,l[r]=c&&un(c))}return t&&(s=o(e,n,n,f)),s},t,r,a)}function s(e,t,n,r){var i,o;return i=e.$watch(function(e){return r(e)},function(e,n,r){o=e,k(t)&&t.apply(this,arguments),b(e)&&r.$$postDigest(function(){b(o)&&i()})},n)}function u(e,t,n,r){function i(e){var t=!0;return o(e,function(e){b(e)||(t=!1)}),t}var a,s;return a=e.$watch(function(e){return r(e)},function(e,n,r){s=e,k(t)&&t.call(this,e,n,r),i(e)&&r.$$postDigest(function(){i(s)&&a()})},n)}function c(e,t,n,r){var i;return i=e.$watch(function(e){return r(e)},function(e,n,r){k(t)&&t.apply(this,arguments),i()},n)}function l(e,t){if(!t)return e;var n=e.$$watchDelegate,r=n!==u&&n!==s,i=r?function(n,r,i,o){var a=e(n,r,i,o);return t(a,n,r)}:function(n,r,i,o){var a=e(n,r,i,o),s=t(a,n,r);return b(a)?s:a};return e.$$watchDelegate&&e.$$watchDelegate!==a?i.$$watchDelegate=e.$$watchDelegate:t.$stateful||(i.$$watchDelegate=a,i.inputs=e.inputs?e.inputs:[e]),i}var f=Fr().noUnsafeEval,h={csp:f,expensiveChecks:!1},p={csp:f,expensiveChecks:!0};return function(n,i,o){var f,d,v;switch(typeof n){case"string":n=n.trim(),v=n;var m=o?t:e;if(f=m[v],!f){":"===n.charAt(0)&&":"===n.charAt(1)&&(d=!0,n=n.substring(2));var g=o?p:h,y=new Zi(g),b=new Qi(y,r,g);f=b.parse(n),f.constant?f.$$watchDelegate=c:d?f.$$watchDelegate=f.literal?u:s:f.inputs&&(f.$$watchDelegate=a),m[v]=f}return l(f,i);case"function":return l(n,i);default:return $}}}]}function ln(){this.$get=["$rootScope","$exceptionHandler",function(e,t){return hn(function(t){e.$evalAsync(t)},t)}]}function fn(){this.$get=["$browser","$exceptionHandler",function(e,t){return hn(function(t){e.defer(t)},t)}]}function hn(e,t){function i(e,t,n){function r(t){return function(n){i||(i=!0,t.call(e,n))}}var i=!1;return[r(t),r(n)]}function a(){this.$$state={status:0}}function s(e,t){return function(n){t.call(e,n)}}function u(e){var r,i,o;o=e.pending,e.processScheduled=!1,e.pending=n;for(var a=0,s=o.length;s>a;++a){i=o[a][0],r=o[a][e.status];try{k(r)?i.resolve(r(e.value)):1===e.status?i.resolve(e.value):i.reject(e.value)}catch(u){i.reject(u),t(u)}}}function c(t){!t.processScheduled&&t.pending&&(t.processScheduled=!0,e(function(){u(t)}))}function l(){this.promise=new a,this.resolve=s(this,this.resolve),this.reject=s(this,this.reject),this.notify=s(this,this.notify)}function h(e){var t=new l,n=0,r=Ir(e)?[]:{};return o(e,function(e,i){n++,g(e).then(function(e){r.hasOwnProperty(i)||(r[i]=e,--n||t.resolve(r))},function(e){r.hasOwnProperty(i)||t.reject(e)})}),0===n&&t.resolve(r),t.promise}var p=r("$q",TypeError),d=function(){return new l};f(a.prototype,{then:function(e,t,n){if(y(e)&&y(t)&&y(n))return this;var r=new l;return this.$$state.pending=this.$$state.pending||[],this.$$state.pending.push([r,e,t,n]),this.$$state.status>0&&c(this.$$state),r.promise},"catch":function(e){return this.then(null,e)},"finally":function(e,t){return this.then(function(t){return m(t,!0,e)},function(t){return m(t,!1,e)},t)}}),f(l.prototype,{resolve:function(e){this.promise.$$state.status||(e===this.promise?this.$$reject(p("qcycle","Expected promise to be resolved with value other than itself '{0}'",e)):this.$$resolve(e))},$$resolve:function(e){var n,r;r=i(this,this.$$resolve,this.$$reject);try{(w(e)||k(e))&&(n=e&&e.then),k(n)?(this.promise.$$state.status=-1,n.call(e,r[0],r[1],this.notify)):(this.promise.$$state.value=e,this.promise.$$state.status=1,c(this.promise.$$state))}catch(o){r[1](o),t(o)}},reject:function(e){this.promise.$$state.status||this.$$reject(e)},$$reject:function(e){this.promise.$$state.value=e,this.promise.$$state.status=2,c(this.promise.$$state)},notify:function(n){var r=this.promise.$$state.pending;this.promise.$$state.status<=0&&r&&r.length&&e(function(){for(var e,i,o=0,a=r.length;a>o;o++){i=r[o][0],e=r[o][3];try{i.notify(k(e)?e(n):n)}catch(s){t(s)}}})}});var $=function(e){var t=new l;return t.reject(e),t.promise},v=function(e,t){var n=new l;return t?n.resolve(e):n.reject(e),n.promise},m=function(e,t,n){var r=null;try{k(n)&&(r=n())}catch(i){return v(i,!1)}return P(r)?r.then(function(){return v(e,t)},function(e){return v(e,!1)}):v(e,t)},g=function(e,t,n,r){var i=new l;return i.resolve(e),i.promise.then(t,n,r)},b=g,x=function S(e){function t(e){r.resolve(e)}function n(e){r.reject(e)}if(!k(e))throw p("norslvr","Expected resolverFn, got '{0}'",e);if(!(this instanceof S))return new S(e);
+var r=new l;return e(t,n),r.promise};return x.defer=d,x.reject=$,x.when=g,x.resolve=b,x.all=h,x}function pn(){this.$get=["$window","$timeout",function(e,t){var n=e.requestAnimationFrame||e.webkitRequestAnimationFrame,r=e.cancelAnimationFrame||e.webkitCancelAnimationFrame||e.webkitCancelRequestAnimationFrame,i=!!n,o=i?function(e){var t=n(e);return function(){r(t)}}:function(e){var n=t(e,16.66,!1);return function(){t.cancel(n)}};return o.supported=i,o}]}function dn(){function e(e){function t(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null,this.$$listeners={},this.$$listenerCount={},this.$$watchersCount=0,this.$id=u(),this.$$ChildScope=null}return t.prototype=e,t}var t=10,n=r("$rootScope"),a=null,s=null;this.digestTtl=function(e){return arguments.length&&(t=e),t},this.$get=["$injector","$exceptionHandler","$parse","$browser",function(r,c,l,f){function h(e){e.currentScope.$$destroyed=!0}function p(){this.$id=u(),this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null,this.$root=this,this.$$destroyed=!1,this.$$listeners={},this.$$listenerCount={},this.$$watchersCount=0,this.$$isolateBindings=null}function d(e){if(E.$$phase)throw n("inprog","{0} already in progress",E.$$phase);E.$$phase=e}function v(){E.$$phase=null}function m(e,t){do e.$$watchersCount+=t;while(e=e.$parent)}function g(e,t,n){do e.$$listenerCount[n]-=t,0===e.$$listenerCount[n]&&delete e.$$listenerCount[n];while(e=e.$parent)}function b(){}function x(){for(;O.length;)try{O.shift()()}catch(e){c(e)}s=null}function S(){null===s&&(s=f.defer(function(){E.$apply(x)}))}p.prototype={constructor:p,$new:function(t,n){var r;return n=n||this,t?(r=new p,r.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=e(this)),r=new this.$$ChildScope),r.$parent=n,r.$$prevSibling=n.$$childTail,n.$$childHead?(n.$$childTail.$$nextSibling=r,n.$$childTail=r):n.$$childHead=n.$$childTail=r,(t||n!=this)&&r.$on("$destroy",h),r},$watch:function(e,t,n,r){var i=l(e);if(i.$$watchDelegate)return i.$$watchDelegate(this,t,n,i,e);var o=this,s=o.$$watchers,u={fn:t,last:b,get:i,exp:r||e,eq:!!n};return a=null,k(t)||(u.fn=$),s||(s=o.$$watchers=[]),s.unshift(u),m(this,1),function(){q(s,u)>=0&&m(o,-1),a=null}},$watchGroup:function(e,t){function n(){u=!1,c?(c=!1,t(i,i,s)):t(i,r,s)}var r=new Array(e.length),i=new Array(e.length),a=[],s=this,u=!1,c=!0;if(!e.length){var l=!0;return s.$evalAsync(function(){l&&t(i,i,s)}),function(){l=!1}}return 1===e.length?this.$watch(e[0],function(e,n,o){i[0]=e,r[0]=n,t(i,e===n?i:r,o)}):(o(e,function(e,t){var o=s.$watch(e,function(e,o){i[t]=e,r[t]=o,u||(u=!0,s.$evalAsync(n))});a.push(o)}),function(){for(;a.length;)a.shift()()})},$watchCollection:function(e,t){function n(e){o=e;var t,n,r,s,u;if(!y(o)){if(w(o))if(i(o)){a!==p&&(a=p,v=a.length=0,f++),t=o.length,v!==t&&(f++,a.length=v=t);for(var c=0;t>c;c++)u=a[c],s=o[c],r=u!==u&&s!==s,r||u===s||(f++,a[c]=s)}else{a!==d&&(a=d={},v=0,f++),t=0;for(n in o)yr.call(o,n)&&(t++,s=o[n],u=a[n],n in a?(r=u!==u&&s!==s,r||u===s||(f++,a[n]=s)):(v++,a[n]=s,f++));if(v>t){f++;for(n in a)yr.call(o,n)||(v--,delete a[n])}}else a!==o&&(a=o,f++);return f}}function r(){if($?($=!1,t(o,o,u)):t(o,s,u),c)if(w(o))if(i(o)){s=new Array(o.length);for(var e=0;e<o.length;e++)s[e]=o[e]}else{s={};for(var n in o)yr.call(o,n)&&(s[n]=o[n])}else s=o}n.$stateful=!0;var o,a,s,u=this,c=t.length>1,f=0,h=l(e,n),p=[],d={},$=!0,v=0;return this.$watch(h,r)},$digest:function(){var e,r,i,o,u,l,h,p,$,m,g=t,y=this,w=[];d("$digest"),f.$$checkUrlChange(),this===E&&null!==s&&(f.defer.cancel(s),x()),a=null;do{for(l=!1,p=y;C.length;){try{m=C.shift(),m.scope.$eval(m.expression,m.locals)}catch(S){c(S)}a=null}e:do{if(o=p.$$watchers)for(u=o.length;u--;)try{if(e=o[u])if((r=e.get(p))===(i=e.last)||(e.eq?B(r,i):"number"==typeof r&&"number"==typeof i&&isNaN(r)&&isNaN(i))){if(e===a){l=!1;break e}}else l=!0,a=e,e.last=e.eq?F(r,null):r,e.fn(r,i===b?r:i,p),5>g&&($=4-g,w[$]||(w[$]=[]),w[$].push({msg:k(e.exp)?"fn: "+(e.exp.name||e.exp.toString()):e.exp,newVal:r,oldVal:i}))}catch(S){c(S)}if(!(h=p.$$watchersCount&&p.$$childHead||p!==y&&p.$$nextSibling))for(;p!==y&&!(h=p.$$nextSibling);)p=p.$parent}while(p=h);if((l||C.length)&&!g--)throw v(),n("infdig","{0} $digest() iterations reached. Aborting!\nWatchers fired in the last 5 iterations: {1}",t,w)}while(l||C.length);for(v();A.length;)try{A.shift()()}catch(S){c(S)}},$destroy:function(){if(!this.$$destroyed){var e=this.$parent;this.$broadcast("$destroy"),this.$$destroyed=!0,this===E&&f.$$applicationDestroyed(),m(this,-this.$$watchersCount);for(var t in this.$$listenerCount)g(this,this.$$listenerCount[t],t);e&&e.$$childHead==this&&(e.$$childHead=this.$$nextSibling),e&&e.$$childTail==this&&(e.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=$,this.$on=this.$watch=this.$watchGroup=function(){return $},this.$$listeners={},this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=this.$$watchers=null}},$eval:function(e,t){return l(e)(this,t)},$evalAsync:function(e,t){E.$$phase||C.length||f.defer(function(){C.length&&E.$digest()}),C.push({scope:this,expression:e,locals:t})},$$postDigest:function(e){A.push(e)},$apply:function(e){try{d("$apply");try{return this.$eval(e)}finally{v()}}catch(t){c(t)}finally{try{E.$digest()}catch(t){throw c(t),t}}},$applyAsync:function(e){function t(){n.$eval(e)}var n=this;e&&O.push(t),S()},$on:function(e,t){var n=this.$$listeners[e];n||(this.$$listeners[e]=n=[]),n.push(t);var r=this;do r.$$listenerCount[e]||(r.$$listenerCount[e]=0),r.$$listenerCount[e]++;while(r=r.$parent);var i=this;return function(){var r=n.indexOf(t);-1!==r&&(n[r]=null,g(i,1,e))}},$emit:function(e,t){var n,r,i,o=[],a=this,s=!1,u={name:e,targetScope:a,stopPropagation:function(){s=!0},preventDefault:function(){u.defaultPrevented=!0},defaultPrevented:!1},l=H([u],arguments,1);do{for(n=a.$$listeners[e]||o,u.currentScope=a,r=0,i=n.length;i>r;r++)if(n[r])try{n[r].apply(null,l)}catch(f){c(f)}else n.splice(r,1),r--,i--;if(s)return u.currentScope=null,u;a=a.$parent}while(a);return u.currentScope=null,u},$broadcast:function(e,t){var n=this,r=n,i=n,o={name:e,targetScope:n,preventDefault:function(){o.defaultPrevented=!0},defaultPrevented:!1};if(!n.$$listenerCount[e])return o;for(var a,s,u,l=H([o],arguments,1);r=i;){for(o.currentScope=r,a=r.$$listeners[e]||[],s=0,u=a.length;u>s;s++)if(a[s])try{a[s].apply(null,l)}catch(f){c(f)}else a.splice(s,1),s--,u--;if(!(i=r.$$listenerCount[e]&&r.$$childHead||r!==n&&r.$$nextSibling))for(;r!==n&&!(i=r.$$nextSibling);)r=r.$parent}return o.currentScope=null,o}};var E=new p,C=E.$$asyncQueue=[],A=E.$$postDigestQueue=[],O=E.$$applyAsyncQueue=[];return E}]}function $n(){var e=/^\s*(https?|ftp|mailto|tel|file):/,t=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(t){return b(t)?(e=t,this):e},this.imgSrcSanitizationWhitelist=function(e){return b(e)?(t=e,this):t},this.$get=function(){return function(n,r){var i,o=r?t:e;return i=En(n).href,""===i||i.match(o)?n:"unsafe:"+i}}}function vn(e){if("self"===e)return e;if(S(e)){if(e.indexOf("***")>-1)throw to("iwcard","Illegal sequence *** in string matcher.  String: {0}",e);return e=qr(e).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*"),new RegExp("^"+e+"$")}if(A(e))return new RegExp("^"+e.source+"$");throw to("imatcher",'Matchers may only be "self", string patterns or RegExp objects')}function mn(e){var t=[];return b(e)&&o(e,function(e){t.push(vn(e))}),t}function gn(){this.SCE_CONTEXTS=no;var e=["self"],t=[];this.resourceUrlWhitelist=function(t){return arguments.length&&(e=mn(t)),e},this.resourceUrlBlacklist=function(e){return arguments.length&&(t=mn(e)),t},this.$get=["$injector",function(n){function r(e,t){return"self"===e?Cn(t):!!e.exec(t.href)}function i(n){var i,o,a=En(n.toString()),s=!1;for(i=0,o=e.length;o>i;i++)if(r(e[i],a)){s=!0;break}if(s)for(i=0,o=t.length;o>i;i++)if(r(t[i],a)){s=!1;break}return s}function o(e){var t=function(e){this.$$unwrapTrustedValue=function(){return e}};return e&&(t.prototype=new e),t.prototype.valueOf=function(){return this.$$unwrapTrustedValue()},t.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()},t}function a(e,t){var n=f.hasOwnProperty(e)?f[e]:null;if(!n)throw to("icontext","Attempted to trust a value in invalid context. Context: {0}; Value: {1}",e,t);if(null===t||y(t)||""===t)return t;if("string"!=typeof t)throw to("itype","Attempted to trust a non-string value in a content requiring a string: Context: {0}",e);return new n(t)}function s(e){return e instanceof l?e.$$unwrapTrustedValue():e}function u(e,t){if(null===t||y(t)||""===t)return t;var n=f.hasOwnProperty(e)?f[e]:null;if(n&&t instanceof n)return t.$$unwrapTrustedValue();if(e===no.RESOURCE_URL){if(i(t))return t;throw to("insecurl","Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",t.toString())}if(e===no.HTML)return c(t);throw to("unsafe","Attempting to use an unsafe value in a safe context.")}var c=function(e){throw to("unsafe","Attempting to use an unsafe value in a safe context.")};n.has("$sanitize")&&(c=n.get("$sanitize"));var l=o(),f={};return f[no.HTML]=o(l),f[no.CSS]=o(l),f[no.URL]=o(l),f[no.JS]=o(l),f[no.RESOURCE_URL]=o(f[no.URL]),{trustAs:a,getTrusted:u,valueOf:s}}]}function yn(){var e=!0;this.enabled=function(t){return arguments.length&&(e=!!t),e},this.$get=["$parse","$sceDelegate",function(t,n){if(e&&8>Sr)throw to("iequirks","Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks mode.  You can fix this by adding the text <!doctype html> to the top of your HTML document.  See http://docs.angularjs.org/api/ng.$sce for more information.");var r=U(no);r.isEnabled=function(){return e},r.trustAs=n.trustAs,r.getTrusted=n.getTrusted,r.valueOf=n.valueOf,e||(r.trustAs=r.getTrusted=function(e,t){return t},r.valueOf=v),r.parseAs=function(e,n){var i=t(n);return i.literal&&i.constant?i:t(n,function(t){return r.getTrusted(e,t)})};var i=r.parseAs,a=r.getTrusted,s=r.trustAs;return o(no,function(e,t){var n=gr(t);r[xe("parse_as_"+n)]=function(t){return i(e,t)},r[xe("get_trusted_"+n)]=function(t){return a(e,t)},r[xe("trust_as_"+n)]=function(t){return s(e,t)}}),r}]}function bn(){this.$get=["$window","$document",function(e,t){var n,r,i={},o=p((/android (\d+)/.exec(gr((e.navigator||{}).userAgent))||[])[1]),a=/Boxee/i.test((e.navigator||{}).userAgent),s=t[0]||{},u=/^(Moz|webkit|ms)(?=[A-Z])/,c=s.body&&s.body.style,l=!1,f=!1;if(c){for(var h in c)if(r=u.exec(h)){n=r[0],n=n.substr(0,1).toUpperCase()+n.substr(1);break}n||(n="WebkitOpacity"in c&&"webkit"),l=!!("transition"in c||n+"Transition"in c),f=!!("animation"in c||n+"Animation"in c),!o||l&&f||(l=S(c.webkitTransition),f=S(c.webkitAnimation))}return{history:!(!e.history||!e.history.pushState||4>o||a),hasEvent:function(e){if("input"===e&&11>=Sr)return!1;if(y(i[e])){var t=s.createElement("div");i[e]="on"+e in t}return i[e]},csp:Fr(),vendorPrefix:n,transitions:l,animations:f,android:o}}]}function wn(){this.$get=["$templateCache","$http","$q","$sce",function(e,t,n,r){function i(o,a){function s(e){if(!a)throw Oi("tpload","Failed to load template: {0} (HTTP status: {1} {2})",o,e.status,e.statusText);return n.reject(e)}i.totalPendingRequests++,S(o)&&e.get(o)||(o=r.getTrustedResourceUrl(o));var u=t.defaults&&t.defaults.transformResponse;Ir(u)?u=u.filter(function(e){return e!==yt}):u===yt&&(u=null);var c={cache:e,transformResponse:u};return t.get(o,c)["finally"](function(){i.totalPendingRequests--}).then(function(t){return e.put(o,t.data),t.data},s)}return i.totalPendingRequests=0,i}]}function xn(){this.$get=["$rootScope","$browser","$location",function(e,t,n){var r={};return r.findBindings=function(e,t,n){var r=e.getElementsByClassName("ng-binding"),i=[];return o(r,function(e){var r=jr.element(e).data("$binding");r&&o(r,function(r){if(n){var o=new RegExp("(^|\\s)"+qr(t)+"(\\s|\\||$)");o.test(r)&&i.push(e)}else-1!=r.indexOf(t)&&i.push(e)})}),i},r.findModels=function(e,t,n){for(var r=["ng-","data-ng-","ng\\:"],i=0;i<r.length;++i){var o=n?"=":"*=",a="["+r[i]+"model"+o+'"'+t+'"]',s=e.querySelectorAll(a);if(s.length)return s}},r.getLocation=function(){return n.url()},r.setLocation=function(t){t!==n.url()&&(n.url(t),e.$digest())},r.whenStable=function(e){t.notifyWhenNoOutstandingRequests(e)},r}]}function Sn(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(e,t,n,r,i){function o(o,s,u){k(o)||(u=s,s=o,o=$);var c,l=L(arguments,3),f=b(u)&&!u,h=(f?r:n).defer(),p=h.promise;return c=t.defer(function(){try{h.resolve(o.apply(null,l))}catch(t){h.reject(t),i(t)}finally{delete a[p.$$timeoutId]}f||e.$apply()},s),p.$$timeoutId=c,a[c]=h,p}var a={};return o.cancel=function(e){return e&&e.$$timeoutId in a?(a[e.$$timeoutId].reject("canceled"),delete a[e.$$timeoutId],t.defer.cancel(e.$$timeoutId)):!1},o}]}function En(e){var t=e;return Sr&&(ro.setAttribute("href",t),t=ro.href),ro.setAttribute("href",t),{href:ro.href,protocol:ro.protocol?ro.protocol.replace(/:$/,""):"",host:ro.host,search:ro.search?ro.search.replace(/^\?/,""):"",hash:ro.hash?ro.hash.replace(/^#/,""):"",hostname:ro.hostname,port:ro.port,pathname:"/"===ro.pathname.charAt(0)?ro.pathname:"/"+ro.pathname}}function Cn(e){var t=S(e)?En(e):e;return t.protocol===io.protocol&&t.host===io.host}function kn(){this.$get=m(e)}function An(e){function t(e){try{return decodeURIComponent(e)}catch(t){return e}}var n=e[0]||{},r={},i="";return function(){var e,o,a,s,u,c=n.cookie||"";if(c!==i)for(i=c,e=i.split("; "),r={},a=0;a<e.length;a++)o=e[a],s=o.indexOf("="),s>0&&(u=t(o.substring(0,s)),y(r[u])&&(r[u]=t(o.substring(s+1))));return r}}function On(){this.$get=An}function Mn(e){function t(r,i){if(w(r)){var a={};return o(r,function(e,n){a[n]=t(n,e)}),a}return e.factory(r+n,i)}var n="Filter";this.register=t,this.$get=["$injector",function(e){return function(t){return e.get(t+n)}}],t("currency",Pn),t("date",Gn),t("filter",Tn),t("json",Yn),t("limitTo",Jn),t("lowercase",co),t("number",Dn),t("orderBy",Kn),t("uppercase",lo)}function Tn(){return function(e,t,n){if(!i(e)){if(null==e)return e;throw r("filter")("notarray","Expected array but received: {0}",e)}var o,a,s=jn(t);switch(s){case"function":o=t;break;case"boolean":case"null":case"number":case"string":a=!0;case"object":o=Nn(t,n,a);break;default:return e}return Array.prototype.filter.call(e,o)}}function Nn(e,t,n){var r,i=w(e)&&"$"in e;return t===!0?t=B:k(t)||(t=function(e,t){return y(e)?!1:null===e||null===t?e===t:w(t)||w(e)&&!g(e)?!1:(e=gr(""+e),t=gr(""+t),-1!==e.indexOf(t))}),r=function(r){return i&&!w(r)?Vn(r,e.$,t,!1):Vn(r,e,t,n)}}function Vn(e,t,n,r,i){var o=jn(e),a=jn(t);if("string"===a&&"!"===t.charAt(0))return!Vn(e,t.substring(1),n,r);if(Ir(e))return e.some(function(e){return Vn(e,t,n,r)});switch(o){case"object":var s;if(r){for(s in e)if("$"!==s.charAt(0)&&Vn(e[s],t,n,!0))return!0;return i?!1:Vn(e,t,n,!1)}if("object"===a){for(s in t){var u=t[s];if(!k(u)&&!y(u)){var c="$"===s,l=c?e:e[s];if(!Vn(l,u,n,c,c))return!1}}return!0}return n(e,t);case"function":return!1;default:return n(e,t)}}function jn(e){return null===e?"null":typeof e}function Pn(e){var t=e.NUMBER_FORMATS;return function(e,n,r){return y(n)&&(n=t.CURRENCY_SYM),y(r)&&(r=t.PATTERNS[1].maxFrac),null==e?e:In(e,t.PATTERNS[1],t.GROUP_SEP,t.DECIMAL_SEP,r).replace(/\u00A4/g,n)}}function Dn(e){var t=e.NUMBER_FORMATS;return function(e,n){return null==e?e:In(e,t.PATTERNS[0],t.GROUP_SEP,t.DECIMAL_SEP,n)}}function In(e,t,n,r,i){if(w(e))return"";var o=0>e;e=Math.abs(e);var a=e===1/0;if(!a&&!isFinite(e))return"";var s=e+"",u="",c=!1,l=[];if(a&&(u="∞"),!a&&-1!==s.indexOf("e")){var f=s.match(/([\d\.]+)e(-?)(\d+)/);f&&"-"==f[2]&&f[3]>i+1?e=0:(u=s,c=!0)}if(a||c)i>0&&1>e&&(u=e.toFixed(i),e=parseFloat(u));else{var h=(s.split(oo)[1]||"").length;y(i)&&(i=Math.min(Math.max(t.minFrac,h),t.maxFrac)),e=+(Math.round(+(e.toString()+"e"+i)).toString()+"e"+-i);var p=(""+e).split(oo),d=p[0];p=p[1]||"";var $,v=0,m=t.lgSize,g=t.gSize;if(d.length>=m+g)for(v=d.length-m,$=0;v>$;$++)(v-$)%g===0&&0!==$&&(u+=n),u+=d.charAt($);for($=v;$<d.length;$++)(d.length-$)%m===0&&0!==$&&(u+=n),u+=d.charAt($);for(;p.length<i;)p+="0";i&&"0"!==i&&(u+=r+p.substr(0,i))}return 0===e&&(o=!1),l.push(o?t.negPre:t.posPre,u,o?t.negSuf:t.posSuf),l.join("")}function Rn(e,t,n){var r="";for(0>e&&(r="-",e=-e),e=""+e;e.length<t;)e="0"+e;return n&&(e=e.substr(e.length-t)),r+e}function _n(e,t,n,r){return n=n||0,function(i){var o=i["get"+e]();return(n>0||o>-n)&&(o+=n),0===o&&-12==n&&(o=12),Rn(o,t,r)}}function qn(e,t){return function(n,r){var i=n["get"+e](),o=br(t?"SHORT"+e:e);return r[o][i]}}function Fn(e,t,n){var r=-1*n,i=r>=0?"+":"";return i+=Rn(Math[r>0?"floor":"ceil"](r/60),2)+Rn(Math.abs(r%60),2)}function Un(e){var t=new Date(e,0,1).getDay();return new Date(e,0,(4>=t?5:12)-t)}function Bn(e){return new Date(e.getFullYear(),e.getMonth(),e.getDate()+(4-e.getDay()))}function Hn(e){return function(t){var n=Un(t.getFullYear()),r=Bn(t),i=+r-+n,o=1+Math.round(i/6048e5);return Rn(o,e)}}function Ln(e,t){return e.getHours()<12?t.AMPMS[0]:t.AMPMS[1]}function zn(e,t){return e.getFullYear()<=0?t.ERAS[0]:t.ERAS[1]}function Wn(e,t){return e.getFullYear()<=0?t.ERANAMES[0]:t.ERANAMES[1]}function Gn(e){function t(e){var t;if(t=e.match(n)){var r=new Date(0),i=0,o=0,a=t[8]?r.setUTCFullYear:r.setFullYear,s=t[8]?r.setUTCHours:r.setHours;t[9]&&(i=p(t[9]+t[10]),o=p(t[9]+t[11])),a.call(r,p(t[1]),p(t[2])-1,p(t[3]));var u=p(t[4]||0)-i,c=p(t[5]||0)-o,l=p(t[6]||0),f=Math.round(1e3*parseFloat("0."+(t[7]||0)));return s.call(r,u,c,l,f),r}return e}var n=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(n,r,i){var a,s,u="",c=[];if(r=r||"mediumDate",r=e.DATETIME_FORMATS[r]||r,S(n)&&(n=uo.test(n)?p(n):t(n)),E(n)&&(n=new Date(n)),!C(n)||!isFinite(n.getTime()))return n;for(;r;)s=so.exec(r),s?(c=H(c,s,1),r=c.pop()):(c.push(r),r=null);var l=n.getTimezoneOffset();return i&&(l=J(i,n.getTimezoneOffset()),n=Z(n,i,!0)),o(c,function(t){a=ao[t],u+=a?a(n,e.DATETIME_FORMATS,l):t.replace(/(^'|'$)/g,"").replace(/''/g,"'")}),u}}function Yn(){return function(e,t){return y(t)&&(t=2),G(e,t)}}function Jn(){return function(e,t,n){return t=Math.abs(Number(t))===1/0?Number(t):p(t),isNaN(t)?e:(E(e)&&(e=e.toString()),Ir(e)||S(e)?(n=!n||isNaN(n)?0:p(n),n=0>n&&n>=-e.length?e.length+n:n,t>=0?e.slice(n,n+t):0===n?e.slice(t,e.length):e.slice(Math.max(0,n+t),n)):e)}}function Kn(e){function t(t,n){return n=n?-1:1,t.map(function(t){var r=1,i=v;if(k(t))i=t;else if(S(t)&&("+"!=t.charAt(0)&&"-"!=t.charAt(0)||(r="-"==t.charAt(0)?-1:1,t=t.substring(1)),""!==t&&(i=e(t),i.constant))){var o=i();i=function(e){return e[o]}}return{get:i,descending:r*n}})}function n(e){switch(typeof e){case"number":case"boolean":case"string":return!0;default:return!1}}function r(e,t){return"function"==typeof e.valueOf&&(e=e.valueOf(),n(e))?e:g(e)&&(e=e.toString(),n(e))?e:t}function o(e,t){var n=typeof e;return null===e?(n="string",e="null"):"string"===n?e=e.toLowerCase():"object"===n&&(e=r(e,t)),{value:e,type:n}}function a(e,t){var n=0;return e.type===t.type?e.value!==t.value&&(n=e.value<t.value?-1:1):n=e.type<t.type?-1:1,n}return function(e,n,r){function s(e,t){return{value:e,predicateValues:c.map(function(n){return o(n.get(e),t)})}}function u(e,t){for(var n=0,r=0,i=c.length;i>r&&!(n=a(e.predicateValues[r],t.predicateValues[r])*c[r].descending);++r);return n}if(!i(e))return e;Ir(n)||(n=[n]),0===n.length&&(n=["+"]);var c=t(n,r);c.push({get:function(){return{}},descending:r?-1:1});var l=Array.prototype.map.call(e,s);return l.sort(u),e=l.map(function(e){return e.value})}}function Zn(e){return k(e)&&(e={link:e}),e.restrict=e.restrict||"AC",m(e)}function Xn(e,t){e.$name=t}function Qn(e,t,r,i,a){var s=this,u=[];s.$error={},s.$$success={},s.$pending=n,s.$name=a(t.name||t.ngForm||"")(r),s.$dirty=!1,s.$pristine=!0,s.$valid=!0,s.$invalid=!1,s.$submitted=!1,s.$$parentForm=po,s.$rollbackViewValue=function(){o(u,function(e){e.$rollbackViewValue()})},s.$commitViewValue=function(){o(u,function(e){e.$commitViewValue()})},s.$addControl=function(e){pe(e.$name,"input"),u.push(e),e.$name&&(s[e.$name]=e),e.$$parentForm=s},s.$$renameControl=function(e,t){var n=e.$name;s[n]===e&&delete s[n],s[t]=e,e.$name=t},s.$removeControl=function(e){e.$name&&s[e.$name]===e&&delete s[e.$name],o(s.$pending,function(t,n){s.$setValidity(n,null,e)}),o(s.$error,function(t,n){s.$setValidity(n,null,e)}),o(s.$$success,function(t,n){s.$setValidity(n,null,e)}),q(u,e),e.$$parentForm=po},dr({ctrl:this,$element:e,set:function(e,t,n){var r=e[t];if(r){var i=r.indexOf(n);-1===i&&r.push(n)}else e[t]=[n]},unset:function(e,t,n){var r=e[t];r&&(q(r,n),0===r.length&&delete e[t])},$animate:i}),s.$setDirty=function(){i.removeClass(e,Ko),i.addClass(e,Zo),s.$dirty=!0,s.$pristine=!1,s.$$parentForm.$setDirty()},s.$setPristine=function(){i.setClass(e,Ko,Zo+" "+$o),s.$dirty=!1,s.$pristine=!0,s.$submitted=!1,o(u,function(e){e.$setPristine()})},s.$setUntouched=function(){o(u,function(e){e.$setUntouched()})},s.$setSubmitted=function(){i.addClass(e,$o),s.$submitted=!0,s.$$parentForm.$setSubmitted()}}function er(e){e.$formatters.push(function(t){return e.$isEmpty(t)?t:t.toString()})}function tr(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r)}function nr(e,t,n,r,i,o){var a=gr(t[0].type);if(!i.android){var s=!1;t.on("compositionstart",function(e){s=!0}),t.on("compositionend",function(){s=!1,u()})}var u=function(e){if(c&&(o.defer.cancel(c),c=null),!s){var i=t.val(),u=e&&e.type;"password"===a||n.ngTrim&&"false"===n.ngTrim||(i=_r(i)),(r.$viewValue!==i||""===i&&r.$$hasNativeValidators)&&r.$setViewValue(i,u)}};if(i.hasEvent("input"))t.on("input",u);else{var c,l=function(e,t,n){c||(c=o.defer(function(){c=null,t&&t.value===n||u(e)}))};t.on("keydown",function(e){var t=e.keyCode;91===t||t>15&&19>t||t>=37&&40>=t||l(e,this,this.value)}),i.hasEvent("paste")&&t.on("paste cut",l)}t.on("change",u),r.$render=function(){var e=r.$isEmpty(r.$viewValue)?"":r.$viewValue;t.val()!==e&&t.val(e)}}function rr(e,t){if(C(e))return e;if(S(e)){Co.lastIndex=0;var n=Co.exec(e);if(n){var r=+n[1],i=+n[2],o=0,a=0,s=0,u=0,c=Un(r),l=7*(i-1);return t&&(o=t.getHours(),a=t.getMinutes(),s=t.getSeconds(),u=t.getMilliseconds()),new Date(r,0,c.getDate()+l,o,a,s,u)}}return NaN}function ir(e,t){return function(n,r){var i,a;if(C(n))return n;if(S(n)){if('"'==n.charAt(0)&&'"'==n.charAt(n.length-1)&&(n=n.substring(1,n.length-1)),yo.test(n))return new Date(n);if(e.lastIndex=0,i=e.exec(n))return i.shift(),a=r?{yyyy:r.getFullYear(),MM:r.getMonth()+1,dd:r.getDate(),HH:r.getHours(),mm:r.getMinutes(),ss:r.getSeconds(),sss:r.getMilliseconds()/1e3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},o(i,function(e,n){n<t.length&&(a[t[n]]=+e)}),new Date(a.yyyy,a.MM-1,a.dd,a.HH,a.mm,a.ss||0,1e3*a.sss||0)}return NaN}}function or(e,t,r,i){return function(o,a,s,u,c,l,f){function h(e){return e&&!(e.getTime&&e.getTime()!==e.getTime())}function p(e){return b(e)&&!C(e)?r(e)||n:e}ar(o,a,s,u),nr(o,a,s,u,c,l);var d,$=u&&u.$options&&u.$options.timezone;if(u.$$parserName=e,u.$parsers.push(function(e){if(u.$isEmpty(e))return null;if(t.test(e)){var i=r(e,d);return $&&(i=Z(i,$)),i}return n}),u.$formatters.push(function(e){if(e&&!C(e))throw ta("datefmt","Expected `{0}` to be a date",e);return h(e)?(d=e,d&&$&&(d=Z(d,$,!0)),f("date")(e,i,$)):(d=null,"")}),b(s.min)||s.ngMin){var v;u.$validators.min=function(e){return!h(e)||y(v)||r(e)>=v},s.$observe("min",function(e){v=p(e),u.$validate()})}if(b(s.max)||s.ngMax){var m;u.$validators.max=function(e){return!h(e)||y(m)||r(e)<=m},s.$observe("max",function(e){m=p(e),u.$validate()})}}}function ar(e,t,r,i){var o=t[0],a=i.$$hasNativeValidators=w(o.validity);a&&i.$parsers.push(function(e){var r=t.prop(mr)||{};return r.badInput&&!r.typeMismatch?n:e})}function sr(e,t,r,i,o,a){if(ar(e,t,r,i),nr(e,t,r,i,o,a),i.$$parserName="number",i.$parsers.push(function(e){return i.$isEmpty(e)?null:xo.test(e)?parseFloat(e):n}),i.$formatters.push(function(e){if(!i.$isEmpty(e)){if(!E(e))throw ta("numfmt","Expected `{0}` to be a number",e);e=e.toString()}return e}),b(r.min)||r.ngMin){var s;i.$validators.min=function(e){return i.$isEmpty(e)||y(s)||e>=s},r.$observe("min",function(e){b(e)&&!E(e)&&(e=parseFloat(e,10)),s=E(e)&&!isNaN(e)?e:n,i.$validate()})}if(b(r.max)||r.ngMax){var u;i.$validators.max=function(e){return i.$isEmpty(e)||y(u)||u>=e},r.$observe("max",function(e){b(e)&&!E(e)&&(e=parseFloat(e,10)),u=E(e)&&!isNaN(e)?e:n,i.$validate()})}}function ur(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r),r.$$parserName="url",r.$validators.url=function(e,t){var n=e||t;return r.$isEmpty(n)||bo.test(n)}}function cr(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r),r.$$parserName="email",r.$validators.email=function(e,t){var n=e||t;return r.$isEmpty(n)||wo.test(n)}}function lr(e,t,n,r){y(n.name)&&t.attr("name",u());var i=function(e){t[0].checked&&r.$setViewValue(n.value,e&&e.type)};t.on("click",i),r.$render=function(){var e=n.value;t[0].checked=e==r.$viewValue},n.$observe("value",r.$render)}function fr(e,t,n,r,i){var o;if(b(r)){if(o=e(r),!o.constant)throw ta("constexpr","Expected constant expression for `{0}`, but saw `{1}`.",n,r);return o(t)}return i}function hr(e,t,n,r,i,o,a,s){var u=fr(s,e,"ngTrueValue",n.ngTrueValue,!0),c=fr(s,e,"ngFalseValue",n.ngFalseValue,!1),l=function(e){r.$setViewValue(t[0].checked,e&&e.type)};t.on("click",l),r.$render=function(){t[0].checked=r.$viewValue},r.$isEmpty=function(e){return e===!1},r.$formatters.push(function(e){return B(e,u)}),r.$parsers.push(function(e){return e?u:c})}function pr(e,t){return e="ngClass"+e,["$animate",function(n){function r(e,t){var n=[];e:for(var r=0;r<e.length;r++){for(var i=e[r],o=0;o<t.length;o++)if(i==t[o])continue e;n.push(i)}return n}function i(e){var t=[];return Ir(e)?(o(e,function(e){t=t.concat(i(e))}),t):S(e)?e.split(" "):w(e)?(o(e,function(e,n){e&&(t=t.concat(n.split(" ")))}),t):e}return{restrict:"AC",link:function(a,s,u){function c(e){var t=f(e,1);u.$addClass(t)}function l(e){var t=f(e,-1);u.$removeClass(t)}function f(e,t){var n=s.data("$classCounts")||ve(),r=[];return o(e,function(e){(t>0||n[e])&&(n[e]=(n[e]||0)+t,n[e]===+(t>0)&&r.push(e))}),s.data("$classCounts",n),r.join(" ")}function h(e,t){var i=r(t,e),o=r(e,t);i=f(i,1),o=f(o,-1),i&&i.length&&n.addClass(s,i),o&&o.length&&n.removeClass(s,o)}function p(e){if(t===!0||a.$index%2===t){var n=i(e||[]);if(d){if(!B(e,d)){var r=i(d);h(r,n)}}else c(n)}d=U(e)}var d;a.$watch(u[e],p,!0),u.$observe("class",function(t){p(a.$eval(u[e]))}),"ngClass"!==e&&a.$watch("$index",function(n,r){var o=1&n;if(o!==(1&r)){var s=i(a.$eval(u[e]));o===t?c(s):l(s)}})}}}]}function dr(e){function t(e,t,u){y(t)?r("$pending",e,u):i("$pending",e,u),j(t)?t?(f(s.$error,e,u),l(s.$$success,e,u)):(l(s.$error,e,u),f(s.$$success,e,u)):(f(s.$error,e,u),f(s.$$success,e,u)),s.$pending?(o(ea,!0),s.$valid=s.$invalid=n,a("",null)):(o(ea,!1),s.$valid=$r(s.$error),s.$invalid=!s.$valid,a("",s.$valid));var c;c=s.$pending&&s.$pending[e]?n:s.$error[e]?!1:s.$$success[e]?!0:null,a(e,c),s.$$parentForm.$setValidity(e,c,s)}function r(e,t,n){s[e]||(s[e]={}),l(s[e],t,n)}function i(e,t,r){s[e]&&f(s[e],t,r),$r(s[e])&&(s[e]=n)}function o(e,t){t&&!c[e]?(h.addClass(u,e),c[e]=!0):!t&&c[e]&&(h.removeClass(u,e),c[e]=!1)}function a(e,t){e=e?"-"+ce(e,"-"):"",o(Yo+e,t===!0),o(Jo+e,t===!1)}var s=e.ctrl,u=e.$element,c={},l=e.set,f=e.unset,h=e.$animate;c[Jo]=!(c[Yo]=u.hasClass(Yo)),s.$setValidity=t}function $r(e){if(e)for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}var vr=/^\/(.+)\/([a-z]*)$/,mr="validity",gr=function(e){return S(e)?e.toLowerCase():e},yr=Object.prototype.hasOwnProperty,br=function(e){return S(e)?e.toUpperCase():e},wr=function(e){return S(e)?e.replace(/[A-Z]/g,function(e){return String.fromCharCode(32|e.charCodeAt(0))}):e},xr=function(e){return S(e)?e.replace(/[a-z]/g,function(e){return String.fromCharCode(-33&e.charCodeAt(0))}):e};"i"!=="I".toLowerCase()&&(gr=wr,br=xr);var Sr,Er,Cr,kr,Ar=[].slice,Or=[].splice,Mr=[].push,Tr=Object.prototype.toString,Nr=Object.getPrototypeOf,Vr=r("ng"),jr=e.angular||(e.angular={}),Pr=0;Sr=t.documentMode,$.$inject=[],v.$inject=[];var Dr,Ir=Array.isArray,Rr=/^\[object (Uint8(Clamped)?)|(Uint16)|(Uint32)|(Int8)|(Int16)|(Int32)|(Float(32)|(64))Array\]$/,_r=function(e){return S(e)?e.trim():e},qr=function(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Fr=function(){function e(){try{return new Function(""),!1}catch(e){return!0}}if(!b(Fr.rules)){var n=t.querySelector("[ng-csp]")||t.querySelector("[data-ng-csp]");if(n){var r=n.getAttribute("ng-csp")||n.getAttribute("data-ng-csp");Fr.rules={noUnsafeEval:!r||-1!==r.indexOf("no-unsafe-eval"),noInlineStyle:!r||-1!==r.indexOf("no-inline-style")}}else Fr.rules={noUnsafeEval:e(),noInlineStyle:!1}}return Fr.rules},Ur=function(){if(b(Ur.name_))return Ur.name_;var e,n,r,i,o=Br.length;for(n=0;o>n;++n)if(r=Br[n],e=t.querySelector("["+r.replace(":","\\:")+"jq]")){i=e.getAttribute(r+"jq");break}return Ur.name_=i},Br=["ng-","data-ng-","ng:","x-ng-"],Hr=/[A-Z]/g,Lr=!1,zr=1,Wr=2,Gr=3,Yr=8,Jr=9,Kr=11,Zr={full:"1.4.6",major:1,minor:4,dot:6,codeName:"multiplicative-elevation"};Oe.expando="ng339";var Xr=Oe.cache={},Qr=1,ei=function(e,t,n){e.addEventListener(t,n,!1)},ti=function(e,t,n){e.removeEventListener(t,n,!1)};Oe._data=function(e){return this.cache[e[this.expando]]||{}};var ni=/([\:\-\_]+(.))/g,ri=/^moz([A-Z])/,ii={mouseleave:"mouseout",mouseenter:"mouseover"},oi=r("jqLite"),ai=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,si=/<|&#?\w+;/,ui=/<([\w:]+)/,ci=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,li={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};li.optgroup=li.option,li.tbody=li.tfoot=li.colgroup=li.caption=li.thead,li.th=li.td;var fi=Oe.prototype={ready:function(n){function r(){i||(i=!0,n())}var i=!1;"complete"===t.readyState?setTimeout(r):(this.on("DOMContentLoaded",r),Oe(e).on("load",r))},toString:function(){var e=[];return o(this,function(t){e.push(""+t)}),"["+e.join(", ")+"]"},eq:function(e){return Er(e>=0?this[e]:this[this.length+e])},length:0,push:Mr,sort:[].sort,splice:[].splice},hi={};o("multiple,selected,checked,disabled,readOnly,required,open".split(","),function(e){hi[gr(e)]=e});var pi={};o("input,select,option,textarea,button,form,details".split(","),function(e){pi[e]=!0});var di={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};o({data:Pe,removeData:Ve,hasData:Ce},function(e,t){Oe[t]=e}),o({data:Pe,inheritedData:Fe,scope:function(e){return Er.data(e,"$scope")||Fe(e.parentNode||e,["$isolateScope","$scope"])},isolateScope:function(e){return Er.data(e,"$isolateScope")||Er.data(e,"$isolateScopeNoTemplate")},controller:qe,injector:function(e){return Fe(e,"$injector")},removeAttr:function(e,t){e.removeAttribute(t)},hasClass:De,css:function(e,t,n){return t=xe(t),b(n)?void(e.style[t]=n):e.style[t]},attr:function(e,t,r){var i=e.nodeType;if(i!==Gr&&i!==Wr&&i!==Yr){var o=gr(t);if(hi[o]){if(!b(r))return e[t]||(e.attributes.getNamedItem(t)||$).specified?o:n;r?(e[t]=!0,e.setAttribute(t,o)):(e[t]=!1,e.removeAttribute(o))}else if(b(r))e.setAttribute(t,r);else if(e.getAttribute){var a=e.getAttribute(t,2);return null===a?n:a}}},prop:function(e,t,n){return b(n)?void(e[t]=n):e[t]},text:function(){function e(e,t){if(y(t)){var n=e.nodeType;return n===zr||n===Gr?e.textContent:""}e.textContent=t}return e.$dv="",e}(),val:function(e,t){if(y(t)){if(e.multiple&&"select"===_(e)){var n=[];return o(e.options,function(e){e.selected&&n.push(e.value||e.text)}),0===n.length?null:n}return e.value}e.value=t},html:function(e,t){return y(t)?e.innerHTML:(Te(e,!0),void(e.innerHTML=t))},empty:Ue},function(e,t){Oe.prototype[t]=function(t,n){
+var r,i,o=this.length;if(e!==Ue&&y(2==e.length&&e!==De&&e!==qe?t:n)){if(w(t)){for(r=0;o>r;r++)if(e===Pe)e(this[r],t);else for(i in t)e(this[r],i,t[i]);return this}for(var a=e.$dv,s=y(a)?Math.min(o,1):o,u=0;s>u;u++){var c=e(this[u],t,n);a=a?a+c:c}return a}for(r=0;o>r;r++)e(this[r],t,n);return this}}),o({removeData:Ve,on:function Na(e,t,n,r){if(b(r))throw oi("onargs","jqLite#on() does not support the `selector` or `eventData` parameters");if(Ee(e)){var i=je(e,!0),o=i.events,a=i.handle;a||(a=i.handle=We(e,o));for(var s=t.indexOf(" ")>=0?t.split(" "):[t],u=s.length;u--;){t=s[u];var c=o[t];c||(o[t]=[],"mouseenter"===t||"mouseleave"===t?Na(e,ii[t],function(e){var n=this,r=e.relatedTarget;r&&(r===n||n.contains(r))||a(e,t)}):"$destroy"!==t&&ei(e,t,a),c=o[t]),c.push(n)}}},off:Ne,one:function(e,t,n){e=Er(e),e.on(t,function r(){e.off(t,n),e.off(t,r)}),e.on(t,n)},replaceWith:function(e,t){var n,r=e.parentNode;Te(e),o(new Oe(t),function(t){n?r.insertBefore(t,n.nextSibling):r.replaceChild(t,e),n=t})},children:function(e){var t=[];return o(e.childNodes,function(e){e.nodeType===zr&&t.push(e)}),t},contents:function(e){return e.contentDocument||e.childNodes||[]},append:function(e,t){var n=e.nodeType;if(n===zr||n===Kr){t=new Oe(t);for(var r=0,i=t.length;i>r;r++){var o=t[r];e.appendChild(o)}}},prepend:function(e,t){if(e.nodeType===zr){var n=e.firstChild;o(new Oe(t),function(t){e.insertBefore(t,n)})}},wrap:function(e,t){t=Er(t).eq(0).clone()[0];var n=e.parentNode;n&&n.replaceChild(t,e),t.appendChild(e)},remove:Be,detach:function(e){Be(e,!0)},after:function(e,t){var n=e,r=e.parentNode;t=new Oe(t);for(var i=0,o=t.length;o>i;i++){var a=t[i];r.insertBefore(a,n.nextSibling),n=a}},addClass:Re,removeClass:Ie,toggleClass:function(e,t,n){t&&o(t.split(" "),function(t){var r=n;y(r)&&(r=!De(e,t)),(r?Re:Ie)(e,t)})},parent:function(e){var t=e.parentNode;return t&&t.nodeType!==Kr?t:null},next:function(e){return e.nextElementSibling},find:function(e,t){return e.getElementsByTagName?e.getElementsByTagName(t):[]},clone:Me,triggerHandler:function(e,t,n){var r,i,a,s=t.type||t,u=je(e),c=u&&u.events,l=c&&c[s];l&&(r={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return this.defaultPrevented===!0},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return this.immediatePropagationStopped===!0},stopPropagation:$,type:s,target:e},t.type&&(r=f(r,t)),i=U(l),a=n?[r].concat(n):[r],o(i,function(t){r.isImmediatePropagationStopped()||t.apply(e,a)}))}},function(e,t){Oe.prototype[t]=function(t,n,r){for(var i,o=0,a=this.length;a>o;o++)y(i)?(i=e(this[o],t,n,r),b(i)&&(i=Er(i))):_e(i,e(this[o],t,n,r));return b(i)?i:this},Oe.prototype.bind=Oe.prototype.on,Oe.prototype.unbind=Oe.prototype.off}),Je.prototype={put:function(e,t){this[Ye(e,this.nextUid)]=t},get:function(e){return this[Ye(e,this.nextUid)]},remove:function(e){var t=this[e=Ye(e,this.nextUid)];return delete this[e],t}};var $i=[function(){this.$get=[function(){return Je}]}],vi=/^[^\(]*\(\s*([^\)]*)\)/m,mi=/,/,gi=/^\s*(_?)(\S+?)\1\s*$/,yi=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,bi=r("$injector");Xe.$$annotate=Ze;var wi=r("$animate"),xi=1,Si="ng-animate",Ei=function(){this.$get=["$q","$$rAF",function(e,t){function n(){}return n.all=$,n.chain=$,n.prototype={end:$,cancel:$,resume:$,pause:$,complete:$,then:function(n,r){return e(function(e){t(function(){e()})}).then(n,r)}},n}]},Ci=function(){var e=new Je,t=[];this.$get=["$$AnimateRunner","$rootScope",function(n,r){function i(e,t,n){var r=!1;return t&&(t=S(t)?t.split(" "):Ir(t)?t:[],o(t,function(t){t&&(r=!0,e[t]=n)})),r}function a(){o(t,function(t){var n=e.get(t);if(n){var r=nt(t.attr("class")),i="",a="";o(n,function(e,t){var n=!!r[t];e!==n&&(e?i+=(i.length?" ":"")+t:a+=(a.length?" ":"")+t)}),o(t,function(e){i&&Re(e,i),a&&Ie(e,a)}),e.remove(t)}}),t.length=0}function s(n,o,s){var u=e.get(n)||{},c=i(u,o,!0),l=i(u,s,!1);(c||l)&&(e.put(n,u),t.push(n),1===t.length&&r.$$postDigest(a))}return{enabled:$,on:$,off:$,pin:$,push:function(e,t,r,i){return i&&i(),r=r||{},r.from&&e.css(r.from),r.to&&e.css(r.to),(r.addClass||r.removeClass)&&s(e,r.addClass,r.removeClass),new n}}}]},ki=["$provide",function(e){var t=this;this.$$registeredAnimations=Object.create(null),this.register=function(n,r){if(n&&"."!==n.charAt(0))throw wi("notcsel","Expecting class selector starting with '.' got '{0}'.",n);var i=n+"-animation";t.$$registeredAnimations[n.substr(1)]=i,e.factory(i,r)},this.classNameFilter=function(e){if(1===arguments.length&&(this.$$classNameFilter=e instanceof RegExp?e:null,this.$$classNameFilter)){var t=new RegExp("(\\s+|\\/)"+Si+"(\\s+|\\/)");if(t.test(this.$$classNameFilter.toString()))throw wi("nongcls",'$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.',Si)}return this.$$classNameFilter},this.$get=["$$animateQueue",function(e){function t(e,t,n){if(n){var r=tt(n);!r||r.parentNode||r.previousElementSibling||(n=null)}n?n.after(e):t.prepend(e)}return{on:e.on,off:e.off,pin:e.pin,enabled:e.enabled,cancel:function(e){e.end&&e.end()},enter:function(n,r,i,o){return r=r&&Er(r),i=i&&Er(i),r=r||i.parent(),t(n,r,i),e.push(n,"enter",rt(o))},move:function(n,r,i,o){return r=r&&Er(r),i=i&&Er(i),r=r||i.parent(),t(n,r,i),e.push(n,"move",rt(o))},leave:function(t,n){return e.push(t,"leave",rt(n),function(){t.remove()})},addClass:function(t,n,r){return r=rt(r),r.addClass=et(r.addclass,n),e.push(t,"addClass",r)},removeClass:function(t,n,r){return r=rt(r),r.removeClass=et(r.removeClass,n),e.push(t,"removeClass",r)},setClass:function(t,n,r,i){return i=rt(i),i.addClass=et(i.addClass,n),i.removeClass=et(i.removeClass,r),e.push(t,"setClass",i)},animate:function(t,n,r,i,o){return o=rt(o),o.from=o.from?f(o.from,n):n,o.to=o.to?f(o.to,r):r,i=i||"ng-inline-animate",o.tempClasses=et(o.tempClasses,i),e.push(t,"animate",o)}}}]}],Ai=function(){this.$get=["$$rAF","$q",function(e,t){var n=function(){};return n.prototype={done:function(e){this.defer&&this.defer[e===!0?"reject":"resolve"]()},end:function(){this.done()},cancel:function(){this.done(!0)},getPromise:function(){return this.defer||(this.defer=t.defer()),this.defer.promise},then:function(e,t){return this.getPromise().then(e,t)},"catch":function(e){return this.getPromise()["catch"](e)},"finally":function(e){return this.getPromise()["finally"](e)}},function(t,r){function i(){return e(function(){o(),a||s.done(),a=!0}),s}function o(){r.addClass&&(t.addClass(r.addClass),r.addClass=null),r.removeClass&&(t.removeClass(r.removeClass),r.removeClass=null),r.to&&(t.css(r.to),r.to=null)}r.from&&(t.css(r.from),r.from=null);var a,s=new n;return{start:i,end:i}}}]},Oi=r("$compile");ut.$inject=["$provide","$$sanitizeUriProvider"];var Mi=/^((?:x|data)[\:\-_])/i,Ti=r("$controller"),Ni=/^(\S+)(\s+as\s+(\w+))?$/,Vi=function(){this.$get=["$document",function(e){return function(t){return t?!t.nodeType&&t instanceof Er&&(t=t[0]):t=e[0].body,t.offsetWidth+1}}]},ji="application/json",Pi={"Content-Type":ji+";charset=utf-8"},Di=/^\[|^\{(?!\{)/,Ii={"[":/]$/,"{":/}$/},Ri=/^\)\]\}',?\n/,_i=r("$http"),qi=function(e){return function(){throw _i("legacy","The method `{0}` on the promise returned from `$http` has been disabled.",e)}},Fi=jr.$interpolateMinErr=r("$interpolate");Fi.throwNoconcat=function(e){throw Fi("noconcat","Error while interpolating: {0}\nStrict Contextual Escaping disallows interpolations that concatenate multiple expressions when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce",e)},Fi.interr=function(e,t){return Fi("interr","Can't interpolate: {0}\n{1}",e,t.toString())};var Ui=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,Bi={http:80,https:443,ftp:21},Hi=r("$location"),Li={$$html5:!1,$$replace:!1,absUrl:Bt("$$absUrl"),url:function(e){if(y(e))return this.$$url;var t=Ui.exec(e);return(t[1]||""===e)&&this.path(decodeURIComponent(t[1])),(t[2]||t[1]||""===e)&&this.search(t[3]||""),this.hash(t[5]||""),this},protocol:Bt("$$protocol"),host:Bt("$$host"),port:Bt("$$port"),path:Ht("$$path",function(e){return e=null!==e?e.toString():"","/"==e.charAt(0)?e:"/"+e}),search:function(e,t){switch(arguments.length){case 0:return this.$$search;case 1:if(S(e)||E(e))e=e.toString(),this.$$search=ee(e);else{if(!w(e))throw Hi("isrcharg","The first argument of the `$location#search()` call must be a string or an object.");e=F(e,{}),o(e,function(t,n){null==t&&delete e[n]}),this.$$search=e}break;default:y(t)||null===t?delete this.$$search[e]:this.$$search[e]=t}return this.$$compose(),this},hash:Ht("$$hash",function(e){return null!==e?e.toString():""}),replace:function(){return this.$$replace=!0,this}};o([Ut,Ft,qt],function(e){e.prototype=Object.create(Li),e.prototype.state=function(t){if(!arguments.length)return this.$$state;if(e!==qt||!this.$$html5)throw Hi("nostate","History API state support is available only in HTML5 mode and only in browsers supporting HTML5 History API");return this.$$state=y(t)?null:t,this}});var zi=r("$parse"),Wi=Function.prototype.call,Gi=Function.prototype.apply,Yi=Function.prototype.bind,Ji=ve();o("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(e){Ji[e]=!0});var Ki={n:"\n",f:"\f",r:"\r",t:"	",v:"\x0B","'":"'",'"':'"'},Zi=function(e){this.options=e};Zi.prototype={constructor:Zi,lex:function(e){for(this.text=e,this.index=0,this.tokens=[];this.index<this.text.length;){var t=this.text.charAt(this.index);if('"'===t||"'"===t)this.readString(t);else if(this.isNumber(t)||"."===t&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(t))this.readIdent();else if(this.is(t,"(){}[].,;:?"))this.tokens.push({index:this.index,text:t}),this.index++;else if(this.isWhitespace(t))this.index++;else{var n=t+this.peek(),r=n+this.peek(2),i=Ji[t],o=Ji[n],a=Ji[r];if(i||o||a){var s=a?r:o?n:t;this.tokens.push({index:this.index,text:s,operator:!0}),this.index+=s.length}else this.throwError("Unexpected next character ",this.index,this.index+1)}}return this.tokens},is:function(e,t){return-1!==t.indexOf(e)},peek:function(e){var t=e||1;return this.index+t<this.text.length?this.text.charAt(this.index+t):!1},isNumber:function(e){return e>="0"&&"9">=e&&"string"==typeof e},isWhitespace:function(e){return" "===e||"\r"===e||"	"===e||"\n"===e||"\x0B"===e||" "===e},isIdent:function(e){return e>="a"&&"z">=e||e>="A"&&"Z">=e||"_"===e||"$"===e},isExpOperator:function(e){return"-"===e||"+"===e||this.isNumber(e)},throwError:function(e,t,n){n=n||this.index;var r=b(t)?"s "+t+"-"+this.index+" ["+this.text.substring(t,n)+"]":" "+n;throw zi("lexerr","Lexer Error: {0} at column{1} in expression [{2}].",e,r,this.text)},readNumber:function(){for(var e="",t=this.index;this.index<this.text.length;){var n=gr(this.text.charAt(this.index));if("."==n||this.isNumber(n))e+=n;else{var r=this.peek();if("e"==n&&this.isExpOperator(r))e+=n;else if(this.isExpOperator(n)&&r&&this.isNumber(r)&&"e"==e.charAt(e.length-1))e+=n;else{if(!this.isExpOperator(n)||r&&this.isNumber(r)||"e"!=e.charAt(e.length-1))break;this.throwError("Invalid exponent")}}this.index++}this.tokens.push({index:t,text:e,constant:!0,value:Number(e)})},readIdent:function(){for(var e=this.index;this.index<this.text.length;){var t=this.text.charAt(this.index);if(!this.isIdent(t)&&!this.isNumber(t))break;this.index++}this.tokens.push({index:e,text:this.text.slice(e,this.index),identifier:!0})},readString:function(e){var t=this.index;this.index++;for(var n="",r=e,i=!1;this.index<this.text.length;){var o=this.text.charAt(this.index);if(r+=o,i){if("u"===o){var a=this.text.substring(this.index+1,this.index+5);a.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+a+"]"),this.index+=4,n+=String.fromCharCode(parseInt(a,16))}else{var s=Ki[o];n+=s||o}i=!1}else if("\\"===o)i=!0;else{if(o===e)return this.index++,void this.tokens.push({index:t,text:r,constant:!0,value:n});n+=o}this.index++}this.throwError("Unterminated quote",t)}};var Xi=function(e,t){this.lexer=e,this.options=t};Xi.Program="Program",Xi.ExpressionStatement="ExpressionStatement",Xi.AssignmentExpression="AssignmentExpression",Xi.ConditionalExpression="ConditionalExpression",Xi.LogicalExpression="LogicalExpression",Xi.BinaryExpression="BinaryExpression",Xi.UnaryExpression="UnaryExpression",Xi.CallExpression="CallExpression",Xi.MemberExpression="MemberExpression",Xi.Identifier="Identifier",Xi.Literal="Literal",Xi.ArrayExpression="ArrayExpression",Xi.Property="Property",Xi.ObjectExpression="ObjectExpression",Xi.ThisExpression="ThisExpression",Xi.NGValueParameter="NGValueParameter",Xi.prototype={ast:function(e){this.text=e,this.tokens=this.lexer.lex(e);var t=this.program();return 0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]),t},program:function(){for(var e=[];;)if(this.tokens.length>0&&!this.peek("}",")",";","]")&&e.push(this.expressionStatement()),!this.expect(";"))return{type:Xi.Program,body:e}},expressionStatement:function(){return{type:Xi.ExpressionStatement,expression:this.filterChain()}},filterChain:function(){for(var e,t=this.expression();e=this.expect("|");)t=this.filter(t);return t},expression:function(){return this.assignment()},assignment:function(){var e=this.ternary();return this.expect("=")&&(e={type:Xi.AssignmentExpression,left:e,right:this.assignment(),operator:"="}),e},ternary:function(){var e,t,n=this.logicalOR();return this.expect("?")&&(e=this.expression(),this.consume(":"))?(t=this.expression(),{type:Xi.ConditionalExpression,test:n,alternate:e,consequent:t}):n},logicalOR:function(){for(var e=this.logicalAND();this.expect("||");)e={type:Xi.LogicalExpression,operator:"||",left:e,right:this.logicalAND()};return e},logicalAND:function(){for(var e=this.equality();this.expect("&&");)e={type:Xi.LogicalExpression,operator:"&&",left:e,right:this.equality()};return e},equality:function(){for(var e,t=this.relational();e=this.expect("==","!=","===","!==");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.relational()};return t},relational:function(){for(var e,t=this.additive();e=this.expect("<",">","<=",">=");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.additive()};return t},additive:function(){for(var e,t=this.multiplicative();e=this.expect("+","-");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.multiplicative()};return t},multiplicative:function(){for(var e,t=this.unary();e=this.expect("*","/","%");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.unary()};return t},unary:function(){var e;return(e=this.expect("+","-","!"))?{type:Xi.UnaryExpression,operator:e.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var e;this.expect("(")?(e=this.filterChain(),this.consume(")")):this.expect("[")?e=this.arrayDeclaration():this.expect("{")?e=this.object():this.constants.hasOwnProperty(this.peek().text)?e=F(this.constants[this.consume().text]):this.peek().identifier?e=this.identifier():this.peek().constant?e=this.constant():this.throwError("not a primary expression",this.peek());for(var t;t=this.expect("(","[",".");)"("===t.text?(e={type:Xi.CallExpression,callee:e,arguments:this.parseArguments()},this.consume(")")):"["===t.text?(e={type:Xi.MemberExpression,object:e,property:this.expression(),computed:!0},this.consume("]")):"."===t.text?e={type:Xi.MemberExpression,object:e,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");return e},filter:function(e){for(var t=[e],n={type:Xi.CallExpression,callee:this.identifier(),arguments:t,filter:!0};this.expect(":");)t.push(this.expression());return n},parseArguments:function(){var e=[];if(")"!==this.peekToken().text)do e.push(this.expression());while(this.expect(","));return e},identifier:function(){var e=this.consume();return e.identifier||this.throwError("is not a valid identifier",e),{type:Xi.Identifier,name:e.text}},constant:function(){return{type:Xi.Literal,value:this.consume().value}},arrayDeclaration:function(){var e=[];if("]"!==this.peekToken().text)do{if(this.peek("]"))break;e.push(this.expression())}while(this.expect(","));return this.consume("]"),{type:Xi.ArrayExpression,elements:e}},object:function(){var e,t=[];if("}"!==this.peekToken().text)do{if(this.peek("}"))break;e={type:Xi.Property,kind:"init"},this.peek().constant?e.key=this.constant():this.peek().identifier?e.key=this.identifier():this.throwError("invalid key",this.peek()),this.consume(":"),e.value=this.expression(),t.push(e)}while(this.expect(","));return this.consume("}"),{type:Xi.ObjectExpression,properties:t}},throwError:function(e,t){throw zi("syntax","Syntax Error: Token '{0}' {1} at column {2} of the expression [{3}] starting at [{4}].",t.text,e,t.index+1,this.text,this.text.substring(t.index))},consume:function(e){if(0===this.tokens.length)throw zi("ueoe","Unexpected end of expression: {0}",this.text);var t=this.expect(e);return t||this.throwError("is unexpected, expecting ["+e+"]",this.peek()),t},peekToken:function(){if(0===this.tokens.length)throw zi("ueoe","Unexpected end of expression: {0}",this.text);return this.tokens[0]},peek:function(e,t,n,r){return this.peekAhead(0,e,t,n,r)},peekAhead:function(e,t,n,r,i){if(this.tokens.length>e){var o=this.tokens[e],a=o.text;if(a===t||a===n||a===r||a===i||!t&&!n&&!r&&!i)return o}return!1},expect:function(e,t,n,r){var i=this.peek(e,t,n,r);return i?(this.tokens.shift(),i):!1},constants:{"true":{type:Xi.Literal,value:!0},"false":{type:Xi.Literal,value:!1},"null":{type:Xi.Literal,value:null},undefined:{type:Xi.Literal,value:n},"this":{type:Xi.ThisExpression}}},on.prototype={compile:function(e,t){var r=this,i=this.astBuilder.ast(e);this.state={nextId:0,filters:{},expensiveChecks:t,fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]},Xt(i,r.$filter);var a,s="";if(this.stage="assign",a=tn(i)){this.state.computing="assign";var u=this.nextId();this.recurse(a,u),this.return_(u),s="fn.assign="+this.generateFunction("assign","s,v,l")}var c=Qt(i.body);r.stage="inputs",o(c,function(e,t){var n="fn"+t;r.state[n]={vars:[],body:[],own:{}},r.state.computing=n;var i=r.nextId();r.recurse(e,i),r.return_(i),r.state.inputs.push(n),e.watchId=t}),this.state.computing="fn",this.stage="main",this.recurse(i);var l='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+s+this.watchFns()+"return fn;",f=new Function("$filter","ensureSafeMemberName","ensureSafeObject","ensureSafeFunction","ifDefined","plus","text",l)(this.$filter,Wt,Gt,Yt,Jt,Kt,e);return this.state=this.stage=n,f.literal=nn(i),f.constant=rn(i),f},USE:"use",STRICT:"strict",watchFns:function(){var e=[],t=this.state.inputs,n=this;return o(t,function(t){e.push("var "+t+"="+n.generateFunction(t,"s"))}),t.length&&e.push("fn.inputs=["+t.join(",")+"];"),e.join("")},generateFunction:function(e,t){return"function("+t+"){"+this.varsPrefix(e)+this.body(e)+"};"},filterPrefix:function(){var e=[],t=this;return o(this.state.filters,function(n,r){e.push(n+"=$filter("+t.escape(r)+")")}),e.length?"var "+e.join(",")+";":""},varsPrefix:function(e){return this.state[e].vars.length?"var "+this.state[e].vars.join(",")+";":""},body:function(e){return this.state[e].body.join("")},recurse:function(e,t,r,i,a,s){var u,c,l,f,h=this;if(i=i||$,!s&&b(e.watchId))return t=t||this.nextId(),void this.if_("i",this.lazyAssign(t,this.computedMember("i",e.watchId)),this.lazyRecurse(e,t,r,i,a,!0));switch(e.type){case Xi.Program:o(e.body,function(t,r){h.recurse(t.expression,n,n,function(e){c=e}),r!==e.body.length-1?h.current().body.push(c,";"):h.return_(c)});break;case Xi.Literal:f=this.escape(e.value),this.assign(t,f),i(f);break;case Xi.UnaryExpression:this.recurse(e.argument,n,n,function(e){c=e}),f=e.operator+"("+this.ifDefined(c,0)+")",this.assign(t,f),i(f);break;case Xi.BinaryExpression:this.recurse(e.left,n,n,function(e){u=e}),this.recurse(e.right,n,n,function(e){c=e}),f="+"===e.operator?this.plus(u,c):"-"===e.operator?this.ifDefined(u,0)+e.operator+this.ifDefined(c,0):"("+u+")"+e.operator+"("+c+")",this.assign(t,f),i(f);break;case Xi.LogicalExpression:t=t||this.nextId(),h.recurse(e.left,t),h.if_("&&"===e.operator?t:h.not(t),h.lazyRecurse(e.right,t)),i(t);break;case Xi.ConditionalExpression:t=t||this.nextId(),h.recurse(e.test,t),h.if_(t,h.lazyRecurse(e.alternate,t),h.lazyRecurse(e.consequent,t)),i(t);break;case Xi.Identifier:t=t||this.nextId(),r&&(r.context="inputs"===h.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",e.name)+"?l:s"),r.computed=!1,r.name=e.name),Wt(e.name),h.if_("inputs"===h.stage||h.not(h.getHasOwnProperty("l",e.name)),function(){h.if_("inputs"===h.stage||"s",function(){a&&1!==a&&h.if_(h.not(h.nonComputedMember("s",e.name)),h.lazyAssign(h.nonComputedMember("s",e.name),"{}")),h.assign(t,h.nonComputedMember("s",e.name))})},t&&h.lazyAssign(t,h.nonComputedMember("l",e.name))),(h.state.expensiveChecks||sn(e.name))&&h.addEnsureSafeObject(t),i(t);break;case Xi.MemberExpression:u=r&&(r.context=this.nextId())||this.nextId(),t=t||this.nextId(),h.recurse(e.object,u,n,function(){h.if_(h.notNull(u),function(){e.computed?(c=h.nextId(),h.recurse(e.property,c),h.addEnsureSafeMemberName(c),a&&1!==a&&h.if_(h.not(h.computedMember(u,c)),h.lazyAssign(h.computedMember(u,c),"{}")),f=h.ensureSafeObject(h.computedMember(u,c)),h.assign(t,f),r&&(r.computed=!0,r.name=c)):(Wt(e.property.name),a&&1!==a&&h.if_(h.not(h.nonComputedMember(u,e.property.name)),h.lazyAssign(h.nonComputedMember(u,e.property.name),"{}")),f=h.nonComputedMember(u,e.property.name),(h.state.expensiveChecks||sn(e.property.name))&&(f=h.ensureSafeObject(f)),h.assign(t,f),r&&(r.computed=!1,r.name=e.property.name))},function(){h.assign(t,"undefined")}),i(t)},!!a);break;case Xi.CallExpression:t=t||this.nextId(),e.filter?(c=h.filter(e.callee.name),l=[],o(e.arguments,function(e){var t=h.nextId();h.recurse(e,t),l.push(t)}),f=c+"("+l.join(",")+")",h.assign(t,f),i(t)):(c=h.nextId(),u={},l=[],h.recurse(e.callee,c,u,function(){h.if_(h.notNull(c),function(){h.addEnsureSafeFunction(c),o(e.arguments,function(e){h.recurse(e,h.nextId(),n,function(e){l.push(h.ensureSafeObject(e))})}),u.name?(h.state.expensiveChecks||h.addEnsureSafeObject(u.context),f=h.member(u.context,u.name,u.computed)+"("+l.join(",")+")"):f=c+"("+l.join(",")+")",f=h.ensureSafeObject(f),h.assign(t,f)},function(){h.assign(t,"undefined")}),i(t)}));break;case Xi.AssignmentExpression:if(c=this.nextId(),u={},!en(e.left))throw zi("lval","Trying to assing a value to a non l-value");this.recurse(e.left,n,u,function(){h.if_(h.notNull(u.context),function(){h.recurse(e.right,c),h.addEnsureSafeObject(h.member(u.context,u.name,u.computed)),f=h.member(u.context,u.name,u.computed)+e.operator+c,h.assign(t,f),i(t||f)})},1);break;case Xi.ArrayExpression:l=[],o(e.elements,function(e){h.recurse(e,h.nextId(),n,function(e){l.push(e)})}),f="["+l.join(",")+"]",this.assign(t,f),i(f);break;case Xi.ObjectExpression:l=[],o(e.properties,function(e){h.recurse(e.value,h.nextId(),n,function(t){l.push(h.escape(e.key.type===Xi.Identifier?e.key.name:""+e.key.value)+":"+t)})}),f="{"+l.join(",")+"}",this.assign(t,f),i(f);break;case Xi.ThisExpression:this.assign(t,"s"),i("s");break;case Xi.NGValueParameter:this.assign(t,"v"),i("v")}},getHasOwnProperty:function(e,t){var n=e+"."+t,r=this.current().own;return r.hasOwnProperty(n)||(r[n]=this.nextId(!1,e+"&&("+this.escape(t)+" in "+e+")")),r[n]},assign:function(e,t){return e?(this.current().body.push(e,"=",t,";"),e):void 0},filter:function(e){return this.state.filters.hasOwnProperty(e)||(this.state.filters[e]=this.nextId(!0)),this.state.filters[e]},ifDefined:function(e,t){return"ifDefined("+e+","+this.escape(t)+")"},plus:function(e,t){return"plus("+e+","+t+")"},return_:function(e){this.current().body.push("return ",e,";")},if_:function(e,t,n){if(e===!0)t();else{var r=this.current().body;r.push("if(",e,"){"),t(),r.push("}"),n&&(r.push("else{"),n(),r.push("}"))}},not:function(e){return"!("+e+")"},notNull:function(e){return e+"!=null"},nonComputedMember:function(e,t){return e+"."+t},computedMember:function(e,t){return e+"["+t+"]"},member:function(e,t,n){return n?this.computedMember(e,t):this.nonComputedMember(e,t)},addEnsureSafeObject:function(e){this.current().body.push(this.ensureSafeObject(e),";")},addEnsureSafeMemberName:function(e){this.current().body.push(this.ensureSafeMemberName(e),";")},addEnsureSafeFunction:function(e){this.current().body.push(this.ensureSafeFunction(e),";")},ensureSafeObject:function(e){return"ensureSafeObject("+e+",text)"},ensureSafeMemberName:function(e){return"ensureSafeMemberName("+e+",text)"},ensureSafeFunction:function(e){return"ensureSafeFunction("+e+",text)"},lazyRecurse:function(e,t,n,r,i,o){var a=this;return function(){a.recurse(e,t,n,r,i,o)}},lazyAssign:function(e,t){var n=this;return function(){n.assign(e,t)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(e){return"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)},escape:function(e){if(S(e))return"'"+e.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(E(e))return e.toString();if(e===!0)return"true";if(e===!1)return"false";if(null===e)return"null";if("undefined"==typeof e)return"undefined";throw zi("esc","IMPOSSIBLE")},nextId:function(e,t){var n="v"+this.state.nextId++;return e||this.current().vars.push(n+(t?"="+t:"")),n},current:function(){return this.state[this.state.computing]}},an.prototype={compile:function(e,t){var n=this,r=this.astBuilder.ast(e);this.expression=e,this.expensiveChecks=t,Xt(r,n.$filter);var i,a;(i=tn(r))&&(a=this.recurse(i));var s,u=Qt(r.body);u&&(s=[],o(u,function(e,t){var r=n.recurse(e);e.input=r,s.push(r),e.watchId=t}));var c=[];o(r.body,function(e){c.push(n.recurse(e.expression))});var l=0===r.body.length?function(){}:1===r.body.length?c[0]:function(e,t){var n;return o(c,function(r){n=r(e,t)}),n};return a&&(l.assign=function(e,t,n){return a(e,n,t)}),s&&(l.inputs=s),l.literal=nn(r),l.constant=rn(r),l},recurse:function(e,t,r){var i,a,s,u=this;if(e.input)return this.inputs(e.input,e.watchId);switch(e.type){case Xi.Literal:return this.value(e.value,t);case Xi.UnaryExpression:return a=this.recurse(e.argument),this["unary"+e.operator](a,t);case Xi.BinaryExpression:return i=this.recurse(e.left),a=this.recurse(e.right),this["binary"+e.operator](i,a,t);case Xi.LogicalExpression:return i=this.recurse(e.left),a=this.recurse(e.right),this["binary"+e.operator](i,a,t);case Xi.ConditionalExpression:return this["ternary?:"](this.recurse(e.test),this.recurse(e.alternate),this.recurse(e.consequent),t);case Xi.Identifier:return Wt(e.name,u.expression),u.identifier(e.name,u.expensiveChecks||sn(e.name),t,r,u.expression);case Xi.MemberExpression:return i=this.recurse(e.object,!1,!!r),e.computed||(Wt(e.property.name,u.expression),a=e.property.name),e.computed&&(a=this.recurse(e.property)),e.computed?this.computedMember(i,a,t,r,u.expression):this.nonComputedMember(i,a,u.expensiveChecks,t,r,u.expression);case Xi.CallExpression:return s=[],o(e.arguments,function(e){s.push(u.recurse(e))}),e.filter&&(a=this.$filter(e.callee.name)),e.filter||(a=this.recurse(e.callee,!0)),e.filter?function(e,r,i,o){for(var u=[],c=0;c<s.length;++c)u.push(s[c](e,r,i,o));var l=a.apply(n,u,o);return t?{context:n,name:n,value:l}:l}:function(e,n,r,i){var o,c=a(e,n,r,i);if(null!=c.value){Gt(c.context,u.expression),Yt(c.value,u.expression);for(var l=[],f=0;f<s.length;++f)l.push(Gt(s[f](e,n,r,i),u.expression));o=Gt(c.value.apply(c.context,l),u.expression)}return t?{value:o}:o};case Xi.AssignmentExpression:return i=this.recurse(e.left,!0,1),a=this.recurse(e.right),function(e,n,r,o){var s=i(e,n,r,o),c=a(e,n,r,o);return Gt(s.value,u.expression),s.context[s.name]=c,t?{value:c}:c};case Xi.ArrayExpression:return s=[],o(e.elements,function(e){s.push(u.recurse(e))}),function(e,n,r,i){for(var o=[],a=0;a<s.length;++a)o.push(s[a](e,n,r,i));return t?{value:o}:o};case Xi.ObjectExpression:return s=[],o(e.properties,function(e){s.push({key:e.key.type===Xi.Identifier?e.key.name:""+e.key.value,value:u.recurse(e.value)})}),function(e,n,r,i){for(var o={},a=0;a<s.length;++a)o[s[a].key]=s[a].value(e,n,r,i);return t?{value:o}:o};case Xi.ThisExpression:return function(e){return t?{value:e}:e};case Xi.NGValueParameter:return function(e,n,r,i){return t?{value:r}:r}}},"unary+":function(e,t){return function(n,r,i,o){var a=e(n,r,i,o);return a=b(a)?+a:0,t?{value:a}:a}},"unary-":function(e,t){return function(n,r,i,o){var a=e(n,r,i,o);return a=b(a)?-a:0,t?{value:a}:a}},"unary!":function(e,t){return function(n,r,i,o){var a=!e(n,r,i,o);return t?{value:a}:a}},"binary+":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a),u=t(r,i,o,a),c=Kt(s,u);return n?{value:c}:c}},"binary-":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a),u=t(r,i,o,a),c=(b(s)?s:0)-(b(u)?u:0);return n?{value:c}:c}},"binary*":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)*t(r,i,o,a);return n?{value:s}:s}},"binary/":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)/t(r,i,o,a);return n?{value:s}:s}},"binary%":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)%t(r,i,o,a);return n?{value:s}:s}},"binary===":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)===t(r,i,o,a);return n?{value:s}:s}},"binary!==":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)!==t(r,i,o,a);return n?{value:s}:s}},"binary==":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)==t(r,i,o,a);return n?{value:s}:s}},"binary!=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)!=t(r,i,o,a);return n?{value:s}:s}},"binary<":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)<t(r,i,o,a);return n?{value:s}:s}},"binary>":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)>t(r,i,o,a);return n?{value:s}:s}},"binary<=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)<=t(r,i,o,a);return n?{value:s}:s}},"binary>=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)>=t(r,i,o,a);return n?{value:s}:s}},"binary&&":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)&&t(r,i,o,a);return n?{value:s}:s}},"binary||":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)||t(r,i,o,a);return n?{value:s}:s}},"ternary?:":function(e,t,n,r){return function(i,o,a,s){var u=e(i,o,a,s)?t(i,o,a,s):n(i,o,a,s);return r?{value:u}:u}},value:function(e,t){return function(){return t?{context:n,name:n,value:e}:e}},identifier:function(e,t,r,i,o){return function(a,s,u,c){var l=s&&e in s?s:a;i&&1!==i&&l&&!l[e]&&(l[e]={});var f=l?l[e]:n;return t&&Gt(f,o),r?{context:l,name:e,value:f}:f}},computedMember:function(e,t,n,r,i){return function(o,a,s,u){var c,l,f=e(o,a,s,u);return null!=f&&(c=t(o,a,s,u),Wt(c,i),r&&1!==r&&f&&!f[c]&&(f[c]={}),l=f[c],Gt(l,i)),n?{context:f,name:c,value:l}:l}},nonComputedMember:function(e,t,r,i,o,a){return function(s,u,c,l){var f=e(s,u,c,l);o&&1!==o&&f&&!f[t]&&(f[t]={});var h=null!=f?f[t]:n;return(r||sn(t))&&Gt(h,a),i?{context:f,name:t,value:h}:h}},inputs:function(e,t){return function(n,r,i,o){return o?o[t]:e(n,r,i)}}};var Qi=function(e,t,n){this.lexer=e,this.$filter=t,this.options=n,this.ast=new Xi(this.lexer),this.astCompiler=n.csp?new an(this.ast,t):new on(this.ast,t)};Qi.prototype={constructor:Qi,parse:function(e){return this.astCompiler.compile(e,this.options.expensiveChecks)}};var eo=(ve(),ve(),Object.prototype.valueOf),to=r("$sce"),no={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Oi=r("$compile"),ro=t.createElement("a"),io=En(e.location.href);An.$inject=["$document"],Mn.$inject=["$provide"],Pn.$inject=["$locale"],Dn.$inject=["$locale"];var oo=".",ao={yyyy:_n("FullYear",4),yy:_n("FullYear",2,0,!0),y:_n("FullYear",1),MMMM:qn("Month"),MMM:qn("Month",!0),MM:_n("Month",2,1),M:_n("Month",1,1),dd:_n("Date",2),d:_n("Date",1),HH:_n("Hours",2),H:_n("Hours",1),hh:_n("Hours",2,-12),h:_n("Hours",1,-12),mm:_n("Minutes",2),m:_n("Minutes",1),ss:_n("Seconds",2),s:_n("Seconds",1),sss:_n("Milliseconds",3),EEEE:qn("Day"),EEE:qn("Day",!0),a:Ln,Z:Fn,ww:Hn(2),w:Hn(1),G:zn,GG:zn,GGG:zn,GGGG:Wn},so=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,uo=/^\-?\d+$/;Gn.$inject=["$locale"];var co=m(gr),lo=m(br);
+Kn.$inject=["$parse"];var fo=m({restrict:"E",compile:function(e,t){return t.href||t.xlinkHref?void 0:function(e,t){if("a"===t[0].nodeName.toLowerCase()){var n="[object SVGAnimatedString]"===Tr.call(t.prop("href"))?"xlink:href":"href";t.on("click",function(e){t.attr(n)||e.preventDefault()})}}}}),ho={};o(hi,function(e,t){function n(e,n,i){e.$watch(i[r],function(e){i.$set(t,!!e)})}if("multiple"!=e){var r=ct("ng-"+t),i=n;"checked"===e&&(i=function(e,t,i){i.ngModel!==i[r]&&n(e,t,i)}),ho[r]=function(){return{restrict:"A",priority:100,link:i}}}}),o(di,function(e,t){ho[t]=function(){return{priority:100,link:function(e,n,r){if("ngPattern"===t&&"/"==r.ngPattern.charAt(0)){var i=r.ngPattern.match(vr);if(i)return void r.$set("ngPattern",new RegExp(i[1],i[2]))}e.$watch(r[t],function(e){r.$set(t,e)})}}}}),o(["src","srcset","href"],function(e){var t=ct("ng-"+e);ho[t]=function(){return{priority:99,link:function(n,r,i){var o=e,a=e;"href"===e&&"[object SVGAnimatedString]"===Tr.call(r.prop("href"))&&(a="xlinkHref",i.$attr[a]="xlink:href",o=null),i.$observe(t,function(t){return t?(i.$set(a,t),void(Sr&&o&&r.prop(o,i[a]))):void("href"===e&&i.$set(a,null))})}}}});var po={$addControl:$,$$renameControl:Xn,$removeControl:$,$setValidity:$,$setDirty:$,$setPristine:$,$setSubmitted:$},$o="ng-submitted";Qn.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var vo=function(e){return["$timeout","$parse",function(t,r){function i(e){return""===e?r('this[""]').assign:r(e).assign||$}var o={name:"form",restrict:e?"EAC":"E",require:["form","^^?form"],controller:Qn,compile:function(r,o){r.addClass(Ko).addClass(Yo);var a=o.name?"name":e&&o.ngForm?"ngForm":!1;return{pre:function(e,r,o,s){var u=s[0];if(!("action"in o)){var c=function(t){e.$apply(function(){u.$commitViewValue(),u.$setSubmitted()}),t.preventDefault()};ei(r[0],"submit",c),r.on("$destroy",function(){t(function(){ti(r[0],"submit",c)},0,!1)})}var l=s[1]||u.$$parentForm;l.$addControl(u);var h=a?i(u.$name):$;a&&(h(e,u),o.$observe(a,function(t){u.$name!==t&&(h(e,n),u.$$parentForm.$$renameControl(u,t),(h=i(u.$name))(e,u))})),r.on("$destroy",function(){u.$$parentForm.$removeControl(u),h(e,n),f(u,po)})}}}};return o}]},mo=vo(),go=vo(!0),yo=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,bo=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,wo=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,xo=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,So=/^(\d{4})-(\d{2})-(\d{2})$/,Eo=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Co=/^(\d{4})-W(\d\d)$/,ko=/^(\d{4})-(\d\d)$/,Ao=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Oo={text:tr,date:or("date",So,ir(So,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":or("datetimelocal",Eo,ir(Eo,["yyyy","MM","dd","HH","mm","ss","sss"]),"yyyy-MM-ddTHH:mm:ss.sss"),time:or("time",Ao,ir(Ao,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:or("week",Co,rr,"yyyy-Www"),month:or("month",ko,ir(ko,["yyyy","MM"]),"yyyy-MM"),number:sr,url:ur,email:cr,radio:lr,checkbox:hr,hidden:$,button:$,submit:$,reset:$,file:$},Mo=["$browser","$sniffer","$filter","$parse",function(e,t,n,r){return{restrict:"E",require:["?ngModel"],link:{pre:function(i,o,a,s){s[0]&&(Oo[gr(a.type)]||Oo.text)(i,o,a,s[0],t,e,n,r)}}}}],To=/^(true|false|\d+)$/,No=function(){return{restrict:"A",priority:100,compile:function(e,t){return To.test(t.ngValue)?function(e,t,n){n.$set("value",e.$eval(n.ngValue))}:function(e,t,n){e.$watch(n.ngValue,function(e){n.$set("value",e)})}}}},Vo=["$compile",function(e){return{restrict:"AC",compile:function(t){return e.$$addBindingClass(t),function(t,n,r){e.$$addBindingInfo(n,r.ngBind),n=n[0],t.$watch(r.ngBind,function(e){n.textContent=y(e)?"":e})}}}}],jo=["$interpolate","$compile",function(e,t){return{compile:function(n){return t.$$addBindingClass(n),function(n,r,i){var o=e(r.attr(i.$attr.ngBindTemplate));t.$$addBindingInfo(r,o.expressions),r=r[0],i.$observe("ngBindTemplate",function(e){r.textContent=y(e)?"":e})}}}}],Po=["$sce","$parse","$compile",function(e,t,n){return{restrict:"A",compile:function(r,i){var o=t(i.ngBindHtml),a=t(i.ngBindHtml,function(e){return(e||"").toString()});return n.$$addBindingClass(r),function(t,r,i){n.$$addBindingInfo(r,i.ngBindHtml),t.$watch(a,function(){r.html(e.getTrustedHtml(o(t))||"")})}}}}],Do=m({restrict:"A",require:"ngModel",link:function(e,t,n,r){r.$viewChangeListeners.push(function(){e.$eval(n.ngChange)})}}),Io=pr("",!0),Ro=pr("Odd",0),_o=pr("Even",1),qo=Zn({compile:function(e,t){t.$set("ngCloak",n),e.removeClass("ng-cloak")}}),Fo=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],Uo={},Bo={blur:!0,focus:!0};o("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(e){var t=ct("ng-"+e);Uo[t]=["$parse","$rootScope",function(n,r){return{restrict:"A",compile:function(i,o){var a=n(o[t],null,!0);return function(t,n){n.on(e,function(n){var i=function(){a(t,{$event:n})};Bo[e]&&r.$$phase?t.$evalAsync(i):t.$apply(i)})}}}}]});var Ho=["$animate",function(e){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(n,r,i,o,a){var s,u,c;n.$watch(i.ngIf,function(n){n?u||a(function(n,o){u=o,n[n.length++]=t.createComment(" end ngIf: "+i.ngIf+" "),s={clone:n},e.enter(n,r.parent(),r)}):(c&&(c.remove(),c=null),u&&(u.$destroy(),u=null),s&&(c=$e(s.clone),e.leave(c).then(function(){c=null}),s=null))})}}}],Lo=["$templateRequest","$anchorScroll","$animate",function(e,t,n){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:jr.noop,compile:function(r,i){var o=i.ngInclude||i.src,a=i.onload||"",s=i.autoscroll;return function(r,i,u,c,l){var f,h,p,d=0,$=function(){h&&(h.remove(),h=null),f&&(f.$destroy(),f=null),p&&(n.leave(p).then(function(){h=null}),h=p,p=null)};r.$watch(o,function(o){var u=function(){!b(s)||s&&!r.$eval(s)||t()},h=++d;o?(e(o,!0).then(function(e){if(h===d){var t=r.$new();c.template=e;var s=l(t,function(e){$(),n.enter(e,null,i).then(u)});f=t,p=s,f.$emit("$includeContentLoaded",o),r.$eval(a)}},function(){h===d&&($(),r.$emit("$includeContentError",o))}),r.$emit("$includeContentRequested",o)):($(),c.template=null)})}}}}],zo=["$compile",function(e){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(n,r,i,o){return/SVG/.test(r[0].toString())?(r.empty(),void e(ke(o.template,t).childNodes)(n,function(e){r.append(e)},{futureParentElement:r})):(r.html(o.template),void e(r.contents())(n))}}}],Wo=Zn({priority:450,compile:function(){return{pre:function(e,t,n){e.$eval(n.ngInit)}}}}),Go=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(e,t,r,i){var a=t.attr(r.$attr.ngList)||", ",s="false"!==r.ngTrim,u=s?_r(a):a,c=function(e){if(!y(e)){var t=[];return e&&o(e.split(u),function(e){e&&t.push(s?_r(e):e)}),t}};i.$parsers.push(c),i.$formatters.push(function(e){return Ir(e)?e.join(a):n}),i.$isEmpty=function(e){return!e||!e.length}}}},Yo="ng-valid",Jo="ng-invalid",Ko="ng-pristine",Zo="ng-dirty",Xo="ng-untouched",Qo="ng-touched",ea="ng-pending",ta=r("ngModel"),na=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(e,t,r,i,a,s,u,c,l,f){this.$viewValue=Number.NaN,this.$modelValue=Number.NaN,this.$$rawModelValue=n,this.$validators={},this.$asyncValidators={},this.$parsers=[],this.$formatters=[],this.$viewChangeListeners=[],this.$untouched=!0,this.$touched=!1,this.$pristine=!0,this.$dirty=!1,this.$valid=!0,this.$invalid=!1,this.$error={},this.$$success={},this.$pending=n,this.$name=f(r.name||"",!1)(e),this.$$parentForm=po;var h,p=a(r.ngModel),d=p.assign,v=p,m=d,g=null,w=this;this.$$setOptions=function(e){if(w.$options=e,e&&e.getterSetter){var t=a(r.ngModel+"()"),n=a(r.ngModel+"($$$p)");v=function(e){var n=p(e);return k(n)&&(n=t(e)),n},m=function(e,t){k(p(e))?n(e,{$$$p:w.$modelValue}):d(e,w.$modelValue)}}else if(!p.assign)throw ta("nonassign","Expression '{0}' is non-assignable. Element: {1}",r.ngModel,X(i))},this.$render=$,this.$isEmpty=function(e){return y(e)||""===e||null===e||e!==e};var x=0;dr({ctrl:this,$element:i,set:function(e,t){e[t]=!0},unset:function(e,t){delete e[t]},$animate:s}),this.$setPristine=function(){w.$dirty=!1,w.$pristine=!0,s.removeClass(i,Zo),s.addClass(i,Ko)},this.$setDirty=function(){w.$dirty=!0,w.$pristine=!1,s.removeClass(i,Ko),s.addClass(i,Zo),w.$$parentForm.$setDirty()},this.$setUntouched=function(){w.$touched=!1,w.$untouched=!0,s.setClass(i,Xo,Qo)},this.$setTouched=function(){w.$touched=!0,w.$untouched=!1,s.setClass(i,Qo,Xo)},this.$rollbackViewValue=function(){u.cancel(g),w.$viewValue=w.$$lastCommittedViewValue,w.$render()},this.$validate=function(){if(!E(w.$modelValue)||!isNaN(w.$modelValue)){var e=w.$$lastCommittedViewValue,t=w.$$rawModelValue,r=w.$valid,i=w.$modelValue,o=w.$options&&w.$options.allowInvalid;w.$$runValidators(t,e,function(e){o||r===e||(w.$modelValue=e?t:n,w.$modelValue!==i&&w.$$writeModelToScope())})}},this.$$runValidators=function(e,t,r){function i(){var e=w.$$parserName||"parse";return y(h)?(u(e,null),!0):(h||(o(w.$validators,function(e,t){u(t,null)}),o(w.$asyncValidators,function(e,t){u(t,null)})),u(e,h),h)}function a(){var n=!0;return o(w.$validators,function(r,i){var o=r(e,t);n=n&&o,u(i,o)}),n?!0:(o(w.$asyncValidators,function(e,t){u(t,null)}),!1)}function s(){var r=[],i=!0;o(w.$asyncValidators,function(o,a){var s=o(e,t);if(!P(s))throw ta("$asyncValidators","Expected asynchronous validator to return a promise but got '{0}' instead.",s);u(a,n),r.push(s.then(function(){u(a,!0)},function(e){i=!1,u(a,!1)}))}),r.length?l.all(r).then(function(){c(i)},$):c(!0)}function u(e,t){f===x&&w.$setValidity(e,t)}function c(e){f===x&&r(e)}x++;var f=x;return i()&&a()?void s():void c(!1)},this.$commitViewValue=function(){var e=w.$viewValue;u.cancel(g),(w.$$lastCommittedViewValue!==e||""===e&&w.$$hasNativeValidators)&&(w.$$lastCommittedViewValue=e,w.$pristine&&this.$setDirty(),this.$$parseAndValidate())},this.$$parseAndValidate=function(){function t(){w.$modelValue!==a&&w.$$writeModelToScope()}var r=w.$$lastCommittedViewValue,i=r;if(h=y(i)?n:!0)for(var o=0;o<w.$parsers.length;o++)if(i=w.$parsers[o](i),y(i)){h=!1;break}E(w.$modelValue)&&isNaN(w.$modelValue)&&(w.$modelValue=v(e));var a=w.$modelValue,s=w.$options&&w.$options.allowInvalid;w.$$rawModelValue=i,s&&(w.$modelValue=i,t()),w.$$runValidators(i,w.$$lastCommittedViewValue,function(e){s||(w.$modelValue=e?i:n,t())})},this.$$writeModelToScope=function(){m(e,w.$modelValue),o(w.$viewChangeListeners,function(e){try{e()}catch(n){t(n)}})},this.$setViewValue=function(e,t){w.$viewValue=e,w.$options&&!w.$options.updateOnDefault||w.$$debounceViewValueCommit(t)},this.$$debounceViewValueCommit=function(t){var n,r=0,i=w.$options;i&&b(i.debounce)&&(n=i.debounce,E(n)?r=n:E(n[t])?r=n[t]:E(n["default"])&&(r=n["default"])),u.cancel(g),r?g=u(function(){w.$commitViewValue()},r):c.$$phase?w.$commitViewValue():e.$apply(function(){w.$commitViewValue()})},e.$watch(function(){var t=v(e);if(t!==w.$modelValue&&(w.$modelValue===w.$modelValue||t===t)){w.$modelValue=w.$$rawModelValue=t,h=n;for(var r=w.$formatters,i=r.length,o=t;i--;)o=r[i](o);w.$viewValue!==o&&(w.$viewValue=w.$$lastCommittedViewValue=o,w.$render(),w.$$runValidators(t,o,$))}return t})}],ra=["$rootScope",function(e){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:na,priority:1,compile:function(t){return t.addClass(Ko).addClass(Xo).addClass(Yo),{pre:function(e,t,n,r){var i=r[0],o=r[1]||i.$$parentForm;i.$$setOptions(r[2]&&r[2].$options),o.$addControl(i),n.$observe("name",function(e){i.$name!==e&&i.$$parentForm.$$renameControl(i,e)}),e.$on("$destroy",function(){i.$$parentForm.$removeControl(i)})},post:function(t,n,r,i){var o=i[0];o.$options&&o.$options.updateOn&&n.on(o.$options.updateOn,function(e){o.$$debounceViewValueCommit(e&&e.type)}),n.on("blur",function(n){o.$touched||(e.$$phase?t.$evalAsync(o.$setTouched):t.$apply(o.$setTouched))})}}}}}],ia=/(\s+|^)default(\s+|$)/,oa=function(){return{restrict:"A",controller:["$scope","$attrs",function(e,t){var n=this;this.$options=F(e.$eval(t.ngModelOptions)),b(this.$options.updateOn)?(this.$options.updateOnDefault=!1,this.$options.updateOn=_r(this.$options.updateOn.replace(ia,function(){return n.$options.updateOnDefault=!0," "}))):this.$options.updateOnDefault=!0}]}},aa=Zn({terminal:!0,priority:1e3}),sa=r("ngOptions"),ua=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,ca=["$compile","$parse",function(e,n){function r(e,t,r){function o(e,t,n,r,i){this.selectValue=e,this.viewValue=t,this.label=n,this.group=r,this.disabled=i}function a(e){var t;if(!c&&i(e))t=e;else{t=[];for(var n in e)e.hasOwnProperty(n)&&"$"!==n.charAt(0)&&t.push(n)}return t}var s=e.match(ua);if(!s)throw sa("iexp","Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_' but got '{0}'. Element: {1}",e,X(t));var u=s[5]||s[7],c=s[6],l=/ as /.test(s[0])&&s[1],f=s[9],h=n(s[2]?s[1]:u),p=l&&n(l),d=p||h,$=f&&n(f),v=f?function(e,t){return $(r,t)}:function(e){return Ye(e)},m=function(e,t){return v(e,S(e,t))},g=n(s[2]||s[1]),y=n(s[3]||""),b=n(s[4]||""),w=n(s[8]),x={},S=c?function(e,t){return x[c]=t,x[u]=e,x}:function(e){return x[u]=e,x};return{trackBy:f,getTrackByValue:m,getWatchables:n(w,function(e){var t=[];e=e||[];for(var n=a(e),i=n.length,o=0;i>o;o++){var u=e===n?o:n[o],c=(e[u],S(e[u],u)),l=v(e[u],c);if(t.push(l),s[2]||s[1]){var f=g(r,c);t.push(f)}if(s[4]){var h=b(r,c);t.push(h)}}return t}),getOptions:function(){for(var e=[],t={},n=w(r)||[],i=a(n),s=i.length,u=0;s>u;u++){var c=n===i?u:i[u],l=n[c],h=S(l,c),p=d(r,h),$=v(p,h),x=g(r,h),E=y(r,h),C=b(r,h),k=new o($,p,x,E,C);e.push(k),t[$]=k}return{items:e,selectValueMap:t,getOptionFromViewValue:function(e){return t[m(e)]},getViewValueFromOption:function(e){return f?jr.copy(e.viewValue):e.viewValue}}}}}var a=t.createElement("option"),s=t.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","?ngModel"],link:function(t,n,i,u){function c(e,t){e.element=t,t.disabled=e.disabled,e.value!==t.value&&(t.value=e.selectValue),e.label!==t.label&&(t.label=e.label,t.textContent=e.label)}function l(e,t,n,r){var i;return t&&gr(t.nodeName)===n?i=t:(i=r.cloneNode(!1),t?e.insertBefore(i,t):e.appendChild(i)),i}function f(e){for(var t;e;)t=e.nextSibling,Be(e),e=t}function h(e){var t=$&&$[0],n=x&&x[0];if(t||n)for(;e&&(e===t||e===n);)e=e.nextSibling;return e}function p(){var e=S&&v.readValue();S=E.getOptions();var t={},r=n[0].firstChild;if(w&&n.prepend($),r=h(r),S.items.forEach(function(e){var i,o,u;e.group?(i=t[e.group],i||(o=l(n[0],r,"optgroup",s),r=o.nextSibling,o.label=e.group,i=t[e.group]={groupElement:o,currentOptionElement:o.firstChild}),u=l(i.groupElement,i.currentOptionElement,"option",a),c(e,u),i.currentOptionElement=u.nextSibling):(u=l(n[0],r,"option",a),c(e,u),r=u.nextSibling)}),Object.keys(t).forEach(function(e){f(t[e].currentOptionElement)}),f(r),d.$render(),!d.$isEmpty(e)){var i=v.readValue();(E.trackBy?B(e,i):e===i)||(d.$setViewValue(i),d.$render())}}var d=u[1];if(d){for(var $,v=u[0],m=i.multiple,g=0,y=n.children(),b=y.length;b>g;g++)if(""===y[g].value){$=y.eq(g);break}var w=!!$,x=Er(a.cloneNode(!1));x.val("?");var S,E=r(i.ngOptions,n,t),C=function(){w||n.prepend($),n.val(""),$.prop("selected",!0),$.attr("selected",!0)},k=function(){w||$.remove()},A=function(){n.prepend(x),n.val("?"),x.prop("selected",!0),x.attr("selected",!0)},O=function(){x.remove()};m?(d.$isEmpty=function(e){return!e||0===e.length},v.writeValue=function(e){S.items.forEach(function(e){e.element.selected=!1}),e&&e.forEach(function(e){var t=S.getOptionFromViewValue(e);t&&!t.disabled&&(t.element.selected=!0)})},v.readValue=function(){var e=n.val()||[],t=[];return o(e,function(e){var n=S.selectValueMap[e];n&&!n.disabled&&t.push(S.getViewValueFromOption(n))}),t},E.trackBy&&t.$watchCollection(function(){return Ir(d.$viewValue)?d.$viewValue.map(function(e){return E.getTrackByValue(e)}):void 0},function(){d.$render()})):(v.writeValue=function(e){var t=S.getOptionFromViewValue(e);t&&!t.disabled?n[0].value!==t.selectValue&&(O(),k(),n[0].value=t.selectValue,t.element.selected=!0,t.element.setAttribute("selected","selected")):null===e||w?(O(),C()):(k(),A())},v.readValue=function(){var e=S.selectValueMap[n.val()];return e&&!e.disabled?(k(),O(),S.getViewValueFromOption(e)):null},E.trackBy&&t.$watch(function(){return E.getTrackByValue(d.$viewValue)},function(){d.$render()})),w?($.remove(),e($)(t),$.removeClass("ng-scope")):$=Er(a.cloneNode(!1)),p(),t.$watchCollection(E.getWatchables,p)}}}}],la=["$locale","$interpolate","$log",function(e,t,n){var r=/{}/g,i=/^when(Minus)?(.+)$/;return{link:function(a,s,u){function c(e){s.text(e||"")}var l,f=u.count,h=u.$attr.when&&s.attr(u.$attr.when),p=u.offset||0,d=a.$eval(h)||{},v={},m=t.startSymbol(),g=t.endSymbol(),b=m+f+"-"+p+g,w=jr.noop;o(u,function(e,t){var n=i.exec(t);if(n){var r=(n[1]?"-":"")+gr(n[2]);d[r]=s.attr(u.$attr[t])}}),o(d,function(e,n){v[n]=t(e.replace(r,b))}),a.$watch(f,function(t){var r=parseFloat(t),i=isNaN(r);if(i||r in d||(r=e.pluralCat(r-p)),r!==l&&!(i&&E(l)&&isNaN(l))){w();var o=v[r];y(o)?(null!=t&&n.debug("ngPluralize: no rule defined for '"+r+"' in "+h),w=$,c()):w=a.$watch(o,c),l=r}})}}}],fa=["$parse","$animate",function(e,a){var s="$$NG_REMOVED",u=r("ngRepeat"),c=function(e,t,n,r,i,o,a){e[n]=r,i&&(e[i]=o),e.$index=t,e.$first=0===t,e.$last=t===a-1,e.$middle=!(e.$first||e.$last),e.$odd=!(e.$even=0===(1&t))},l=function(e){return e.clone[0]},f=function(e){return e.clone[e.clone.length-1]};return{restrict:"A",multiElement:!0,transclude:"element",priority:1e3,terminal:!0,$$tlb:!0,compile:function(r,h){var p=h.ngRepeat,d=t.createComment(" end ngRepeat: "+p+" "),$=p.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!$)throw u("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",p);var v=$[1],m=$[2],g=$[3],y=$[4];if($=v.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/),!$)throw u("iidexp","'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",v);var b=$[3]||$[1],w=$[2];if(g&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(g)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(g)))throw u("badident","alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",g);var x,S,E,C,k={$id:Ye};return y?x=e(y):(E=function(e,t){return Ye(t)},C=function(e){return e}),function(e,t,r,h,$){x&&(S=function(t,n,r){return w&&(k[w]=t),k[b]=n,k.$index=r,x(e,k)});var v=ve();e.$watchCollection(m,function(r){var h,m,y,x,k,A,O,M,T,N,V,j,P=t[0],D=ve();if(g&&(e[g]=r),i(r))T=r,M=S||E;else{M=S||C,T=[];for(var I in r)yr.call(r,I)&&"$"!==I.charAt(0)&&T.push(I)}for(x=T.length,V=new Array(x),h=0;x>h;h++)if(k=r===T?h:T[h],A=r[k],O=M(k,A,h),v[O])N=v[O],delete v[O],D[O]=N,V[h]=N;else{if(D[O])throw o(V,function(e){e&&e.scope&&(v[e.id]=e)}),u("dupes","Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",p,O,A);V[h]={id:O,scope:n,clone:n},D[O]=!0}for(var R in v){if(N=v[R],j=$e(N.clone),a.leave(j),j[0].parentNode)for(h=0,m=j.length;m>h;h++)j[h][s]=!0;N.scope.$destroy()}for(h=0;x>h;h++)if(k=r===T?h:T[h],A=r[k],N=V[h],N.scope){y=P;do y=y.nextSibling;while(y&&y[s]);l(N)!=y&&a.move($e(N.clone),null,Er(P)),P=f(N),c(N.scope,h,b,A,w,k,x)}else $(function(e,t){N.scope=t;var n=d.cloneNode(!1);e[e.length++]=n,a.enter(e,null,Er(P)),P=n,N.clone=e,D[N.id]=N,c(N.scope,h,b,A,w,k,x)});v=D})}}}}],ha="ng-hide",pa="ng-hide-animate",da=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,r){t.$watch(r.ngShow,function(t){e[t?"removeClass":"addClass"](n,ha,{tempClasses:pa})})}}}],$a=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,r){t.$watch(r.ngHide,function(t){e[t?"addClass":"removeClass"](n,ha,{tempClasses:pa})})}}}],va=Zn(function(e,t,n){e.$watch(n.ngStyle,function(e,n){n&&e!==n&&o(n,function(e,n){t.css(n,"")}),e&&t.css(e)},!0)}),ma=["$animate",function(e){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(n,r,i,a){var s=i.ngSwitch||i.on,u=[],c=[],l=[],f=[],h=function(e,t){return function(){e.splice(t,1)}};n.$watch(s,function(n){var r,i;for(r=0,i=l.length;i>r;++r)e.cancel(l[r]);for(l.length=0,r=0,i=f.length;i>r;++r){var s=$e(c[r].clone);f[r].$destroy();var p=l[r]=e.leave(s);p.then(h(l,r))}c.length=0,f.length=0,(u=a.cases["!"+n]||a.cases["?"])&&o(u,function(n){n.transclude(function(r,i){f.push(i);var o=n.element;r[r.length++]=t.createComment(" end ngSwitchWhen: ");var a={clone:r};c.push(a),e.enter(r,o.parent(),o)})})})}}}],ga=Zn({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,r,i){r.cases["!"+n.ngSwitchWhen]=r.cases["!"+n.ngSwitchWhen]||[],r.cases["!"+n.ngSwitchWhen].push({transclude:i,element:t})}}),ya=Zn({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,r,i){r.cases["?"]=r.cases["?"]||[],r.cases["?"].push({transclude:i,element:t})}}),ba=Zn({restrict:"EAC",link:function(e,t,n,i,o){if(!o)throw r("ngTransclude")("orphan","Illegal use of ngTransclude directive in the template! No parent directive that requires a transclusion found. Element: {0}",X(t));o(function(e){t.empty(),t.append(e)})}}),wa=["$templateCache",function(e){return{restrict:"E",terminal:!0,compile:function(t,n){if("text/ng-template"==n.type){var r=n.id,i=t[0].text;e.put(r,i)}}}}],xa={$setViewValue:$,$render:$},Sa=["$element","$scope","$attrs",function(e,r,i){var o=this,a=new Je;o.ngModelCtrl=xa,o.unknownOption=Er(t.createElement("option")),o.renderUnknownOption=function(t){var n="? "+Ye(t)+" ?";o.unknownOption.val(n),e.prepend(o.unknownOption),e.val(n)},r.$on("$destroy",function(){o.renderUnknownOption=$}),o.removeUnknownOption=function(){o.unknownOption.parent()&&o.unknownOption.remove()},o.readValue=function(){return o.removeUnknownOption(),e.val()},o.writeValue=function(t){o.hasOption(t)?(o.removeUnknownOption(),e.val(t),""===t&&o.emptyOption.prop("selected",!0)):null==t&&o.emptyOption?(o.removeUnknownOption(),e.val("")):o.renderUnknownOption(t)},o.addOption=function(e,t){pe(e,'"option value"'),""===e&&(o.emptyOption=t);var n=a.get(e)||0;a.put(e,n+1)},o.removeOption=function(e){var t=a.get(e);t&&(1===t?(a.remove(e),""===e&&(o.emptyOption=n)):a.put(e,t-1))},o.hasOption=function(e){return!!a.get(e)}}],Ea=function(){return{restrict:"E",require:["select","?ngModel"],controller:Sa,link:function(e,t,n,r){var i=r[1];if(i){var a=r[0];if(a.ngModelCtrl=i,i.$render=function(){a.writeValue(i.$viewValue)},t.on("change",function(){e.$apply(function(){i.$setViewValue(a.readValue())})}),n.multiple){a.readValue=function(){var e=[];return o(t.find("option"),function(t){t.selected&&e.push(t.value)}),e},a.writeValue=function(e){var n=new Je(e);o(t.find("option"),function(e){e.selected=b(n.get(e.value))})};var s,u=NaN;e.$watch(function(){u!==i.$viewValue||B(s,i.$viewValue)||(s=U(i.$viewValue),i.$render()),u=i.$viewValue}),i.$isEmpty=function(e){return!e||0===e.length}}}}}},Ca=["$interpolate",function(e){function t(e){e[0].hasAttribute("selected")&&(e[0].selected=!0)}return{restrict:"E",priority:100,compile:function(n,r){if(b(r.value))var i=e(r.value,!0);else{var o=e(n.text(),!0);o||r.$set("value",n.text())}return function(e,n,r){function a(e){c.addOption(e,n),c.ngModelCtrl.$render(),t(n)}var s="$selectController",u=n.parent(),c=u.data(s)||u.parent().data(s);if(c&&c.ngModelCtrl){if(i){var l;r.$observe("value",function(e){b(l)&&c.removeOption(l),l=e,a(e)})}else o?e.$watch(o,function(e,t){r.$set("value",e),t!==e&&c.removeOption(t),a(e)}):a(r.value);n.on("$destroy",function(){c.removeOption(r.value),c.ngModelCtrl.$render()})}}}}}],ka=m({restrict:"E",terminal:!1}),Aa=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){r&&(n.required=!0,r.$validators.required=function(e,t){return!n.required||!r.$isEmpty(t)},n.$observe("required",function(){r.$validate()}))}}},Oa=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,i,o){if(o){var a,s=i.ngPattern||i.pattern;i.$observe("pattern",function(e){if(S(e)&&e.length>0&&(e=new RegExp("^"+e+"$")),e&&!e.test)throw r("ngPattern")("noregexp","Expected {0} to be a RegExp but was {1}. Element: {2}",s,e,X(t));a=e||n,o.$validate()}),o.$validators.pattern=function(e,t){return o.$isEmpty(t)||y(a)||a.test(t)}}}}},Ma=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){if(r){var i=-1;n.$observe("maxlength",function(e){var t=p(e);i=isNaN(t)?-1:t,r.$validate()}),r.$validators.maxlength=function(e,t){return 0>i||r.$isEmpty(t)||t.length<=i}}}}},Ta=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){if(r){var i=0;n.$observe("minlength",function(e){i=p(e)||0,r.$validate()}),r.$validators.minlength=function(e,t){return r.$isEmpty(t)||t.length>=i}}}}};return e.angular.bootstrap?void console.log("WARNING: Tried to load angular more than once."):(le(),be(jr),jr.module("ngLocale",[],["$provide",function(e){function t(e){e+="";var t=e.indexOf(".");return-1==t?0:e.length-t-1}function r(e,r){var i=r;n===i&&(i=Math.min(t(e),3));var o=Math.pow(10,i),a=(e*o|0)%o;return{v:i,f:a}}var i={ZERO:"zero",ONE:"one",TWO:"two",FEW:"few",MANY:"many",OTHER:"other"};e.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:["January","February","March","April","May","June","July","August","September","October","November","December"],SHORTDAY:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],SHORTMONTH:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-¤",negSuf:"",posPre:"¤",posSuf:""}]},id:"en-us",pluralCat:function(e,t){var n=0|e,o=r(e,t);return 1==n&&0==o.v?i.ONE:i.OTHER}})}]),void Er(t).ready(function(){oe(t,ae)}))}(window,document),!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+!function(e,r,t){"use strict";function n(){function e(e,t){return r.extend(Object.create(e),t)}function t(e,r){var t=r.caseInsensitiveMatch,n={originalPath:e,regexp:e},a=n.keys=[];return e=e.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(e,r,t,n){var o="?"===n?n:null,i="*"===n?n:null;return a.push({name:t,optional:!!o}),r=r||"",""+(o?"":r)+"(?:"+(o?r:"")+(i&&"(.+?)"||"([^/]+)")+(o||"")+")"+(o||"")}).replace(/([\/$\*])/g,"\\$1"),n.regexp=new RegExp("^"+e+"$",t?"i":""),n}var n={};this.when=function(e,a){var o=r.copy(a);if(r.isUndefined(o.reloadOnSearch)&&(o.reloadOnSearch=!0),r.isUndefined(o.caseInsensitiveMatch)&&(o.caseInsensitiveMatch=this.caseInsensitiveMatch),n[e]=r.extend(o,e&&t(e,o)),e){var i="/"==e[e.length-1]?e.substr(0,e.length-1):e+"/";n[i]=r.extend({redirectTo:e},t(i,o))}return this},this.caseInsensitiveMatch=!1,this.otherwise=function(e){return"string"==typeof e&&(e={redirectTo:e}),this.when(null,e),this},this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(t,a,o,i,c,l,s){function h(e,r){var t=r.keys,n={};if(!r.regexp)return null;var a=r.regexp.exec(e);if(!a)return null;for(var o=1,i=a.length;i>o;++o){var c=t[o-1],u=a[o];c&&u&&(n[c.name]=u)}return n}function $(e){var n=w.current;v=f(),m=v&&n&&v.$$route===n.$$route&&r.equals(v.pathParams,n.pathParams)&&!v.reloadOnSearch&&!g,m||!n&&!v||t.$broadcast("$routeChangeStart",v,n).defaultPrevented&&e&&e.preventDefault()}function p(){var e=w.current,n=v;m?(e.params=n.params,r.copy(e.params,o),t.$broadcast("$routeUpdate",e)):(n||e)&&(g=!1,w.current=n,n&&n.redirectTo&&(r.isString(n.redirectTo)?a.path(d(n.redirectTo,n.params)).search(n.params).replace():a.url(n.redirectTo(n.pathParams,a.path(),a.search())).replace()),i.when(n).then(function(){if(n){var e,t,a=r.extend({},n.resolve);return r.forEach(a,function(e,t){a[t]=r.isString(e)?c.get(e):c.invoke(e,null,null,t)}),r.isDefined(e=n.template)?r.isFunction(e)&&(e=e(n.params)):r.isDefined(t=n.templateUrl)&&(r.isFunction(t)&&(t=t(n.params)),r.isDefined(t)&&(n.loadedTemplateUrl=s.valueOf(t),e=l(t))),r.isDefined(e)&&(a.$template=e),i.all(a)}}).then(function(a){n==w.current&&(n&&(n.locals=a,r.copy(n.params,o)),t.$broadcast("$routeChangeSuccess",n,e))},function(r){n==w.current&&t.$broadcast("$routeChangeError",n,e,r)}))}function f(){var t,o;return r.forEach(n,function(n,i){!o&&(t=h(a.path(),n))&&(o=e(n,{params:r.extend({},a.search(),t),pathParams:t}),o.$$route=n)}),o||n[null]&&e(n[null],{params:{},pathParams:{}})}function d(e,t){var n=[];return r.forEach((e||"").split(":"),function(e,r){if(0===r)n.push(e);else{var a=e.match(/(\w+)(?:[?*])?(.*)/),o=a[1];n.push(t[o]),n.push(a[2]||""),delete t[o]}}),n.join("")}var v,m,g=!1,w={routes:n,reload:function(){g=!0,t.$evalAsync(function(){$(),p()})},updateParams:function(e){if(!this.current||!this.current.$$route)throw u("norout","Tried updating route when with no current route");e=r.extend({},this.current.params,e),a.path(d(this.current.$$route.originalPath,e)),a.search(e)}};return t.$on("$locationChangeStart",$),t.$on("$locationChangeSuccess",p),w}]}function a(){this.$get=function(){return{}}}function o(e,t,n){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,o,i,c,u){function l(){p&&(n.cancel(p),p=null),h&&(h.$destroy(),h=null),$&&(p=n.leave($),p.then(function(){p=null}),$=null)}function s(){var i=e.current&&e.current.locals,c=i&&i.$template;if(r.isDefined(c)){var s=a.$new(),p=e.current,v=u(s,function(e){n.enter(e,null,$||o).then(function(){!r.isDefined(f)||f&&!a.$eval(f)||t()}),l()});$=v,h=p.scope=s,h.$emit("$viewContentLoaded"),h.$eval(d)}else l()}var h,$,p,f=i.autoscroll,d=i.onload||"";a.$on("$routeChangeSuccess",s),s()}}}function i(e,r,t){return{restrict:"ECA",priority:-400,link:function(n,a){var o=t.current,i=o.locals;a.html(i.$template);var c=e(a.contents());if(o.controller){i.$scope=n;var u=r(o.controller,i);o.controllerAs&&(n[o.controllerAs]=u),a.data("$ngControllerController",u),a.children().data("$ngControllerController",u)}c(n)}}}var c=r.module("ngRoute",["ng"]).provider("$route",n),u=r.$$minErr("ngRoute");c.provider("$routeParams",a),c.directive("ngView",o),c.directive("ngView",i),o.$inject=["$route","$anchorScroll","$animate"],i.$inject=["$compile","$controller","$route"]}(window,window.angular);
+!function(e,n,o){"use strict";function t(e,o,t){function i(e,t,i){var u,c;i=i||{},c=i.expires,u=n.isDefined(i.path)?i.path:r,n.isUndefined(t)&&(c="Thu, 01 Jan 1970 00:00:00 GMT",t=""),n.isString(c)&&(c=new Date(c));var s=encodeURIComponent(e)+"="+encodeURIComponent(t);s+=u?";path="+u:"",s+=i.domain?";domain="+i.domain:"",s+=c?";expires="+c.toUTCString():"",s+=i.secure?";secure":"";var f=s.length+1;return f>4096&&o.warn("Cookie '"+e+"' possibly not set or overflowed because it was too large ("+f+" > 4096 bytes)!"),s}var r=t.baseHref(),u=e[0];return function(e,n,o){u.cookie=i(e,n,o)}}n.module("ngCookies",["ng"]).provider("$cookies",[function(){function e(e){return e?n.extend({},t,e):t}var t=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(t,i){return{get:function(e){return t()[e]},getObject:function(e){var o=this.get(e);return o?n.fromJson(o):o},getAll:function(){return t()},put:function(n,o,t){i(n,o,e(t))},putObject:function(e,o,t){this.put(e,n.toJson(o),t)},remove:function(n,t){i(n,o,e(t))}}}]}]),n.module("ngCookies").factory("$cookieStore",["$cookies",function(e){return{get:function(n){return e.getObject(n)},put:function(n,o){e.putObject(n,o)},remove:function(n){e.remove(n)}}}]),t.$inject=["$document","$log","$browser"],n.module("ngCookies").provider("$$cookieWriter",function(){this.$get=t})}(window,window.angular);
+!function(e,t,r){"use strict";function n(e){var r=[];return l(r,t.noop).chars(e),r.join("")}function a(e,r){var n,a={},i=e.split(",");for(n=0;n<i.length;n++)a[r?t.lowercase(i[n]):i[n]]=!0;return a}function i(e,r){function n(e,n,i,o){if(n=t.lowercase(n),w[n])for(;b.last()&&z[b.last()];)a("",b.last());v[n]&&b.last()==n&&a("",n),(o=y[n]||!!o)||b.push(n);var l={};i.replace(h,function(e,t,r,n,a){l[t]=s(r||n||a||"")}),r.start&&r.start(n,l,o)}function a(e,n){var a,i=0;if(n=t.lowercase(n))for(i=b.length-1;i>=0&&b[i]!=n;i--);if(i>=0){for(a=b.length-1;a>=i;a--)r.end&&r.end(b[a]);b.length=i}}"string"!=typeof e&&(e=null===e||"undefined"==typeof e?"":""+e);var i,o,l,b=[],k=e;for(b.last=function(){return b[b.length-1]};e;){if(l="",o=!0,b.last()&&$[b.last()]?(e=e.replace(new RegExp("([\\W\\w]*)<\\s*\\/\\s*"+b.last()+"[^>]*>","i"),function(e,t){return t=t.replace(f,"$1").replace(x,"$1"),r.chars&&r.chars(s(t)),""}),a("",b.last())):(0===e.indexOf("<!--")?(i=e.indexOf("--",4),i>=0&&e.lastIndexOf("-->",i)===i&&(r.comment&&r.comment(e.substring(4,i)),e=e.substring(i+3),o=!1)):m.test(e)?(i=e.match(m))&&(e=e.replace(i[0],""),o=!1):g.test(e)?(i=e.match(p))&&(e=e.substring(i[0].length),i[0].replace(p,a),o=!1):d.test(e)&&((i=e.match(u))?(i[4]&&(e=e.substring(i[0].length),i[0].replace(u,n)),o=!1):(l+="<",e=e.substring(1))),o&&(i=e.indexOf("<"),l+=0>i?e:e.substring(0,i),e=0>i?"":e.substring(i),r.chars&&r.chars(s(l)))),e==k)throw c("badparse",e);k=e}a()}function s(e){return e?(E.innerHTML=e.replace(/</g,"&lt;"),E.textContent):""}function o(e){return e.replace(/&/g,"&amp;").replace(b,function(e){var t=e.charCodeAt(0);return e=e.charCodeAt(1),"&#"+(1024*(t-55296)+(e-56320)+65536)+";"}).replace(k,function(e){return"&#"+e.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function l(e,r){var n=!1,a=t.bind(e,e.push);return{start:function(e,i,s){e=t.lowercase(e),!n&&$[e]&&(n=e),n||!0!==A[e]||(a("<"),a(e),t.forEach(i,function(n,i){var s=t.lowercase(i),l="img"===e&&"src"===s||"background"===s;!0!==D[s]||!0===C[s]&&!r(n,l)||(a(" "),a(i),a('="'),a(o(n)),a('"'))}),a(s?"/>":">"))},end:function(e){e=t.lowercase(e),n||!0!==A[e]||(a("</"),a(e),a(">")),e==n&&(n=!1)},chars:function(e){n||a(o(e))}}}var c=t.$$minErr("$sanitize"),u=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,p=/^<\/\s*([\w:-]+)[^>]*>/,h=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,d=/^</,g=/^<\//,f=/\x3c!--(.*?)--\x3e/g,m=/<!DOCTYPE([^>]*?)>/i,x=/<!\[CDATA\[(.*?)]]\x3e/g,b=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,k=/([^\#-~| |!])/g,y=a("area,br,col,hr,img,wbr");e=a("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),r=a("rp,rt");var v=t.extend({},r,e),w=t.extend({},e,a("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),z=t.extend({},r,a("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var"));e=a("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan,use");var $=a("script,style"),A=t.extend({},y,w,z,v,e),C=a("background,cite,href,longdesc,src,usemap,xlink:href");e=a("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width"),r=a("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",!0);var D=t.extend({},C,r,e),E=document.createElement("pre");t.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(e){return function(t){var r=[];return i(t,l(r,function(t,r){return!/^unsafe/.test(e(t,r))})),r.join("")}}]}),t.module("ngSanitize").filter("linky",["$sanitize",function(e){var r=/((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,a=/^mailto:/i;return function(i,s){function o(e){e&&d.push(n(e))}function l(e,r){d.push("<a "),t.isDefined(s)&&d.push('target="',s,'" '),d.push('href="',e.replace(/"/g,"&quot;"),'">'),o(r),d.push("</a>")}if(!i)return i;for(var c,u,p,h=i,d=[];c=h.match(r);)u=c[0],c[2]||c[4]||(u=(c[3]?"http://":"mailto:")+u),p=c.index,o(h.substr(0,p)),l(u,c[0].replace(a,"")),h=h.substring(p+c[0].length);return o(h),e(d.join(""))}}])}(window,window.angular);
\ No newline at end of file
diff --git a/public/javascripts/wechat/gulpfile.js b/public/javascripts/wechat/gulpfile.js
new file mode 100644
index 000000000..a6726bd22
--- /dev/null
+++ b/public/javascripts/wechat/gulpfile.js
@@ -0,0 +1,10 @@
+var gulp = require('gulp'),
+     uglify = require('gulp-uglify');
+var concat = require('gulp-concat');
+
+gulp.task('minify', function () {
+  gulp.src(['angular.js', 'angular-route.js', 'angular-cookies.js', 'angular-sanitize.min.js'])
+  .pipe(uglify())
+  .pipe(concat('angular.all.min.js'))
+  .pipe(gulp.dest('build'))
+});
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 78b445a7aea28dd07efb27004cbe013095984ca4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 12 Jun 2016 13:36:35 +0800
Subject: [PATCH 361/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=20=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=AD=E4=BF=AE=E6=94=B9=EF=BC=8C=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=9F=9F=E5=90=8D=E9=95=BF=E5=BA=A6?=
 =?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/organizations/_subfield_list.html.erb        |  2 +-
 app/views/organizations/setting.html.erb               |  4 ++--
 .../20160612030537_update_org_subfiled_default.rb      | 10 ++++++++++
 .../20160612043259_update_org_subfiled_resource.rb     |  8 ++++++++
 db/schema.rb                                           |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20160612030537_update_org_subfiled_default.rb
 create mode 100644 db/migrate/20160612043259_update_org_subfiled_resource.rb

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index aa1084304..d84f1299d 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -73,7 +73,7 @@
           <li class="orgListType"><%= org_subfield_type field %></li>
           <li class="orgListCatalog hidden">
             <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; margin-left:20px;" title="双击可编辑">
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:75px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" title="双击可编辑">
                   <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
                 </div>
             <% else %>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 775bc7e6a..1ab51b3af 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -75,9 +75,9 @@
         <div class="orgRow mb10 mt5">
           <span style="margin-left:10px;" >显示模式&nbsp;: </span>
           <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" <%= @organization.show_mode == 0 ? "checked" : "" %> />
-          <label for="show_mode_ordinary">社区模式一</label>
+          <label for="show_mode_ordinary">简介模式</label>
           <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" <%= @organization.show_mode == 1 ? "checked" : "" %> />
-          <label for="show_mode_special">社区模式二</label>
+          <label for="show_mode_special">门户模式</label>
         </div>
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" id="is_public" onclick="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));"  name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
diff --git a/db/migrate/20160612030537_update_org_subfiled_default.rb b/db/migrate/20160612030537_update_org_subfiled_default.rb
new file mode 100644
index 000000000..48355c321
--- /dev/null
+++ b/db/migrate/20160612030537_update_org_subfiled_default.rb
@@ -0,0 +1,10 @@
+class UpdateOrgSubfiledDefault < ActiveRecord::Migration
+  def up
+    OrgSubfield.where(:name => "activity").update_all(:status => false)
+    OrgSubfield.where(:name => "course").update_all(:status => 2)
+    OrgSubfield.where(:name => "project").update_all(:status => 2)
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160612043259_update_org_subfiled_resource.rb b/db/migrate/20160612043259_update_org_subfiled_resource.rb
new file mode 100644
index 000000000..ec0bd616e
--- /dev/null
+++ b/db/migrate/20160612043259_update_org_subfiled_resource.rb
@@ -0,0 +1,8 @@
+class UpdateOrgSubfiledResource < ActiveRecord::Migration
+  def up
+    OrgSubfield.where(:field_type => "Resource").update_all(:status => 6)
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 504849d39..0a1408e7e 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 => 20160606064856) do
+ActiveRecord::Schema.define(:version => 20160612043259) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From d3c45fd133b85d89704e3317244139bebeaee3d5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 12 Jun 2016 13:40:14 +0800
Subject: [PATCH 362/668] =?UTF-8?q?=E4=BD=BF=E7=94=A8jquery1.3=E6=AF=94?=
 =?UTF-8?q?=E8=BE=83=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/menu.yml                                    |  2 +-
 config/wechat.yml                                  |  8 ++++----
 public/assets/wechat/app.html                      |  1 -
 public/javascripts/wechat/app.js                   | 13 ++-----------
 public/javascripts/wechat/build/angular.all.min.js |  3 ++-
 public/javascripts/wechat/gulpfile.js              |  2 +-
 public/javascripts/wechat/jquery.min.js            |  5 -----
 7 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 public/javascripts/wechat/jquery.min.js

diff --git a/config/menu.yml b/config/menu.yml
index 155553bc2..712d2dd79 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
diff --git a/config/wechat.yml b/config/wechat.yml
index cf5be1f2b..cf0703e81 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -5,11 +5,11 @@ default: &default
 # Or if using public account, only need above two line
 
   # guange test
-  #appid: "wxf694495398c7d470"
-  #secret: "743e038392f1d89540e95f8f7645849a"
+  appid: "wxf694495398c7d470"
+  secret: "743e038392f1d89540e95f8f7645849a"
 
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+  #appid: "wx8e1ab05163a28e37"
+  #secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
   access_token: "1234567"
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 8e3d38005..5059c41ab 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -17,7 +17,6 @@
 <div ng-view>
 </div>
 
-<script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
 <script src="/javascripts/wechat/app.js"></script>
 </body>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index e3ecf9b37..ca9682db2 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,4 +1,4 @@
-var app = angular.module('wechat', ['ngRoute','ngCookies']);
+var app = angular.module('wechat', ['ngRoute']);
 var apiUrl = '/api/v1/';
 var debug = false; //调试标志,如果在本地请置为true
 
@@ -8,7 +8,7 @@ if(debug===true){
 }
 
 
-app.factory('auth', function($http,$routeParams, $cookies, $q){
+app.factory('auth', function($http,$routeParams, $q){
     var _openid = '';
 
     if(typeof g_openid !== 'undefined'){
@@ -31,15 +31,6 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
                 method: 'POST'
             }).then(function successCallback(response) {
                 _openid = response.data.openid;
-                if(typeof _openid !== 'undefined' && _openid.length>0){
-                    if(debug !== true){ //如果是生产环境,就存到cookies中
-                        $cookies.put("openid", _openid);
-                    }
-                } else {
-                    if(debug!==true){//考虑从cookies中取出
-                        _openid = $cookies.get('openid');
-                    }
-                }
                 deferred.resolve(_openid);
             }, function errorCallback(response) {
                 deferred.reject(response);
diff --git a/public/javascripts/wechat/build/angular.all.min.js b/public/javascripts/wechat/build/angular.all.min.js
index 72e4e89cd..106f2a167 100644
--- a/public/javascripts/wechat/build/angular.all.min.js
+++ b/public/javascripts/wechat/build/angular.all.min.js
@@ -1,8 +1,9 @@
+!function(){function e(e,t){t.src?h.ajax({url:t.src,async:!1,dataType:"script"}):h.globalEval(t.text||t.textContent||t.innerHTML||""),t.parentNode&&t.parentNode.removeChild(t)}function t(){return+new Date}function n(e,t){return e[0]&&parseInt(h.curCSS(e[0],t,!0),10)||0}function r(){return!1}function i(){return!0}function o(e){var t=RegExp("(^|\\.)"+e.type+"(\\.|$)"),n=!0,r=[];return h.each(h.data(this,"events").live||[],function(n,i){if(t.test(i.type)){var o=h(e.target).closest(i.data)[0];o&&r.push({elem:o,fn:i})}}),r.sort(function(e,t){return h.data(e.elem,"closest")-h.data(t.elem,"closest")}),h.each(r,function(){return this.fn.call(this.elem,e,this.fn.data)===!1?n=!1:void 0}),n}function a(e,t){return["live",e,t.replace(/\./g,"`").replace(/ /g,"|")].join(".")}function s(){S||(S=!0,document.addEventListener?document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,!1),h.ready()},!1):document.attachEvent&&(document.attachEvent("onreadystatechange",function(){"complete"===document.readyState&&(document.detachEvent("onreadystatechange",arguments.callee),h.ready())}),document.documentElement.doScroll&&u==u.top&&!function(){if(!h.isReady){try{document.documentElement.doScroll("left")}catch(e){return void setTimeout(arguments.callee,0)}h.ready()}}()),h.event.add(u,"load",h.ready))}function l(e,t){var n={};return h.each(L.concat.apply([],L.slice(0,t)),function(){n[this]=e}),n}var c,u=this,d=u.jQuery,f=u.$,h=u.jQuery=u.$=function(e,t){return new h.fn.init(e,t)},p=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,m=/^.[^:#\[\.,]*$/;h.fn=h.prototype={init:function(e,t){if(e=e||document,e.nodeType)return this[0]=e,this.length=1,this.context=e,this;if("string"==typeof e){var n=p.exec(e);if(!n||!n[1]&&t)return h(t).find(e);if(!n[1]){var r=document.getElementById(n[3]);if(r&&r.id!=n[3])return h().find(e);var i=h(r||[]);return i.context=document,i.selector=e,i}e=h.clean([n[1]],t)}else if(h.isFunction(e))return h(document).ready(e);return e.selector&&e.context&&(this.selector=e.selector,this.context=e.context),this.setArray(h.isArray(e)?e:h.makeArray(e))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(e){return e===c?Array.prototype.slice.call(this):this[e]},pushStack:function(e,t,n){var r=h(e);return r.prevObject=this,r.context=this.context,"find"===t?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},setArray:function(e){return this.length=0,Array.prototype.push.apply(this,e),this},each:function(e,t){return h.each(this,e,t)},index:function(e){return h.inArray(e&&e.jquery?e[0]:e,this)},attr:function(e,t,n){var r=e;if("string"==typeof e){if(t===c)return this[0]&&h[n||"attr"](this[0],e);r={},r[e]=t}return this.each(function(t){for(e in r)h.attr(n?this.style:this,e,h.prop(this,r[e],n,t,e))})},css:function(e,t){return("width"==e||"height"==e)&&parseFloat(t)<0&&(t=c),this.attr(e,t,"curCSS")},text:function(e){if("object"!=typeof e&&null!=e)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(e));var t="";return h.each(e||this,function(){h.each(this.childNodes,function(){8!=this.nodeType&&(t+=1!=this.nodeType?this.nodeValue:h.fn.text([this]))})}),t},wrapAll:function(e){if(this[0]){var t=h(e,this[0].ownerDocument).clone();this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return this.each(function(){h(this).contents().wrapAll(e)})},wrap:function(e){return this.each(function(){h(this).wrapAll(e)})},append:function(){return this.domManip(arguments,!0,function(e){1==this.nodeType&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){1==this.nodeType&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)})},end:function(){return this.prevObject||h([])},push:[].push,sort:[].sort,splice:[].splice,find:function(e){if(1===this.length){var t=this.pushStack([],"find",e);return t.length=0,h.find(e,this[0],t),t}return this.pushStack(h.unique(h.map(this,function(t){return h.find(e,t)})),"find",e)},clone:function(e){var t=this.map(function(){if(h.support.noCloneEvent||h.isXMLDoc(this))return this.cloneNode(!0);var e=this.outerHTML;if(!e){var t=this.ownerDocument.createElement("div");t.appendChild(this.cloneNode(!0)),e=t.innerHTML}return h.clean([e.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]});if(e===!0){var n=this.find("*").andSelf(),r=0;t.find("*").andSelf().each(function(){if(this.nodeName===n[r].nodeName){var e=h.data(n[r],"events");for(var t in e)for(var i in e[t])h.event.add(this,t,e[t][i],e[t][i].data);r++}})}return t},filter:function(e){return this.pushStack(h.isFunction(e)&&h.grep(this,function(t,n){return e.call(t,n)})||h.multiFilter(e,h.grep(this,function(e){return 1===e.nodeType})),"filter",e)},closest:function(e){var t=h.expr.match.POS.test(e)?h(e):null,n=0;return this.map(function(){for(var r=this;r&&r.ownerDocument;){if(t?t.index(r)>-1:h(r).is(e))return h.data(r,"closest",n),r;r=r.parentNode,n++}})},not:function(e){if("string"==typeof e){if(m.test(e))return this.pushStack(h.multiFilter(e,this,!0),"not",e);e=h.multiFilter(e,this)}var t=e.length&&e[e.length-1]!==c&&!e.nodeType;return this.filter(function(){return t?h.inArray(this,e)<0:this!=e})},add:function(e){return this.pushStack(h.unique(h.merge(this.get(),"string"==typeof e?h(e):h.makeArray(e))))},is:function(e){return!!e&&h.multiFilter(e,this).length>0},hasClass:function(e){return!!e&&this.is("."+e)},val:function(e){if(e===c){var t=this[0];if(t){if(h.nodeName(t,"option"))return(t.attributes.value||{}).specified?t.value:t.text;if(h.nodeName(t,"select")){var n=t.selectedIndex,r=[],i=t.options,o="select-one"==t.type;if(0>n)return null;for(var a=o?n:0,s=o?n+1:i.length;s>a;a++){var l=i[a];if(l.selected){if(e=h(l).val(),o)return e;r.push(e)}}return r}return(t.value||"").replace(/\r/g,"")}return c}return"number"==typeof e&&(e+=""),this.each(function(){if(1==this.nodeType)if(h.isArray(e)&&/radio|checkbox/.test(this.type))this.checked=h.inArray(this.value,e)>=0||h.inArray(this.name,e)>=0;else if(h.nodeName(this,"select")){var t=h.makeArray(e);h("option",this).each(function(){this.selected=h.inArray(this.value,t)>=0||h.inArray(this.text,t)>=0}),t.length||(this.selectedIndex=-1)}else this.value=e})},html:function(e){return e===c?this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null:this.empty().append(e)},replaceWith:function(e){return this.after(e).remove()},eq:function(e){return this.slice(e,+e+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(e){return this.pushStack(h.map(this,function(t,n){return e.call(t,n,t)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(t,n,r){function i(e,t){return n&&h.nodeName(e,"table")&&h.nodeName(t,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}if(this[0]){var o=(this[0].ownerDocument||this[0]).createDocumentFragment(),a=h.clean(t,this[0].ownerDocument||this[0],o),s=o.firstChild;if(s)for(var l=0,c=this.length;c>l;l++)r.call(i(this[l],s),this.length>1||l>0?o.cloneNode(!0):o);a&&h.each(a,e)}return this}},h.fn.init.prototype=h.fn,h.extend=h.fn.extend=function(){var e,t=arguments[0]||{},n=1,r=arguments.length,i=!1;for("boolean"==typeof t&&(i=t,t=arguments[1]||{},n=2),"object"==typeof t||h.isFunction(t)||(t={}),r==n&&(t=this,--n);r>n;n++)if(null!=(e=arguments[n]))for(var o in e){var a=t[o],s=e[o];t!==s&&(i&&s&&"object"==typeof s&&!s.nodeType?t[o]=h.extend(i,a||(null!=s.length?[]:{}),s):s!==c&&(t[o]=s))}return t};var v=/z-?index|font-?weight|opacity|zoom|line-?height/i,y=document.defaultView||{},g=Object.prototype.toString;h.extend({noConflict:function(e){return u.$=f,e&&(u.jQuery=d),h},isFunction:function(e){return"[object Function]"===g.call(e)},isArray:function(e){return"[object Array]"===g.call(e)},isXMLDoc:function(e){return 9===e.nodeType&&"HTML"!==e.documentElement.nodeName||!!e.ownerDocument&&h.isXMLDoc(e.ownerDocument)},globalEval:function(e){if(e&&/\S/.test(e)){var t=document.getElementsByTagName("head")[0]||document.documentElement,n=document.createElement("script");n.type="text/javascript",h.support.scriptEval?n.appendChild(document.createTextNode(e)):n.text=e,t.insertBefore(n,t.firstChild),t.removeChild(n)}},nodeName:function(e,t){return e.nodeName&&e.nodeName.toUpperCase()==t.toUpperCase()},each:function(e,t,n){var r,i=0,o=e.length;if(n)if(o===c){for(r in e)if(t.apply(e[r],n)===!1)break}else for(;o>i&&t.apply(e[i++],n)!==!1;);else if(o===c){for(r in e)if(t.call(e[r],r,e[r])===!1)break}else for(var a=e[0];o>i&&t.call(a,i,a)!==!1;a=e[++i]);return e},prop:function(e,t,n,r,i){return h.isFunction(t)&&(t=t.call(e,r)),"number"!=typeof t||"curCSS"!=n||v.test(i)?t:t+"px"},className:{add:function(e,t){h.each((t||"").split(/\s+/),function(t,n){1!=e.nodeType||h.className.has(e.className,n)||(e.className+=(e.className?" ":"")+n)})},remove:function(e,t){1==e.nodeType&&(e.className=t!==c?h.grep(e.className.split(/\s+/),function(e){return!h.className.has(t,e)}).join(" "):"")},has:function(e,t){return e&&h.inArray(t,(e.className||e).toString().split(/\s+/))>-1}},swap:function(e,t,n){var r={};for(var i in t)r[i]=e.style[i],e.style[i]=t[i];n.call(e);for(var i in t)e.style[i]=r[i]},css:function(e,t,n,r){function i(){o="width"==t?e.offsetWidth:e.offsetHeight,"border"!==r&&h.each(s,function(){r||(o-=parseFloat(h.curCSS(e,"padding"+this,!0))||0),"margin"===r?o+=parseFloat(h.curCSS(e,"margin"+this,!0))||0:o-=parseFloat(h.curCSS(e,"border"+this+"Width",!0))||0})}if("width"==t||"height"==t){var o,a={position:"absolute",visibility:"hidden",display:"block"},s="width"==t?["Left","Right"]:["Top","Bottom"];return 0!==e.offsetWidth?i():h.swap(e,a,i),Math.max(0,Math.round(o))}return h.curCSS(e,t,n)},curCSS:function(e,t,n){var r,i=e.style;if("opacity"==t&&!h.support.opacity)return r=h.attr(i,"opacity"),""==r?"1":r;if(t.match(/float/i)&&(t=w),!n&&i&&i[t])r=i[t];else if(y.getComputedStyle){t.match(/float/i)&&(t="float"),t=t.replace(/([A-Z])/g,"-$1").toLowerCase();var o=y.getComputedStyle(e,null);o&&(r=o.getPropertyValue(t)),"opacity"==t&&""==r&&(r="1")}else if(e.currentStyle){var a=t.replace(/\-(\w)/g,function(e,t){return t.toUpperCase()});if(r=e.currentStyle[t]||e.currentStyle[a],!/^\d+(px)?$/i.test(r)&&/^\d/.test(r)){var s=i.left,l=e.runtimeStyle.left;e.runtimeStyle.left=e.currentStyle.left,i.left=r||0,r=i.pixelLeft+"px",i.left=s,e.runtimeStyle.left=l}}return r},clean:function(e,t,n){if(t=t||document,"undefined"==typeof t.createElement&&(t=t.ownerDocument||t[0]&&t[0].ownerDocument||document),!n&&1===e.length&&"string"==typeof e[0]){var r=/^<(\w+)\s*\/?>$/.exec(e[0]);if(r)return[t.createElement(r[1])]}var i=[],o=[],a=t.createElement("div");if(h.each(e,function(e,n){if("number"==typeof n&&(n+=""),n){if("string"==typeof n){n=n.replace(/(<(\w+)[^>]*?)\/>/g,function(e,t,n){return n.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?e:t+"></"+n+">"});var r=n.replace(/^\s+/,"").substring(0,10).toLowerCase(),o=!r.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!r.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||r.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!r.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!r.indexOf("<td")||!r.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!r.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!h.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];for(a.innerHTML=o[1]+n+o[2];o[0]--;)a=a.lastChild;if(!h.support.tbody)for(var s=/<tbody/i.test(n),l=r.indexOf("<table")||s?"<table>"!=o[1]||s?[]:a.childNodes:a.firstChild&&a.firstChild.childNodes,c=l.length-1;c>=0;--c)h.nodeName(l[c],"tbody")&&!l[c].childNodes.length&&l[c].parentNode.removeChild(l[c]);!h.support.leadingWhitespace&&/^\s/.test(n)&&a.insertBefore(t.createTextNode(n.match(/^\s*/)[0]),a.firstChild),n=h.makeArray(a.childNodes)}n.nodeType?i.push(n):i=h.merge(i,n)}}),n){for(var s=0;i[s];s++)!h.nodeName(i[s],"script")||i[s].type&&"text/javascript"!==i[s].type.toLowerCase()?(1===i[s].nodeType&&i.splice.apply(i,[s+1,0].concat(h.makeArray(i[s].getElementsByTagName("script")))),n.appendChild(i[s])):o.push(i[s].parentNode?i[s].parentNode.removeChild(i[s]):i[s]);return o}return i},attr:function(e,t,n){if(!e||3==e.nodeType||8==e.nodeType)return c;var r=!h.isXMLDoc(e),i=n!==c;if(t=r&&h.props[t]||t,e.tagName){var o=/href|src|style/.test(t);if("selected"==t&&e.parentNode&&e.parentNode.selectedIndex,t in e&&r&&!o){if(i){if("type"==t&&h.nodeName(e,"input")&&e.parentNode)throw"type property can't be changed";e[t]=n}if(h.nodeName(e,"form")&&e.getAttributeNode(t))return e.getAttributeNode(t).nodeValue;if("tabIndex"==t){var a=e.getAttributeNode("tabIndex");return a&&a.specified?a.value:e.nodeName.match(/(button|input|object|select|textarea)/i)?0:e.nodeName.match(/^(a|area)$/i)&&e.href?0:c}return e[t]}if(!h.support.style&&r&&"style"==t)return h.attr(e.style,"cssText",n);i&&e.setAttribute(t,""+n);var s=!h.support.hrefNormalized&&r&&o?e.getAttribute(t,2):e.getAttribute(t);return null===s?c:s}return h.support.opacity||"opacity"!=t?(t=t.replace(/-([a-z])/gi,function(e,t){return t.toUpperCase()}),i&&(e[t]=n),e[t]):(i&&(e.zoom=1,e.filter=(e.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(n)+""=="NaN"?"":"alpha(opacity="+100*n+")")),e.filter&&e.filter.indexOf("opacity=")>=0?parseFloat(e.filter.match(/opacity=([^)]*)/)[1])/100+"":"")},trim:function(e){return(e||"").replace(/^\s+|\s+$/g,"")},makeArray:function(e){var t=[];if(null!=e){var n=e.length;if(null==n||"string"==typeof e||h.isFunction(e)||e.setInterval)t[0]=e;else for(;n;)t[--n]=e[n]}return t},inArray:function(e,t){for(var n=0,r=t.length;r>n;n++)if(t[n]===e)return n;return-1},merge:function(e,t){var n,r=0,i=e.length;if(h.support.getAll)for(;null!=(n=t[r++]);)e[i++]=n;else for(;null!=(n=t[r++]);)8!=n.nodeType&&(e[i++]=n);return e},unique:function(e){var t=[],n={};try{for(var r=0,i=e.length;i>r;r++){var o=h.data(e[r]);n[o]||(n[o]=!0,t.push(e[r]))}}catch(a){t=e}return t},grep:function(e,t,n){for(var r=[],i=0,o=e.length;o>i;i++)!n!=!t(e[i],i)&&r.push(e[i]);return r},map:function(e,t){for(var n=[],r=0,i=e.length;i>r;r++){var o=t(e[r],r);null!=o&&(n[n.length]=o)}return n.concat.apply([],n)}});var b=navigator.userAgent.toLowerCase();h.browser={version:(b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(b),opera:/opera/.test(b),msie:/msie/.test(b)&&!/opera/.test(b),mozilla:/mozilla/.test(b)&&!/(compatible|webkit)/.test(b)},h.each({parent:function(e){return e.parentNode},parents:function(e){return h.dir(e,"parentNode")},next:function(e){return h.nth(e,2,"nextSibling")},prev:function(e){return h.nth(e,2,"previousSibling")},nextAll:function(e){return h.dir(e,"nextSibling")},prevAll:function(e){return h.dir(e,"previousSibling")},siblings:function(e){return h.sibling(e.parentNode.firstChild,e)},children:function(e){return h.sibling(e.firstChild)},contents:function(e){return h.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:h.makeArray(e.childNodes)}},function(e,t){h.fn[e]=function(n){var r=h.map(this,t);return n&&"string"==typeof n&&(r=h.multiFilter(n,r)),this.pushStack(h.unique(r),e,n)}}),h.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){h.fn[e]=function(n){for(var r=[],i=h(n),o=0,a=i.length;a>o;o++){var s=(o>0?this.clone(!0):this).get();h.fn[t].apply(h(i[o]),s),r=r.concat(s)}return this.pushStack(r,e,n)}}),h.each({removeAttr:function(e){h.attr(this,e,""),1==this.nodeType&&this.removeAttribute(e)},addClass:function(e){h.className.add(this,e)},removeClass:function(e){h.className.remove(this,e)},toggleClass:function(e,t){"boolean"!=typeof t&&(t=!h.className.has(this,e)),h.className[t?"add":"remove"](this,e)},remove:function(e){e&&!h.filter(e,[this]).length||(h("*",this).add([this]).each(function(){h.event.remove(this),h.removeData(this)}),this.parentNode&&this.parentNode.removeChild(this))},empty:function(){for(h(this).children().remove();this.firstChild;)this.removeChild(this.firstChild)}},function(e,t){h.fn[e]=function(){return this.each(t,arguments)}});var x="jQuery"+t(),T=0,N={};h.extend({cache:{},data:function(e,t,n){e=e==u?N:e;var r=e[x];return r||(r=e[x]=++T),t&&!h.cache[r]&&(h.cache[r]={}),n!==c&&(h.cache[r][t]=n),t?h.cache[r][t]:r},removeData:function(e,t){e=e==u?N:e;var n=e[x];if(t){if(h.cache[n]){delete h.cache[n][t],t="";for(t in h.cache[n])break;t||h.removeData(e)}}else{try{delete e[x]}catch(r){e.removeAttribute&&e.removeAttribute(x)}delete h.cache[n]}},queue:function(e,t,n){if(e){t=(t||"fx")+"queue";var r=h.data(e,t);!r||h.isArray(n)?r=h.data(e,t,h.makeArray(n)):n&&r.push(n)}return r},dequeue:function(e,t){var n=h.queue(e,t),r=n.shift();t&&"fx"!==t||(r=n[0]),r!==c&&r.call(e)}}),h.fn.extend({data:function(e,t){var n=e.split(".");if(n[1]=n[1]?"."+n[1]:"",t===c){var r=this.triggerHandler("getData"+n[1]+"!",[n[0]]);return r===c&&this.length&&(r=h.data(this[0],e)),r===c&&n[1]?this.data(n[0]):r}return this.trigger("setData"+n[1]+"!",[n[0],t]).each(function(){h.data(this,e,t)})},removeData:function(e){return this.each(function(){h.removeData(this,e)})},queue:function(e,t){return"string"!=typeof e&&(t=e,e="fx"),t===c?h.queue(this[0],e):this.each(function(){var n=h.queue(this,e,t);"fx"==e&&1==n.length&&n[0].call(this)})},dequeue:function(e){return this.each(function(){h.dequeue(this,e)})}}),function(){function e(e,t,n,r,i,o){for(var a="previousSibling"==e&&!o,s=0,l=r.length;l>s;s++){var c=r[s];if(c){a&&1===c.nodeType&&(c.sizcache=n,c.sizset=s),c=c[e];for(var u=!1;c;){if(c.sizcache===n){u=r[c.sizset];break}if(1!==c.nodeType||o||(c.sizcache=n,c.sizset=s),c.nodeName===t){u=c;break}c=c[e]}r[s]=u}}}function t(e,t,n,r,i,a){for(var s="previousSibling"==e&&!a,l=0,c=r.length;c>l;l++){var u=r[l];if(u){s&&1===u.nodeType&&(u.sizcache=n,u.sizset=l),u=u[e];for(var d=!1;u;){if(u.sizcache===n){d=r[u.sizset];break}if(1===u.nodeType)if(a||(u.sizcache=n,u.sizset=l),"string"!=typeof t){if(u===t){d=!0;break}}else if(o.filter(t,[u]).length>0){d=u;break}u=u[e]}r[l]=d}}}var n=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,r=0,i=Object.prototype.toString,o=function(e,t,r,l){if(r=r||[],t=t||document,1!==t.nodeType&&9!==t.nodeType)return[];if(!e||"string"!=typeof e)return r;var c,d,h,y,g=[],b=!0;for(n.lastIndex=0;null!==(c=n.exec(e));)if(g.push(c[1]),c[2]){y=RegExp.rightContext;break}if(g.length>1&&s.exec(e))if(2===g.length&&a.relative[g[0]])d=v(g[0]+g[1],t);else for(d=a.relative[g[0]]?[t]:o(g.shift(),t);g.length;)e=g.shift(),a.relative[e]&&(e+=g.shift()),d=v(e,d);else{var x=l?{expr:g.pop(),set:u(l)}:o.find(g.pop(),1===g.length&&t.parentNode?t.parentNode:t,m(t));for(d=o.filter(x.expr,x.set),g.length>0?h=u(d):b=!1;g.length;){var T=g.pop(),N=T;a.relative[T]?N=g.pop():T="",null==N&&(N=t),a.relative[T](h,N,m(t))}}if(h||(h=d),!h)throw"Syntax error, unrecognized expression: "+(T||e);if("[object Array]"===i.call(h))if(b)if(1===t.nodeType)for(var E=0;null!=h[E];E++)h[E]&&(h[E]===!0||1===h[E].nodeType&&p(t,h[E]))&&r.push(d[E]);else for(var E=0;null!=h[E];E++)h[E]&&1===h[E].nodeType&&r.push(d[E]);else r.push.apply(r,h);else u(h,r);if(y&&(o(y,t,r,l),f&&(hasDuplicate=!1,r.sort(f),hasDuplicate)))for(var E=1;E<r.length;E++)r[E]===r[E-1]&&r.splice(E--,1);return r};o.matches=function(e,t){return o(e,null,null,t)},o.find=function(e,t,n){var r,i;if(!e)return[];for(var o=0,s=a.order.length;s>o;o++){var i,l=a.order[o];if(i=a.match[l].exec(e)){var c=RegExp.leftContext;if("\\"!==c.substr(c.length-1)&&(i[1]=(i[1]||"").replace(/\\/g,""),r=a.find[l](i,t,n),null!=r)){e=e.replace(a.match[l],"");break}}}return r||(r=t.getElementsByTagName("*")),{set:r,expr:e}},o.filter=function(e,t,n,r){for(var i,o,s=e,l=[],u=t,d=t&&t[0]&&m(t[0]);e&&t.length;){for(var f in a.filter)if(null!=(i=a.match[f].exec(e))){var h,p,v=a.filter[f];if(o=!1,u==l&&(l=[]),a.preFilter[f])if(i=a.preFilter[f](i,u,n,l,r,d)){if(i===!0)continue}else o=h=!0;if(i)for(var y=0;null!=(p=u[y]);y++)if(p){h=v(p,i,y,u);var g=r^!!h;n&&null!=h?g?o=!0:u[y]=!1:g&&(l.push(p),o=!0)}if(h!==c){if(n||(u=l),e=e.replace(a.match[f],""),!o)return[];break}}if(e==s){if(null==o)throw"Syntax error, unrecognized expression: "+e;break}s=e}return u};var a=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(e,t,n){var r="string"==typeof t,i=r&&!/\W/.test(t),a=r&&!i;i&&!n&&(t=t.toUpperCase());for(var s,l=0,c=e.length;c>l;l++)if(s=e[l]){for(;(s=s.previousSibling)&&1!==s.nodeType;);e[l]=a||s&&s.nodeName===t?s||!1:s===t}a&&o.filter(t,e,!0)},">":function(e,t,n){var r="string"==typeof t;if(r&&!/\W/.test(t)){t=n?t:t.toUpperCase();for(var i=0,a=e.length;a>i;i++){var s=e[i];if(s){var l=s.parentNode;e[i]=l.nodeName===t?l:!1}}}else{for(var i=0,a=e.length;a>i;i++){var s=e[i];s&&(e[i]=r?s.parentNode:s.parentNode===t)}r&&o.filter(t,e,!0)}},"":function(n,i,o){var a=r++,s=t;if(!i.match(/\W/)){var l=i=o?i:i.toUpperCase();s=e}s("parentNode",i,a,n,l,o)},"~":function(n,i,o){var a=r++,s=t;if("string"==typeof i&&!i.match(/\W/)){var l=i=o?i:i.toUpperCase();s=e}s("previousSibling",i,a,n,l,o)}},find:{ID:function(e,t,n){if("undefined"!=typeof t.getElementById&&!n){var r=t.getElementById(e[1]);return r?[r]:[]}},NAME:function(e,t,n){if("undefined"!=typeof t.getElementsByName){for(var r=[],i=t.getElementsByName(e[1]),o=0,a=i.length;a>o;o++)i[o].getAttribute("name")===e[1]&&r.push(i[o]);return 0===r.length?null:r}},TAG:function(e,t){return t.getElementsByTagName(e[1])}},preFilter:{CLASS:function(e,t,n,r,i,o){if(e=" "+e[1].replace(/\\/g,"")+" ",o)return e;for(var a,s=0;null!=(a=t[s]);s++)a&&(i^(a.className&&(" "+a.className+" ").indexOf(e)>=0)?n||r.push(a):n&&(t[s]=!1));return!1},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(e,t){for(var n=0;t[n]===!1;n++);return t[n]&&m(t[n])?e[1]:e[1].toUpperCase()},CHILD:function(e){if("nth"==e[1]){var t=/(-?)(\d*)n((?:\+|-)?\d*)/.exec("even"==e[2]&&"2n"||"odd"==e[2]&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=t[1]+(t[2]||1)-0,e[3]=t[3]-0}return e[0]=r++,e},ATTR:function(e,t,n,r,i,o){var s=e[1].replace(/\\/g,"");return!o&&a.attrMap[s]&&(e[1]=a.attrMap[s]),"~="===e[2]&&(e[4]=" "+e[4]+" "),e},PSEUDO:function(e,t,r,i,s){if("not"===e[1]){if(!(e[3].match(n).length>1||/^\w/.test(e[3]))){var l=o.filter(e[3],t,r,!0^s);return r||i.push.apply(i,l),!1}e[3]=o(e[3],null,null,t)}else if(a.match.POS.test(e[0])||a.match.CHILD.test(e[0]))return!0;return e},POS:function(e){return e.unshift(!0),e}},filters:{enabled:function(e){return e.disabled===!1&&"hidden"!==e.type},disabled:function(e){return e.disabled===!0},checked:function(e){return e.checked===!0},selected:function(e){return e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!!e.firstChild},empty:function(e){return!e.firstChild},has:function(e,t,n){return!!o(n[3],e).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||"BUTTON"===e.nodeName.toUpperCase()},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(e,t){return 0===t},last:function(e,t,n,r){return t===r.length-1},even:function(e,t){return t%2===0},odd:function(e,t){return t%2===1},lt:function(e,t,n){return t<n[3]-0},gt:function(e,t,n){return t>n[3]-0},nth:function(e,t,n){return n[3]-0==t},eq:function(e,t,n){return n[3]-0==t}},filter:{PSEUDO:function(e,t,n,r){var i=t[1],o=a.filters[i];if(o)return o(e,n,t,r);if("contains"===i)return(e.textContent||e.innerText||"").indexOf(t[3])>=0;if("not"===i){for(var s=t[3],n=0,l=s.length;l>n;n++)if(s[n]===e)return!1;return!0}},CHILD:function(e,t){var n=t[1],r=e;switch(n){case"only":case"first":for(;r=r.previousSibling;)if(1===r.nodeType)return!1;if("first"==n)return!0;r=e;case"last":for(;r=r.nextSibling;)if(1===r.nodeType)return!1;return!0;case"nth":var i=t[2],o=t[3];if(1==i&&0==o)return!0;var a=t[0],s=e.parentNode;if(s&&(s.sizcache!==a||!e.nodeIndex)){var l=0;for(r=s.firstChild;r;r=r.nextSibling)1===r.nodeType&&(r.nodeIndex=++l);s.sizcache=a}var c=e.nodeIndex-o;return 0==i?0==c:c%i==0&&c/i>=0}},ID:function(e,t){return 1===e.nodeType&&e.getAttribute("id")===t},TAG:function(e,t){return"*"===t&&1===e.nodeType||e.nodeName===t},CLASS:function(e,t){return(" "+(e.className||e.getAttribute("class"))+" ").indexOf(t)>-1},ATTR:function(e,t){var n=t[1],r=a.attrHandle[n]?a.attrHandle[n](e):null!=e[n]?e[n]:e.getAttribute(n),i=r+"",o=t[2],s=t[4];return null==r?"!="===o:"="===o?i===s:"*="===o?i.indexOf(s)>=0:"~="===o?(" "+i+" ").indexOf(s)>=0:s?"!="===o?i!=s:"^="===o?0===i.indexOf(s):"$="===o?i.substr(i.length-s.length)===s:"|="===o?i===s||i.substr(0,s.length+1)===s+"-":!1:i&&r!==!1},POS:function(e,t,n,r){var i=t[2],o=a.setFilters[i];return o?o(e,n,t,r):void 0}}},s=a.match.POS;for(var l in a.match)a.match[l]=RegExp(a.match[l].source+/(?![^\[]*\])(?![^\(]*\))/.source);var u=function(e,t){return e=Array.prototype.slice.call(e),t?(t.push.apply(t,e),t):e};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(d){u=function(e,t){var n=t||[];if("[object Array]"===i.call(e))Array.prototype.push.apply(n,e);else if("number"==typeof e.length)for(var r=0,o=e.length;o>r;r++)n.push(e[r]);else for(var r=0;e[r];r++)n.push(e[r]);return n}}var f;document.documentElement.compareDocumentPosition?f=function(e,t){var n=4&e.compareDocumentPosition(t)?-1:e===t?0:1;return 0===n&&(hasDuplicate=!0),n}:"sourceIndex"in document.documentElement?f=function(e,t){var n=e.sourceIndex-t.sourceIndex;return 0===n&&(hasDuplicate=!0),n}:document.createRange&&(f=function(e,t){var n=e.ownerDocument.createRange(),r=t.ownerDocument.createRange();n.selectNode(e),n.collapse(!0),r.selectNode(t),r.collapse(!0);var i=n.compareBoundaryPoints(Range.START_TO_END,r);return 0===i&&(hasDuplicate=!0),i}),function(){var e=document.createElement("form"),t="script"+(new Date).getTime();e.innerHTML="<input name='"+t+"'/>";var n=document.documentElement;n.insertBefore(e,n.firstChild),document.getElementById(t)&&(a.find.ID=function(e,t,n){if("undefined"!=typeof t.getElementById&&!n){var r=t.getElementById(e[1]);return r?r.id===e[1]||"undefined"!=typeof r.getAttributeNode&&r.getAttributeNode("id").nodeValue===e[1]?[r]:c:[]}},a.filter.ID=function(e,t){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return 1===e.nodeType&&n&&n.nodeValue===t}),n.removeChild(e)}(),function(){var e=document.createElement("div");e.appendChild(document.createComment("")),e.getElementsByTagName("*").length>0&&(a.find.TAG=function(e,t){var n=t.getElementsByTagName(e[1]);if("*"===e[1]){for(var r=[],i=0;n[i];i++)1===n[i].nodeType&&r.push(n[i]);n=r}return n}),e.innerHTML="<a href='#'></a>",e.firstChild&&"undefined"!=typeof e.firstChild.getAttribute&&"#"!==e.firstChild.getAttribute("href")&&(a.attrHandle.href=function(e){return e.getAttribute("href",2)})}(),document.querySelectorAll&&!function(){var e=o,t=document.createElement("div");t.innerHTML="<p class='TEST'></p>",t.querySelectorAll&&0===t.querySelectorAll(".TEST").length||(o=function(t,n,r,i){if(n=n||document,!i&&9===n.nodeType&&!m(n))try{return u(n.querySelectorAll(t),r)}catch(o){}return e(t,n,r,i)},o.find=e.find,o.filter=e.filter,o.selectors=e.selectors,o.matches=e.matches)}(),document.getElementsByClassName&&document.documentElement.getElementsByClassName&&!function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>",0!==e.getElementsByClassName("e").length&&(e.lastChild.className="e",1!==e.getElementsByClassName("e").length&&(a.order.splice(1,0,"CLASS"),a.find.CLASS=function(e,t,n){return"undefined"==typeof t.getElementsByClassName||n?void 0:t.getElementsByClassName(e[1])}))}();var p=document.compareDocumentPosition?function(e,t){return 16&e.compareDocumentPosition(t)}:function(e,t){return e!==t&&(e.contains?e.contains(t):!0)},m=function(e){return 9===e.nodeType&&"HTML"!==e.documentElement.nodeName||!!e.ownerDocument&&m(e.ownerDocument)},v=function(e,t){for(var n,r=[],i="",s=t.nodeType?[t]:t;n=a.match.PSEUDO.exec(e);)i+=n[0],e=e.replace(a.match.PSEUDO,"");e=a.relative[e]?e+"*":e;for(var l=0,c=s.length;c>l;l++)o(e,s[l],r);return o.filter(i,r)};h.find=o,h.filter=o.filter,h.expr=o.selectors,h.expr[":"]=h.expr.filters,o.selectors.filters.hidden=function(e){return 0===e.offsetWidth||0===e.offsetHeight},o.selectors.filters.visible=function(e){return e.offsetWidth>0||e.offsetHeight>0},o.selectors.filters.animated=function(e){return h.grep(h.timers,function(t){return e===t.elem}).length},h.multiFilter=function(e,t,n){return n&&(e=":not("+e+")"),o.matches(e,t)},h.dir=function(e,t){for(var n=[],r=e[t];r&&r!=document;)1==r.nodeType&&n.push(r),r=r[t];return n},h.nth=function(e,t,n,r){t=t||1;for(var i=0;e&&(1!=e.nodeType||++i!=t);e=e[n]);return e},h.sibling=function(e,t){for(var n=[];e;e=e.nextSibling)1==e.nodeType&&e!=t&&n.push(e);return n}}(),h.event={add:function(e,t,n,r){if(3!=e.nodeType&&8!=e.nodeType){if(e.setInterval&&e!=u&&(e=u),n.guid||(n.guid=this.guid++),r!==c){var i=n;n=this.proxy(i),n.data=r}var o=h.data(e,"events")||h.data(e,"events",{}),a=h.data(e,"handle")||h.data(e,"handle",function(){return"undefined"==typeof h||h.event.triggered?c:h.event.handle.apply(arguments.callee.elem,arguments)});a.elem=e,h.each(t.split(/\s+/),function(t,i){var s=i.split(".");i=s.shift(),n.type=s.slice().sort().join(".");var l=o[i];h.event.specialAll[i]&&h.event.specialAll[i].setup.call(e,r,s),l||(l=o[i]={},h.event.special[i]&&h.event.special[i].setup.call(e,r,s)!==!1||(e.addEventListener?e.addEventListener(i,a,!1):e.attachEvent&&e.attachEvent("on"+i,a))),l[n.guid]=n,h.event.global[i]=!0}),e=null}},guid:1,global:{},remove:function(e,t,n){if(3!=e.nodeType&&8!=e.nodeType){var r,i=h.data(e,"events");if(i){if(t===c||"string"==typeof t&&"."==t.charAt(0))for(var o in i)this.remove(e,o+(t||""));else t.type&&(n=t.handler,t=t.type),h.each(t.split(/\s+/),function(t,o){var a=o.split(".");o=a.shift();var s=RegExp("(^|\\.)"+a.slice().sort().join(".*\\.")+"(\\.|$)");if(i[o]){if(n)delete i[o][n.guid];else for(var l in i[o])s.test(i[o][l].type)&&delete i[o][l];h.event.specialAll[o]&&h.event.specialAll[o].teardown.call(e,a);for(r in i[o])break;r||(h.event.special[o]&&h.event.special[o].teardown.call(e,a)!==!1||(e.removeEventListener?e.removeEventListener(o,h.data(e,"handle"),!1):e.detachEvent&&e.detachEvent("on"+o,h.data(e,"handle"))),r=null,delete i[o])}});for(r in i)break;if(!r){var a=h.data(e,"handle");a&&(a.elem=null),h.removeData(e,"events"),h.removeData(e,"handle")}}}},trigger:function(e,t,n,r){var i=e.type||e;if(!r){if(e="object"==typeof e?e[x]?e:h.extend(h.Event(i),e):h.Event(i),i.indexOf("!")>=0&&(e.type=i=i.slice(0,-1),e.exclusive=!0),
+n||(e.stopPropagation(),this.global[i]&&h.each(h.cache,function(){this.events&&this.events[i]&&h.event.trigger(e,t,this.handle.elem)})),!n||3==n.nodeType||8==n.nodeType)return c;e.result=c,e.target=n,t=h.makeArray(t),t.unshift(e)}e.currentTarget=n;var o=h.data(n,"handle");if(o&&o.apply(n,t),(!n[i]||h.nodeName(n,"a")&&"click"==i)&&n["on"+i]&&n["on"+i].apply(n,t)===!1&&(e.result=!1),!r&&n[i]&&!e.isDefaultPrevented()&&(!h.nodeName(n,"a")||"click"!=i)){this.triggered=!0;try{n[i]()}catch(a){}}if(this.triggered=!1,!e.isPropagationStopped()){var s=n.parentNode||n.ownerDocument;s&&h.event.trigger(e,t,s,!0)}},handle:function(e){var t,n;e=arguments[0]=h.event.fix(e||u.event),e.currentTarget=this;var r=e.type.split(".");e.type=r.shift(),t=!r.length&&!e.exclusive;var i=RegExp("(^|\\.)"+r.slice().sort().join(".*\\.")+"(\\.|$)");n=(h.data(this,"events")||{})[e.type];for(var o in n){var a=n[o];if(t||i.test(a.type)){e.handler=a,e.data=a.data;var s=a.apply(this,arguments);if(s!==c&&(e.result=s,s===!1&&(e.preventDefault(),e.stopPropagation())),e.isImmediatePropagationStopped())break}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(e){if(e[x])return e;var t=e;e=h.Event(t);for(var n,r=this.props.length;r;)n=this.props[--r],e[n]=t[n];if(e.target||(e.target=e.srcElement||document),3==e.target.nodeType&&(e.target=e.target.parentNode),!e.relatedTarget&&e.fromElement&&(e.relatedTarget=e.fromElement==e.target?e.toElement:e.fromElement),null==e.pageX&&null!=e.clientX){var i=document.documentElement,o=document.body;e.pageX=e.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i.clientLeft||0),e.pageY=e.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i.clientTop||0)}return!e.which&&(e.charCode||0===e.charCode?e.charCode:e.keyCode)&&(e.which=e.charCode||e.keyCode),!e.metaKey&&e.ctrlKey&&(e.metaKey=e.ctrlKey),!e.which&&e.button&&(e.which=1&e.button?1:2&e.button?3:4&e.button?2:0),e},proxy:function(e,t){return t=t||function(){return e.apply(this,arguments)},t.guid=e.guid=e.guid||t.guid||this.guid++,t},special:{ready:{setup:s,teardown:function(){}}},specialAll:{live:{setup:function(e,t){h.event.add(this,t[0],o)},teardown:function(e){if(e.length){var t=0,n=RegExp("(^|\\.)"+e[0]+"(\\.|$)");h.each(h.data(this,"events").live||{},function(){n.test(this.type)&&t++}),1>t&&h.event.remove(this,e[0],o)}}}}},h.Event=function(e){return this.preventDefault?(e&&e.type?(this.originalEvent=e,this.type=e.type):this.type=e,this.timeStamp=t(),void(this[x]=!0)):new h.Event(e)},h.Event.prototype={preventDefault:function(){this.isDefaultPrevented=i;var e=this.originalEvent;e&&(e.preventDefault&&e.preventDefault(),e.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=i;var e=this.originalEvent;e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=i,this.stopPropagation()},isDefaultPrevented:r,isPropagationStopped:r,isImmediatePropagationStopped:r};var E=function(e){for(var t=e.relatedTarget;t&&t!=this;)try{t=t.parentNode}catch(n){t=this}t!=this&&(e.type=e.data,h.event.handle.apply(this,arguments))};h.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(e,t){h.event.special[t]={setup:function(){h.event.add(this,e,E,t)},teardown:function(){h.event.remove(this,e,E)}}}),h.fn.extend({bind:function(e,t,n){return"unload"==e?this.one(e,t,n):this.each(function(){h.event.add(this,e,n||t,n&&t)})},one:function(e,t,n){var r=h.event.proxy(n||t,function(e){return h(this).unbind(e,r),(n||t).apply(this,arguments)});return this.each(function(){h.event.add(this,e,r,n&&t)})},unbind:function(e,t){return this.each(function(){h.event.remove(this,e,t)})},trigger:function(e,t){return this.each(function(){h.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0]){var n=h.Event(e);return n.preventDefault(),n.stopPropagation(),h.event.trigger(n,t,this[0]),n.result}},toggle:function(e){for(var t=arguments,n=1;n<t.length;)h.event.proxy(e,t[n++]);return this.click(h.event.proxy(e,function(e){return this.lastToggle=(this.lastToggle||0)%n,e.preventDefault(),t[this.lastToggle++].apply(this,arguments)||!1}))},hover:function(e,t){return this.mouseenter(e).mouseleave(t)},ready:function(e){return s(),h.isReady?e.call(document,h):h.readyList.push(e),this},live:function(e,t){var n=h.event.proxy(t);return n.guid+=this.selector+e,h(document).bind(a(e,this.selector),this.selector,n),this},die:function(e,t){return h(document).unbind(a(e,this.selector),t?{guid:t.guid+this.selector+e}:null),this}}),h.extend({isReady:!1,readyList:[],ready:function(){h.isReady||(h.isReady=!0,h.readyList&&(h.each(h.readyList,function(){this.call(document,h)}),h.readyList=null),h(document).triggerHandler("ready"))}});var S=!1;h.each("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error".split(","),function(e,t){h.fn[t]=function(e){return e?this.bind(t,e):this.trigger(t)}}),h(u).bind("unload",function(){for(var e in h.cache)1!=e&&h.cache[e].handle&&h.event.remove(h.cache[e].handle.elem)}),function(){h.support={};var e=document.documentElement,t=document.createElement("script"),n=document.createElement("div"),r="script"+(new Date).getTime();n.style.display="none",n.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var i=n.getElementsByTagName("*"),o=n.getElementsByTagName("a")[0];if(i&&i.length&&o){h.support={leadingWhitespace:3==n.firstChild.nodeType,tbody:!n.getElementsByTagName("tbody").length,objectAll:!!n.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/red/.test(o.getAttribute("style")),hrefNormalized:"/a"===o.getAttribute("href"),opacity:"0.5"===o.style.opacity,cssFloat:!!o.style.cssFloat,scriptEval:!1,noCloneEvent:!0,boxModel:null},t.type="text/javascript";try{t.appendChild(document.createTextNode("window."+r+"=1;"))}catch(a){}e.insertBefore(t,e.firstChild),u[r]&&(h.support.scriptEval=!0,delete u[r]),e.removeChild(t),n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",function(){h.support.noCloneEvent=!1,n.detachEvent("onclick",arguments.callee)}),n.cloneNode(!0).fireEvent("onclick")),h(function(){var e=document.createElement("div");e.style.width=e.style.paddingLeft="1px",document.body.appendChild(e),h.boxModel=h.support.boxModel=2===e.offsetWidth,document.body.removeChild(e).style.display="none"})}}();var w=h.support.cssFloat?"cssFloat":"styleFloat";h.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"},h.fn.extend({_load:h.fn.load,load:function(e,t,n){if("string"!=typeof e)return this._load(e);var r=e.indexOf(" ");if(r>=0){var i=e.slice(r,e.length);e=e.slice(0,r)}var o="GET";t&&(h.isFunction(t)?(n=t,t=null):"object"==typeof t&&(t=h.param(t),o="POST"));var a=this;return h.ajax({url:e,type:o,dataType:"html",data:t,complete:function(e,t){"success"!=t&&"notmodified"!=t||a.html(i?h("<div/>").append(e.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(i):e.responseText),n&&a.each(n,[e.responseText,t,e])}}),this},serialize:function(){return h.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?h.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(e,t){var n=h(this).val();return null==n?null:h.isArray(n)?h.map(n,function(e,n){return{name:t.name,value:e}}):{name:t.name,value:n}}).get()}}),h.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(e,t){h.fn[t]=function(e){return this.bind(t,e)}});var C=t();h.extend({get:function(e,t,n,r){return h.isFunction(t)&&(n=t,t=null),h.ajax({type:"GET",url:e,data:t,success:n,dataType:r})},getScript:function(e,t){return h.get(e,null,t,"script")},getJSON:function(e,t,n){return h.get(e,t,n,"json")},post:function(e,t,n,r){return h.isFunction(t)&&(n=t,t={}),h.ajax({type:"POST",url:e,data:t,success:n,dataType:r})},ajaxSetup:function(e){h.extend(h.ajaxSettings,e)},ajaxSettings:{url:location.href,global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,xhr:function(){return u.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(e){function n(){e.success&&e.success(a,o),e.global&&h.event.trigger("ajaxSuccess",[b,e])}function r(){e.complete&&e.complete(b,o),e.global&&h.event.trigger("ajaxComplete",[b,e]),e.global&&!--h.active&&h.event.trigger("ajaxStop")}e=h.extend(!0,e,h.extend(!0,{},h.ajaxSettings,e));var i,o,a,s=/=\?(&|$)/g,l=e.type.toUpperCase();if(e.data&&e.processData&&"string"!=typeof e.data&&(e.data=h.param(e.data)),"jsonp"==e.dataType&&("GET"==l?e.url.match(s)||(e.url+=(e.url.match(/\?/)?"&":"?")+(e.jsonp||"callback")+"=?"):e.data&&e.data.match(s)||(e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?"),e.dataType="json"),"json"==e.dataType&&(e.data&&e.data.match(s)||e.url.match(s))&&(i="jsonp"+C++,e.data&&(e.data=(e.data+"").replace(s,"="+i+"$1")),e.url=e.url.replace(s,"="+i+"$1"),e.dataType="script",u[i]=function(e){a=e,n(),r(),u[i]=c;try{delete u[i]}catch(t){}m&&m.removeChild(v)}),"script"==e.dataType&&null==e.cache&&(e.cache=!1),e.cache===!1&&"GET"==l){var d=t(),f=e.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+d+"$2");e.url=f+(f==e.url?(e.url.match(/\?/)?"&":"?")+"_="+d:"")}e.data&&"GET"==l&&(e.url+=(e.url.match(/\?/)?"&":"?")+e.data,e.data=null),e.global&&!h.active++&&h.event.trigger("ajaxStart");var p=/^(\w+:)?\/\/([^\/?#]+)/.exec(e.url);if("script"==e.dataType&&"GET"==l&&p&&(p[1]&&p[1]!=location.protocol||p[2]!=location.host)){var m=document.getElementsByTagName("head")[0],v=document.createElement("script");if(v.src=e.url,e.scriptCharset&&(v.charset=e.scriptCharset),!i){var y=!1;v.onload=v.onreadystatechange=function(){y||this.readyState&&"loaded"!=this.readyState&&"complete"!=this.readyState||(y=!0,n(),r(),v.onload=v.onreadystatechange=null,m.removeChild(v))}}return m.appendChild(v),c}var g=!1,b=e.xhr();e.username?b.open(l,e.url,e.async,e.username,e.password):b.open(l,e.url,e.async);try{e.data&&b.setRequestHeader("Content-Type",e.contentType),e.ifModified&&b.setRequestHeader("If-Modified-Since",h.lastModified[e.url]||"Thu, 01 Jan 1970 00:00:00 GMT"),b.setRequestHeader("X-Requested-With","XMLHttpRequest"),b.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(x){}if(e.beforeSend&&e.beforeSend(b,e)===!1)return e.global&&!--h.active&&h.event.trigger("ajaxStop"),b.abort(),!1;e.global&&h.event.trigger("ajaxSend",[b,e]);var T=function(t){if(0==b.readyState)N&&(clearInterval(N),N=null,e.global&&!--h.active&&h.event.trigger("ajaxStop"));else if(!g&&b&&(4==b.readyState||"timeout"==t)){if(g=!0,N&&(clearInterval(N),N=null),o="timeout"==t?"timeout":h.httpSuccess(b)?e.ifModified&&h.httpNotModified(b,e.url)?"notmodified":"success":"error","success"==o)try{a=h.httpData(b,e.dataType,e)}catch(s){o="parsererror"}if("success"==o){var l;try{l=b.getResponseHeader("Last-Modified")}catch(s){}e.ifModified&&l&&(h.lastModified[e.url]=l),i||n()}else h.handleError(e,b,o);r(),t&&b.abort(),e.async&&(b=null)}};if(e.async){var N=setInterval(T,13);e.timeout>0&&setTimeout(function(){b&&!g&&T("timeout")},e.timeout)}try{b.send(e.data)}catch(x){h.handleError(e,b,null,x)}return e.async||T(),b},handleError:function(e,t,n,r){e.error&&e.error(t,n,r),e.global&&h.event.trigger("ajaxError",[t,e,r])},active:0,httpSuccess:function(e){try{return!e.status&&"file:"==location.protocol||e.status>=200&&e.status<300||304==e.status||1223==e.status}catch(t){}return!1},httpNotModified:function(e,t){try{var n=e.getResponseHeader("Last-Modified");return 304==e.status||n==h.lastModified[t]}catch(r){}return!1},httpData:function(e,t,n){var r=e.getResponseHeader("content-type"),i="xml"==t||!t&&r&&r.indexOf("xml")>=0,o=i?e.responseXML:e.responseText;if(i&&"parsererror"==o.documentElement.tagName)throw"parsererror";return n&&n.dataFilter&&(o=n.dataFilter(o,t)),"string"==typeof o&&("script"==t&&h.globalEval(o),"json"==t&&(o=u.eval("("+o+")"))),o},param:function(e){function t(e,t){n[n.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)}var n=[];if(h.isArray(e)||e.jquery)h.each(e,function(){t(this.name,this.value)});else for(var r in e)h.isArray(e[r])?h.each(e[r],function(){t(r,this)}):t(r,h.isFunction(e[r])?e[r]():e[r]);return n.join("&").replace(/%20/g,"+")}});var A,D={},L=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];h.fn.extend({show:function(e,t){if(e)return this.animate(l("show",3),e,t);for(var n=0,r=this.length;r>n;n++){var i=h.data(this[n],"olddisplay");if(this[n].style.display=i||"","none"===h.css(this[n],"display")){var o,a=this[n].tagName;if(D[a])o=D[a];else{var s=h("<"+a+" />").appendTo("body");o=s.css("display"),"none"===o&&(o="block"),s.remove(),D[a]=o}h.data(this[n],"olddisplay",o)}}for(var n=0,r=this.length;r>n;n++)this[n].style.display=h.data(this[n],"olddisplay")||"";return this},hide:function(e,t){if(e)return this.animate(l("hide",3),e,t);for(var n=0,r=this.length;r>n;n++){var i=h.data(this[n],"olddisplay");i||"none"===i||h.data(this[n],"olddisplay",h.css(this[n],"display"))}for(var n=0,r=this.length;r>n;n++)this[n].style.display="none";return this},_toggle:h.fn.toggle,toggle:function(e,t){var n="boolean"==typeof e;return h.isFunction(e)&&h.isFunction(t)?this._toggle.apply(this,arguments):null==e||n?this.each(function(){var t=n?e:h(this).is(":hidden");h(this)[t?"show":"hide"]()}):this.animate(l("toggle",3),e,t)},fadeTo:function(e,t,n){return this.animate({opacity:t},e,n)},animate:function(e,t,n,r){var i=h.speed(t,n,r);return this[i.queue===!1?"each":"queue"](function(){var t,n=h.extend({},i),r=1==this.nodeType&&h(this).is(":hidden"),o=this;for(t in e){if("hide"==e[t]&&r||"show"==e[t]&&!r)return n.complete.call(this);"height"!=t&&"width"!=t||!this.style||(n.display=h.css(this,"display"),n.overflow=this.style.overflow)}return null!=n.overflow&&(this.style.overflow="hidden"),n.curAnim=h.extend({},e),h.each(e,function(t,i){var a=new h.fx(o,n,t);if(/toggle|show|hide/.test(i))a["toggle"==i?r?"show":"hide":i](e);else{var s=i.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),l=a.cur(!0)||0;if(s){var c=parseFloat(s[2]),u=s[3]||"px";"px"!=u&&(o.style[t]=(c||1)+u,l=(c||1)/a.cur(!0)*l,o.style[t]=l+u),s[1]&&(c=("-="==s[1]?-1:1)*c+l),a.custom(l,c,u)}else a.custom(l,i,"")}}),!0})},stop:function(e,t){var n=h.timers;return e&&this.queue([]),this.each(function(){for(var e=n.length-1;e>=0;e--)n[e].elem==this&&(t&&n[e](!0),n.splice(e,1))}),t||this.dequeue(),this}}),h.each({slideDown:l("show",1),slideUp:l("hide",1),slideToggle:l("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(e,t){h.fn[e]=function(e,n){return this.animate(t,e,n)}}),h.extend({speed:function(e,t,n){var r="object"==typeof e?e:{complete:n||!n&&t||h.isFunction(e)&&e,duration:e,easing:n&&t||t&&!h.isFunction(t)&&t};return r.duration=h.fx.off?0:"number"==typeof r.duration?r.duration:h.fx.speeds[r.duration]||h.fx.speeds._default,r.old=r.complete,r.complete=function(){r.queue!==!1&&h(this).dequeue(),h.isFunction(r.old)&&r.old.call(this)},r},easing:{linear:function(e,t,n,r){return n+r*e},swing:function(e,t,n,r){return(-Math.cos(e*Math.PI)/2+.5)*r+n}},timers:[],fx:function(e,t,n){this.options=t,this.elem=e,this.prop=n,t.orig||(t.orig={})}}),h.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(h.fx.step[this.prop]||h.fx.step._default)(this),"height"!=this.prop&&"width"!=this.prop||!this.elem.style||(this.elem.style.display="block")},cur:function(e){if(null!=this.elem[this.prop]&&(!this.elem.style||null==this.elem.style[this.prop]))return this.elem[this.prop];var t=parseFloat(h.css(this.elem,this.prop,e));return t&&t>-1e4?t:parseFloat(h.curCSS(this.elem,this.prop))||0},custom:function(e,n,r){function i(e){return o.step(e)}this.startTime=t(),this.start=e,this.end=n,this.unit=r||this.unit||"px",this.now=this.start,this.pos=this.state=0;var o=this;i.elem=this.elem,i()&&h.timers.push(i)&&!A&&(A=setInterval(function(){for(var e=h.timers,t=0;t<e.length;t++)e[t]()||e.splice(t--,1);e.length||(clearInterval(A),A=c)},13))},show:function(){this.options.orig[this.prop]=h.attr(this.elem.style,this.prop),this.options.show=!0,this.custom("width"==this.prop||"height"==this.prop?1:0,this.cur()),h(this.elem).show()},hide:function(){this.options.orig[this.prop]=h.attr(this.elem.style,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(e){var n=t();if(e||n>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;var r=!0;for(var i in this.options.curAnim)this.options.curAnim[i]!==!0&&(r=!1);if(r){if(null!=this.options.display&&(this.elem.style.overflow=this.options.overflow,this.elem.style.display=this.options.display,"none"==h.css(this.elem,"display")&&(this.elem.style.display="block")),this.options.hide&&h(this.elem).hide(),this.options.hide||this.options.show)for(var o in this.options.curAnim)h.attr(this.elem.style,o,this.options.orig[o]);this.options.complete.call(this.elem)}return!1}var a=n-this.startTime;return this.state=a/this.options.duration,this.pos=h.easing[this.options.easing||(h.easing.swing?"swing":"linear")](this.state,a,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update(),!0}},h.extend(h.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(e){h.attr(e.elem.style,"opacity",e.now)},_default:function(e){e.elem.style&&null!=e.elem.style[e.prop]?e.elem.style[e.prop]=e.now+e.unit:e.elem[e.prop]=e.now}}}),document.documentElement.getBoundingClientRect?h.fn.offset=function(){if(!this[0])return{top:0,left:0};if(this[0]===this[0].ownerDocument.body)return h.offset.bodyOffset(this[0]);var e=this[0].getBoundingClientRect(),t=this[0].ownerDocument,n=t.body,r=t.documentElement,i=r.clientTop||n.clientTop||0,o=r.clientLeft||n.clientLeft||0,a=e.top+(self.pageYOffset||h.boxModel&&r.scrollTop||n.scrollTop)-i,s=e.left+(self.pageXOffset||h.boxModel&&r.scrollLeft||n.scrollLeft)-o;return{top:a,left:s}}:h.fn.offset=function(){if(!this[0])return{top:0,left:0};if(this[0]===this[0].ownerDocument.body)return h.offset.bodyOffset(this[0]);h.offset.initialized||h.offset.initialize();for(var e,t=this[0],n=t.offsetParent,r=t,i=t.ownerDocument,o=i.documentElement,a=i.body,s=i.defaultView,l=s.getComputedStyle(t,null),c=t.offsetTop,u=t.offsetLeft;(t=t.parentNode)&&t!==a&&t!==o;)e=s.getComputedStyle(t,null),c-=t.scrollTop,u-=t.scrollLeft,t===n&&(c+=t.offsetTop,u+=t.offsetLeft,!h.offset.doesNotAddBorder||h.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(t.tagName)||(c+=parseInt(e.borderTopWidth,10)||0,u+=parseInt(e.borderLeftWidth,10)||0),r=n,n=t.offsetParent),h.offset.subtractsBorderForOverflowNotVisible&&"visible"!==e.overflow&&(c+=parseInt(e.borderTopWidth,10)||0,u+=parseInt(e.borderLeftWidth,10)||0),l=e;return"relative"!==l.position&&"static"!==l.position||(c+=a.offsetTop,u+=a.offsetLeft),"fixed"===l.position&&(c+=Math.max(o.scrollTop,a.scrollTop),u+=Math.max(o.scrollLeft,a.scrollLeft)),{top:c,left:u}},h.offset={initialize:function(){if(!this.initialized){var e,t,n,r,i,o=document.body,a=document.createElement("div"),s=o.style.marginTop,l='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';r={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(i in r)a.style[i]=r[i];a.innerHTML=l,o.insertBefore(a,o.firstChild),e=a.firstChild,t=e.firstChild,n=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=5!==t.offsetTop,this.doesAddBorderForTableAndCells=5===n.offsetTop,e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=-5===t.offsetTop,o.style.marginTop="1px",this.doesNotIncludeMarginInBodyOffset=0===o.offsetTop,o.style.marginTop=s,o.removeChild(a),this.initialized=!0}},bodyOffset:function(e){h.offset.initialized||h.offset.initialize();var t=e.offsetTop,n=e.offsetLeft;return h.offset.doesNotIncludeMarginInBodyOffset&&(t+=parseInt(h.curCSS(e,"marginTop",!0),10)||0,n+=parseInt(h.curCSS(e,"marginLeft",!0),10)||0),{top:t,left:n}}},h.fn.extend({position:function(){var e;if(this[0]){var t=this.offsetParent(),r=this.offset(),i=/^body|html$/i.test(t[0].tagName)?{top:0,left:0}:t.offset();r.top-=n(this,"marginTop"),r.left-=n(this,"marginLeft"),i.top+=n(t,"borderTopWidth"),i.left+=n(t,"borderLeftWidth"),e={top:r.top-i.top,left:r.left-i.left}}return e},offsetParent:function(){for(var e=this[0].offsetParent||document.body;e&&!/^body|html$/i.test(e.tagName)&&"static"==h.css(e,"position");)e=e.offsetParent;return h(e)}}),h.each(["Left","Top"],function(e,t){var n="scroll"+t;h.fn[n]=function(t){return this[0]?t!==c?this.each(function(){this==u||this==document?u.scrollTo(e?h(u).scrollLeft():t,e?t:h(u).scrollTop()):this[n]=t}):this[0]==u||this[0]==document?self[e?"pageYOffset":"pageXOffset"]||h.boxModel&&document.documentElement[n]||document.body[n]:this[0][n]:null}}),h.each(["Height","Width"],function(e,t){var n=t.toLowerCase();h.fn["inner"+t]=function(){return this[0]?h.css(this[0],n,!1,"padding"):null},h.fn["outer"+t]=function(e){return this[0]?h.css(this[0],n,!1,e?"margin":"border"):null};var r=t.toLowerCase();h.fn[r]=function(e){return this[0]==u?"CSS1Compat"==document.compatMode&&document.documentElement["client"+t]||document.body["client"+t]:this[0]==document?Math.max(document.documentElement["client"+t],document.body["scroll"+t],document.documentElement["scroll"+t],document.body["offset"+t],document.documentElement["offset"+t]):e===c?this.length?h.css(this[0],r):null:this.css(r,"string"==typeof e?e:e+"px")}})}();
 !function(e,t,n){"use strict";function r(e,t){return t=t||Error,function(){var n,r,i=2,o=arguments,a=o[0],s="["+(e?e+":":"")+a+"] ",u=o[1];for(s+=u.replace(/\{\d+\}/g,function(e){var t=+e.slice(1,-1),n=t+i;return n<o.length?ye(o[n]):e}),s+="\nhttp://errors.angularjs.org/1.4.6/"+(e?e+"/":"")+a,r=i,n="?";r<o.length;r++,n="&")s+=n+"p"+(r-i)+"="+encodeURIComponent(ye(o[r]));return new t(s)}}function i(e){if(null==e||O(e))return!1;var t="length"in Object(e)&&e.length;return e.nodeType===zr&&t?!0:S(e)||Ir(e)||0===t||"number"==typeof t&&t>0&&t-1 in e}function o(e,t,n){var r,a;if(e)if(k(e))for(r in e)"prototype"==r||"length"==r||"name"==r||e.hasOwnProperty&&!e.hasOwnProperty(r)||t.call(n,e[r],r,e);else if(Ir(e)||i(e)){var s="object"!=typeof e;for(r=0,a=e.length;a>r;r++)(s||r in e)&&t.call(n,e[r],r,e)}else if(e.forEach&&e.forEach!==o)e.forEach(t,n,e);else if(x(e))for(r in e)t.call(n,e[r],r,e);else if("function"==typeof e.hasOwnProperty)for(r in e)e.hasOwnProperty(r)&&t.call(n,e[r],r,e);else for(r in e)yr.call(e,r)&&t.call(n,e[r],r,e);return e}function a(e,t,n){for(var r=Object.keys(e).sort(),i=0;i<r.length;i++)t.call(n,e[r[i]],r[i]);return r}function s(e){return function(t,n){e(n,t)}}function u(){return++Pr}function c(e,t){t?e.$$hashKey=t:delete e.$$hashKey}function l(e,t,n){for(var r=e.$$hashKey,i=0,o=t.length;o>i;++i){var a=t[i];if(w(a)||k(a))for(var s=Object.keys(a),u=0,f=s.length;f>u;u++){var h=s[u],p=a[h];n&&w(p)?C(p)?e[h]=new Date(p.valueOf()):A(p)?e[h]=new RegExp(p):(w(e[h])||(e[h]=Ir(p)?[]:{}),l(e[h],[p],!0)):e[h]=p}}return c(e,r),e}function f(e){return l(e,Ar.call(arguments,1),!1)}function h(e){return l(e,Ar.call(arguments,1),!0)}function p(e){return parseInt(e,10)}function d(e,t){return f(Object.create(e),t)}function $(){}function v(e){return e}function m(e){return function(){return e}}function g(e){return k(e.toString)&&e.toString!==Object.prototype.toString}function y(e){return"undefined"==typeof e}function b(e){return"undefined"!=typeof e}function w(e){return null!==e&&"object"==typeof e}function x(e){return null!==e&&"object"==typeof e&&!Nr(e)}function S(e){return"string"==typeof e}function E(e){return"number"==typeof e}function C(e){return"[object Date]"===Tr.call(e)}function k(e){return"function"==typeof e}function A(e){return"[object RegExp]"===Tr.call(e)}function O(e){return e&&e.window===e}function M(e){return e&&e.$evalAsync&&e.$watch}function T(e){return"[object File]"===Tr.call(e)}function N(e){return"[object FormData]"===Tr.call(e)}function V(e){return"[object Blob]"===Tr.call(e)}function j(e){return"boolean"==typeof e}function P(e){return e&&k(e.then)}function D(e){return Rr.test(Tr.call(e))}function I(e){return!(!e||!(e.nodeName||e.prop&&e.attr&&e.find))}function R(e){var t,n={},r=e.split(",");for(t=0;t<r.length;t++)n[r[t]]=!0;return n}function _(e){return gr(e.nodeName||e[0]&&e[0].nodeName)}function q(e,t){var n=e.indexOf(t);return n>=0&&e.splice(n,1),n}function F(e,t,n,r){if(O(e)||M(e))throw Vr("cpws","Can't copy! Making copies of Window or Scope instances is not supported.");if(D(t))throw Vr("cpta","Can't copy! TypedArray destination cannot be mutated.");if(t){if(e===t)throw Vr("cpi","Can't copy! Source and destination are identical.");n=n||[],r=r||[],w(e)&&(n.push(e),r.push(t));var i;if(Ir(e)){t.length=0;for(var a=0;a<e.length;a++)t.push(F(e[a],null,n,r))}else{var s=t.$$hashKey;if(Ir(t)?t.length=0:o(t,function(e,n){delete t[n]}),x(e))for(i in e)t[i]=F(e[i],null,n,r);else if(e&&"function"==typeof e.hasOwnProperty)for(i in e)e.hasOwnProperty(i)&&(t[i]=F(e[i],null,n,r));else for(i in e)yr.call(e,i)&&(t[i]=F(e[i],null,n,r));c(t,s)}}else if(t=e,w(e)){var u;if(n&&-1!==(u=n.indexOf(e)))return r[u];if(Ir(e))return F(e,[],n,r);if(D(e))t=new e.constructor(e);else if(C(e))t=new Date(e.getTime());else if(A(e))t=new RegExp(e.source,e.toString().match(/[^\/]*$/)[0]),t.lastIndex=e.lastIndex;else{if(!k(e.cloneNode)){var l=Object.create(Nr(e));return F(e,l,n,r)}t=e.cloneNode(!0)}r&&(n.push(e),r.push(t))}return t}function U(e,t){if(Ir(e)){t=t||[];for(var n=0,r=e.length;r>n;n++)t[n]=e[n]}else if(w(e)){t=t||{};for(var i in e)"$"===i.charAt(0)&&"$"===i.charAt(1)||(t[i]=e[i])}return t||e}function B(e,t){if(e===t)return!0;if(null===e||null===t)return!1;if(e!==e&&t!==t)return!0;var n,r,i,o=typeof e,a=typeof t;if(o==a&&"object"==o){if(!Ir(e)){if(C(e))return C(t)?B(e.getTime(),t.getTime()):!1;if(A(e))return A(t)?e.toString()==t.toString():!1;if(M(e)||M(t)||O(e)||O(t)||Ir(t)||C(t)||A(t))return!1;i=ve();for(r in e)if("$"!==r.charAt(0)&&!k(e[r])){if(!B(e[r],t[r]))return!1;i[r]=!0}for(r in t)if(!(r in i)&&"$"!==r.charAt(0)&&b(t[r])&&!k(t[r]))return!1;return!0}if(!Ir(t))return!1;if((n=e.length)==t.length){for(r=0;n>r;r++)if(!B(e[r],t[r]))return!1;return!0}}return!1}function H(e,t,n){return e.concat(Ar.call(t,n))}function L(e,t){return Ar.call(e,t||0)}function z(e,t){var n=arguments.length>2?L(arguments,2):[];return!k(t)||t instanceof RegExp?t:n.length?function(){return arguments.length?t.apply(e,H(n,arguments,0)):t.apply(e,n)}:function(){return arguments.length?t.apply(e,arguments):t.call(e)}}function W(e,r){var i=r;return"string"==typeof e&&"$"===e.charAt(0)&&"$"===e.charAt(1)?i=n:O(r)?i="$WINDOW":r&&t===r?i="$DOCUMENT":M(r)&&(i="$SCOPE"),i}function G(e,t){return"undefined"==typeof e?n:(E(t)||(t=t?2:null),JSON.stringify(e,W,t))}function Y(e){return S(e)?JSON.parse(e):e}function J(e,t){var n=Date.parse("Jan 01, 1970 00:00:00 "+e)/6e4;return isNaN(n)?t:n}function K(e,t){return e=new Date(e.getTime()),e.setMinutes(e.getMinutes()+t),e}function Z(e,t,n){n=n?-1:1;var r=J(t,e.getTimezoneOffset());return K(e,n*(r-e.getTimezoneOffset()))}function X(e){e=Er(e).clone();try{e.empty()}catch(t){}var n=Er("<div>").append(e).html();try{return e[0].nodeType===Gr?gr(n):n.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(e,t){return"<"+gr(t)})}catch(t){return gr(n)}}function Q(e){try{return decodeURIComponent(e)}catch(t){}}function ee(e){var t={};return o((e||"").split("&"),function(e){var n,r,i;e&&(r=e=e.replace(/\+/g,"%20"),n=e.indexOf("="),-1!==n&&(r=e.substring(0,n),i=e.substring(n+1)),r=Q(r),b(r)&&(i=b(i)?Q(i):!0,yr.call(t,r)?Ir(t[r])?t[r].push(i):t[r]=[t[r],i]:t[r]=i))}),t}function te(e){var t=[];return o(e,function(e,n){Ir(e)?o(e,function(e){t.push(re(n,!0)+(e===!0?"":"="+re(e,!0)))}):t.push(re(n,!0)+(e===!0?"":"="+re(e,!0)))}),t.length?t.join("&"):""}function ne(e){return re(e,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function re(e,t){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,t?"%20":"+")}function ie(e,t){var n,r,i=Br.length;for(r=0;i>r;++r)if(n=Br[r]+t,S(n=e.getAttribute(n)))return n;return null}function oe(e,t){var n,r,i={};o(Br,function(t){var i=t+"app";!n&&e.hasAttribute&&e.hasAttribute(i)&&(n=e,r=e.getAttribute(i))}),o(Br,function(t){var i,o=t+"app";!n&&(i=e.querySelector("["+o.replace(":","\\:")+"]"))&&(n=i,r=i.getAttribute(o))}),n&&(i.strictDi=null!==ie(n,"strict-di"),t(n,r?[r]:[],i))}function ae(n,r,i){w(i)||(i={});var a={strictDi:!1};i=f(a,i);var s=function(){if(n=Er(n),n.injector()){var e=n[0]===t?"document":X(n);throw Vr("btstrpd","App Already Bootstrapped with this Element '{0}'",e.replace(/</,"&lt;").replace(/>/,"&gt;"))}r=r||[],r.unshift(["$provide",function(e){e.value("$rootElement",n)}]),i.debugInfoEnabled&&r.push(["$compileProvider",function(e){e.debugInfoEnabled(!0)}]),r.unshift("ng");var o=Xe(r,i.strictDi);return o.invoke(["$rootScope","$rootElement","$compile","$injector",function(e,t,n,r){e.$apply(function(){t.data("$injector",r),n(t)(e)})}]),o},u=/^NG_ENABLE_DEBUG_INFO!/,c=/^NG_DEFER_BOOTSTRAP!/;return e&&u.test(e.name)&&(i.debugInfoEnabled=!0,e.name=e.name.replace(u,"")),e&&!c.test(e.name)?s():(e.name=e.name.replace(c,""),jr.resumeBootstrap=function(e){return o(e,function(e){r.push(e)}),s()},void(k(jr.resumeDeferredBootstrap)&&jr.resumeDeferredBootstrap()))}function se(){e.name="NG_ENABLE_DEBUG_INFO!"+e.name,e.location.reload()}function ue(e){var t=jr.element(e).injector();if(!t)throw Vr("test","no injector found for element argument to getTestability");return t.get("$$testability")}function ce(e,t){return t=t||"_",e.replace(Hr,function(e,n){return(n?t:"")+e.toLowerCase()})}function le(){var t;if(!Lr){var r=Ur();Cr=y(r)?e.jQuery:r?e[r]:n,Cr&&Cr.fn.on?(Er=Cr,f(Cr.fn,{scope:fi.scope,isolateScope:fi.isolateScope,controller:fi.controller,injector:fi.injector,inheritedData:fi.inheritedData}),t=Cr.cleanData,Cr.cleanData=function(e){var n;if(Dr)Dr=!1;else for(var r,i=0;null!=(r=e[i]);i++)n=Cr._data(r,"events"),n&&n.$destroy&&Cr(r).triggerHandler("$destroy");t(e)}):Er=Oe,jr.element=Er,Lr=!0}}function fe(e,t,n){if(!e)throw Vr("areq","Argument '{0}' is {1}",t||"?",n||"required");return e}function he(e,t,n){return n&&Ir(e)&&(e=e[e.length-1]),fe(k(e),t,"not a function, got "+(e&&"object"==typeof e?e.constructor.name||"Object":typeof e)),e}function pe(e,t){if("hasOwnProperty"===e)throw Vr("badname","hasOwnProperty is not a valid {0} name",t)}function de(e,t,n){if(!t)return e;for(var r,i=t.split("."),o=e,a=i.length,s=0;a>s;s++)r=i[s],e&&(e=(o=e)[r]);return!n&&k(e)?z(o,e):e}function $e(e){for(var t,n=e[0],r=e[e.length-1],i=1;n!==r&&(n=n.nextSibling);i++)(t||e[i]!==n)&&(t||(t=Er(Ar.call(e,0,i))),t.push(n));return t||e}function ve(){return Object.create(null)}function me(e){function t(e,t,n){return e[t]||(e[t]=n())}var n=r("$injector"),i=r("ng"),o=t(e,"angular",Object);return o.$$minErr=o.$$minErr||r,t(o,"module",function(){var e={};return function(r,o,a){var s=function(e,t){if("hasOwnProperty"===e)throw i("badname","hasOwnProperty is not a valid {0} name",t)};return s(r,"module"),o&&e.hasOwnProperty(r)&&(e[r]=null),t(e,r,function(){function e(e,t,n,r){return r||(r=i),function(){return r[n||"push"]([e,t,arguments]),l}}function t(e,t){return function(n,o){return o&&k(o)&&(o.$$moduleName=r),i.push([e,t,arguments]),l}}if(!o)throw n("nomod","Module '{0}' is not available! You either misspelled the module name or forgot to load it. If registering a module ensure that you specify the dependencies as the second argument.",r);var i=[],s=[],u=[],c=e("$injector","invoke","push",s),l={_invokeQueue:i,_configBlocks:s,_runBlocks:u,requires:o,name:r,provider:t("$provide","provider"),factory:t("$provide","factory"),service:t("$provide","service"),value:e("$provide","value"),constant:e("$provide","constant","unshift"),decorator:t("$provide","decorator"),animation:t("$animateProvider","register"),filter:t("$filterProvider","register"),controller:t("$controllerProvider","register"),directive:t("$compileProvider","directive"),config:c,run:function(e){return u.push(e),this}};return a&&c(a),l})}})}function ge(e){var t=[];return JSON.stringify(e,function(e,n){if(n=W(e,n),w(n)){if(t.indexOf(n)>=0)return"...";t.push(n)}return n})}function ye(e){return"function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):y(e)?"undefined":"string"!=typeof e?ge(e):e}function be(t){f(t,{bootstrap:ae,copy:F,extend:f,merge:h,equals:B,element:Er,forEach:o,injector:Xe,noop:$,bind:z,toJson:G,fromJson:Y,identity:v,isUndefined:y,isDefined:b,isString:S,isFunction:k,isObject:w,isNumber:E,isElement:I,isArray:Ir,version:Zr,isDate:C,lowercase:gr,uppercase:br,callbacks:{counter:0},getTestability:ue,$$minErr:r,$$csp:Fr,reloadWithDebugInfo:se}),(kr=me(e))("ng",["ngLocale"],["$provide",function(e){e.provider({$$sanitizeUri:$n}),e.provider("$compile",ut).directive({a:fo,input:Mo,textarea:Mo,form:mo,script:wa,select:Ea,style:ka,option:Ca,ngBind:Vo,ngBindHtml:Po,ngBindTemplate:jo,ngClass:Io,ngClassEven:_o,ngClassOdd:Ro,ngCloak:qo,ngController:Fo,ngForm:go,ngHide:$a,ngIf:Ho,ngInclude:Lo,ngInit:Wo,ngNonBindable:aa,ngPluralize:la,ngRepeat:fa,ngShow:da,ngStyle:va,ngSwitch:ma,ngSwitchWhen:ga,ngSwitchDefault:ya,ngOptions:ca,ngTransclude:ba,ngModel:ra,ngList:Go,ngChange:Do,pattern:Oa,ngPattern:Oa,required:Aa,ngRequired:Aa,minlength:Ta,ngMinlength:Ta,maxlength:Ma,ngMaxlength:Ma,ngValue:No,ngModelOptions:oa}).directive({ngInclude:zo}).directive(ho).directive(Uo),e.provider({$anchorScroll:Qe,$animate:ki,$animateCss:Ai,$$animateQueue:Ci,$$AnimateRunner:Ei,$browser:ot,$cacheFactory:at,$controller:pt,$document:dt,$exceptionHandler:$t,$filter:Mn,$$forceReflow:Vi,$interpolate:Mt,$interval:Tt,$http:Ct,$httpParamSerializer:mt,$httpParamSerializerJQLike:gt,$httpBackend:At,$location:Lt,$log:zt,$parse:cn,$rootScope:dn,$q:ln,$$q:fn,$sce:yn,$sceDelegate:gn,$sniffer:bn,$templateCache:st,$templateRequest:wn,$$testability:xn,$timeout:Sn,$window:kn,$$rAF:pn,$$jqLite:Ge,$$HashMap:$i,$$cookieReader:On})}])}function we(){return++Qr}function xe(e){return e.replace(ni,function(e,t,n,r){return r?n.toUpperCase():n}).replace(ri,"Moz$1")}function Se(e){return!si.test(e)}function Ee(e){var t=e.nodeType;return t===zr||!t||t===Jr}function Ce(e){for(var t in Xr[e.ng339])return!0;return!1}function ke(e,t){var n,r,i,a,s=t.createDocumentFragment(),u=[];if(Se(e))u.push(t.createTextNode(e));else{for(n=n||s.appendChild(t.createElement("div")),r=(ui.exec(e)||["",""])[1].toLowerCase(),i=li[r]||li._default,n.innerHTML=i[1]+e.replace(ci,"<$1></$2>")+i[2],a=i[0];a--;)n=n.lastChild;u=H(u,n.childNodes),n=s.firstChild,n.textContent=""}return s.textContent="",s.innerHTML="",o(u,function(e){s.appendChild(e)}),s}function Ae(e,n){n=n||t;var r;return(r=ai.exec(e))?[n.createElement(r[1])]:(r=ke(e,n))?r.childNodes:[]}function Oe(e){if(e instanceof Oe)return e;var t;if(S(e)&&(e=_r(e),t=!0),!(this instanceof Oe)){if(t&&"<"!=e.charAt(0))throw oi("nosel","Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element");return new Oe(e)}t?_e(this,Ae(e)):_e(this,e)}function Me(e){return e.cloneNode(!0)}function Te(e,t){if(t||Ve(e),e.querySelectorAll)for(var n=e.querySelectorAll("*"),r=0,i=n.length;i>r;r++)Ve(n[r])}function Ne(e,t,n,r){if(b(r))throw oi("offargs","jqLite#off() does not support the `selector` argument");var i=je(e),a=i&&i.events,s=i&&i.handle;if(s)if(t)o(t.split(" "),function(t){if(b(n)){var r=a[t];if(q(r||[],n),r&&r.length>0)return}ti(e,t,s),delete a[t]});else for(t in a)"$destroy"!==t&&ti(e,t,s),delete a[t]}function Ve(e,t){var r=e.ng339,i=r&&Xr[r];if(i){if(t)return void delete i.data[t];i.handle&&(i.events.$destroy&&i.handle({},"$destroy"),Ne(e)),delete Xr[r],e.ng339=n}}function je(e,t){var r=e.ng339,i=r&&Xr[r];return t&&!i&&(e.ng339=r=we(),i=Xr[r]={events:{},data:{},handle:n}),i}function Pe(e,t,n){if(Ee(e)){var r=b(n),i=!r&&t&&!w(t),o=!t,a=je(e,!i),s=a&&a.data;if(r)s[t]=n;else{if(o)return s;if(i)return s&&s[t];f(s,t)}}}function De(e,t){return e.getAttribute?(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+t+" ")>-1:!1}function Ie(e,t){t&&e.setAttribute&&o(t.split(" "),function(t){e.setAttribute("class",_r((" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+_r(t)+" "," ")))})}function Re(e,t){if(t&&e.setAttribute){var n=(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");o(t.split(" "),function(e){e=_r(e),-1===n.indexOf(" "+e+" ")&&(n+=e+" ")}),e.setAttribute("class",_r(n))}}function _e(e,t){if(t)if(t.nodeType)e[e.length++]=t;else{var n=t.length;if("number"==typeof n&&t.window!==t){if(n)for(var r=0;n>r;r++)e[e.length++]=t[r]}else e[e.length++]=t}}function qe(e,t){return Fe(e,"$"+(t||"ngController")+"Controller")}function Fe(e,t,n){e.nodeType==Jr&&(e=e.documentElement);for(var r=Ir(t)?t:[t];e;){for(var i=0,o=r.length;o>i;i++)if(b(n=Er.data(e,r[i])))return n;e=e.parentNode||e.nodeType===Kr&&e.host}}function Ue(e){for(Te(e,!0);e.firstChild;)e.removeChild(e.firstChild)}function Be(e,t){t||Te(e);var n=e.parentNode;n&&n.removeChild(e)}function He(t,n){n=n||e,"complete"===n.document.readyState?n.setTimeout(t):Er(n).on("load",t)}function Le(e,t){var n=hi[t.toLowerCase()];return n&&pi[_(e)]&&n}function ze(e){return di[e]}function We(e,t){var n=function(n,r){n.isDefaultPrevented=function(){return n.defaultPrevented};var i=t[r||n.type],o=i?i.length:0;if(o){if(y(n.immediatePropagationStopped)){var a=n.stopImmediatePropagation;n.stopImmediatePropagation=function(){n.immediatePropagationStopped=!0,n.stopPropagation&&n.stopPropagation(),a&&a.call(n)}}n.isImmediatePropagationStopped=function(){return n.immediatePropagationStopped===!0},o>1&&(i=U(i));for(var s=0;o>s;s++)n.isImmediatePropagationStopped()||i[s].call(e,n)}};return n.elem=e,n}function Ge(){this.$get=function(){return f(Oe,{hasClass:function(e,t){return e.attr&&(e=e[0]),De(e,t)},addClass:function(e,t){return e.attr&&(e=e[0]),Re(e,t)},removeClass:function(e,t){return e.attr&&(e=e[0]),Ie(e,t)}})}}function Ye(e,t){var n=e&&e.$$hashKey;if(n)return"function"==typeof n&&(n=e.$$hashKey()),n;var r=typeof e;return n="function"==r||"object"==r&&null!==e?e.$$hashKey=r+":"+(t||u)():r+":"+e}function Je(e,t){if(t){var n=0;this.nextUid=function(){return++n}}o(e,this.put,this)}function Ke(e){var t=e.toString().replace(yi,""),n=t.match(vi);return n?"function("+(n[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function Ze(e,t,n){var r,i,a,s;if("function"==typeof e){if(!(r=e.$inject)){if(r=[],e.length){if(t)throw S(n)&&n||(n=e.name||Ke(e)),bi("strictdi","{0} is not using explicit annotation and cannot be invoked in strict mode",n);i=e.toString().replace(yi,""),a=i.match(vi),o(a[1].split(mi),function(e){e.replace(gi,function(e,t,n){r.push(n)})})}e.$inject=r}}else Ir(e)?(s=e.length-1,he(e[s],"fn"),r=e.slice(0,s)):he(e,"fn",!0);return r}function Xe(e,t){function r(e){return function(t,n){return w(t)?void o(t,s(e)):e(t,n)}}function i(e,t){if(pe(e,"service"),(k(t)||Ir(t))&&(t=E.instantiate(t)),!t.$get)throw bi("pget","Provider '{0}' must define $get factory method.",e);return x[e+v]=t}function a(e,t){return function(){var n=A.invoke(t,this);if(y(n))throw bi("undef","Provider '{0}' must return a value from $get factory method.",e);return n}}function u(e,t,n){return i(e,{$get:n!==!1?a(e,t):t})}function c(e,t){return u(e,["$injector",function(e){return e.instantiate(t)}])}function l(e,t){return u(e,m(t),!1)}function f(e,t){pe(e,"constant"),x[e]=t,C[e]=t}function h(e,t){var n=E.get(e+v),r=n.$get;n.$get=function(){var e=A.invoke(r,n);return A.invoke(t,null,{$delegate:e})}}function p(e){fe(y(e)||Ir(e),"modulesToLoad","not an array");var t,n=[];return o(e,function(e){function r(e){var t,n;for(t=0,n=e.length;n>t;t++){var r=e[t],i=E.get(r[0]);i[r[1]].apply(i,r[2])}}if(!b.get(e)){b.put(e,!0);try{S(e)?(t=kr(e),n=n.concat(p(t.requires)).concat(t._runBlocks),r(t._invokeQueue),r(t._configBlocks)):k(e)?n.push(E.invoke(e)):Ir(e)?n.push(E.invoke(e)):he(e,"module")}catch(i){throw Ir(e)&&(e=e[e.length-1]),i.message&&i.stack&&-1==i.stack.indexOf(i.message)&&(i=i.message+"\n"+i.stack),bi("modulerr","Failed to instantiate module {0} due to:\n{1}",e,i.stack||i.message||i)}}}),n}function d(e,n){function r(t,r){if(e.hasOwnProperty(t)){if(e[t]===$)throw bi("cdep","Circular dependency found: {0}",t+" <- "+g.join(" <- "));return e[t]}try{return g.unshift(t),e[t]=$,e[t]=n(t,r)}catch(i){throw e[t]===$&&delete e[t],i}finally{g.shift()}}function i(e,n,i,o){"string"==typeof i&&(o=i,i=null);var a,s,u,c=[],l=Xe.$$annotate(e,t,o);for(s=0,a=l.length;a>s;s++){if(u=l[s],"string"!=typeof u)throw bi("itkn","Incorrect injection token! Expected service name as string, got {0}",u);c.push(i&&i.hasOwnProperty(u)?i[u]:r(u,o))}return Ir(e)&&(e=e[a]),e.apply(n,c)}function o(e,t,n){var r=Object.create((Ir(e)?e[e.length-1]:e).prototype||null),o=i(e,r,t,n);return w(o)||k(o)?o:r}return{invoke:i,instantiate:o,get:r,annotate:Xe.$$annotate,has:function(t){return x.hasOwnProperty(t+v)||e.hasOwnProperty(t)}}}t=t===!0;var $={},v="Provider",g=[],b=new Je([],!0),x={$provide:{provider:r(i),factory:r(u),service:r(c),value:r(l),constant:r(f),decorator:h}},E=x.$injector=d(x,function(e,t){throw jr.isString(t)&&g.push(t),bi("unpr","Unknown provider: {0}",g.join(" <- "))}),C={},A=C.$injector=d(C,function(e,t){var r=E.get(e+v,t);return A.invoke(r.$get,r,n,e)});return o(p(e),function(e){e&&A.invoke(e)}),A}function Qe(){var e=!0;this.disableAutoScrolling=function(){e=!1},this.$get=["$window","$location","$rootScope",function(t,n,r){function i(e){var t=null;return Array.prototype.some.call(e,function(e){return"a"===_(e)?(t=e,!0):void 0}),t}function o(){var e=s.yOffset;if(k(e))e=e();else if(I(e)){var n=e[0],r=t.getComputedStyle(n);e="fixed"!==r.position?0:n.getBoundingClientRect().bottom}else E(e)||(e=0);return e}function a(e){if(e){e.scrollIntoView();var n=o();if(n){var r=e.getBoundingClientRect().top;t.scrollBy(0,r-n)}}else t.scrollTo(0,0)}function s(e){e=S(e)?e:n.hash();var t;e?(t=u.getElementById(e))?a(t):(t=i(u.getElementsByName(e)))?a(t):"top"===e&&a(null):a(null)}var u=t.document;return e&&r.$watch(function(){return n.hash()},function(e,t){e===t&&""===e||He(function(){r.$evalAsync(s)})}),s}]}function et(e,t){return e||t?e?t?(Ir(e)&&(e=e.join(" ")),Ir(t)&&(t=t.join(" ")),e+" "+t):e:t:""}function tt(e){for(var t=0;t<e.length;t++){var n=e[t];if(n.nodeType===xi)return n}}function nt(e){S(e)&&(e=e.split(" "));var t=ve();return o(e,function(e){e.length&&(t[e]=!0)}),t}function rt(e){return w(e)?e:{}}function it(e,t,n,r){function i(e){try{e.apply(null,L(arguments,1))}finally{if(g--,0===g)for(;b.length;)try{b.pop()()}catch(t){n.error(t)}}}function a(e){var t=e.indexOf("#");return-1===t?"":e.substr(t)}function s(){C=null,c(),l()}function u(){try{return p.state}catch(e){}}function c(){w=u(),w=y(w)?null:w,B(w,O)&&(w=O),O=w}function l(){S===f.url()&&x===w||(S=f.url(),x=w,o(k,function(e){e(f.url(),w)}))}var f=this,h=(t[0],e.location),p=e.history,d=e.setTimeout,v=e.clearTimeout,m={};f.isMock=!1;var g=0,b=[];f.$$completeOutstandingRequest=i,f.$$incOutstandingRequestCount=function(){g++},f.notifyWhenNoOutstandingRequests=function(e){0===g?e():b.push(e)};var w,x,S=h.href,E=t.find("base"),C=null;c(),x=w,f.url=function(t,n,i){if(y(i)&&(i=null),h!==e.location&&(h=e.location),p!==e.history&&(p=e.history),t){var o=x===i;if(S===t&&(!r.history||o))return f;var s=S&&Dt(S)===Dt(t);return S=t,x=i,!r.history||s&&o?(s&&!C||(C=t),n?h.replace(t):s?h.hash=a(t):h.href=t,h.href!==t&&(C=t)):(p[n?"replaceState":"pushState"](i,"",t),c(),x=w),f}return C||h.href.replace(/%27/g,"'")},f.state=function(){return w};var k=[],A=!1,O=null;f.onUrlChange=function(t){return A||(r.history&&Er(e).on("popstate",s),Er(e).on("hashchange",s),A=!0),k.push(t),t},f.$$applicationDestroyed=function(){Er(e).off("hashchange popstate",s)},f.$$checkUrlChange=l,f.baseHref=function(){var e=E.attr("href");return e?e.replace(/^(https?\:)?\/\/[^\/]*/,""):""},f.defer=function(e,t){var n;return g++,n=d(function(){delete m[n],i(e)},t||0),m[n]=!0,n},f.defer.cancel=function(e){return m[e]?(delete m[e],v(e),i($),!0):!1}}function ot(){this.$get=["$window","$log","$sniffer","$document",function(e,t,n,r){return new it(e,r,t,n)}]}function at(){this.$get=function(){function e(e,n){function i(e){e!=h&&(p?p==e&&(p=e.n):p=e,o(e.n,e.p),o(e,h),h=e,h.n=null)}function o(e,t){e!=t&&(e&&(e.p=t),t&&(t.n=e))}if(e in t)throw r("$cacheFactory")("iid","CacheId '{0}' is already taken!",e);var a=0,s=f({},n,{id:e}),u={},c=n&&n.capacity||Number.MAX_VALUE,l={},h=null,p=null;return t[e]={put:function(e,t){if(!y(t)){if(c<Number.MAX_VALUE){var n=l[e]||(l[e]={key:e});i(n)}return e in u||a++,u[e]=t,a>c&&this.remove(p.key),t}},get:function(e){if(c<Number.MAX_VALUE){var t=l[e];if(!t)return;i(t)}return u[e]},remove:function(e){if(c<Number.MAX_VALUE){var t=l[e];if(!t)return;t==h&&(h=t.p),t==p&&(p=t.n),o(t.n,t.p),delete l[e]}delete u[e],a--},removeAll:function(){u={},a=0,l={},h=p=null},destroy:function(){u=null,s=null,l=null,delete t[e]},info:function(){return f({},s,{size:a})}}}var t={};return e.info=function(){var e={};return o(t,function(t,n){e[n]=t.info()}),e},e.get=function(e){return t[e]},e}}function st(){this.$get=["$cacheFactory",function(e){return e("templates")}]}function ut(e,r){function i(e,t,n){var r=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,i={};return o(e,function(e,o){var a=e.match(r);if(!a)throw Oi("iscp","Invalid {3} for directive '{0}'. Definition: {... {1}: '{2}' ...}",t,o,e,n?"controller bindings definition":"isolate scope definition");i[o]={mode:a[1][0],collection:"*"===a[2],optional:"?"===a[3],attrName:a[4]||o}}),i}function a(e,t){var n={isolateScope:null,bindToController:null};if(w(e.scope)&&(e.bindToController===!0?(n.bindToController=i(e.scope,t,!0),n.isolateScope={}):n.isolateScope=i(e.scope,t,!1)),w(e.bindToController)&&(n.bindToController=i(e.bindToController,t,!0)),w(n.bindToController)){var r=e.controller,o=e.controllerAs;if(!r)throw Oi("noctrl","Cannot bind to controller without directive '{0}'s controller.",t);if(!ht(r,o))throw Oi("noident","Cannot bind to controller without identifier for directive '{0}'.",t)}return n}function u(e){var t=e.charAt(0);if(!t||t!==gr(t))throw Oi("baddir","Directive name '{0}' is invalid. The first character must be a lowercase letter",e);if(e!==e.trim())throw Oi("baddir","Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces",e)}var c={},l="Directive",h=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,p=/(([\w\-]+)(?:\:([^;]+))?;?)/,g=R("ngSrc,ngSrcset,src,srcset"),x=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,E=/^(on[a-z]+|formaction)$/;this.directive=function A(t,n){return pe(t,"directive"),S(t)?(u(t),fe(n,"directiveFactory"),c.hasOwnProperty(t)||(c[t]=[],e.factory(t+l,["$injector","$exceptionHandler",function(e,n){var r=[];return o(c[t],function(i,o){try{var s=e.invoke(i);k(s)?s={compile:m(s)}:!s.compile&&s.link&&(s.compile=m(s.link)),s.priority=s.priority||0,s.index=o,s.name=s.name||t,s.require=s.require||s.controller&&s.name,s.restrict=s.restrict||"EA";var u=s.$$bindings=a(s,s.name);w(u.isolateScope)&&(s.$$isolateBindings=u.isolateScope),s.$$moduleName=i.$$moduleName,r.push(s)}catch(c){n(c)}}),r}])),c[t].push(n)):o(t,s(A)),this},this.aHrefSanitizationWhitelist=function(e){return b(e)?(r.aHrefSanitizationWhitelist(e),this):r.aHrefSanitizationWhitelist()},this.imgSrcSanitizationWhitelist=function(e){return b(e)?(r.imgSrcSanitizationWhitelist(e),this):r.imgSrcSanitizationWhitelist()};var C=!0;this.debugInfoEnabled=function(e){return b(e)?(C=e,this):C},this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(e,r,i,a,s,u,m,b,A,O,T){function N(e,t){try{e.addClass(t)}catch(n){}}function V(e,t,n,r,i){e instanceof Er||(e=Er(e)),o(e,function(t,n){t.nodeType==Gr&&t.nodeValue.match(/\S+/)&&(e[n]=Er(t).wrap("<span></span>").parent()[0])});var a=P(e,t,e,n,r,i);V.$$addScopeClass(e);var s=null;return function(t,n,r){fe(t,"scope"),r=r||{};var i=r.parentBoundTranscludeFn,o=r.transcludeControllers,u=r.futureParentElement;i&&i.$$boundTransclude&&(i=i.$$boundTransclude),s||(s=j(u));var c;if(c="html"!==s?Er(Q(s,Er("<div>").append(e).html())):n?fi.clone.call(e):e,o)for(var l in o)c.data("$"+l+"Controller",o[l].instance);return V.$$addScopeInfo(c,t),n&&n(c,t),a&&a(t,c,c,i),c}}function j(e){var t=e&&e[0];return t&&"foreignobject"!==_(t)&&t.toString().match(/SVG/)?"svg":"html"}function P(e,t,r,i,o,a){function s(e,r,i,o){var a,s,u,c,l,f,h,p,v;if(d){var m=r.length;for(v=new Array(m),l=0;l<$.length;l+=3)h=$[l],v[h]=r[h]}else v=r;for(l=0,f=$.length;f>l;)if(u=v[$[l++]],a=$[l++],s=$[l++],a){if(a.scope){c=e.$new(),V.$$addScopeInfo(Er(u),c);var g=a.$$destroyBindings;g&&(a.$$destroyBindings=null,c.$on("$destroyed",g))}else c=e;p=a.transcludeOnThisElement?D(e,a.transclude,o):!a.templateOnThisElement&&o?o:!o&&t?D(e,t):null,a(s,c,u,i,p,a)}else s&&s(e,u.childNodes,n,o)}for(var u,c,l,f,h,p,d,$=[],v=0;v<e.length;v++)u=new ae,c=I(e[v],[],u,0===v?i:n,o),l=c.length?U(c,e[v],u,t,r,null,[],[],a):null,l&&l.scope&&V.$$addScopeClass(u.$$element),h=l&&l.terminal||!(f=e[v].childNodes)||!f.length?null:P(f,l?(l.transcludeOnThisElement||!l.templateOnThisElement)&&l.transclude:t),(l||h)&&($.push(v,l,h),p=!0,d=d||l),a=null;return p?s:null}function D(e,t,n){var r=function(r,i,o,a,s){return r||(r=e.$new(!1,s),r.$$transcluded=!0),t(r,i,{parentBoundTranscludeFn:n,transcludeControllers:o,futureParentElement:a})};return r}function I(e,t,n,r,i){var o,a,s=e.nodeType,u=n.$attr;switch(s){case zr:z(t,ct(_(e)),"E",r,i);for(var c,l,f,d,$,v,m=e.attributes,g=0,y=m&&m.length;y>g;g++){var b=!1,x=!1;c=m[g],l=c.name,$=_r(c.value),d=ct(l),(v=he.test(d))&&(l=l.replace(Mi,"").substr(8).replace(/_(.)/g,function(e,t){return t.toUpperCase()}));var E=d.replace(/(Start|End)$/,"");W(E)&&d===E+"Start"&&(b=l,x=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6)),f=ct(l.toLowerCase()),u[f]=l,!v&&n.hasOwnProperty(f)||(n[f]=$,Le(e,f)&&(n[f]=!0)),te(e,t,$,f,v),z(t,f,"A",r,i,b,x)}if(a=e.className,w(a)&&(a=a.animVal),S(a)&&""!==a)for(;o=p.exec(a);)f=ct(o[2]),z(t,f,"C",r,i)&&(n[f]=_r(o[3])),a=a.substr(o.index+o[0].length);break;case Gr:if(11===Sr)for(;e.parentNode&&e.nextSibling&&e.nextSibling.nodeType===Gr;)e.nodeValue=e.nodeValue+e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);Z(t,e.nodeValue);break;case Yr:try{o=h.exec(e.nodeValue),o&&(f=ct(o[1]),z(t,f,"M",r,i)&&(n[f]=_r(o[2])))}catch(C){}}return t.sort(J),t}function R(e,t,n){var r=[],i=0;if(t&&e.hasAttribute&&e.hasAttribute(t)){do{if(!e)throw Oi("uterdir","Unterminated attribute, found '{0}' but no matching '{1}' found.",t,n);e.nodeType==zr&&(e.hasAttribute(t)&&i++,e.hasAttribute(n)&&i--),r.push(e),e=e.nextSibling}while(i>0)}else r.push(e);return Er(r)}function F(e,t,n){return function(r,i,o,a,s){return i=R(i[0],t,n),e(r,i,o,a,s)}}function U(e,r,o,a,s,c,l,f,h){function p(e,t,n,r){e&&(n&&(e=F(e,n,r)),e.require=m.require,e.directiveName=g,(T===m||m.$$isolateScope)&&(e=re(e,{isolateScope:!0})),l.push(e)),t&&(n&&(t=F(t,n,r)),t.require=m.require,t.directiveName=g,(T===m||m.$$isolateScope)&&(t=re(t,{isolateScope:!0})),f.push(t))}function d(e,t,n,r){var i;if(S(t)){var o=t.match(x),a=t.substring(o[0].length),s=o[1]||o[3],u="?"===o[2];if("^^"===s?n=n.parent():(i=r&&r[a],i=i&&i.instance),!i){var c="$"+a+"Controller";i=s?n.inheritedData(c):n.data(c)}if(!i&&!u)throw Oi("ctreq","Controller '{0}', required by directive '{1}', can't be found!",a,e)}else if(Ir(t)){i=[];for(var l=0,f=t.length;f>l;l++)i[l]=d(e,t[l],n,r)}return i||null}function $(e,t,n,r,i,o){var a=ve();for(var s in r){var c=r[s],l={$scope:c===T||c.$$isolateScope?i:o,$element:e,$attrs:t,$transclude:n},f=c.controller;"@"==f&&(f=t[c.name]);var h=u(f,l,!0,c.controllerAs);a[c.name]=h,_||e.data("$"+c.name+"Controller",h.instance)}return a}function v(e,t,i,a,s,u){function c(e,t,r){var i;return M(e)||(r=t,t=e,e=n),_&&(i=y),r||(r=_?w.parent():w),s(e,t,i,r,j)}var h,p,v,m,g,y,b,w,x;if(r===i?(x=o,w=o.$$element):(w=Er(i),x=new ae(w,o)),T&&(g=t.$new(!0)),s&&(b=c,b.$$boundTransclude=s),O&&(y=$(w,x,b,O,g,t)),T&&(V.$$addScopeInfo(w,g,!0,!(N&&(N===T||N===T.$$originalDirective))),V.$$addScopeClass(w,!0),g.$$isolateBindings=T.$$isolateBindings,oe(t,x,g,g.$$isolateBindings,T,g)),y){var S,E,C=T||A;C&&y[C.name]&&(S=C.$$bindings.bindToController,m=y[C.name],m&&m.identifier&&S&&(E=m,u.$$destroyBindings=oe(t,x,m.instance,S,C)));for(h in y){m=y[h];var k=m();k!==m.instance&&(m.instance=k,w.data("$"+h+"Controller",k),m===E&&(u.$$destroyBindings(),u.$$destroyBindings=oe(t,x,k,S,C)))}}for(h=0,p=l.length;p>h;h++)v=l[h],ie(v,v.isolateScope?g:t,w,x,v.require&&d(v.directiveName,v.require,w,y),b);var j=t;for(T&&(T.template||null===T.templateUrl)&&(j=g),e&&e(j,i.childNodes,n,s),h=f.length-1;h>=0;h--)v=f[h],ie(v,v.isolateScope?g:t,w,x,v.require&&d(v.directiveName,v.require,w,y),b)}h=h||{};for(var m,g,y,b,E,C=-Number.MAX_VALUE,A=h.newScopeDirective,O=h.controllerDirectives,T=h.newIsolateScopeDirective,N=h.templateDirective,j=h.nonTlbTranscludeDirective,P=!1,D=!1,_=h.hasElementTranscludeDirective,q=o.$$element=Er(r),U=c,B=a,z=0,W=e.length;W>z;z++){m=e[z];var J=m.$$start,Z=m.$$end;if(J&&(q=R(r,J,Z)),y=n,C>m.priority)break;if((E=m.scope)&&(m.templateUrl||(w(E)?(K("new/isolated scope",T||A,m,q),T=m):K("new/isolated scope",T,m,q)),A=A||m),g=m.name,!m.templateUrl&&m.controller&&(E=m.controller,O=O||ve(),K("'"+g+"' controller",O[g],m,q),O[g]=m),
 (E=m.transclude)&&(P=!0,m.$$tlb||(K("transclusion",j,m,q),j=m),"element"==E?(_=!0,C=m.priority,y=q,q=o.$$element=Er(t.createComment(" "+g+": "+o[g]+" ")),r=q[0],ne(s,L(y),r),B=V(y,a,C,U&&U.name,{nonTlbTranscludeDirective:j})):(y=Er(Me(r)).contents(),q.empty(),B=V(y,a))),m.template)if(D=!0,K("template",N,m,q),N=m,E=k(m.template)?m.template(q,o):m.template,E=le(E),m.replace){if(U=m,y=Se(E)?[]:ft(Q(m.templateNamespace,_r(E))),r=y[0],1!=y.length||r.nodeType!==zr)throw Oi("tplrt","Template for directive '{0}' must have exactly one root element. {1}",g,"");ne(s,q,r);var ee={$attr:{}},te=I(r,[],ee),se=e.splice(z+1,e.length-(z+1));T&&H(te),e=e.concat(te).concat(se),G(o,ee),W=e.length}else q.html(E);if(m.templateUrl)D=!0,K("template",N,m,q),N=m,m.replace&&(U=m),v=Y(e.splice(z,e.length-z),q,o,s,P&&B,l,f,{controllerDirectives:O,newScopeDirective:A!==m&&A,newIsolateScopeDirective:T,templateDirective:N,nonTlbTranscludeDirective:j}),W=e.length;else if(m.compile)try{b=m.compile(q,o,B),k(b)?p(null,b,J,Z):b&&p(b.pre,b.post,J,Z)}catch(ue){i(ue,X(q))}m.terminal&&(v.terminal=!0,C=Math.max(C,m.priority))}return v.scope=A&&A.scope===!0,v.transcludeOnThisElement=P,v.templateOnThisElement=D,v.transclude=B,h.hasElementTranscludeDirective=_,v}function H(e){for(var t=0,n=e.length;n>t;t++)e[t]=d(e[t],{$$isolateScope:!0})}function z(t,n,r,o,a,s,u){if(n===a)return null;var f=null;if(c.hasOwnProperty(n))for(var h,p=e.get(n+l),$=0,v=p.length;v>$;$++)try{h=p[$],(y(o)||o>h.priority)&&-1!=h.restrict.indexOf(r)&&(s&&(h=d(h,{$$start:s,$$end:u})),t.push(h),f=h)}catch(m){i(m)}return f}function W(t){if(c.hasOwnProperty(t))for(var n,r=e.get(t+l),i=0,o=r.length;o>i;i++)if(n=r[i],n.multiElement)return!0;return!1}function G(e,t){var n=t.$attr,r=e.$attr,i=e.$$element;o(e,function(r,i){"$"!=i.charAt(0)&&(t[i]&&t[i]!==r&&(r+=("style"===i?";":" ")+t[i]),e.$set(i,r,!0,n[i]))}),o(t,function(t,o){"class"==o?(N(i,t),e["class"]=(e["class"]?e["class"]+" ":"")+t):"style"==o?(i.attr("style",i.attr("style")+";"+t),e.style=(e.style?e.style+";":"")+t):"$"==o.charAt(0)||e.hasOwnProperty(o)||(e[o]=t,r[o]=n[o])})}function Y(e,t,n,r,i,s,u,c){var l,f,h=[],p=t[0],$=e.shift(),v=d($,{templateUrl:null,transclude:null,replace:null,$$originalDirective:$}),m=k($.templateUrl)?$.templateUrl(t,n):$.templateUrl,g=$.templateNamespace;return t.empty(),a(m).then(function(a){var d,y,b,x;if(a=le(a),$.replace){if(b=Se(a)?[]:ft(Q(g,_r(a))),d=b[0],1!=b.length||d.nodeType!==zr)throw Oi("tplrt","Template for directive '{0}' must have exactly one root element. {1}",$.name,m);y={$attr:{}},ne(r,t,d);var S=I(d,[],y);w($.scope)&&H(S),e=S.concat(e),G(n,y)}else d=p,t.html(a);for(e.unshift(v),l=U(e,d,n,i,t,$,s,u,c),o(r,function(e,n){e==d&&(r[n]=t[0])}),f=P(t[0].childNodes,i);h.length;){var E=h.shift(),C=h.shift(),k=h.shift(),A=h.shift(),O=t[0];if(!E.$$destroyed){if(C!==p){var M=C.className;c.hasElementTranscludeDirective&&$.replace||(O=Me(d)),ne(k,Er(C),O),N(Er(O),M)}x=l.transcludeOnThisElement?D(E,l.transclude,A):A,l(f,E,O,r,x,l)}}h=null}),function(e,t,n,r,i){var o=i;t.$$destroyed||(h?h.push(t,n,r,o):(l.transcludeOnThisElement&&(o=D(t,l.transclude,i)),l(f,t,n,r,o,l)))}}function J(e,t){var n=t.priority-e.priority;return 0!==n?n:e.name!==t.name?e.name<t.name?-1:1:e.index-t.index}function K(e,t,n,r){function i(e){return e?" (module: "+e+")":""}if(t)throw Oi("multidir","Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}",t.name,i(t.$$moduleName),n.name,i(n.$$moduleName),e,X(r))}function Z(e,t){var n=r(t,!0);n&&e.push({priority:0,compile:function(e){var t=e.parent(),r=!!t.length;return r&&V.$$addBindingClass(t),function(e,t){var i=t.parent();r||V.$$addBindingClass(i),V.$$addBindingInfo(i,n.expressions),e.$watch(n,function(e){t[0].nodeValue=e})}}})}function Q(e,n){switch(e=gr(e||"html")){case"svg":case"math":var r=t.createElement("div");return r.innerHTML="<"+e+">"+n+"</"+e+">",r.childNodes[0].childNodes;default:return n}}function ee(e,t){if("srcdoc"==t)return A.HTML;var n=_(e);return"xlinkHref"==t||"form"==n&&"action"==t||"img"!=n&&("src"==t||"ngSrc"==t)?A.RESOURCE_URL:void 0}function te(e,t,n,i,o){var a=ee(e,i);o=g[i]||o;var s=r(n,!0,a,o);if(s){if("multiple"===i&&"select"===_(e))throw Oi("selmulti","Binding to the 'multiple' attribute is not supported. Element: {0}",X(e));t.push({priority:100,compile:function(){return{pre:function(e,t,u){var c=u.$$observers||(u.$$observers={});if(E.test(i))throw Oi("nodomevents","Interpolations for HTML DOM event attributes are disallowed.  Please use the ng- versions (such as ng-click instead of onclick) instead.");var l=u[i];l!==n&&(s=l&&r(l,!0,a,o),n=l),s&&(u[i]=s(e),(c[i]||(c[i]=[])).$$inter=!0,(u.$$observers&&u.$$observers[i].$$scope||e).$watch(s,function(e,t){"class"===i&&e!=t?u.$updateClass(e,t):u.$set(i,e)}))}}}})}}function ne(e,n,r){var i,o,a=n[0],s=n.length,u=a.parentNode;if(e)for(i=0,o=e.length;o>i;i++)if(e[i]==a){e[i++]=r;for(var c=i,l=c+s-1,f=e.length;f>c;c++,l++)f>l?e[c]=e[l]:delete e[c];e.length-=s-1,e.context===a&&(e.context=r);break}u&&u.replaceChild(r,a);var h=t.createDocumentFragment();h.appendChild(a),Er.hasData(a)&&(Er(r).data(Er(a).data()),Cr?(Dr=!0,Cr.cleanData([a])):delete Er.cache[a[Er.expando]]);for(var p=1,d=n.length;d>p;p++){var $=n[p];Er($).remove(),h.appendChild($),delete n[p]}n[0]=r,n.length=1}function re(e,t){return f(function(){return e.apply(null,arguments)},e,t)}function ie(e,t,n,r,o,a){try{e(t,n,r,o,a)}catch(s){i(s,X(n))}}function oe(e,t,n,i,a,u){var c;o(i,function(i,o){var u,l,f,h,p=i.attrName,d=i.optional,v=i.mode;switch(v){case"@":d||yr.call(t,p)||(n[o]=t[p]=void 0),t.$observe(p,function(e){S(e)&&(n[o]=e)}),t.$$observers[p].$$scope=e,S(t[p])&&(n[o]=r(t[p])(e));break;case"=":if(!yr.call(t,p)){if(d)break;t[p]=void 0}if(d&&!t[p])break;l=s(t[p]),h=l.literal?B:function(e,t){return e===t||e!==e&&t!==t},f=l.assign||function(){throw u=n[o]=l(e),Oi("nonassign","Expression '{0}' used with directive '{1}' is non-assignable!",t[p],a.name)},u=n[o]=l(e);var m=function(t){return h(t,n[o])||(h(t,u)?f(e,t=n[o]):n[o]=t),u=t};m.$stateful=!0;var g;g=i.collection?e.$watchCollection(t[p],m):e.$watch(s(t[p],m),null,l.literal),c=c||[],c.push(g);break;case"&":if(l=t.hasOwnProperty(p)?s(t[p]):$,l===$&&d)break;n[o]=function(t){return l(e,t)}}});var l=c?function(){for(var e=0,t=c.length;t>e;++e)c[e]()}:$;return u&&l!==$?(u.$on("$destroy",l),$):l}var ae=function(e,t){if(t){var n,r,i,o=Object.keys(t);for(n=0,r=o.length;r>n;n++)i=o[n],this[i]=t[i]}else this.$attr={};this.$$element=e};ae.prototype={$normalize:ct,$addClass:function(e){e&&e.length>0&&O.addClass(this.$$element,e)},$removeClass:function(e){e&&e.length>0&&O.removeClass(this.$$element,e)},$updateClass:function(e,t){var n=lt(e,t);n&&n.length&&O.addClass(this.$$element,n);var r=lt(t,e);r&&r.length&&O.removeClass(this.$$element,r)},$set:function(e,t,n,r){var a,s=this.$$element[0],u=Le(s,e),c=ze(e),l=e;if(u?(this.$$element.prop(e,t),r=u):c&&(this[c]=t,l=c),this[e]=t,r?this.$attr[e]=r:(r=this.$attr[e],r||(this.$attr[e]=r=ce(e,"-"))),a=_(this.$$element),"a"===a&&"href"===e||"img"===a&&"src"===e)this[e]=t=T(t,"src"===e);else if("img"===a&&"srcset"===e){for(var f="",h=_r(t),p=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,d=/\s/.test(h)?p:/(,)/,$=h.split(d),v=Math.floor($.length/2),m=0;v>m;m++){var g=2*m;f+=T(_r($[g]),!0),f+=" "+_r($[g+1])}var b=_r($[2*m]).split(/\s/);f+=T(_r(b[0]),!0),2===b.length&&(f+=" "+_r(b[1])),this[e]=t=f}n!==!1&&(null===t||y(t)?this.$$element.removeAttr(r):this.$$element.attr(r,t));var w=this.$$observers;w&&o(w[l],function(e){try{e(t)}catch(n){i(n)}})},$observe:function(e,t){var n=this,r=n.$$observers||(n.$$observers=ve()),i=r[e]||(r[e]=[]);return i.push(t),m.$evalAsync(function(){i.$$inter||!n.hasOwnProperty(e)||y(n[e])||t(n[e])}),function(){q(i,t)}}};var se=r.startSymbol(),ue=r.endSymbol(),le="{{"==se||"}}"==ue?v:function(e){return e.replace(/\{\{/g,se).replace(/}}/g,ue)},he=/^ngAttr[A-Z]/;return V.$$addBindingInfo=C?function(e,t){var n=e.data("$binding")||[];Ir(t)?n=n.concat(t):n.push(t),e.data("$binding",n)}:$,V.$$addBindingClass=C?function(e){N(e,"ng-binding")}:$,V.$$addScopeInfo=C?function(e,t,n,r){var i=n?r?"$isolateScopeNoTemplate":"$isolateScope":"$scope";e.data(i,t)}:$,V.$$addScopeClass=C?function(e,t){N(e,t?"ng-isolate-scope":"ng-scope")}:$,V}]}function ct(e){return xe(e.replace(Mi,""))}function lt(e,t){var n="",r=e.split(/\s+/),i=t.split(/\s+/);e:for(var o=0;o<r.length;o++){for(var a=r[o],s=0;s<i.length;s++)if(a==i[s])continue e;n+=(n.length>0?" ":"")+a}return n}function ft(e){e=Er(e);var t=e.length;if(1>=t)return e;for(;t--;){var n=e[t];n.nodeType===Yr&&Or.call(e,t,1)}return e}function ht(e,t){if(t&&S(t))return t;if(S(e)){var n=Ni.exec(e);if(n)return n[3]}}function pt(){var e={},t=!1;this.register=function(t,n){pe(t,"controller"),w(t)?f(e,t):e[t]=n},this.allowGlobals=function(){t=!0},this.$get=["$injector","$window",function(i,o){function a(e,t,n,i){if(!e||!w(e.$scope))throw r("$controller")("noscp","Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",i,t);e.$scope[t]=n}return function(r,s,u,c){var l,h,p,d;if(u=u===!0,c&&S(c)&&(d=c),S(r)){if(h=r.match(Ni),!h)throw Ti("ctrlfmt","Badly formed controller string '{0}'. Must match `__name__ as __id__` or `__name__`.",r);p=h[1],d=d||h[3],r=e.hasOwnProperty(p)?e[p]:de(s.$scope,p,!0)||(t?de(o,p,!0):n),he(r,p,!0)}if(u){var $=(Ir(r)?r[r.length-1]:r).prototype;l=Object.create($||null),d&&a(s,d,l,p||r.name);var v;return v=f(function(){var e=i.invoke(r,l,s,p);return e!==l&&(w(e)||k(e))&&(l=e,d&&a(s,d,l,p||r.name)),l},{instance:l,identifier:d})}return l=i.instantiate(r,s,p),d&&a(s,d,l,p||r.name),l}}]}function dt(){this.$get=["$window",function(e){return Er(e.document)}]}function $t(){this.$get=["$log",function(e){return function(t,n){e.error.apply(e,arguments)}}]}function vt(e){return w(e)?C(e)?e.toISOString():G(e):e}function mt(){this.$get=function(){return function(e){if(!e)return"";var t=[];return a(e,function(e,n){null===e||y(e)||(Ir(e)?o(e,function(e,r){t.push(re(n)+"="+re(vt(e)))}):t.push(re(n)+"="+re(vt(e))))}),t.join("&")}}}function gt(){this.$get=function(){return function(e){function t(e,r,i){null===e||y(e)||(Ir(e)?o(e,function(e,n){t(e,r+"["+(w(e)?n:"")+"]")}):w(e)&&!C(e)?a(e,function(e,n){t(e,r+(i?"":"[")+n+(i?"":"]"))}):n.push(re(r)+"="+re(vt(e))))}if(!e)return"";var n=[];return t(e,"",!0),n.join("&")}}}function yt(e,t){if(S(e)){var n=e.replace(Ri,"").trim();if(n){var r=t("Content-Type");(r&&0===r.indexOf(ji)||bt(n))&&(e=Y(n))}}return e}function bt(e){var t=e.match(Di);return t&&Ii[t[0]].test(e)}function wt(e){function t(e,t){e&&(r[e]=r[e]?r[e]+", "+t:t)}var n,r=ve();return S(e)?o(e.split("\n"),function(e){n=e.indexOf(":"),t(gr(_r(e.substr(0,n))),_r(e.substr(n+1)))}):w(e)&&o(e,function(e,n){t(gr(n),_r(e))}),r}function xt(e){var t;return function(n){if(t||(t=wt(e)),n){var r=t[gr(n)];return void 0===r&&(r=null),r}return t}}function St(e,t,n,r){return k(r)?r(e,t,n):(o(r,function(r){e=r(e,t,n)}),e)}function Et(e){return e>=200&&300>e}function Ct(){var e=this.defaults={transformResponse:[yt],transformRequest:[function(e){return!w(e)||T(e)||V(e)||N(e)?e:G(e)}],headers:{common:{Accept:"application/json, text/plain, */*"},post:U(Pi),put:U(Pi),patch:U(Pi)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer"},t=!1;this.useApplyAsync=function(e){return b(e)?(t=!!e,this):t};var i=!0;this.useLegacyPromiseExtensions=function(e){return b(e)?(i=!!e,this):i};var a=this.interceptors=[];this.$get=["$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector",function(s,u,c,l,h,p){function d(t){function a(e){var t=f({},e);return e.data?t.data=St(e.data,e.headers,e.status,c.transformResponse):t.data=e.data,Et(e.status)?t:h.reject(t)}function s(e,t){var n,r={};return o(e,function(e,i){k(e)?(n=e(t),null!=n&&(r[i]=n)):r[i]=e}),r}function u(t){var n,r,i,o=e.headers,a=f({},t.headers);o=f({},o.common,o[gr(t.method)]);e:for(n in o){r=gr(n);for(i in a)if(gr(i)===r)continue e;a[n]=o[n]}return s(a,U(t))}if(!jr.isObject(t))throw r("$http")("badreq","Http request configuration must be an object.  Received: {0}",t);var c=f({method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse,paramSerializer:e.paramSerializer},t);c.headers=u(t),c.method=br(c.method),c.paramSerializer=S(c.paramSerializer)?p.get(c.paramSerializer):c.paramSerializer;var l=function(t){var r=t.headers,i=St(t.data,xt(r),n,t.transformRequest);return y(i)&&o(r,function(e,t){"content-type"===gr(t)&&delete r[t]}),y(t.withCredentials)&&!y(e.withCredentials)&&(t.withCredentials=e.withCredentials),m(t,i).then(a,a)},d=[l,n],$=h.when(c);for(o(E,function(e){(e.request||e.requestError)&&d.unshift(e.request,e.requestError),(e.response||e.responseError)&&d.push(e.response,e.responseError)});d.length;){var v=d.shift(),g=d.shift();$=$.then(v,g)}return i?($.success=function(e){return he(e,"fn"),$.then(function(t){e(t.data,t.status,t.headers,c)}),$},$.error=function(e){return he(e,"fn"),$.then(null,function(t){e(t.data,t.status,t.headers,c)}),$}):($.success=qi("success"),$.error=qi("error")),$}function $(e){o(arguments,function(e){d[e]=function(t,n){return d(f({},n||{},{method:e,url:t}))}})}function v(e){o(arguments,function(e){d[e]=function(t,n,r){return d(f({},r||{},{method:e,url:t,data:n}))}})}function m(r,i){function o(e,n,r,i){function o(){a(n,e,r,i)}p&&(Et(e)?p.put(E,[e,n,wt(r),i]):p.remove(E)),t?l.$applyAsync(o):(o(),l.$$phase||l.$apply())}function a(e,t,n,i){t=t>=-1?t:0,(Et(t)?v.resolve:v.reject)({data:e,status:t,headers:xt(n),config:r,statusText:i})}function c(e){a(e.data,e.status,U(e.headers()),e.statusText)}function f(){var e=d.pendingRequests.indexOf(r);-1!==e&&d.pendingRequests.splice(e,1)}var p,$,v=h.defer(),m=v.promise,S=r.headers,E=g(r.url,r.paramSerializer(r.params));if(d.pendingRequests.push(r),m.then(f,f),!r.cache&&!e.cache||r.cache===!1||"GET"!==r.method&&"JSONP"!==r.method||(p=w(r.cache)?r.cache:w(e.cache)?e.cache:x),p&&($=p.get(E),b($)?P($)?$.then(c,c):Ir($)?a($[1],$[0],U($[2]),$[3]):a($,200,{},"OK"):p.put(E,m)),y($)){var C=Cn(r.url)?u()[r.xsrfCookieName||e.xsrfCookieName]:n;C&&(S[r.xsrfHeaderName||e.xsrfHeaderName]=C),s(r.method,E,i,o,S,r.timeout,r.withCredentials,r.responseType)}return m}function g(e,t){return t.length>0&&(e+=(-1==e.indexOf("?")?"?":"&")+t),e}var x=c("$http");e.paramSerializer=S(e.paramSerializer)?p.get(e.paramSerializer):e.paramSerializer;var E=[];return o(a,function(e){E.unshift(S(e)?p.get(e):p.invoke(e))}),d.pendingRequests=[],$("get","delete","head","jsonp"),v("post","put","patch"),d.defaults=e,d}]}function kt(){return new e.XMLHttpRequest}function At(){this.$get=["$browser","$window","$document",function(e,t,n){return Ot(e,kt,e.defer,t.angular.callbacks,n[0])}]}function Ot(e,t,n,r,i){function a(e,t,n){var o=i.createElement("script"),a=null;return o.type="text/javascript",o.src=e,o.async=!0,a=function(e){ti(o,"load",a),ti(o,"error",a),i.body.removeChild(o),o=null;var s=-1,u="unknown";e&&("load"!==e.type||r[t].called||(e={type:"error"}),u=e.type,s="error"===e.type?404:200),n&&n(s,u)},ei(o,"load",a),ei(o,"error",a),i.body.appendChild(o),a}return function(i,s,u,c,l,f,h,p){function d(){g&&g(),w&&w.abort()}function v(t,r,i,o,a){b(E)&&n.cancel(E),g=w=null,t(r,i,o,a),e.$$completeOutstandingRequest($)}if(e.$$incOutstandingRequestCount(),s=s||e.url(),"jsonp"==gr(i)){var m="_"+(r.counter++).toString(36);r[m]=function(e){r[m].data=e,r[m].called=!0};var g=a(s.replace("JSON_CALLBACK","angular.callbacks."+m),m,function(e,t){v(c,e,r[m].data,"",t),r[m]=$})}else{var w=t();w.open(i,s,!0),o(l,function(e,t){b(e)&&w.setRequestHeader(t,e)}),w.onload=function(){var e=w.statusText||"",t="response"in w?w.response:w.responseText,n=1223===w.status?204:w.status;0===n&&(n=t?200:"file"==En(s).protocol?404:0),v(c,n,t,w.getAllResponseHeaders(),e)};var x=function(){v(c,-1,null,null,"")};if(w.onerror=x,w.onabort=x,h&&(w.withCredentials=!0),p)try{w.responseType=p}catch(S){if("json"!==p)throw S}w.send(y(u)?null:u)}if(f>0)var E=n(d,f);else P(f)&&f.then(d)}}function Mt(){var e="{{",t="}}";this.startSymbol=function(t){return t?(e=t,this):e},this.endSymbol=function(e){return e?(t=e,this):t},this.$get=["$parse","$exceptionHandler","$sce",function(n,r,i){function o(e){return"\\\\\\"+e}function a(n){return n.replace(h,e).replace(p,t)}function s(e){if(null==e)return"";switch(typeof e){case"string":break;case"number":e=""+e;break;default:e=G(e)}return e}function u(o,u,h,p){function d(e){try{return e=O(e),p&&!b(e)?e:s(e)}catch(t){r(Fi.interr(o,t))}}p=!!p;for(var $,v,m,g=0,w=[],x=[],S=o.length,E=[],C=[];S>g;){if(-1==($=o.indexOf(e,g))||-1==(v=o.indexOf(t,$+c))){g!==S&&E.push(a(o.substring(g)));break}g!==$&&E.push(a(o.substring(g,$))),m=o.substring($+c,v),w.push(m),x.push(n(m,d)),g=v+l,C.push(E.length),E.push("")}if(h&&E.length>1&&Fi.throwNoconcat(o),!u||w.length){var A=function(e){for(var t=0,n=w.length;n>t;t++){if(p&&y(e[t]))return;E[C[t]]=e[t]}return E.join("")},O=function(e){return h?i.getTrusted(h,e):i.valueOf(e)};return f(function(e){var t=0,n=w.length,i=new Array(n);try{for(;n>t;t++)i[t]=x[t](e);return A(i)}catch(a){r(Fi.interr(o,a))}},{exp:o,expressions:w,$$watchDelegate:function(e,t){var n;return e.$watchGroup(x,function(r,i){var o=A(r);k(t)&&t.call(this,o,r!==i?n:o,e),n=o})}})}}var c=e.length,l=t.length,h=new RegExp(e.replace(/./g,o),"g"),p=new RegExp(t.replace(/./g,o),"g");return u.startSymbol=function(){return e},u.endSymbol=function(){return t},u}]}function Tt(){this.$get=["$rootScope","$window","$q","$$q",function(e,t,n,r){function i(i,a,s,u){var c=arguments.length>4,l=c?L(arguments,4):[],f=t.setInterval,h=t.clearInterval,p=0,d=b(u)&&!u,$=(d?r:n).defer(),v=$.promise;return s=b(s)?s:0,v.then(null,null,c?function(){i.apply(null,l)}:i),v.$$intervalId=f(function(){$.notify(p++),s>0&&p>=s&&($.resolve(p),h(v.$$intervalId),delete o[v.$$intervalId]),d||e.$apply()},a),o[v.$$intervalId]=$,v}var o={};return i.cancel=function(e){return e&&e.$$intervalId in o?(o[e.$$intervalId].reject("canceled"),t.clearInterval(e.$$intervalId),delete o[e.$$intervalId],!0):!1},i}]}function Nt(e){for(var t=e.split("/"),n=t.length;n--;)t[n]=ne(t[n]);return t.join("/")}function Vt(e,t){var n=En(e);t.$$protocol=n.protocol,t.$$host=n.hostname,t.$$port=p(n.port)||Bi[n.protocol]||null}function jt(e,t){var n="/"!==e.charAt(0);n&&(e="/"+e);var r=En(e);t.$$path=decodeURIComponent(n&&"/"===r.pathname.charAt(0)?r.pathname.substring(1):r.pathname),t.$$search=ee(r.search),t.$$hash=decodeURIComponent(r.hash),t.$$path&&"/"!=t.$$path.charAt(0)&&(t.$$path="/"+t.$$path)}function Pt(e,t){return 0===t.indexOf(e)?t.substr(e.length):void 0}function Dt(e){var t=e.indexOf("#");return-1==t?e:e.substr(0,t)}function It(e){return e.replace(/(#.+)|#$/,"$1")}function Rt(e){return e.substr(0,Dt(e).lastIndexOf("/")+1)}function _t(e){return e.substring(0,e.indexOf("/",e.indexOf("//")+2))}function qt(e,t,n){this.$$html5=!0,n=n||"",Vt(e,this),this.$$parse=function(e){var n=Pt(t,e);if(!S(n))throw Hi("ipthprfx",'Invalid url "{0}", missing path prefix "{1}".',e,t);jt(n,this),this.$$path||(this.$$path="/"),this.$$compose()},this.$$compose=function(){var e=te(this.$$search),n=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(e?"?"+e:"")+n,this.$$absUrl=t+this.$$url.substr(1)},this.$$parseLinkUrl=function(r,i){if(i&&"#"===i[0])return this.hash(i.slice(1)),!0;var o,a,s;return b(o=Pt(e,r))?(a=o,s=b(o=Pt(n,o))?t+(Pt("/",o)||o):e+a):b(o=Pt(t,r))?s=t+o:t==r+"/"&&(s=t),s&&this.$$parse(s),!!s}}function Ft(e,t,n){Vt(e,this),this.$$parse=function(r){function i(e,t,n){var r,i=/^\/[A-Z]:(\/.*)/;return 0===t.indexOf(n)&&(t=t.replace(n,"")),i.exec(t)?e:(r=i.exec(e),r?r[1]:e)}var o,a=Pt(e,r)||Pt(t,r);y(a)||"#"!==a.charAt(0)?this.$$html5?o=a:(o="",y(a)&&(e=r,this.replace())):(o=Pt(n,a),y(o)&&(o=a)),jt(o,this),this.$$path=i(this.$$path,o,e),this.$$compose()},this.$$compose=function(){var t=te(this.$$search),r=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(t?"?"+t:"")+r,this.$$absUrl=e+(this.$$url?n+this.$$url:"")},this.$$parseLinkUrl=function(t,n){return Dt(e)==Dt(t)?(this.$$parse(t),!0):!1}}function Ut(e,t,n){this.$$html5=!0,Ft.apply(this,arguments),this.$$parseLinkUrl=function(r,i){if(i&&"#"===i[0])return this.hash(i.slice(1)),!0;var o,a;return e==Dt(r)?o=r:(a=Pt(t,r))?o=e+n+a:t===r+"/"&&(o=t),o&&this.$$parse(o),!!o},this.$$compose=function(){var t=te(this.$$search),r=this.$$hash?"#"+ne(this.$$hash):"";this.$$url=Nt(this.$$path)+(t?"?"+t:"")+r,this.$$absUrl=e+n+this.$$url}}function Bt(e){return function(){return this[e]}}function Ht(e,t){return function(n){return y(n)?this[e]:(this[e]=t(n),this.$$compose(),this)}}function Lt(){var e="",t={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(t){return b(t)?(e=t,this):e},this.html5Mode=function(e){return j(e)?(t.enabled=e,this):w(e)?(j(e.enabled)&&(t.enabled=e.enabled),j(e.requireBase)&&(t.requireBase=e.requireBase),j(e.rewriteLinks)&&(t.rewriteLinks=e.rewriteLinks),this):t},this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(n,r,i,o,a){function s(e,t,n){var i=c.url(),o=c.$$state;try{r.url(e,t,n),c.$$state=r.state()}catch(a){throw c.url(i),c.$$state=o,a}}function u(e,t){n.$broadcast("$locationChangeSuccess",c.absUrl(),e,c.$$state,t)}var c,l,f,h=r.baseHref(),p=r.url();if(t.enabled){if(!h&&t.requireBase)throw Hi("nobase","$location in HTML5 mode requires a <base> tag to be present!");f=_t(p)+(h||"/"),l=i.history?qt:Ut}else f=Dt(p),l=Ft;var d=Rt(f);c=new l(f,d,"#"+e),c.$$parseLinkUrl(p,p),c.$$state=r.state();var $=/^\s*(javascript|mailto):/i;o.on("click",function(e){if(t.rewriteLinks&&!e.ctrlKey&&!e.metaKey&&!e.shiftKey&&2!=e.which&&2!=e.button){for(var i=Er(e.target);"a"!==_(i[0]);)if(i[0]===o[0]||!(i=i.parent())[0])return;var s=i.prop("href"),u=i.attr("href")||i.attr("xlink:href");w(s)&&"[object SVGAnimatedString]"===s.toString()&&(s=En(s.animVal).href),$.test(s)||!s||i.attr("target")||e.isDefaultPrevented()||c.$$parseLinkUrl(s,u)&&(e.preventDefault(),c.absUrl()!=r.url()&&(n.$apply(),a.angular["ff-684208-preventDefault"]=!0))}}),It(c.absUrl())!=It(p)&&r.url(c.absUrl(),!0);var v=!0;return r.onUrlChange(function(e,t){return y(Pt(d,e))?void(a.location.href=e):(n.$evalAsync(function(){var r,i=c.absUrl(),o=c.$$state;c.$$parse(e),c.$$state=t,r=n.$broadcast("$locationChangeStart",e,i,t,o).defaultPrevented,c.absUrl()===e&&(r?(c.$$parse(i),c.$$state=o,s(i,!1,o)):(v=!1,u(i,o)))}),void(n.$$phase||n.$digest()))}),n.$watch(function(){var e=It(r.url()),t=It(c.absUrl()),o=r.state(),a=c.$$replace,l=e!==t||c.$$html5&&i.history&&o!==c.$$state;(v||l)&&(v=!1,n.$evalAsync(function(){var t=c.absUrl(),r=n.$broadcast("$locationChangeStart",t,e,c.$$state,o).defaultPrevented;c.absUrl()===t&&(r?(c.$$parse(e),c.$$state=o):(l&&s(t,a,o===c.$$state?null:c.$$state),u(e,o)))})),c.$$replace=!1}),c}]}function zt(){var e=!0,t=this;this.debugEnabled=function(t){return b(t)?(e=t,this):e},this.$get=["$window",function(n){function r(e){return e instanceof Error&&(e.stack?e=e.message&&-1===e.stack.indexOf(e.message)?"Error: "+e.message+"\n"+e.stack:e.stack:e.sourceURL&&(e=e.message+"\n"+e.sourceURL+":"+e.line)),e}function i(e){var t=n.console||{},i=t[e]||t.log||$,a=!1;try{a=!!i.apply}catch(s){}return a?function(){var e=[];return o(arguments,function(t){e.push(r(t))}),i.apply(t,e)}:function(e,t){i(e,null==t?"":t)}}return{log:i("log"),info:i("info"),warn:i("warn"),error:i("error"),debug:function(){var n=i("debug");return function(){e&&n.apply(t,arguments)}}()}}]}function Wt(e,t){if(e=w(e)&&e.toString?e.toString():e,"__defineGetter__"===e||"__defineSetter__"===e||"__lookupGetter__"===e||"__lookupSetter__"===e||"__proto__"===e)throw zi("isecfld","Attempting to access a disallowed field in Angular expressions! Expression: {0}",t);return e}function Gt(e,t){if(e){if(e.constructor===e)throw zi("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e.window===e)throw zi("isecwindow","Referencing the Window in Angular expressions is disallowed! Expression: {0}",t);if(e.children&&(e.nodeName||e.prop&&e.attr&&e.find))throw zi("isecdom","Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}",t);if(e===Object)throw zi("isecobj","Referencing Object in Angular expressions is disallowed! Expression: {0}",t)}return e}function Yt(e,t){if(e){if(e.constructor===e)throw zi("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e===Wi||e===Gi||e===Yi)throw zi("isecff","Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}",t)}}function Jt(e,t){return"undefined"!=typeof e?e:t}function Kt(e,t){return"undefined"==typeof e?t:"undefined"==typeof t?e:e+t}function Zt(e,t){var n=e(t);return!n.$stateful}function Xt(e,t){var n,r;switch(e.type){case Xi.Program:n=!0,o(e.body,function(e){Xt(e.expression,t),n=n&&e.expression.constant}),e.constant=n;break;case Xi.Literal:e.constant=!0,e.toWatch=[];break;case Xi.UnaryExpression:Xt(e.argument,t),e.constant=e.argument.constant,e.toWatch=e.argument.toWatch;break;case Xi.BinaryExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=e.left.toWatch.concat(e.right.toWatch);break;case Xi.LogicalExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=e.constant?[]:[e];break;case Xi.ConditionalExpression:Xt(e.test,t),Xt(e.alternate,t),Xt(e.consequent,t),e.constant=e.test.constant&&e.alternate.constant&&e.consequent.constant,e.toWatch=e.constant?[]:[e];break;case Xi.Identifier:e.constant=!1,e.toWatch=[e];break;case Xi.MemberExpression:Xt(e.object,t),e.computed&&Xt(e.property,t),e.constant=e.object.constant&&(!e.computed||e.property.constant),e.toWatch=[e];break;case Xi.CallExpression:n=e.filter?Zt(t,e.callee.name):!1,r=[],o(e.arguments,function(e){Xt(e,t),n=n&&e.constant,e.constant||r.push.apply(r,e.toWatch)}),e.constant=n,e.toWatch=e.filter&&Zt(t,e.callee.name)?r:[e];break;case Xi.AssignmentExpression:Xt(e.left,t),Xt(e.right,t),e.constant=e.left.constant&&e.right.constant,e.toWatch=[e];break;case Xi.ArrayExpression:n=!0,r=[],o(e.elements,function(e){Xt(e,t),n=n&&e.constant,e.constant||r.push.apply(r,e.toWatch)}),e.constant=n,e.toWatch=r;break;case Xi.ObjectExpression:n=!0,r=[],o(e.properties,function(e){Xt(e.value,t),n=n&&e.value.constant,e.value.constant||r.push.apply(r,e.value.toWatch)}),e.constant=n,e.toWatch=r;break;case Xi.ThisExpression:e.constant=!1,e.toWatch=[]}}function Qt(e){if(1==e.length){var t=e[0].expression,r=t.toWatch;return 1!==r.length?r:r[0]!==t?r:n}}function en(e){return e.type===Xi.Identifier||e.type===Xi.MemberExpression}function tn(e){return 1===e.body.length&&en(e.body[0].expression)?{type:Xi.AssignmentExpression,left:e.body[0].expression,right:{type:Xi.NGValueParameter},operator:"="}:void 0}function nn(e){return 0===e.body.length||1===e.body.length&&(e.body[0].expression.type===Xi.Literal||e.body[0].expression.type===Xi.ArrayExpression||e.body[0].expression.type===Xi.ObjectExpression)}function rn(e){return e.constant}function on(e,t){this.astBuilder=e,this.$filter=t}function an(e,t){this.astBuilder=e,this.$filter=t}function sn(e){return"constructor"==e}function un(e){return k(e.valueOf)?e.valueOf():eo.call(e)}function cn(){var e=ve(),t=ve();this.$get=["$filter",function(r){function i(e,t){return null==e||null==t?e===t:"object"==typeof e&&(e=un(e),"object"==typeof e)?!1:e===t||e!==e&&t!==t}function a(e,t,r,o,a){var s,u=o.inputs;if(1===u.length){var c=i;return u=u[0],e.$watch(function(e){var t=u(e);return i(t,c)||(s=o(e,n,n,[t]),c=t&&un(t)),s},t,r,a)}for(var l=[],f=[],h=0,p=u.length;p>h;h++)l[h]=i,f[h]=null;return e.$watch(function(e){for(var t=!1,r=0,a=u.length;a>r;r++){var c=u[r](e);(t||(t=!i(c,l[r])))&&(f[r]=c,l[r]=c&&un(c))}return t&&(s=o(e,n,n,f)),s},t,r,a)}function s(e,t,n,r){var i,o;return i=e.$watch(function(e){return r(e)},function(e,n,r){o=e,k(t)&&t.apply(this,arguments),b(e)&&r.$$postDigest(function(){b(o)&&i()})},n)}function u(e,t,n,r){function i(e){var t=!0;return o(e,function(e){b(e)||(t=!1)}),t}var a,s;return a=e.$watch(function(e){return r(e)},function(e,n,r){s=e,k(t)&&t.call(this,e,n,r),i(e)&&r.$$postDigest(function(){i(s)&&a()})},n)}function c(e,t,n,r){var i;return i=e.$watch(function(e){return r(e)},function(e,n,r){k(t)&&t.apply(this,arguments),i()},n)}function l(e,t){if(!t)return e;var n=e.$$watchDelegate,r=n!==u&&n!==s,i=r?function(n,r,i,o){var a=e(n,r,i,o);return t(a,n,r)}:function(n,r,i,o){var a=e(n,r,i,o),s=t(a,n,r);return b(a)?s:a};return e.$$watchDelegate&&e.$$watchDelegate!==a?i.$$watchDelegate=e.$$watchDelegate:t.$stateful||(i.$$watchDelegate=a,i.inputs=e.inputs?e.inputs:[e]),i}var f=Fr().noUnsafeEval,h={csp:f,expensiveChecks:!1},p={csp:f,expensiveChecks:!0};return function(n,i,o){var f,d,v;switch(typeof n){case"string":n=n.trim(),v=n;var m=o?t:e;if(f=m[v],!f){":"===n.charAt(0)&&":"===n.charAt(1)&&(d=!0,n=n.substring(2));var g=o?p:h,y=new Zi(g),b=new Qi(y,r,g);f=b.parse(n),f.constant?f.$$watchDelegate=c:d?f.$$watchDelegate=f.literal?u:s:f.inputs&&(f.$$watchDelegate=a),m[v]=f}return l(f,i);case"function":return l(n,i);default:return $}}}]}function ln(){this.$get=["$rootScope","$exceptionHandler",function(e,t){return hn(function(t){e.$evalAsync(t)},t)}]}function fn(){this.$get=["$browser","$exceptionHandler",function(e,t){return hn(function(t){e.defer(t)},t)}]}function hn(e,t){function i(e,t,n){function r(t){return function(n){i||(i=!0,t.call(e,n))}}var i=!1;return[r(t),r(n)]}function a(){this.$$state={status:0}}function s(e,t){return function(n){t.call(e,n)}}function u(e){var r,i,o;o=e.pending,e.processScheduled=!1,e.pending=n;for(var a=0,s=o.length;s>a;++a){i=o[a][0],r=o[a][e.status];try{k(r)?i.resolve(r(e.value)):1===e.status?i.resolve(e.value):i.reject(e.value)}catch(u){i.reject(u),t(u)}}}function c(t){!t.processScheduled&&t.pending&&(t.processScheduled=!0,e(function(){u(t)}))}function l(){this.promise=new a,this.resolve=s(this,this.resolve),this.reject=s(this,this.reject),this.notify=s(this,this.notify)}function h(e){var t=new l,n=0,r=Ir(e)?[]:{};return o(e,function(e,i){n++,g(e).then(function(e){r.hasOwnProperty(i)||(r[i]=e,--n||t.resolve(r))},function(e){r.hasOwnProperty(i)||t.reject(e)})}),0===n&&t.resolve(r),t.promise}var p=r("$q",TypeError),d=function(){return new l};f(a.prototype,{then:function(e,t,n){if(y(e)&&y(t)&&y(n))return this;var r=new l;return this.$$state.pending=this.$$state.pending||[],this.$$state.pending.push([r,e,t,n]),this.$$state.status>0&&c(this.$$state),r.promise},"catch":function(e){return this.then(null,e)},"finally":function(e,t){return this.then(function(t){return m(t,!0,e)},function(t){return m(t,!1,e)},t)}}),f(l.prototype,{resolve:function(e){this.promise.$$state.status||(e===this.promise?this.$$reject(p("qcycle","Expected promise to be resolved with value other than itself '{0}'",e)):this.$$resolve(e))},$$resolve:function(e){var n,r;r=i(this,this.$$resolve,this.$$reject);try{(w(e)||k(e))&&(n=e&&e.then),k(n)?(this.promise.$$state.status=-1,n.call(e,r[0],r[1],this.notify)):(this.promise.$$state.value=e,this.promise.$$state.status=1,c(this.promise.$$state))}catch(o){r[1](o),t(o)}},reject:function(e){this.promise.$$state.status||this.$$reject(e)},$$reject:function(e){this.promise.$$state.value=e,this.promise.$$state.status=2,c(this.promise.$$state)},notify:function(n){var r=this.promise.$$state.pending;this.promise.$$state.status<=0&&r&&r.length&&e(function(){for(var e,i,o=0,a=r.length;a>o;o++){i=r[o][0],e=r[o][3];try{i.notify(k(e)?e(n):n)}catch(s){t(s)}}})}});var $=function(e){var t=new l;return t.reject(e),t.promise},v=function(e,t){var n=new l;return t?n.resolve(e):n.reject(e),n.promise},m=function(e,t,n){var r=null;try{k(n)&&(r=n())}catch(i){return v(i,!1)}return P(r)?r.then(function(){return v(e,t)},function(e){return v(e,!1)}):v(e,t)},g=function(e,t,n,r){var i=new l;return i.resolve(e),i.promise.then(t,n,r)},b=g,x=function S(e){function t(e){r.resolve(e)}function n(e){r.reject(e)}if(!k(e))throw p("norslvr","Expected resolverFn, got '{0}'",e);if(!(this instanceof S))return new S(e);
 var r=new l;return e(t,n),r.promise};return x.defer=d,x.reject=$,x.when=g,x.resolve=b,x.all=h,x}function pn(){this.$get=["$window","$timeout",function(e,t){var n=e.requestAnimationFrame||e.webkitRequestAnimationFrame,r=e.cancelAnimationFrame||e.webkitCancelAnimationFrame||e.webkitCancelRequestAnimationFrame,i=!!n,o=i?function(e){var t=n(e);return function(){r(t)}}:function(e){var n=t(e,16.66,!1);return function(){t.cancel(n)}};return o.supported=i,o}]}function dn(){function e(e){function t(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null,this.$$listeners={},this.$$listenerCount={},this.$$watchersCount=0,this.$id=u(),this.$$ChildScope=null}return t.prototype=e,t}var t=10,n=r("$rootScope"),a=null,s=null;this.digestTtl=function(e){return arguments.length&&(t=e),t},this.$get=["$injector","$exceptionHandler","$parse","$browser",function(r,c,l,f){function h(e){e.currentScope.$$destroyed=!0}function p(){this.$id=u(),this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null,this.$root=this,this.$$destroyed=!1,this.$$listeners={},this.$$listenerCount={},this.$$watchersCount=0,this.$$isolateBindings=null}function d(e){if(E.$$phase)throw n("inprog","{0} already in progress",E.$$phase);E.$$phase=e}function v(){E.$$phase=null}function m(e,t){do e.$$watchersCount+=t;while(e=e.$parent)}function g(e,t,n){do e.$$listenerCount[n]-=t,0===e.$$listenerCount[n]&&delete e.$$listenerCount[n];while(e=e.$parent)}function b(){}function x(){for(;O.length;)try{O.shift()()}catch(e){c(e)}s=null}function S(){null===s&&(s=f.defer(function(){E.$apply(x)}))}p.prototype={constructor:p,$new:function(t,n){var r;return n=n||this,t?(r=new p,r.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=e(this)),r=new this.$$ChildScope),r.$parent=n,r.$$prevSibling=n.$$childTail,n.$$childHead?(n.$$childTail.$$nextSibling=r,n.$$childTail=r):n.$$childHead=n.$$childTail=r,(t||n!=this)&&r.$on("$destroy",h),r},$watch:function(e,t,n,r){var i=l(e);if(i.$$watchDelegate)return i.$$watchDelegate(this,t,n,i,e);var o=this,s=o.$$watchers,u={fn:t,last:b,get:i,exp:r||e,eq:!!n};return a=null,k(t)||(u.fn=$),s||(s=o.$$watchers=[]),s.unshift(u),m(this,1),function(){q(s,u)>=0&&m(o,-1),a=null}},$watchGroup:function(e,t){function n(){u=!1,c?(c=!1,t(i,i,s)):t(i,r,s)}var r=new Array(e.length),i=new Array(e.length),a=[],s=this,u=!1,c=!0;if(!e.length){var l=!0;return s.$evalAsync(function(){l&&t(i,i,s)}),function(){l=!1}}return 1===e.length?this.$watch(e[0],function(e,n,o){i[0]=e,r[0]=n,t(i,e===n?i:r,o)}):(o(e,function(e,t){var o=s.$watch(e,function(e,o){i[t]=e,r[t]=o,u||(u=!0,s.$evalAsync(n))});a.push(o)}),function(){for(;a.length;)a.shift()()})},$watchCollection:function(e,t){function n(e){o=e;var t,n,r,s,u;if(!y(o)){if(w(o))if(i(o)){a!==p&&(a=p,v=a.length=0,f++),t=o.length,v!==t&&(f++,a.length=v=t);for(var c=0;t>c;c++)u=a[c],s=o[c],r=u!==u&&s!==s,r||u===s||(f++,a[c]=s)}else{a!==d&&(a=d={},v=0,f++),t=0;for(n in o)yr.call(o,n)&&(t++,s=o[n],u=a[n],n in a?(r=u!==u&&s!==s,r||u===s||(f++,a[n]=s)):(v++,a[n]=s,f++));if(v>t){f++;for(n in a)yr.call(o,n)||(v--,delete a[n])}}else a!==o&&(a=o,f++);return f}}function r(){if($?($=!1,t(o,o,u)):t(o,s,u),c)if(w(o))if(i(o)){s=new Array(o.length);for(var e=0;e<o.length;e++)s[e]=o[e]}else{s={};for(var n in o)yr.call(o,n)&&(s[n]=o[n])}else s=o}n.$stateful=!0;var o,a,s,u=this,c=t.length>1,f=0,h=l(e,n),p=[],d={},$=!0,v=0;return this.$watch(h,r)},$digest:function(){var e,r,i,o,u,l,h,p,$,m,g=t,y=this,w=[];d("$digest"),f.$$checkUrlChange(),this===E&&null!==s&&(f.defer.cancel(s),x()),a=null;do{for(l=!1,p=y;C.length;){try{m=C.shift(),m.scope.$eval(m.expression,m.locals)}catch(S){c(S)}a=null}e:do{if(o=p.$$watchers)for(u=o.length;u--;)try{if(e=o[u])if((r=e.get(p))===(i=e.last)||(e.eq?B(r,i):"number"==typeof r&&"number"==typeof i&&isNaN(r)&&isNaN(i))){if(e===a){l=!1;break e}}else l=!0,a=e,e.last=e.eq?F(r,null):r,e.fn(r,i===b?r:i,p),5>g&&($=4-g,w[$]||(w[$]=[]),w[$].push({msg:k(e.exp)?"fn: "+(e.exp.name||e.exp.toString()):e.exp,newVal:r,oldVal:i}))}catch(S){c(S)}if(!(h=p.$$watchersCount&&p.$$childHead||p!==y&&p.$$nextSibling))for(;p!==y&&!(h=p.$$nextSibling);)p=p.$parent}while(p=h);if((l||C.length)&&!g--)throw v(),n("infdig","{0} $digest() iterations reached. Aborting!\nWatchers fired in the last 5 iterations: {1}",t,w)}while(l||C.length);for(v();A.length;)try{A.shift()()}catch(S){c(S)}},$destroy:function(){if(!this.$$destroyed){var e=this.$parent;this.$broadcast("$destroy"),this.$$destroyed=!0,this===E&&f.$$applicationDestroyed(),m(this,-this.$$watchersCount);for(var t in this.$$listenerCount)g(this,this.$$listenerCount[t],t);e&&e.$$childHead==this&&(e.$$childHead=this.$$nextSibling),e&&e.$$childTail==this&&(e.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=$,this.$on=this.$watch=this.$watchGroup=function(){return $},this.$$listeners={},this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=this.$$watchers=null}},$eval:function(e,t){return l(e)(this,t)},$evalAsync:function(e,t){E.$$phase||C.length||f.defer(function(){C.length&&E.$digest()}),C.push({scope:this,expression:e,locals:t})},$$postDigest:function(e){A.push(e)},$apply:function(e){try{d("$apply");try{return this.$eval(e)}finally{v()}}catch(t){c(t)}finally{try{E.$digest()}catch(t){throw c(t),t}}},$applyAsync:function(e){function t(){n.$eval(e)}var n=this;e&&O.push(t),S()},$on:function(e,t){var n=this.$$listeners[e];n||(this.$$listeners[e]=n=[]),n.push(t);var r=this;do r.$$listenerCount[e]||(r.$$listenerCount[e]=0),r.$$listenerCount[e]++;while(r=r.$parent);var i=this;return function(){var r=n.indexOf(t);-1!==r&&(n[r]=null,g(i,1,e))}},$emit:function(e,t){var n,r,i,o=[],a=this,s=!1,u={name:e,targetScope:a,stopPropagation:function(){s=!0},preventDefault:function(){u.defaultPrevented=!0},defaultPrevented:!1},l=H([u],arguments,1);do{for(n=a.$$listeners[e]||o,u.currentScope=a,r=0,i=n.length;i>r;r++)if(n[r])try{n[r].apply(null,l)}catch(f){c(f)}else n.splice(r,1),r--,i--;if(s)return u.currentScope=null,u;a=a.$parent}while(a);return u.currentScope=null,u},$broadcast:function(e,t){var n=this,r=n,i=n,o={name:e,targetScope:n,preventDefault:function(){o.defaultPrevented=!0},defaultPrevented:!1};if(!n.$$listenerCount[e])return o;for(var a,s,u,l=H([o],arguments,1);r=i;){for(o.currentScope=r,a=r.$$listeners[e]||[],s=0,u=a.length;u>s;s++)if(a[s])try{a[s].apply(null,l)}catch(f){c(f)}else a.splice(s,1),s--,u--;if(!(i=r.$$listenerCount[e]&&r.$$childHead||r!==n&&r.$$nextSibling))for(;r!==n&&!(i=r.$$nextSibling);)r=r.$parent}return o.currentScope=null,o}};var E=new p,C=E.$$asyncQueue=[],A=E.$$postDigestQueue=[],O=E.$$applyAsyncQueue=[];return E}]}function $n(){var e=/^\s*(https?|ftp|mailto|tel|file):/,t=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(t){return b(t)?(e=t,this):e},this.imgSrcSanitizationWhitelist=function(e){return b(e)?(t=e,this):t},this.$get=function(){return function(n,r){var i,o=r?t:e;return i=En(n).href,""===i||i.match(o)?n:"unsafe:"+i}}}function vn(e){if("self"===e)return e;if(S(e)){if(e.indexOf("***")>-1)throw to("iwcard","Illegal sequence *** in string matcher.  String: {0}",e);return e=qr(e).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*"),new RegExp("^"+e+"$")}if(A(e))return new RegExp("^"+e.source+"$");throw to("imatcher",'Matchers may only be "self", string patterns or RegExp objects')}function mn(e){var t=[];return b(e)&&o(e,function(e){t.push(vn(e))}),t}function gn(){this.SCE_CONTEXTS=no;var e=["self"],t=[];this.resourceUrlWhitelist=function(t){return arguments.length&&(e=mn(t)),e},this.resourceUrlBlacklist=function(e){return arguments.length&&(t=mn(e)),t},this.$get=["$injector",function(n){function r(e,t){return"self"===e?Cn(t):!!e.exec(t.href)}function i(n){var i,o,a=En(n.toString()),s=!1;for(i=0,o=e.length;o>i;i++)if(r(e[i],a)){s=!0;break}if(s)for(i=0,o=t.length;o>i;i++)if(r(t[i],a)){s=!1;break}return s}function o(e){var t=function(e){this.$$unwrapTrustedValue=function(){return e}};return e&&(t.prototype=new e),t.prototype.valueOf=function(){return this.$$unwrapTrustedValue()},t.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()},t}function a(e,t){var n=f.hasOwnProperty(e)?f[e]:null;if(!n)throw to("icontext","Attempted to trust a value in invalid context. Context: {0}; Value: {1}",e,t);if(null===t||y(t)||""===t)return t;if("string"!=typeof t)throw to("itype","Attempted to trust a non-string value in a content requiring a string: Context: {0}",e);return new n(t)}function s(e){return e instanceof l?e.$$unwrapTrustedValue():e}function u(e,t){if(null===t||y(t)||""===t)return t;var n=f.hasOwnProperty(e)?f[e]:null;if(n&&t instanceof n)return t.$$unwrapTrustedValue();if(e===no.RESOURCE_URL){if(i(t))return t;throw to("insecurl","Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",t.toString())}if(e===no.HTML)return c(t);throw to("unsafe","Attempting to use an unsafe value in a safe context.")}var c=function(e){throw to("unsafe","Attempting to use an unsafe value in a safe context.")};n.has("$sanitize")&&(c=n.get("$sanitize"));var l=o(),f={};return f[no.HTML]=o(l),f[no.CSS]=o(l),f[no.URL]=o(l),f[no.JS]=o(l),f[no.RESOURCE_URL]=o(f[no.URL]),{trustAs:a,getTrusted:u,valueOf:s}}]}function yn(){var e=!0;this.enabled=function(t){return arguments.length&&(e=!!t),e},this.$get=["$parse","$sceDelegate",function(t,n){if(e&&8>Sr)throw to("iequirks","Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks mode.  You can fix this by adding the text <!doctype html> to the top of your HTML document.  See http://docs.angularjs.org/api/ng.$sce for more information.");var r=U(no);r.isEnabled=function(){return e},r.trustAs=n.trustAs,r.getTrusted=n.getTrusted,r.valueOf=n.valueOf,e||(r.trustAs=r.getTrusted=function(e,t){return t},r.valueOf=v),r.parseAs=function(e,n){var i=t(n);return i.literal&&i.constant?i:t(n,function(t){return r.getTrusted(e,t)})};var i=r.parseAs,a=r.getTrusted,s=r.trustAs;return o(no,function(e,t){var n=gr(t);r[xe("parse_as_"+n)]=function(t){return i(e,t)},r[xe("get_trusted_"+n)]=function(t){return a(e,t)},r[xe("trust_as_"+n)]=function(t){return s(e,t)}}),r}]}function bn(){this.$get=["$window","$document",function(e,t){var n,r,i={},o=p((/android (\d+)/.exec(gr((e.navigator||{}).userAgent))||[])[1]),a=/Boxee/i.test((e.navigator||{}).userAgent),s=t[0]||{},u=/^(Moz|webkit|ms)(?=[A-Z])/,c=s.body&&s.body.style,l=!1,f=!1;if(c){for(var h in c)if(r=u.exec(h)){n=r[0],n=n.substr(0,1).toUpperCase()+n.substr(1);break}n||(n="WebkitOpacity"in c&&"webkit"),l=!!("transition"in c||n+"Transition"in c),f=!!("animation"in c||n+"Animation"in c),!o||l&&f||(l=S(c.webkitTransition),f=S(c.webkitAnimation))}return{history:!(!e.history||!e.history.pushState||4>o||a),hasEvent:function(e){if("input"===e&&11>=Sr)return!1;if(y(i[e])){var t=s.createElement("div");i[e]="on"+e in t}return i[e]},csp:Fr(),vendorPrefix:n,transitions:l,animations:f,android:o}}]}function wn(){this.$get=["$templateCache","$http","$q","$sce",function(e,t,n,r){function i(o,a){function s(e){if(!a)throw Oi("tpload","Failed to load template: {0} (HTTP status: {1} {2})",o,e.status,e.statusText);return n.reject(e)}i.totalPendingRequests++,S(o)&&e.get(o)||(o=r.getTrustedResourceUrl(o));var u=t.defaults&&t.defaults.transformResponse;Ir(u)?u=u.filter(function(e){return e!==yt}):u===yt&&(u=null);var c={cache:e,transformResponse:u};return t.get(o,c)["finally"](function(){i.totalPendingRequests--}).then(function(t){return e.put(o,t.data),t.data},s)}return i.totalPendingRequests=0,i}]}function xn(){this.$get=["$rootScope","$browser","$location",function(e,t,n){var r={};return r.findBindings=function(e,t,n){var r=e.getElementsByClassName("ng-binding"),i=[];return o(r,function(e){var r=jr.element(e).data("$binding");r&&o(r,function(r){if(n){var o=new RegExp("(^|\\s)"+qr(t)+"(\\s|\\||$)");o.test(r)&&i.push(e)}else-1!=r.indexOf(t)&&i.push(e)})}),i},r.findModels=function(e,t,n){for(var r=["ng-","data-ng-","ng\\:"],i=0;i<r.length;++i){var o=n?"=":"*=",a="["+r[i]+"model"+o+'"'+t+'"]',s=e.querySelectorAll(a);if(s.length)return s}},r.getLocation=function(){return n.url()},r.setLocation=function(t){t!==n.url()&&(n.url(t),e.$digest())},r.whenStable=function(e){t.notifyWhenNoOutstandingRequests(e)},r}]}function Sn(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(e,t,n,r,i){function o(o,s,u){k(o)||(u=s,s=o,o=$);var c,l=L(arguments,3),f=b(u)&&!u,h=(f?r:n).defer(),p=h.promise;return c=t.defer(function(){try{h.resolve(o.apply(null,l))}catch(t){h.reject(t),i(t)}finally{delete a[p.$$timeoutId]}f||e.$apply()},s),p.$$timeoutId=c,a[c]=h,p}var a={};return o.cancel=function(e){return e&&e.$$timeoutId in a?(a[e.$$timeoutId].reject("canceled"),delete a[e.$$timeoutId],t.defer.cancel(e.$$timeoutId)):!1},o}]}function En(e){var t=e;return Sr&&(ro.setAttribute("href",t),t=ro.href),ro.setAttribute("href",t),{href:ro.href,protocol:ro.protocol?ro.protocol.replace(/:$/,""):"",host:ro.host,search:ro.search?ro.search.replace(/^\?/,""):"",hash:ro.hash?ro.hash.replace(/^#/,""):"",hostname:ro.hostname,port:ro.port,pathname:"/"===ro.pathname.charAt(0)?ro.pathname:"/"+ro.pathname}}function Cn(e){var t=S(e)?En(e):e;return t.protocol===io.protocol&&t.host===io.host}function kn(){this.$get=m(e)}function An(e){function t(e){try{return decodeURIComponent(e)}catch(t){return e}}var n=e[0]||{},r={},i="";return function(){var e,o,a,s,u,c=n.cookie||"";if(c!==i)for(i=c,e=i.split("; "),r={},a=0;a<e.length;a++)o=e[a],s=o.indexOf("="),s>0&&(u=t(o.substring(0,s)),y(r[u])&&(r[u]=t(o.substring(s+1))));return r}}function On(){this.$get=An}function Mn(e){function t(r,i){if(w(r)){var a={};return o(r,function(e,n){a[n]=t(n,e)}),a}return e.factory(r+n,i)}var n="Filter";this.register=t,this.$get=["$injector",function(e){return function(t){return e.get(t+n)}}],t("currency",Pn),t("date",Gn),t("filter",Tn),t("json",Yn),t("limitTo",Jn),t("lowercase",co),t("number",Dn),t("orderBy",Kn),t("uppercase",lo)}function Tn(){return function(e,t,n){if(!i(e)){if(null==e)return e;throw r("filter")("notarray","Expected array but received: {0}",e)}var o,a,s=jn(t);switch(s){case"function":o=t;break;case"boolean":case"null":case"number":case"string":a=!0;case"object":o=Nn(t,n,a);break;default:return e}return Array.prototype.filter.call(e,o)}}function Nn(e,t,n){var r,i=w(e)&&"$"in e;return t===!0?t=B:k(t)||(t=function(e,t){return y(e)?!1:null===e||null===t?e===t:w(t)||w(e)&&!g(e)?!1:(e=gr(""+e),t=gr(""+t),-1!==e.indexOf(t))}),r=function(r){return i&&!w(r)?Vn(r,e.$,t,!1):Vn(r,e,t,n)}}function Vn(e,t,n,r,i){var o=jn(e),a=jn(t);if("string"===a&&"!"===t.charAt(0))return!Vn(e,t.substring(1),n,r);if(Ir(e))return e.some(function(e){return Vn(e,t,n,r)});switch(o){case"object":var s;if(r){for(s in e)if("$"!==s.charAt(0)&&Vn(e[s],t,n,!0))return!0;return i?!1:Vn(e,t,n,!1)}if("object"===a){for(s in t){var u=t[s];if(!k(u)&&!y(u)){var c="$"===s,l=c?e:e[s];if(!Vn(l,u,n,c,c))return!1}}return!0}return n(e,t);case"function":return!1;default:return n(e,t)}}function jn(e){return null===e?"null":typeof e}function Pn(e){var t=e.NUMBER_FORMATS;return function(e,n,r){return y(n)&&(n=t.CURRENCY_SYM),y(r)&&(r=t.PATTERNS[1].maxFrac),null==e?e:In(e,t.PATTERNS[1],t.GROUP_SEP,t.DECIMAL_SEP,r).replace(/\u00A4/g,n)}}function Dn(e){var t=e.NUMBER_FORMATS;return function(e,n){return null==e?e:In(e,t.PATTERNS[0],t.GROUP_SEP,t.DECIMAL_SEP,n)}}function In(e,t,n,r,i){if(w(e))return"";var o=0>e;e=Math.abs(e);var a=e===1/0;if(!a&&!isFinite(e))return"";var s=e+"",u="",c=!1,l=[];if(a&&(u="∞"),!a&&-1!==s.indexOf("e")){var f=s.match(/([\d\.]+)e(-?)(\d+)/);f&&"-"==f[2]&&f[3]>i+1?e=0:(u=s,c=!0)}if(a||c)i>0&&1>e&&(u=e.toFixed(i),e=parseFloat(u));else{var h=(s.split(oo)[1]||"").length;y(i)&&(i=Math.min(Math.max(t.minFrac,h),t.maxFrac)),e=+(Math.round(+(e.toString()+"e"+i)).toString()+"e"+-i);var p=(""+e).split(oo),d=p[0];p=p[1]||"";var $,v=0,m=t.lgSize,g=t.gSize;if(d.length>=m+g)for(v=d.length-m,$=0;v>$;$++)(v-$)%g===0&&0!==$&&(u+=n),u+=d.charAt($);for($=v;$<d.length;$++)(d.length-$)%m===0&&0!==$&&(u+=n),u+=d.charAt($);for(;p.length<i;)p+="0";i&&"0"!==i&&(u+=r+p.substr(0,i))}return 0===e&&(o=!1),l.push(o?t.negPre:t.posPre,u,o?t.negSuf:t.posSuf),l.join("")}function Rn(e,t,n){var r="";for(0>e&&(r="-",e=-e),e=""+e;e.length<t;)e="0"+e;return n&&(e=e.substr(e.length-t)),r+e}function _n(e,t,n,r){return n=n||0,function(i){var o=i["get"+e]();return(n>0||o>-n)&&(o+=n),0===o&&-12==n&&(o=12),Rn(o,t,r)}}function qn(e,t){return function(n,r){var i=n["get"+e](),o=br(t?"SHORT"+e:e);return r[o][i]}}function Fn(e,t,n){var r=-1*n,i=r>=0?"+":"";return i+=Rn(Math[r>0?"floor":"ceil"](r/60),2)+Rn(Math.abs(r%60),2)}function Un(e){var t=new Date(e,0,1).getDay();return new Date(e,0,(4>=t?5:12)-t)}function Bn(e){return new Date(e.getFullYear(),e.getMonth(),e.getDate()+(4-e.getDay()))}function Hn(e){return function(t){var n=Un(t.getFullYear()),r=Bn(t),i=+r-+n,o=1+Math.round(i/6048e5);return Rn(o,e)}}function Ln(e,t){return e.getHours()<12?t.AMPMS[0]:t.AMPMS[1]}function zn(e,t){return e.getFullYear()<=0?t.ERAS[0]:t.ERAS[1]}function Wn(e,t){return e.getFullYear()<=0?t.ERANAMES[0]:t.ERANAMES[1]}function Gn(e){function t(e){var t;if(t=e.match(n)){var r=new Date(0),i=0,o=0,a=t[8]?r.setUTCFullYear:r.setFullYear,s=t[8]?r.setUTCHours:r.setHours;t[9]&&(i=p(t[9]+t[10]),o=p(t[9]+t[11])),a.call(r,p(t[1]),p(t[2])-1,p(t[3]));var u=p(t[4]||0)-i,c=p(t[5]||0)-o,l=p(t[6]||0),f=Math.round(1e3*parseFloat("0."+(t[7]||0)));return s.call(r,u,c,l,f),r}return e}var n=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(n,r,i){var a,s,u="",c=[];if(r=r||"mediumDate",r=e.DATETIME_FORMATS[r]||r,S(n)&&(n=uo.test(n)?p(n):t(n)),E(n)&&(n=new Date(n)),!C(n)||!isFinite(n.getTime()))return n;for(;r;)s=so.exec(r),s?(c=H(c,s,1),r=c.pop()):(c.push(r),r=null);var l=n.getTimezoneOffset();return i&&(l=J(i,n.getTimezoneOffset()),n=Z(n,i,!0)),o(c,function(t){a=ao[t],u+=a?a(n,e.DATETIME_FORMATS,l):t.replace(/(^'|'$)/g,"").replace(/''/g,"'")}),u}}function Yn(){return function(e,t){return y(t)&&(t=2),G(e,t)}}function Jn(){return function(e,t,n){return t=Math.abs(Number(t))===1/0?Number(t):p(t),isNaN(t)?e:(E(e)&&(e=e.toString()),Ir(e)||S(e)?(n=!n||isNaN(n)?0:p(n),n=0>n&&n>=-e.length?e.length+n:n,t>=0?e.slice(n,n+t):0===n?e.slice(t,e.length):e.slice(Math.max(0,n+t),n)):e)}}function Kn(e){function t(t,n){return n=n?-1:1,t.map(function(t){var r=1,i=v;if(k(t))i=t;else if(S(t)&&("+"!=t.charAt(0)&&"-"!=t.charAt(0)||(r="-"==t.charAt(0)?-1:1,t=t.substring(1)),""!==t&&(i=e(t),i.constant))){var o=i();i=function(e){return e[o]}}return{get:i,descending:r*n}})}function n(e){switch(typeof e){case"number":case"boolean":case"string":return!0;default:return!1}}function r(e,t){return"function"==typeof e.valueOf&&(e=e.valueOf(),n(e))?e:g(e)&&(e=e.toString(),n(e))?e:t}function o(e,t){var n=typeof e;return null===e?(n="string",e="null"):"string"===n?e=e.toLowerCase():"object"===n&&(e=r(e,t)),{value:e,type:n}}function a(e,t){var n=0;return e.type===t.type?e.value!==t.value&&(n=e.value<t.value?-1:1):n=e.type<t.type?-1:1,n}return function(e,n,r){function s(e,t){return{value:e,predicateValues:c.map(function(n){return o(n.get(e),t)})}}function u(e,t){for(var n=0,r=0,i=c.length;i>r&&!(n=a(e.predicateValues[r],t.predicateValues[r])*c[r].descending);++r);return n}if(!i(e))return e;Ir(n)||(n=[n]),0===n.length&&(n=["+"]);var c=t(n,r);c.push({get:function(){return{}},descending:r?-1:1});var l=Array.prototype.map.call(e,s);return l.sort(u),e=l.map(function(e){return e.value})}}function Zn(e){return k(e)&&(e={link:e}),e.restrict=e.restrict||"AC",m(e)}function Xn(e,t){e.$name=t}function Qn(e,t,r,i,a){var s=this,u=[];s.$error={},s.$$success={},s.$pending=n,s.$name=a(t.name||t.ngForm||"")(r),s.$dirty=!1,s.$pristine=!0,s.$valid=!0,s.$invalid=!1,s.$submitted=!1,s.$$parentForm=po,s.$rollbackViewValue=function(){o(u,function(e){e.$rollbackViewValue()})},s.$commitViewValue=function(){o(u,function(e){e.$commitViewValue()})},s.$addControl=function(e){pe(e.$name,"input"),u.push(e),e.$name&&(s[e.$name]=e),e.$$parentForm=s},s.$$renameControl=function(e,t){var n=e.$name;s[n]===e&&delete s[n],s[t]=e,e.$name=t},s.$removeControl=function(e){e.$name&&s[e.$name]===e&&delete s[e.$name],o(s.$pending,function(t,n){s.$setValidity(n,null,e)}),o(s.$error,function(t,n){s.$setValidity(n,null,e)}),o(s.$$success,function(t,n){s.$setValidity(n,null,e)}),q(u,e),e.$$parentForm=po},dr({ctrl:this,$element:e,set:function(e,t,n){var r=e[t];if(r){var i=r.indexOf(n);-1===i&&r.push(n)}else e[t]=[n]},unset:function(e,t,n){var r=e[t];r&&(q(r,n),0===r.length&&delete e[t])},$animate:i}),s.$setDirty=function(){i.removeClass(e,Ko),i.addClass(e,Zo),s.$dirty=!0,s.$pristine=!1,s.$$parentForm.$setDirty()},s.$setPristine=function(){i.setClass(e,Ko,Zo+" "+$o),s.$dirty=!1,s.$pristine=!0,s.$submitted=!1,o(u,function(e){e.$setPristine()})},s.$setUntouched=function(){o(u,function(e){e.$setUntouched()})},s.$setSubmitted=function(){i.addClass(e,$o),s.$submitted=!0,s.$$parentForm.$setSubmitted()}}function er(e){e.$formatters.push(function(t){return e.$isEmpty(t)?t:t.toString()})}function tr(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r)}function nr(e,t,n,r,i,o){var a=gr(t[0].type);if(!i.android){var s=!1;t.on("compositionstart",function(e){s=!0}),t.on("compositionend",function(){s=!1,u()})}var u=function(e){if(c&&(o.defer.cancel(c),c=null),!s){var i=t.val(),u=e&&e.type;"password"===a||n.ngTrim&&"false"===n.ngTrim||(i=_r(i)),(r.$viewValue!==i||""===i&&r.$$hasNativeValidators)&&r.$setViewValue(i,u)}};if(i.hasEvent("input"))t.on("input",u);else{var c,l=function(e,t,n){c||(c=o.defer(function(){c=null,t&&t.value===n||u(e)}))};t.on("keydown",function(e){var t=e.keyCode;91===t||t>15&&19>t||t>=37&&40>=t||l(e,this,this.value)}),i.hasEvent("paste")&&t.on("paste cut",l)}t.on("change",u),r.$render=function(){var e=r.$isEmpty(r.$viewValue)?"":r.$viewValue;t.val()!==e&&t.val(e)}}function rr(e,t){if(C(e))return e;if(S(e)){Co.lastIndex=0;var n=Co.exec(e);if(n){var r=+n[1],i=+n[2],o=0,a=0,s=0,u=0,c=Un(r),l=7*(i-1);return t&&(o=t.getHours(),a=t.getMinutes(),s=t.getSeconds(),u=t.getMilliseconds()),new Date(r,0,c.getDate()+l,o,a,s,u)}}return NaN}function ir(e,t){return function(n,r){var i,a;if(C(n))return n;if(S(n)){if('"'==n.charAt(0)&&'"'==n.charAt(n.length-1)&&(n=n.substring(1,n.length-1)),yo.test(n))return new Date(n);if(e.lastIndex=0,i=e.exec(n))return i.shift(),a=r?{yyyy:r.getFullYear(),MM:r.getMonth()+1,dd:r.getDate(),HH:r.getHours(),mm:r.getMinutes(),ss:r.getSeconds(),sss:r.getMilliseconds()/1e3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},o(i,function(e,n){n<t.length&&(a[t[n]]=+e)}),new Date(a.yyyy,a.MM-1,a.dd,a.HH,a.mm,a.ss||0,1e3*a.sss||0)}return NaN}}function or(e,t,r,i){return function(o,a,s,u,c,l,f){function h(e){return e&&!(e.getTime&&e.getTime()!==e.getTime())}function p(e){return b(e)&&!C(e)?r(e)||n:e}ar(o,a,s,u),nr(o,a,s,u,c,l);var d,$=u&&u.$options&&u.$options.timezone;if(u.$$parserName=e,u.$parsers.push(function(e){if(u.$isEmpty(e))return null;if(t.test(e)){var i=r(e,d);return $&&(i=Z(i,$)),i}return n}),u.$formatters.push(function(e){if(e&&!C(e))throw ta("datefmt","Expected `{0}` to be a date",e);return h(e)?(d=e,d&&$&&(d=Z(d,$,!0)),f("date")(e,i,$)):(d=null,"")}),b(s.min)||s.ngMin){var v;u.$validators.min=function(e){return!h(e)||y(v)||r(e)>=v},s.$observe("min",function(e){v=p(e),u.$validate()})}if(b(s.max)||s.ngMax){var m;u.$validators.max=function(e){return!h(e)||y(m)||r(e)<=m},s.$observe("max",function(e){m=p(e),u.$validate()})}}}function ar(e,t,r,i){var o=t[0],a=i.$$hasNativeValidators=w(o.validity);a&&i.$parsers.push(function(e){var r=t.prop(mr)||{};return r.badInput&&!r.typeMismatch?n:e})}function sr(e,t,r,i,o,a){if(ar(e,t,r,i),nr(e,t,r,i,o,a),i.$$parserName="number",i.$parsers.push(function(e){return i.$isEmpty(e)?null:xo.test(e)?parseFloat(e):n}),i.$formatters.push(function(e){if(!i.$isEmpty(e)){if(!E(e))throw ta("numfmt","Expected `{0}` to be a number",e);e=e.toString()}return e}),b(r.min)||r.ngMin){var s;i.$validators.min=function(e){return i.$isEmpty(e)||y(s)||e>=s},r.$observe("min",function(e){b(e)&&!E(e)&&(e=parseFloat(e,10)),s=E(e)&&!isNaN(e)?e:n,i.$validate()})}if(b(r.max)||r.ngMax){var u;i.$validators.max=function(e){return i.$isEmpty(e)||y(u)||u>=e},r.$observe("max",function(e){b(e)&&!E(e)&&(e=parseFloat(e,10)),u=E(e)&&!isNaN(e)?e:n,i.$validate()})}}function ur(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r),r.$$parserName="url",r.$validators.url=function(e,t){var n=e||t;return r.$isEmpty(n)||bo.test(n)}}function cr(e,t,n,r,i,o){nr(e,t,n,r,i,o),er(r),r.$$parserName="email",r.$validators.email=function(e,t){var n=e||t;return r.$isEmpty(n)||wo.test(n)}}function lr(e,t,n,r){y(n.name)&&t.attr("name",u());var i=function(e){t[0].checked&&r.$setViewValue(n.value,e&&e.type)};t.on("click",i),r.$render=function(){var e=n.value;t[0].checked=e==r.$viewValue},n.$observe("value",r.$render)}function fr(e,t,n,r,i){var o;if(b(r)){if(o=e(r),!o.constant)throw ta("constexpr","Expected constant expression for `{0}`, but saw `{1}`.",n,r);return o(t)}return i}function hr(e,t,n,r,i,o,a,s){var u=fr(s,e,"ngTrueValue",n.ngTrueValue,!0),c=fr(s,e,"ngFalseValue",n.ngFalseValue,!1),l=function(e){r.$setViewValue(t[0].checked,e&&e.type)};t.on("click",l),r.$render=function(){t[0].checked=r.$viewValue},r.$isEmpty=function(e){return e===!1},r.$formatters.push(function(e){return B(e,u)}),r.$parsers.push(function(e){return e?u:c})}function pr(e,t){return e="ngClass"+e,["$animate",function(n){function r(e,t){var n=[];e:for(var r=0;r<e.length;r++){for(var i=e[r],o=0;o<t.length;o++)if(i==t[o])continue e;n.push(i)}return n}function i(e){var t=[];return Ir(e)?(o(e,function(e){t=t.concat(i(e))}),t):S(e)?e.split(" "):w(e)?(o(e,function(e,n){e&&(t=t.concat(n.split(" ")))}),t):e}return{restrict:"AC",link:function(a,s,u){function c(e){var t=f(e,1);u.$addClass(t)}function l(e){var t=f(e,-1);u.$removeClass(t)}function f(e,t){var n=s.data("$classCounts")||ve(),r=[];return o(e,function(e){(t>0||n[e])&&(n[e]=(n[e]||0)+t,n[e]===+(t>0)&&r.push(e))}),s.data("$classCounts",n),r.join(" ")}function h(e,t){var i=r(t,e),o=r(e,t);i=f(i,1),o=f(o,-1),i&&i.length&&n.addClass(s,i),o&&o.length&&n.removeClass(s,o)}function p(e){if(t===!0||a.$index%2===t){var n=i(e||[]);if(d){if(!B(e,d)){var r=i(d);h(r,n)}}else c(n)}d=U(e)}var d;a.$watch(u[e],p,!0),u.$observe("class",function(t){p(a.$eval(u[e]))}),"ngClass"!==e&&a.$watch("$index",function(n,r){var o=1&n;if(o!==(1&r)){var s=i(a.$eval(u[e]));o===t?c(s):l(s)}})}}}]}function dr(e){function t(e,t,u){y(t)?r("$pending",e,u):i("$pending",e,u),j(t)?t?(f(s.$error,e,u),l(s.$$success,e,u)):(l(s.$error,e,u),f(s.$$success,e,u)):(f(s.$error,e,u),f(s.$$success,e,u)),s.$pending?(o(ea,!0),s.$valid=s.$invalid=n,a("",null)):(o(ea,!1),s.$valid=$r(s.$error),s.$invalid=!s.$valid,a("",s.$valid));var c;c=s.$pending&&s.$pending[e]?n:s.$error[e]?!1:s.$$success[e]?!0:null,a(e,c),s.$$parentForm.$setValidity(e,c,s)}function r(e,t,n){s[e]||(s[e]={}),l(s[e],t,n)}function i(e,t,r){s[e]&&f(s[e],t,r),$r(s[e])&&(s[e]=n)}function o(e,t){t&&!c[e]?(h.addClass(u,e),c[e]=!0):!t&&c[e]&&(h.removeClass(u,e),c[e]=!1)}function a(e,t){e=e?"-"+ce(e,"-"):"",o(Yo+e,t===!0),o(Jo+e,t===!1)}var s=e.ctrl,u=e.$element,c={},l=e.set,f=e.unset,h=e.$animate;c[Jo]=!(c[Yo]=u.hasClass(Yo)),s.$setValidity=t}function $r(e){if(e)for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}var vr=/^\/(.+)\/([a-z]*)$/,mr="validity",gr=function(e){return S(e)?e.toLowerCase():e},yr=Object.prototype.hasOwnProperty,br=function(e){return S(e)?e.toUpperCase():e},wr=function(e){return S(e)?e.replace(/[A-Z]/g,function(e){return String.fromCharCode(32|e.charCodeAt(0))}):e},xr=function(e){return S(e)?e.replace(/[a-z]/g,function(e){return String.fromCharCode(-33&e.charCodeAt(0))}):e};"i"!=="I".toLowerCase()&&(gr=wr,br=xr);var Sr,Er,Cr,kr,Ar=[].slice,Or=[].splice,Mr=[].push,Tr=Object.prototype.toString,Nr=Object.getPrototypeOf,Vr=r("ng"),jr=e.angular||(e.angular={}),Pr=0;Sr=t.documentMode,$.$inject=[],v.$inject=[];var Dr,Ir=Array.isArray,Rr=/^\[object (Uint8(Clamped)?)|(Uint16)|(Uint32)|(Int8)|(Int16)|(Int32)|(Float(32)|(64))Array\]$/,_r=function(e){return S(e)?e.trim():e},qr=function(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Fr=function(){function e(){try{return new Function(""),!1}catch(e){return!0}}if(!b(Fr.rules)){var n=t.querySelector("[ng-csp]")||t.querySelector("[data-ng-csp]");if(n){var r=n.getAttribute("ng-csp")||n.getAttribute("data-ng-csp");Fr.rules={noUnsafeEval:!r||-1!==r.indexOf("no-unsafe-eval"),noInlineStyle:!r||-1!==r.indexOf("no-inline-style")}}else Fr.rules={noUnsafeEval:e(),noInlineStyle:!1}}return Fr.rules},Ur=function(){if(b(Ur.name_))return Ur.name_;var e,n,r,i,o=Br.length;for(n=0;o>n;++n)if(r=Br[n],e=t.querySelector("["+r.replace(":","\\:")+"jq]")){i=e.getAttribute(r+"jq");break}return Ur.name_=i},Br=["ng-","data-ng-","ng:","x-ng-"],Hr=/[A-Z]/g,Lr=!1,zr=1,Wr=2,Gr=3,Yr=8,Jr=9,Kr=11,Zr={full:"1.4.6",major:1,minor:4,dot:6,codeName:"multiplicative-elevation"};Oe.expando="ng339";var Xr=Oe.cache={},Qr=1,ei=function(e,t,n){e.addEventListener(t,n,!1)},ti=function(e,t,n){e.removeEventListener(t,n,!1)};Oe._data=function(e){return this.cache[e[this.expando]]||{}};var ni=/([\:\-\_]+(.))/g,ri=/^moz([A-Z])/,ii={mouseleave:"mouseout",mouseenter:"mouseover"},oi=r("jqLite"),ai=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,si=/<|&#?\w+;/,ui=/<([\w:]+)/,ci=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,li={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};li.optgroup=li.option,li.tbody=li.tfoot=li.colgroup=li.caption=li.thead,li.th=li.td;var fi=Oe.prototype={ready:function(n){function r(){i||(i=!0,n())}var i=!1;"complete"===t.readyState?setTimeout(r):(this.on("DOMContentLoaded",r),Oe(e).on("load",r))},toString:function(){var e=[];return o(this,function(t){e.push(""+t)}),"["+e.join(", ")+"]"},eq:function(e){return Er(e>=0?this[e]:this[this.length+e])},length:0,push:Mr,sort:[].sort,splice:[].splice},hi={};o("multiple,selected,checked,disabled,readOnly,required,open".split(","),function(e){hi[gr(e)]=e});var pi={};o("input,select,option,textarea,button,form,details".split(","),function(e){pi[e]=!0});var di={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};o({data:Pe,removeData:Ve,hasData:Ce},function(e,t){Oe[t]=e}),o({data:Pe,inheritedData:Fe,scope:function(e){return Er.data(e,"$scope")||Fe(e.parentNode||e,["$isolateScope","$scope"])},isolateScope:function(e){return Er.data(e,"$isolateScope")||Er.data(e,"$isolateScopeNoTemplate")},controller:qe,injector:function(e){return Fe(e,"$injector")},removeAttr:function(e,t){e.removeAttribute(t)},hasClass:De,css:function(e,t,n){return t=xe(t),b(n)?void(e.style[t]=n):e.style[t]},attr:function(e,t,r){var i=e.nodeType;if(i!==Gr&&i!==Wr&&i!==Yr){var o=gr(t);if(hi[o]){if(!b(r))return e[t]||(e.attributes.getNamedItem(t)||$).specified?o:n;r?(e[t]=!0,e.setAttribute(t,o)):(e[t]=!1,e.removeAttribute(o))}else if(b(r))e.setAttribute(t,r);else if(e.getAttribute){var a=e.getAttribute(t,2);return null===a?n:a}}},prop:function(e,t,n){return b(n)?void(e[t]=n):e[t]},text:function(){function e(e,t){if(y(t)){var n=e.nodeType;return n===zr||n===Gr?e.textContent:""}e.textContent=t}return e.$dv="",e}(),val:function(e,t){if(y(t)){if(e.multiple&&"select"===_(e)){var n=[];return o(e.options,function(e){e.selected&&n.push(e.value||e.text)}),0===n.length?null:n}return e.value}e.value=t},html:function(e,t){return y(t)?e.innerHTML:(Te(e,!0),void(e.innerHTML=t))},empty:Ue},function(e,t){Oe.prototype[t]=function(t,n){
 var r,i,o=this.length;if(e!==Ue&&y(2==e.length&&e!==De&&e!==qe?t:n)){if(w(t)){for(r=0;o>r;r++)if(e===Pe)e(this[r],t);else for(i in t)e(this[r],i,t[i]);return this}for(var a=e.$dv,s=y(a)?Math.min(o,1):o,u=0;s>u;u++){var c=e(this[u],t,n);a=a?a+c:c}return a}for(r=0;o>r;r++)e(this[r],t,n);return this}}),o({removeData:Ve,on:function Na(e,t,n,r){if(b(r))throw oi("onargs","jqLite#on() does not support the `selector` or `eventData` parameters");if(Ee(e)){var i=je(e,!0),o=i.events,a=i.handle;a||(a=i.handle=We(e,o));for(var s=t.indexOf(" ")>=0?t.split(" "):[t],u=s.length;u--;){t=s[u];var c=o[t];c||(o[t]=[],"mouseenter"===t||"mouseleave"===t?Na(e,ii[t],function(e){var n=this,r=e.relatedTarget;r&&(r===n||n.contains(r))||a(e,t)}):"$destroy"!==t&&ei(e,t,a),c=o[t]),c.push(n)}}},off:Ne,one:function(e,t,n){e=Er(e),e.on(t,function r(){e.off(t,n),e.off(t,r)}),e.on(t,n)},replaceWith:function(e,t){var n,r=e.parentNode;Te(e),o(new Oe(t),function(t){n?r.insertBefore(t,n.nextSibling):r.replaceChild(t,e),n=t})},children:function(e){var t=[];return o(e.childNodes,function(e){e.nodeType===zr&&t.push(e)}),t},contents:function(e){return e.contentDocument||e.childNodes||[]},append:function(e,t){var n=e.nodeType;if(n===zr||n===Kr){t=new Oe(t);for(var r=0,i=t.length;i>r;r++){var o=t[r];e.appendChild(o)}}},prepend:function(e,t){if(e.nodeType===zr){var n=e.firstChild;o(new Oe(t),function(t){e.insertBefore(t,n)})}},wrap:function(e,t){t=Er(t).eq(0).clone()[0];var n=e.parentNode;n&&n.replaceChild(t,e),t.appendChild(e)},remove:Be,detach:function(e){Be(e,!0)},after:function(e,t){var n=e,r=e.parentNode;t=new Oe(t);for(var i=0,o=t.length;o>i;i++){var a=t[i];r.insertBefore(a,n.nextSibling),n=a}},addClass:Re,removeClass:Ie,toggleClass:function(e,t,n){t&&o(t.split(" "),function(t){var r=n;y(r)&&(r=!De(e,t)),(r?Re:Ie)(e,t)})},parent:function(e){var t=e.parentNode;return t&&t.nodeType!==Kr?t:null},next:function(e){return e.nextElementSibling},find:function(e,t){return e.getElementsByTagName?e.getElementsByTagName(t):[]},clone:Me,triggerHandler:function(e,t,n){var r,i,a,s=t.type||t,u=je(e),c=u&&u.events,l=c&&c[s];l&&(r={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return this.defaultPrevented===!0},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return this.immediatePropagationStopped===!0},stopPropagation:$,type:s,target:e},t.type&&(r=f(r,t)),i=U(l),a=n?[r].concat(n):[r],o(i,function(t){r.isImmediatePropagationStopped()||t.apply(e,a)}))}},function(e,t){Oe.prototype[t]=function(t,n,r){for(var i,o=0,a=this.length;a>o;o++)y(i)?(i=e(this[o],t,n,r),b(i)&&(i=Er(i))):_e(i,e(this[o],t,n,r));return b(i)?i:this},Oe.prototype.bind=Oe.prototype.on,Oe.prototype.unbind=Oe.prototype.off}),Je.prototype={put:function(e,t){this[Ye(e,this.nextUid)]=t},get:function(e){return this[Ye(e,this.nextUid)]},remove:function(e){var t=this[e=Ye(e,this.nextUid)];return delete this[e],t}};var $i=[function(){this.$get=[function(){return Je}]}],vi=/^[^\(]*\(\s*([^\)]*)\)/m,mi=/,/,gi=/^\s*(_?)(\S+?)\1\s*$/,yi=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,bi=r("$injector");Xe.$$annotate=Ze;var wi=r("$animate"),xi=1,Si="ng-animate",Ei=function(){this.$get=["$q","$$rAF",function(e,t){function n(){}return n.all=$,n.chain=$,n.prototype={end:$,cancel:$,resume:$,pause:$,complete:$,then:function(n,r){return e(function(e){t(function(){e()})}).then(n,r)}},n}]},Ci=function(){var e=new Je,t=[];this.$get=["$$AnimateRunner","$rootScope",function(n,r){function i(e,t,n){var r=!1;return t&&(t=S(t)?t.split(" "):Ir(t)?t:[],o(t,function(t){t&&(r=!0,e[t]=n)})),r}function a(){o(t,function(t){var n=e.get(t);if(n){var r=nt(t.attr("class")),i="",a="";o(n,function(e,t){var n=!!r[t];e!==n&&(e?i+=(i.length?" ":"")+t:a+=(a.length?" ":"")+t)}),o(t,function(e){i&&Re(e,i),a&&Ie(e,a)}),e.remove(t)}}),t.length=0}function s(n,o,s){var u=e.get(n)||{},c=i(u,o,!0),l=i(u,s,!1);(c||l)&&(e.put(n,u),t.push(n),1===t.length&&r.$$postDigest(a))}return{enabled:$,on:$,off:$,pin:$,push:function(e,t,r,i){return i&&i(),r=r||{},r.from&&e.css(r.from),r.to&&e.css(r.to),(r.addClass||r.removeClass)&&s(e,r.addClass,r.removeClass),new n}}}]},ki=["$provide",function(e){var t=this;this.$$registeredAnimations=Object.create(null),this.register=function(n,r){if(n&&"."!==n.charAt(0))throw wi("notcsel","Expecting class selector starting with '.' got '{0}'.",n);var i=n+"-animation";t.$$registeredAnimations[n.substr(1)]=i,e.factory(i,r)},this.classNameFilter=function(e){if(1===arguments.length&&(this.$$classNameFilter=e instanceof RegExp?e:null,this.$$classNameFilter)){var t=new RegExp("(\\s+|\\/)"+Si+"(\\s+|\\/)");if(t.test(this.$$classNameFilter.toString()))throw wi("nongcls",'$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.',Si)}return this.$$classNameFilter},this.$get=["$$animateQueue",function(e){function t(e,t,n){if(n){var r=tt(n);!r||r.parentNode||r.previousElementSibling||(n=null)}n?n.after(e):t.prepend(e)}return{on:e.on,off:e.off,pin:e.pin,enabled:e.enabled,cancel:function(e){e.end&&e.end()},enter:function(n,r,i,o){return r=r&&Er(r),i=i&&Er(i),r=r||i.parent(),t(n,r,i),e.push(n,"enter",rt(o))},move:function(n,r,i,o){return r=r&&Er(r),i=i&&Er(i),r=r||i.parent(),t(n,r,i),e.push(n,"move",rt(o))},leave:function(t,n){return e.push(t,"leave",rt(n),function(){t.remove()})},addClass:function(t,n,r){return r=rt(r),r.addClass=et(r.addclass,n),e.push(t,"addClass",r)},removeClass:function(t,n,r){return r=rt(r),r.removeClass=et(r.removeClass,n),e.push(t,"removeClass",r)},setClass:function(t,n,r,i){return i=rt(i),i.addClass=et(i.addClass,n),i.removeClass=et(i.removeClass,r),e.push(t,"setClass",i)},animate:function(t,n,r,i,o){return o=rt(o),o.from=o.from?f(o.from,n):n,o.to=o.to?f(o.to,r):r,i=i||"ng-inline-animate",o.tempClasses=et(o.tempClasses,i),e.push(t,"animate",o)}}}]}],Ai=function(){this.$get=["$$rAF","$q",function(e,t){var n=function(){};return n.prototype={done:function(e){this.defer&&this.defer[e===!0?"reject":"resolve"]()},end:function(){this.done()},cancel:function(){this.done(!0)},getPromise:function(){return this.defer||(this.defer=t.defer()),this.defer.promise},then:function(e,t){return this.getPromise().then(e,t)},"catch":function(e){return this.getPromise()["catch"](e)},"finally":function(e){return this.getPromise()["finally"](e)}},function(t,r){function i(){return e(function(){o(),a||s.done(),a=!0}),s}function o(){r.addClass&&(t.addClass(r.addClass),r.addClass=null),r.removeClass&&(t.removeClass(r.removeClass),r.removeClass=null),r.to&&(t.css(r.to),r.to=null)}r.from&&(t.css(r.from),r.from=null);var a,s=new n;return{start:i,end:i}}}]},Oi=r("$compile");ut.$inject=["$provide","$$sanitizeUriProvider"];var Mi=/^((?:x|data)[\:\-_])/i,Ti=r("$controller"),Ni=/^(\S+)(\s+as\s+(\w+))?$/,Vi=function(){this.$get=["$document",function(e){return function(t){return t?!t.nodeType&&t instanceof Er&&(t=t[0]):t=e[0].body,t.offsetWidth+1}}]},ji="application/json",Pi={"Content-Type":ji+";charset=utf-8"},Di=/^\[|^\{(?!\{)/,Ii={"[":/]$/,"{":/}$/},Ri=/^\)\]\}',?\n/,_i=r("$http"),qi=function(e){return function(){throw _i("legacy","The method `{0}` on the promise returned from `$http` has been disabled.",e)}},Fi=jr.$interpolateMinErr=r("$interpolate");Fi.throwNoconcat=function(e){throw Fi("noconcat","Error while interpolating: {0}\nStrict Contextual Escaping disallows interpolations that concatenate multiple expressions when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce",e)},Fi.interr=function(e,t){return Fi("interr","Can't interpolate: {0}\n{1}",e,t.toString())};var Ui=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,Bi={http:80,https:443,ftp:21},Hi=r("$location"),Li={$$html5:!1,$$replace:!1,absUrl:Bt("$$absUrl"),url:function(e){if(y(e))return this.$$url;var t=Ui.exec(e);return(t[1]||""===e)&&this.path(decodeURIComponent(t[1])),(t[2]||t[1]||""===e)&&this.search(t[3]||""),this.hash(t[5]||""),this},protocol:Bt("$$protocol"),host:Bt("$$host"),port:Bt("$$port"),path:Ht("$$path",function(e){return e=null!==e?e.toString():"","/"==e.charAt(0)?e:"/"+e}),search:function(e,t){switch(arguments.length){case 0:return this.$$search;case 1:if(S(e)||E(e))e=e.toString(),this.$$search=ee(e);else{if(!w(e))throw Hi("isrcharg","The first argument of the `$location#search()` call must be a string or an object.");e=F(e,{}),o(e,function(t,n){null==t&&delete e[n]}),this.$$search=e}break;default:y(t)||null===t?delete this.$$search[e]:this.$$search[e]=t}return this.$$compose(),this},hash:Ht("$$hash",function(e){return null!==e?e.toString():""}),replace:function(){return this.$$replace=!0,this}};o([Ut,Ft,qt],function(e){e.prototype=Object.create(Li),e.prototype.state=function(t){if(!arguments.length)return this.$$state;if(e!==qt||!this.$$html5)throw Hi("nostate","History API state support is available only in HTML5 mode and only in browsers supporting HTML5 History API");return this.$$state=y(t)?null:t,this}});var zi=r("$parse"),Wi=Function.prototype.call,Gi=Function.prototype.apply,Yi=Function.prototype.bind,Ji=ve();o("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(e){Ji[e]=!0});var Ki={n:"\n",f:"\f",r:"\r",t:"	",v:"\x0B","'":"'",'"':'"'},Zi=function(e){this.options=e};Zi.prototype={constructor:Zi,lex:function(e){for(this.text=e,this.index=0,this.tokens=[];this.index<this.text.length;){var t=this.text.charAt(this.index);if('"'===t||"'"===t)this.readString(t);else if(this.isNumber(t)||"."===t&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(t))this.readIdent();else if(this.is(t,"(){}[].,;:?"))this.tokens.push({index:this.index,text:t}),this.index++;else if(this.isWhitespace(t))this.index++;else{var n=t+this.peek(),r=n+this.peek(2),i=Ji[t],o=Ji[n],a=Ji[r];if(i||o||a){var s=a?r:o?n:t;this.tokens.push({index:this.index,text:s,operator:!0}),this.index+=s.length}else this.throwError("Unexpected next character ",this.index,this.index+1)}}return this.tokens},is:function(e,t){return-1!==t.indexOf(e)},peek:function(e){var t=e||1;return this.index+t<this.text.length?this.text.charAt(this.index+t):!1},isNumber:function(e){return e>="0"&&"9">=e&&"string"==typeof e},isWhitespace:function(e){return" "===e||"\r"===e||"	"===e||"\n"===e||"\x0B"===e||" "===e},isIdent:function(e){return e>="a"&&"z">=e||e>="A"&&"Z">=e||"_"===e||"$"===e},isExpOperator:function(e){return"-"===e||"+"===e||this.isNumber(e)},throwError:function(e,t,n){n=n||this.index;var r=b(t)?"s "+t+"-"+this.index+" ["+this.text.substring(t,n)+"]":" "+n;throw zi("lexerr","Lexer Error: {0} at column{1} in expression [{2}].",e,r,this.text)},readNumber:function(){for(var e="",t=this.index;this.index<this.text.length;){var n=gr(this.text.charAt(this.index));if("."==n||this.isNumber(n))e+=n;else{var r=this.peek();if("e"==n&&this.isExpOperator(r))e+=n;else if(this.isExpOperator(n)&&r&&this.isNumber(r)&&"e"==e.charAt(e.length-1))e+=n;else{if(!this.isExpOperator(n)||r&&this.isNumber(r)||"e"!=e.charAt(e.length-1))break;this.throwError("Invalid exponent")}}this.index++}this.tokens.push({index:t,text:e,constant:!0,value:Number(e)})},readIdent:function(){for(var e=this.index;this.index<this.text.length;){var t=this.text.charAt(this.index);if(!this.isIdent(t)&&!this.isNumber(t))break;this.index++}this.tokens.push({index:e,text:this.text.slice(e,this.index),identifier:!0})},readString:function(e){var t=this.index;this.index++;for(var n="",r=e,i=!1;this.index<this.text.length;){var o=this.text.charAt(this.index);if(r+=o,i){if("u"===o){var a=this.text.substring(this.index+1,this.index+5);a.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+a+"]"),this.index+=4,n+=String.fromCharCode(parseInt(a,16))}else{var s=Ki[o];n+=s||o}i=!1}else if("\\"===o)i=!0;else{if(o===e)return this.index++,void this.tokens.push({index:t,text:r,constant:!0,value:n});n+=o}this.index++}this.throwError("Unterminated quote",t)}};var Xi=function(e,t){this.lexer=e,this.options=t};Xi.Program="Program",Xi.ExpressionStatement="ExpressionStatement",Xi.AssignmentExpression="AssignmentExpression",Xi.ConditionalExpression="ConditionalExpression",Xi.LogicalExpression="LogicalExpression",Xi.BinaryExpression="BinaryExpression",Xi.UnaryExpression="UnaryExpression",Xi.CallExpression="CallExpression",Xi.MemberExpression="MemberExpression",Xi.Identifier="Identifier",Xi.Literal="Literal",Xi.ArrayExpression="ArrayExpression",Xi.Property="Property",Xi.ObjectExpression="ObjectExpression",Xi.ThisExpression="ThisExpression",Xi.NGValueParameter="NGValueParameter",Xi.prototype={ast:function(e){this.text=e,this.tokens=this.lexer.lex(e);var t=this.program();return 0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]),t},program:function(){for(var e=[];;)if(this.tokens.length>0&&!this.peek("}",")",";","]")&&e.push(this.expressionStatement()),!this.expect(";"))return{type:Xi.Program,body:e}},expressionStatement:function(){return{type:Xi.ExpressionStatement,expression:this.filterChain()}},filterChain:function(){for(var e,t=this.expression();e=this.expect("|");)t=this.filter(t);return t},expression:function(){return this.assignment()},assignment:function(){var e=this.ternary();return this.expect("=")&&(e={type:Xi.AssignmentExpression,left:e,right:this.assignment(),operator:"="}),e},ternary:function(){var e,t,n=this.logicalOR();return this.expect("?")&&(e=this.expression(),this.consume(":"))?(t=this.expression(),{type:Xi.ConditionalExpression,test:n,alternate:e,consequent:t}):n},logicalOR:function(){for(var e=this.logicalAND();this.expect("||");)e={type:Xi.LogicalExpression,operator:"||",left:e,right:this.logicalAND()};return e},logicalAND:function(){for(var e=this.equality();this.expect("&&");)e={type:Xi.LogicalExpression,operator:"&&",left:e,right:this.equality()};return e},equality:function(){for(var e,t=this.relational();e=this.expect("==","!=","===","!==");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.relational()};return t},relational:function(){for(var e,t=this.additive();e=this.expect("<",">","<=",">=");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.additive()};return t},additive:function(){for(var e,t=this.multiplicative();e=this.expect("+","-");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.multiplicative()};return t},multiplicative:function(){for(var e,t=this.unary();e=this.expect("*","/","%");)t={type:Xi.BinaryExpression,operator:e.text,left:t,right:this.unary()};return t},unary:function(){var e;return(e=this.expect("+","-","!"))?{type:Xi.UnaryExpression,operator:e.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var e;this.expect("(")?(e=this.filterChain(),this.consume(")")):this.expect("[")?e=this.arrayDeclaration():this.expect("{")?e=this.object():this.constants.hasOwnProperty(this.peek().text)?e=F(this.constants[this.consume().text]):this.peek().identifier?e=this.identifier():this.peek().constant?e=this.constant():this.throwError("not a primary expression",this.peek());for(var t;t=this.expect("(","[",".");)"("===t.text?(e={type:Xi.CallExpression,callee:e,arguments:this.parseArguments()},this.consume(")")):"["===t.text?(e={type:Xi.MemberExpression,object:e,property:this.expression(),computed:!0},this.consume("]")):"."===t.text?e={type:Xi.MemberExpression,object:e,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");return e},filter:function(e){for(var t=[e],n={type:Xi.CallExpression,callee:this.identifier(),arguments:t,filter:!0};this.expect(":");)t.push(this.expression());return n},parseArguments:function(){var e=[];if(")"!==this.peekToken().text)do e.push(this.expression());while(this.expect(","));return e},identifier:function(){var e=this.consume();return e.identifier||this.throwError("is not a valid identifier",e),{type:Xi.Identifier,name:e.text}},constant:function(){return{type:Xi.Literal,value:this.consume().value}},arrayDeclaration:function(){var e=[];if("]"!==this.peekToken().text)do{if(this.peek("]"))break;e.push(this.expression())}while(this.expect(","));return this.consume("]"),{type:Xi.ArrayExpression,elements:e}},object:function(){var e,t=[];if("}"!==this.peekToken().text)do{if(this.peek("}"))break;e={type:Xi.Property,kind:"init"},this.peek().constant?e.key=this.constant():this.peek().identifier?e.key=this.identifier():this.throwError("invalid key",this.peek()),this.consume(":"),e.value=this.expression(),t.push(e)}while(this.expect(","));return this.consume("}"),{type:Xi.ObjectExpression,properties:t}},throwError:function(e,t){throw zi("syntax","Syntax Error: Token '{0}' {1} at column {2} of the expression [{3}] starting at [{4}].",t.text,e,t.index+1,this.text,this.text.substring(t.index))},consume:function(e){if(0===this.tokens.length)throw zi("ueoe","Unexpected end of expression: {0}",this.text);var t=this.expect(e);return t||this.throwError("is unexpected, expecting ["+e+"]",this.peek()),t},peekToken:function(){if(0===this.tokens.length)throw zi("ueoe","Unexpected end of expression: {0}",this.text);return this.tokens[0]},peek:function(e,t,n,r){return this.peekAhead(0,e,t,n,r)},peekAhead:function(e,t,n,r,i){if(this.tokens.length>e){var o=this.tokens[e],a=o.text;if(a===t||a===n||a===r||a===i||!t&&!n&&!r&&!i)return o}return!1},expect:function(e,t,n,r){var i=this.peek(e,t,n,r);return i?(this.tokens.shift(),i):!1},constants:{"true":{type:Xi.Literal,value:!0},"false":{type:Xi.Literal,value:!1},"null":{type:Xi.Literal,value:null},undefined:{type:Xi.Literal,value:n},"this":{type:Xi.ThisExpression}}},on.prototype={compile:function(e,t){var r=this,i=this.astBuilder.ast(e);this.state={nextId:0,filters:{},expensiveChecks:t,fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]},Xt(i,r.$filter);var a,s="";if(this.stage="assign",a=tn(i)){this.state.computing="assign";var u=this.nextId();this.recurse(a,u),this.return_(u),s="fn.assign="+this.generateFunction("assign","s,v,l")}var c=Qt(i.body);r.stage="inputs",o(c,function(e,t){var n="fn"+t;r.state[n]={vars:[],body:[],own:{}},r.state.computing=n;var i=r.nextId();r.recurse(e,i),r.return_(i),r.state.inputs.push(n),e.watchId=t}),this.state.computing="fn",this.stage="main",this.recurse(i);var l='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+s+this.watchFns()+"return fn;",f=new Function("$filter","ensureSafeMemberName","ensureSafeObject","ensureSafeFunction","ifDefined","plus","text",l)(this.$filter,Wt,Gt,Yt,Jt,Kt,e);return this.state=this.stage=n,f.literal=nn(i),f.constant=rn(i),f},USE:"use",STRICT:"strict",watchFns:function(){var e=[],t=this.state.inputs,n=this;return o(t,function(t){e.push("var "+t+"="+n.generateFunction(t,"s"))}),t.length&&e.push("fn.inputs=["+t.join(",")+"];"),e.join("")},generateFunction:function(e,t){return"function("+t+"){"+this.varsPrefix(e)+this.body(e)+"};"},filterPrefix:function(){var e=[],t=this;return o(this.state.filters,function(n,r){e.push(n+"=$filter("+t.escape(r)+")")}),e.length?"var "+e.join(",")+";":""},varsPrefix:function(e){return this.state[e].vars.length?"var "+this.state[e].vars.join(",")+";":""},body:function(e){return this.state[e].body.join("")},recurse:function(e,t,r,i,a,s){var u,c,l,f,h=this;if(i=i||$,!s&&b(e.watchId))return t=t||this.nextId(),void this.if_("i",this.lazyAssign(t,this.computedMember("i",e.watchId)),this.lazyRecurse(e,t,r,i,a,!0));switch(e.type){case Xi.Program:o(e.body,function(t,r){h.recurse(t.expression,n,n,function(e){c=e}),r!==e.body.length-1?h.current().body.push(c,";"):h.return_(c)});break;case Xi.Literal:f=this.escape(e.value),this.assign(t,f),i(f);break;case Xi.UnaryExpression:this.recurse(e.argument,n,n,function(e){c=e}),f=e.operator+"("+this.ifDefined(c,0)+")",this.assign(t,f),i(f);break;case Xi.BinaryExpression:this.recurse(e.left,n,n,function(e){u=e}),this.recurse(e.right,n,n,function(e){c=e}),f="+"===e.operator?this.plus(u,c):"-"===e.operator?this.ifDefined(u,0)+e.operator+this.ifDefined(c,0):"("+u+")"+e.operator+"("+c+")",this.assign(t,f),i(f);break;case Xi.LogicalExpression:t=t||this.nextId(),h.recurse(e.left,t),h.if_("&&"===e.operator?t:h.not(t),h.lazyRecurse(e.right,t)),i(t);break;case Xi.ConditionalExpression:t=t||this.nextId(),h.recurse(e.test,t),h.if_(t,h.lazyRecurse(e.alternate,t),h.lazyRecurse(e.consequent,t)),i(t);break;case Xi.Identifier:t=t||this.nextId(),r&&(r.context="inputs"===h.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",e.name)+"?l:s"),r.computed=!1,r.name=e.name),Wt(e.name),h.if_("inputs"===h.stage||h.not(h.getHasOwnProperty("l",e.name)),function(){h.if_("inputs"===h.stage||"s",function(){a&&1!==a&&h.if_(h.not(h.nonComputedMember("s",e.name)),h.lazyAssign(h.nonComputedMember("s",e.name),"{}")),h.assign(t,h.nonComputedMember("s",e.name))})},t&&h.lazyAssign(t,h.nonComputedMember("l",e.name))),(h.state.expensiveChecks||sn(e.name))&&h.addEnsureSafeObject(t),i(t);break;case Xi.MemberExpression:u=r&&(r.context=this.nextId())||this.nextId(),t=t||this.nextId(),h.recurse(e.object,u,n,function(){h.if_(h.notNull(u),function(){e.computed?(c=h.nextId(),h.recurse(e.property,c),h.addEnsureSafeMemberName(c),a&&1!==a&&h.if_(h.not(h.computedMember(u,c)),h.lazyAssign(h.computedMember(u,c),"{}")),f=h.ensureSafeObject(h.computedMember(u,c)),h.assign(t,f),r&&(r.computed=!0,r.name=c)):(Wt(e.property.name),a&&1!==a&&h.if_(h.not(h.nonComputedMember(u,e.property.name)),h.lazyAssign(h.nonComputedMember(u,e.property.name),"{}")),f=h.nonComputedMember(u,e.property.name),(h.state.expensiveChecks||sn(e.property.name))&&(f=h.ensureSafeObject(f)),h.assign(t,f),r&&(r.computed=!1,r.name=e.property.name))},function(){h.assign(t,"undefined")}),i(t)},!!a);break;case Xi.CallExpression:t=t||this.nextId(),e.filter?(c=h.filter(e.callee.name),l=[],o(e.arguments,function(e){var t=h.nextId();h.recurse(e,t),l.push(t)}),f=c+"("+l.join(",")+")",h.assign(t,f),i(t)):(c=h.nextId(),u={},l=[],h.recurse(e.callee,c,u,function(){h.if_(h.notNull(c),function(){h.addEnsureSafeFunction(c),o(e.arguments,function(e){h.recurse(e,h.nextId(),n,function(e){l.push(h.ensureSafeObject(e))})}),u.name?(h.state.expensiveChecks||h.addEnsureSafeObject(u.context),f=h.member(u.context,u.name,u.computed)+"("+l.join(",")+")"):f=c+"("+l.join(",")+")",f=h.ensureSafeObject(f),h.assign(t,f)},function(){h.assign(t,"undefined")}),i(t)}));break;case Xi.AssignmentExpression:if(c=this.nextId(),u={},!en(e.left))throw zi("lval","Trying to assing a value to a non l-value");this.recurse(e.left,n,u,function(){h.if_(h.notNull(u.context),function(){h.recurse(e.right,c),h.addEnsureSafeObject(h.member(u.context,u.name,u.computed)),f=h.member(u.context,u.name,u.computed)+e.operator+c,h.assign(t,f),i(t||f)})},1);break;case Xi.ArrayExpression:l=[],o(e.elements,function(e){h.recurse(e,h.nextId(),n,function(e){l.push(e)})}),f="["+l.join(",")+"]",this.assign(t,f),i(f);break;case Xi.ObjectExpression:l=[],o(e.properties,function(e){h.recurse(e.value,h.nextId(),n,function(t){l.push(h.escape(e.key.type===Xi.Identifier?e.key.name:""+e.key.value)+":"+t)})}),f="{"+l.join(",")+"}",this.assign(t,f),i(f);break;case Xi.ThisExpression:this.assign(t,"s"),i("s");break;case Xi.NGValueParameter:this.assign(t,"v"),i("v")}},getHasOwnProperty:function(e,t){var n=e+"."+t,r=this.current().own;return r.hasOwnProperty(n)||(r[n]=this.nextId(!1,e+"&&("+this.escape(t)+" in "+e+")")),r[n]},assign:function(e,t){return e?(this.current().body.push(e,"=",t,";"),e):void 0},filter:function(e){return this.state.filters.hasOwnProperty(e)||(this.state.filters[e]=this.nextId(!0)),this.state.filters[e]},ifDefined:function(e,t){return"ifDefined("+e+","+this.escape(t)+")"},plus:function(e,t){return"plus("+e+","+t+")"},return_:function(e){this.current().body.push("return ",e,";")},if_:function(e,t,n){if(e===!0)t();else{var r=this.current().body;r.push("if(",e,"){"),t(),r.push("}"),n&&(r.push("else{"),n(),r.push("}"))}},not:function(e){return"!("+e+")"},notNull:function(e){return e+"!=null"},nonComputedMember:function(e,t){return e+"."+t},computedMember:function(e,t){return e+"["+t+"]"},member:function(e,t,n){return n?this.computedMember(e,t):this.nonComputedMember(e,t)},addEnsureSafeObject:function(e){this.current().body.push(this.ensureSafeObject(e),";")},addEnsureSafeMemberName:function(e){this.current().body.push(this.ensureSafeMemberName(e),";")},addEnsureSafeFunction:function(e){this.current().body.push(this.ensureSafeFunction(e),";")},ensureSafeObject:function(e){return"ensureSafeObject("+e+",text)"},ensureSafeMemberName:function(e){return"ensureSafeMemberName("+e+",text)"},ensureSafeFunction:function(e){return"ensureSafeFunction("+e+",text)"},lazyRecurse:function(e,t,n,r,i,o){var a=this;return function(){a.recurse(e,t,n,r,i,o)}},lazyAssign:function(e,t){var n=this;return function(){n.assign(e,t)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(e){return"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)},escape:function(e){if(S(e))return"'"+e.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(E(e))return e.toString();if(e===!0)return"true";if(e===!1)return"false";if(null===e)return"null";if("undefined"==typeof e)return"undefined";throw zi("esc","IMPOSSIBLE")},nextId:function(e,t){var n="v"+this.state.nextId++;return e||this.current().vars.push(n+(t?"="+t:"")),n},current:function(){return this.state[this.state.computing]}},an.prototype={compile:function(e,t){var n=this,r=this.astBuilder.ast(e);this.expression=e,this.expensiveChecks=t,Xt(r,n.$filter);var i,a;(i=tn(r))&&(a=this.recurse(i));var s,u=Qt(r.body);u&&(s=[],o(u,function(e,t){var r=n.recurse(e);e.input=r,s.push(r),e.watchId=t}));var c=[];o(r.body,function(e){c.push(n.recurse(e.expression))});var l=0===r.body.length?function(){}:1===r.body.length?c[0]:function(e,t){var n;return o(c,function(r){n=r(e,t)}),n};return a&&(l.assign=function(e,t,n){return a(e,n,t)}),s&&(l.inputs=s),l.literal=nn(r),l.constant=rn(r),l},recurse:function(e,t,r){var i,a,s,u=this;if(e.input)return this.inputs(e.input,e.watchId);switch(e.type){case Xi.Literal:return this.value(e.value,t);case Xi.UnaryExpression:return a=this.recurse(e.argument),this["unary"+e.operator](a,t);case Xi.BinaryExpression:return i=this.recurse(e.left),a=this.recurse(e.right),this["binary"+e.operator](i,a,t);case Xi.LogicalExpression:return i=this.recurse(e.left),a=this.recurse(e.right),this["binary"+e.operator](i,a,t);case Xi.ConditionalExpression:return this["ternary?:"](this.recurse(e.test),this.recurse(e.alternate),this.recurse(e.consequent),t);case Xi.Identifier:return Wt(e.name,u.expression),u.identifier(e.name,u.expensiveChecks||sn(e.name),t,r,u.expression);case Xi.MemberExpression:return i=this.recurse(e.object,!1,!!r),e.computed||(Wt(e.property.name,u.expression),a=e.property.name),e.computed&&(a=this.recurse(e.property)),e.computed?this.computedMember(i,a,t,r,u.expression):this.nonComputedMember(i,a,u.expensiveChecks,t,r,u.expression);case Xi.CallExpression:return s=[],o(e.arguments,function(e){s.push(u.recurse(e))}),e.filter&&(a=this.$filter(e.callee.name)),e.filter||(a=this.recurse(e.callee,!0)),e.filter?function(e,r,i,o){for(var u=[],c=0;c<s.length;++c)u.push(s[c](e,r,i,o));var l=a.apply(n,u,o);return t?{context:n,name:n,value:l}:l}:function(e,n,r,i){var o,c=a(e,n,r,i);if(null!=c.value){Gt(c.context,u.expression),Yt(c.value,u.expression);for(var l=[],f=0;f<s.length;++f)l.push(Gt(s[f](e,n,r,i),u.expression));o=Gt(c.value.apply(c.context,l),u.expression)}return t?{value:o}:o};case Xi.AssignmentExpression:return i=this.recurse(e.left,!0,1),a=this.recurse(e.right),function(e,n,r,o){var s=i(e,n,r,o),c=a(e,n,r,o);return Gt(s.value,u.expression),s.context[s.name]=c,t?{value:c}:c};case Xi.ArrayExpression:return s=[],o(e.elements,function(e){s.push(u.recurse(e))}),function(e,n,r,i){for(var o=[],a=0;a<s.length;++a)o.push(s[a](e,n,r,i));return t?{value:o}:o};case Xi.ObjectExpression:return s=[],o(e.properties,function(e){s.push({key:e.key.type===Xi.Identifier?e.key.name:""+e.key.value,value:u.recurse(e.value)})}),function(e,n,r,i){for(var o={},a=0;a<s.length;++a)o[s[a].key]=s[a].value(e,n,r,i);return t?{value:o}:o};case Xi.ThisExpression:return function(e){return t?{value:e}:e};case Xi.NGValueParameter:return function(e,n,r,i){return t?{value:r}:r}}},"unary+":function(e,t){return function(n,r,i,o){var a=e(n,r,i,o);return a=b(a)?+a:0,t?{value:a}:a}},"unary-":function(e,t){return function(n,r,i,o){var a=e(n,r,i,o);return a=b(a)?-a:0,t?{value:a}:a}},"unary!":function(e,t){return function(n,r,i,o){var a=!e(n,r,i,o);return t?{value:a}:a}},"binary+":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a),u=t(r,i,o,a),c=Kt(s,u);return n?{value:c}:c}},"binary-":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a),u=t(r,i,o,a),c=(b(s)?s:0)-(b(u)?u:0);return n?{value:c}:c}},"binary*":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)*t(r,i,o,a);return n?{value:s}:s}},"binary/":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)/t(r,i,o,a);return n?{value:s}:s}},"binary%":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)%t(r,i,o,a);return n?{value:s}:s}},"binary===":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)===t(r,i,o,a);return n?{value:s}:s}},"binary!==":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)!==t(r,i,o,a);return n?{value:s}:s}},"binary==":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)==t(r,i,o,a);return n?{value:s}:s}},"binary!=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)!=t(r,i,o,a);return n?{value:s}:s}},"binary<":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)<t(r,i,o,a);return n?{value:s}:s}},"binary>":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)>t(r,i,o,a);return n?{value:s}:s}},"binary<=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)<=t(r,i,o,a);return n?{value:s}:s}},"binary>=":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)>=t(r,i,o,a);return n?{value:s}:s}},"binary&&":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)&&t(r,i,o,a);return n?{value:s}:s}},"binary||":function(e,t,n){return function(r,i,o,a){var s=e(r,i,o,a)||t(r,i,o,a);return n?{value:s}:s}},"ternary?:":function(e,t,n,r){return function(i,o,a,s){var u=e(i,o,a,s)?t(i,o,a,s):n(i,o,a,s);return r?{value:u}:u}},value:function(e,t){return function(){return t?{context:n,name:n,value:e}:e}},identifier:function(e,t,r,i,o){return function(a,s,u,c){var l=s&&e in s?s:a;i&&1!==i&&l&&!l[e]&&(l[e]={});var f=l?l[e]:n;return t&&Gt(f,o),r?{context:l,name:e,value:f}:f}},computedMember:function(e,t,n,r,i){return function(o,a,s,u){var c,l,f=e(o,a,s,u);return null!=f&&(c=t(o,a,s,u),Wt(c,i),r&&1!==r&&f&&!f[c]&&(f[c]={}),l=f[c],Gt(l,i)),n?{context:f,name:c,value:l}:l}},nonComputedMember:function(e,t,r,i,o,a){return function(s,u,c,l){var f=e(s,u,c,l);o&&1!==o&&f&&!f[t]&&(f[t]={});var h=null!=f?f[t]:n;return(r||sn(t))&&Gt(h,a),i?{context:f,name:t,value:h}:h}},inputs:function(e,t){return function(n,r,i,o){return o?o[t]:e(n,r,i)}}};var Qi=function(e,t,n){this.lexer=e,this.$filter=t,this.options=n,this.ast=new Xi(this.lexer),this.astCompiler=n.csp?new an(this.ast,t):new on(this.ast,t)};Qi.prototype={constructor:Qi,parse:function(e){return this.astCompiler.compile(e,this.options.expensiveChecks)}};var eo=(ve(),ve(),Object.prototype.valueOf),to=r("$sce"),no={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Oi=r("$compile"),ro=t.createElement("a"),io=En(e.location.href);An.$inject=["$document"],Mn.$inject=["$provide"],Pn.$inject=["$locale"],Dn.$inject=["$locale"];var oo=".",ao={yyyy:_n("FullYear",4),yy:_n("FullYear",2,0,!0),y:_n("FullYear",1),MMMM:qn("Month"),MMM:qn("Month",!0),MM:_n("Month",2,1),M:_n("Month",1,1),dd:_n("Date",2),d:_n("Date",1),HH:_n("Hours",2),H:_n("Hours",1),hh:_n("Hours",2,-12),h:_n("Hours",1,-12),mm:_n("Minutes",2),m:_n("Minutes",1),ss:_n("Seconds",2),s:_n("Seconds",1),sss:_n("Milliseconds",3),EEEE:qn("Day"),EEE:qn("Day",!0),a:Ln,Z:Fn,ww:Hn(2),w:Hn(1),G:zn,GG:zn,GGG:zn,GGGG:Wn},so=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,uo=/^\-?\d+$/;Gn.$inject=["$locale"];var co=m(gr),lo=m(br);
 Kn.$inject=["$parse"];var fo=m({restrict:"E",compile:function(e,t){return t.href||t.xlinkHref?void 0:function(e,t){if("a"===t[0].nodeName.toLowerCase()){var n="[object SVGAnimatedString]"===Tr.call(t.prop("href"))?"xlink:href":"href";t.on("click",function(e){t.attr(n)||e.preventDefault()})}}}}),ho={};o(hi,function(e,t){function n(e,n,i){e.$watch(i[r],function(e){i.$set(t,!!e)})}if("multiple"!=e){var r=ct("ng-"+t),i=n;"checked"===e&&(i=function(e,t,i){i.ngModel!==i[r]&&n(e,t,i)}),ho[r]=function(){return{restrict:"A",priority:100,link:i}}}}),o(di,function(e,t){ho[t]=function(){return{priority:100,link:function(e,n,r){if("ngPattern"===t&&"/"==r.ngPattern.charAt(0)){var i=r.ngPattern.match(vr);if(i)return void r.$set("ngPattern",new RegExp(i[1],i[2]))}e.$watch(r[t],function(e){r.$set(t,e)})}}}}),o(["src","srcset","href"],function(e){var t=ct("ng-"+e);ho[t]=function(){return{priority:99,link:function(n,r,i){var o=e,a=e;"href"===e&&"[object SVGAnimatedString]"===Tr.call(r.prop("href"))&&(a="xlinkHref",i.$attr[a]="xlink:href",o=null),i.$observe(t,function(t){return t?(i.$set(a,t),void(Sr&&o&&r.prop(o,i[a]))):void("href"===e&&i.$set(a,null))})}}}});var po={$addControl:$,$$renameControl:Xn,$removeControl:$,$setValidity:$,$setDirty:$,$setPristine:$,$setSubmitted:$},$o="ng-submitted";Qn.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var vo=function(e){return["$timeout","$parse",function(t,r){function i(e){return""===e?r('this[""]').assign:r(e).assign||$}var o={name:"form",restrict:e?"EAC":"E",require:["form","^^?form"],controller:Qn,compile:function(r,o){r.addClass(Ko).addClass(Yo);var a=o.name?"name":e&&o.ngForm?"ngForm":!1;return{pre:function(e,r,o,s){var u=s[0];if(!("action"in o)){var c=function(t){e.$apply(function(){u.$commitViewValue(),u.$setSubmitted()}),t.preventDefault()};ei(r[0],"submit",c),r.on("$destroy",function(){t(function(){ti(r[0],"submit",c)},0,!1)})}var l=s[1]||u.$$parentForm;l.$addControl(u);var h=a?i(u.$name):$;a&&(h(e,u),o.$observe(a,function(t){u.$name!==t&&(h(e,n),u.$$parentForm.$$renameControl(u,t),(h=i(u.$name))(e,u))})),r.on("$destroy",function(){u.$$parentForm.$removeControl(u),h(e,n),f(u,po)})}}}};return o}]},mo=vo(),go=vo(!0),yo=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,bo=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,wo=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,xo=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,So=/^(\d{4})-(\d{2})-(\d{2})$/,Eo=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Co=/^(\d{4})-W(\d\d)$/,ko=/^(\d{4})-(\d\d)$/,Ao=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Oo={text:tr,date:or("date",So,ir(So,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":or("datetimelocal",Eo,ir(Eo,["yyyy","MM","dd","HH","mm","ss","sss"]),"yyyy-MM-ddTHH:mm:ss.sss"),time:or("time",Ao,ir(Ao,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:or("week",Co,rr,"yyyy-Www"),month:or("month",ko,ir(ko,["yyyy","MM"]),"yyyy-MM"),number:sr,url:ur,email:cr,radio:lr,checkbox:hr,hidden:$,button:$,submit:$,reset:$,file:$},Mo=["$browser","$sniffer","$filter","$parse",function(e,t,n,r){return{restrict:"E",require:["?ngModel"],link:{pre:function(i,o,a,s){s[0]&&(Oo[gr(a.type)]||Oo.text)(i,o,a,s[0],t,e,n,r)}}}}],To=/^(true|false|\d+)$/,No=function(){return{restrict:"A",priority:100,compile:function(e,t){return To.test(t.ngValue)?function(e,t,n){n.$set("value",e.$eval(n.ngValue))}:function(e,t,n){e.$watch(n.ngValue,function(e){n.$set("value",e)})}}}},Vo=["$compile",function(e){return{restrict:"AC",compile:function(t){return e.$$addBindingClass(t),function(t,n,r){e.$$addBindingInfo(n,r.ngBind),n=n[0],t.$watch(r.ngBind,function(e){n.textContent=y(e)?"":e})}}}}],jo=["$interpolate","$compile",function(e,t){return{compile:function(n){return t.$$addBindingClass(n),function(n,r,i){var o=e(r.attr(i.$attr.ngBindTemplate));t.$$addBindingInfo(r,o.expressions),r=r[0],i.$observe("ngBindTemplate",function(e){r.textContent=y(e)?"":e})}}}}],Po=["$sce","$parse","$compile",function(e,t,n){return{restrict:"A",compile:function(r,i){var o=t(i.ngBindHtml),a=t(i.ngBindHtml,function(e){return(e||"").toString()});return n.$$addBindingClass(r),function(t,r,i){n.$$addBindingInfo(r,i.ngBindHtml),t.$watch(a,function(){r.html(e.getTrustedHtml(o(t))||"")})}}}}],Do=m({restrict:"A",require:"ngModel",link:function(e,t,n,r){r.$viewChangeListeners.push(function(){e.$eval(n.ngChange)})}}),Io=pr("",!0),Ro=pr("Odd",0),_o=pr("Even",1),qo=Zn({compile:function(e,t){t.$set("ngCloak",n),e.removeClass("ng-cloak")}}),Fo=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],Uo={},Bo={blur:!0,focus:!0};o("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(e){var t=ct("ng-"+e);Uo[t]=["$parse","$rootScope",function(n,r){return{restrict:"A",compile:function(i,o){var a=n(o[t],null,!0);return function(t,n){n.on(e,function(n){var i=function(){a(t,{$event:n})};Bo[e]&&r.$$phase?t.$evalAsync(i):t.$apply(i)})}}}}]});var Ho=["$animate",function(e){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(n,r,i,o,a){var s,u,c;n.$watch(i.ngIf,function(n){n?u||a(function(n,o){u=o,n[n.length++]=t.createComment(" end ngIf: "+i.ngIf+" "),s={clone:n},e.enter(n,r.parent(),r)}):(c&&(c.remove(),c=null),u&&(u.$destroy(),u=null),s&&(c=$e(s.clone),e.leave(c).then(function(){c=null}),s=null))})}}}],Lo=["$templateRequest","$anchorScroll","$animate",function(e,t,n){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:jr.noop,compile:function(r,i){var o=i.ngInclude||i.src,a=i.onload||"",s=i.autoscroll;return function(r,i,u,c,l){var f,h,p,d=0,$=function(){h&&(h.remove(),h=null),f&&(f.$destroy(),f=null),p&&(n.leave(p).then(function(){h=null}),h=p,p=null)};r.$watch(o,function(o){var u=function(){!b(s)||s&&!r.$eval(s)||t()},h=++d;o?(e(o,!0).then(function(e){if(h===d){var t=r.$new();c.template=e;var s=l(t,function(e){$(),n.enter(e,null,i).then(u)});f=t,p=s,f.$emit("$includeContentLoaded",o),r.$eval(a)}},function(){h===d&&($(),r.$emit("$includeContentError",o))}),r.$emit("$includeContentRequested",o)):($(),c.template=null)})}}}}],zo=["$compile",function(e){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(n,r,i,o){return/SVG/.test(r[0].toString())?(r.empty(),void e(ke(o.template,t).childNodes)(n,function(e){r.append(e)},{futureParentElement:r})):(r.html(o.template),void e(r.contents())(n))}}}],Wo=Zn({priority:450,compile:function(){return{pre:function(e,t,n){e.$eval(n.ngInit)}}}}),Go=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(e,t,r,i){var a=t.attr(r.$attr.ngList)||", ",s="false"!==r.ngTrim,u=s?_r(a):a,c=function(e){if(!y(e)){var t=[];return e&&o(e.split(u),function(e){e&&t.push(s?_r(e):e)}),t}};i.$parsers.push(c),i.$formatters.push(function(e){return Ir(e)?e.join(a):n}),i.$isEmpty=function(e){return!e||!e.length}}}},Yo="ng-valid",Jo="ng-invalid",Ko="ng-pristine",Zo="ng-dirty",Xo="ng-untouched",Qo="ng-touched",ea="ng-pending",ta=r("ngModel"),na=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(e,t,r,i,a,s,u,c,l,f){this.$viewValue=Number.NaN,this.$modelValue=Number.NaN,this.$$rawModelValue=n,this.$validators={},this.$asyncValidators={},this.$parsers=[],this.$formatters=[],this.$viewChangeListeners=[],this.$untouched=!0,this.$touched=!1,this.$pristine=!0,this.$dirty=!1,this.$valid=!0,this.$invalid=!1,this.$error={},this.$$success={},this.$pending=n,this.$name=f(r.name||"",!1)(e),this.$$parentForm=po;var h,p=a(r.ngModel),d=p.assign,v=p,m=d,g=null,w=this;this.$$setOptions=function(e){if(w.$options=e,e&&e.getterSetter){var t=a(r.ngModel+"()"),n=a(r.ngModel+"($$$p)");v=function(e){var n=p(e);return k(n)&&(n=t(e)),n},m=function(e,t){k(p(e))?n(e,{$$$p:w.$modelValue}):d(e,w.$modelValue)}}else if(!p.assign)throw ta("nonassign","Expression '{0}' is non-assignable. Element: {1}",r.ngModel,X(i))},this.$render=$,this.$isEmpty=function(e){return y(e)||""===e||null===e||e!==e};var x=0;dr({ctrl:this,$element:i,set:function(e,t){e[t]=!0},unset:function(e,t){delete e[t]},$animate:s}),this.$setPristine=function(){w.$dirty=!1,w.$pristine=!0,s.removeClass(i,Zo),s.addClass(i,Ko)},this.$setDirty=function(){w.$dirty=!0,w.$pristine=!1,s.removeClass(i,Ko),s.addClass(i,Zo),w.$$parentForm.$setDirty()},this.$setUntouched=function(){w.$touched=!1,w.$untouched=!0,s.setClass(i,Xo,Qo)},this.$setTouched=function(){w.$touched=!0,w.$untouched=!1,s.setClass(i,Qo,Xo)},this.$rollbackViewValue=function(){u.cancel(g),w.$viewValue=w.$$lastCommittedViewValue,w.$render()},this.$validate=function(){if(!E(w.$modelValue)||!isNaN(w.$modelValue)){var e=w.$$lastCommittedViewValue,t=w.$$rawModelValue,r=w.$valid,i=w.$modelValue,o=w.$options&&w.$options.allowInvalid;w.$$runValidators(t,e,function(e){o||r===e||(w.$modelValue=e?t:n,w.$modelValue!==i&&w.$$writeModelToScope())})}},this.$$runValidators=function(e,t,r){function i(){var e=w.$$parserName||"parse";return y(h)?(u(e,null),!0):(h||(o(w.$validators,function(e,t){u(t,null)}),o(w.$asyncValidators,function(e,t){u(t,null)})),u(e,h),h)}function a(){var n=!0;return o(w.$validators,function(r,i){var o=r(e,t);n=n&&o,u(i,o)}),n?!0:(o(w.$asyncValidators,function(e,t){u(t,null)}),!1)}function s(){var r=[],i=!0;o(w.$asyncValidators,function(o,a){var s=o(e,t);if(!P(s))throw ta("$asyncValidators","Expected asynchronous validator to return a promise but got '{0}' instead.",s);u(a,n),r.push(s.then(function(){u(a,!0)},function(e){i=!1,u(a,!1)}))}),r.length?l.all(r).then(function(){c(i)},$):c(!0)}function u(e,t){f===x&&w.$setValidity(e,t)}function c(e){f===x&&r(e)}x++;var f=x;return i()&&a()?void s():void c(!1)},this.$commitViewValue=function(){var e=w.$viewValue;u.cancel(g),(w.$$lastCommittedViewValue!==e||""===e&&w.$$hasNativeValidators)&&(w.$$lastCommittedViewValue=e,w.$pristine&&this.$setDirty(),this.$$parseAndValidate())},this.$$parseAndValidate=function(){function t(){w.$modelValue!==a&&w.$$writeModelToScope()}var r=w.$$lastCommittedViewValue,i=r;if(h=y(i)?n:!0)for(var o=0;o<w.$parsers.length;o++)if(i=w.$parsers[o](i),y(i)){h=!1;break}E(w.$modelValue)&&isNaN(w.$modelValue)&&(w.$modelValue=v(e));var a=w.$modelValue,s=w.$options&&w.$options.allowInvalid;w.$$rawModelValue=i,s&&(w.$modelValue=i,t()),w.$$runValidators(i,w.$$lastCommittedViewValue,function(e){s||(w.$modelValue=e?i:n,t())})},this.$$writeModelToScope=function(){m(e,w.$modelValue),o(w.$viewChangeListeners,function(e){try{e()}catch(n){t(n)}})},this.$setViewValue=function(e,t){w.$viewValue=e,w.$options&&!w.$options.updateOnDefault||w.$$debounceViewValueCommit(t)},this.$$debounceViewValueCommit=function(t){var n,r=0,i=w.$options;i&&b(i.debounce)&&(n=i.debounce,E(n)?r=n:E(n[t])?r=n[t]:E(n["default"])&&(r=n["default"])),u.cancel(g),r?g=u(function(){w.$commitViewValue()},r):c.$$phase?w.$commitViewValue():e.$apply(function(){w.$commitViewValue()})},e.$watch(function(){var t=v(e);if(t!==w.$modelValue&&(w.$modelValue===w.$modelValue||t===t)){w.$modelValue=w.$$rawModelValue=t,h=n;for(var r=w.$formatters,i=r.length,o=t;i--;)o=r[i](o);w.$viewValue!==o&&(w.$viewValue=w.$$lastCommittedViewValue=o,w.$render(),w.$$runValidators(t,o,$))}return t})}],ra=["$rootScope",function(e){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:na,priority:1,compile:function(t){return t.addClass(Ko).addClass(Xo).addClass(Yo),{pre:function(e,t,n,r){var i=r[0],o=r[1]||i.$$parentForm;i.$$setOptions(r[2]&&r[2].$options),o.$addControl(i),n.$observe("name",function(e){i.$name!==e&&i.$$parentForm.$$renameControl(i,e)}),e.$on("$destroy",function(){i.$$parentForm.$removeControl(i)})},post:function(t,n,r,i){var o=i[0];o.$options&&o.$options.updateOn&&n.on(o.$options.updateOn,function(e){o.$$debounceViewValueCommit(e&&e.type)}),n.on("blur",function(n){o.$touched||(e.$$phase?t.$evalAsync(o.$setTouched):t.$apply(o.$setTouched))})}}}}}],ia=/(\s+|^)default(\s+|$)/,oa=function(){return{restrict:"A",controller:["$scope","$attrs",function(e,t){var n=this;this.$options=F(e.$eval(t.ngModelOptions)),b(this.$options.updateOn)?(this.$options.updateOnDefault=!1,this.$options.updateOn=_r(this.$options.updateOn.replace(ia,function(){return n.$options.updateOnDefault=!0," "}))):this.$options.updateOnDefault=!0}]}},aa=Zn({terminal:!0,priority:1e3}),sa=r("ngOptions"),ua=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,ca=["$compile","$parse",function(e,n){function r(e,t,r){function o(e,t,n,r,i){this.selectValue=e,this.viewValue=t,this.label=n,this.group=r,this.disabled=i}function a(e){var t;if(!c&&i(e))t=e;else{t=[];for(var n in e)e.hasOwnProperty(n)&&"$"!==n.charAt(0)&&t.push(n)}return t}var s=e.match(ua);if(!s)throw sa("iexp","Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_' but got '{0}'. Element: {1}",e,X(t));var u=s[5]||s[7],c=s[6],l=/ as /.test(s[0])&&s[1],f=s[9],h=n(s[2]?s[1]:u),p=l&&n(l),d=p||h,$=f&&n(f),v=f?function(e,t){return $(r,t)}:function(e){return Ye(e)},m=function(e,t){return v(e,S(e,t))},g=n(s[2]||s[1]),y=n(s[3]||""),b=n(s[4]||""),w=n(s[8]),x={},S=c?function(e,t){return x[c]=t,x[u]=e,x}:function(e){return x[u]=e,x};return{trackBy:f,getTrackByValue:m,getWatchables:n(w,function(e){var t=[];e=e||[];for(var n=a(e),i=n.length,o=0;i>o;o++){var u=e===n?o:n[o],c=(e[u],S(e[u],u)),l=v(e[u],c);if(t.push(l),s[2]||s[1]){var f=g(r,c);t.push(f)}if(s[4]){var h=b(r,c);t.push(h)}}return t}),getOptions:function(){for(var e=[],t={},n=w(r)||[],i=a(n),s=i.length,u=0;s>u;u++){var c=n===i?u:i[u],l=n[c],h=S(l,c),p=d(r,h),$=v(p,h),x=g(r,h),E=y(r,h),C=b(r,h),k=new o($,p,x,E,C);e.push(k),t[$]=k}return{items:e,selectValueMap:t,getOptionFromViewValue:function(e){return t[m(e)]},getViewValueFromOption:function(e){return f?jr.copy(e.viewValue):e.viewValue}}}}}var a=t.createElement("option"),s=t.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","?ngModel"],link:function(t,n,i,u){function c(e,t){e.element=t,t.disabled=e.disabled,e.value!==t.value&&(t.value=e.selectValue),e.label!==t.label&&(t.label=e.label,t.textContent=e.label)}function l(e,t,n,r){var i;return t&&gr(t.nodeName)===n?i=t:(i=r.cloneNode(!1),t?e.insertBefore(i,t):e.appendChild(i)),i}function f(e){for(var t;e;)t=e.nextSibling,Be(e),e=t}function h(e){var t=$&&$[0],n=x&&x[0];if(t||n)for(;e&&(e===t||e===n);)e=e.nextSibling;return e}function p(){var e=S&&v.readValue();S=E.getOptions();var t={},r=n[0].firstChild;if(w&&n.prepend($),r=h(r),S.items.forEach(function(e){var i,o,u;e.group?(i=t[e.group],i||(o=l(n[0],r,"optgroup",s),r=o.nextSibling,o.label=e.group,i=t[e.group]={groupElement:o,currentOptionElement:o.firstChild}),u=l(i.groupElement,i.currentOptionElement,"option",a),c(e,u),i.currentOptionElement=u.nextSibling):(u=l(n[0],r,"option",a),c(e,u),r=u.nextSibling)}),Object.keys(t).forEach(function(e){f(t[e].currentOptionElement)}),f(r),d.$render(),!d.$isEmpty(e)){var i=v.readValue();(E.trackBy?B(e,i):e===i)||(d.$setViewValue(i),d.$render())}}var d=u[1];if(d){for(var $,v=u[0],m=i.multiple,g=0,y=n.children(),b=y.length;b>g;g++)if(""===y[g].value){$=y.eq(g);break}var w=!!$,x=Er(a.cloneNode(!1));x.val("?");var S,E=r(i.ngOptions,n,t),C=function(){w||n.prepend($),n.val(""),$.prop("selected",!0),$.attr("selected",!0)},k=function(){w||$.remove()},A=function(){n.prepend(x),n.val("?"),x.prop("selected",!0),x.attr("selected",!0)},O=function(){x.remove()};m?(d.$isEmpty=function(e){return!e||0===e.length},v.writeValue=function(e){S.items.forEach(function(e){e.element.selected=!1}),e&&e.forEach(function(e){var t=S.getOptionFromViewValue(e);t&&!t.disabled&&(t.element.selected=!0)})},v.readValue=function(){var e=n.val()||[],t=[];return o(e,function(e){var n=S.selectValueMap[e];n&&!n.disabled&&t.push(S.getViewValueFromOption(n))}),t},E.trackBy&&t.$watchCollection(function(){return Ir(d.$viewValue)?d.$viewValue.map(function(e){return E.getTrackByValue(e)}):void 0},function(){d.$render()})):(v.writeValue=function(e){var t=S.getOptionFromViewValue(e);t&&!t.disabled?n[0].value!==t.selectValue&&(O(),k(),n[0].value=t.selectValue,t.element.selected=!0,t.element.setAttribute("selected","selected")):null===e||w?(O(),C()):(k(),A())},v.readValue=function(){var e=S.selectValueMap[n.val()];return e&&!e.disabled?(k(),O(),S.getViewValueFromOption(e)):null},E.trackBy&&t.$watch(function(){return E.getTrackByValue(d.$viewValue)},function(){d.$render()})),w?($.remove(),e($)(t),$.removeClass("ng-scope")):$=Er(a.cloneNode(!1)),p(),t.$watchCollection(E.getWatchables,p)}}}}],la=["$locale","$interpolate","$log",function(e,t,n){var r=/{}/g,i=/^when(Minus)?(.+)$/;return{link:function(a,s,u){function c(e){s.text(e||"")}var l,f=u.count,h=u.$attr.when&&s.attr(u.$attr.when),p=u.offset||0,d=a.$eval(h)||{},v={},m=t.startSymbol(),g=t.endSymbol(),b=m+f+"-"+p+g,w=jr.noop;o(u,function(e,t){var n=i.exec(t);if(n){var r=(n[1]?"-":"")+gr(n[2]);d[r]=s.attr(u.$attr[t])}}),o(d,function(e,n){v[n]=t(e.replace(r,b))}),a.$watch(f,function(t){var r=parseFloat(t),i=isNaN(r);if(i||r in d||(r=e.pluralCat(r-p)),r!==l&&!(i&&E(l)&&isNaN(l))){w();var o=v[r];y(o)?(null!=t&&n.debug("ngPluralize: no rule defined for '"+r+"' in "+h),w=$,c()):w=a.$watch(o,c),l=r}})}}}],fa=["$parse","$animate",function(e,a){var s="$$NG_REMOVED",u=r("ngRepeat"),c=function(e,t,n,r,i,o,a){e[n]=r,i&&(e[i]=o),e.$index=t,e.$first=0===t,e.$last=t===a-1,e.$middle=!(e.$first||e.$last),e.$odd=!(e.$even=0===(1&t))},l=function(e){return e.clone[0]},f=function(e){return e.clone[e.clone.length-1]};return{restrict:"A",multiElement:!0,transclude:"element",priority:1e3,terminal:!0,$$tlb:!0,compile:function(r,h){var p=h.ngRepeat,d=t.createComment(" end ngRepeat: "+p+" "),$=p.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!$)throw u("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",p);var v=$[1],m=$[2],g=$[3],y=$[4];if($=v.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/),!$)throw u("iidexp","'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",v);var b=$[3]||$[1],w=$[2];if(g&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(g)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(g)))throw u("badident","alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",g);var x,S,E,C,k={$id:Ye};return y?x=e(y):(E=function(e,t){return Ye(t)},C=function(e){return e}),function(e,t,r,h,$){x&&(S=function(t,n,r){return w&&(k[w]=t),k[b]=n,k.$index=r,x(e,k)});var v=ve();e.$watchCollection(m,function(r){var h,m,y,x,k,A,O,M,T,N,V,j,P=t[0],D=ve();if(g&&(e[g]=r),i(r))T=r,M=S||E;else{M=S||C,T=[];for(var I in r)yr.call(r,I)&&"$"!==I.charAt(0)&&T.push(I)}for(x=T.length,V=new Array(x),h=0;x>h;h++)if(k=r===T?h:T[h],A=r[k],O=M(k,A,h),v[O])N=v[O],delete v[O],D[O]=N,V[h]=N;else{if(D[O])throw o(V,function(e){e&&e.scope&&(v[e.id]=e)}),u("dupes","Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",p,O,A);V[h]={id:O,scope:n,clone:n},D[O]=!0}for(var R in v){if(N=v[R],j=$e(N.clone),a.leave(j),j[0].parentNode)for(h=0,m=j.length;m>h;h++)j[h][s]=!0;N.scope.$destroy()}for(h=0;x>h;h++)if(k=r===T?h:T[h],A=r[k],N=V[h],N.scope){y=P;do y=y.nextSibling;while(y&&y[s]);l(N)!=y&&a.move($e(N.clone),null,Er(P)),P=f(N),c(N.scope,h,b,A,w,k,x)}else $(function(e,t){N.scope=t;var n=d.cloneNode(!1);e[e.length++]=n,a.enter(e,null,Er(P)),P=n,N.clone=e,D[N.id]=N,c(N.scope,h,b,A,w,k,x)});v=D})}}}}],ha="ng-hide",pa="ng-hide-animate",da=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,r){t.$watch(r.ngShow,function(t){e[t?"removeClass":"addClass"](n,ha,{tempClasses:pa})})}}}],$a=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,r){t.$watch(r.ngHide,function(t){e[t?"addClass":"removeClass"](n,ha,{tempClasses:pa})})}}}],va=Zn(function(e,t,n){e.$watch(n.ngStyle,function(e,n){n&&e!==n&&o(n,function(e,n){t.css(n,"")}),e&&t.css(e)},!0)}),ma=["$animate",function(e){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(n,r,i,a){var s=i.ngSwitch||i.on,u=[],c=[],l=[],f=[],h=function(e,t){return function(){e.splice(t,1)}};n.$watch(s,function(n){var r,i;for(r=0,i=l.length;i>r;++r)e.cancel(l[r]);for(l.length=0,r=0,i=f.length;i>r;++r){var s=$e(c[r].clone);f[r].$destroy();var p=l[r]=e.leave(s);p.then(h(l,r))}c.length=0,f.length=0,(u=a.cases["!"+n]||a.cases["?"])&&o(u,function(n){n.transclude(function(r,i){f.push(i);var o=n.element;r[r.length++]=t.createComment(" end ngSwitchWhen: ");var a={clone:r};c.push(a),e.enter(r,o.parent(),o)})})})}}}],ga=Zn({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,r,i){r.cases["!"+n.ngSwitchWhen]=r.cases["!"+n.ngSwitchWhen]||[],r.cases["!"+n.ngSwitchWhen].push({transclude:i,element:t})}}),ya=Zn({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,r,i){r.cases["?"]=r.cases["?"]||[],r.cases["?"].push({transclude:i,element:t})}}),ba=Zn({restrict:"EAC",link:function(e,t,n,i,o){if(!o)throw r("ngTransclude")("orphan","Illegal use of ngTransclude directive in the template! No parent directive that requires a transclusion found. Element: {0}",X(t));o(function(e){t.empty(),t.append(e)})}}),wa=["$templateCache",function(e){return{restrict:"E",terminal:!0,compile:function(t,n){if("text/ng-template"==n.type){var r=n.id,i=t[0].text;e.put(r,i)}}}}],xa={$setViewValue:$,$render:$},Sa=["$element","$scope","$attrs",function(e,r,i){var o=this,a=new Je;o.ngModelCtrl=xa,o.unknownOption=Er(t.createElement("option")),o.renderUnknownOption=function(t){var n="? "+Ye(t)+" ?";o.unknownOption.val(n),e.prepend(o.unknownOption),e.val(n)},r.$on("$destroy",function(){o.renderUnknownOption=$}),o.removeUnknownOption=function(){o.unknownOption.parent()&&o.unknownOption.remove()},o.readValue=function(){return o.removeUnknownOption(),e.val()},o.writeValue=function(t){o.hasOption(t)?(o.removeUnknownOption(),e.val(t),""===t&&o.emptyOption.prop("selected",!0)):null==t&&o.emptyOption?(o.removeUnknownOption(),e.val("")):o.renderUnknownOption(t)},o.addOption=function(e,t){pe(e,'"option value"'),""===e&&(o.emptyOption=t);var n=a.get(e)||0;a.put(e,n+1)},o.removeOption=function(e){var t=a.get(e);t&&(1===t?(a.remove(e),""===e&&(o.emptyOption=n)):a.put(e,t-1))},o.hasOption=function(e){return!!a.get(e)}}],Ea=function(){return{restrict:"E",require:["select","?ngModel"],controller:Sa,link:function(e,t,n,r){var i=r[1];if(i){var a=r[0];if(a.ngModelCtrl=i,i.$render=function(){a.writeValue(i.$viewValue)},t.on("change",function(){e.$apply(function(){i.$setViewValue(a.readValue())})}),n.multiple){a.readValue=function(){var e=[];return o(t.find("option"),function(t){t.selected&&e.push(t.value)}),e},a.writeValue=function(e){var n=new Je(e);o(t.find("option"),function(e){e.selected=b(n.get(e.value))})};var s,u=NaN;e.$watch(function(){u!==i.$viewValue||B(s,i.$viewValue)||(s=U(i.$viewValue),i.$render()),u=i.$viewValue}),i.$isEmpty=function(e){return!e||0===e.length}}}}}},Ca=["$interpolate",function(e){function t(e){e[0].hasAttribute("selected")&&(e[0].selected=!0)}return{restrict:"E",priority:100,compile:function(n,r){if(b(r.value))var i=e(r.value,!0);else{var o=e(n.text(),!0);o||r.$set("value",n.text())}return function(e,n,r){function a(e){c.addOption(e,n),c.ngModelCtrl.$render(),t(n)}var s="$selectController",u=n.parent(),c=u.data(s)||u.parent().data(s);if(c&&c.ngModelCtrl){if(i){var l;r.$observe("value",function(e){b(l)&&c.removeOption(l),l=e,a(e)})}else o?e.$watch(o,function(e,t){r.$set("value",e),t!==e&&c.removeOption(t),a(e)}):a(r.value);n.on("$destroy",function(){c.removeOption(r.value),c.ngModelCtrl.$render()})}}}}}],ka=m({restrict:"E",terminal:!1}),Aa=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){r&&(n.required=!0,r.$validators.required=function(e,t){return!n.required||!r.$isEmpty(t)},n.$observe("required",function(){r.$validate()}))}}},Oa=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,i,o){if(o){var a,s=i.ngPattern||i.pattern;i.$observe("pattern",function(e){if(S(e)&&e.length>0&&(e=new RegExp("^"+e+"$")),e&&!e.test)throw r("ngPattern")("noregexp","Expected {0} to be a RegExp but was {1}. Element: {2}",s,e,X(t));a=e||n,o.$validate()}),o.$validators.pattern=function(e,t){return o.$isEmpty(t)||y(a)||a.test(t)}}}}},Ma=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){if(r){var i=-1;n.$observe("maxlength",function(e){var t=p(e);i=isNaN(t)?-1:t,r.$validate()}),r.$validators.maxlength=function(e,t){return 0>i||r.$isEmpty(t)||t.length<=i}}}}},Ta=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,r){if(r){var i=0;n.$observe("minlength",function(e){i=p(e)||0,r.$validate()}),r.$validators.minlength=function(e,t){return r.$isEmpty(t)||t.length>=i}}}}};return e.angular.bootstrap?void console.log("WARNING: Tried to load angular more than once."):(le(),be(jr),jr.module("ngLocale",[],["$provide",function(e){function t(e){e+="";var t=e.indexOf(".");return-1==t?0:e.length-t-1}function r(e,r){var i=r;n===i&&(i=Math.min(t(e),3));var o=Math.pow(10,i),a=(e*o|0)%o;return{v:i,f:a}}var i={ZERO:"zero",ONE:"one",TWO:"two",FEW:"few",MANY:"many",OTHER:"other"};e.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:["January","February","March","April","May","June","July","August","September","October","November","December"],SHORTDAY:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],SHORTMONTH:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-¤",negSuf:"",posPre:"¤",posSuf:""}]},id:"en-us",pluralCat:function(e,t){var n=0|e,o=r(e,t);return 1==n&&0==o.v?i.ONE:i.OTHER}})}]),void Er(t).ready(function(){oe(t,ae)}))}(window,document),!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
 !function(e,r,t){"use strict";function n(){function e(e,t){return r.extend(Object.create(e),t)}function t(e,r){var t=r.caseInsensitiveMatch,n={originalPath:e,regexp:e},a=n.keys=[];return e=e.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(e,r,t,n){var o="?"===n?n:null,i="*"===n?n:null;return a.push({name:t,optional:!!o}),r=r||"",""+(o?"":r)+"(?:"+(o?r:"")+(i&&"(.+?)"||"([^/]+)")+(o||"")+")"+(o||"")}).replace(/([\/$\*])/g,"\\$1"),n.regexp=new RegExp("^"+e+"$",t?"i":""),n}var n={};this.when=function(e,a){var o=r.copy(a);if(r.isUndefined(o.reloadOnSearch)&&(o.reloadOnSearch=!0),r.isUndefined(o.caseInsensitiveMatch)&&(o.caseInsensitiveMatch=this.caseInsensitiveMatch),n[e]=r.extend(o,e&&t(e,o)),e){var i="/"==e[e.length-1]?e.substr(0,e.length-1):e+"/";n[i]=r.extend({redirectTo:e},t(i,o))}return this},this.caseInsensitiveMatch=!1,this.otherwise=function(e){return"string"==typeof e&&(e={redirectTo:e}),this.when(null,e),this},this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(t,a,o,i,c,l,s){function h(e,r){var t=r.keys,n={};if(!r.regexp)return null;var a=r.regexp.exec(e);if(!a)return null;for(var o=1,i=a.length;i>o;++o){var c=t[o-1],u=a[o];c&&u&&(n[c.name]=u)}return n}function $(e){var n=w.current;v=f(),m=v&&n&&v.$$route===n.$$route&&r.equals(v.pathParams,n.pathParams)&&!v.reloadOnSearch&&!g,m||!n&&!v||t.$broadcast("$routeChangeStart",v,n).defaultPrevented&&e&&e.preventDefault()}function p(){var e=w.current,n=v;m?(e.params=n.params,r.copy(e.params,o),t.$broadcast("$routeUpdate",e)):(n||e)&&(g=!1,w.current=n,n&&n.redirectTo&&(r.isString(n.redirectTo)?a.path(d(n.redirectTo,n.params)).search(n.params).replace():a.url(n.redirectTo(n.pathParams,a.path(),a.search())).replace()),i.when(n).then(function(){if(n){var e,t,a=r.extend({},n.resolve);return r.forEach(a,function(e,t){a[t]=r.isString(e)?c.get(e):c.invoke(e,null,null,t)}),r.isDefined(e=n.template)?r.isFunction(e)&&(e=e(n.params)):r.isDefined(t=n.templateUrl)&&(r.isFunction(t)&&(t=t(n.params)),r.isDefined(t)&&(n.loadedTemplateUrl=s.valueOf(t),e=l(t))),r.isDefined(e)&&(a.$template=e),i.all(a)}}).then(function(a){n==w.current&&(n&&(n.locals=a,r.copy(n.params,o)),t.$broadcast("$routeChangeSuccess",n,e))},function(r){n==w.current&&t.$broadcast("$routeChangeError",n,e,r)}))}function f(){var t,o;return r.forEach(n,function(n,i){!o&&(t=h(a.path(),n))&&(o=e(n,{params:r.extend({},a.search(),t),pathParams:t}),o.$$route=n)}),o||n[null]&&e(n[null],{params:{},pathParams:{}})}function d(e,t){var n=[];return r.forEach((e||"").split(":"),function(e,r){if(0===r)n.push(e);else{var a=e.match(/(\w+)(?:[?*])?(.*)/),o=a[1];n.push(t[o]),n.push(a[2]||""),delete t[o]}}),n.join("")}var v,m,g=!1,w={routes:n,reload:function(){g=!0,t.$evalAsync(function(){$(),p()})},updateParams:function(e){if(!this.current||!this.current.$$route)throw u("norout","Tried updating route when with no current route");e=r.extend({},this.current.params,e),a.path(d(this.current.$$route.originalPath,e)),a.search(e)}};return t.$on("$locationChangeStart",$),t.$on("$locationChangeSuccess",p),w}]}function a(){this.$get=function(){return{}}}function o(e,t,n){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,o,i,c,u){function l(){p&&(n.cancel(p),p=null),h&&(h.$destroy(),h=null),$&&(p=n.leave($),p.then(function(){p=null}),$=null)}function s(){var i=e.current&&e.current.locals,c=i&&i.$template;if(r.isDefined(c)){var s=a.$new(),p=e.current,v=u(s,function(e){n.enter(e,null,$||o).then(function(){!r.isDefined(f)||f&&!a.$eval(f)||t()}),l()});$=v,h=p.scope=s,h.$emit("$viewContentLoaded"),h.$eval(d)}else l()}var h,$,p,f=i.autoscroll,d=i.onload||"";a.$on("$routeChangeSuccess",s),s()}}}function i(e,r,t){return{restrict:"ECA",priority:-400,link:function(n,a){var o=t.current,i=o.locals;a.html(i.$template);var c=e(a.contents());if(o.controller){i.$scope=n;var u=r(o.controller,i);o.controllerAs&&(n[o.controllerAs]=u),a.data("$ngControllerController",u),a.children().data("$ngControllerController",u)}c(n)}}}var c=r.module("ngRoute",["ng"]).provider("$route",n),u=r.$$minErr("ngRoute");c.provider("$routeParams",a),c.directive("ngView",o),c.directive("ngView",i),o.$inject=["$route","$anchorScroll","$animate"],i.$inject=["$compile","$controller","$route"]}(window,window.angular);
-!function(e,n,o){"use strict";function t(e,o,t){function i(e,t,i){var u,c;i=i||{},c=i.expires,u=n.isDefined(i.path)?i.path:r,n.isUndefined(t)&&(c="Thu, 01 Jan 1970 00:00:00 GMT",t=""),n.isString(c)&&(c=new Date(c));var s=encodeURIComponent(e)+"="+encodeURIComponent(t);s+=u?";path="+u:"",s+=i.domain?";domain="+i.domain:"",s+=c?";expires="+c.toUTCString():"",s+=i.secure?";secure":"";var f=s.length+1;return f>4096&&o.warn("Cookie '"+e+"' possibly not set or overflowed because it was too large ("+f+" > 4096 bytes)!"),s}var r=t.baseHref(),u=e[0];return function(e,n,o){u.cookie=i(e,n,o)}}n.module("ngCookies",["ng"]).provider("$cookies",[function(){function e(e){return e?n.extend({},t,e):t}var t=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(t,i){return{get:function(e){return t()[e]},getObject:function(e){var o=this.get(e);return o?n.fromJson(o):o},getAll:function(){return t()},put:function(n,o,t){i(n,o,e(t))},putObject:function(e,o,t){this.put(e,n.toJson(o),t)},remove:function(n,t){i(n,o,e(t))}}}]}]),n.module("ngCookies").factory("$cookieStore",["$cookies",function(e){return{get:function(n){return e.getObject(n)},put:function(n,o){e.putObject(n,o)},remove:function(n){e.remove(n)}}}]),t.$inject=["$document","$log","$browser"],n.module("ngCookies").provider("$$cookieWriter",function(){this.$get=t})}(window,window.angular);
 !function(e,t,r){"use strict";function n(e){var r=[];return l(r,t.noop).chars(e),r.join("")}function a(e,r){var n,a={},i=e.split(",");for(n=0;n<i.length;n++)a[r?t.lowercase(i[n]):i[n]]=!0;return a}function i(e,r){function n(e,n,i,o){if(n=t.lowercase(n),w[n])for(;b.last()&&z[b.last()];)a("",b.last());v[n]&&b.last()==n&&a("",n),(o=y[n]||!!o)||b.push(n);var l={};i.replace(h,function(e,t,r,n,a){l[t]=s(r||n||a||"")}),r.start&&r.start(n,l,o)}function a(e,n){var a,i=0;if(n=t.lowercase(n))for(i=b.length-1;i>=0&&b[i]!=n;i--);if(i>=0){for(a=b.length-1;a>=i;a--)r.end&&r.end(b[a]);b.length=i}}"string"!=typeof e&&(e=null===e||"undefined"==typeof e?"":""+e);var i,o,l,b=[],k=e;for(b.last=function(){return b[b.length-1]};e;){if(l="",o=!0,b.last()&&$[b.last()]?(e=e.replace(new RegExp("([\\W\\w]*)<\\s*\\/\\s*"+b.last()+"[^>]*>","i"),function(e,t){return t=t.replace(f,"$1").replace(x,"$1"),r.chars&&r.chars(s(t)),""}),a("",b.last())):(0===e.indexOf("<!--")?(i=e.indexOf("--",4),i>=0&&e.lastIndexOf("-->",i)===i&&(r.comment&&r.comment(e.substring(4,i)),e=e.substring(i+3),o=!1)):m.test(e)?(i=e.match(m))&&(e=e.replace(i[0],""),o=!1):g.test(e)?(i=e.match(p))&&(e=e.substring(i[0].length),i[0].replace(p,a),o=!1):d.test(e)&&((i=e.match(u))?(i[4]&&(e=e.substring(i[0].length),i[0].replace(u,n)),o=!1):(l+="<",e=e.substring(1))),o&&(i=e.indexOf("<"),l+=0>i?e:e.substring(0,i),e=0>i?"":e.substring(i),r.chars&&r.chars(s(l)))),e==k)throw c("badparse",e);k=e}a()}function s(e){return e?(E.innerHTML=e.replace(/</g,"&lt;"),E.textContent):""}function o(e){return e.replace(/&/g,"&amp;").replace(b,function(e){var t=e.charCodeAt(0);return e=e.charCodeAt(1),"&#"+(1024*(t-55296)+(e-56320)+65536)+";"}).replace(k,function(e){return"&#"+e.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function l(e,r){var n=!1,a=t.bind(e,e.push);return{start:function(e,i,s){e=t.lowercase(e),!n&&$[e]&&(n=e),n||!0!==A[e]||(a("<"),a(e),t.forEach(i,function(n,i){var s=t.lowercase(i),l="img"===e&&"src"===s||"background"===s;!0!==D[s]||!0===C[s]&&!r(n,l)||(a(" "),a(i),a('="'),a(o(n)),a('"'))}),a(s?"/>":">"))},end:function(e){e=t.lowercase(e),n||!0!==A[e]||(a("</"),a(e),a(">")),e==n&&(n=!1)},chars:function(e){n||a(o(e))}}}var c=t.$$minErr("$sanitize"),u=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,p=/^<\/\s*([\w:-]+)[^>]*>/,h=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,d=/^</,g=/^<\//,f=/\x3c!--(.*?)--\x3e/g,m=/<!DOCTYPE([^>]*?)>/i,x=/<!\[CDATA\[(.*?)]]\x3e/g,b=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,k=/([^\#-~| |!])/g,y=a("area,br,col,hr,img,wbr");e=a("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),r=a("rp,rt");var v=t.extend({},r,e),w=t.extend({},e,a("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),z=t.extend({},r,a("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var"));e=a("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan,use");var $=a("script,style"),A=t.extend({},y,w,z,v,e),C=a("background,cite,href,longdesc,src,usemap,xlink:href");e=a("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width"),r=a("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",!0);var D=t.extend({},C,r,e),E=document.createElement("pre");t.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(e){return function(t){var r=[];return i(t,l(r,function(t,r){return!/^unsafe/.test(e(t,r))})),r.join("")}}]}),t.module("ngSanitize").filter("linky",["$sanitize",function(e){var r=/((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,a=/^mailto:/i;return function(i,s){function o(e){e&&d.push(n(e))}function l(e,r){d.push("<a "),t.isDefined(s)&&d.push('target="',s,'" '),d.push('href="',e.replace(/"/g,"&quot;"),'">'),o(r),d.push("</a>")}if(!i)return i;for(var c,u,p,h=i,d=[];c=h.match(r);)u=c[0],c[2]||c[4]||(u=(c[3]?"http://":"mailto:")+u),p=c.index,o(h.substr(0,p)),l(u,c[0].replace(a,"")),h=h.substring(p+c[0].length);return o(h),e(d.join(""))}}])}(window,window.angular);
\ No newline at end of file
diff --git a/public/javascripts/wechat/gulpfile.js b/public/javascripts/wechat/gulpfile.js
index a6726bd22..439b6ae5d 100644
--- a/public/javascripts/wechat/gulpfile.js
+++ b/public/javascripts/wechat/gulpfile.js
@@ -3,7 +3,7 @@ var gulp = require('gulp'),
 var concat = require('gulp-concat');
 
 gulp.task('minify', function () {
-  gulp.src(['angular.js', 'angular-route.js', 'angular-cookies.js', 'angular-sanitize.min.js'])
+  gulp.src(['../jquery-1.3.2.js','angular.js', 'angular-route.js', 'angular-sanitize.min.js'])
   .pipe(uglify())
   .pipe(concat('angular.all.min.js'))
   .pipe(gulp.dest('build'))
diff --git a/public/javascripts/wechat/jquery.min.js b/public/javascripts/wechat/jquery.min.js
deleted file mode 100644
index c4643af62..000000000
--- a/public/javascripts/wechat/jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
-},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
-},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Ic=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Jc})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Lc=a.jQuery,Mc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Mc),b&&a.jQuery===n&&(a.jQuery=Lc),n},typeof b===U&&(a.jQuery=a.$=n),n});
-//# sourceMappingURL=jquery.min.map
\ No newline at end of file

From 07760bcfca213fb65c58bde97ce26ac0c052d449 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 12 Jun 2016 13:42:53 +0800
Subject: [PATCH 363/668] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 5ce5280d6..ba15f97f0 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -19,7 +19,6 @@
 <div ng-view>
 </div>
 
-<script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
 <script src="/javascripts/wechat/app.js"></script>
 </body>

From 928d71500def87c9d03ce5855d210babfc8cac7a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 12 Jun 2016 13:45:22 +0800
Subject: [PATCH 364/668] =?UTF-8?q?=E9=97=A8=E6=88=B7=E6=A8=A1=E5=BC=8F--?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE=E6=B2=A1=E6=9C=89=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_custom_org_subfield.html.erb        | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/views/organizations/_show_custom_org_subfield.html.erb b/app/views/organizations/_show_custom_org_subfield.html.erb
index 54416b6f0..aad0d0c84 100644
--- a/app/views/organizations/_show_custom_org_subfield.html.erb
+++ b/app/views/organizations/_show_custom_org_subfield.html.erb
@@ -1,14 +1,15 @@
-<% if @subfield_acts.blank? %>
-    <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
-<% else %>
-    <div class="sn-inner-body">
-      <div class="sn-innner-content">
-        <div class="sn-row sn-bg-white">
-          <div class="sn-font-grey3 f14">
-            您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
-            <a class = "sn-link-grey2"><%= @org_subfield.name %></a>
-          </div>
-        </div>
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-font-grey3 f14">
+        您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+        <a class = "sn-link-grey2"><%= @org_subfield.name %></a>
+      </div>
+    </div>
+    <% if @subfield_acts.blank? %>
+        <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+    <% else %>
+
         <div class="sn-inner-newslist mt15">
           <h2 class="sn-inner-newsh2"><%= @org_subfield.name %></h2>
           <ul>
@@ -34,12 +35,13 @@
           </ul>
 
           <!--<div>-->
-            <!--<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">-->
-              <!--<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>-->
-              <!--<div class="cl"></div>-->
-            <!--</ul>-->
+          <!--<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">-->
+          <!--<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>-->
+          <!--<div class="cl"></div>-->
+          <!--</ul>-->
           <!--</div>-->
         </div>
-      </div>
-    </div>
-<% end %>
+    <% end %>
+  </div>
+</div>
+

From 24f5e245df08958c73651fc7b248c8a3b15527a7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 12 Jun 2016 14:20:55 +0800
Subject: [PATCH 365/668] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E6=97=B6=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=845=E6=9D=A1?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        |  5 ++
 app/views/layouts/_logined_header.html.erb    | 14 ++--
 .../layouts/_show_messages_list.html.erb      | 79 ++++++++++++++++---
 3 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index b1e5456c5..e4f637b6d 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -49,6 +49,11 @@ class ExerciseController < ApplicationController
       return
     end
     @exercise = Exercise.find params[:id]
+    @exercise.course_messages.each do |message|
+      if User.current.id == message.user_id && message.viewed == 0
+        message.update_attributes(:viewed => true) if message.viewed == 0
+      end
+    end
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     exercise_end = @exercise.end_time > Time.now
     if @exercise.time == -1
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index a87e83238..7ba0a23be 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -84,9 +84,9 @@
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-    <!--<div class="shadowbox_news undis" id="user_messages_list">
-      <%#=render :partial => 'layouts/message_loading' %>
-    </div>-->
+    <div class="shadowbox_news undis" id="user_messages_list">
+      <%=render :partial => 'layouts/message_loading' %>
+    </div>
   </div>
 </div>
 
@@ -98,15 +98,15 @@
         $("#navHomepageSearchType").hide();
     });
 
-    /*$("#user_messages").mouseenter(function(){
+    $("#user_messages").mouseenter(function(){
         $("#user_messages_list").show();
-        $.get('<%#=user_messages_unviewed_users_path %>');
+        $.get('<%=user_messages_unviewed_users_path %>');
         $("#ajax-indicator").hide();
     }).mouseleave(function(){
         $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%#=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
 
-    });*/
+    });
 
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 27e1d8896..addd04815 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,7 +1,6 @@
 <font></font>
 <h4 class="shadowbox_news_title">未读消息</h4>
 <ul class="shadowbox_news_list">
-  <%# user_messages = User.current.user_messages_unviewed %>
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
       <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
@@ -60,15 +59,77 @@
               <% else %>
                   <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
               <% end %>
+          <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
+          <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
+          <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
+          <% elsif ma.course_message_type == "Course" %>
+              <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
+          <% elsif ma.course_message_type == "JoinCourseRequest" %>
+              <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
+              <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
+          <% elsif ma.course_message_type == "CourseRequestDealResult" %>
+              <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+              <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
+          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+              <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
+          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+              <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
+          <% elsif ma.course_message_type == "RemoveFromCourse" %>
+              <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
+          <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
+              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
+          <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
+              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
           <% end %>
-    <% end %>
+      <% elsif ma.class == ForgeMessage %>
+          <% if ma.forge_message_type == "AppliedProject" %>
+              <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "JoinProject" %>
+              <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "RemoveFromProject" %>
+              <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "RemoveFromProject" %>
+              <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
+          <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
+          <% elsif ma.forge_message_type == "Journal" %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
+          <% elsif ma.forge_message_type == "Message" %>
+              <li><a href="<%=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) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
+          <% elsif ma.forge_message_type == "News" %>
+              <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
+          <% elsif ma.forge_message_type == "Comment" %>
+              <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
+          <% end %>
+      <% elsif ma.class == MemoMessage %>
+          <% if ma.memo_type == "Memo" %>
+              <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
+          <% end %>
+      <% elsif ma.class == UserFeedbackMessage %>
+          <% if ma.journals_for_message_type == "JournalsForMessage" %>
+              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
+          <% end %>
+      <% elsif ma.class == OrgMessage %>
+          <% if ma.message_type == 'ApplySubdomain' %>
+              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
+          <% elsif ma.message_type == 'AgreeApplySubdomain' %>
+              <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+          <% end %>
+      <% elsif AtMessage === ma && ma.at_valid? %>
+          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+            <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+              <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+          <% else %>
+            <% href = ma.url %>
+          <% end %>
+          <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% end %>
   <% end %>
-  <!--<li><span class="shadowbox_news_user">教辅测试老师</span><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
--->
 </ul>
 <%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file

From 00528bec6058f935cce17f7736047830f8b88a68 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 12 Jun 2016 14:50:47 +0800
Subject: [PATCH 366/668] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=86=E7=8F=AD=E5=B0=B1=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=86=E7=8F=AD=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 40 +++++++++++----------
 public/stylesheets/public.css               |  2 ++
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index 747b37c03..720dfceea 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -24,8 +24,10 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><span class="fontGrey6 fb">姓名</span></li>
         <li  class="ml10" style="padding-right: 15px;"><span class="fontGrey6 fb">学号</span></li>
-        <li style="padding-right: 55px; margin-left: 160px;"><span class="fontGrey6 fb">分班</span></li>
-        <li class="st_list_score ml10">
+        <% unless @course.course_groups.empty? %>
+            <li style="padding-right: 55px; margin-left: 160px;"><span class="fontGrey6 fb">分班</span></li>
+        <% end %>
+        <li class="st_list_score <%= @course.course_groups.empty? ? 'ml250' : '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 => 'ml35'%>
           <% if @sort_type == "score" && @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
@@ -59,31 +61,33 @@
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
               <% end%>
             </ul>
-            <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
-                <% if @course.course_groups.nil? || @group %>
+            <% unless @course.course_groups.empty? %>
+                <% 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: 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: 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: 5px;"}) %>
+                        <% end %>
+                    <% end %>
+                <% else %>
                     <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: 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: 5px;"}) %>
-                    <% end %>
                 <% end %>
-            <% else %>
-                <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 %>
             <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
                     :action => 'show_member_score',
                     :member_id => member.id,
                     :remote => true},
-                        :class => 'st_list_score c_red' %>
+                        :class => "st_list_score c_red #{@course.course_groups.empty? ? 'ml130' : ''}" %>
             <%= link_to member.act_score.nil? ? 0 : member.act_score.to_s, {
                     :action => 'show_member_act_score',
                     :member_id => member.id,
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index f975b5a64..c98ec2a47 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -89,7 +89,9 @@ h4{ font-size:14px; }
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
 .ml125 { margin-left:125px;}
+.ml130 { margin-left:130px;}
 .ml200 {margin-left:200px;}
+.ml250 {margin-left:250px;}
 .ml320{ margin-left:320px;}
 .ml150 { margin-left:150px;}
 .mr-5 {margin-right:-5px;}

From b57f6fbc6589ee7317f1185047542638ac347286 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Sun, 12 Jun 2016 14:52:24 +0800
Subject: [PATCH 367/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0padding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb                       | 408 +----------------------------
 public/stylesheets/weui/weixin.css |   6 +-
 2 files changed, 9 insertions(+), 405 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 05a6f4e22..6091f33d8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
-  create_table "application_settings", :force => true do |t|
-    t.integer  "default_projects_limit"
-    t.boolean  "signup_enabled"
-    t.boolean  "signin_enabled"
-    t.boolean  "gravatar_enabled"
-    t.text     "sign_in_text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "home_page_url"
-    t.integer  "default_branch_protection",    :default => 2
-    t.boolean  "twitter_sharing_enabled",      :default => true
-    t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",        :default => true
-    t.integer  "max_attachment_size",          :default => 10,    :null => false
-    t.integer  "default_project_visibility"
-    t.integer  "default_snippet_visibility"
-    t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",      :default => true
-    t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",         :default => 10080, :null => false
-  end
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -178,20 +156,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.string  "typeName", :limit => 50
   end
 
-  create_table "audit_events", :force => true do |t|
-    t.integer  "author_id",   :null => false
-    t.string   "type",        :null => false
-    t.integer  "entity_id",   :null => false
-    t.string   "entity_type", :null => false
-    t.text     "details"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
-  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
-  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
-
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -289,17 +253,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
-  create_table "broadcast_messages", :force => true do |t|
-    t.text     "message",    :null => false
-    t.datetime "starts_at"
-    t.datetime "ends_at"
-    t.integer  "alert_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "color"
-    t.string   "font"
-  end
-
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -599,10 +552,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "visits",                        :default => 0
   end
 
-  add_index "courses", ["id"], :name => "id", :unique => true
-  add_index "courses", ["tea_id"], :name => "tea_id"
-  add_index "courses", ["visits"], :name => "visits"
-
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -664,15 +613,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "deploy_keys_projects", :force => true do |t|
-    t.integer  "deploy_key_id", :null => false
-    t.integer  "project_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
-
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -722,16 +662,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "created_at"
   end
 
-  create_table "emails", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.string   "email",      :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
-  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
-
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -754,25 +684,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
-  create_table "events", :force => true do |t|
-    t.string   "target_type"
-    t.integer  "target_id"
-    t.string   "title"
-    t.text     "data"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "action"
-    t.integer  "author_id"
-  end
-
-  add_index "events", ["action"], :name => "index_events_on_action"
-  add_index "events", ["author_id"], :name => "index_events_on_author_id"
-  add_index "events", ["created_at"], :name => "index_events_on_created_at"
-  add_index "events", ["project_id"], :name => "index_events_on_project_id"
-  add_index "events", ["target_id"], :name => "index_events_on_target_id"
-  add_index "events", ["target_type"], :name => "index_events_on_target_type"
-
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -875,15 +786,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
-  create_table "forked_project_links", :force => true do |t|
-    t.integer  "forked_to_project_id",   :null => false
-    t.integer  "forked_from_project_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
-
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -1013,17 +915,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "identities", :force => true do |t|
-    t.string   "extern_uid"
-    t.string   "provider"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
-  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
-
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1167,20 +1058,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "private",                     :default => 0
   end
 
-  create_table "keys", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "key"
-    t.string   "title"
-    t.string   "type"
-    t.string   "fingerprint"
-    t.boolean  "public",      :default => false, :null => false
-  end
-
-  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
-  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
-
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1192,27 +1069,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "owner_type", :default => 0
   end
 
-  create_table "label_links", :force => true do |t|
-    t.integer  "label_id"
-    t.integer  "target_id"
-    t.string   "target_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
-  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
-
-  create_table "labels", :force => true do |t|
-    t.string   "title"
-    t.string   "color"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
-
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1263,47 +1119,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "viewed_count",  :default => 0
   end
 
-  create_table "merge_request_diffs", :force => true do |t|
-    t.string   "state"
-    t.text     "st_commits",       :limit => 2147483647
-    t.text     "st_diffs",         :limit => 2147483647
-    t.integer  "merge_request_id",                       :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
-
-  create_table "merge_requests", :force => true do |t|
-    t.string   "target_branch",                    :null => false
-    t.string   "source_branch",                    :null => false
-    t.integer  "source_project_id",                :null => false
-    t.integer  "author_id"
-    t.integer  "assignee_id"
-    t.string   "title"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "milestone_id"
-    t.string   "state"
-    t.string   "merge_status"
-    t.integer  "target_project_id",                :null => false
-    t.integer  "iid"
-    t.text     "description"
-    t.integer  "position",          :default => 0
-    t.datetime "locked_at"
-  end
-
-  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
-  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
-  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
-  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
-  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
-  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
-  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
-  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
-  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
-  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
-
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1338,39 +1153,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
-  create_table "milestones", :force => true do |t|
-    t.string   "title",       :null => false
-    t.integer  "project_id",  :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.integer  "iid"
-  end
-
-  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
-  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
-  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
-  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
-
-  create_table "namespaces", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.string   "path",                        :null => false
-    t.integer  "owner_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type"
-    t.string   "description", :default => "", :null => false
-    t.string   "avatar"
-  end
-
-  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
-  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
-  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
-  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
-  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
-
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1396,31 +1178,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "notes", :force => true do |t|
-    t.text     "note"
-    t.string   "noteable_type"
-    t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "project_id"
-    t.string   "attachment"
-    t.string   "line_code"
-    t.string   "commit_id"
-    t.integer  "noteable_id"
-    t.boolean  "system",                              :default => false, :null => false
-    t.text     "st_diff",       :limit => 2147483647
-  end
-
-  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
-  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
-  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
-  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
-  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
-  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
-  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
-  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
-  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
-
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1430,49 +1187,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.text     "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
-
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
-
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.string   "uid",                          :null => false
-    t.string   "secret",                       :null => false
-    t.text     "redirect_uri",                 :null => false
-    t.string   "scopes",       :default => "", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
-
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1630,23 +1344,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "allow_teacher",        :default => 0
   end
 
-  create_table "permissions", :force => true do |t|
-    t.string  "controller",   :limit => 30, :default => "",    :null => false
-    t.string  "action",       :limit => 30, :default => "",    :null => false
-    t.string  "description",  :limit => 60, :default => "",    :null => false
-    t.boolean "is_public",                  :default => false, :null => false
-    t.integer "sort",                       :default => 0,     :null => false
-    t.boolean "mail_option",                :default => false, :null => false
-    t.boolean "mail_enabled",               :default => false, :null => false
-  end
-
-  create_table "permissions_roles", :id => false, :force => true do |t|
-    t.integer "permission_id", :default => 0, :null => false
-    t.integer "role_id",       :default => 0, :null => false
-  end
-
-  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
-
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1729,11 +1426,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "project_import_data", :force => true do |t|
-    t.integer "project_id"
-    t.text    "data"
-  end
-
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1824,16 +1516,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
-  create_table "protected_branches", :force => true do |t|
-    t.integer  "project_id",                             :null => false
-    t.string   "name",                                   :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "developers_can_push", :default => false, :null => false
-  end
-
-  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
-
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1968,25 +1650,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
-  create_table "services", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",                :default => false, :null => false
-    t.text     "properties"
-    t.boolean  "template",              :default => false
-    t.boolean  "push_events",           :default => true
-    t.boolean  "issues_events",         :default => true
-    t.boolean  "merge_requests_events", :default => true
-    t.boolean  "tag_push_events",       :default => true
-    t.boolean  "note_events",           :default => true,  :null => false
-  end
-
-  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
-  add_index "services", ["project_id"], :name => "index_services_on_project_id"
-
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -2025,26 +1688,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",     :null => false
   end
 
-  create_table "snippets", :force => true do |t|
-    t.string   "title"
-    t.text     "content",          :limit => 2147483647
-    t.integer  "author_id",                                             :null => false
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "file_name"
-    t.datetime "expires_at"
-    t.string   "type"
-    t.integer  "visibility_level",                       :default => 0, :null => false
-  end
-
-  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
-  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
-  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
-  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
-  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
-  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2117,9 +1760,9 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
-    t.float    "work_score"
     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"
@@ -2167,13 +1810,13 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority"
+    t.integer  "priority",        :default => 0
     t.string   "name"
     t.string   "field_type"
-    t.integer  "hide"
-    t.integer  "status"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    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|
@@ -2183,17 +1826,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",      :null => false
   end
 
-  create_table "subscriptions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "subscribable_id"
-    t.string   "subscribable_type"
-    t.boolean  "subscribed"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
-
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2434,17 +2066,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
-  create_table "users_star_projects", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
-  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
-  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
-
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2496,23 +2117,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "web_hooks", :force => true do |t|
-    t.string   "url"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",                  :default => "ProjectHook"
-    t.integer  "service_id"
-    t.boolean  "push_events",           :default => true,          :null => false
-    t.boolean  "issues_events",         :default => false,         :null => false
-    t.boolean  "merge_requests_events", :default => false,         :null => false
-    t.boolean  "tag_push_events",       :default => false
-    t.boolean  "note_events",           :default => false,         :null => false
-  end
-
-  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
-  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
-
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 5882b04e0..dc8b5bdf1 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -71,9 +71,9 @@ a.underline {text-decoration:underline;}
 .post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;}
 .post-reply-content img {max-width:100%;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
-.post-input-container {padding-right:2px;}
-.copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
-.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:auto; resize:none;}
+.post-input-container {padding-right:12px;}
+.copy-input {width:100%; height:28px; line-height:28px; padding:0 5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-9999em;}
+.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; vertical-align: middle; font-size:12px; border:1px solid #e6e6e6; outline:none; padding:0 5px; margin:0; border-radius:3px; overflow-y:auto; resize:none;}
 .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
 .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}

From 9d36c74d7f078c89d439a3bd8bed6a2cebd406b4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 12 Jun 2016 14:59:00 +0800
Subject: [PATCH 368/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb        | 2 +-
 app/views/users/_homework_replies.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index fa084e349..22b7f1f52 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -106,7 +106,7 @@ class WordsController < ApplicationController
       elsif @journal_destroyed.jour_type == 'HomeworkCommon'
         @homework = HomeworkCommon.find @journal_destroyed.jour_id
         if params[:user_activity_id]
-          @user_activity_id = params[:user_activity_id]
+          @user_activity_id = params[:user_activity_id].to_i
         else
           @user_activity_id = -1
         end
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
index de6e96ae3..7f4dc379b 100644
--- a/app/views/users/_homework_replies.html.erb
+++ b/app/views/users/_homework_replies.html.erb
@@ -63,7 +63,7 @@
                     </span>
                     <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
                   <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => course_activity},
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
                                     :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
                     <% end %>
                 </span>

From c9021eb70facc806d6379c9d38462237e8bae99f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 12 Jun 2016 15:01:28 +0800
Subject: [PATCH 369/668] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E4=BB=8E=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 857f98afc..9e785c562 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -360,7 +360,7 @@ update
       # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       # REDO:需优化，仅测试用
-      @zip_path = gitlab_address.to_s + "/api/v3/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=YTyCv4978MXmdL2B9C62"
+      @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else

From cbc4f2f6fd15822dc40ebec8309a9a0cb326d666 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 12 Jun 2016 15:05:45 +0800
Subject: [PATCH 370/668] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb |  5 ++--
 config/menu.yml                            | 28 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index ba15f97f0..3d61d8fcf 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -6,14 +6,15 @@
   <meta charset='utf-8' />
   <meta name="keywords" content="" />
   <meta name="description" content="" />
-  <meta name="apple-mobile-web-app-capable" content="no">
+  <meta name="apple-mobile-web-app-capable" content="no" />
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+
   <script type="text/javascript">
     window.g_openid = '<%= @wechat_user.openid %>';
   </script>
+
 </head>
 <body>
 <div ng-view>
diff --git a/config/menu.yml b/config/menu.yml
index 712d2dd79..c2579d8e6 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -4,17 +4,33 @@ button:
   name: "我的动态"
   url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
-  type: "click"
-  name: "意见反馈"
-  key:  "FEEDBACK"
+  name: "我的课程"
+  sub_button:
+  -
+    type: "view"
+    name: "课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  -
+    type: "view"
+    name: "资源"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+
  -
   name: "更多"
   sub_button:
   -
     type: "view"
-    name: "进入网站"
+    name: "加入班级"
     url:  "https://www.trustie.net/"
   -
     type: "view"
-    name: "使用手册"
-    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    name: "点名"
+    url:  "https://www.trustie.net/organizations/1/downloads"
+  -
+    type: "click"
+    name: "反馈"
+    key:  "FEEDBACK"
+  -
+    type: "view"
+    name: "历史推文"
+    url:  "http://mp.weixin.qq.com/mp/getmasssendmsg?__biz=MzIwOTM2NDkxMA==#wechat_webview_type=1&wechat_redirect"

From 0e63a3a24c335b6bd90cbb3caaae7d55178629df Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Sun, 12 Jun 2016 15:37:52 +0800
Subject: [PATCH 371/668] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index dc8b5bdf1..6cccb3615 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -56,7 +56,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; line-height:18px; height:95px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,

From 9d3bb44682da7e85a43bbea6640e15210eb53427 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 12 Jun 2016 16:04:26 +0800
Subject: [PATCH 372/668] =?UTF-8?q?=E7=AE=80=E6=B4=81=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 1ab51b3af..ebf3f5445 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -75,7 +75,7 @@
         <div class="orgRow mb10 mt5">
           <span style="margin-left:10px;" >显示模式&nbsp;: </span>
           <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" <%= @organization.show_mode == 0 ? "checked" : "" %> />
-          <label for="show_mode_ordinary">简介模式</label>
+          <label for="show_mode_ordinary">简洁模式</label>
           <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" <%= @organization.show_mode == 1 ? "checked" : "" %> />
           <label for="show_mode_special">门户模式</label>
         </div>

From d4d4e38c4153165bb6e2783968163eed2af023f1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 12 Jun 2016 16:48:35 +0800
Subject: [PATCH 373/668] =?UTF-8?q?=E9=97=A8=E6=88=B7=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=AD=E5=90=AB=E6=9C=89=E4=B8=89=E7=BA=A7=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E5=9B=BE=E5=83=8Fhttps=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/views/organizations/_org_custom_header.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 91ca5aafb..c7aca1e6a 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,3 +1,4 @@
+
 <div class="por_header_top">
   <div class="por_header_con" >
     <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
@@ -5,7 +6,7 @@
         <div class="navHomepageProfile" id="navHomepageProfile">
           <ul>
             <li class="homepageProfileMenuIcon fr mt15" id="homepageProfileMenuIcon">
-              <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+              <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_url_in_org(User.current.id) %>
               <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
                 <li><%= link_to "修改资料", my_account_path, :class => "menuGrey"%></li>
                 <li><%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%></li>

From 02e2831980ee7b2d9db591adb61af7bad346f83f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 12 Jun 2016 17:17:37 +0800
Subject: [PATCH 374/668] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=95=99=E8=A8=80=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/leave_messages.html.erb   | 6 +++---
 app/views/users/_user_jours_list.html.erb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/leave_messages.html.erb b/app/views/admin/leave_messages.html.erb
index dee8b7443..986823faa 100644
--- a/app/views/admin/leave_messages.html.erb
+++ b/app/views/admin/leave_messages.html.erb
@@ -59,12 +59,12 @@
           <td class="center">
             <%= format_date(journal.created_on) %>
           </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=journal.notes %>'>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=strip_html(journal.notes) %>'>
             <%case journal.jour_type %>
             <% when 'Principal' %>
-                <%= link_to(journal.notes.html_safe, feedback_path(journal.jour_id)) %>
+                <%= link_to(strip_html(journal.notes), feedback_path(journal.jour_id)) %>
             <% when 'Course' %>
-                <%= link_to(journal.notes.html_safe, course_feedback_path(journal.jour_id)) %>
+                <%= link_to(strip_html(journal.notes), course_feedback_path(journal.jour_id)) %>
             <% end %>
           </td>
           <td class="center">
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index afd498d06..6211aac7d 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -5,7 +5,7 @@
 
 <%if jours %>
     <% jours.each do |jour|%>
-        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
+        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id && !User.current.admin?)) %>
             <script type="text/javascript">
                 $(function(){
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");

From 1cb63055cbc29aff276a10d51f59c7f707236cec Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 12 Jun 2016 17:18:05 +0800
Subject: [PATCH 375/668] =?UTF-8?q?api=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?openid=E6=9D=A5=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb             | 14 ++++++++++----
 app/api/mobile/apis/activities.rb |  4 +++-
 app/api/mobile/apis/courses.rb    |  1 -
 config/wechat.yml                 |  8 ++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index 23014b0c1..f3f0cf935 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -29,16 +29,22 @@ module Mobile
       end
 
       def authenticate!
-        raise('Unauthorized. Invalid or expired token.') unless current_user
+        raise('Unauthorized. 用户认证失败.') unless current_user
       end
 
       def current_user
+        openid = params[:openid]
+        if openid
+          uw = UserWechat.find_by_openid(params[:openid])
+          return uw.user if uw
+        end
+
         token = ApiKey.where(access_token: params[:token]).first
         if token && !token.expired?
-          @current_user = User.find(token.user_id)
-        else
-          nil
+          return User.find(token.user_id)
         end
+
+        nil
       end
     end
 
diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index af17e0f44..49fdaff8f 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -12,7 +12,9 @@ module Mobile
           requires :openid, type: String
         end
         post do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+
+          user = current_user
 
           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)
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 591a4e288..3a36a9e37 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -97,7 +97,6 @@ module Mobile
 
         desc "加入课程"
         params do
-          requires :token, type: String
           requires :course_password, type: String
         end
         post ":id" do
diff --git a/config/wechat.yml b/config/wechat.yml
index cf0703e81..cf5be1f2b 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -5,11 +5,11 @@ default: &default
 # Or if using public account, only need above two line
 
   # guange test
-  appid: "wxf694495398c7d470"
-  secret: "743e038392f1d89540e95f8f7645849a"
+  #appid: "wxf694495398c7d470"
+  #secret: "743e038392f1d89540e95f8f7645849a"
 
-  #appid: "wx8e1ab05163a28e37"
-  #secret: "beb4d3bc4b32b3557811680835357841"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
   access_token: "1234567"

From 0a82de1cf40bba0f2a703db3c3ff73cb8bf76c9b Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 12 Jun 2016 17:25:47 +0800
Subject: [PATCH 376/668] =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index f3f0cf935..c86a36d05 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -1,3 +1,5 @@
+#coding=utf-8
+
 module Mobile
   require_relative 'middleware/error_handler'
   require_relative 'apis/auth'

From f2903ae90325e489ba70376f0449ef6a0b149835 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 13 Jun 2016 09:45:11 +0800
Subject: [PATCH 377/668] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E8=B7=B3=E5=85=A5=E8=AF=A5=E8=B4=B4?=
 =?UTF-8?q?=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/create.js.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index be99d724a..aae5122e4 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,6 +1,7 @@
 <%if @save_flag%>
-$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-$('#reorder_time').click();
+//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+//$('#reorder_time').click();
+    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
  $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>
\ No newline at end of file

From 3a8a61e4048d263012669c7215934a5d6ab6c9e7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 13 Jun 2016 11:10:28 +0800
Subject: [PATCH 378/668] =?UTF-8?q?=E5=9C=A8=E7=B2=BE=E5=93=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=B2=BE=E5=93=81=E2=80=9D=E5=88=97=E3=80=81=E5=9C=A8?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F=E2=80=9D?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb           | 27 ++++++++++++++++---
 app/views/admin/_course_detail_tr.html.erb    |  3 +++
 .../admin/excellent_all_courses.html.erb      |  9 ++++---
 app/views/admin/excellent_courses.html.erb    | 11 +++++---
 config/routes.rb                              |  1 +
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d3f681a06..4014a91bd 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -67,12 +67,15 @@ class AdminController < ApplicationController
   def excellent_all_courses
     name = params[:name]
     @order = ""
-    if params[:order] == 'asc'
-      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) asc, c.id desc")
+    @sort = ""
+    if params[:sort] && (params[:order]  == 'act')
+      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) #{params[:sort]}, c.id desc")
       @order = params[:order]
-    elsif params[:order] == 'desc'
-      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) DESC, c.id desc")
+      @sort = params[:sort]
+    elsif params[:sort] && (params[:order]  == 'time')
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]},id desc")
       @order = params[:order]
+      @sort = params[:sort]
     else
       courses = Course.like(name).order('created_at desc')
     end
@@ -99,6 +102,22 @@ class AdminController < ApplicationController
     end
   end
 
+  #取消精品
+  def cancel_excellent_course
+    @course = Course.find params[:id]
+    unless @course.nil?
+      if @course.is_excellent == 1 || @course.excellent_option == 1
+        @course.update_column('is_excellent', 0)
+        @course.update_column('excellent_option', 0)
+      end
+    end
+    respond_to do |format|
+      format.html{
+        redirect_to excellent_courses_url
+      }
+    end
+  end
+
  #管理员界面课程资源列表
   def course_resource_list
 
diff --git a/app/views/admin/_course_detail_tr.html.erb b/app/views/admin/_course_detail_tr.html.erb
index ca15a6696..bea14fd3d 100644
--- a/app/views/admin/_course_detail_tr.html.erb
+++ b/app/views/admin/_course_detail_tr.html.erb
@@ -27,6 +27,9 @@
   <td class="center">
     <%= course.course_activities.count%>
   </td>
+  <td class="center">
+    <%= course.time %>
+  </td>
   <td class="buttons">
     <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'set_excellent_course', :id => course.id },:remote=>true, :class => 'icon-del') %>
   </td>
diff --git a/app/views/admin/excellent_all_courses.html.erb b/app/views/admin/excellent_all_courses.html.erb
index 86e4556f9..eb5f8c1a2 100644
--- a/app/views/admin/excellent_all_courses.html.erb
+++ b/app/views/admin/excellent_all_courses.html.erb
@@ -45,11 +45,14 @@
       <th style="width: 25px;">
         资源数
       </th>
-      <th style="width: 50px;">
+      <th style="width: 30px;">
         帖子数
       </th>
-      <th style="width: 50px;" class = "<%= @order == 'desc' ? 'st_up' : (@order == 'asc' ? 'st_down' : '') %>">
-        <%=link_to '动态数', excellent_all_courses_path(:order=> @order == "desc" ? 'asc' : 'desc') %>
+      <th style="width: 30px;" class = "<%= @order == 'act' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%=link_to '动态数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'act') %>
+      </th>
+      <th style="width: 40px;" class = "<%= @order == 'time' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%=link_to '开课学期', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'time') %>
       </th>
       <th style="width: 40px;">
       </tr>
diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb
index fef6da84d..c107713a0 100644
--- a/app/views/admin/excellent_courses.html.erb
+++ b/app/views/admin/excellent_courses.html.erb
@@ -2,7 +2,7 @@
 <h3>
   <%=l(:label_excellent_courses_list)%>
 </h3>
-<%= render 'tab_excellent_courses' %>
+<%= render 'admin/tab_excellent_courses' %>
 
 <h3>
   <%=l(:label_excellent_courses_list)%>
@@ -33,12 +33,14 @@
       <th style="width: 25px;">
         资源数
       </th>
-      <th style="width: 70px;">
+      <th style="width: 50px;">
         帖子数
       </th>
-      <th style="width: 70px;">
+      <th style="width: 50px;">
         动态数
       </th>
+      <th style="width: 40px;">
+    </tr>
     </tr>
     </thead>
     <tbody>
@@ -74,6 +76,9 @@
           <td class="center">
             <%= course.course_activities.count%>
           </td>
+          <td class="buttons">
+            <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'cancel_excellent_course', :id => course.id }, :class => 'icon-del') %>
+          </td>
         </tr>
     <% end %>
     </tbody>
diff --git a/config/routes.rb b/config/routes.rb
index e4b462d93..91ab5cffe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1019,6 +1019,7 @@ RedmineApp::Application.routes.draw do
   get 'admin/excellent_courses', as: :excellent_courses
   get 'admin/excellent_all_courses', as: :excellent_all_courses
   match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
+  match 'admin/cancel_excellent_course/:id', :to => 'admin#cancel_excellent_course'
   get 'admin/course_resource_list'
   get 'admin/project_resource_list'
   match 'admin/users',  :via => :get

From e86419c28bfa4bbff08a6f9cc1769ea95026aa43 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 13 Jun 2016 13:35:01 +0800
Subject: [PATCH 379/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E6=A0=8F=E7=9B=AE=E7=B1=BB=E5=9E=8B=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=B8=96=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb | 5 +++--
 app/views/org_subfields/create.js.erb       | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 159648f34..38f5879e5 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -14,9 +14,10 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      @subfield.update_attributes(:field_type => params[:field_type])
+      #默认类型为帖子
+      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type])
+      update_status_by_type(@subfield, params[:field_type]||"Post")
     else
       @res = false
     end
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 952ed7b2c..a65f53719 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,6 +4,8 @@
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+    //默认选中第一个
+    $("input[name='field_type']").get(0).checked=true;
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");
\ No newline at end of file

From 6c7237509d8a3bc447d8a443c2339f156923292e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 13 Jun 2016 14:08:30 +0800
Subject: [PATCH 380/668] =?UTF-8?q?=E2=80=9C=E5=BD=93=E5=89=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E6=9C=AA=E8=BF=9B=E8=A1=8C=E8=AF=84=E5=88=86=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A1=AE=E5=AE=9A=E6=8F=90=E4=BA=A4=E2=80=9D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=82=A8=E5=BD=93=E6=AC=A1=E8=AF=84?=
 =?UTF-8?q?=E9=98=85=E6=9C=AA=E5=AF=B9=E4=BD=9C=E5=93=81=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=EF=BC=8C=E5=88=86=E6=95=B0=E5=B0=86=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E7=9A=84=E8=AF=84=E5=88=86=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E6=B2=A1=E6=9C=89=E8=AF=84=E5=88=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=99=E4=B8=8D=E8=AF=84=E5=88=86=EF=BC=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=A1=AE=E5=AE=9A=E6=8F=90=E4=BA=A4=EF=BC=9F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_no_teacher_score_notice.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb
index 5a8c768cc..0926e3c74 100644
--- a/app/views/student_work/_no_teacher_score_notice.html.erb
+++ b/app/views/student_work/_no_teacher_score_notice.html.erb
@@ -1,7 +1,8 @@
 <div id="popbox02">
   <div class="ni_con">
     <p>
-      当前作品未进行评分，是否确定提交？
+      <%#A if work.teacher_score.nil? || work. %>
+      您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？
     </p>
     <div class="ni_btn">
       <a href="javascript:" class="tijiao" onclick="submit_teacher_score(<%=work.id %>);" style="margin-bottom: 20px;" >

From 0c25e3b13d8026f8179e025ca66ee7dde3377cbf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 13 Jun 2016 15:21:29 +0800
Subject: [PATCH 381/668] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=88=86=E6=9E=90=20ssh=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +
 app/controllers/repositories_controller.rb    | 44 ++++++++++++++++++-
 .../repositories/quality_analyses.html.erb    |  1 +
 app/views/repositories/show.html.erb          |  1 +
 config/routes.rb                              |  2 +
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 app/views/repositories/quality_analyses.html.erb

diff --git a/Gemfile b/Gemfile
index d392c6561..789c2011e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,8 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
+gem 'net-ssh'
+
 gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 857f98afc..b2bf7b42d 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -30,11 +30,11 @@ class RepositoriesController < ApplicationController
   menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
   default_search_scope :changesets
 
-  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats]
+  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats, :quality_analyses]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analyses]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -43,6 +43,7 @@ class RepositoriesController < ApplicationController
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
   $g=Gitlab.client
+  require 'net/ssh'
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -306,6 +307,27 @@ update
     end
   end
 
+  def quality_analyses
+    host = "192.168.0.200"
+    port = "1125"
+    username = "git"
+    password = "123123"
+    ##显示文件和系统版本
+    server_cmd1 = 'll'
+    server_cmd2 = 'cat /etc/issue'
+    # 连接到远程主机 foobar
+    ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
+      result = ssh.exec!(server_cmd1)
+      logger.error("#################")
+      puts result
+      result = ssh.exec!(server_cmd2)
+      puts result
+    end
+    respond_to do |format|
+      format.html
+    end
+  end
+
   def destroy
     DestroyRepositoryTask.new.destroy(User.current.id, @repository.id)
     @repository.hidden = true
@@ -557,6 +579,24 @@ update
       render 404
       return
     end
+    host = "http://192.168.0.200:8893"
+    username = "git"
+    password = "123123"
+
+##显示文件和系统版本
+    server_cmd1 = 'ls -l'
+    server_cmd2 = 'cat /etc/issue'
+
+
+# 连接到远程主机 foobar
+    ssh = Net::SSH.start(host, username, :password => password) do |ssh|
+      result = ssh.exec!(server_cmd1)
+      puts result
+      result = ssh.exec!(server_cmd2)
+      puts result
+    end
+
+
     project_id = @project.gpid
     # @repository_id = @repository.identifier
     # creator = params[:creator]
diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
new file mode 100644
index 000000000..30d74d258
--- /dev/null
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..bbcb48bdf 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,6 +2,7 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
+  <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier) %>
 
 </div>
 <div class="repository_con" style="line-height:1.9;">
diff --git a/config/routes.rb b/config/routes.rb
index e4b462d93..438925878 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -902,6 +902,7 @@ RedmineApp::Application.routes.draw do
 
   # repositories routes
   get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats', :as => "stats_repository_project"
+  get 'projects/:id/repository/:repository_id/quality_analyses', :to => 'repositories#quality_analyses', :as => "quality_analyses"
   get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
 
   get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))', :to => 'repositories#changes'
@@ -920,6 +921,7 @@ RedmineApp::Application.routes.draw do
       }
 
   get 'projects/:id/repository/statistics', :to => 'repositories#stats'
+
   get 'projects/:id/repository/graph', :to => 'repositories#graph'
 
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'

From 8bbdf3688cb91ebe8aad41f942d66a305915bac0 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Mon, 13 Jun 2016 15:25:26 +0800
Subject: [PATCH 382/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7css=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 48 ++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 6cccb3615..4c7439308 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -3,7 +3,7 @@
 
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+body, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
 .text-control {word-break:normal; word-wrap:break-word;}
@@ -12,10 +12,12 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
 .mt2 {margin-top:2px;}
+.mt4 {margin-top:4px;}
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
+.mb20 {margin-bottom:20px;}
 .ml10 {margin-left:10px;}
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
@@ -29,12 +31,15 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .c-grey {color:#9a9a9a;}
 .c-grey2 {color:#707070;}
 .c-grey3 {color:#555555;}
+.c-grey4 {color:#888888;}
+.c-blue {color:#3b94d6;}
 a {color:#707070;}
 a.c-grey {color:#707070;}
 a.c-grey2 {color:#9a9a9a;}
 a:link,a:visited{text-decoration:none;}
 a:hover,a:active{cursor:pointer;}
 a.link-blue {color:#269ac9;}
+a.link-blue2 {color:#3b94d6;}
 a.underline {text-decoration:underline;}
 .border-radius {border-radius:5px;}
 .w36 {width:36px;}
@@ -42,9 +47,14 @@ a.underline {text-decoration:underline;}
 .max-width-130 {max-width:130px;}
 .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .inline-block {display:inline-block;}
+.dis {display:block;}
 .undis {display:none;}
 .text-nowrap {white-space:nowrap;}
 .v-top {vertical-align:top;}
+.tac {text-align:center;}
+
+/*背景色*/
+.bg-grey {background-color:#c1c1c1;}
 
 /*动态样式*/
 .post-container {width:100%;}
@@ -88,4 +98,38 @@ a.underline {text-decoration:underline;}
 /*帖子锁定样式*/
 .locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
 
-.bg-grey {background-color:#c1c1c1;}
+/*20150612加入班级样式*/
+.add-class-box {width:80%; max-width:300px; min-width:240px; height:150px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; margin-top:100px;}
+.add-class-tip {padding-top:20px; padding-bottom:20px;}
+.class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
+.cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.slice {width:2%; text-align:center; border-top:1px solid #ccc;}
+.slice-line {width:1px; height:37px; margin:auto; background:#ccc;}
+
+/*20160613邀请码样式*/
+.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
+.qr-code-box {width:225px; height:332px; background-color:#fff; border-radius:3px; margin:0 auto;}
+.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
+.qr-code-img {margin:36px auto; display:block;}
+.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}
+.share-code-wrap {width:100%; background-color:#efeff4;}
+.share-code-btn {width:145px; height:40px; color:#fff; font-size:15px; line-height:40px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:0 auto;}
+
+/*20160613班级详情*/
+.class-detail-name {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;}
+.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
+.class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-tab-active {border-bottom:1px solid #3b94d6;}
+.class-search-wrap {padding:8px 12px; position:relative;}
+.class-search-inner {padding:0 30px; background-color:#fff;}
+.class-search-icon {position:absolute; top:16px; left:16px;}
+.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
+.border-top {border-top:1px solid #ccc;}
+.class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
+.img-circle {border-radius:50%;}
\ No newline at end of file

From 44c9265fee20616107f9a484e6e77ee253929eda Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 13 Jun 2016 15:29:15 +0800
Subject: [PATCH 383/668] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=AA=E6=80=A7=E7=AD=BE=E5=90=8D=E5=A2=9E=E5=8A=A0=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

---
 .../layouts/_user_brief_introduction.html.erb      | 14 ++++++++------
 app/views/layouts/new_base_user.html.erb           |  7 ++++---
 app/views/users/edit_brief_introduction.js.erb     |  3 ++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb
index 3b0500fed..4b2645129 100644
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@@ -1,8 +1,10 @@
-<% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
-    <%= user.user_extensions.brief_introduction %>&nbsp;
-<% else%>
-    这位童鞋很懒，什么也没有留下～&nbsp;
-<% end %>
+<span>
+    <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
+        <%= user.user_extensions.brief_introduction %>
+    <% else%>
+        这位童鞋很懒，什么也没有留下～
+    <% end %>
+</span>
 <% if User.current == user%>
     <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
-<% end%>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index e43aa499f..d67b2d3f3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -139,9 +139,9 @@
 
         <div>
           <div class="homepageSignature break_word">
-            <p id="user_brief_introduction_show">
-              <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
-            </p>
+            <div id="user_brief_introduction_show">
+                <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
+            </div>
           </div>
           <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
         </div>
@@ -349,6 +349,7 @@
     $(function(){
         $('#user_hide_course').hide();
         $('#user_hide_project').hide();
+        autoUrl("user_brief_introduction_show");
     });
 
     $("#courseMenu").mouseenter(function(){
diff --git a/app/views/users/edit_brief_introduction.js.erb b/app/views/users/edit_brief_introduction.js.erb
index c64482715..eeaec4e6d 100644
--- a/app/views/users/edit_brief_introduction.js.erb
+++ b/app/views/users/edit_brief_introduction.js.erb
@@ -1,3 +1,4 @@
 $("#user_brief_introduction_show").html("<%= escape_javascript render(:partial => "layouts/user_brief_introduction", :locals => {:user => @user}) %>");
 $("#user_brief_introduction_show").show();
-$("#user_brief_introduction_edit").hide();
\ No newline at end of file
+$("#user_brief_introduction_edit").hide();
+autoUrl("user_brief_introduction_show");

From 962470c5826e91e47e59dd055df5449f819f8042 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Mon, 13 Jun 2016 17:23:35 +0800
Subject: [PATCH 384/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 4 ++--
 public/stylesheets/weui/weixin.css   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 69ea8f1fa..2ab2e2d61 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -20,7 +20,7 @@
                   <div class="cl"></div>
                   <div class="post-title mt5 mb5 hidden"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
-                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
                     <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
                   </div>
@@ -127,7 +127,7 @@
                   <div class="cl"></div>
                   <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                   <div class="post-content c-grey3">
-                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
                     <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
                   </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 4c7439308..cc4db7e17 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -66,7 +66,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:95px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,

From a2450defc67252920bf39984187c23e3cc2e7f40 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Mon, 13 Jun 2016 17:32:51 +0800
Subject: [PATCH 385/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=B1=BB=E5=88=AB=E6=96=87=E5=AD=97=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/homework_detail.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 0fc39c735..4de1c7b37 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -18,9 +18,9 @@
                     </tr>
                     <tr>
                         <td class="text-nowrap v-top">类&nbsp;&nbsp;&nbsp;别：</td>
-                        <td><span ng-if="homework.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
-                            <span ng-if="homework.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
-                            <span ng-if="homework.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
+                        <td><span ng-if="homework.homework_type == 1">普通作业</span>
+                            <span ng-if="homework.homework_type == 2">编程作业</span>
+                            <span ng-if="homework.homework_type == 3">分组作业</span>
                         </td>
                     </tr>
                 </table>

From 9029fd91e0148cf8f1edd13929836d01556c96c2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 14 Jun 2016 09:57:29 +0800
Subject: [PATCH 386/668] =?UTF-8?q?rails=20=E4=BB=A3=E7=A0=81=E4=B8=AD?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8shell=E5=91=BD=E4=BB=A4=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 36 +++++++---------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index b2bf7b42d..555b46051 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -313,18 +313,22 @@ update
     username = "git"
     password = "123123"
     ##显示文件和系统版本
-    server_cmd1 = 'll'
-    server_cmd2 = 'cat /etc/issue'
+    user_name = User.find(@project.user_id).try(:login)
+    rep_name = params[:repository_id]
+    server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name
     # 连接到远程主机 foobar
     ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
       result = ssh.exec!(server_cmd1)
-      logger.error("#################")
-      puts result
-      result = ssh.exec!(server_cmd2)
-      puts result
+      path = "/home/git/repo/" + user_name + "/" + rep_name
+      # sonar 分析
+      # server_cmd2
+      # 删除clone的版本库
+      # server_cmd3
     end
     respond_to do |format|
-      format.html
+      format.html{
+        render :layout => "base_projects"
+      }
     end
   end
 
@@ -579,24 +583,6 @@ update
       render 404
       return
     end
-    host = "http://192.168.0.200:8893"
-    username = "git"
-    password = "123123"
-
-##显示文件和系统版本
-    server_cmd1 = 'ls -l'
-    server_cmd2 = 'cat /etc/issue'
-
-
-# 连接到远程主机 foobar
-    ssh = Net::SSH.start(host, username, :password => password) do |ssh|
-      result = ssh.exec!(server_cmd1)
-      puts result
-      result = ssh.exec!(server_cmd2)
-      puts result
-    end
-
-
     project_id = @project.gpid
     # @repository_id = @repository.identifier
     # creator = params[:creator]

From c6bd5e6d311c5626975dcdd75d2f4a31e8a90553 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 14 Jun 2016 09:57:53 +0800
Subject: [PATCH 387/668] =?UTF-8?q?=E9=A5=BC=E7=8A=B6=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/quality_analyses.html.erb    | 77 ++++++++++++++++++-
 config/locales/en.yml                         |  1 +
 config/locales/zh.yml                         |  1 +
 3 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
index 30d74d258..69dae2629 100644
--- a/app/views/repositories/quality_analyses.html.erb
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -1 +1,76 @@
-test
\ No newline at end of file
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_quality_analyses) %></h2>
+</div>
+
+<div class="repository_con " style="line-height:1.9;">
+  <%#= render :partial => 'navigation' %>
+  <div class="cl"></div>
+</div>
+
+<div id = "container">
+</div>
+<div id = "container_quality" class="mt30">
+</div>
+
+<script>
+    $(function () {
+        $('#container').highcharts({
+            chart: {
+                type: 'pie',
+                options3d: {
+                    enabled: true,
+                    alpha: 45,
+                    beta: 0
+                }
+            },
+            title: {
+                text: 'Browser market shares at a specific website, 2014'
+            },
+            tooltip: {
+                pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+            },
+            plotOptions: {
+                pie: {
+                    allowPointSelect: true,
+                    cursor: 'pointer',
+                    depth: 35,
+                    dataLabels: {
+                        enabled: true,
+                        format: '{point.name}'
+                    }
+                }
+            },
+            series: [{
+                type: 'pie',
+                name: 'Browser share',
+                data: [
+                    ['Firefox',   45.0],
+                    ['IE',       26.8],
+                    {
+                        name: 'Chrome',
+                        y: 12.8,
+                        sliced: true,
+                        selected: true
+                    },
+                    ['Safari',    8.5],
+                    ['Opera',     6.2],
+                    ['Others',   0.7]
+                ],
+                dataLabels: {
+                    enabled: true,
+                    style: {
+                        fontSize: '13px',
+                        color: '#aaa',
+                        fontFamily: 'Arial',
+                        textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                        fontWeight: 'normal'
+                    }
+                }
+            }]
+        });
+    });
+</script>
+
+<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+<% html_title(l(:label_repository), l(:label_statistics)) -%>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 033f12ad2..98d02cdb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -602,6 +602,7 @@ en:
   label_time_tracking: Time tracking
   label_change_plural: Changes
   label_statistics: Statistics
+  label_quality_analyses: Quality Analyses
   label_commits_per_month: Commits per month
   label_commits_per_author: Commits per author
   label_diff: diff
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 94be8af6d..4c0f531a5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -732,6 +732,7 @@ zh:
   label_time_tracking: 时间跟踪
   label_change_plural: 变更
   label_statistics: 统计
+  label_quality_analyses: 质量分析
 
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数

From 6100abe0da46b50fbdf08d3f3bacb5655fa4ac34 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 10:38:11 +0800
Subject: [PATCH 388/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/syllabuses.js.coffee   |   3 +
 app/assets/stylesheets/syllabuses.css.scss    |   3 +
 app/controllers/syllabuses_controller.rb      |  23 +
 app/helpers/syllabuses_helper.rb              |   2 +
 app/models/course.rb                          |   1 +
 app/models/syllabus.rb                        |   5 +
 app/models/user.rb                            |   1 +
 .../20160613064914_create_syllabuses.rb       |  12 +
 .../20160613065840_add_syllabus_to_course.rb  |   6 +
 db/schema.rb                                  | 426 ++----------------
 .../controllers/syllabuses_controller_spec.rb |   5 +
 spec/factories/syllabuses.rb                  |   9 +
 spec/models/syllabus_spec.rb                  |   5 +
 13 files changed, 105 insertions(+), 396 deletions(-)
 create mode 100644 app/assets/javascripts/syllabuses.js.coffee
 create mode 100644 app/assets/stylesheets/syllabuses.css.scss
 create mode 100644 app/controllers/syllabuses_controller.rb
 create mode 100644 app/helpers/syllabuses_helper.rb
 create mode 100644 app/models/syllabus.rb
 create mode 100644 db/migrate/20160613064914_create_syllabuses.rb
 create mode 100644 db/migrate/20160613065840_add_syllabus_to_course.rb
 create mode 100644 spec/controllers/syllabuses_controller_spec.rb
 create mode 100644 spec/factories/syllabuses.rb
 create mode 100644 spec/models/syllabus_spec.rb

diff --git a/app/assets/javascripts/syllabuses.js.coffee b/app/assets/javascripts/syllabuses.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/syllabuses.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/syllabuses.css.scss b/app/assets/stylesheets/syllabuses.css.scss
new file mode 100644
index 000000000..2576e25f0
--- /dev/null
+++ b/app/assets/stylesheets/syllabuses.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the syllabuses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
new file mode 100644
index 000000000..69982b99a
--- /dev/null
+++ b/app/controllers/syllabuses_controller.rb
@@ -0,0 +1,23 @@
+class SyllabusesController < ApplicationController
+
+  before_filter :is_logged, :only => [:index, :show]
+  before_filter :find_syllabus, :only => [:show]
+  def index
+    user = User.current
+    @syllabuses = user.syllabuses
+  end
+
+  def show
+    @courses = @syllabus.courses
+
+  end
+
+  private
+  def find_syllabus
+    @syllabus = Syllabus.find params[:id]
+  end
+
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+end
diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
new file mode 100644
index 000000000..dac84937b
--- /dev/null
+++ b/app/helpers/syllabuses_helper.rb
@@ -0,0 +1,2 @@
+module SyllabusesHelper
+end
diff --git a/app/models/course.rb b/app/models/course.rb
index 69dbec5d0..e3a845b11 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -24,6 +24,7 @@ class Course < ActiveRecord::Base
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
+  belongs_to :syllabus
   # has_many :bid
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
   has_many :memberships, :class_name => 'Member'
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
new file mode 100644
index 000000000..7d6319955
--- /dev/null
+++ b/app/models/syllabus.rb
@@ -0,0 +1,5 @@
+class Syllabus < ActiveRecord::Base
+  belongs_to :user
+  has_many :courses
+  attr_accessible :description, :title
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 44ef54c95..258fe2ea5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -90,6 +90,7 @@ class User < Principal
   has_many :homework_users
   has_many :homework_attaches, :through => :homework_users
   has_many :homework_evaluations
+  has_many :syllabuses, :dependent => :destroy
   #问卷相关关关系
   has_many :poll_users, :dependent => :destroy
   has_many :poll_votes, :dependent => :destroy
diff --git a/db/migrate/20160613064914_create_syllabuses.rb b/db/migrate/20160613064914_create_syllabuses.rb
new file mode 100644
index 000000000..a9a926d7e
--- /dev/null
+++ b/db/migrate/20160613064914_create_syllabuses.rb
@@ -0,0 +1,12 @@
+class CreateSyllabuses < ActiveRecord::Migration
+  def change
+    create_table :syllabuses do |t|
+      t.string :title
+      t.text :description
+      t.references :user
+
+      t.timestamps
+    end
+    add_index :syllabuses, :user_id
+  end
+end
diff --git a/db/migrate/20160613065840_add_syllabus_to_course.rb b/db/migrate/20160613065840_add_syllabus_to_course.rb
new file mode 100644
index 000000000..b40d187d0
--- /dev/null
+++ b/db/migrate/20160613065840_add_syllabus_to_course.rb
@@ -0,0 +1,6 @@
+class AddSyllabusToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :syllabus_id, :integer
+    add_index :courses, :syllabus_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 05a6f4e22..7782731dc 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 => 20160601073753) do
+ActiveRecord::Schema.define(:version => 20160613065840) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
-  create_table "application_settings", :force => true do |t|
-    t.integer  "default_projects_limit"
-    t.boolean  "signup_enabled"
-    t.boolean  "signin_enabled"
-    t.boolean  "gravatar_enabled"
-    t.text     "sign_in_text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "home_page_url"
-    t.integer  "default_branch_protection",    :default => 2
-    t.boolean  "twitter_sharing_enabled",      :default => true
-    t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",        :default => true
-    t.integer  "max_attachment_size",          :default => 10,    :null => false
-    t.integer  "default_project_visibility"
-    t.integer  "default_snippet_visibility"
-    t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",      :default => true
-    t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",         :default => 10080, :null => false
-  end
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -178,20 +156,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.string  "typeName", :limit => 50
   end
 
-  create_table "audit_events", :force => true do |t|
-    t.integer  "author_id",   :null => false
-    t.string   "type",        :null => false
-    t.integer  "entity_id",   :null => false
-    t.string   "entity_type", :null => false
-    t.text     "details"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
-  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
-  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
-
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -289,17 +253,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
-  create_table "broadcast_messages", :force => true do |t|
-    t.text     "message",    :null => false
-    t.datetime "starts_at"
-    t.datetime "ends_at"
-    t.integer  "alert_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "color"
-    t.string   "font"
-  end
-
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -597,11 +550,10 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
   end
 
-  add_index "courses", ["id"], :name => "id", :unique => true
-  add_index "courses", ["tea_id"], :name => "tea_id"
-  add_index "courses", ["visits"], :name => "visits"
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
 
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
@@ -664,15 +616,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "deploy_keys_projects", :force => true do |t|
-    t.integer  "deploy_key_id", :null => false
-    t.integer  "project_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
-
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -722,16 +665,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "created_at"
   end
 
-  create_table "emails", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.string   "email",      :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
-  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
-
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -754,25 +687,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
-  create_table "events", :force => true do |t|
-    t.string   "target_type"
-    t.integer  "target_id"
-    t.string   "title"
-    t.text     "data"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "action"
-    t.integer  "author_id"
-  end
-
-  add_index "events", ["action"], :name => "index_events_on_action"
-  add_index "events", ["author_id"], :name => "index_events_on_author_id"
-  add_index "events", ["created_at"], :name => "index_events_on_created_at"
-  add_index "events", ["project_id"], :name => "index_events_on_project_id"
-  add_index "events", ["target_id"], :name => "index_events_on_target_id"
-  add_index "events", ["target_type"], :name => "index_events_on_target_type"
-
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -875,15 +789,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
-  create_table "forked_project_links", :force => true do |t|
-    t.integer  "forked_to_project_id",   :null => false
-    t.integer  "forked_from_project_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
-
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -1013,17 +918,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "identities", :force => true do |t|
-    t.string   "extern_uid"
-    t.string   "provider"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
-  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
-
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1167,20 +1061,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "private",                     :default => 0
   end
 
-  create_table "keys", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "key"
-    t.string   "title"
-    t.string   "type"
-    t.string   "fingerprint"
-    t.boolean  "public",      :default => false, :null => false
-  end
-
-  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
-  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
-
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1192,27 +1072,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "owner_type", :default => 0
   end
 
-  create_table "label_links", :force => true do |t|
-    t.integer  "label_id"
-    t.integer  "target_id"
-    t.string   "target_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
-  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
-
-  create_table "labels", :force => true do |t|
-    t.string   "title"
-    t.string   "color"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
-
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1263,47 +1122,23 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "viewed_count",  :default => 0
   end
 
-  create_table "merge_request_diffs", :force => true do |t|
-    t.string   "state"
-    t.text     "st_commits",       :limit => 2147483647
-    t.text     "st_diffs",         :limit => 2147483647
-    t.integer  "merge_request_id",                       :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
-
-  create_table "merge_requests", :force => true do |t|
-    t.string   "target_branch",                    :null => false
-    t.string   "source_branch",                    :null => false
-    t.integer  "source_project_id",                :null => false
-    t.integer  "author_id"
-    t.integer  "assignee_id"
-    t.string   "title"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "milestone_id"
-    t.string   "state"
-    t.string   "merge_status"
-    t.integer  "target_project_id",                :null => false
-    t.integer  "iid"
-    t.text     "description"
-    t.integer  "position",          :default => 0
-    t.datetime "locked_at"
+  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
 
-  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
-  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
-  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
-  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
-  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
-  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
-  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
-  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
-  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
-  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
-
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1338,39 +1173,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
-  create_table "milestones", :force => true do |t|
-    t.string   "title",       :null => false
-    t.integer  "project_id",  :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.integer  "iid"
-  end
-
-  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
-  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
-  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
-  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
-
-  create_table "namespaces", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.string   "path",                        :null => false
-    t.integer  "owner_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type"
-    t.string   "description", :default => "", :null => false
-    t.string   "avatar"
-  end
-
-  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
-  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
-  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
-  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
-  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
-
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1396,31 +1198,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "notes", :force => true do |t|
-    t.text     "note"
-    t.string   "noteable_type"
-    t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "project_id"
-    t.string   "attachment"
-    t.string   "line_code"
-    t.string   "commit_id"
-    t.integer  "noteable_id"
-    t.boolean  "system",                              :default => false, :null => false
-    t.text     "st_diff",       :limit => 2147483647
-  end
-
-  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
-  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
-  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
-  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
-  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
-  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
-  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
-  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
-  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
-
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1430,49 +1207,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.text     "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
-
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
-
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.string   "uid",                          :null => false
-    t.string   "secret",                       :null => false
-    t.text     "redirect_uri",                 :null => false
-    t.string   "scopes",       :default => "", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
-
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1630,23 +1364,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "allow_teacher",        :default => 0
   end
 
-  create_table "permissions", :force => true do |t|
-    t.string  "controller",   :limit => 30, :default => "",    :null => false
-    t.string  "action",       :limit => 30, :default => "",    :null => false
-    t.string  "description",  :limit => 60, :default => "",    :null => false
-    t.boolean "is_public",                  :default => false, :null => false
-    t.integer "sort",                       :default => 0,     :null => false
-    t.boolean "mail_option",                :default => false, :null => false
-    t.boolean "mail_enabled",               :default => false, :null => false
-  end
-
-  create_table "permissions_roles", :id => false, :force => true do |t|
-    t.integer "permission_id", :default => 0, :null => false
-    t.integer "role_id",       :default => 0, :null => false
-  end
-
-  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
-
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1729,11 +1446,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "project_import_data", :force => true do |t|
-    t.integer "project_id"
-    t.text    "data"
-  end
-
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1824,16 +1536,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
-  create_table "protected_branches", :force => true do |t|
-    t.integer  "project_id",                             :null => false
-    t.string   "name",                                   :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "developers_can_push", :default => false, :null => false
-  end
-
-  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
-
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1968,25 +1670,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
-  create_table "services", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",                :default => false, :null => false
-    t.text     "properties"
-    t.boolean  "template",              :default => false
-    t.boolean  "push_events",           :default => true
-    t.boolean  "issues_events",         :default => true
-    t.boolean  "merge_requests_events", :default => true
-    t.boolean  "tag_push_events",       :default => true
-    t.boolean  "note_events",           :default => true,  :null => false
-  end
-
-  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
-  add_index "services", ["project_id"], :name => "index_services_on_project_id"
-
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -2025,26 +1708,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",     :null => false
   end
 
-  create_table "snippets", :force => true do |t|
-    t.string   "title"
-    t.text     "content",          :limit => 2147483647
-    t.integer  "author_id",                                             :null => false
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "file_name"
-    t.datetime "expires_at"
-    t.string   "type"
-    t.integer  "visibility_level",                       :default => 0, :null => false
-  end
-
-  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
-  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
-  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
-  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
-  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
-  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2117,9 +1780,9 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
-    t.float    "work_score"
     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"
@@ -2167,13 +1830,13 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority"
+    t.integer  "priority",        :default => 0
     t.string   "name"
     t.string   "field_type"
-    t.integer  "hide"
-    t.integer  "status"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    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|
@@ -2183,16 +1846,15 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",      :null => false
   end
 
-  create_table "subscriptions", :force => true do |t|
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
     t.integer  "user_id"
-    t.integer  "subscribable_id"
-    t.string   "subscribable_type"
-    t.boolean  "subscribed"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
-  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
 
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
@@ -2434,17 +2096,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
-  create_table "users_star_projects", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
-  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
-  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
-
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2496,23 +2147,6 @@ ActiveRecord::Schema.define(:version => 20160601073753) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "web_hooks", :force => true do |t|
-    t.string   "url"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",                  :default => "ProjectHook"
-    t.integer  "service_id"
-    t.boolean  "push_events",           :default => true,          :null => false
-    t.boolean  "issues_events",         :default => false,         :null => false
-    t.boolean  "merge_requests_events", :default => false,         :null => false
-    t.boolean  "tag_push_events",       :default => false
-    t.boolean  "note_events",           :default => false,         :null => false
-  end
-
-  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
-  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
-
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"
diff --git a/spec/controllers/syllabuses_controller_spec.rb b/spec/controllers/syllabuses_controller_spec.rb
new file mode 100644
index 000000000..72c43dff1
--- /dev/null
+++ b/spec/controllers/syllabuses_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SyllabusesController, :type => :controller do
+
+end
diff --git a/spec/factories/syllabuses.rb b/spec/factories/syllabuses.rb
new file mode 100644
index 000000000..436972e39
--- /dev/null
+++ b/spec/factories/syllabuses.rb
@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :syllabus do
+    title "MyString"
+    description "MyText"
+    user nil
+  end
+end
diff --git a/spec/models/syllabus_spec.rb b/spec/models/syllabus_spec.rb
new file mode 100644
index 000000000..6072c09ce
--- /dev/null
+++ b/spec/models/syllabus_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Syllabus, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 270399c5dade14b39ef3893f93e2402fd4ad9726 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 14 Jun 2016 14:04:39 +0800
Subject: [PATCH 389/668] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=97=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=8A=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 54 ++++++++++++++--------------
 public/stylesheets/weui/weixin.css   |  1 +
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 2ab2e2d61..476ae3690 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -33,9 +33,9 @@
                 <span class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -59,12 +59,12 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -88,12 +88,12 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -135,12 +135,12 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -165,12 +165,12 @@
                   <div class="cl"></div>
                 </div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -208,12 +208,12 @@
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                 <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -237,12 +237,12 @@
                 <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                 <div class="cl"></div>
               </div>
-              <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
+              <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
               <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
               <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">赞</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
               <div class="cl"></div>
             </div>
           </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index cc4db7e17..514cb92aa 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -88,6 +88,7 @@ a.underline {text-decoration:underline;}
 .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.num-block {width:12px; text-align:center; display:inline-block; vertical-align:top;}
 
 /* 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;}

From e7499c95c591964d6ca08679f3c84efcd7a804d8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 14:08:54 +0800
Subject: [PATCH 390/668] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=9F=90=E4=BD=9C=E5=93=81=EF=BC=8C=E5=9C=A8=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E7=9A=84=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_student_result.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 3e989d93c..d8b4f55bf 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -20,7 +20,11 @@
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
     </div>
-    <div class="mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
+    <div>
+        <div class="fl mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
+        <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+    </div>
+    <div class="cl"></div>
     <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
     <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
     <% single_question_list = exercise.exercise_questions.where("question_type=3") %>

From d21df48961a15f8ffa412c1b543dc4d76c542c29 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 14 Jun 2016 14:10:33 +0800
Subject: [PATCH 391/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=BC=B9=E6=A1=86=E5=8F=8A=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb        | 8 +++++---
 app/views/repositories/_quality_analyses.html.erb | 5 +++++
 app/views/repositories/quality_analyses.js.erb    | 8 ++++++++
 app/views/repositories/show.html.erb              | 5 ++---
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 app/views/repositories/_quality_analyses.html.erb
 create mode 100644 app/views/repositories/quality_analyses.js.erb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 555b46051..9dbf7cfd7 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -308,13 +308,15 @@ update
   end
 
   def quality_analyses
+    language = params[:language]
+    branch = params[:branch]
+    path = params[:path]
+    user_name = User.find(@project.user_id).try(:login)
+    rep_name = params[:repository_id]
     host = "192.168.0.200"
     port = "1125"
     username = "git"
     password = "123123"
-    ##显示文件和系统版本
-    user_name = User.find(@project.user_id).try(:login)
-    rep_name = params[:repository_id]
     server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name
     # 连接到远程主机 foobar
     ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb
new file mode 100644
index 000000000..7424e0369
--- /dev/null
+++ b/app/views/repositories/_quality_analyses.html.erb
@@ -0,0 +1,5 @@
+<%= form_tag( url_for(:controller => 'repositories', :action => 'quality_analyses'), :remote => true , :method => 'post', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %>
+    <textarea  id="path_description" name="rep[path]" rows="8" placeholder="最多3000个汉字(或6000个英文字符)"></textarea>
+    <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
+    <%= select_tag :language, options_for_select(["Java","C"]), :id => 'branch' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/quality_analyses.js.erb b/app/views/repositories/quality_analyses.js.erb
new file mode 100644
index 000000000..89d8685cf
--- /dev/null
+++ b/app/views/repositories/quality_analyses.js.erb
@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analyses', :locals => {}) %>');
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index bbcb48bdf..d1c041d73 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,7 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier) %>
+  <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
 
 </div>
 <div class="repository_con" style="line-height:1.9;">
@@ -46,7 +46,7 @@
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
@@ -58,7 +58,6 @@
 
          <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
-
         </span>
       </div>
   <% end %>

From b1791f4531db9be1648c5e5fb9748d2f1116b256 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 14 Jun 2016 14:24:39 +0800
Subject: [PATCH 392/668] =?UTF-8?q?wechat=E7=BB=93=E6=9E=84=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/add_class.html           |  13 +
 public/assets/wechat/app.html                 |  14 +
 public/javascripts/wechat/CommentBox.jsx      | 108 ----
 public/javascripts/wechat/app.js              | 544 +-----------------
 public/javascripts/wechat/auth.js             |  36 --
 public/javascripts/wechat/blog_detail.js      |  95 ---
 .../wechat/controllers/activity.js            |  66 +++
 .../wechat/controllers/add_class.js           |   4 +
 public/javascripts/wechat/controllers/blog.js |  38 ++
 .../wechat/controllers/course_notice.js       |  35 ++
 .../wechat/controllers/discussion.js          |  36 ++
 .../wechat/controllers/homework.js            |  36 ++
 .../javascripts/wechat/controllers/issue.js   |  36 ++
 .../wechat/controllers/journals.js            |  37 ++
 .../javascripts/wechat/course_discussion.js   | 102 ----
 public/javascripts/wechat/course_notice.js    | 101 ----
 .../wechat/directives/input_auto.js           |  19 +
 .../wechat/directives/loading_spinner.js      |   7 +
 public/javascripts/wechat/gulpfile.js         |   7 +
 public/javascripts/wechat/homework_detail.js  | 104 ----
 public/javascripts/wechat/issue_detail.js     | 108 ----
 public/javascripts/wechat/message_detail.js   |  95 ---
 public/javascripts/wechat/others/factory.js   | 120 ++++
 public/javascripts/wechat/others/filter.js    |   5 +
 public/javascripts/wechat/others/routes.js    |  70 +++
 .../javascripts/wechat/project_discussion.js  | 105 ----
 26 files changed, 546 insertions(+), 1395 deletions(-)
 create mode 100644 public/assets/wechat/add_class.html
 delete mode 100644 public/javascripts/wechat/CommentBox.jsx
 delete mode 100644 public/javascripts/wechat/auth.js
 delete mode 100644 public/javascripts/wechat/blog_detail.js
 create mode 100644 public/javascripts/wechat/controllers/activity.js
 create mode 100644 public/javascripts/wechat/controllers/add_class.js
 create mode 100644 public/javascripts/wechat/controllers/blog.js
 create mode 100644 public/javascripts/wechat/controllers/course_notice.js
 create mode 100644 public/javascripts/wechat/controllers/discussion.js
 create mode 100644 public/javascripts/wechat/controllers/homework.js
 create mode 100644 public/javascripts/wechat/controllers/issue.js
 create mode 100644 public/javascripts/wechat/controllers/journals.js
 delete mode 100644 public/javascripts/wechat/course_discussion.js
 delete mode 100644 public/javascripts/wechat/course_notice.js
 create mode 100644 public/javascripts/wechat/directives/input_auto.js
 create mode 100644 public/javascripts/wechat/directives/loading_spinner.js
 delete mode 100644 public/javascripts/wechat/homework_detail.js
 delete mode 100644 public/javascripts/wechat/issue_detail.js
 delete mode 100644 public/javascripts/wechat/message_detail.js
 create mode 100644 public/javascripts/wechat/others/factory.js
 create mode 100644 public/javascripts/wechat/others/filter.js
 create mode 100644 public/javascripts/wechat/others/routes.js
 delete mode 100644 public/javascripts/wechat/project_discussion.js

diff --git a/public/assets/wechat/add_class.html b/public/assets/wechat/add_class.html
new file mode 100644
index 000000000..2543d5cc4
--- /dev/null
+++ b/public/assets/wechat/add_class.html
@@ -0,0 +1,13 @@
+<div class="post-container">
+    <div class="add-class-box">
+        <p class="tac add-class-tip">输入班级邀请码，即刻加入班级！</p>
+        <form class="mb20">
+            <input type="text" class="class-number-input" />
+        </form>
+        <a href="javascript:void(0);" class="c-grey4 fl cancel-btn">取消</a>
+        <div class="slice fl">
+            <div class="slice-line"></div>
+        </div>
+        <a href="javascript:void(0);" class="c-blue fl submit-btn">确定</a>
+    </div>
+</div>
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 5059c41ab..d88efe50f 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -18,7 +18,21 @@
 </div>
 
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
+
 <script src="/javascripts/wechat/app.js"></script>
+<script src="/javascripts/wechat/others/factory.js"></script>
+<script src="/javascripts/wechat/others/filter.js"></script>
+<script src="/javascripts/wechat/directives/input_auto.js"></script>
+<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
+<script src="/javascripts/wechat/controllers/activity.js"></script>
+<script src="/javascripts/wechat/controllers/add_class.js"></script>
+<script src="/javascripts/wechat/controllers/blog.js"></script>
+<script src="/javascripts/wechat/controllers/course_notice.js"></script>
+<script src="/javascripts/wechat/controllers/discussion.js"></script>
+<script src="/javascripts/wechat/controllers/homework.js"></script>
+<script src="/javascripts/wechat/controllers/issue.js"></script>
+<script src="/javascripts/wechat/controllers/journals.js"></script>
+<script src="/javascripts/wechat/others/routes.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/javascripts/wechat/CommentBox.jsx b/public/javascripts/wechat/CommentBox.jsx
deleted file mode 100644
index 7f30b38b1..000000000
--- a/public/javascripts/wechat/CommentBox.jsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Created by guange on 16/3/19.
- */
-
-
-
-
-var CommentBox = React.createClass({
-
-    loadFromServer: function(){
-        $.ajax({
-            url: this.props.url,
-            dataType: 'json',
-            success: function(data){
-                this.setState({data: data});
-            }.bind(this),
-            error: function(xhr,status,err){
-                console.error(this.props.url, status, err.toString());
-            }.bind(this)
-        });
-    },
-    onCommentSubmit: function(comment){
-        console.log(comment);
-    },
-    getInitialState: function(){
-        return {data: []};
-    },
-    componentDidMount: function(){
-        this.loadFromServer();
-        setInterval(this.loadFromServer, 2000);
-    },
-    render: function(){
-        return(
-        <div className="commentBox">
-            <CommentForm onCommentSubmit={this.onCommentSubmit}/>
-            <CommentList data={this.state.data}/>
-        </div>
-        );
-    }
-});
-
-var CommentList = React.createClass({
-    render: function(){
-
-        var commentNodes = this.props.data.map(function(comment){
-            return (
-                <Comment author={comment.author}>
-                    {comment.text}
-                </Comment>
-            )
-        });
-
-        return (
-            <div className="commentList">
-                {commentNodes}
-            </div>
-        );
-    }
-});
-
-var CommentForm = React.createClass({
-    handleSubmit: function(e){
-        e.preventDefault();
-
-        var author = this.refs.author.value.trim();
-        var text = this.refs.text.value.trim();
-        if(!text || !author){
-            return;
-        }
-
-        this.props.onCommentSubmit({author: author, text: text});
-
-        this.refs.author.value = '';
-        this.refs.text.value = '';
-        return;
-    },
-    render: function(){
-        return (
-            <form className="commentForm" onSubmit={this.handleSubmit}>
-                <input type="text" placeholder="Your name" ref="author" />
-                <input type="text" placeholder="Say something..." ref="text" />
-                <input type="submit" value="Post" />
-            </form>
-        );
-    }
-});
-
-
-var Comment = React.createClass({
-
-    rawMarkup: function() {
-        var rawMarkup = marked(this.props.children.toString(), {sanitize: true});
-        return { __html: rawMarkup };
-    },
-
-    render: function(){
-        return (
-            <div className="comment">
-                <h2 className="commentAuthor">
-                    {this.props.author}
-                </h2>
-                <span dangerouslySetInnerHTML={this.rawMarkup()}></span>
-            </div>
-        )
-    }
-})
-
-React.render(<CommentBox url="api/comment.json"/>, document.getElementById("example"));
\ No newline at end of file
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ca9682db2..adf445b51 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,546 +1,8 @@
 var app = angular.module('wechat', ['ngRoute']);
 var apiUrl = '/api/v1/';
-var debug = false; //调试标志,如果在本地请置为true
+var debug = true; //调试标志,如果在本地请置为true
 
 if(debug===true){
-    //apiUrl = 'http://localhost:3000/api/v1/';
-    apiUrl = 'http://www.trustie.net/api/v1/';
+    apiUrl = 'http://localhost:3000/api/v1/';
+    //apiUrl = 'http://www.trustie.net/api/v1/';
 }
-
-
-app.factory('auth', function($http,$routeParams, $q){
-    var _openid = '';
-
-    if(typeof g_openid !== 'undefined'){
-        _openid = g_openid;
-    }
-
-    if(debug===true){
-        _openid = "orgVLv8TlS6e7FDiI6xdTGHRaaRo"; //guange的帐号
-    }
-
-    var getOpenId = function() {
-        var deferred = $q.defer();
-        if (typeof _openid !== 'undefined' && _openid.length > 0){
-            deferred.resolve(_openid);
-        } else {
-            var code = $routeParams.code;
-            $http({
-                url: '/wechat/get_open_id',
-                data: {code: code},
-                method: 'POST'
-            }).then(function successCallback(response) {
-                _openid = response.data.openid;
-                deferred.resolve(_openid);
-            }, function errorCallback(response) {
-                deferred.reject(response);
-            });
-        }
-        return deferred.promise;
-    };
-    var openid = function(){
-        return _openid;
-    };
-    return {getOpenId: getOpenId, openid: openid};
-});
-
-
-app.factory('rms', function(){
-    var _saveStorage = {};
-    var save = function(key, value){
-        _saveStorage[key] = value;
-    };
-
-    var get = function(key){
-        return _saveStorage[key];
-    };
-
-    return {save: save, get: get};
-});
-
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
-    $scope.replaceUrl = function(url){
-        return url;
-    };
-
-    console.log("ActivityController load");
-
-    $scope.page = rms.get('page') || 0;
-    $scope.activities = rms.get("activities") || [];
-    $scope.has_more = rms.get("has_more");
-
-    $scope.loadActData = function(page){
-
-        $scope.page = page;
-        $http({
-            method: 'POST',
-            url: apiUrl+ "activities",
-            data: {openid: auth.openid(), page: page}
-        }).then(function successCallback(response) {
-            if(response.data.page >0) {
-                $scope.activities = $scope.activities.concat(response.data.data);
-            } else {
-                $scope.activities = response.data.data;
-            }
-
-            rms.save("activities", $scope.activities);
-            $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
-            rms.save('has_more', $scope.has_more);
-            rms.save('page', response.data.page);
-
-            console.log(response.data);
-
-        }, function errorCallback(response) {
-        });
-    };
-
-    if($scope.activities.length<=0){
-        auth.getOpenId().then(
-            function successCallback(response){
-                $scope.loadActData(0);
-            }, function errorCallback(response) {
-                alert("获取openid出错:"+response);
-            }
-        );
-    } else {
-        $timeout(function(){
-            window.scrollTo(0, rms.get("yoffset"));
-        });
-
-    }
-
-    //跳到详情页
-    $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", window.document.body.scrollTop);
-        $location.path('/'+type+'/'+act_id);
-    }
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.factory('common', function($http, auth, $routeParams){
-    var addCommonReply = function(id, type, data, cb){
-
-        if(!data.comment || data.comment.length<=0){
-            return;
-        }
-
-        var temp =  data.comment.replace(/\n/g,'<br/>');
-
-        var userInfo = {
-            type: type,
-            content: temp,
-            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();
-            }
-        }, function errorCallback(response) {
-        });
-    };
-
-    var loadCommonData = function(id, type){
-        return $http({
-            method: 'GET',
-            url: apiUrl+ type + "/" + id+"?openid="+auth.openid()
-        })
-    };
-
-    var addCommonPraise = function(act){
-        act.praise_count += 1;
-        act.has_praise = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-
-    };
-
-    var decreaseCommonPraise = function(act){
-        act.praise_count -= 1;
-        act.has_praise = false;
-
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-    };
-
-    return {addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
-});
-
-app.controller('IssueController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'issues').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.issue = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addIssueReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Issue', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.homework = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addHomeworkReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'newss').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.news = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addNoticeReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'News', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.discussion = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addDiscussionReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Message', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.message = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addJournalReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.blog = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addBlogReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.filter('safeHtml', function ($sce) {
-    return function (input) {
-        return $sce.trustAsHtml(input);
-    }
-});
-
-//app.directive('textAutoHeight', function($timeout){
-//    return {
-//        restrict: 'A',
-//        scope: {},
-//        link: function(scope, element, attr){
-//            scope.text = '点击展开';
-//            $timeout(function(){
-//                var e = element.parent().children().eq(5);
-//                var height = e[0].scrollHeight;
-//                if(height>90){
-//                    element.css('display', 'block');
-//                    element.on('click', function(){
-//                        if(element.text() == "点击展开"){
-//                            e.css("height", height+'px');
-//                            element.text("点击隐藏");
-//                        } else {
-//                            e.css("height", '90px');
-//                            element.text("点击展开");
-//                        }
-//
-//                    });
-//                }
-//            }, false);
-//
-//        }
-//    }
-//});
-
-app.directive('inputAuto',function(){
-    return{
-        restrict: 'A',
-        scope: {},
-        link: function(scope, element){
-                var copyContainer = element.parent().children().eq(0);
-                var sendButton = element.parent().next();
-                element.on('input',function(){
-                    console.log(sendButton);
-                    copyContainer.html(element[0].value);
-                    var textHeight = copyContainer[0].scrollHeight;
-                    element.css('height', textHeight + 'px');
-                });
-                sendButton.on('click',function(){
-                    element.css('height','28px');
-                });
-            }
-    }
-});
-
-app.directive('loadingSpinner', ['$http', function ($http) {
-    return {
-        restrict: 'A',
-        replace: true,
-        template: '<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
-    };
-}]);
-
-app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
-    var rootPath = '/assets/wechat/'
-    //$locationProvider.html5Mode(true);
-    $routeProvider
-        .when('/activites', {
-            templateUrl: rootPath + 'activities.html',
-            controller: 'ActivityController'
-        })
-        .when('/issues/:id', {
-            templateUrl: rootPath + 'issue_detail.html',
-            controller: 'IssueController'
-        })
-        .when('/project_discussion/:id', {
-            templateUrl: rootPath + 'project_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/homework/:id', {
-            templateUrl: rootPath + 'homework_detail.html',
-            controller: 'HomeworkController'
-        })
-        .when('/course_notice/:id', {
-            templateUrl: rootPath + 'course_notice.html',
-            controller: 'CourseNoticeController'
-        })
-        .when('/course_discussion/:id', {
-            templateUrl: rootPath + 'course_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/journal_for_message/:id', {
-            templateUrl: rootPath + 'jour_message_detail.html',
-            controller: 'JournalsController'
-        })
-        .when('/blog_comment/:id', {
-            templateUrl: rootPath + 'blog_detail.html',
-            controller: 'BlogController'
-        })
-        .otherwise({
-            redirectTo: '/activites'
-        });
-
-        //监听异步请求,实现加载中显隐标记
-        $httpProvider.interceptors.push(function ($q, $rootScope) {
-            if ($rootScope.activeCalls == undefined) {
-                $rootScope.activeCalls = 0;
-            }
-
-            return {
-                request: function (config) {
-                    $rootScope.activeCalls += 1;
-                    return config;
-                },
-                requestError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                },
-                response: function (response) {
-                    $rootScope.activeCalls -= 1;
-                    return response;
-                },
-                responseError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                }
-            };
-        });
-}]);
diff --git a/public/javascripts/wechat/auth.js b/public/javascripts/wechat/auth.js
deleted file mode 100644
index f9c2917fc..000000000
--- a/public/javascripts/wechat/auth.js
+++ /dev/null
@@ -1,36 +0,0 @@
-$(function(){
-    //获取url中的参数
-    function getUrlParam(name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
-        var r = window.location.search.substr(1).match(reg);  //匹配目标参数
-        if (r != null) return unescape(r[2]); return null; //返回参数值
-    }
-
-
-    var debug = false;
-
-    var g_openid = "";
-    if(debug){
-        g_openid = "填写要调试的openid即可";
-    }
-
-    window.getOpenId = function(cb){
-        if (g_openid.length>0){
-            cb(g_openid);
-        }
-        var code = getUrlParam("code");
-        $.ajax({
-            url: '/wechat/get_open_id',
-            data: {code: code},
-            type: 'post',
-            dataType: 'json',
-            success: function(data){
-                g_openid = data.openid;
-                cb(g_openid);
-            },
-            error: function(xhr,err){
-                alert("认证失败: "+err);
-            }
-        });
-    }
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/blog_detail.js b/public/javascripts/wechat/blog_detail.js
deleted file mode 100644
index 44121f83c..000000000
--- a/public/javascripts/wechat/blog_detail.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:blog-detail',{blog: data});
-        $('#blog-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        $('post-interactive-praise').click(function(){
-            praiseClick();
-        });
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'blog_comments/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "replyType" : "homework_assignment",
-                "replyContent" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: "前台地址/后台方法",    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    alert(data.d);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
new file mode 100644
index 000000000..732772e13
--- /dev/null
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -0,0 +1,66 @@
+
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
+    $scope.replaceUrl = function(url){
+        return url;
+    };
+
+    console.log("ActivityController load");
+
+    $scope.page = rms.get('page') || 0;
+    $scope.activities = rms.get("activities") || [];
+    $scope.has_more = rms.get("has_more");
+
+    $scope.loadActData = function(page){
+
+        $scope.page = page;
+        $http({
+            method: 'POST',
+            url: apiUrl+ "activities",
+            data: {openid: auth.openid(), page: page}
+        }).then(function successCallback(response) {
+            if(response.data.page >0) {
+                $scope.activities = $scope.activities.concat(response.data.data);
+            } else {
+                $scope.activities = response.data.data;
+            }
+
+            rms.save("activities", $scope.activities);
+            $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+            rms.save('has_more', $scope.has_more);
+            rms.save('page', response.data.page);
+
+            console.log(response.data);
+
+        }, function errorCallback(response) {
+        });
+    };
+
+    if($scope.activities.length<=0){
+        auth.getOpenId().then(
+            function successCallback(response){
+                $scope.loadActData(0);
+            }, function errorCallback(response) {
+                alert("获取openid出错:"+response);
+            }
+        );
+    } else {
+        $timeout(function(){
+            window.scrollTo(0, rms.get("yoffset"));
+        });
+
+    }
+
+    //跳到详情页
+    $scope.goDetail = function(type, act_id,id){
+        rms.save("yoffset", window.document.body.scrollTop);
+        $location.path('/'+type+'/'+act_id);
+    }
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/add_class.js b/public/javascripts/wechat/controllers/add_class.js
new file mode 100644
index 000000000..099bb8e8e
--- /dev/null
+++ b/public/javascripts/wechat/controllers/add_class.js
@@ -0,0 +1,4 @@
+
+app.controller('AddClassController', ['$scope',function($scope){
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
new file mode 100644
index 000000000..56589122a
--- /dev/null
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -0,0 +1,38 @@
+
+app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.blog = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addBlogReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+    };
+
+    $scope.addPraise = function(act){
+        console.log(act);
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        console.log(act);
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
new file mode 100644
index 000000000..9a60d2222
--- /dev/null
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -0,0 +1,35 @@
+app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'newss').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.news = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addNoticeReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'News', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+    };
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
new file mode 100644
index 000000000..479f473bf
--- /dev/null
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -0,0 +1,36 @@
+
+app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'messages').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.discussion = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addDiscussionReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'Message', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+    };
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
new file mode 100644
index 000000000..5fb890741
--- /dev/null
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -0,0 +1,36 @@
+
+app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.homework = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addHomeworkReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+    };
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+});
diff --git a/public/javascripts/wechat/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
new file mode 100644
index 000000000..53bdbf265
--- /dev/null
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -0,0 +1,36 @@
+app.controller('IssueController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'issues').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.issue = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addIssueReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'Issue', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+
+    };
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
new file mode 100644
index 000000000..c292b1932
--- /dev/null
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -0,0 +1,37 @@
+app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
+    $scope.formData = {comment: ''};
+
+    var loadData = function(id){
+        common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
+            console.log(response.data);
+            $scope.message = response.data.data;
+        }, function errorCallback(response) {
+        });
+    };
+
+    auth.getOpenId().then(
+        function successCallback(response){
+            loadData($routeParams.id);
+        }, function errorCallback(response) {
+            alert("获取openid出错:"+response);
+        }
+    );
+
+    $scope.addJournalReply = function(data){
+        console.log(data.comment);
+        common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
+            $scope.formData = {comment: ''};
+            loadData($routeParams.id);
+        });
+    };
+
+    $scope.addPraise = function(act){
+        console.log(act);
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        console.log(act);
+        common.decreaseCommonPraise(act);
+    };
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/course_discussion.js b/public/javascripts/wechat/course_discussion.js
deleted file mode 100644
index e01b6b451..000000000
--- a/public/javascripts/wechat/course_discussion.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:c-message-detail-reply',{reply: data});
-        $('#all_course_message_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:course-discussion',{discussion: data});
-        $('#c-discussion-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "Type" : "Message",
-                "Content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);
-                    alert("6");
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    /*//点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/course_notice.js b/public/javascripts/wechat/course_notice.js
deleted file mode 100644
index 546aac385..000000000
--- a/public/javascripts/wechat/course_notice.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:news-detail-reply',{reply: data});
-        $('#all_news_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:course-notice',{course: data});
-        $('#c-notice-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'newss/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "type" : "News",
-                "content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/input_auto.js b/public/javascripts/wechat/directives/input_auto.js
new file mode 100644
index 000000000..bcb44141e
--- /dev/null
+++ b/public/javascripts/wechat/directives/input_auto.js
@@ -0,0 +1,19 @@
+app.directive('inputAuto',function(){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            var copyContainer = element.parent().children().eq(0);
+            var sendButton = element.parent().next();
+            element.on('input',function(){
+                console.log(sendButton);
+                copyContainer.html(element[0].value);
+                var textHeight = copyContainer[0].scrollHeight;
+                element.css('height', textHeight + 'px');
+            });
+            sendButton.on('click',function(){
+                element.css('height','28px');
+            });
+        }
+    }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/loading_spinner.js b/public/javascripts/wechat/directives/loading_spinner.js
new file mode 100644
index 000000000..780056828
--- /dev/null
+++ b/public/javascripts/wechat/directives/loading_spinner.js
@@ -0,0 +1,7 @@
+app.directive('loadingSpinner', ['$http', function ($http) {
+    return {
+        restrict: 'A',
+        replace: true,
+        template: '<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
+    };
+}]);
diff --git a/public/javascripts/wechat/gulpfile.js b/public/javascripts/wechat/gulpfile.js
index 439b6ae5d..ea0649376 100644
--- a/public/javascripts/wechat/gulpfile.js
+++ b/public/javascripts/wechat/gulpfile.js
@@ -8,3 +8,10 @@ gulp.task('minify', function () {
   .pipe(concat('angular.all.min.js'))
   .pipe(gulp.dest('build'))
 });
+
+gulp.task("default", function(){
+  gulp.src(['app.js','others/factory.js','others/filter.js', 'controllers/*.js', 'directives/*.js', 'others/routes.js'])
+      .pipe(uglify())
+      .pipe(concat('app.min.js'))
+      .pipe(gulp.dest('build'))
+});
diff --git a/public/javascripts/wechat/homework_detail.js b/public/javascripts/wechat/homework_detail.js
deleted file mode 100644
index 166ed20bf..000000000
--- a/public/javascripts/wechat/homework_detail.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Created by root on 3/31/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail-reply',{reply: data});
-        $('#all_homework_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail',{homework: data});
-        $('#homework-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'whomeworks/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            /*//将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            getOpenId(function(openid) {
-                //获取并传送回复用户数据
-                var userInfo = {
-                    "type": "HomeworkCommon",
-                    "content": postInput,
-                    openid: openid
-                };
-
-                $.ajax({
-                    type: "POST",     //提交方式
-                    dataType: "json",     //类型
-                    url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                    data: userInfo,    //参数，如果没有，可以为null
-                    success: function (data) { //如果执行成功，那么执行此方法
-                        setReplyTemplate(data.data);
-                    },
-                    error: function (err) { //如果执行不成功，那么执行此方法
-                        alert("err:" + err);
-                    }
-                })
-            });
-        }
-
-    };
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    };*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/issue_detail.js b/public/javascripts/wechat/issue_detail.js
deleted file mode 100644
index 2b2766d29..000000000
--- a/public/javascripts/wechat/issue_detail.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-/**
- * Created by root on 3/31/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:issue-detail-reply',{issue_reply: data});
-        $('#all_issue_reply').prepend(html);
-    };
-
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:issue-detail',{issues: data});
-        $('#issue-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            IssueReplyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'issues/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var IssueUrl = window.location.search;
-    var IssueID = IssueUrl.split("=")[1];
-
-    loadDataFromServer(IssueID);
-
-    //点击回复按钮，插入回复内容
-    var IssueReplyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            getOpenId(function(openid) {
-                //获取并传送回复用户数据
-                var userInfo = {
-                    "type": "Issue",
-                    "content": postInput,
-                    openid: openid,
-                };
-
-                $.ajax({
-                    type: "POST",     //提交方式
-                    dataType: "json",     //类型
-                    url: apiUrl + 'new_comment/' + IssueID,    //提交的页面，方法名
-                    data: userInfo,    //参数，如果没有，可以为null
-                    success: function (data) { //如果执行成功，那么执行此方法
-                        setReplyTemplate(data.data);
-                    },
-                    error: function (err) { //如果执行不成功，那么执行此方法
-                        alert("err:" + err);
-                    }
-                })
-            });
-        }
-
-    };
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    };*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/message_detail.js b/public/javascripts/wechat/message_detail.js
deleted file mode 100644
index 279da05d9..000000000
--- a/public/javascripts/wechat/message_detail.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:message-detail',{message: data});
-        $('#message-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        $('post-interactive-praise').click(function(){
-            praiseClick();
-        });
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'journal_for_messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "replyType" : "homework_assignment",
-                "replyContent" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: "前台地址/后台方法",    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    alert(data.d);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
new file mode 100644
index 000000000..955ca2faf
--- /dev/null
+++ b/public/javascripts/wechat/others/factory.js
@@ -0,0 +1,120 @@
+app.factory('auth', function($http,$routeParams, $q){
+    var _openid = '';
+
+    if(typeof g_openid !== 'undefined'){
+        _openid = g_openid;
+    }
+
+    if(debug===true){
+        _openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg"; //guange的帐号
+    }
+
+    var getOpenId = function() {
+        var deferred = $q.defer();
+        if (typeof _openid !== 'undefined' && _openid.length > 0){
+            deferred.resolve(_openid);
+        } else {
+            var code = $routeParams.code;
+            $http({
+                url: '/wechat/get_open_id',
+                data: {code: code},
+                method: 'POST'
+            }).then(function successCallback(response) {
+                _openid = response.data.openid;
+                deferred.resolve(_openid);
+            }, function errorCallback(response) {
+                deferred.reject(response);
+            });
+        }
+        return deferred.promise;
+    };
+    var openid = function(){
+        return _openid;
+    };
+    return {getOpenId: getOpenId, openid: openid};
+});
+
+
+app.factory('rms', function(){
+    var _saveStorage = {};
+    var save = function(key, value){
+        _saveStorage[key] = value;
+    };
+
+    var get = function(key){
+        return _saveStorage[key];
+    };
+
+    return {save: save, get: get};
+});
+
+app.factory('common', function($http, auth, $routeParams){
+    var addCommonReply = function(id, type, data, cb){
+
+        if(!data.comment || data.comment.length<=0){
+            return;
+        }
+
+        var temp =  data.comment.replace(/\n/g,'<br/>');
+
+        var userInfo = {
+            type: type,
+            content: temp,
+            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();
+            }
+        }, function errorCallback(response) {
+        });
+    };
+
+    var loadCommonData = function(id, type){
+        return $http({
+            method: 'GET',
+            url: apiUrl+ type + "/" + id+"?openid="+auth.openid()
+        })
+    };
+
+    var addCommonPraise = function(act){
+        act.praise_count += 1;
+        act.has_praise = true;
+
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{openid:auth.openid(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+
+    };
+
+    var decreaseCommonPraise = function(act){
+        act.praise_count -= 1;
+        act.has_praise = false;
+
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{openid:auth.openid(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+    };
+
+    return {addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/filter.js b/public/javascripts/wechat/others/filter.js
new file mode 100644
index 000000000..2f57c2417
--- /dev/null
+++ b/public/javascripts/wechat/others/filter.js
@@ -0,0 +1,5 @@
+app.filter('safeHtml', function ($sce) {
+    return function (input) {
+        return $sce.trustAsHtml(input);
+    }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
new file mode 100644
index 000000000..270c16edd
--- /dev/null
+++ b/public/javascripts/wechat/others/routes.js
@@ -0,0 +1,70 @@
+app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
+    var rootPath = '/assets/wechat/'
+    //$locationProvider.html5Mode(true);
+    $routeProvider
+        .when('/activites', {
+            templateUrl: rootPath + 'activities.html',
+            controller: 'ActivityController'
+        })
+        .when('/issues/:id', {
+            templateUrl: rootPath + 'issue_detail.html',
+            controller: 'IssueController'
+        })
+        .when('/project_discussion/:id', {
+            templateUrl: rootPath + 'project_discussion.html',
+            controller: 'DiscussionController'
+        })
+        .when('/homework/:id', {
+            templateUrl: rootPath + 'homework_detail.html',
+            controller: 'HomeworkController'
+        })
+        .when('/course_notice/:id', {
+            templateUrl: rootPath + 'course_notice.html',
+            controller: 'CourseNoticeController'
+        })
+        .when('/course_discussion/:id', {
+            templateUrl: rootPath + 'course_discussion.html',
+            controller: 'DiscussionController'
+        })
+        .when('/journal_for_message/:id', {
+            templateUrl: rootPath + 'jour_message_detail.html',
+            controller: 'JournalsController'
+        })
+        .when('/blog_comment/:id', {
+            templateUrl: rootPath + 'blog_detail.html',
+            controller: 'BlogController'
+        })
+        .when('/add_class', {
+            templateUrl: rootPath + 'add_class.html',
+            controller: 'AddClassController'
+        })
+        .otherwise({
+            redirectTo: '/activites'
+        });
+
+    //监听异步请求,实现加载中显隐标记
+    $httpProvider.interceptors.push(function ($q, $rootScope) {
+        if ($rootScope.activeCalls == undefined) {
+            $rootScope.activeCalls = 0;
+        }
+
+        return {
+            request: function (config) {
+                $rootScope.activeCalls += 1;
+                return config;
+            },
+            requestError: function (rejection) {
+                $rootScope.activeCalls -= 1;
+                return rejection;
+            },
+            response: function (response) {
+                $rootScope.activeCalls -= 1;
+                return response;
+            },
+            responseError: function (rejection) {
+                $rootScope.activeCalls -= 1;
+                return rejection;
+            }
+        };
+    });
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/project_discussion.js b/public/javascripts/wechat/project_discussion.js
deleted file mode 100644
index 94cdcea10..000000000
--- a/public/javascripts/wechat/project_discussion.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail-reply',{reply: data});
-        $('#all_homework_reply').prepend(html);
-    };
-
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:project-discussion',{discussion: data});
-        $('#p-discussion-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            /*//将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "type" : "Message",
-                "content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }*/
-
-
-});
\ No newline at end of file

From 5515fb660f4690f763a2fa678dde5d612c896d6e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 14 Jun 2016 14:47:02 +0800
Subject: [PATCH 393/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E6=97=B6=E5=80=99=20=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E7=BB=A7=E6=89=BF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb               | 4 ++++
 app/views/attachments/_show_attachment_history.html.erb | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index fe3c3272a..960bc61e6 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -265,6 +265,10 @@ class AttachmentsController < ApplicationController
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
       @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes")
+      # 如果附件描述被修改，则保存附件
+      unless params[:description] == @attachment.description
+        @old_attachment.description = params[:description]
+      end
       @old_attachment.save
       #删除当前记录
       @attachment.delete
diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index fb2afd308..edb3ef17e 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -39,6 +39,14 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
+      <div class="mb5">
+        <label class="fl c_dark f14" style="margin-top: 4px;">描述：</label>
+        <div class="fl">
+          <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
       <div class="uploadResourceIntr">
         <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
         <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>

From 01bd394a59a5467b614b0e95a1a3026c80aaf0dc Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Tue, 14 Jun 2016 15:08:13 +0800
Subject: [PATCH 394/668] =?UTF-8?q?=E9=97=A8=E6=88=B7=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=A5=8E=E6=AC=A30613=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_header.html.erb | 13 ++--
 .../organizations/_org_custom_left1.html.erb  | 66 +++---------------
 .../organizations/_org_custom_left3.html.erb  |  8 +--
 .../organizations/_org_custom_right3.html.erb | 26 -------
 public/stylesheets/org2.css                   |  2 +-
 public/stylesheets/org_custom.css             | 68 +++++++------------
 public/stylesheets/public.css                 |  2 +-
 7 files changed, 48 insertions(+), 137 deletions(-)

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 91ca5aafb..e1dd1d65b 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,10 +1,10 @@
 <div class="por_header_top">
-  <div class="por_header_con" >
-    <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
+  <div class="por_header_con " >
+    <%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
     <% if User.current.logged? %>
         <div class="navHomepageProfile" id="navHomepageProfile">
           <ul>
-            <li class="homepageProfileMenuIcon fr mt15" id="homepageProfileMenuIcon">
+            <li class="homepageProfileMenuIcon fr mt5 " id="homepageProfileMenuIcon">
               <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
               <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
                 <li><%= link_to "修改资料", my_account_path, :class => "menuGrey"%></li>
@@ -90,10 +90,11 @@
             <% end %>
         <% end %>
     <% end %>
+    <% if User.current.admin_of_org?(@organization) %>
+        <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index" target="_blank">配置</a>
+    <% end %>
   </ul>
-  <% if User.current.admin_of_org?(@organization) %>
-      <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index" target="_blank">配置</a>
-  <% end %>
+
   <div class="cl"></div>
 </div><!--por_nav end-->
 
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 4c1271ab8..7661b64d0 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -8,11 +8,11 @@
       </h2>
       <ul class="por_hotbar_left fl">
         <% if acts.count > 1 %>
-            <% acts[1..2].each do |activity| %>
+            <% acts[1..3].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <li>
-                      <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
+                      <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
                         <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
@@ -25,7 +25,7 @@
                         <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                         <% if message.board.org_subfield_id %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to document.title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
@@ -33,7 +33,7 @@
                             </li>
                         <% else %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to document.title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
@@ -44,7 +44,7 @@
                     <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
                         <% news = activity.org_act %>
                         <li>
-                          <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
+                          <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
                             <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                           </p>
@@ -54,54 +54,6 @@
                 <% end %>
             <% end %>
         <% end %>
-
-        <% if acts.count > 3 %>
-            <% activity = acts[3] %>
-            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
-                <% document = activity.org_act %>
-                <li>
-                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
-                  <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
-                    <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
-                  </p>
-                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                </li>
-            <% else activity.container_type == 'OrgSubfield' %>
-                <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                    <% message = activity.org_act %>
-                    <% content = message.parent_id.nil? ? message.content : message.parent.content %>
-                    <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
-                    <% if message.board.org_subfield_id %>
-                        <li>
-                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
-                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                        </li>
-                    <% else %>
-                        <li>
-                          <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
-                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                        </li>
-                    <% end %>
-                <% end %>
-                <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                    <% news = activity.org_act %>
-                    <li>
-                      <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
-                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
-                        <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                      </p>
-                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                    </li>
-                <% end %>
-            <% end %>
-        <% end %>
-
       </ul>
 
       <%# if acts.count > 3 %>
@@ -114,9 +66,11 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
-                <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                <div style="background: #f8fafb;">
+                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
+                  <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                </div>
               </div>
           <% else activity.container_type == 'OrgSubfield' %>
               <!--发送过来的帖子-->
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 3d5d01dee..fb2b83dd2 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -71,8 +71,8 @@
               <% end %>
           <% end %>
         </div>
-        <% unless acts[1..5].nil? %>
-            <% acts[1..5].each do |activity| %>
+        <% unless acts[1..4].nil? %>
+            <% acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <ul class="por_post_list">
@@ -110,10 +110,10 @@
             <% end %>
         <% end %>
       </div>
-      <% unless acts[6..19].nil? %>
+      <% unless acts[5..16].nil? %>
           <div class="fl">
             <ul class="por_post_right por_post_list">
-              <% acts[6..19].each do |activity| %>
+              <% acts[6..16].each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index a461a38dc..a7f819ca2 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -33,9 +33,6 @@
         <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
           <a href="javascript:void(0);" class="por_teachers_type">名师风采</a>
         </li>
-        <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
-          <a href="javascript:void(0);" class="por_teachers_type">学生英雄榜</a>
-        </li>
         <!--<a href="javascript:void(0);" target="_blank" class="f12 fontGrey2 fr mt5">更多></a>-->
         <div class="cl"></div>
       </ul>
@@ -65,29 +62,6 @@
           <% end %>
         </ul>
       </div>
-      <div id="por_teachers_content_2" class="undis">
-        <ul class="por_teachers_li">
-          <% excellent_students.each do |student| %>
-              <li >
-                <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
-                <div class="por_teachers_txt fl mt5">
-                  <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %>
-                  <p class="por_teachers_p fr" title="<%= student.my_workplace %>"><%= student.my_workplace %></p>
-                  <div class="cl"></div>
-                  <p class="por_teachers_span ">
-                    <% unless student.my_blogs_count == 0 %>
-                        <span class=" mr10">博客 <%= student.my_blogs_count %></span>
-                    <% end %>
-                    <% unless student.courses.count == 0 %>
-                        <span class="mr10">课程 <%= student.courses.count %></span>
-                    <% end %>
-                  </p>
-                </div>
-                <div class="cl"></div>
-              </li>
-          <% end %>
-        </ul>
-      </div>
     </div>
 
     <script>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 9e19fb5cb..23e53fd7b 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -197,7 +197,7 @@ a.sn-reply-username { color:#24366e; margin-right:15px; }
 .topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;}
 .topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block; line-height:0;}
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .none {display: none;}
 .user-img,.user-img img{ margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;}
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 0bdc8a670..95df98738 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -1,64 +1,64 @@
 /* 门户首页 */
 #por_header{ width:100%;   }
-.por_header_top{ width:100%; height:70px; background:#3b94d6; }
-.por_header_con{ width:1000px; margin:0 auto; height:70px;  }
-.por_logo{ margin-top:5px;}
+.por_header_top{ width:100%; height:55px; background:#3b94d6; }
+.por_header_con{ width:1000px; margin:0 auto; height:55px;  }
+.por_logo img{ margin-top:2px;  height:51px;}
 .por_login li{ float:left;}
-.por_login li a{ display:block; padding:0 15px; height:70px; line-height:70px;font-size:16px; color:#fff; }
+.por_login li a{ display:block; padding:0 15px; height:55px; line-height:55px;font-size:16px; color:#fff; }
 .por_login li a:hover{ background-color:#1173bc;}
-.por_search{ margin-top:15px; margin-right:20px;}
+.por_search{ margin-top:10px; margin-right:20px;}
 .pro_input_search{ background-color:#daeefc; height:36px; width:355px; border:none; padding:0 5px; color:#3b94d6;}
-a.por_search_btn{ display:block;background:#daeefc url(../images/org_custom/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
-a:hover.por_search_btn{background:#daeefc url(../images/org_custom/icons_por.png) -35px 8px  no-repeat; }
-.por_nav{ width:1000px; height:70px;  overflow:hidden;   margin: 0 auto; position:relative; }
-a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:20px;}
-.por_nav ul{ border-bottom:7px solid #ccc; height:63px;}
+a.por_search_btn{ display:block;background:#daeefc url(../images/icons_por.png) 0 8px  no-repeat; width:25px; height:36px;}
+a:hover.por_search_btn{background:#daeefc url(../images/icons_por.png) -35px 8px  no-repeat; }
+.por_nav{ width:100%;  height:50px; background-color:#eeefef; }
+.por_nav ul{ width:1000px;height:50px; overflow:hidden;   margin: 0 auto; position:relative;}
+a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
 .por_nav ul li{ float:left; }
-.por_nav ul li a{ display: block;  height:63px; padding:0 20px; line-height:63px; font-size:18px; color:#333; }
-.por_nav ul li a:hover{ border-bottom:7px solid #3b94d6; }
-.por_index_act{border-bottom:7px solid #3b94d6; }
+.por_nav ul li a{ display: block;  height:63px; padding:0 20px; line-height:50px; font-size:16px; color:#333; }
+.por_nav ul li a:hover{ color:#3b94d6; }
+.por_nav ul li a.por_index_act{color:#3b94d6; }
 
 #por_container{ width:1000px; margin:10px auto;}
 .por_left{ width:685px; margin-right:15px; float:left; }
 .por_right{ width:300px; float:left;}
 .por_icons_hot{ background:url(../images/org_custom/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
-.por_h2_index{ font-size:20px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
+.por_h2_index{ font-size:18px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
 a.por_more_index{ font-size:12px; color:#999; }
 .por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
 a.por_hot_title{ font-size:16px; display:block; font-weight:bold; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_hot_txt{ color:#666; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
 .por_time{ color:#999;}
 a.por_hot_name{color:#3b94d6;}
-.por_hotbar_right{ border:1px solid #e8e5e5; padding:5px; margin-top:15px; width:300px;}
+.por_hotbar_right{  padding:5px 0 5px 10px; margin-top:15px; width:300px; }
 .por_hotbar_right img{ width:300px; height:246px;}
 .por_hot_title_r{ font-size:16px; display:block; font-weight:bold; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_hot_txt_r{color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course{ }
-.por_course_bar{ width:328px; margin:0 7px; padding:20px 0; border-bottom:1px solid #e8e5e5;}
+.por_course_bar{ width:328px; margin:0 7px; padding:20px 0 0px;}
 a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_course_bar img{ width:140px; height:100px; }
 .por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course_time{color:#3b94d6; margin-left:5px;}
-.por_post{ border-bottom:1px solid #e8e5e5; padding-bottom:5px;}
+.por_post{  padding-bottom:5px;}
 .por_post_left{ width:394px; margin-top:15px;}
 .por_post_leftbar img{ width:377px; height:163px;}
 .por_post_leftbar { border-bottom:1px dashed #e8e5e5; padding-bottom:5px; margin-bottom:10px;}
 a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_post_txt{color:#666; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
-.post_icons_grey{ width:5px; height:5px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
-.por_post_list li{ height:20px; height:30px;}
+.post_icons_grey{ width:4px; height:4px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
+.por_post_list li{  height:35px;}
 .por_post_list li a{ font-size:14px; }
 a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_post_right{ width:280px; border-left:1px solid #e8e5e5; margin-top:15px; padding-left:10px;}
 .por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
-.por_users_img{ width:40px; height:40px; border:1px solid #e8e5e5;}
+.por_users_img{ width:40px; height:40px;  -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
 .por_news_txt{ width:245px; margin-left:10px;}
 .por_news_p{ line-height:20px;max-height:40px;min-width:240px;overflow:hidden;text-overflow:ellipsis;  }
 a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
 a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
 .por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.por_projects{border-bottom:1px solid #e8e5e5; padding-bottom:10px; margin-top:10px;}
+.por_projects{ padding-bottom:10px; margin-top:10px;}
 .por_projects ul li{ padding:5px 0;}
 .por_projects ul{ margin-top:5px;}
 .por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#666;  }
@@ -67,8 +67,8 @@ a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px n
 .por_teachers{ margin-top:20px; }
 #por_teachers_nav {border-bottom:1px solid #d0d0d0; height:31px;}
 #por_teachers_nav li {float:left; padding:0px 5px; text-align:center;  }
-#por_teachers_nav li a{font-size:20px;}
-.por_teachers_hover {border:1px solid #d0d0d0; border-bottom:1px solid #fff;  }
+#por_teachers_nav li a{font-size:18px;}
+.por_teachers_hover {  }
 .por_teachers_hover a{color:#3b94d6;}
 .por_teachers_nomal {border-bottom:none; }
 .por_teachers_nomal a{color:#999;}
@@ -76,7 +76,7 @@ a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px n
 .dis {display:block;}
 a.por_more_teacher{ font-size:12px; }
 .por_teachers_li{ margin-top:10px;}
-.por_teachers_li li{ padding:10px 0;border-bottom:1px solid #e8e5e5;}
+.por_teachers_li li{ padding:10px 0;}
 .por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
 a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
@@ -88,22 +88,4 @@ a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden;
 .por_footer_con ul li{ float:left; text-align:center;}
 .por_footer_con ul li a{ font-size:14px;}
 .por_footer_con ul li a span{ color:#999; margin:0 15px ;}
-.por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+.por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9306fa0b..a97abb8e3 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -533,7 +533,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
 .newsActive {width:16px; height:16px; border-radius:50%;  background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 2px;padding-right: 1px;font-weight: bold;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block;}
 .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
 .navHomepageProfile ul li ul {display:none;}
 .navHomepageProfile ul li:hover ul {display:block;}

From 254e1f44f618b822612a3f3e1ca7ca9185962382 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 15:44:03 +0800
Subject: [PATCH 395/668] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84=E4=BF=AE=E6=94=B9=E4=B8=8E=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_set_score_rule_detail.html.erb           | 24 +++++++++++++++----
 public/javascripts/course.js                  |  2 +-
 public/javascripts/new_user.js                | 18 ++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb
index fe2c734e5..eaabc81df 100644
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -2,12 +2,14 @@
   <span class="uploadText">评分设置</span>
   <div class="mt15">
     <span class="f14 fontGrey3 mr10">迟交扣分</span>
-    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <span class="f12 c_red ml10">请输入0-50数值</span>
   </div>
   <% if homework.anonymous_comment == 0 %>
-      <div>
+      <div class="mt10">
         <span class="f14 fontGrey3 mr10">缺评扣分</span>
-        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <span class="f12 c_red ml10">请输入0-50数值</span>
       </div>
   <% end %>
 
@@ -55,11 +57,23 @@
   </div>
   <div>
     <div class="courseSendSubmit">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();clickCanel();">确定</a>
+      <a href="javascript:void(0);" class="sendSourceText" onclick="set_score_rule_submit();">确定</a>
     </div>
     <div class="courseSendCancel">
       <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="hideModal();">取消</a>
     </div>
   </div>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+  function set_score_rule_submit() {
+      if($("#late_penalty_num").val() == ""){
+          $("#late_penalty_num").val("0");
+      }
+      if($("#absence_penalty_num").val() == ""){
+          $("#absence_penalty_num").val("0");
+      }
+      $('#ajax-modal').find('form').submit();
+      clickCanel();
+  }
+</script>
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 9f6b6aabd..6fbf9f8c4 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -550,7 +550,7 @@ function check_late_penalty(id)
     }
     else
     {
-        obj.val("0");
+        obj.val("");
     }
 }
 
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index b6301afad..2771dd191 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -259,6 +259,24 @@ function regex_evaluation_end(){
     }
 }
 
+//处理迟交、缺评扣分
+function check_late_penalty(id)
+{
+    var obj = $("#" + id);
+    var regex = /^\d+$/;
+    if(regex.test(obj.val()))
+    {
+        if(obj.val() > 50)
+        {
+            obj.val("50");
+        }
+    }
+    else
+    {
+        obj.val("");
+    }
+}
+
 //验证匿评数量
 function regex_evaluation_num(){
     var evaluation_num = $.trim($("#evaluation_num").val());

From ada15b42123536486f0e62f76cb5f3072ccebd06 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 14 Jun 2016 16:03:10 +0800
Subject: [PATCH 396/668] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4,=20=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=88=86=E5=BC=80=E5=86=99,=E4=BD=86=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=B6=E6=89=93=E6=88=90=E4=B8=80=E4=B8=AAjs=E6=8F=90?=
 =?UTF-8?q?=E9=AB=98=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb    |  4 +-
 public/assets/wechat/app.html                 | 13 ++++-
 public/javascripts/wechat/app.js              |  7 ---
 public/javascripts/wechat/build/app.min.js    | 14 +++++
 .../wechat/controllers/activity.js            |  6 +-
 public/javascripts/wechat/controllers/blog.js |  6 +-
 .../wechat/controllers/course_notice.js       |  5 +-
 .../wechat/controllers/discussion.js          |  4 +-
 .../wechat/controllers/homework.js            |  4 +-
 .../javascripts/wechat/controllers/issue.js   |  4 +-
 .../wechat/controllers/journals.js            |  4 +-
 public/javascripts/wechat/others/factory.js   | 12 ++--
 public/javascripts/wechat/others/filter.js    |  4 +-
 public/javascripts/wechat/others/routes.js    |  4 +-
 public/javascripts/wechat/wechat_dev.js       | 57 -------------------
 script/assets                                 |  3 +
 16 files changed, 59 insertions(+), 92 deletions(-)
 create mode 100644 public/javascripts/wechat/build/app.min.js
 delete mode 100644 public/javascripts/wechat/wechat_dev.js
 create mode 100644 script/assets

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 3d61d8fcf..073d45495 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -13,6 +13,8 @@
 
   <script type="text/javascript">
     window.g_openid = '<%= @wechat_user.openid %>';
+    window.g_debug = false; //调试标志,如果在本地请置为true
+    window.apiUrl = '/api/v1/';
   </script>
 
 </head>
@@ -21,7 +23,7 @@
 </div>
 
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
-<script src="/javascripts/wechat/app.js"></script>
+<script src="/javascripts/wechat/build/app.min.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index d88efe50f..cabd224c4 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -2,7 +2,7 @@
 <html ng-app="wechat">
 <head>
     <base href="/">
-    <title>我的动态</title>
+    <title>仅供本地调试使用</title>
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />
@@ -17,7 +17,15 @@
 <div ng-view>
 </div>
 
+<script type="text/javascript">
+    window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
+    window.g_debug = true; //调试标志,如果在本地请置为true
+    window.apiUrl = 'http://localhost:3000/api/v1/';
+</script>
+
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
+<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
+
 
 <script src="/javascripts/wechat/app.js"></script>
 <script src="/javascripts/wechat/others/factory.js"></script>
@@ -33,6 +41,9 @@
 <script src="/javascripts/wechat/controllers/issue.js"></script>
 <script src="/javascripts/wechat/controllers/journals.js"></script>
 <script src="/javascripts/wechat/others/routes.js"></script>
+
+
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index adf445b51..4d947e440 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,8 +1 @@
 var app = angular.module('wechat', ['ngRoute']);
-var apiUrl = '/api/v1/';
-var debug = true; //调试标志,如果在本地请置为true
-
-if(debug===true){
-    apiUrl = 'http://localhost:3000/api/v1/';
-    //apiUrl = 'http://www.trustie.net/api/v1/';
-}
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
new file mode 100644
index 000000000..d8eacbf1b
--- /dev/null
+++ b/public/javascripts/wechat/build/app.min.js
@@ -0,0 +1,14 @@
+var app=angular.module("wechat",["ngRoute"]);
+app.factory("auth",["$http","$routeParams","$q",function(e,n,t){var o="";"undefined"!=typeof g_openid&&(o=g_openid);var a=function(){var a=t.defer();if("undefined"!=typeof o&&o.length>0)a.resolve(o);else{var i=n.code;e({url:"/wechat/get_open_id",data:{code:i},method:"POST"}).then(function(e){o=e.data.openid,a.resolve(o)},function(e){a.reject(e)})}return a.promise},i=function(){return o};return{getOpenId:a,openid:i}}]),app.factory("rms",function(){var e={},n=function(n,t){e[n]=t},t=function(n){return e[n]};return{save:n,get:t}}),app.factory("common",["$http","auth","$routeParams",function(e,n,t){var o=function(t,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),d={type:o,content:r,openid:n.openid()};a.disabled=!0,e({method:"POST",url:apiUrl+"new_comment/"+t,data:d}).then(function(e){a.disabled=!1,"function"==typeof i&&i()},function(e){})}},a=function(t,o){return e({method:"GET",url:apiUrl+o+"/"+t+"?openid="+n.openid()})},i=function(t){t.praise_count+=1,t.has_praise=!0,e({method:"POST",url:apiUrl+"praise/"+t.act_id,data:{openid:n.openid(),type:t.act_type}}).then(function(e){console.log(e.data)},function(e){})},r=function(t){t.praise_count-=1,t.has_praise=!1,e({method:"POST",url:apiUrl+"praise/"+t.act_id,data:{openid:n.openid(),type:t.act_type}}).then(function(e){console.log(e.data)},function(e){})};return{addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
+app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]);
+app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common",function(t,a,e,o,i,n,c,s){e.replaceUrl=function(t){return t},console.log("ActivityController load"),e.page=c.get("page")||0,e.activities=c.get("activities")||[],e.has_more=c.get("has_more"),e.loadActData=function(t){e.page=t,o({method:"POST",url:apiUrl+"activities",data:{openid:n.openid(),page:t}}).then(function(t){t.data.page>0?e.activities=e.activities.concat(t.data.data):e.activities=t.data.data,c.save("activities",e.activities),e.has_more=t.data.count+10*t.data.page<t.data.all_count,c.save("has_more",e.has_more),c.save("page",t.data.page),console.log(t.data)},function(t){})},e.activities.length<=0?n.getOpenId().then(function(t){e.loadActData(0)},function(t){alert("获取openid出错:"+t)}):i(function(){window.scrollTo(0,c.get("yoffset"))}),e.goDetail=function(t,e,o){c.save("yoffset",window.document.body.scrollTop),a.path("/"+t+"/"+e)},e.addPraise=function(t){s.addCommonPraise(t)},e.decreasePraise=function(t){s.decreaseCommonPraise(t)}}]);
+app.controller("AddClassController",["$scope",function(o){}]);
+app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,n,e,t,a){o.formData={comment:""};var c=function(n){a.loadCommonData(n,"blog_comments").then(function(n){console.log(n.data),o.blog=n.data.data},function(o){})};t.getOpenId().then(function(o){c(e.id)},function(o){alert("获取openid出错:"+o)}),o.addBlogReply=function(n){console.log(n.comment),a.addCommonReply(e.id,"BlogComment",n,function(){o.formData={comment:""},c(e.id)})},o.addPraise=function(o){console.log(o),a.addCommonPraise(o)},o.decreasePraise=function(o){console.log(o),a.decreaseCommonPraise(o)}}]);
+app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,n,e,t,a){o.formData={comment:""};var c=function(n){a.loadCommonData(n,"newss").then(function(n){console.log(n.data),o.news=n.data.data},function(o){})};t.getOpenId().then(function(o){c(e.id)},function(o){alert("获取openid出错:"+o)}),o.addNoticeReply=function(n){console.log(n.comment),a.addCommonReply(e.id,"News",n,function(){o.formData={comment:""},c(e.id)})},o.addPraise=function(o){a.addCommonPraise(o)},o.decreasePraise=function(o){a.decreaseCommonPraise(o)}}]);
+app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,n,a,e,t){o.formData={comment:""};var i=function(n){t.loadCommonData(n,"messages").then(function(n){console.log(n.data),o.discussion=n.data.data},function(o){})};e.getOpenId().then(function(o){i(a.id)},function(o){alert("获取openid出错:"+o)}),o.addDiscussionReply=function(n){console.log(n.comment),t.addCommonReply(a.id,"Message",n,function(){o.formData={comment:""},i(a.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
+app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,n,e,a,t){o.formData={comment:""};var m=function(n){t.loadCommonData(n,"whomeworks").then(function(n){console.log(n.data),o.homework=n.data.data},function(o){})};a.getOpenId().then(function(o){m(e.id)},function(o){alert("获取openid出错:"+o)}),o.addHomeworkReply=function(n){console.log(n.comment),t.addCommonReply(e.id,"HomeworkCommon",n,function(){o.formData={comment:""},m(e.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
+app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,n,e,a,t){o.formData={comment:""};var s=function(n){t.loadCommonData(n,"issues").then(function(n){console.log(n.data),o.issue=n.data.data},function(o){})};a.getOpenId().then(function(o){s(e.id)},function(o){alert("获取openid出错:"+o)}),o.addIssueReply=function(n){console.log(n.comment),t.addCommonReply(e.id,"Issue",n,function(){o.formData={comment:""},s(e.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
+app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,n,a,e,t){o.formData={comment:""};var c=function(n){t.loadCommonData(n,"journal_for_messages").then(function(n){console.log(n.data),o.message=n.data.data},function(o){})};e.getOpenId().then(function(o){c(a.id)},function(o){alert("获取openid出错:"+o)}),o.addJournalReply=function(n){console.log(n.comment),t.addCommonReply(a.id,"JournalsForMessage",n,function(){o.formData={comment:""},c(a.id)})},o.addPraise=function(o){console.log(o),t.addCommonPraise(o)},o.decreasePraise=function(o){console.log(o),t.decreaseCommonPraise(o)}}]);
+app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
+app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
+app.config(["$routeProvider","$httpProvider","$locationProvider",function(e,r,t){var o="/assets/wechat/";e.when("/activites",{templateUrl:o+"activities.html",controller:"ActivityController"}).when("/issues/:id",{templateUrl:o+"issue_detail.html",controller:"IssueController"}).when("/project_discussion/:id",{templateUrl:o+"project_discussion.html",controller:"DiscussionController"}).when("/homework/:id",{templateUrl:o+"homework_detail.html",controller:"HomeworkController"}).when("/course_notice/:id",{templateUrl:o+"course_notice.html",controller:"CourseNoticeController"}).when("/course_discussion/:id",{templateUrl:o+"course_discussion.html",controller:"DiscussionController"}).when("/journal_for_message/:id",{templateUrl:o+"jour_message_detail.html",controller:"JournalsController"}).when("/blog_comment/:id",{templateUrl:o+"blog_detail.html",controller:"BlogController"}).when("/add_class",{templateUrl:o+"add_class.html",controller:"AddClassController"}).otherwise({redirectTo:"/activites"}),r.interceptors.push(["$q","$rootScope",function(e,r){return void 0==r.activeCalls&&(r.activeCalls=0),{request:function(e){return r.activeCalls+=1,e},requestError:function(e){return r.activeCalls-=1,e},response:function(e){return r.activeCalls-=1,e},responseError:function(e){return r.activeCalls-=1,e}}}])}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 732772e13..e17b7c5b3 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -1,5 +1,7 @@
 
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
+app.controller('ActivityController',
+    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common',
+    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -63,4 +65,4 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 56589122a..8eb45b604 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -1,5 +1,7 @@
 
-app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
+app.controller('BlogController',
+    ['$scope', '$http', '$routeParams', 'auth', 'common',
+    function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -35,4 +37,4 @@ app.controller('BlogController', function($scope, $http, $routeParams, auth, com
         console.log(act);
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
index 9a60d2222..24b0fdbe1 100644
--- a/public/javascripts/wechat/controllers/course_notice.js
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -1,4 +1,5 @@
-app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
+app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'auth', 'common',
+    function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -32,4 +33,4 @@ app.controller('CourseNoticeController', function($scope, $http, $routeParams, a
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
index 479f473bf..4828cb39a 100644
--- a/public/javascripts/wechat/controllers/discussion.js
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -1,5 +1,5 @@
 
-app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
+app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -33,4 +33,4 @@ app.controller('DiscussionController', function($scope, $http, $routeParams, aut
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
index 5fb890741..795bf30e9 100644
--- a/public/javascripts/wechat/controllers/homework.js
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -1,5 +1,5 @@
 
-app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
+app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -33,4 +33,4 @@ app.controller('HomeworkController', function($scope, $http, $routeParams, auth,
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-});
+}]);
diff --git a/public/javascripts/wechat/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
index 53bdbf265..09602f9e1 100644
--- a/public/javascripts/wechat/controllers/issue.js
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -1,4 +1,4 @@
-app.controller('IssueController', function($scope, $http, $routeParams, auth, common){
+app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -33,4 +33,4 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth, co
     $scope.decreasePraise = function(act){
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
index c292b1932..f379525d7 100644
--- a/public/javascripts/wechat/controllers/journals.js
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -1,4 +1,4 @@
-app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
+app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
     $scope.formData = {comment: ''};
 
     var loadData = function(id){
@@ -34,4 +34,4 @@ app.controller('JournalsController', function($scope, $http, $routeParams, auth,
         console.log(act);
         common.decreaseCommonPraise(act);
     };
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 955ca2faf..cefef3ab9 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -1,14 +1,10 @@
-app.factory('auth', function($http,$routeParams, $q){
+app.factory('auth', ['$http','$routeParams', '$q', function($http,$routeParams, $q){
     var _openid = '';
 
     if(typeof g_openid !== 'undefined'){
         _openid = g_openid;
     }
 
-    if(debug===true){
-        _openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg"; //guange的帐号
-    }
-
     var getOpenId = function() {
         var deferred = $q.defer();
         if (typeof _openid !== 'undefined' && _openid.length > 0){
@@ -32,7 +28,7 @@ app.factory('auth', function($http,$routeParams, $q){
         return _openid;
     };
     return {getOpenId: getOpenId, openid: openid};
-});
+}]);
 
 
 app.factory('rms', function(){
@@ -48,7 +44,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.factory('common', function($http, auth, $routeParams){
+app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $routeParams){
     var addCommonReply = function(id, type, data, cb){
 
         if(!data.comment || data.comment.length<=0){
@@ -117,4 +113,4 @@ app.factory('common', function($http, auth, $routeParams){
     };
 
     return {addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/filter.js b/public/javascripts/wechat/others/filter.js
index 2f57c2417..dcb8e9e6a 100644
--- a/public/javascripts/wechat/others/filter.js
+++ b/public/javascripts/wechat/others/filter.js
@@ -1,5 +1,5 @@
-app.filter('safeHtml', function ($sce) {
+app.filter('safeHtml', ['$sce',function ($sce) {
     return function (input) {
         return $sce.trustAsHtml(input);
     }
-});
\ No newline at end of file
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 270c16edd..7ea270c6e 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -43,7 +43,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($rou
         });
 
     //监听异步请求,实现加载中显隐标记
-    $httpProvider.interceptors.push(function ($q, $rootScope) {
+    $httpProvider.interceptors.push(['$q', '$rootScope', function ($q, $rootScope) {
         if ($rootScope.activeCalls == undefined) {
             $rootScope.activeCalls = 0;
         }
@@ -66,5 +66,5 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($rou
                 return rejection;
             }
         };
-    });
+    }]);
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/wechat_dev.js b/public/javascripts/wechat/wechat_dev.js
deleted file mode 100644
index 36529e0b8..000000000
--- a/public/javascripts/wechat/wechat_dev.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Created by root on 3/25/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-    var apiUrl = '/api/v1/';
-    var loadDataFromServer = function(id, page){
-        getOpenId(function(openid){
-            $.ajax({
-                url: apiUrl + 'activities',
-                data: {openid: openid, page: page},
-                type: 'POST',
-                dataType: 'json',
-                success: function(data){
-                    setTemplate(data.data, data.all_count, data.count, data.page);
-                },
-                error: function(xhr,status,err){
-                    console.log(err);
-                }
-            });
-        })
-
-    };
-    var setTemplate = function(data, all_count, count, page){
-        console.log(data);
-        var html=bt('t:result-list',{activities: data, all_count: all_count, count: count, page: page});
-        if (page == 0) {
-            $('#container').prepend(html);
-        } else {
-            $("#more_activities").remove();
-            $('#container').append(html);
-        }
-        descToggle();
-    };
-    //内容全部显示与部分隐藏
-    var descToggle = function(){
-        $(".post-all-content").each(function(){
-            var postHeight = $(this).height();
-            if (postHeight > 90){
-                $(this).parent().next().css("display","block");
-                $(this).parent().next().toggle(function(){
-                    $(this).text("点击隐藏");
-                    $(this).prev().css("height",postHeight);
-                },function(){
-                    $(this).text("点击展开");
-                    $(this).prev().css("height",90);
-                });
-            }
-        });
-    }
-
-    loadDataFromServer(8686, 0);
-});
diff --git a/script/assets b/script/assets
new file mode 100644
index 000000000..bf4501127
--- /dev/null
+++ b/script/assets
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd public/javascripts/wechat && gulp  && gulp minify

From c50d307e897974d09401b34b1544fcbeca505088 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 17:36:12 +0800
Subject: [PATCH 397/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E5=90=8E=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9C=AA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 14 +++++++++++
 .../_choose_group_member.html.erb             | 25 +++++++++++++++++++
 .../search_course_students.js.erb             |  5 ++--
 config/routes.rb                              |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 10431f01a..9e537d551 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1115,6 +1115,20 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def get_user_infor
+    req = Hash.new(false)
+    user = User.where("id = #{params[:user_id].to_i}").first
+    if user
+      req[:id] = user.id
+      req[:name] = user.show_name
+      req[:student_id] = user.user_extensions.student_id
+      req[:valid] = true
+    else
+      req[:valid] = false
+    end
+    render :json => req
+  end
+
   private
   def searchstudent_by_name  users, name
     mems = []
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index c47c31d9d..b76f94511 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -105,6 +105,31 @@
                 $("#choose_students_list").append(link);
             <% end %>
         <% end %>
+        var ids = $("#group_member_ids").val().split(',');
+        if (ids.length > 1){
+            for(var i=1; i<ids.length; i++) {
+                $.get(
+                        '/student_work/get_user_infor',
+                        {
+                            user_id: ids[i]
+                        },
+                        function (data) {
+                            if (data.valid) {
+                                var link = "<li id='choose_student_"+data.id+"' onclick='delete_student("+data.id+");'>"+data.name;
+                                if (data.student_id != "" ) {
+                                    link += "("+data.student_id+")";
+                                }
+                                link += "</li>";
+                                $("#choose_students_list").append(link);
+                            }
+                            else
+                            {
+
+                            }
+                        }
+                );
+            }
+        }
     });
 </script>
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index c7aa982b9..2ac4eeaab 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -7,7 +7,8 @@ $("#all_students_list").empty();
     link += "</li>";
     $("#all_students_list").append(link);
 
-    var str = "";
+    var str = $("#group_member_ids").val();
+    /*var str = "";
     var lists = $("#choose_students_list li");
     if(lists.length > 0) {
         for(var i=0; i<lists.length; i++) {
@@ -17,7 +18,7 @@ $("#all_students_list").empty();
                 str += ",";
         }
     }
-}
+}*/
     <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
         if (str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {
diff --git a/config/routes.rb b/config/routes.rb
index 91ab5cffe..2c1362359 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,6 +329,7 @@ RedmineApp::Application.routes.draw do
       post 'last_codecomparetime'
       post 'set_score_rule'
       get 'work_canrepeat'
+      get 'get_user_infor'
     end
   end
 

From e7c856be0b7aa9caf596671f37740be3b86f6528 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jun 2016 09:30:36 +0800
Subject: [PATCH 398/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9F=9F=E5=90=8D500?=
 =?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/controllers/org_subfields_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 159648f34..1b24a6730 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -56,7 +56,7 @@ class OrgSubfieldsController < ApplicationController
       @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
                                                   "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
                                                   " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
-      if @org_subfield.field_type == 'Post'
+      if @org_subfield.try(:field_type) == 'Post'
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
         @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
         #redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id)

From 8fd4d518b26b159b6fe5040497c49b0944cc24af Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 15 Jun 2016 13:44:28 +0800
Subject: [PATCH 399/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb                         |  3 +-
 app/api/mobile/apis/courses.rb                | 25 ++++++--------
 app/helpers/api_helper.rb                     | 22 ++++++++++++
 app/models/course.rb                          | 19 +++++++++++
 app/services/courses_service.rb               | 34 ++++++++++++-------
 ...0160614072229_add_invite_code_to_course.rb |  5 +++
 db/schema.rb                                  |  3 +-
 7 files changed, 81 insertions(+), 30 deletions(-)
 create mode 100644 db/migrate/20160614072229_add_invite_code_to_course.rb

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index c86a36d05..058687776 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -67,8 +67,7 @@ module Mobile
     mount Apis::NewComment
     mount Apis::Praise
 
-    #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-    #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
+    add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 3a36a9e37..b585e7dae 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -97,25 +97,22 @@ module Mobile
 
         desc "加入课程"
         params do
-          requires :course_password, type: String
+          optional :openid, type: String, desc: '微信ID'
+          requires :invite_code, type: String, desc: '邀请码'
         end
-        post ":id" do
+        post "join" do
           authenticate!
+
           cs = CoursesService.new
-          status = cs.join_course({:object_id => params[:id],:course_password => params[:course_password]},current_user)
-          out = {status: status[:state]}
-          message = case status[:state]
-          when 0; "加入成功"
-          when 1; "密码错误"
-          when 2; "课程已过期 请联系课程管理员重启课程。(在配置课程处)"
-          when 3; "您已经加入了课程"
-          when 4; "您加入的课程不存在"
-          when 5; "您还未登录"
-          else; "未知错误，请稍后再试"
-          end
-          out.merge(message: message)
+          status = cs.join_course({openid: params[:openid], invite_code: params[:invite_code]}, current_user)
+
+          {
+              status: status[:state],
+              messsge:CoursesService::JoinCourseError.message(status[:state])
+          }
         end
 
+
         desc "退出课程"
         params do
           requires :token, type: String
diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index fb1231287..e993b120f 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -489,4 +489,26 @@ module ApiHelper
     self.update_attribute(:praise_num, self.praise_num.to_i - num)
   end
 
+
+  class Errors
+    def self.define_error(arr)
+      @errors = {}
+      arr.each_with_index { |item, index|
+        if index %2 == 1
+          @errors[arr[index-1]] = item
+        end
+      }
+      if arr.count % 2== 1
+        @default_error =  arr.last
+      else
+        @default_error =  "未知错误"
+      end
+
+    end
+
+    def self.message(msg_id)
+      @errors[msg_id] || @default_error
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/app/models/course.rb b/app/models/course.rb
index 69dbec5d0..d379b24d3 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -1,3 +1,5 @@
+#coding=utf-8
+
 require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
@@ -404,6 +406,7 @@ class Course < ActiveRecord::Base
     self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
   end
 
+
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
@@ -450,6 +453,22 @@ class Course < ActiveRecord::Base
     end
   end
 
+  # 生成邀请码
+  CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
+  def generate_invite_code
+    code = invite_code
+    if !invite_code || invite_code.size <6
+      self.invite_code = CODES.sample(6).join
+      save! && reload
+      code = invite_code
+    end
+    code
+  end
+
+  def 
+    
+  end
+
 
 end
 
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 2c8387349..93529f57c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -300,23 +300,31 @@ class CoursesService
     @state
   end
 
+  class JoinCourseError < Errors
+    define_error [
+        0, '加入成功',
+        1, '密码错误',
+        2, '课程已过期 请联系课程管理员重启课程。',
+        3, '您已经加入了课程',
+        4, '您加入的课程不存在',
+        5, '您还未登录',
+        6, '申请成功，请等待审核完毕',
+        7, '您已经发送过申请了，请耐心等待',
+        8, '您已经是该课程的教师了',
+        9, '您已经是该课程的教辅了',
+        10, '您已经是该课程的管理员了',
+        '未知错误，请稍后再试'
+    ]
+  end
   #加入课程
   #object_id：课程id
   #course_password ：加入课程的密码
-  #@state == 0 加入成功
-  #@state == 1 密码错误
-  #@state == 2 课程已过期 请联系课程管理员重启课程。(在配置课程处)
-  #@state == 3 您已经加入了课程
-  #@state == 4 您加入的课程不存在
-  #@state == 5 您还未登录
-  #@state == 6 申请成功，请等待审核完毕
-  #@state == 7 您已经发送过申请了，请耐心等待
-  #@state == 8 您已经是该课程的教师了
-  #@state == 9 您已经是该课程的教辅了
-  #@state == 10 您已经是该课程的管理员了
-  #@state 其他 未知错误，请稍后再试
   def join_course params,current_user
-    course = Course.find_by_id params[:object_id]
+    course = if params[:invite_code]
+      Course.find_by_invite_code(params[:invite_code])
+    else
+      Course.find_by_id params[:object_id]
+    end
 
     @state = 10
     if course
diff --git a/db/migrate/20160614072229_add_invite_code_to_course.rb b/db/migrate/20160614072229_add_invite_code_to_course.rb
new file mode 100644
index 000000000..8f7bb8da1
--- /dev/null
+++ b/db/migrate/20160614072229_add_invite_code_to_course.rb
@@ -0,0 +1,5 @@
+class AddInviteCodeToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :invite_code, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 95ffceef1..820c6a035 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 => 20160612043259) do
+ActiveRecord::Schema.define(:version => 20160614072229) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -550,6 +550,7 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.string   "invite_code"
   end
 
   create_table "custom_fields", :force => true do |t|

From f7832b00c9a8e89819bd939420816fa6007e7056 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 15 Jun 2016 14:02:09 +0800
Subject: [PATCH 400/668] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=B6=E6=8F=8F=E8=BF=B0=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_attachment_history.html.erb         |    5 +-
 .../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 +-
 20 files changed, 3030 insertions(+), 3029 deletions(-)

diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index edb3ef17e..6e2994a8d 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -39,8 +39,9 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
-      <div class="mb5">
-        <label class="fl c_dark f14" style="margin-top: 4px;">描述：</label>
+      <div class="cl"></div>
+      <div class="mb5 mt5">
+        <label class="fl c_dark f14" style="line-height:30px;">描述：</label>
         <div class="fl">
           <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
         </div>
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 caa966c85a52a40c70bfb950e37b05913b6ce165 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 15 Jun 2016 14:12:42 +0800
Subject: [PATCH 401/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=20=E5=88=86=E7=BB=84=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=9C=80=E5=B0=8F=E4=BA=BA=E6=95=B0=E9=99=90=E5=88=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B7=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    |  3 +-
 .../_choose_group_member.html.erb             | 48 ++++++++-----------
 .../student_work/_student_work_list.html.erb  | 15 ++++--
 app/views/student_work/edit.html.erb          | 26 +++++-----
 app/views/student_work/new.html.erb           | 26 +++++-----
 app/views/student_work/retry_work.js.erb      |  3 +-
 6 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9e537d551..22047efee 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1096,7 +1096,8 @@ class StudentWorkController < ApplicationController
       all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
     end
     all_students = User.where("id in #{all_student_ids}")
-    @commit_student_ids = @homework.student_work_projects.map{|student| student.user_id}
+    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
+    @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
     respond_to do |format|
       format.js
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index b76f94511..e7d776cea 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -93,41 +93,31 @@
             url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
             type:'get'
         });
-        <% if defined?(edit_mode) && edit_mode %>
-            <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
-            <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
-            <% members.each do |member| %>
-                var link = "<li id='choose_student_<%=member.user_id%>' onclick='delete_student(<%=member.user_id %>);'><%=member.user.show_name %>";
-                <% unless member.user.user_extensions.student_id == "" %>
-                link += "(<%=member.user.user_extensions.student_id %>)";
-                <% end %>
-                link += "</li>";
-                $("#choose_students_list").append(link);
-            <% end %>
-        <% end %>
         var ids = $("#group_member_ids").val().split(',');
         if (ids.length > 1){
             for(var i=1; i<ids.length; i++) {
-                $.get(
-                        '/student_work/get_user_infor',
-                        {
-                            user_id: ids[i]
-                        },
-                        function (data) {
-                            if (data.valid) {
-                                var link = "<li id='choose_student_"+data.id+"' onclick='delete_student("+data.id+");'>"+data.name;
-                                if (data.student_id != "" ) {
-                                    link += "("+data.student_id+")";
-                                }
-                                link += "</li>";
-                                $("#choose_students_list").append(link);
-                            }
-                            else
+                if($("#choose_student_"+ids[i]).length == 0) {
+                    $.get(
+                            '/student_work/get_user_infor',
                             {
+                                user_id: ids[i]
+                            },
+                            function (data) {
+                                if (data.valid) {
+                                    var link = "<li id='choose_student_"+data.id+"' onclick='delete_student("+data.id+");'>"+data.name;
+                                    if (data.student_id != "" ) {
+                                        link += "("+data.student_id+")";
+                                    }
+                                    link += "</li>";
+                                    $("#choose_students_list").append(link);
+                                }
+                                else
+                                {
 
+                                }
                             }
-                        }
-                );
+                    );
+                }
             }
         }
     });
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index eaf6b9304..cc078bf9c 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -4,14 +4,21 @@
       <font class="f12 c_red">
         (<%= @student_work_count%>人已交)
       </font>
-    <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <%# my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <% my_work = cur_user_works_for_homework @homework %>
     <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
-        <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+        <% unless @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+            <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+        <% end %>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
-       <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
+       <span class="f12 c_red">已提交且不可再修改，因为截止日期已过</span>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
-       <span class="f12 c_red">您已提交，您还可以修改</span>
+        <% if @homework.homework_type == 3 %>
+            <span class="f12 c_red">组长已提交，组长还可修改</span>
+        <% else %>
+            <span class="f12 c_red">您已提交，您还可以修改</span>
+        <% end %>
     <% end %>
   </span>
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 8e1a2a546..ed0b369e8 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -103,21 +103,11 @@
     }
 
     function popupRegex(){
-        if($("#group_member_ids").length > 0) {
-            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-                $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-                showModal('ajax-modal', '500px');
-                $('#ajax-modal').siblings().remove();
-                $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-                $('#ajax-modal').parent().addClass("anonymos");
-            }
-        } else {
-            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-            showModal('ajax-modal', '500px');
-            $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-            $('#ajax-modal').parent().addClass("anonymos");
-        }
+        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+        showModal('ajax-modal', '500px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("anonymos");
     }
 
     function nh_check_field(params){
@@ -140,6 +130,12 @@
                     params.contentmsg.html('');
                 }
             }
+            if(!result) {
+                return result;
+            }
+        }
+        if($("#group_member_ids").length > 0) {
+            result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
         }
         return result;
     }
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 453f717c9..dfddea306 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -62,21 +62,11 @@
   }
   // 作品校验
   function popupRegex(){
-      if($("#group_member_ids").length > 0) {
-          if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-              $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-              showModal('ajax-modal', '500px');
-              $('#ajax-modal').siblings().remove();
-              $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-              $('#ajax-modal').parent().addClass("anonymos");
-          }
-      } else {
-          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-          $('#ajax-modal').parent().addClass("anonymos");
-      }
+      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+      showModal('ajax-modal', '500px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+      $('#ajax-modal').parent().addClass("anonymos");
   }
 
   function nh_check_field(params){
@@ -99,6 +89,12 @@
                   params.contentmsg.html('');
               }
           }
+          if(!result) {
+              return result;
+          }
+      }
+      if($("#group_member_ids").length > 0) {
+            result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
       }
       return result;
   }
diff --git a/app/views/student_work/retry_work.js.erb b/app/views/student_work/retry_work.js.erb
index c6f354875..c15b81e09 100644
--- a/app/views/student_work/retry_work.js.erb
+++ b/app/views/student_work/retry_work.js.erb
@@ -1,2 +1,3 @@
 hideModal('#popbox02');
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
\ No newline at end of file
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
+$("#group_member_ids").val("<%=User.current.id %>");
\ No newline at end of file

From 7b6e8fbc5367c76e5850af6bdaf754dfad443a2b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 15 Jun 2016 14:33:25 +0800
Subject: [PATCH 402/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=AF=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=8A=A5500=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb    |  7 +++++++
 app/controllers/org_subfields_controller.rb  |  4 ++++
 app/controllers/praise_tread_controller.rb   |  4 ++--
 app/views/organizations/_unlogged_tip.js.erb |  4 ++++
 app/views/users/_show_unlogged.html.erb      | 14 ++++++++++++--
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 app/views/organizations/_unlogged_tip.js.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cbce67618..b1aae9b26 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -916,4 +916,11 @@ class ApplicationController < ActionController::Base
     call_hook(:controller_account_success_authentication_after, {:user => user })
   end
 
+  def user_unlogged_check
+    if !User.current.logged?
+      render(:partial => 'organizations/unlogged_tip')
+      return false
+    end
+    true
+  end
 end
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 38f5879e5..734e8a719 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -57,6 +57,10 @@ class OrgSubfieldsController < ApplicationController
       @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
                                                   "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
                                                   " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+      if @org_subfield.nil?
+        render_404
+        return
+      end
       if @org_subfield.field_type == 'Post'
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
         @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index 0c665341a..b6eb54d2f 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -1,12 +1,12 @@
 class PraiseTreadController < ApplicationController
   
   accept_api_auth :tread_plus,:praise_plus
-  before_filter :require_login,:only => [:praise_plus,:tread_plus]
+  # before_filter :require_login,:only => [:praise_plus,:tread_plus]
+  before_filter :user_unlogged_check,:only => [:praise_plus,:tread_plus,:praise_minus]
   
   def praise_plus
     @obj = nil
     @activity = false
-
     if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
diff --git a/app/views/organizations/_unlogged_tip.js.erb b/app/views/organizations/_unlogged_tip.js.erb
new file mode 100644
index 000000000..ac49fd422
--- /dev/null
+++ b/app/views/organizations/_unlogged_tip.js.erb
@@ -0,0 +1,4 @@
+//获取登录页面地址
+var signinPath = '<%= signin_url_without_domain %>';
+var htmlvalue = "</br><div style='width:550px;text-align:center'>您还没有登录，请登录后再执行此操作，谢谢！</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href="+signinPath+" class='Blue-btn fl' target='_Blank' onclick=' hideModal()' >登录</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a></div>";
+pop_up_box(htmlvalue,580,30,50);
\ No newline at end of file
diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index 258ebe7af..cd59123b1 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -1,3 +1,13 @@
 <div class="visitor-box fontGrey2">
-  <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
-</div>
\ No newline at end of file
+  <a href='javascript:void(0);' class='linkBlue' onclick='loginClick()'>登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+</div>
+<script type="text/javascript">
+  function loginClick()
+  {
+      //获取登录页面地址
+      var signinPath = '<%= signin_url_without_domain %>';
+      var htmlvalue = "</br><div style='width:550px;text-align:center'>您还没有登录，请登录后再执行此操作，谢谢！</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href="+signinPath+" class='Blue-btn fl' target='_Blank' onclick=' hideModal()' >登录</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a></div>";
+      pop_up_box(htmlvalue,580,30,50);
+  }
+</script>
\ No newline at end of file

From c15ef27fc0ed13ccdfb0ce8e9e323ee1e063a374 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jun 2016 14:36:38 +0800
Subject: [PATCH 403/668] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=83=BD?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 66b68e895..a3337b1ce 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -1,7 +1,7 @@
 <% delete_allowed = User.current.admin? %>
 
 <% org_subfield_attachments.each do |file| %>
-  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) %>
+  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) || User.current.admin? %>
     <div class="resources mt10" id="container_files_<%= file.id %>">
         <div class="homepagePostBrief">
           <div class="homepagePostPortrait">

From 5a7f7da1f74f289f56008fd41e630c35de4e2db9 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 15 Jun 2016 15:34:13 +0800
Subject: [PATCH 404/668] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9A=82=E6=97=B6=E8=BF=98=E5=8E=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb | 5 ++---
 app/views/forums/create.js.erb              | 7 +++----
 app/views/org_subfields/create.js.erb       | 2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 734e8a719..34e996494 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -14,10 +14,9 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      #默认类型为帖子
-      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
+      @subfield.update_attributes(:field_type => params[:field_type])
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type]||"Post")
+      update_status_by_type(@subfield, params[:field_type])
     else
       @res = false
     end
diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index aae5122e4..88e535e72 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,7 +1,6 @@
 <%if @save_flag%>
-//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-//$('#reorder_time').click();
-    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
 <%else%>
- $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+$("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index a65f53719..952ed7b2c 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,8 +4,6 @@
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
-    //默认选中第一个
-    $("input[name='field_type']").get(0).checked=true;
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");
\ No newline at end of file

From a2c5cc6da1e3ec82bc5cc4c0f0e7f902d6578030 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jun 2016 15:41:13 +0800
Subject: [PATCH 405/668] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2bas?=
 =?UTF-8?q?e=E5=8F=8A=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/account/login.html.erb    |  34 +++++++
 app/views/layouts/login.html.erb    |  18 +---
 public/images/login/bg_login.jpg    | Bin 0 -> 34003 bytes
 public/images/login/bg_register.jpg | Bin 0 -> 37083 bytes
 public/images/login/icons_login.png | Bin 0 -> 20685 bytes
 public/stylesheets/new_user.css     | 144 +++++++++++++++++++++++++++-
 6 files changed, 177 insertions(+), 19 deletions(-)
 create mode 100644 public/images/login/bg_login.jpg
 create mode 100644 public/images/login/bg_register.jpg
 create mode 100644 public/images/login/icons_login.png

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index f2b43c9a3..fcfbe8422 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -201,6 +201,40 @@
             }
         }
 </script>
+<div class="new_login">
+  <div class="new_login_con">
+    <div class="new_login_txt fl">
+      <h3> 欢迎加入Trustie创新实践社区</h3>
+      <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
+    </div>
+    <div class="new_login_box fr mr45 mt100">
+      <h2 class="new_login_h2">登录<a href="register.html" class="fr mt5">立即注册</a><div class="cl"></div></h2>
+      <div class="new_login_form">
+        <form>
+          <ul>
+            <li>
+              <input type="text" class="new_loggin_input new_login_users" placeholder="请输入邮箱地址或登录名">
+              <p class="new_login_error" >请输入正确的邮箱或登录名</p>
+            </li>
+            <li>
+              <input type="text" class="new_loggin_input new_login_lock" placeholder="请输入登录密码">
+              <p class="new_login_error" style="display:none;">请输入位密码，区分大小写，不能使用空格！</p>
+            </li>
+            <li>
+              <label><input type="checkbox" checked=" checked" class=" new_login_check">记住密码</label>
+              <a href="javascript:void(0);"  class="fr">忘记密码</a><div class="cl"></div>
+            </li>
+            <li><button type="submit" class="new_login_submit">登录</button></li>
+          </ul>
+        </form>
+      </div>
+
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+
+
 <div class="loginContentContainer">
   <div class="loginContent">
     <div class="loginLeft">
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 60ffbce1a..2c14ee0ad 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -9,24 +9,11 @@
   <%= favicon %>
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-  <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
-  <!-- MathJax的配置 -->
-  <script type="text/javascript"
-          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  </script>
-  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
-  <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({
-        showMathMenu: false,
-        showMathMenuMSIE: false,
-          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-        });
-      </script>
 </head>
+<body>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>
@@ -35,9 +22,10 @@
         <%= render :partial => 'layouts/unlogin_header' %>
     <% end%>
 </div>
-
 <%= yield %>
 <div class="cl"></div>
+<%= javascript_heads %>
+<%= javascript_include_tag "bootstrap","avatars","new_user"%>
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
 <%= call_hook :view_layouts_base_body_bottom %>
diff --git a/public/images/login/bg_login.jpg b/public/images/login/bg_login.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c56af093d59b92d6c229e9cd43b193b70081471d
GIT binary patch
literal 34003
zcmd?RcOaJE|1f^pQbLFjqO!90RvA(Dii{*=-MH<oA)7LiEwXMQnK$8`nVlrr*?aH(
zoa<J--`~&k{(YbC^Zfg}uI_W4>s)8N&N;9BIy(MwJPJ|ExmlV+kfI_xL<s$T9WOv+
zvd*T~?hqD)3yLKm=y(*z^^ud4y%;w)!ja45q1^*BE>k;OZZ{KqZeA`PZb(Af&ECY+
z+RTaZftiIRLXv5@vWAJ#@}VS?uAnlHvi(i7N0zrdkY<`5Dq5x<)~2ElnWUu{CEUc^
zZ0&8$oJ<(qY;6#ZVs4U5n9jvO9xmo)V#HK&vX*4J4v)%sS6PkmrXA9ZQIJcB)09U@
zm{C}ii&s!sSU~t1BOed1AU6*`H$M+2AHSFYkC*@-<FAVejD~z@E~X(X|7$GpCdu?`
zQm(G9T(10Fc1R0uUQtm|ZXP~vK0Z!RgVWI+;bh{*iEw28-Gi)|qbbtT-pSGq!3g(g
z^1#m7Ns<XbdNKuDdu8Q69slcU+1kSM!qj$j(lGlQjDM}|sO4^N#;sxIXy=SHH3QX|
ze>Vne_umf$R|L?AsUj`GrkL2s+L=1rnjxGNWhI%w7p{kv55;7KZi@1Y^2v%^=er>%
z#LIhKK!o?k4bkg21$lWz`T6C3_wjFS<*y6z^4z@6$Io|DfR|TJNK}}g@5W7jIU#V#
z^6>m=tB7!PGC`P{{T|m6jQguC?|<7?>?YF8#K{h+WoKve8w1oH**V!cKC-iCym=F|
z<BY7jmWYRTu8wT*7M;vk)(mOsV)jrTX=lrbSz|HFe}UnFsJWSt0FNmr?*sk^oV<Jj
zqMRlVh50%8d4>6Tghcs-%>)IQezkx2|FU-603dD{N&bN}zl#7S!r4D00ABtOkr@I|
z4ib>a@e*_vgZR+HzW^y>9S=ayAbeb0Ts&NSJUskU_~3V%5FelL^cf<e(?mpPNY7v{
z(lcjCNJ-9~At$GxASb7zrKP1~_;X<q5D*ZbA*LoJrKX`Iqon!s;eVPr{tF@_#3sg>
z!NDSfu*tA+$gqy<p|21Y78Zm9C%-Q&Y#e+7Ts%U!3>$p;T@Ge~hmVbeOF&2pVPoN7
zW8t1Udm5e=0r-MVhJ$+!5C0PHbpmyhml}~@$)l(o9>3`tW#U5?X;EsQ7b?8*B<(}3
z=2HqMolngC>Cu7@ZaQ8bGwl{wsjHWheO7$ssxToL7U&5Zm+%Z84mLgxJTd@=3|IZ-
zIXuwwV-0eCiWL)wH-(?NZXg9H@j>UB=O08euYUMCcGJ|6>PcGd<>P+n3}^}9A%mo$
znWiuOJbzE%|DQRvf15VxzZL%9ml0u_sNq5X@voRj4G)_FOC|$SyCegi|M4#a^9@cY
zh@!D%{7;%=M-%?t%`aH~Ddhf-;8B1Y*q}cO!c>4dV9*<<F(VV50FnC#jJJ4Dg^VTE
zTl^O^|9G4N#eV|;@|R?CKwn@cm_FfzRqgQ&e+(Sw{8+L5zzqiaKfs0e>pPL!X)seL
zm57uTFO>+7mFyArV<oId*nR?!o&3Jy+@iWg%xK6cfXT`bLjuqjye~K>ng4u{pA_T5
z-{BUxpgG7q#xy3sMFf4t_EUmVZ@`HL0Q50{76NMmF{(i_FgSj2@~;;W#3}=+VHOaq
z9+ncWJ{}A%45vPndIF;%4Cf1wLIVEahvoDeRPX{}V1_em_XV)vRN^(sRd@o*peE)s
z26~YFN`?Vl{nrG@!4v?z094#mBFqyr3CK??6+0Ec3Sb8p?!T`$EA$4!k^|U6!I*ji
zFJ9_-Kaj&DRJSN)pJe;PaG%`T5Z4oYKQ7Fj2~rxU0&?f!j>1aC2l+?89}|DY!!M^m
zDGT^^DwXNi+tnvQZ%+aAx%%s-k%_-?^#ujCNVGDe0_hb<?UW1zPXkv8j}_=+OfY6b
z5Gkt+c>5Q8!7RG^4G4M*LHc-V6xfd+!I0}iZ{UaFCEZ&z>NrY_+NA73c<R{MkF{=;
zq@GSCO2q>xA_IQ#jU%HCFFoPuHz!;0XQ{!u<6_nxUVU6}tJ6X8GVwAZkHLOCQ)ZO+
z3%_y!gF@uD;9C}KfqXD#4va*ABLh5_0azo0Cj+J+lZuU{hEXx$3H`Z#Pk@jW!lNY9
z@l%7Wz~bK`R(tXm?-tPu?OVi`!Q18Q8aP@+C`L<0t``Dn*PR|~$)GOjf5ihgjv}0b
z=N}?~Q5>cP7%ecEjSIu5C<{_>J79}EGpomJL1gGGw#Z{TnP|dR86_+l)-Ws@Y&F6!
z=lqm#l_-?3z&4QL0fhIH@grp=!}gZ}Kr2B+q+n`{f8d8RFfV%pr9FeNZb3xsOepNf
zGO22uP%&dMQ8A7pmInM|{3>I~n0FZu?8appcqcMQQEB+aFfCwiZBnimxo=Mc%;1WI
znG1%?z)%7{gAEu?8u*=h%LL~$umm0_F#>cs7dQr{V~HbngGQz`kgPtP6N?UHWK+pf
zndQh*`DLy^(bxiH@qi@!FQh_O;JHAL0Rzug1Ne>$$^F|*)cj7+36CN;n+Q)v%P&>S
zFNgFIM`WYqLCBY)2ZIGh<=<@kpCF?Xrj$5hJ}9e`g}#$*8zs3lI-D*NB{qn34f(!h
zquZLfTvMYO7$54(uDwWYGkjQNe$}DrtP$(?=E-g4mYp3*uKCA3#ySZ|<9Y>V=L+;t
zYh<W(zs^BqR(|_U;q7*c4vG%xGahpm*A8n`uUV&<ZgJXt#0xL(8+|95(Y7@3Y-GC8
z{M_^i)m1m9nx(of5@+$qL8N9*Zh|U~kv_t{gF^E#Dc8X_fiN<nnyZOU`*3IPRbH!=
zJKMK|kHdL;9|p<Q8fr=neb=uU#Bi*dFEy>-sn%UaSv<*ky_0@K6}&yLp-N$uVx41`
zB)3$W*UEgqy`)0Vp!$YZiRU+!{BxUw%9U5Pi4(fQC06Us2$?z#rf;n5W=!i<`XKP{
ztUB5lG&Yycit9cYy)w@)D(9eOdT0EMvX(Ocv&M6y>Y^gWFJRidq%BL#`odC{C=EYa
zrs4)F5HOrsY;a?pV8ee18klnco&h5Twk2ygj0U7vU%-ff!v(T@W9k6q0fG~b;p>CX
zW~t0FW~o6kAWaJb_|PgN|Abjai9+5l8XHO_C4>mcupj@z2Y|+;*#AUqRtW0`gdI$Z
zod!}lEj;WmL@y|aUeMfn;_pIF{4;4jc$;BVXveY$5y8P_xht;j9ox;)McKKKZ15cs
zA~3EiAbG*2MAxb|$<B3jiEcFcY}1;!a!eFjFpC*k5tZQ0&b_L8z`Hr;RpWCw1k8_`
zcIiXY0V(>clP`uS20|@X59oF;=v^T1^%zf>Dd5{AOEq_NwbL#^=AiUiIJ@tdkd8?#
z-G?AV&wQzQmKEZhA={V5BA-faTXp_BJBe1A?4ehhD@+z7ZU??EJ9yNhsL^4=M*C`D
zR%7PiVl-kPcBy}{hhivE!YgW3Azz|R-ql$hDN^;ZlXl#vz*XgZvu4y0hxNzVuq3?C
zds^l-=e0Idu5TK=@(FE_V92ct$~0fo)=OsS&gl83>iPL=AdNaB;89>d{k6{#vjQen
zA%kMHzC{e!Fpz(jVHx;KWD|ppJCR<1FTt$p4|jq$7BJXocrVFfNtpp%pZSs|@;H_>
zv>5l%nPT-<ei&{=*a}D--dsjN?`ff5AW}ly`+(U7LXZ|LIk52v@gVT>_mv8f$>32i
z;>p6CR-2KP5=)JO2tShXjWPPu0b99))V76nt-iD8LCB(xP#(*27WaZ7_lxzZB7wd%
zt5_eS23_mEfDI`ruD-f`!>SOofXK!VIX>Itg9$qt(Xry*+}{lX8hs}ApI7#@SFntw
z97DWgUq@VhZX`H05j>A=vkc9~0E4wPK2qOYk1kny^<91-vRH+DQoZ09qAwE@GOVky
zZq=pek&cS=kbWK;AR3jq$p2~Q<GlzG4rc#tU&e&WvI!kGQIgg4?hBf$=|)DgTW#S;
z?yd-Kj_Vy}=IwWpNU^b?MfYEn^;8LL$1lptk30=13d3PBOcfB=FD>qb&Hkb(tha<?
zu$W+tzrh@M0Z0oVAiz@BpD70t&#e9o5E;?nQU1&<6%ZTv2DTvZ%Y{dTUGn<a0{Hrb
zVL)&^O2YzT1Cn8sg&=kcKvY=R&wwxlT=)0Iip>g33{o{bN>Vixo{Sp1jGDkpJfg2M
zzH;^i#Q9{Sv`F+t@$U;U3$KnS%Qc7Z9Yh~o?TkAdt)6<_m*!^iMAF%l_SNKPo9@tE
ziyo5lT}=z<K%$zhC@jXMt|>7oM+D6#A0F^!jp2UBg9a*(#pDmKbBV*RnbJpTwtIJ<
z&+oCzZ8Fb^=t+-j*s5)6w-}Y(Jci~yYJ8-Njw}?`iF~bmD_5j`+}(Y5z#4IAr@P#=
z<=f`VleLw#UxTyg9}(YK8+Z(T-}E`~wK!<{@9Sf&h6VdBf+2i=4Pd(KFI^%%v?G3M
z{rnVGJ9_cFNO}NL=-$Q=`=D1o-mDMj=K{~xA2Z&W-UN%pn*yD>T1P38Vxnkj$;HT!
z=v{Aatf~l?hWS_A*J~GZL=2uzI7A!L_@qmfQOY**bY)&;IVE>4{rB$QKn20f_1A5Q
zJxf$^i$+Eb#svyk+n0fPs#=;Qp(VE3Z{>_Rko*?d_1VAiAPGp^P_XaygkPuuUPPOK
zjJ!S$Ck4QSFXtX#fQgd^hZBniM*tuJ4QuEr8AeiI?m~|tEHxPQ2`LyU|DiglVcmcg
zPwW>Eg$BnhZ0yHx@nkHSh+gPK;*>fY))kJpb>p00a31>+)zYFGBktn8$zY|~O*NOy
zIqsWV#82n=DR2IB-#k}6(xGbHrNv#emqovpTUPSczSs2h;%dVDI;Hkf6RtaR9aY!b
z*4CpyFLT~utS@D;%H5pD&=miM&gkxGhMnwV$VN)B%ExNCNjGE9WrsXC|6bVV``^ix
z)O|F1*{yO{!*_>WnC$!4RSQj>rmpe^d#x^7FOZx+s5=-i5|zq{opsOpQFE(p1C&es
zwQAQU-Ci;tfil}OvfN_$UF=}j=KH@DJMT6$bZ{pNhHUCGORkDEUUO<BfBKcAjidxZ
zjy=51aCK;A{ZmhV%dBBtcT`(@Nbz8Vi*HZuB&}AP#CG0cB(;G`(SrQz{frWC!S+e!
zWrVBuLY3q4KmtG2wWg3R3Dp$4+u~FX-Lp>4<kuRD(<n2}VVD8Tl&Nl=f2{KiX34-h
zxtMT&ZauIpkYlyDkf*<3Rh06HbrE&9R+YYHshcBhV^97WhZOQYQ)c8eg~{1ZXV3g3
zE{j4AEm;^FY^_GB6)0_^eBYYb+3jvWVD9+AH)3Ou`}~17L&(c}b7}P3GaqwPR_9ZW
zihZ%hllEOz<1bL}t2U@^Yqgac<vQvlxbkhyN<SHhj`4KXRT=QyD<7}*DqL_f+SkYq
zC+v~xZ76rvjpaDk^271nQYjVJvu|7;iA&tQk6O*P+bfPCU4mq4x{j$zgtz7=uGpA>
zs30G=U7f542NzkaCJY`{X|+`eHmHZH@YMI*=@z+T!bL-ucw#PL`vEERm=!hx$rWM6
z0dvDb=Yj)k_$3VYi-mQHS5Nr9T!1wUv-)(9q=uG1eih93g$y9Rygn;XD*W1^FkG|L
zOR|qn$uMI>*gTA+*`(NSWEg=?5eyih%rCyj3gM~&q=yw{HcB9V0LH_*F;O=0Wr9Ly
zyk~iOBik-jhq*ed3$5c;iM=j7g2oj^lG;J9Co*%UCoIY+^H5V>FP5@uX@5XxpMFFw
z#aS0Q9O3*Emlb~Da^IqJRDEgQjiHZcTnXjmIcqodm6FcP=Q{Ss#r3D~kI3&=k&zYB
zyHv3_sJ8KbJbl#HH1oYea|*e)xb)1uQ*lsp{fr&<F;prQW}P8rI$u^nHZA$P?vFje
z{OH|?{NWjeq_4wS`5KuyqDop*?-G3b&2vJT@$pfGaj{urKm4cJ+jS&Xm9-9zA@sJS
zXm&g*moWU+_`#*kgZACB00LS)>fk|VxzY+N$Kip9O7$|?Ma|X-x~s;5Wg@Dy(}L4^
zyONd<-c=I~tXtlD?M|;;UC(ksZl5=3i{V3&xQk`b%;;g!rztD(qh9WauWNGTp4LG1
z$RK5x0g~?}<s*za2pi#6=ckbl&zPn~OQ;*!^U6L)-ii{rCeMAVZ^zhT)JFVX7U`#l
zOJ(QZ8CJf`mI}Di)<0|a(n&kMV{Q0ok<KXPQ}I$*gLYq|X&-%`kI#04c=fVS!H|8^
zfq}Ji=()x1Ve~s)7gYJck?ti#o6p^Yes|*+&Q+<9=*oH#PXWhHY?k@lR3feFH}B}X
zDAS-`WRGAYr997~PMKkB@akykDsg#VXJ(>dOTW5D1^I$*;fnF2mI>Dw7t~6ve&*J`
zPkc^)`g4iZ#ef@QDl~&a#I<+htO|Yh8g>p&zgQ?(G{m2M)z<Bigff<HGn*^XId_1%
zxb(!I2)06hI|qPe2c^RLRCc@!(2Zdw*+3@zio5}^nqc(40uoMKAl-}ApZkU3nxygp
zp$<4YK>uIT9UFt>u$4#(UAPZ8J0r~5abctIw_^;pXj$JtgirjiAK%CZN*2v6qCkNc
z+Q9x3dPz{e$&E)}P-dMwdRz3<Uhq%~^_S|M+|!g^0>@BQiFXylQp(N36gu0Vkl5L^
z+zNB9_GTY|-9P_u>fhKsQn>fEZ(+Q@cxCPFVl6LHX^2*lOV!78ez4a(C(+V^bGcRh
zjy$EPB*(%CZ|l;%)edR7%FI~l{Jt*rS!46vaAV|1xKxO%GE1+`O!h`WkyjHp+OCNK
zREnA}b<$cp2=%8nsuBCDkr-_(T^(iVdDU1tDT^&Oer`OlR>HA)^iAN9c<H+%1gB<$
z);ND!vfj$1cY-wK5*cF4v}ZX%cXZjj!kB5olHqh^bUa7!LR*)Co1=$>YNgT8hBmdr
z`5@P@T%Yh+f3_Rym3VTKrl03K6&2nj^;NBUOc~`0=Nt?&B&eR1QgQ1cMr<vG2s4>J
zt=}VdZ~oLssyR1;v^z4KSCMk*KQx`Kd7!=PyW4a0!#d$e`tmOG*VP#E*+oHMc;mqW
z^}HYKQ#f&p5TveL?G7qlbag9oe4a&9XY=70qVekQMeS0V#>5}(cG@)7JMPn-A0I06
zC{H2m=587+yH?f2H)W)?IaGf5u!5QL%gbzStsarq*{y5cR<ARYS-qO59>M(0^<w5`
zI7c7Cerxi|f%9whB3ffdvB6QeTP3;8`zB|lV~>78-E*3NLE6mtoPkUcmUgLT_k5iz
z2X_+6`$+9;%n?JMrGn(T651&n)XC{Ic6+qi`Jb)UJr7{PI1QDcH?qK?2D^t~9TRX`
z8MFE{0kT(qVOa1l7Ned3wG`h#iRTN9)xhctg}-Am#Xvc&laU8}8)&PrqDlc+wHhI|
z-$Oz*CP?ND@RI#QL%{<MF$mx>8}N=XWz)z&umgh~uxj`z@RFc(lf~WOXVo&97l$7E
zx?xVO^qzd!c3uvu!I&V;!R8pU)2$2G^f2j*2o+|8E)uvGe2t5qUW?4KKcp;|y3usR
zE<Hf<a@jb(a<ymH17Ccu%CuiM<4M7zh-l@txwO1H-p&>-S;VC-L!uX7H<?mh%}04I
zoSm(+6F)?FULctfbk-cX?<zm+y4M~Wut8Iiv;1B>9egxzytzj&jW#@D7P`9?zowRm
zHf`@XhU6uZx^?y=JT|w5n0&8PlW-ao%>mK*Me57o%jiO3_J}pZ(KXGbrhNBeeh*<5
zj=OiedR*q!LaD@UySNR$Th89LMP&yzy1kjLyxL=JJ&^a{UV5}PqTNTZX(eOPCCr!K
z_gw+KihS<t8e!}BjO}FCn^WV~!JWE#yuL>)OoOKLDtyP#WQxZA`R^36J98;Q#1_6i
zyXF$fy%Cqa*|G&*QUVtj_S;|VS|(LHl|iSsY;aKcnhmWn$<+nhtRLTIM)EqGhtL$7
zf~uEA2hyxjY~i}z<AbegtxbIn-c$5_Ry?6pLS>XY%yL6go{5!$y|sJQV=WDp_w>C<
z=iM|N26?ihdZNs^K7I_J(3B`_qSrB>FqJbtvq%4?el>V-g*9?&<`@d2CP7;qLvux=
z%QrPYtM1INOt=`c*i{+UBi`xo9SpTT-%6_EW?*5eH*9m)jnl9Sf0<&&(&F4>6_;o>
zSD1uG#AU|)Oc8#$r_}Q{`wc}bpCa9gyUW`(m;IhWxxX5X?7oLFSNxP`yTU<5o3@~=
zxspuROD7aoSBF3!Wp9WjpEX;!)+*|9k*hC0k-^qUs#{{CgFJ-WWl;A{w}i%_QPIjZ
zRSp90My<jMJr&<g##m|FhKzaI>Zvx{fp{m6D{F@9uM%9nx+en^-o!ol?Ggrb1N_>s
zV-H9Kn1Id{<ECDC1Y`lMz_bQZJFvr~ai;t+AS4Xc$WenjfPCuYVC9|+$OMe8f8joG
zqR5dF{?!g)QIi7V!BR^l{ihJX_5%WeRR#+WQoqHj4QxB$oV<Kp4Jh`CSj9jV(5HVB
znmp~fG+sOya|vy#!%-y8x#mW7xs7D-!lO#lfF`=0o4n|yg~8X|a~{N>l?EqIu`6*l
z<o8cVVIhOkax&e<?7gvBs2k1_VSRB0`aJIz*X<RCv@(LvcaNb4g?*DX$@z6%AF(Pf
zu$w(Dov!pfeP$Cm2G1UTU31FSUM3;-oSV4Q*e>O3Ehs-)B2d4mJ+&n&NwF{@(R>VX
z*NYq?r{z<mOIl~nS7^Ieg{L%nNd^@n?(V$q<uVK#;9AIVRo47IE|($Oia40mosB~=
z@w}pSpU7$LA-mHyPM2R6_wqnWyd2GSd$@no!)#aj`E%(d&gr3dHr>(_1y3aOE$U+8
z_irLy2fz0?9B~*3x=lwW`xsM5ow+OD5a8jph~(<MvDq2bE7CzyUMY>WuvY0ZwfX{`
z@SNQ{*|PKd4o9y9ZR1g!%}tUjeuj<lq@gx`BCMS%TeElGS&#a<w-;NlZg>)N@-Cr2
z@B8-0iIzOzoycTPb~DScYaP&*bz9xM*%m3(i1pSl2MdMu2=5JuQs4ng;Jly9QmzBD
zZ-~vHRZX2f+S#MHYi~;2qt`!fwM}xrG!fAh%pf%%b1kov`>IO*W?$!bq>}*6^o2O@
zr`+-l6_#D3qxHv-{ih?Vrk46~I)_P@-aYmms}0GP%|yMHGSdr6(eKc+`bXr<j@$@z
zV|Gw7w{gb$o;6A&qj}PH`}30hqq7`&fH#rdEXLP#HXdP=SkIH*_O9IZtjQv;i$7HB
zcO@}1ZlDix>TYYVl$xmto2wn1Y?Z8JyTTPOs*y64KtGE1ce4zNxHo+aIqL<YESjaV
zlD`bZs{;oh9Hu%YLxBxHncy5od&l@J06AbN0O&xlC@BWsCmui#>BK<i`8$Krh;V^i
z0pbLs8ZiS47#O;+I^-|&1dqrM`1;=fH4B!AL=YAQ1pLVwz<~(xA9xS_zA^%9gF_MP
zZJ-eFBywzuIJ#ARSblvkFIjKQFszBP870vjF)3H<G*Uvv8gCIZU_Q}hpiLJslh?iD
z75HOt^>V(+^u4eFM}tlc)jor)+UlvHb@QWPI!cEF^`^z|dt5gTbQK7mN#W>w`iY%i
zJ(`a_hSZNClRXam1OJEvE#Fdx%fmH-uH(61cMS&?0fD%7DEnGQ&CPa^&>0ronU}~o
zh6aY#qgI1@)YAmH4UOWykE6wW-I2&BrI_f%Bypm=#I)C0L5)_Ze9?x!t)p`T+a0uZ
z)no6blqO0ZYM16UE=1{DD`-U|A2wL$we>_?rFKgv=sx<^(Q%KH+Ck-8n`NTC5B>C~
zgm1zeBH;r^XD53JCs7(f+Rcq65mi$KirK~`LTvG<F*~8{3{-Y})l4{xXG3FANQ51I
zn^S)YC80ub46)9nqoJnOYAcSRqgGod9a`lqcbP@~5i=i`@u>dxHtkf}l)N$WVP)e3
z-a~<vPL$~6bi3h?^d@fhaobfpFU6QR0)t02%wfln$_SHh^gOr0euq+%wiVmtq}RHz
z=Q}k2=L3O=du=&@NHDPsEE!G+gd!<$DmUd=n}U|JI<MUh@~GArII5$pW<F3~^~i`E
z@_xH38Bvd>y3oQm9b&nc{bl4qP$TW%B%wg(u5=8^850`?pof%OBl}}*<6Jwb)nj}=
z$#_E!h8jK1wu&xyFDN-14>tY4=@jcehFk|~Vk`F?Bt#2(h_mdsv=7v0VwEM@28tDi
zo$pmx9Yb+3#Pr1rJMTIXBFE4*$2}V9p{S;nru}3Oge@V6bYS~|$Rx%N01=&N*hQy)
z!v6tV$Jak$`yj(w7l_gKp9cf=Ngsz8aQjdJxLC#{6~=cAt$dcfZx#(G$xj{^n}QI8
zhO|In4i5|h5dRnB$7W20&09(=nQY+k4HS3+T>ZC*-(D|%Qu>1S*3({(l(9-tk*HD5
zmPy*Y_WX$ohT53?<?4w1O8lH{u9+-eD+^VIV0ZSdqWuI(0hRi7&x>`;^h=Vn`V~1M
z)yB3A=h`OciwwF9OtgeOID*ru9g@zfBvjanCk-`So&0FoLS8=jFh{;JYiOHmzga!9
zNLe?pL2DrM>ecK<7J@d{R|{=DacFI!`PcE&QH{Gk&xWck9oM~!u52CzEcYMnxK&5R
zAEGu%%!VTEc5X*}>t2i~n2`4A-L5@k5!`p4^Kx~O+?qhG<aar8doCt9)~xX#Lq@&Z
zbsvOv%%x|0bM_=I(Z64D?bDBq3Lw66QHL*k>h0X*gn*=CZ_M0wHTtc0UG;}=gYnrY
zt~;a8+s2z)CBiz9llk4|@m4`uXWR}xEbH10RvfNR%oq}MI=b(dO|Prshs%FbCQ~IR
z2x~VvHJE6EJ1HtA$Mvd1XR*gnU70tu<xagk-}tz4vn?%Msn@+AglN|>R9;?lZeYTC
zt(s`FZ*#d+Si)>3DEGPBbd%I)tI7fKl3ml-uAPt1U9u1ea;-?=>_q*Kjf5}NQKUc`
zoP@5i{jg-jsdRT&YscCyw0|9%6+d@4=MXWiwrY3UQ^#u6e$Hb}aA7D+wJ4a!==?F1
z@E|%O#xbA)y*$3aKfP^Po8#?!$@N{)ot-L@&cEqkK3rt2O8Y3dnx=}xIVronr?g7m
zY(&Ch$8G!T(&H9<7At;d+XD5+DWl^fw<`#eoU@LW%Y3<AH^$r?jZw5JqYJq^>0Mm$
z?r~-2V`UqzShnJh6IBTg69$H28puPp1eMXEx{@?W?ga1l*ZpW-8sLsfrM;;MkQDHK
z2pb%8fPSk&WU$8?*tD>gga7Eaw}+F$q@I}*>p4dKVJ60U4lD<G8bB4mE<SPl0LSNF
zq0Ef(>QE>ge7K~>h<5|Hy+O2^9rpNO$(#fnfF1D`n7>$nAm09i82tLL-@EnH63_82
z+NJ%6QHd~O5zRJ`cuylVZ7$wAF71wN<GDf+6`pM_qH!CpYjtI12+eS5QoS(FK_~Uk
zw=;YjMihDt{ZqZ0w|ayv`?I2go!qh-Mko8rbT*sTdYWbrjB}#Gd}-#(Jh=D_8!K6N
z<t;dn4W5*Z=lUO^f$!lYcm!eP>f{@i=M97;PPS9H=oe|Xq{TDSWU!-{cw>9e2sa7-
zko@tm!{G&AbYVwo%J}V)9S@SXhm~6+y1Vm-9!_rQP2(#`zHZB`z%G_35Nd7t+}4ba
ziV{X1_M#lUukGPc$nidN5DZ4eXI&WgahWs|w;G!cN#DFMWaVb>G#IWs_13jQ=dq5T
zK9&rYj2ei;ohMIZx$vpHgHxp0F%zwMxse0-MMeB?28y_n1o1|?E?&PoXhQE+(yj6>
z#UWjG*j=&Apy@eD`XTxwQ-uplY<J6?(A75y0YYEZn~ScFFr}5p1p|C5?N6s+kC@H<
zvL#&qTF`go$NKxNwk$mweQu|Mbe$ZjulJ9Jo00-bRXzw5IKm~!dt;n=jVkU!rmU#9
z`Ja0Gxb<iZEZ7{uCx^qgpAM@cBuQ+N9&%$U|7kAv`D;~2b(ns}mx}t%qPU9tD&Iy0
zX{pH9keV45^d9tg+SU1qLy-Nb5bbethIq+y2TSMsSSpvc-U$M;kzkU~?8_Uf_FaP}
zLzEEe(_H6NT01&7HVVXy_r0Gl*9^MQxVeSwcv(3LQZ2u&(sOjlw%f1a?$Hl*oAzIm
z*gX0$F%xi4vXdItKwwM<kxpPRgZK-GhZBN`I0&J^1~Y6FrvvAXU)@Qji4{0C0pmYG
zalrU#0KW$k0OJh8dcoJFPJQ9N3?tcNaF8LJ^u%5UA#~X9qlT-NN+!cZ1f{*yBJxWG
zK24lkPj7Jmo{taoo$CfcqzG2x20Wx3siS^Ut1B~dFp&j6<5WWz*j(jvrj$XS=IA)T
z51N_N`cm|}3+Y}KCS)IsKuqY??sQEq^6L-RAo|-hpUJ9*^htyc-}da09o4C^{`lil
z-JruU6w>F&IW;b|bz5Ums%}w?L137{a=3)QXJseriSw#zT=C>~3}vHKK)WZ^)w+xU
zjR4y$mDxPw7Q+(h<hZO>5^rI)++YKRq&6IvcSaSnR)d-QWXeZ4rQeMvn`?v33oeWF
z7%0$H?<{;Ru^j2FI&;Tutwl3Zb>+(sK4}}{O5U<vQw6$@u0<Q_bR-Q!Zu2<!gM}`q
zJ(j8!rwt5JB2%Obn){`KDyoM{V#BXV@=vCi8n!R%6>L<<?QgHysT}S{R(g!TTT<*P
zn@hMN&;V$Kr$?J#q?L`5LF(t%hDdMDD?>Sbc44*EER$**V(=jmeOROesauQ#{Dc&T
zrxL{VZnrGDhsYad=F090X7m@Z&ni5Xjtco^?~}dqY4P*aRJ+@nn|+OHh=_{F3%zpH
zov?(fQAHjkI$;Jm!ao-H<=V`qf@+PmhwgpnmbE|fy`6h_F=Aj#GQG9vOs`w^o;X9<
zg6B>1v#aVGF4A^Cww||L97~^B@EIvwBz`U4pwRW>u*S5Xmd7<X1<_eJ($*d>M2t45
za*QgDz4LbOoM@Nbg<5*A4g_nu6}t9Pzgvh?-Kck(Cw`xU!4RJ=5LA;2$)^gQq};TA
z$>rbL(VpeBwCt15t@?8}^I&-0B?rXXZf$|`q+AS6!v~!}20mH_&>KGb1VUFbfxq08
zuwovJ(a?#pf|vl3H=Zc+CaFAK@-)B;Wb(@|gfVP^FQ{4eK5zzspyiFnq(uHQ5b$gI
zX@LjUjc0!!007Z4SbzVb^IMxKqX6hVaf>68^=Tvqzb{|k{Apove?)iX1DC0hK`*Cb
zt>KSi`}`q6dBAU{<s9#flRqtAtU@?EzpTY=P?Ut%e0W&ntr})q*T>uIsvKXQX4<?{
z^?f_3-)+aZ&@Ny3_R;i%LKj0WVS%F<^y`5Xo4Y8t2XSlN=Qg{m=fhRSk@L^L8V}l>
zw{3k>i86jNs3PE95Sta5Y<0<M#JQ8@7_yk2+C(>qlG!)v@T7lPyw`JOe$dhA)5{X{
zLU*Q@ges@!*F}T7H{VUzdFGpIAss*DPb&L-RZ(Q=i1Z5iF1hg|?RD+zK)1OnZOt&v
zkPTY{|IcindiYVM1U4#MvJPiuQM+UcQ|88N+Z3E@jS}BxExaj4&&JO+#QI038(*EB
z*DXg5Jo^z#d{%`WJ}E>5<SqoAZK@r#O!%NnvvA(1*QHwboL3H;W4TW8V!pW>e;g6F
zyo9#pRu%frri;bXkh-8gV-ovi((4l|!w+pnthKiG2g9V|x%9ZrT-t97S8|j|@CLl8
zS^`Kko6l3Q?%^y=BJRI^z$WNRv=p<mVx%EO!5-?Yg9?{#u$DBRrc|HtdH6=8iZ3Lz
zl2|>-PV3I?*~b1diOg3*SLWNdUql&x3s;xzq!630K}7UuDTu!}u|IEM>r44@;@$wy
zc&o6eTu0InN3T!eY)Mo;`cqK5U8~Oc+RE;mh6;!3-r_M;+tJ(l254@CrqPjMd2h^K
zLBbnaAqB?<3BkFoV%y0Yjw%WA9rsIJETSFA#ED5!p-DEe(h&~ZB5AUx#&HdisbGn~
zg|Sk>Qwe6`Af!Zy`-tgp?rj2dZ&*8lIX2KvV2+K^PC^BM`@Z!$?7UHbg@5;g8PM4M
za2P=_icyA88${#%2;ayO0`@@!VLt;W=UBC|Q^9G7xA-sdU+4e@ow$M2mN5@bM46tT
znF3EzVG4rF>Xe`1?{DRR3-kqDY5rjG{3(&5(0Zl%pL?$+U&IO+BO(SwoYkhk-wt0=
zp8psX%i@71YhepiM44^bx}<07GSucrI}ar*h}-XX#9FVra;S%WZbyn{8EaqM%6i<5
z6fwTkKM&4&o}Bx`Zsd!4t7-Qhtr%REc^D_}6oY2D+ZrRVf9G}m>pRk}cH>JNwMsl4
zG4s}|+!?OxZ%aH`BBz#%j4K189?zvqx+ELg^+eqBx|6P8aZdHa;$T6c1HJp;R&meN
zmiV}bK^HyUasv0eqiZ!()J7#?MhQASo<-js)1CFg6_Z_w%EJ04KYd>>lWelDoODDY
z9;&_>jEa#|TK8zG7(zV?WecSjThi7V*BaXmZ^G=@uLKJ`aZki9E?`bdxF=p`*x171
zqy!rSwu+tS3!Kq1Nfqg5t$%SMb|1fb0yxxNpoqQ?RDXqw%>y%~-)@B)tZIaQfF=1s
zZ*Z^6P-qZQs?mU``Snx*IA(4MZ`xY|CRy5GqKRO}iC~;a)?iG^VM&U-jQ^FX6y{r(
zufGMJ)>|aGr`hzPLXU7OJkQMMhZ@Y}63j@vbG~S#A+YK08KBZu>GEb5?M|;hse9S9
znY=pKK0sOf!Ki3C5I!fDv?ijA`iG`5k#f&octG;RO65#AL6?ZUgF__BYuZ5NtR_jl
zRapL~dG{Boznc7hfHR)JW`yr(Y;fif_!==zd9XY*z!s%`bXEw1%&g;&m^rbUE~`I(
z0+y&1HbUQHR_DIiGkMJF0FwBJ_tB3OqF}wQ<VOjf8tkb8e%VBR{fyZhkBDW7(}>?v
zHd9<L_M7;%I)ATGzYOv+CG3_2rs*yAR8|m`1(NmmMUq9u+o!^(pStV$2wte!0s_Is
zW)YG85alEO8If-5+tGtxcFs=!UY6hO;3wEDR)`QtCI~(s1Jo{9pMs4D*rHAg7kUCv
zAQGM>ET!PrE_vz;;ElrUF`!#{Jy~olSmpB5BE*7^Ut&(df-}ac;1Cld7ACg#52}6Y
zaQ&VP(6D@1C=Jl3-Bv;eO@$>D#dM-GJTqB522o6}gT|Y_eO}sQGB*eD$CBIC-rdAy
zI<Iui1!%HHq-F+km2BjnYE@1T(K=fizW!nr>$RVb$h+G1NKm!f`@3>QaRP5@kJRq=
z?J}Jx&}RBi8-smJ8zJWF`QGbGg=IQ1ePQ_M?aqqEA$`pUn40rfhxFlrK%-fgxvw^j
zPvJ(UC*5~~?uF*QCXl7}g6{7EKo<UdXDg&3c3e(z4y!26uYV+w(SfO;SV%*{=6KQ!
z0NrA6QUmm`7AwB%3U_f*JPD7%_m4bB5!|vS7Va>C?2T7O$B`jCIDiQBGCA~cAXo8s
zl~@dTV9fto1@s7@!t~;lfLSW{+ertNCu=2<G5o7G0BZ<zcrr)O$>Fx%$;?{}{}kJs
zSt!-}&^r3!3&On$)UErx=qxxIn_FaS<~B*JXesU}qt8zw_(~hlQQ+RZZ<?2TC&^HZ
zaqp(|w6NDiRpIyEOqKj3(r?0&E##WvhBM7l^7%@+eb<Z%?!4{Kl9eoa=D5bc<4C}L
zX|4)MVt_`Cv(W70*Ttd*yC_v@Njw5Ga{|YF(1UaTKwBUgAV%0vgbhd4e!Dt}VYa0R
z#EeKkVf_m_Tkv{TlqpmZ7gnY4sR81eT>x|mFjpPK1pe|nv4&G2!oSFF_<<vLO#X5Z
z9wUX;br^3`fl~-0Yh-BybuX&{!dr1GN}$?KL79}5Rd&vq3A<Lc&wCkgmyIupAJLyz
z;0#%dwvg|hc=k5C*Or=gvt2-0t#fIg%;iu(yFvGZQN&DVfH;)|o2NN{&G!N6@E_f5
zphS9If@LxM7}7g%X^fM+urhsQ@$9g0Wd7uPYk;S)*FV48FPks_`OcC~e{o@G<@NGr
z*6IMw!wu8Aq0JFO*S*g1R|4N6a_Q-p^LONyH+Lf7cMqP?qod_#;)g!WJCk98^r0fY
zHI<`hk0Im0BT-Xj#hIFbW6098Lj2H!5iU?jJ7PG@SejYhoOud2U`acCx)ocQ?Yg&d
z!<ViwGrh~_)Be4oZ@=r`oU1fB%v+jcP%DsSXk3`hk)*PbF0C56IY$XP7)lbP4{>1_
zFkX7INwjhO0MV(G-i2t`_dM)bB+1rIBi|WHj!{S(3fbD;&+Y%!#|BDOE`gzgd)su8
z>ZF(C7$egz^QQHX!yo&<ItE1#H*`OEO@Z@L|0px<GHPB=0InWP_ax&k9@_3NH$lB=
z=5=ovh8w;#MPGB<JlOkuoL}xHf7$Z~^A@zo&`tR9Z)M5BrN&7UJ{HANZ;S$^!}MlB
zG=@Id<=@Kek{|k51WUcq2~-`|0mD`Wq$MRx$1%i>MPzHIk(`tT&7@oGE~)PNu<rTm
zGam7u49wbh<Qa8jjA<+#+6NE9k`|USjh3F=NuLvZ^mL~^ImyV*bh@VJc^5(Eg+7{!
zdpiAxWSi{8H<P5T^;3KbgbR1q=R&L#6En~c(NeCNBgLvYVAL^}3TOAY4e8=T)2N>V
zTLIrtU8fH;dQ}Q|XM8R9npi%SEt2H)fO@Y$y_ArKL!+NI_pX(lz7Sh57}n}?kko)j
zquf>Ff%4$%>(AFM;yr`d9MoAW^=Pp|Sx|@5i5gOWE(s`IAsM<@Io3J(&_-0M<rRZq
z|LynmS&9Fk+&>ZrJ^_DXy2I8zP!xfF=r{f-8xSs1j?NbM!L9T#5Yv#q0JM%X%-7Pd
zo#A07Y-Mc)@`mg&<d4lr3691?GO3UsDG>$sGeTDE;6N0?l>}is1D(Yix?Hz^)}Csv
z(K~0(9QNR<ah}D~@`??uJR48{&ozzDIcK>au-uu-Q@E%#A7Ep)q)I7h6?@kB?DCE}
zvTcBGH4Q!K(a>tWo))e(l9tb&=00duWGLal+qR?rW8M<a607`i@%3WL=5xgLB%j8X
zY*dGRa-I(lFH7e{4-Ib%=QaFQ<5}7nAsrc4U|uQqQS=_y^lq+?u~t>~C#m57vKs&O
z#cTHhjrW8U)$Ij3bHix$h|?1yl`kMjEJEMc3E|6Yu@Sd4bXXuz0uCxwYxuAmiC7p*
zc-ldST?5seoiTCmCo0+Rdi7dz{pFEt|IeO*LJdK%ZVn$RXg#qgfg(;xXA8I`?`5*4
z%LH^U)q@yCCScxK$6AM3@-t`N^VRaT0R8T_h$l)taUBA8p*A6wI)tULVBbq*_fawV
zeQBtkae4OA;8Yocdo^EqP0ok@X{Rr*9LfP@@2Xd5*jM}7W2&b|7-wa|)G-K|QMq(G
z=I0ND(1U$qmJ8A?kp&+2xtFa=R_=wpUau<Yde!PuRAwwMA<0!|5mLA{?{o7(f1%4f
z-M44w>`FISxfbs@J7_zGY4WY<)}X>qYiZtbbEnfB_qiN}Y7X^O8md_g5!rP5*j>HO
zzwDm=V<=f-j22OZMyxHU^c%l<3-o{a!?q?m;J4>-FrTnjIZ70HYFa{DG~M2)&&AS*
z43As$DEKCxXIyEwp)I9=3ImK6Z;ofR>A6&_%9v3G*E`E41LoL`e45Eubn$v*1{)z-
znwzXCD09Anv8yf!`L@{!*WQ<z6)p=sWvWS2{3Xbq=6jV?r(YoWpG9dXBL%vr%*|Qo
zuZo%C$=G6HaH#>$hk(lQfzSHp9igpl_rp8MOWWuw1Q*`^P^p*uL3F#PU|-K@OP{Mk
z`@OZjj79lV8~>)#ooqbT`ou%a?Uy@--0vOYT-4>cUyLou0G;-mNB4fZ<8Fxb+fKyt
zqI*WcVf$Lts>W)a#P0Zj8^Kce$ST6?U0A@CK8?DmN<|l(Z|i<1J^o6sz)zqt{w;Zb
zW0K!^B)iB2NLlL$K?0P<GiQLE2PCf^uop~#?2VSky>AB2+Je)D;4BNS$qg(uY@j8|
z5CuXm;m}Xz){t%gkO!sqHX81`c{)O=dsODgtSaLl?)>N$8}-oDwVOTBE$wsf!@2Z4
zwTD`*e+W&!UnwaG3$l*fGH^#2rU+ydB$bW0vWDqQIveI%p&RckZ3Hu;3O}iG>U$**
zss3eKI^b*<Q%ZBtf(t=7vjf}LhH5Su*H<hK8f;8OE+{$*C<ey*81oy(mu4qk*<4jP
zwJ72F*ijsNkY^{Co+b<LR^26qG~>s&lN_aP_C|JUKX9=cEt|0^UAouN9qMzhtBJ--
zqVw$MMsTCUULte~`l9>?G_|75sO00l*%IUgWgB_x8{7HGpRK-C5(3KqM4;|Z2VWtU
zWofNCJ3H5uZ_P`~o(bPae;QW}STv<H-{~zfOfsU&i*@qqso_Q$eY>9`_g^;TpD$<6
zgoe>?NuSQxI?K=1!rHK!X!sfa?o3~NG&6YgpmUagpmN{H()t*3^m==s_0hgl%57^H
zYd^ir>s|^6vq`gy*8AQ3uZDh`5<mahF~~Clb_>Zc<6JxQ9^-JuaP4rJ2Xb`C>vTxg
zaTCBzf+!r`hw_E;@BqHS^Vesv?Pg?;VTSE@BUJ|WTAc(QVD52CDy)Wp!@i^GQ~lG*
zs2HTsy8%P~gfye(#)`4m@maxi*_l?a1IJ@G<l3%Dk&J%yIX|H9el8eYVW#kM5G}a;
zk^6ywe3Hk;Fj}yazwhHZ*@MBm>EXUwJC+;L%v7{HK_WTo`C5@kyYKSC(#eS*WgEzi
z#OOJ@D#RDHH7UDgyR*WLRlBIfXWh}%%LS^7+M{iqzNd4yb9#1CWDS-xrY5ASq)T)I
zcn`P=hO>0XcD9WehWL2X?QjG~M|3Z-8O8(%j8f^{h^StOIBC9ExaFj&BRH6uT~`;g
zC7Cwu%`JRsbM_GRQ8dZ8cJ6S_*@xw1K$4RN|J`uAs~_xsn%5o)wip(%*ILJQ7xjBz
zMYMN(7}Vx1DxuTpLCERdTc_xuRHpRF9*b@MK5}*(u`ib_FkqWK6rLbnmA&Q8OdC-~
zb*sANQQK1Dw{A&ogZ8JqMLyq*(~qI3W+t06){%_1q)1tgf>nREp#9Dso`Hd(=}kV*
z%HgTaayP1Fm%i2MHBG^VUJKm-4znQ!LA%zu*b-`%E}8#8jo+_WpI*L9A8s0Ts{Yhy
z)+a|@%^!lse7mTSCtV>d{kmxH&eqaVZ@m67G&sU0P03Bi-<d2~=I1lBIC6fv<?|1u
zcQnuc2mS%<1Anmr3#GqW*?In|!#M}LmBMeOhu>ljmvQ)<J^q6Fr2^d(9)NjuK!|<D
zDErZX-@u_S;59YD90X<ZhXV14z^OTcoK1occPp!=SI-+*hkf{g81OBvc#Ep$EN`s{
z722!vCzJK;o_en8(oNB>Yc-a3F;<vs$;fapx1)?(vBRiF;obc-9&6qF_LeF1c$`le
z{^jj?OH=`i;|d*@1D|KeRC+Tw+cUAaoxMIbOsV&D>WR<$dWZhxi_;=~NtKbM{b*`M
z#fE&RuU^lB3n!7Npm32-HQ)@FTtgF1^T4t$3o~^<RGGrEF8@{LW{Z{S)r=jzMX%a?
z(X~n{g2ATdWTU3nC8G!z3xt~Y)~h6O$}sPz{+a@9+I03E2=Uc2A=IH@Q_3MdWu<Ld
zX;m*jqUMO};%r~SLb+mNZcm1COV8*0*C^5ZXxT2UZi$Fw7SpFMPp~22f8$0!{~x#!
z&Qs<~HvuyE;Dok*2<G*&?Tz`xjs6ExXy{+05Z0bJ*QbhQQK_4D@0SFRt~50hvUIaa
z$vPRgsax@)48PlGBkeOUMsQgDJbPYiOtN8miEQ%KP>`;|k5{ka4{~Hz2heeCE?NuS
zUsFiruT>@W$@-uhc4Iw8`&JU3H`R%3J*Xz0Ulgs;mKQwO^2ix<?&&v-TXXYBp1ani
zN^$dPcN2w9gx$bU^>*{{G1PNZm$Et_$$l{0WSTr;ATDLCHX>p{zhPWkWs)H{$0lEs
z98QT4n_XCHbN7-|saWXJrMtPY>XHwQ#i-B?8sU#}-CgW+*7gpZv#n{4j^J#KORTY0
z>5*hz+4#9KJQS@ulX%h5<A<<e0?TK_`HQ8;P+d9NM4-a-%I8kA&;}|~8neKv2f2>^
zY6s(0Uw_dcP>O*+E)-VXU_z)54&@P<AfO8l7sYB~N{8tr{T$)A8TEY=U<f~lov*-&
zgL94WFF+)$WcV1Z8usEr7!s-2v<-hRmR9qU@^(U|O)ggwuY<pIORQ7RcAlqRs2I=o
zP*P~<F=S{&|D1$e&u1F%7^)dKhO!(tR4PB-X&l|nUb~I9+aEsPRAjc)mv;=21Q8>H
zcQm3VLYW7mlSm|aLw^p<<q|ghw0pP2GvbzoaOKYm@Rw-ieSVg|%l7(EaQD@!ja|_J
zNl61)2}hTl*xqXM$)674voTLS?)IHuw-XsG-KcrKyU$VFZeEee5f{dtJ-Mjq$So%*
zFR)P8S1ugrll;TRqWwx_LP-qay8B(nlK#kazVBR%-64v@dQ!_Ck0QF8=oRYf#Lo&f
zB%mK2Ll<Ah9(ZlepigPg<!x==eigHDT1e=s1)T%3WBF`#JX>F|i-5QU%Y^~W2!SXo
zROpiFu%dK;bQpJSr}Y%2Lubs!q8>M`V?%Y4MA8q%y<ny4Pwb&4BQfYgm-u4svsu0J
zxDIaHToc;Nu~zMSE`t&YOO@tz71sTQ^w&(@FN^V1NeSNyigcq5q$?zvA2e<M-*~gg
z|2=QEfB5i`zUj&_gmo2I79rz^kMDlM3L$*`&$+W<%rz<N;@JC=sv;1{@Te4JP4%RT
zF3W+`Kxm2Cq}Ubed_%TsrEYYG+q!#s2_2oFDutxG!MmZ{Jp(V3@6MIy=|6oM*}7+l
zs$Fto&mZ<`uQfi!GUCP3FaAM1{ldK6k<|uL;dy2QVn{%qq6w!xgH1_A!?wAiboZW3
zCmOgsnc3u()NK{TGSM`To_=+cemC#B!1*-PciE+~*#F&Z&(Me6sKjdW+toX_OYid!
zq@S9%@zLKvsy@%6eFY*fC=t3uz1p&^YuQSJ$57w^Qs>>B4Ec=nxfvzR`mXLBiJ1tl
zCK5dLCSq5?m;`O#+bgQ37zGNf5^x3sw-HcapP59PJbsRULA?n!m@tGDE=1PYA~Hb+
zO67s0i5hk^J$^+-#0UK2j54TaGMGOxd<H_$&>JmAJjU%M3d>FI50*16RRx_R+r+AF
zUhM|Mfu4>d%nD7%5c#-7yX}4=)e#7`A0>5mi7l=2(+0o-#iwEw$tPCR;__hPopGVZ
znsHHRyxn)Cf_A~T!R4k&UkQ^*gZj3@SW6aH`U&oP8k72Ou3RzdQJ;$qzA~^T_N}wZ
zWl3%^!~*Ryk+`IC_bW0wg~M)Sy{KJO-0}10?y4ezMlyp@df}>-R~$ukJN(HP6Y1V1
zsMW+qgpsh=8YXJ`Y{#Yr&IYq(JxOLUb6qk3stL-=b}?>%%SCR+M7d+>TFuA&jBX`V
zwYFw-eO;?HuUzx%Ot+Nm-IVOl%kFeXbVmX;rzHzsYd1-0u%R!b=RXsU`&bx<bBC^4
zc9iZb85O*$I(%-2+~QyLcvHHJ_%6j@@Nw*_VF*(8?5&rEo}upVk0JNHOa@QSk4KrR
zuAYO#WdzuVO9N68M@r^Z@e6Y+lQxy<Q+d1I8e8eOd#o4~|IdT~U;f6EZieTFPwt?*
z<hjF2hm1u(4g3A7_CHaV^$z~SO7a$W!IvLRGCfTrRxqJ_<8*p###XGj*pfjo8?4SQ
zb_w=SG||;qygOnlEc&VUGb!G~RxkL~ypKdATJ#DhaeilQ?7NDyNnJ4sB`Oc5xo5Zb
zY2|X&5wA1p4Q#^yI(uvUVY7}<X0MrCQTR7Y<?IJ)(T0~3jZIMJuc)O$B<gc@f$!|7
zsoYrHlXG>`CQFQCujO@c=sX)S9R-JQu9j7;6<KAs-5ZbSS=_2v>JN!-=R2@%!eO@S
zsPT`wD7-o~D%jQhwNf?d;`b#vrv~)~PNPY3In6t(byMPWzt@iu;={c!4+{-|<@Yg4
z7abB<eL%th^lxn8sTKJ_ZANWE4UD}9G9U<oe<EETW24BROIqM>DPdnLw!fMm#nZvP
z{N{TB+M+v_-?w^SO{M=RljJX$RxP)t?GH;>m1KR$k@c=wo32<zirz_r)8t?2;n1fc
zVGD7$hH$9Rg^S9zS%)t)hE9J$z&)Yvv&hq9Xnh|YD?Wffep;m4_T8QG=3TK3`3d)4
zRQR5qr8}y1#wUPalQy7aT7OV@upB}4PEn=fN_P1VO#_rBa=SZyX6lNr!<haxlR9qA
z+&mAJ*f+a7Kgb)B`o`}z7IAcH_sJ=WO7)o=I_YP|#bq+_dVlFnAL%xv&y(m`B>S<Z
zcp!RU>2u!Gm?t;ftDwlN!TnzK#b>B27qMz~=h*k*f-0mN6M4?DIa$hTv)=YgyzS$I
zn*?_s$Pe>*mtPkx&__P%6V|RuAR8aGC=2t{&1(2-wvdnHbmS$2myCZT!~Q?C_Wx_i
zKqpG|?fmNl;e~T%9Y9G_E}h%$IJ@zCy9w0iRhPm#r>-4ENmkaBOueev7H&~(xZQMS
zeLBMSCqsp}YXf@igAiS;*=>^e#VbEZG&`_{#Hz!>Dydw@Y+lcmm5jH3&gw?0+hz=;
zsUM_MedI-JpEn&zAt52>tXMSF>UlGvhmN~|j$P+7UwZh^AZDP*n=c{P`@5~nOfXxp
zY4C;E-uDZll^s@%jatEzmCgs$3g8cd3NN~cHVEZ38VWCWTY*1mNDw}?Fktw)aVT)8
zYG-@t3Y+l!x<_NBuc%@3Xfl3{rzmn_b(EwxstiHt6w2KFB|@OJy>aG1z2@hXb$wBY
z)tc&vF`A|#f1`EcLrK$AT)dZxlQ~D4@3o4$BFpuGCkw2#9Q$XAMYWSEC7ea<?%yp(
zp9`(z)!GsbIk!~uF~3_vI-VinWf-zPhf8bstz(b{ayK5)9m;jyT>iXSXq#oFJN0_l
zfTrQOrzr1l4rp1--$^WcEZ^lVEFW8>Qx3Z*w0*~I_hAK>JlorSCxmpQRYDD|v#z;!
z^UBKV`+=|DDdqGHueI<p{@NQdKa5{a9>^i!VxhCiuJ;>%sX+0Bmnr-z*>eI~K$IuK
z=mJpoU_w-4#$lAlCB&2QBSnG#sRsQ2MvN5fAh=E+^G%hs@2|0t0jYbpNxVu9#8qFq
zKhhp3Xw-=I)(KVFDJ-+L5}DcHyH`3P=O|~KS^jCTOyYF;h3!?Y0}c&KsW$g<ZbO<w
z{!qce_Mjr<qhy8NI`>yAWmjSyU-3LkPb;?5coRM>I-K_Uph!pT!g49n+jh3VD&B=T
zHkQh2-^72P&FywSue9DVRHhri@3!R7on_#uz8X%XTxolyWgt?K>*rqQVZ}$$@ac<U
z&P^o|Wwbi}$ig+-F4dO0+uqN1QBp<65Tf9$1=o1p^B#_^UfZ?c?qFSgRM{kRPJTzS
z!)D69vzsFe@@EqwQKBZq*M_IYjQf=5&3Wmqxs@puOt;0qAz?THgm-W}OQn3Pg7RBT
z-`j5e6!yi6go`0nW@I|#)J+uC+6jd{hN%D5-j{$=xwQ>%bIBOW6yg{nV`UDNp=2IU
z#v}<Lgfhh`r3@ugk|82PDAUd?GKZ6SmMLY7BANQ{wKtu5-@fmE&--52cU|9gecNt7
z&$IT^v)8@ud)@1vSJ0Wv=+O{fi{UGlGnb9;?0mOyW~S3RvE)HY*FjImdjg}ZOFTu1
z0i%(YP9QdBcT}rg1Z6;&thuQ?HYPOY?xJ~pp-h)mPei@c$)0l)O0?>tYEH+pic->|
z;|y6<N5%qJLph7SFn+Sw0JEUn4`xBCziAdEy0N}!ukGBlN*wKy7-UXoUsPuB!%W9e
zC3VIRu*APUwa(+|e$}o?@an8%c>L|C5T=P1w!RAaOKx+4F37Mi^p|0uDBn?njapZy
zt?r9#2a{Yw(9}0fTO4bi{lo^j*I~h%?z;Zj`%CWkvQ0euXx8TF*!|SA*R1Y#sfVdx
zy}mo`Q|oMXcV5LqC5t^-W8j*fjZ+EkTrPKteR`@F%dZofK9@Yh)pifdFc1*OH+<^t
zO_kiSh$$aq!@FJV0#Am|XP340J$l{|LU)tpy2Tx8x<$$O>7iD0C{$s%i!3Z8TOeai
z<ALqCY@uAS<yyDBW&NXp`;$xMwJS#b8;#y1SZ~&BZwQO-H<?O`iHsPVSU$)dSDu;S
zNR>Tc9BWW5BRR8BPR8F*XnP{d$l0Tmt$wDuh0E=HF`FFONNn(<DVamHvF+`y&ZW7B
zYJ{I9OMk;Gl4eH-gF;lRdGpcm;K5P5dZBdB2Ol@5Eb(awNhkfC*6)ViUjigZks(s_
zPRF?@sKoW0o`KR<DN+HB4k8Lp5iq|0dd{*u_gM_=oa>3fdbEen^am!PfL!nJdQmz?
z)mN`IL^f{se(_}WtSrEKosC?@RvY!tTek2-xGK4EH}b7aCA1$nWz*Q-^TqmBXmj_R
zTTz3js^qBVO`azsd(@3i3+>CLim72T{PJ|liwmn>V|Xua#z%NfMj+~#U2bcsqS~no
z!Rhwe5>p|<ZOm4262nvC%jWid;{7L1veO-4ukXo=u@!Y3l6D&s*ioE4>XAMb$CUD9
zpl0om%SEiETVHwckoc2vCx>JAbZ?JGV0&iBH0EBnDK;@Ixqj5lUonv?8=Z^MFX=m>
zJW)}X+vYI2ti920V&*ldbD`^Ci$n-}s_2yhi^Un^a~k6@j&yqrbbMA!Y451T+pyYZ
zQ0;yq5Rty<q$K}-%?JA;d*`mFAKl(akDSgIteG~iDk;=sF<CL+Up}%((fpx7?P_F}
z)X0Lk?D(a=#QoYUHlqtAFPRFYUfkUhH+`sZrrEi_OtXL27{V$smth+i>Dc{SV=Vod
z<rw>pg@TLj37bR#hsnb>>u(Czs^eR&vF=MHtz8@MzMfc4yF45R^%_cuzNk1ZW91B#
ztL{ywS$r~mTud-|r9wtx*Aw@&(zMzQ<+uGG`rNyOZ`|2+?3%n`$em?lwz>F^werd1
z%FRoMtIpKjP;T;fqk0~3-(63~r#|i6zRI!M;PiL<D#x`)y=zY<w=E~Jx!a$8V_+~b
zzOUD8c&g6iwnL3<36;JIQECiJ+R9~PmgZXjev{W$&f(>Ee5NmGP?b!X(kHI+eKL7H
zt-+vcz#2w-=h1*tY-$aU)H1t}kKjY&hNhDHR;r>KOXFF_wyw*fVas|StnJg^rPf$l
zH`WZBimDBV2;bzH#M<h3t+QpT<hZ?^t?zv>`^sg~XK#0JTxR9I-bpC3`VABRf|vSK
zw|Q!lrF>QVlWLVUO*WsaRkDLozaP%r@^cZ2;B3>|a8?hn4SttNYdJ&q5nK4xG=zw6
zt%pot{6K=~>9gA^{t`@~8V_DD^(C9R7`4lxU$~@qK>S0i(--X1h9aT9tK@VilRnDn
zCLM@OS!6jRv+xCS*gJ&XDodX^HB(?6*a}%>g7jUM3iF;YmAOxSJ{i3ftFEzrds;u&
zeD`mqQcwMvQez@73yeRhTIXKI&d-ewM8qtO+fMJ{-p=!2_93UyK%=X+%pv8S%kxXq
ztX@xpGIs5C<Pv-m>LxIxUK^?(VOy-PSA9U1eqQc+?>nkz)bVsgJ17S)7wokfQy(aO
z#GURqA4`-|oNsueee@==yq$Ho1jzCa?JniT3Yka!#x?c1tW~l@?^s({oyltr`dZRB
zm8u#q@4SySd)5Q}XCa}j*vw2*{!-vm`_}y6B5AvEuOYI6uQ{jo3`p<@6tYL%JGeoy
zB)*W>wCjake1~qsQ~OgA<t4>}R3>Gsks77@Th!}9cy9>4E)<&nGQ3;B*>K+*RngrR
z=laVIx=Htkl8@aYGaF^Yxl3>2+@)bScj?Q2a+kjU@7$$7&8LxH%%}gqlj|4eMR&@g
zszHzELrbZv(+~IUZxsFT*v9#m+uFmZEK9qL^k(Dids)<mSxf_6W(U=!xyMMm>t(ti
z8!E`t&bIjhmUJrEO>;2))623DGfV0c=P<pQw&rR_ipL#aKTLRV+N5Xcy%yNERyxGc
zwH%P1t~0XH7E~20_MtDN>d-#ZDx<`&R@TX0x}p(-qBokFe7cxZ|6H@FyysNNtSS^D
zW|Fq@&g{YSpfjc}%q9{G_P?8bU1+<<_ncb8e4pu{5byZevF5eOubgER8cviq1tU`0
zEm%EFlswGJUvzs)7|4)z$a{vx@J4$ambNkux62>rEVa~4%)&}Jm#JPpY?fx}o_txG
z{zH_em>SIwi<OlhBlzt=emsNh>#uxALbYouK+0s<HhS73g7pFgxO#$Ml@jF;tK{OV
zqxHMXMM!)!RT1N_#evy|iq{b!YX^ZAyID_>gN&Jd$v`pZJ0a62#_pLXYEI_&X(k`=
zZ@kpSsLxmx%g~`Vsx~Za*dsmvvN@MRL#%I?MntlMWSa8GOv8Ys#^5dC+o$JdFG$*J
z9?UtsFwosouF-WTqG#URFs4$sS2Cn2`eY3Iz6_Ua3xPOQvno-nSXb)0p5}oTgAa}U
z!&nz;`sHJDcQCWN4W3?jZTzQKt8UbivPztTMJ-kNXqWZvbYAo4fhFwLw6^`&AX!PF
zE2=iSRc_6CP5M3$&KXFMXs=AA#8X+1pPM(=_at|?5;i0@+GM@Q7Hb|nXWzCEpXxE=
zu=+(x+_GjaX<t}wm0nXr$sp^(`!(Y(GMc$aD?dNR8J3eqS8vq%Y-mqwjA)O|C~^0s
z-EWvJc6(v{Ne}yJQJ>{tO*Ql0cJUa|!pMB*R9=3MheOxD^grA?ie+qkmelZB{Eu?>
zOZkjvC+~2+$d@;ajtkTck`_|gF@CFi%K4Q*w$p!VyeDH=o$O5<k9nsU?UM4)e1|<m
z{aTZG{Iy#B6pt|T5Ag``Tk#0{H~w+K62>?z^hvC`yeOYu(0v|0^in(OV65lPCz-l0
zOZG2DF3am(tm+Fbe(u6{;%$`H)DC}#i$god&L|6>9(35CSlN>%f6eSQd+9lAH*3!I
z`x%2F+ZQ$jgFA!%kkKTbUHy#pGGURTi{nWj%$N6OaFESO_Mv`incHa(+3T#rq#jMB
zx6&>Bhp=+|-380}p<ztwR~v4Yhb=}e-M2e+GGhK1wcS4FGQLZcbHUc3&f0x~vc|&m
zV^i{{TofCAAGp+3WlsGlBDXm0$&Iw?&Q6V^4^y&En#7*%%QSZ=d8e~4NW^n8UtRn9
ztJ7w6g`OHk2C_}gyY_Zj3#*s7T`{q8FBUc|5pcOB8OFX-+mW=<@Y9n&Gmoq>FP&ST
z6kTnR+O@yQ?DI#JsE>vhMoX7i%D!RTP!3H7%At{bxlr$AV-TCp=;a@h)o;1-<c86p
z8^nw`UmOV`GyR@M1M$2l0=uFSoL`MZ!60Qi)lo??usRckfR7f8{;U_kBafT1A`Rd~
z+ZIF-u1u-`ac~L&BB<abA>>FZ;C!<fJreQ+EhvA7O9h_l%i*%*7mNDMyfkd)fd8dY
zDm{&z(@w7ACaDXhf{6kP2e@4X_7;n{_~$1}rYF5o84ua5WOAV5YZ_nCiGy9zUK5tr
zoQSgLZ;G@3gO~eniBd$jaT-khCr-7(HVt9_f<F6>GPj>3DGcV{u~>{fw;3pA6pC~2
zmF$o_+Q!(pw0B!2zo_2rcPf$AyA${Je8c!xjGD0<lMXu>4Lqld?1~n0SNdpf9jbFO
z+4)mawR%HNlt;tm^YI-NHJS(VSq{|9XHHo47uZ+M4!!7c6SJ55z3f~O_wFXXvKzq#
z)hj}87_=o{m9|6<Om*g8k-2vx`Gk$VzS|zEo)q3-9?swSAuM-kx=(1lWOi4<dQoF}
znCpU)3pY5s&R1V5xHMF*l+KervCVHvYDndyJXPaO@y6RrpYDfaP3k_?WW3F)<$7#*
zbbR7mrdmf#ac9>{CHWM_{td@-;``QhK9K7Fu{D`}!J*25cavK9-68-P>ARN*c~h-`
zYO08W!@*Sq7Vk}05eH<UARbSMt44ydtH>Ep`Zxo@(R4x-(M-unnUKjLSK_r6BigpT
z^DwPf>aaeokhV$Hz1iUi4{0lDrB5}o*Kc#~vWxb4NBBo|eo~C8Pq}8!m8ntpwpYto
ze-gJobIK<f?eAsmoxt>6CK;QBH6Nw=A<XLU%MJfPJU4Wl?XjT$E??go3*7PFksQi0
z3$sV0JkGp#9T;)J)~p|Ep0lNkEv&g17Btcpl=!~Qr0L*^pyLnsge+a9cG92_AKaIp
z#Mzr7{=spunR3Z=kBrv?^An?qF@?4T(=B9za_o~0<DcHhGE7|x;hglm<u*BHZ!1$X
zxV~8YqTT)A(o6^TE5iXP)34_yNUq+?X5UrrKym%zytJ~ixbmScYtHuRfjgC0XCX1O
z^h@W?JV=CuVn$Z$z4dp3L&IE8)#ih_;iG+DV0e6L#HpI}#QQbY+x86IEQ%jdf4M)l
zOQQ*^WLxOTbNgM~1LJhNg?=?TJMW&PKkh8(kBoFpzlyH9VVdIk4MTM?i=-+0y5Lu}
zm_QAKIhP>~b@$9<vo4;9KcfRDh2GirmCLe*FJH}IcrYl+x@)n>sxeB)B%<-2OQHC<
zRDB0{bnK%g0|F`;Z62QD-$Vij1}c*wXJi$>SVh(8GfFC~zM~KjXoZfUpeciKONtoh
zexbdgeHZbtMm}Hg@Z)$G$x(>q#h_Ydgt(9*tpsKTJygEzF(ee^k-i}vVfftLSeKL6
z7jxU2HQ1Av31-`wwCfS|%^JE6I$kqT6cok*d#(odru-+-I3wlW#-`D7XHP^)+f;vS
z&;XNa&&wei-=7HW??>cB)*R|<N)=LS;f0{p^u2BLuM6XNlw}MpPuPrKlC-Zjp)x+e
zDqPmI>TZ!v-C@f2AwBvg<Ubu1xXH`2%fhfx;^P_Tl!qp^8DykAuZ#z~oLY#)#$z@0
z5@JseSyk!>&a%#qXZGJ|Vtmn8Zpxl=(M@tOKHj4@zsUYY%=O(@$t4E5*iX-U3*CQs
zK0V#6S0dS|mUjPo{;<*H>K^P@jc*wB_;tcBGDD^2@f*C39pz72mJbQ#ewyxcD=5X%
zIbNIFYf$`vYntxErPrgT`g)Vu9)_~oG*dCzG;_vz8858*%fiwN1~}qvX&)P2T<UG?
z!>(A8-JV&QTGtKy6!PUbe)tGcRb*J_P*yW#xYaX}iqS9#1{n?G8@;Q7d=Qn$?D;(k
z1ZPKqL={->z`so>vR8{kBvlVw<Xc_{$Wmd@3rH0>4rz0n384w%0pgHTbflgptGs$H
zjP85L_t`Hf<lE_@@Ze1DXv<iNT~AhXHkCnRk(}*NREMywh-Tu?NS4etGw3>}8NJi0
z;enHvSXh{SQNcwI&MgUhiy;2C`_;AY^EV7dT8m*uhhX!;q+6e*wYy>-zkRo+#LI*w
z9qqQeyZH8#lzd=)vTTy%^wF7<w+aS~GraeYjrec<CUR$@1RxYDP(W(TFV@X?fkK>=
zg<q71j5S)j7Jb4fN{->oQKR6`v;eoK)hB{T+DN21Lm(ei6v5}%;>uLhkSme%9ih>}
zXz@d-Kn|#<1KG9bDLEu|QYkXL$e}v!x6EqtRa724cPu#1ovzy|c<y%ptDZZ8T8{-R
z+v|9--ypeaWSN_nr_c4m+s}%pe;)FGCBpF^l)sY_vpufYCMHZNKI^NUOyR%pY}Qon
zCT*-L9INs;RPkt&i}1sDZ~q!N3=V(3XyCvZ{4A(II}&)6MNU$P8ihEF9BnNR>2J7|
zlt=p(vBjoEuZk~-LL{J~UJ=nQ)N`gGM0HqD4kyM}hYwePg`VFJvZY`NeZv4{Pg&Hi
z-P>y%0Edq+un}jF`4=A*nlkfuqC#QZKHJyk^1i+$Hm)vN#-yqf79MLXd6<?_><5tW
zr$59Q|Ce$-#2JVFw{gbXwK&NAA}fOZShh7<0Z|o@vhY<|FkYY%ZwNZ!SJR`yV!;?j
z6r2-;T;{;#al$H!Da;8VRe(vl&0i~k03T?K;UFdqJqp#W?}FEyGa(&h3#iqR$srDM
z>6jW&SIUuP*;7q{e}%5aU?Ftv`M+pRV0F({?)Mb)stXg+YYQ9>Pu?eWq9ga(8`^6e
z|1>oJj#&BQL*R+3;IQE*PNjXueN?PR*_cSs??y$Hl`;zvWw=uTo@j!^(X@jBLYlQW
zcv+bsf)Y7zP%7C^slOOpz6w6e%8&j>_QfF{AVp&^Qn4nq|6TQ3d51{x5DM!1J0n9S
z)0O0K7`KG+qa{oy{NZC*!`=tHy!#_e`1Aj4WVUNzAO{V}q1+0=*R67bfEf`{`b9PX
z_$)vrNtAxIJlZ!ZacoJMWm^>@DRJ6J2yJR4+RrH#^bE57Bf+b6G~vh(31~WeT7=hW
zNiYmYp}5z19B;o3{2d79#k0&5vf+6{apCceH2=X3T+DtM#O&9;l(6p`DJ>YUub~N=
zI8~ooZP0#i{9O5iAp7<n33Y9zbkUL84&k#aDvn<};-%Oxyj*lWAN8k9Q(1)c+wYC8
zuIIx_`abApQ9lL^E%wx>(4|^KgIoXG?qZc<>1;c5D9$PX`%$-;#B6GhsS&rOsIB*k
zYt`Gh#e5A7ot7H=Z<q<=`H;i#)euvL=v-SC(~9}|uS*hf*ipKS48_>l7LC}8-okla
zt1K<X^Ec5r48+C4Xl>m^m6f^Ez4)-S>&wq&Z$3>s9(JsOANp<1&EwM4wGZA&6WxOz
zLqXC-c_#*^KY!>VYh6`od0w(u&WMJ&wC6)x7IpH{op{SDQ$8Y-lW%xEbHQ`SesYFg
zuI5wcnng!PqQ)0%aN@~D^~!k%Ph>7v{a?2>M=O1Ew4}3772hD)pf7Z&(T~B(mPREG
z)T!#}xLyjh#_m<DZf1<**)hAnx@aMnzC*3K-APS0s3~vvW};93*HbK1Cv%c-Ho4uK
zCQF;x;tqOfTBGDyUw&djaZ=-L!62%Mbu+=#)dQKWo7Fzt;u&r=(7sXeYLnxMqjePI
z`6^f;QQ8UeeBm=ox6)1^0$2;Ti^q=%;S7(-W@k!vS9^x+De2#nv!Tr0`&H)8U`s(U
zr%Q{!J&;{|m#HnOucui2zR@II^!7Q6#jLCsqmw4_nBk$PpC2_A4!mzXnb9n<62n`;
z>yz7h4K>(h42qktLyIu9_|Lj~h^_f>PPW}~mi;65`MAl&_VME`2H|U@yjRZIcje}a
zN?J~y6_fG|w>+d+HNQ@`7`iSW{g$!B^5ov<($q?O&Uzn-eoL9!dO_pb8<kV+TIVhk
z*&d9cOZcqasnX6Ahv^OGdG-D<y=&+qskN_o(urUFr?#(gWJS2|cB5zfb%~yTRrB3t
zw)a0i#&0(G$KT^R-yKVq7?LBG@cN_jo9EI@@%o3Y_^@njufyIO*(@9F*Jsu_A4}a-
z+CE_v^(4znDso84a<@|VgpizMXAIq=+V{qp)E}N^lgf41)-tzc#F9O7$dgaWDPdf-
zWM{RLF8uROT3n8Y8%x^Kp&s)r@e*r8Y3gH#&w3wosmdJ<E@$d!zV>GefZqRcdU@2b
z#?>X^^8o-}LRLmjvUfh#<o#ia#jr(&7OL710J3BG&M_D@C6}t_qX37i5BFzLxZ6-x
zhE1|JnAdRR@Q%g%8)Vexg*{qsPc%u@ip>uE*r&75$>yv}Z2m=mZairCXgL$)<@9uN
z;>b@>{B%PU9tsbJsbed40x$0rh|bsKqDPwj4Cep94Q2k)xL#X~Qf&5G7eDrFB6zTN
zq?zRzN>Gkp7M;HV=((Wb|5>;*>hn8uXE~7?*^{}_Y?&|Dw%0JqO85sx<exRF%V+v}
z(t$M{``cHW$>^t9=LW<_cv7naUt7(pyNIflTTkDi^ESR(VVzWF^x@c(qJj7IODAuY
zWtP7cb8j@|lSv*7ia+}zYO-&GNZ2dC^;(hX`^JU2Q^n^#PY(q8_vu_LB&%x&L&qZ1
z`&+kyEZ&HUN}eQ9z+kxHA86$8N1RHtU5m?t7QeoO<kJ8PJ(7HY4Ir5Zt?VE|BbgA1
zMwHiqUEoZVDB}-TRsssSUE3^sf>D6zWO@#Ih#~VOAt%;jfU5j@s4|4%XRMw)L?hd?
zZ&*Tnw&@|t51$xZJoe_z&Q``<RV%*r))V#U#}~~W7ykB{F%uni&v#uGDGejTNz?Rv
zs~Fsym|U&`-t3t<y$|*4^N-haGcOoK?4WMr^!@P}piZ79xok+gK0F{FQ@)TRL6L2x
zS;clE<Ngf)@{?9va5m_zC<70(U5kMbxFh#bE-R)B+Ym>DaoE(pK+F*VH7tqpy2Ue5
zB=q2~{30uH^5TAq0@`~46)1v$hJyj0LWOg(fIb3yRe%ZsJ2b&Q6?!B@sGRj5<&Qlc
zG}M-MYz*19x6fK?tQXIl%!g-djA$<KM5j3#ofCfjq3X{bti87QnS+)e++A3=B3-`&
zN5HHZ%RA}&hHBBBhLUE^&<XR)Q(V22@Bay%kO~dtpKG5Tc!0It-ry2;;<qAWtAOZ-
zdwI@qF<lm)i*OWhYih_h=f280)8{(TCRHeG5fl7?=fS>|E1b;9lZol?EF-NJ_GCSS
zXQ}$8VnC%pqBDG4;6&?0FlZQ!r>%05@Io}x1ujaUDNzV~0+E{W0$1=e7%~<j!RtU%
zu<+0#?V<v5NAZTDP4xm_0xbdd{lKdj3c(ym#o!@PWOo=Uc8Iw&?&A2m{H9d8#_wNv
zZSsm(uIWpf<g0rzC~8JD2S(^tslC3!?lCGSyz=SdH;n$(8tLN9EPv@oJ%bLP)4K$P
z#74ehvL&b&4NEKr>@V%>AiGlBnqgA#qBgLsxL>}*Z2qQe{-00ugs&7ra~?GN6t}>0
zJZtuJb{&n?a*v7S&u_E~lEhAxKxBzw$r*QJQ*zfMgASMA=~==f<yjE*)IPZRm_6?%
zR5P7hM`rm~rsUVv=NRE`X4j)%a8C(!a%b>%iQP!~5~ML@m!y#@)6^VcG@f7mP<OG$
zeI;g4WVWE_;N-QE{tx<D#&>o(sdO<7O*&qFg=_Yo+bykc7um%yFW<#fKIyPrRn+^w
zEuCuKCE1|R-pP>8+c9P%aV|(EGb>p7k>}>4Wz`qU99II%L~+dta}u~`&^rlt_QX#L
zZ9U@?dWMaY{7!HC=<m-+*!)4ddEU-K+|9*C-+$1?NrHCW4tKN041&cB*AE*fVOnpy
z=!x0osvmCFe^sKim|`7YJW7STSEd@lot^iqR>Pf6)Sb~jJ^)BQ0D|vC#OjGx@<vu)
zSIb0ZJ7I|MWARt3=;pl$y1!cS_g*V8f#KB5^E$SeV*Ya%##UAEkB$5BR>K)~8gJ{U
ziP_6P!XWo%o(%PC0{T^k`h|WgY-abbZ~bQwetoNXp4XAZIP>^I7#T-I5olykx7bgO
ze_j2lTbg;su#L<Wd=I{l%&#9S_r{6rf9zHmEt_AC)<5_4zZ}^A;MVY8j+Tj(Ou<wH
zHE%?;&w82nZii;OLY`*5p2RrDfDmiutS&>=*JZl-oftx}O+!F5i9!TAgO8s$TTlTl
zVsW@N5#(aT)DVk9O9I~T*$t+F3y>E7jLU)vY)ih7aPULbJ9^wkVURF!8<t5zatxT3
zpw?;YX&V|n(lGMY)Ak|<qe<Jyd(X0{Q5}DlS$)@;hjgT}kh4zwK8xDzUie--n&ELp
z>uJ4;*0Z}F86+6_*^;DU_%IBFzKFqpe-ZE#Ch%jn!3S|Fj!DA@EeoL@aAtl`<pq%{
zk92x;BGQd`GH%TWqYwZGi$5p;V8jPjj=$^r*+l$uPe4wLuLR|Hlt6(KehvzA;Wob0
zfeJdLP&bG4E`tcv=(ukXMr3o>MkF(ZbObuj8fsyzcFo4GE}9{)0>BUxu<^?S5a6y8
zevd2C{2tc{9?ewH+o2_>pogKykfRDb@J8^!Mi4l&D1jEY0s%iP)!YgQCjbVaI5AqN
zjrkfaXhD5}afg)!))m}h4GIljW&vCwp+<1ij6o<8R6q=d)6IH>9K_@d@FRW-1Spdh
zDsMu(5j_V1jTQmaBSic7*&vkM#dj1SF=zw001fvIIRQzODN5)ZaD&Gk4mUO;{HJY1
z1dj_IjUa3%QOGAiKq0|v>ji2UphwjY+_?%7+knIp^|rxc$gR+LTDhXp3M4H+3!E^4
zpASr#B4gT-AanqDlt}2<0uM<app$jOr&s{q#|)`rxGm|>7G^XY=;vVQZ~&pQKfX2u
zx`bfMRQn?Vho2LEc?ckcD2M$BA$3ypzP+Ig`5XrylePzBLiyr~*1OCIHX9M41pd=N
zY)63HbP|kk=-HKkh-~Yvifh}68sJnhO%YFbOc%DNf<WcW7jlHQ4v=NyTNSDZaNT8c
z2AZ>~gXt5+fx{F|D%iqQ08R!Y1`<3PfP4f{BUK>)SIY>Dvq;iJuT5lO$Q8gV4%L@@
zTM1K+Jg&^U&#XqtLmI}>3q(iBb0n{_05Am92PaTU7+^AJ<3NCcOo4#YtLRY3$6<;C
zaK%8_z7Hnl4{t)fy+}MHQ3b+7)E9v$F&HouqNE7)2Q*kn0O$$@0SIPH9ax(YmH<BF
z2|@D*Kc~<M`d@V*_7tGPuia4k8$%32v%dlcnVhw@A>%)KX@Tgr#UEgQt!-dmjV4hO
zKvSg^Q5_G=B6K2Pt6(oinL--=M?o}cxNq-WW*yGF$E0XdC3Enf)mNj$&!`;;DnyAo
zB&rBB4gdy0gy6v)fd)YlIIXUru0&hMDNgE2!0HQqZ4euyjpD$;BBTV;oR9)20N*tM
zbON&q*8=7QFccoe+5K<{Sx|WjSKA+h!i_j^P{B^IcwT`j$7z8xg3wPFdaBFOYN3xv
z4G-Dlir!GtHlh>$_Q$W;D%czc!c69*+((eik(oxLk4Q7zH(kM0!6;P!_>R;aseer{
z1P|^F2-<=Q$H7w{_=YH`E2waYjRF0I0Eh^ZIzU?#XHX%ras{GBzQ(%%p&$Yp<|3L_
zh(4cj!2}HGrb#+PsJE>`1gx4+RLz%|-wz<#Vu5(z(6%32OkE*$hZZ03!D!f)4zcRf
zHe!e%$$|47zlLxFY%x4Q96<Ra@9~jjJW#En41lz|yS13xN!p3Dc5CUkD{P)oDjdQ<
z6Qu$_G47!1o2J;VsIEi_P@z8+4z9Z}y9()5ID!fRbs+#<5&{uWY2pij0dzQ@2#ywk
z$5<d<iB<ww-bA=n4*)^?LKOkzIs&i~Kqulu`{w%ML4!}I&y9f{ilI;|KiZ=e4_qp<
z8h;9o+8);dM**Y($H$$hDl+R3sUqxco*~46M^7l>P%3GH5c~-$*b+_>zy-6f?dE|H
zPPRh}547PirmjS%1;~;HfDrPC5t4vDr3ip10hPCL%nv|>6Qs5QCq!BZ;-bE)kVng}
z&5yj27$S}>wG4^_au9z93KX>O+s_iFLiIM_Wx(qA&whssXcN}lOdh}%B0Rv>=9zEn
zU44L15#fqNhj5Z`lDx>b2;c*7eu4`DV~dAudupQXHYtKwg+tJPuDb}dL<C9zjw%(b
za&RYTEfWKdk5i^1fB`Dw2=ai|EyQ)gm4O=)CZKHt6k+2Gv~;1A5sbnQK!JF{hXGxf
zgabpKphq%JxZtO+P?Df;R>7=4?fDyn;qz&KeY4se(#WjZ+*yL;jAzAVZ<#er{Rh5m
z<9D7GntMUo7H{G1U6IKvS2?@tt2fbYI&|^ciI!40Q1Z$x!dC}lo6#YY*9A3_!_{T8
zVbZX|!R#IVL?`;^4E<*bbm40Is)CJ7>Ey@w+YEN@rDk;V3i-v*y8M^{-%64>xOiE!
zny_=uql9<FH*;_ve|7oSSLVwK26LB7gx5F(+)Fl}CcJ$)Ve<-o$2;POu6A$GFcc5|
z@Lj~OuW)^W@1Rc!ssnR|*VnYT+&w#n<>|K@<N8gE?;&3V4mLuA3FznyvGVMfjLI(<
z)CeG26~|6~EUn;jm+2Vx^i`g9hwsR_9o#dDX9)ywBSeA49XKU$qbJtCx&yvqL8Dw5
z)aeZ)k7;y4BTwvr&_F2GUyN=L5JCuILujJc^zL5rt~fAP%+~UP*rS-OjxOr?^mPrh
pm&#W>F;WT-6I8T#`KaI@T{woeol^vZiv)s+i~&m7e35<Y`F}ndTJ`_{

literal 0
HcmV?d00001

diff --git a/public/images/login/bg_register.jpg b/public/images/login/bg_register.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6989550c6a2a999d9a0583e35ec056e247a754d8
GIT binary patch
literal 37083
zcmd?RbzD`=-Z#89ErNoCv|ONqbf<)*(nv{*NNix!-3BOWP)bWTBHaoC!WIw^kXE`&
zI-gmfp6fdIxzGE4p7+mpZCQI})>^ZEGxPoRY>&Sk|9~iD-I3-Hbn6xiga`fWI9`N^
zWn4_HJs<>x1)8rz(D4sUH%n({dl61fTPF^a`*!!tI85zOobD#}oZK8-oX~X%cY704
zYcps1duA3$TQP=}>Usux<b5#)9e!mlWqWBeOXN*YM>7pi6-`r5Yg6I-3=-n>*WE?j
zQT8Y^XA^pNl#Q*Eh`SiWN#`P<3^#K!(4XAmY%Ruc1AZ(09c49oX*)+VdVUT8c2h0^
zL3%-94sL!yK|Vn?dLAxreoii4PF^l{9$pbXE)hN+`d<eFc$?#WbCKIJa=+dMYGMq(
z2Ic1F#^J`xVdrSU$t^4_%*n;W$-~1A?qGNFuyr<ZXSa1?{N00$nUkp_(%u<qXG;(F
zXmZca#aWC2P<lE9l)bX@pN{|IY@tx_xK8eNa=vZ$FEak)-A<Yw_GX;7&7AC998Jx@
z?To)426Ok{Uj*L>s1Z?hM1n;zv5~PebwQcgI^U8JV*pn;?j!Gu$OuRa^9u9G2;Jb3
zk`>_QzQHHNEhQy<Lz<tPTbP$u_IDru>De1n(sF#f!os{f@ZGWkLOlGkaspD)f^t&Q
zTwGi{zn{Hj>*Q==YijoUy-4uhU(X8t*Jnkf9nDOf?Ho1j>}-A`K+V$5+0Mz*&YoUc
z`eeoFnRSr1_wC%AuE9%mI${|!N2IISeK|)v6#dB@iy;344MJvof;_yY-0Wue1clgn
zP5AiPh52~-*ah!%nF{a<nelQ7fH9mtfB*kx?l=KKoG?iK2AbbZ0Euw%4-0_GA0{%h
z1)SpuSmbyaI(Gtm=>B`aiiqPO=rM$Yg@uKUg@cWaa|Q?eoyEh!!8=QUkAD^)pMZ$q
z<RBtAcb@3{IRX+AQc@BU8ft24noEBU1THQvAps!;5fKFy88I2vp9}wQ3&-yvVmu5P
z%vnqXF@!;kz$8W-e}uXq1OfqJ!l&N{0s|8p7Y7RuZo>dqez${>VB=t5V&UQuK^WjB
z1kO2vv)DK|nBWcs1~KLZENq;=xNoH4UQ{=E@PgrGH;JY*zm_?ZLl@8OcN!7J6QpM3
zZ;GVuIi@f=kqKyjc-SB<`-3;N=Q7{wT4UrDJkv)qF2o2x4+ak5SuFU?@Vmi_u!z;)
z+`}dVeLMWPz;io=#FX^%DtJZFhc3sLyf_SueB=)`q~3Kqtu;s=4?+ZhAV3Z=BmwQ1
z&Y~#(MgRX#N~9;_L`ahUfBg4ny8f<c{xtsg0zSB$4ypYmnGThlJdO_~;}bDs1mGhq
zC6n>7nKAs~e?-Y}J2w0cpKhPD{OuxWd?WJ)JOw}c>y7vbX3}JQEbut^0D$~=LjH9X
zOiMCEikA!?k-~;b5P&o_Yz%gcNH9$pKM;}>k|yBmF%A(ZAReFnUHDZ$`N9Af{$58s
zKJ%+Cc?EO^|ATvjI|M@~WmbdV4wEb8&rFK<-zh~%Lij+XgNY-Sgx+BIt3k|UmhhD5
zVSxgeE9?eLyo-1Q^ak`?5A6Nn${9?E0OCT}L+?)t@YhAqq6BgMt%U@>2YQdypavcx
z0nc+i;PP+4YB*T{1u**vFq5a>fLQ+v{>)Gg7W6<8CLLlpIsb<fKEx~uslk&8-H^mq
zBgOb~GNtU0+F5uuF|r=mKR+Qfz~Gc%=sor?@=ger{9QSv^ps?TGz3!%DhNO#CS0Lc
zg6V}RCI)}%r?mf}84&xMb|Q#0S%w*qg9kAKOe7NlX#D#D5by><$O1f)(!U`GOOj0P
z50idY@`P@7JeH>y!4zvXVE_K8(^p7VNZ!Txj$Z+RGsbs>KMur!fdf%McbV_f--WAi
z@f8G$XF%mDsJ;T9yLhi8Ur7o*;EGfNL!bfW(~k*;8UsMdD}^gW7vNdH;D3S`3^j-d
zapSS%3B`D%^rV1#|9>MNA&Cv(0j8bQA37_U0}#Rtu|p+*d@20r<PWrD@KbQ!KCpkF
zDVcMbN*yCBK#PdwDVfaK#}7}I1Hhz#%-+A@&ocZIBY;Y!zrftngSm$%Jd#GT18~9#
z)lyf97$p@*;gKlOD}d`%2+1HxxJdy94_I&rLk$niJRX>LKs6DwBs13kpg$P^8ygCS
z@FgK^{A4vq(;uc?k{u5oL>gI|e>NfqahtwdQuATSb8>$zBEFOxnqc;G=&iw$z;K6`
z<&+10aR2}_%m^^5PjCX`8VjK0<l6y5=&{+yGk`_0@p&KPeIfpMMl!SnEBQhIn0W*<
zDEKR2fr2^|31OX%fSwEkp@x9D_CE{(pa&s^ki;j#NP!@h(-CChW8cJofs;jglTeND
zGWJcv%Qw>eOYplTkusn;63~v6VFA4GAn)=;Ja{e6KE^n~n8pb!gJC>BAr|J%KVu+1
zMY#ip3HS&B0Lc^ajAJzrQ^C~-F&CbW<LF`V5i?_1o{<WY<oN;*hYAlZ3pg3e5)TV3
z0r-HSK$36%^H6|{QS*mV9z$smgwOYa%o5;<MN*AL63Kv1b{q2+0{%;T%9nCd0fpyO
zH}RiqpAP5Y4@?DmgTHjZ0N@pY*8`SHe_s)-lhFX6!0P~(=Zp*(3tl+A1s*N{61*lU
zd^na^$ugD%6%Uxzqy57Wv0wy|7<?yXDol2Gd1T(moUjK5f*HaC?2Lhp53|Grum=AS
zOMu;_V5Y`+4w2qw)r7DmHL;V)=)t%ovk__j08b|aU<E_+@0OtgYXq>?9rUl&$-4}%
z41UUQcwNNP00RQj3&s{avXg=gJd%?SyioE)SBb7(2(5Sw7r^RR;*G0=F@RyBpHf=l
zb;*Gh!qLNP$4I?#A%N2I4B!@Xe`aDZSS$cGVC8_-`4`k!AW1N?(*xE6M8DWPC50uK
zncQE~KUouyPRf#o^AfDgH>3!8QSR6ZmAS%}<M_71XPQXs#;fHFwGlbpgTai18bpi5
z?{X?XD4F;)zy72>Xnrp<&I2V*y)0N@8f(;)E_75BR@$S@w`7vUDLQ76l5aKi;oSHb
zy}ja5Dw0h<20tv`IDC-+<rif*mr&)y|540&mSx5*#bA=S^cYes5%%i-e!KM1_u&eC
zi8k9!l(Km6`0adL1KUaG!6XJR)XR{B5Lez+{rZi5Q5N5@Ce&um{k)Re0DUL!`uFR4
zmeqQ$Zxtt;2F>4Oj(K=*=`CyTjg@*{cwE(e^HUd6Sv~M|<9R}7Ev4_T-v3Y+t|$TM
zd!#@Q%LB4>SSZ}a_<?x`uoetL^2fhaA`on+tL2}3!brcMce-F#WKIMFmIEdq;2<jI
zFhmSd=nqhgr&k~~OXm3^lT2wzP@)baFBVG<;4wNF05$mv2BV~$Iu%$iz+ynFJb+Gl
z3J(e<#i0MaVi1&!@fgFOlpdQNVouY78A*)=1FRK&2|kR#Lt(aXJF(c($ku^`gZ4S*
z!D5uKg7U@%p?(7m3UhnuD86=$hXSKb?`lGku`anDO9j<qg{8q%hOb>&(;Xc~BIab%
zd(2ZaB(4=#H-G%T)v@6<_13`oa&NIwXPi^_e#QLrwyBB8?)AQRls9dqMzZAi=C8>1
zi6eavQbq?Yg7&=kT?9gCFUb-=I)+*%s(m;6^~<jac175&#ct-0cX!+OYxdT2qWEM`
z(zqJWaoOYh%p3D_-#xh{s8Tfhwsvqpbv6e%8iSuVmuq_|l{fy=yoX)(f(NVaV)6Fc
zofu{3OUh~k&TdoDeHygporwZWy`{o*XPd)Py1BfJF-r}e-55wreHUY7-nLkP>~X24
zi>j1x+2a|RE1rvGT^D6-66GbC*=e58s+;x9n;{f0eDvAEYO4BWxg*C#`eBPREPQ<v
z%DiSl4Go{~l1lxCL7G1-UGV`ZE}Zf%Hn0oq{eeygI*AL00pMF;<-j87f<LU(n6VrX
zkMV#gRgWPGf(s6q9Q1O*fPEcK*%k;^W|)5&*%1H=r^o=fz_Lu`!{Fip0$2^NOD35J
z?}UeeM0z6$K=5y>0>(lx5%d%gLB)`Th2x)v@1IR%dBVF}$XIhPjm~eM?%T8-S#w`G
ztDRamba2bA{JniiNk*`FP9~Og6sfWXF}35-;{mZ3-DQlb>JJ00Ejd5<SPS%Ol8k)7
zUy)x$`>Zlf8^1hKZA!dClmDq{CP|!mJ)u)}HY<gzvvA~mkLwb;oEH7kDZYHN^R?cP
z4pOt%;75)=E#F5uy!#8VQh=t==5|vBxzYD0uJl<acghZKB2A3xf<ADN4K%4gG&CQy
zQIWUiiQ%UeAx1A@zv`PRm8EGgxNxxI#gRH&n0q9+%Pvr|W;Hw%YUKXY!)|_1N7m#}
zb7|k*=$d2Gkf4RtB5ifq<b>k|%}BG0a<SgbV=4Dc3HWt`f<7=jrBVkv1PO#LtHNb6
zdKO9R6L|~x`3#1?9&D0Yo>-^M@WO$4gzcmN8L*bH^#R*b;XwW}%2GN2odUE8P=UlB
zQ`xZqBZCFR<hXLOfHabgvc!P3iIYQ1;ANGR^9O%m4G~n#{$SnciGUwVh7TL%K&7Yw
zgX`pgt*l>Giuz4h%d?#5Lm4fgH-PjV6}~p0=p|Zw47od%#jN=#@U=E5y7oS)sw&=A
zO_%NBlW5zRywk<4vf(kmBaQr0C2@W}p>oT<dalEb=~{cGipo2?fFzodlANlHoJ<0=
z-P5O`L{G>Ze5~0LL>F1=g(+!Oy^kT~!Y-W;lPlYPTk4zgANTrnCf*Ej+E{tb?4f*v
z>u~+5kD+(Za>SYX-qq8d8}KsK7?bF+-q2bVJsdlX^if|EFOAxnbwv+RCGH-@8K)FJ
z7+XGu7E|Y+1#RXPwn&#5efzrIxiNT1=6&uMayy31E@^tpzDAe5ti~A~S5Wkcx9-xZ
zLdNF2D+x9=H@D0+WsDLW!q3Fgk@-9$9l0vTp;UKo*=WOd&^g{{rle!PbiA5syow21
zZNiXP^KJ}!J^x*wlkOdqc7okm=fF%Wu}e<W3BJvS@?GKsJEJifYi7jHtlLFP4yaUK
zRkV||JX39&%DMXWeHk!0fCUJ%H87@_A6UxjAuKWR080brhE7=<00LMCpa!r3zF|`V
zAFyfw^a@z4jFL+9X2~bm07Bd!X66(=Vo(5PM=Bv~CP|tk^K=2rqXcd}K?u;-Ux2Ye
zA3%in-X8+kki;Wp0mdE$2D2I-j1Txw!%_oA2I3}!e~nBsSrZr;K)!e1&^$rKys+><
zREfU+%TEU3Y-yMLI-Et@^ZSzKMC5baSNg+q+N?$f!?tr~O#1X>Y;9{7blUTp9Tljf
zQLg0OqbcH;87sBpYeK?&i}H0ooT(!=6_FlOJE78F5HlB3=?<M7yejQ|og`G%MTu*6
zN*#(t7jKJU_X!I{KD*)K4;K+PH!j{e-;>cS@zF6Z<Z!d#e5V|zit2;%V`vI_4C#86
z+;@-TJc>Mq2I(I9I{7$bzU@v3nLmn)4Zoh@dZE<uyvMk*FIk06edyeoqVjQ*Z@Jdf
zVTDh!f7E}Ib@o7A=QZr+n4@ZTQm(FM%WuJE+EpKWTwhE6dYkp^ostxmu>MZ=yy@WS
z*TcS-!~6A54M<C}93rrK*zl^sqS+E>(QIX`np&H^ZE3((ZkQx8ZthBzLr&JyMpn|#
z9e6%hr6UXr+nW^U{d69UM(sAAFU?K*eqB3Op*dk#w9|}Ayf6PV^>VADSjjT~UbC`<
z*BFP+bVrzjS#Vy`Mcdqx7S)(HJH<6IOTKy>>S$?Rvbx3L5TCrat()P4eCc8O6@nu!
zvkP~I8+P+X<%J_^7N-{t(4+cW%S{c27SbcK&b<`Kc&@cxnI565TtduF4$K&j@k#%N
zH5hOwrkn!V1%H4tU?ITfEC5&xumN!l6kz!S5N4Ll1taVPcd{_LD1b&GJ&`})dL(lw
z9u_7&6pHsg0D~S2pA4YuUq&r#%|aL{{=k||#whWp=K~JLiP?IhK#)XUoPX(gqAmAE
zEBco%Pec}R1d@dtx(T_2Nv{vhXqgHLUVFXK@lk*s)1*1aqVv%hXMs4)$a~0RGt){W
z^onc3oUzK3mNuEwyPU1_JrPfWipra|#d%3+d=d%-Yv)vrCM!kwBLGh7cg>5x8ao{o
zkoS*rP$sEj_+6T;esg-oG^=jr(16Lk!rbRN?%I)J6{W;s?lBZC60+>q+u#-wXwmcj
z`&a%^WwYm>TR7e&-Eqyx>tX9@9$)R+t_$kuXx=50qZ1$y+A&~9Eo&%!A2<2X{@r6b
zLMNg1-q=c6?&3sHL{HKO7`?`aX8v7Ctw7$+sUE(WeOv4}QxRtA>sxKWo_{pLtBu=d
zU7C?ld21-1_HtH7u2*e(l!4wjGKR%EIF;Z^W!vzCP?Z9^0%u0K3b{)=nXGy_Nq{+5
zGw!GL*31TxW_iuBY=R@Bmp+t()^4To>f0lj9wGX)&-nIO0w1L>R+POE*FP_DvxA!*
z2!H%+B4CC~0!#xfMWjc{jQs|;-=^+^!B?JRsEOaYUaf1q$gNdfW&EIRg(FFq_o8pN
z^S4F0cHO@sDrVc3rnyxM3=g)-6}pxbuN70Cb^WWBZK_GPBVM#N;^^l*Rl>~8exxYx
z6EulWg|Db=yl?F@KCh`SGXhTxI$CR*T{n6T0+=YaiqiZLKXSUWhoW8EX3XTTzVgKt
zF4ti)3UgCAFNf#*Iioapips-gYC-cLO4ww+X_+RaD%HwRAV!~MSM%c@?U6BRX~rfm
zv1>Aao>HgYL6-H!!DKm^pWKso4TpyDKY~o`Vlg_pB~)`<>$nyK9^GYAy}If1y6R^o
zVZRf5z3Ygep^%x%qs7_?WW}5nN`Q5!WvZl$FYrl0vjvu?IK|j`X}*TjFj%%^06r-O
zh<8Mup7^kmfl3Cv!Jr0PRRkxB`Kg>9FuP+ez-k&6&ndqOW+w$qLM*eCr(b}1{+96u
zQ7Rimc~=sW^Y@oZmc$Q${9%I}$~qO&qzF<-T?)DlVFb&nF_QwefgRe1B`4p6X}ERk
z)@EkAoNc#kuaBB9PW7a>N*_ZvcVlLvE0|yX?4jf;=WLlhBo;k}a4o%yiv6LV3)-n}
z>H*pNAu(UCD7V})NR?1g`ks2uu5#^F#?=~<YMt6S?;)GQma$#S?W^Sl>}&GbCG(1P
zBDEF*L#%7tM|xtP`pI`vzgqooZFZeWliTKwy9Dj~ZiS-J`6`nnwd8T3`o=Gvio5%I
zG-W>8bTFMYBs5Xx<>oD-7)3?4>!XK@<EoFAzrJxr+I92XcIKgSG_BN^=^zkrk<Yky
zkEe)=e8n(-y)BrLU~R5d$fEar@t3U@&e(?yYajZ`vI8eYG!IfIbl5qq9iJALW)db&
zwnQtuwX3W2`LbVBB+T@E#ctYhH;%Z{+)C3cH$Y2l!;|lDzG2No*42sRx}B1ZZS$}#
zcZ@aF;=-#OE(z|e+K$X9QHAAJBxTHU{+MgToWcbl418i%(MJ3M5}fbs`3@!II%rmG
zuIDqlTB86bVWh!Y0agxgFdk_8Gvj_+<UpJ8I#d@}9fm)9G1ADsP;4C06MVqwlyc8G
z;TX!v457*X)HYjtNno?NnPO{IxGVzcq}O5Lwx!Fe^4j~|@GUzg7Q0W~D3p1nkHUmQ
zMngil_TsLsh-vmRkgvEVDb}x-E(sM=>e`C1mKj&ZdlLFybxNtsuy1Vltm;Ckk{22=
ztqd6^eVW<WEETzoG@m$zCV9}l!#ftTwbjd2(?3$2pU^P`*IvT??A#HO(_9%(eGFav
z@THRrgnrLRo(6rfF+e2+RIk8cJ=plX0-<GP8sLBpj)5dv7S;s7`Q#Z_kABDl^a5}?
z13}@$`wa9)-+;{(V8hbO5l06D3l-QSXb6i1i-=hh0s#<UnLY)hfz<v)Jkl{(fqqEV
z#Cd`9oD_sO0N6o@gLMx#VmEtTH~q?y)<T=1e!ua~v*;ram5&`h5}VO;I|oNkN0Y3#
zlelgCq3dgUZpArm&Te*hl~;vTq7InmIt1{!#-BM&&=~Q%b9dHm(R9tk753-3Mr?f+
zuPUDIkaJTTbeg!<PUqEV;~jta&N^4zW|E&UQ=BKhYo<n^rL}X2YQ8g0m{1zo8Ct;B
zf5oGwOnd8|F8V^)D}~9FHzK8^BZ7PKEPPD~8pKTr2{Tk1wCQ}G*CtGTW?}=5_E|lw
z^@m=@yz9L^&pvh#roUc$t)(z4!%vx}P|SdCWcqN2BVax+V-tC)peJHF^U|)DVE4vU
zO!--D>XrOF4*n*iC?S2m9Mdo%3uJu<VSlD&rA?o{a*>^&_-<@t@WHlN&-a|M###-d
z@>rptA45q?^_$YP4BD?Jv@DAlo-2<WU|y7ajoQyPU*j~9T5<MyvKniDM`OM7F!tFb
z$uVTPbv>KW)0!Ow{NTVD&;<xfGD#rj4n<t0w)`YwTJLC8zpA9RpJifFsCzjkq^BoK
z+OAQ0PTN^oOP0H8gRr#yTkBxk;;3{{>*QZ_hpKHAy>6a6Ny<qQ^+s2_D_{F4N*dhj
z=zKOCwtVr%o5?(j&G<yAjdVP7^Y2sm_l85Fr>rW@(-H?}1zK$)1zfdsF0DQJYA(R2
zR9c|d)4R~o`<Xw&zNsp1yW~5!PRNp`ad!1b`3rf}qSZooa`+O`zO}nEo{vcw`e~Bl
zu3}MEK1_YyC9`97VaPypYNrZ4{CZfgv|78EaIQNfe&rUMg9GyJ@UX4cu!X@$nRln5
zh@(j5>u3ETPCf&FdZ10{i-|BA9M9zZINd0-8sCYstDx;WZE0E))kvEv2{ZQ~sF`sj
zDnA=lDbLYSixq>IDoweTi^bc2wn@8B-B7)nbEt@_hNmjxlR5HwU`ln<g5yZ|HCx$D
z>wtYGv%x;g?5XbUo2Bnwe<)Thc3H1hO+m}`^XlU2*be8Ks|F5NGm96e&L!Qb8rm##
z(3so~p)06N@1=VJLe9UK^n_W1KyC)8B$!QMzYq@hoT!+J2hqV?UrzMVpF-fT7T{uV
z0X_wW9BlR7$0Lr$0*2gse>tqXQV)nugOgIf90qKVU?5fVCj~*)=W01Hdp@U<p}L_(
zF964~kchO0we>F+2iq4pQlIDBPCAKgay;gc<1r58<>PEG81|yd5U%ijJ@9GJ?^5aT
z&waz)wdPR>v-6_Q-uw#x%E<nf=2*+KqOrN8OaY-d(K}+Dp*Cw<0;~IDdh0d0I)~HN
zW$0I-g69Qq#eGQgJ|vm1$vv<IZJ<d&1Lwuh4MS}|;~^gjezpQ9_0PJWZ!oc<22s~o
z3Z2NGDMxiIAyuhj@0oV5>l+ukx;R+n-19l#m@q_}9)5eFHhVPwa=hr!hg-rKZ>!`z
z;|>{VGp;twnD94ow<H9+t?da6B(>PsiAen<chcN+C^kli^px!8#d9_5hCFlW?LE5K
zE3Rv8&?_`;Y?tvWgMoodMsz8t+sI2jG255FC_0KQvu1gvpv!ij@4C){Z$UU43Qe6>
zNTcWeqFkpqU>4_$KQvou_?cCk55+CsF;Y2NO&8ZlaYV+roD?!rm5UcNobhU7xx`1%
zy19VS*U0`w@ms6sWc2(}XW?8V#uo^9BDe$VIuYegmbNpt$58brvl-XgGm39_IOJFr
z2OVtQnno+i>N@1RCAfO=I|(M#$5t+{3`e#4d3^0+iRTU2+-DU^d6gmf*S>)2Zt<<d
zjXGO-Rt^IZyJM)iWOTc+cV)J1IhRnn?zZ-@eM4O2txTiJ9#o3Zc14Xt8S+EXbf}O|
zzEnuxS@Elc<@e1KCC>>PHC}ytt0w>on{Q>ip!EZ@ty203RX@Jv_tCVFrfllXF%))*
z-)N@e>iE})RQ>FNpzc;B@sP+0dEu8`{1pXge$(1fzXZ~>7^B;QVz}1L8K&L4;)&Ip
zuGKx<tKO7}cb@~T@hg(@$7?<fu!GzIh>C*9`!6*FVkM104G{n}^sDeoRRQ<;^qy39
zL^PHqBO6{D&wGDK=srCe{sV{wPFej9q~L@2C`h$kgYeZDaxh^9g(R{B8H8@kTSO?p
z1llh#zwDCr|Mh$@8@WBDRF;qYhFo#`wxzwWxTQY-%7@oAM4$4f7ZWO?%XL`MfM&(I
zr`W^8?57|b+V@=0h7RV!C8*9YqoFTX_!tU3hIaPI61=VM8OXo>jM+)nZy`GNGPl%=
zO4XyHqvQa0u7iV$%M{jUw(RZ>s<oTL3)WG?pQey|It1dWsR?Y;^(E5{PWc5p=XA;{
z_-Se8_z%6mc{dm5n)9Pnwo+f0pVi@LCblmd3RVlh)W+kcUvsCcDX8J&=nAi$F`X%9
zi1vV?o~!dgds;E2_g8NHQZoe|#yi<<w>4*NZ7&HQM2~h4u3aDG>LIQz7mw+eAWUgk
zacMGiX8|5sDcv*Mi>j=G#U8mLu6q2{jtYFU;z<guF0pw^8YG(K3Jby4Vl%Di-ek;e
z@g0Q4CnPyo@f8vz9;EG|mSdM{^9Hr}6*bFB;}kNoM|@MW`wnAOw5FZ<eke3>(i}eB
z_i9#^9ue7Z;sf9mu<*S8R)mv0Uhk@rNqOu?7gSb<IXjvxMETC!9WK4$oH+%p7|s2u
zhL+rSPe+El*Y~YkN?s2SI-j9yiMmY>n1=-<>_`C*LClxjTFXt-P-4ByKcd3vx_=%u
zA~G{KdX9{y{nln1QAe8l#@CUBxuVJuM>gGlKAdqcI?yra*}+=%#f|QGk+t#*?rYJ#
zh_uW;qj=%)oevA51D9Z^`53Z(k}i4q@*3xmPP+2y_3}uG>7gS|ivu~4HMFhXrJb&y
zTFc%)x?9C#kk#VKd`R?&JU?@x=@$Bcd5{n5sBmq&&S6){ck-a?7}9yKHmC<=Jwg)B
zrowIr;?yv^0?f2XkOiQElQh8j0MY*6kVoHujWQf67FgI5z-++<%rpS`6En>Wc=PXp
zm1ai#fC7YplZhYTV@cv^0q7&}-khYR@JZ<*7G|s)lBBm;l36ewNCGE>2#JlP=X*|l
z^U*DAM_~Ta&!9(Z?;TcenJ<l&GItD5)Kkj#@-Ome5pzE@NHJ$3ka)9^Z{G2BanxA<
z?aTH-!v(eCORbfcT)vKctWw&&G_^;LOnmohAd_9_kZ?i9_+EEH!kBgF?t&0vMlfcn
zz&E~*1VoEUsXIgZ%S9K}Cdb9zOVI8w`-J+moSjW@(Ok@k8M2XJ)}zam_)cLvwW%yJ
zSkA1%p%#y7VzaL#?JktkoKF(&F6}Y1Hgr+Jckfy9VU*WuE=u7w{kF`3j8$@4>zG=9
zTk6XlDLQ#O<Yh!Iii0k3H+fEsQMr7sIFxi>A6uX-UWHvtsWHB>!rvOXdCO+{vtcAl
zsn`us*Oz1E<mDFK4M~Qn^TtnSjV?RnKI;|bUCtcu+i2Rx7Gm@i=cK;5r>Kf#I4hY8
zC+G1Yd=T}+#$5Jbi?^M2LGf2zpH}a#j~({gB;bfGZnPko*(#<Y?+>z`PtvS9Bc~n_
z8g=EOToR_-^Sw!xix%(v+GAB$(tkP%4><mqu0MvTdc4NYo5ouNbr0XKVr%2m47CW-
z{;H#N?yisp<+yV>c@-NL<8_6yl&ZTP7R-L_<p)NcJE1NU(ZeMYYpK(@!@G^?FMX~K
zOXS%2cFuJVS2|V($p^UdkL+roz6iK;b;b?uKADW}(#kvNi7;7}`_u<82(skB41u$=
z5S;gi4UixyV0gezF+kgC2pcW{pBES#6qZ?yC$S_sIBe-q0+OS!g8++P|4(vvh(Im^
zg9|tbz(0VpK>i)}4<zxx=7wO185X_>*%RT5jd}CY4LwODy}%0)z(!)D7=SN)Sxx8b
z;<*8HS7Ys!uWrr<O@Ae#3)`Myr5d+|xrwv{9y*11a@j76xru)L*89ZCWr;GhPKP_H
zJO>#=ZmRN`%|2dG)A|?+&-f|MlvzUNW;LB-x?$TQ_=v=}a_m}ZhJd^A)4s%+AD&lV
z4%uBpmCcU`>Aq{3rcyoZ*#MjwP3Me_K6F?}3OYD{b5+sD<gn$|F;wLnE3s~MHfC?4
zUxM5$dA3_K`u30^{`uvT$9j&T2sMNHe!9w?qHQ~=RaV1$es<k{OGz0?2L*2`kD&rF
zr#0XB@R-c|j6##|`qt+ci$+!))E#5wRDCv;#MX}?lt*ruwGNecIityoqPHn+iR{D=
zFJ-M&`-@TwtjC(G=oMtF>XuiV_iSs#Om_Kl)U8$eiYBv^6tJ^Ci<UUbY!3>lA48_R
zewxIldcB`Nw4*4?pu=2{+f`u6F6)M!tRHgI>nufaW(c9kU>}O5ku$bqDk`q_Sw-Uf
zoU{6JN*>o*zseb3XD0_egk&<5%!~~{LEGGFwQzHgCec+T+VuKG5Rc~%RL#~))Sr5$
zYr(f%dr{x0pqs@9X9%hKSHWoH#Y1tst*!gz)nWr2Y4wPo3!Xxy;*}{Yw5U+iOp~20
zZ3R)Cw6fW#Ijv)8Z_@tVRAZOl5r4*Z9bM~YUVXEC!Tr?|Tec)U^uc}4i8D>ny=YsZ
zuhEx$3>z|V#7kp#K5e!JxWDtU=3INR5XwYuq|rt&A(mS+K3`X8;o|4sGAfK}1aT88
zajV*nYKx8R`PedJCel?Et(t!9ie(UMC3kkn#O(2^k&TM)ogWjH?|qYnx`Ni$^Y9MU
z)*BJbB_9S6>7FdRDxSt5GYZ%F0q-X_^&OTh+TZS)GOR{|836|z(SfsUYJgMZ9>PvE
z@kzXu2UzFKr!jmvJ-kK`%;)L?>;VcOT0|V^-+1a_M+ft~hqFB|L*Fuj>}@0lmQ<Du
zFi(;py!XUX{xT4R54KB?V$dhU;e4=*LlPL}H`KJhPz7Tmfr*megeZ9`@LcDzIxd5x
zkI~1a(ad7uCwPT<b1_MWatf*rtHL*ql<F^?`Cd27T%KuRhej<{8M726gsU(WAp19z
zQ`%~l173xuMcLh-`8NE>``q<QA<3OlbA=ysi*u~rh0>u~cP&PQsiV*e8c1s1wT%kf
zfogNxi+6uqdEZNTb+DnDrK0p>kGQK*Y)V!m0j-K81UXKvSB8FE)qNEABV&Eb7%^LI
z$d1YxAL!v%3~-I?p)fbj6n@pU<vUoLHLUZqBtI`+(9oTFYoK=4xQR<i2f3Fs+tPf;
zdO0%K6wAKutYQDpy*}&u>2yVhoZ@@p<7YNRe8_z+G^{8`-VH27*=eQyh|%+;<!sGP
zAHBEZ;AbkzRyNEokl-*nrv{`LoJ9md9B9KZvHja%e!|h2*RkP+nJwgUll2^fnhLd7
zzSX7jqqyxqTz4Ogk7yY3yVPB4c!#NH=2@t?-pZO7uUY`wenodNq2-&wt!_<+5mkqk
z*pELlyjS=5#SHUFNQ!0E4##}T8pj59g}f}p>&lZfN3I`LitnSI)EBSYZ?zcf=GeZ<
z>}TDcu+cQ|n#yDEE!Za9?4|X2bJBiod&oxYFe&0mnaEzdhI5nnzdf4hXHZXgu$-A~
zVfMPC+aoTRd_2F2C9C(!&3&dbIacvJ8yaR7X7c3WN+vP=D)!%M6B8D~e7=884Q#J%
zUXo5d9NF%2Ho$R{HMm;!wxe(5L(0*O^zp(TmA;vl??26lQ03a&`aUF%mY?9cf*=L>
zL<B(~_eh)!Vwj=7k^=As1WL=Slf1#H(Ekl)7}b2lum=hpPXdB>p>KKKhhg1M;o?C&
zc#a@q0egHj;Y<}sIj2AnHbVf|gCGN8lLiBi(?5%lfe-;84VxW^l82QS=m#ZjnOR>l
zKYBr5AoEm0TV6Q6)%>s5t)q#?+_-lP%b6%Sa)kP2v?#7}HAeBb^9C|u)ndv`J-HoF
zF}3+Qp;n=Lc%>`7x(=;r?{oj|N)<-)AlKaumCrooKAcFo(GL0UDc7Nh;XM`IkU^i8
z-HRqHIs?I#ml~{e3O{7MZd6k824VaRbF`|4sMEr;M{ffy?%U=J4HD#OjA~Tca&D%R
z5F7s>kBiXhdNR7zlVLOCnxv;HShS^OyD)&fvgY(SX}-;@_<*5uD7G%1Za|@=H{P~q
z!Iz+Kc#&LIe0^nJhkQNMz|<%%$;&vj-B1FrIK#e|!WX%HdvypoJDjBHZFto>N=!qP
zDeBWeU|fvV^A7_COIa`HIkHRdSn9J<xiVTiS&1nrXG9isy9$UEgu8JV#upewB(#dO
zIikw;*o#MqiHpu(?w~DUVb(Fs8o3=?R&H;%&$e8g>C%Jb{N!5oo|zOVU<`k-(li4~
zqZUlB%U`1nTnh(YMpeHUQ>I}}VF@KE<<RWq>!29&q|;IF66pTOHa$fX*d--o;^cWT
z`+b#o^WOLD93(9X-%*Y$a(&2F<dUlLr3@cq+)k@KoZPe#`;I#f0Z8huk#f#^#shWM
zn*;5lsOc52;<8Y_&QzEFc)I7%r9zc%7g~jFkJdX;bG{miMbGALEpueI#a_+NR4yG4
zVQw_|?js%eq{ubeR8(lDbXTs7=dDXv*^aUFM&im1%KS?y^Cj`3uZ{?Lm5>MAO_|o@
ziz~ZHh+M0IB^@y*(S*t|P6NM@VEwM(?>C3pY>+_fsr1N~mgZDd^rGr12Nz(p!v`?B
z!5K(l1jVV<^E(#?CuLJ$uhReHi{COFp#4OKgXCE=*hGcNjs;lYEeNDOzMsm52k)Hn
zhodcIlKv3An!g&JKlDbDSrT6o!yiA3ke&teCL!3umWI=fY553=ZOcrUcB7S)tRm&y
z&17MQrv*2YflOzRp}t9&CX0eCaxImb%d~;Uw~@>vTA5SqN7=nv(M&daroKsqQ^@7L
zNQ-j?20N?Y>$7@=1~d<5>c0y2ScEm_D#^(+QD=`-R^?VyF;uPENU5vP#w<o_a5DGQ
zruQg>E(A{v@HOVvn+;Tb-$qs?-CW7Y<C@LkQpCLsoy-Q95E5jsEq~1?@k042YQs;1
zx;A};icAWkx?uw*v)5L(db#_<E}9{WFJ*X_Q=TQfVr^0VWN5)P#L`3Lt0>!Of|qK|
z_LPMytrAC4mdTPcq5dl-MhUlrl<tI}*BgsdLq^-J){FJQ(=pR`lMa%Wt`COyli%^G
zFY~U;d9iRk_P!S@r9nrkgIBzZ`uw=PaZbm+7^cxO-bPLIF%;R)T_m2hQ-3bA%_!Fu
z-8QGqj?^`r%u8F=*Z}MzgC5yXPN4S7{q}y8FF!wR94%h{$)M74snwv8Ni@PGa&ib&
zM?Mhw^y#-i9*c8BSK#&kefR??fDcIC!+S76ZWQSAFgR0xiiKYqoDgvmcB8^1By|94
zJs5<_O@KSb14Dt*gg8<TN0N)@{R1dV6OUdk3&P;SQcEU=5I5hzDSB)&A~@(~2@*i`
z-S_|s@M@pvbD9@73|`3mJ_BhOJPGtYu|B{9yt9r-lPnDzv!tg$PMgbDlR9Tktfv!6
z&9N{1&9^bX{p-xKoX3+VF0v-sv&ErAvjz6(p9$e$FXicRuJPK7a#pLUULE#cI(%BP
zK@}RJrHoMP*iS<%wyx2XvfA+k>PR71?Hopje%j^dzn}a4O%DoS_W=aLGZ-K{Mob0F
z99T2_@&begK{N)qrnktziBG-xi`?Z?MtK_woK&1Uly{|07zB0*H1QB%QXnj_kI<h8
zU-ot~f=CTpiyjU`lEO*>Y_`Se!ubNiF)tVho3I^ai5z7St)#Nx{0RhU=qLa1$IXYy
z`Si@Bgi^O3HIeriFh@|_jJf>NBS@YgW3D^pK%OFnCL`N{W?1w0C?HXT=zAok6xtEN
z>0*!C4TY|Z$?6lD|0F86QYeknRNs;%{qZvAt#p<chyR~v{uDqH00#mJ1zA2g1HuSz
z)_`XKw)nWZz^Ex+GEcxMl$OitfyB*UD9!%h;yoHK6rO>*a#(l)YEKdP$&&EaEU>kb
zS?hG)2KEgtL>jR4fIE&tz%$T|KdeUc^ifWqOLgVhFU3~FX4mAYBXec7dzrJpaQCAZ
z2b4631C54C``8%?(5vkEod?PVCDo}d`PNP6wF@(8O3Lchj3);d6sxHEYSgUu9NG@o
zzv}D?cy=!bfqTy8&b6?!mwb&mX$dSTB&Dj0cg#g?N<1y@OLFE<cTeu!n26GM%JG&B
zFWG;S&)S3odM({v(bVr_bIBYbL~1jO1_(`Qk6G27H_aEHwN@y)F?_9sb^937-U*>a
zZcFQF1)uw&BCOSRF8}+kFWd=B6Rv$GO`(up{iCV9p5>stg{HIM873jm(}s||`CoU$
z{=Vb1A%5JN?tILGY86#So|+rJL)*`gJa=(p__ZP@uVoUdYB}jMusD~Lwjtip>ECW(
z?GPwDrQ+8+;wS#u<^QZN&=LNAWdhvevpjc!U$2zf#&>A#5HI{b0FUdmN6HR?qJOLZ
z<2p_Jgw@fX9>E~uC+7dH{?F_G{(}F|!9O4P_YPa(G5?LilMenqjsN~Yky~W@?O~d!
z7<5{d#>kfFUtnZs1gRYAIYncW{O>GfIQF?XX;d`xCbX-*XLIeL>hQ>P2(|cikw5;Y
z$^^ymYhNASggsX7=jEgNi^EsgZaHhYozt8XONe!)v8q_KQ9*a}^e;{GY!wc<l)Dng
zUs6!WYWw)HnZo@lmyP0cARYc3Kq<p}TR|{_9^R{R;$NNSIzafrBqdznA@^lmniuMU
z{vV&yph!)UfxrP`8V}8k#$+RS8~W}k7T6pK3**x)2qO?X2qJtkI1^9G@<5FYp+<EY
z14ESDC?PAsy?j%UsPNTbJ+t0n+s<t+Dvf1%^h&g;{5q50_XAJyXYsv1?XE@K8dY<<
z#-!5B&h-9pEvTdfq_dZJ`mOU_Hytd8J_L+7IhBl&og3Jfm-jAi{$wTE!5Ej2xs&DE
zIY_(SNo6J4$u~WNJYu0O-g*LV0Cj%hszJY?C#a)_ZS-~X)S90vwq;4<CPRL2-A?No
zakZH{Pq)SvK?jssE7yDCYP0^-vpKJKt$UQxou~T--=0?UQzNcDYt?<Lu}*hF`Ig6Y
z{3uHPQA?RLsPbQ#iFNWSr6Z`mFFKXTd)vq(Q?Oe7JNnPX_%W2~!-9cxyB48eV+xS%
zTVHormY%OfySLx+oX!;7*Z7{42U8szz1c2YKbVAdc-qluW#%wp_Nr>%Q}|v*&*^=V
zWt?93OAGQtw9B28*>(n<Cfk@+HH2GTTj<fnHSqlBEv8}GoK>cwzu$suRdWX1(&7as
zM!%o;n@_`FAtDBK$;PevIx@S^p!43}Tg)?Roy49Di{-AKaRoaG;D@aHc?Z_S$5F=q
zie*pAL`M>NHH<0~JA=g@57t95sPk|~@MBC&ANNB_eeIG^=VpKP-P#HsTr!TE8IrC#
zA-d22G^tip>rT&YeOZ12ckk8D<LLb#nlzTh`#j2KP<B<EUhih85;s4`Cz1SVqg_VF
z|9*5|cX}wHv<|$K!|}Auz|B?E3dMm|sv2Q=X^%R3yW(mv^>w>`vqLo`=d+FLfN|nA
zq|VzyC%Q(b%_pGys~NQ*rUbT@T^vRg{?uCe3TOi_jom(~dIyLbGM>&I%N{wmZPvlh
zzjEkuf2W>2vv{vB=Byh(O~U6qj@IVk%qQ=VTIq5-=g^{7tlu*1Yx?8DN*~J%YViGV
znXzu$KE(ax=@vY&TVm69{pn~RPEVBR%CKw2AJ&8mz+t=s%z`ik^U1G1Kx6|bM1m4c
zlVqVmOhRA{oD*g^<xy%l_CZK$@&JUYL23q#Nx;Cx(+1)naHtw0GWnOG^hT2&o1Rqj
zhExtlG9R`i3K%{mKp&0+=47BBR?|T*86O@Nj&KGrBGP>)z3X<(HvAaej?VSGT$%Q8
z&mRlGG_LolR}$!K@ryVjS@vvwVkh|zqW@9BrCsPMrwdJ7zl@IJ`{7Hea62M0L0?FW
zn1T|5&Pz-^X|1vdHP|g?N)^_!<Cj2-k0iB=x5Q9-AUS=%cn4&<=O@Jl6@Oc2^rWCx
z(Ojwb82tW^{w3jX5pWD7c^Y_5d<Fz;Maum$9)swGCWE;ez)9$v90i3L#a*+<CXr?j
zqCo=J3~VN%heP?vG8CHNCrb#tWQ-JqRMrh(FOdcpDVMy=^$KF&dcQ&VdQ!)RKSaIV
z{0AW;Lm$Use4ee)hF1E3>o+B{2}NDqMfv$8!KRg>uD&Qa%0s^0F_WmtqzEzLE7?}N
z2?~4L>P0v8eNvJ-DB3n^OATHHYZuH|v=xSl+i`krwU|{>J#5&p>Fw-vEA%tlIbzJb
zW8^Ww`2ELN0XK-W9n`lrdEND(@5rR~Gwiv)ole=NxzzhJLFD!twL25~OObm;f3+5!
zQH)}aBk`+hE8Vcyy^B`%`t>^1if$JbFF1zyr9a*pK<2pSUmLG>@z$ZR$qhcJDY`zP
z-Q|M1B*>PS8C4nix#gg`C|yU6(^D~{oS-%;U*HA&Lk#TnC`}doRIGXiQ5tF)ny0J|
zz_oh$moa;3om%OB)N0yYzQW<K74Kpyi5KwBDP*hL&+9eXD~%5d$BxD_sEsG;TaTeL
z+hX?{%ai}HY=5sHT0A#UEvZa3K|E8+LdJo&Bh#jsv^&nr07D<_-bq?-oE+h8=I|bf
z=!(xCwepMhsg{WKdB(xB-feUYCGVb9S<{ygB(W%(l-uAEh|eDLohW_(_ZI+soCXy6
za3tZl%Sn9QjN&EU1Z+~%I7&La3*`zIrsrk|7sfJ)Gy(7kJTa?H;9Sphz(g2-X)-`k
zSwyF1H7NwAcwDKj24ydJCL{<dy<M4JsggSD!9jUzg}H#dBUfL~W-c}-p7<P^l_fVf
zL}h5i)$hKm@m;otsc+KSgHK4OJQcTGsrCDMw#7TEd@i@^ZTc3B+RM+S4%L0q8@e-`
zipw!HFtsr1VC6ZQnLXSTS2IP`ClEb(v53?InekWQs9jmv&%nwJTZuERlMtd>aOF-#
z!9XRe4&$-~&UnApnI|HwIUwxvJ;vw2TA|<3xS_0&m0(m)Kl-P0I@;0eRW9w<J%@wK
z#W^6>_*LbMMZw@b*6=IiTrHv`=v~RlA<=i+rg3QH8RzSbAa2u<BS^KJWsouDNoXta
z-X@0nP@wCfD{ENiqq0q>IEh}8<`mcTwNIa}D<=a#TkyiUn*rWseY<k~%Q_7&{JWDJ
z#f|@f#Nz)7Bonos0uwq_qrc@yhsNLJ2>35AKw9C_)wx7&r|Hj$p;Ib9H4ciG1`c`_
zJse`9U&69h50<qRabnLH1m8R;nNr!`rY-mfNKT|J1oju=+#!AdlHDM*j0wA<p?tsq
zlDqs+XcCtuI9wPJ1SBqTAP%J*g`BP&1tpLua_Z0NfzN^kGBEz|W-SE#+hp(?M@dZA
ze1mFN@_gBjsaEC&VlBrA=UZ1AK6VgBJ#9D&7|6$DZ(Z(?!skx>I<I!S-Do(*<I%y>
zjnuvFk<pu9?aH%jbY4>%lPj#DF0!%_Z|An2E6Ux@WDQf8oLmrIZY|q()155n3l`QO
zu4i`)q1HFxRp!@vhNYA+4z{GC^Eznf(MhTWG}Te{dkcH_S1ulL7@CXr#)u~w(6)^o
zx*YNxcq~qR&M;*%nF8BYD;)+kN>ObBv$??&-=D5%8|?YmFTd-G2_DZL*P^-8SSl*o
zIWWq3U{LkhEtkVbyux{#)o-(ZqxJ7?qW|l=mNy9XSr&)8T%O8vr_PX+JC3yX;&RZv
zEYw|2sOI~urP8GKX}0#S-cBuKv4yrO$HfTLa`Uu+j&bD+)Nrez;WneskzvMm+;-P!
zjPc{a0-da~)UfKRjnU;EGb6(GmQKdLpTfjA<G{i!j2av~hKNrklym0rvzRfq=4X>C
z$Iyp?b;E;BPO|FN@7BPLDxVAN-&tArYw+pR<yxBkH#q#M(zq4M4O?yNkIKAu%!ub~
z6mD~LjL5aXO<}~Ohj03)8q=uxdJM7cyZZ6%(;1jkDUOv~`U^SAYB4?jH$^}CZ;BrD
z;(rn+1G|dQ;OCr_cTJMH8B)U@oM<qBx)xAL=4um~`~^J<N}#_?9?RkA%G?Er1!=`B
zBKRktCw@OEL`DQ{j7n|UHoF;rUf7-OXMCf-(v>spHko+d0?YK87aup(y|s_U!Hl-`
zrdLw)Cc*@w94$jR3w!y`4hH&e*{)Povt;dmTajb^CWrCr1EJ@pd(L3Dbwa=OJ6&pz
z#pZkM1Gl7xNyk&>sz!teQ2X)&`bt^`HcJA2O(g;ONpu}d8;)h=u1U(<##dHmhIl_@
z7wlyA4Q+-M#(nkaZ}r;U`fO!gcWpDaxxam0eDQwmVf)BYYnZZIlX&r+!QEQ<5$~A#
zB%9`p>hUDqJe2on>T;dpSZA53hT)oOUY|gnoyH^4;z~tfwx(GX_xz#A30<*`oI792
zy+t(^oJaZ6O9foCNGR^T9`+{GAMsjoiNlhSxf|Bf#sXsdyyc=C{Ybv4QiH^4`aUt8
z8;5m9`s-0?xy+k)W4G=-Q*Ic`DGNvG6DH0fM{SFh))x;Gjar_hTD$9m_!0hO5N_L&
zTO`VN%KI7x?X_*jsckfO>MlwBs;fbaA1}Je_CSd0@EBU!Gbue1JxE$ja_UnO^@Ne~
z9}dj$rEf!FK#^hmvXEfOmbf5PJ<i1=dvZUWANqWRb0<aRPjgi{$4rmxBi*gVBjncg
ziqCv8^|RtqJvG{$?H>p7Jcw%v2s2sS#wwQV0hrQ;Zn2ctJQa_-HMxT1KWnwIB!49)
z-D}ybLd4l#9bNF^ds(-(rV3sn-)`a%Ye2e}5SM(yUV+W@d*o(#cBw$RtN8M$K0&O{
zxt4l~_YNUmz1|_$Hg=_lRDv^IGpWiyEsj#4&Y3BuvN|cQPW4X+->q*shGyt0j-j4n
zt$~RoPU*zHkBie8bID6rb$C7Y<7->U1P5!3vs`+8N{jc)Tx3kwcdD$r3<hg$BlHFc
zle==SPit)l977xWi%XmLYdg2IJo7lCU29$sd|cHxM6qp6nDo$PzWP0lAV~<)guwqq
zv+%rc#3VQ;pm|Ty;ZxSca~enH2@{GJ^3-?}cY(q87}&+IMwhz-YjpT$KEK!n!h=(R
z5UD?IosFD2lIDe3I$7XR>8pgHS{fD=*6fF$J*TtN@`bj8!foz)t!TOEFh3nC$whxV
z$c)OXOTFv2QtVe{j5k*{Xk#39*mh*>waBZRSEj-4#vfZvO=(T+#%UCnW=gSA*6}oO
zglC7HHyXvHGZ<R%Bz@9$xF|M0KksmW+3S_Uom8u^o}wQXHUmm>7nKFN_+_MXzw8=*
zMVa>|*nZ`lqKP+qRZMe{K37SFKkelYt}VBLphJD-j?JAz5*6xeuX0J36u+AJk>A!?
zZ#B*@cWh8~oH7kQBhkTg$Cay5E7)G^VSZRb5^vT3p^ov_l7;fpnkTCVpE)Y@185wi
z;&#lcE4Eo1T<+*-sqdv?4y3WM+2lTbm-|cw*CNM*S9m`z2|Hn9spw)o*wiQ95+y%e
zcy~)2MXmbgoA;PUKjS_9vSRzF?4}j5&x+r_ER=)=THF|Nup_39l4+?OACk{t=d^U8
z73OGReO+yJ=?!HKXD$_W*l5o)3*|dM#_Z%TRA!Ra6R7lSy!^}H1^upa;d)r%aA5!=
zX1X}+f|&E2xFG0XF31z$f*b-Dr2hZW1>tsGL^T)sJ-A@j7HeORHFK@CP1SjP<>~uY
zkg9=?pGSAR<1*ZvI^%ded80(zRo6SqEq<yNO*I?o0nvT_x9Hyb<D;F3?!zj%7fHRv
zUs~^@s$(*%b{HvE+f*Mg<_r$TiMaQoMA`CkN^(OK=lR*~%!DPL^{)3#<e{XDOXBNC
z?x5`V$4p!e$)6F14G!)XOQf{0?Rv&x56;L&cZ}Q_MU{wJmsH<yy#2MfI3aq0CXenc
z_ZEALQ_g&Q;DUY8+h<)W9b#kp-{#KWgGe&w$1oQKOrzMdz6{$8*KE>CczRs#aa!~w
zipxvg(Ye`Vv>_H&_F0}h&tANDPE@c=&!=6(Ob=}(5Y0CFLPWNAzqcm$egC~ZrAFoS
z{Jw%KW$nDBIx)vkp4ozYlW|U1(8rzXvI0F|S>F5MNZ4%uGF91@uZPEhn>&!=Rw(s_
zR<+Z4{1v-}wO1pE4gF@t)bJZHD?XQ}@oxlQa=>Z=L0dBlOg6?}TL^&*hL3e40A%MO
zBJjg%X0UhV{A|r<vV;c%XVr&8-w7;Bm}{e24|tW!;{|#TdX_vlI-0^lJ!-$qg%i4L
zQez%NK5>WLJMzk9J@*dmmUY(mM>sk6!p)o8=XP0dI}|5;MlX;aq?@y-hs@n`xe{tq
z=Jj#$dfeSjrSPcIJ@Yq7m7|UxUN7AWemFM7U!nRDj9M<Ps%RuRFBWx&CCG;+f04|L
zsZ`OW((l`}kfD-5ZZ5U+QLn}4BxB5B0Vk#E%*ADmzt~#(5^^=m{murMu(VN!m1SR)
z?lF_;Qj%Hbazne9mF850b5c9({q?*)jP;$>bs<}o`o~KR>)-7(G`oLVzq#j!9qc;t
zo4HzkF_%h<#q^H?<dXd~d%@r>KV)-lwwJT__wv-~XV%|$bxWze-^{Ot|BQO=VsURc
zX+i)+DP+5`=ku<84(|g>CwgLv!7GvJvQ#C*jrBO=DQe?NV|+PW1)op5KI@+?k7QO3
zXk)I7eO_PFuRn)V@3-&!3gs7m3^5%r4R1!A8}<LSu>bt}9}I;iE$`si2_<+Td3xjj
zuC37MTV6+xCfP-sYz~H%6I)(Te|bOXnCY`0-VdEqB<C2bwQYJOJW_q-tiAs7ZRcAw
zRyhn@9o;=7ybmuKmx@d!Jou8Df^-TkdnSQ>ealv~;Pa*0xmD@1S-P`PgLcsgW`0%)
zSuIo5^EUnZHM$y)+*~Gl;%9_a93A8193xy%wS7b8y~Gb@rThV<hgAZ_S+jd#3DPRy
zw}5$7&59lc6s`76tEm~I4Iz40gC_`XZieaJ7eJf$^&+Et^A*|NTJ7Fk>0@;@6k-3m
zW7;EEXhCL(@{HX=CMxZEn3(bf^oP-Sx=x_huBtyeoeS8g^Oqzbcng9PZCtR1%KGR(
z@j{;TAvXw2XgYj4C!ijL1$&=74P0$JI26Q>%_8r^nNBz=fdT&y9)I-HhHM;KxHYkD
zdIJ24l3cegp<=uKkQ~{c<6gGelCap_)m*Ks6=I71I<Hbzu^0B>7^-VOn)7DN7(y2L
z3U0IR`Ybm_vOf#&U0hrzibT!Wv>SgKiK*0K$PP4)<FDwbV)?+H(;dzy5m#y$-@g(6
z^<7nX(kt}nqjcIz1<p)LS)o=h+#Hr5_l(zJ<-O}3t%1b_^B%x3i>i$1Vrw_3b=)wx
z;&nEs+?Hp=y~0@XhhduZyN)(<SJ$L2!6=(y1;drMNM&D@DH5X(Q(j<~LB_zowQ_4m
zhqd@mr}*KCtC=@5-xt{~uf*rXbMp5!=Ze^C=}?<}n@5Rp3iSOf5~$Wza2+o6Gp~>K
zdB*yz(&)pY_n<&R!Dn5!vPX>AA6!&R7LTC@hXPl+LrQt7H5m(&O`DpT$l<R}`aXFh
zAvs~2*16`yCC3l}VXC}F)7y;eqkTq)+SFF%WBerF)`jnpwO%+M0UU>Gr=e+)zlWw5
zD>;rVVuD9@?D_YPp`ndN>jSr4i67!Kd9PeIelPYvzMF=M%BgCPux`b$AR7)y;xpN9
zkNwT41NZ)S)wA)(YxtMyfy0A7F-*HQ87iZxCA*sj1ux8Rm(_0elW&VS4;u<IQl_!w
zRAw|MRLwA6OJ%d~<?oniD-F~6Kec@aAeLSG_=ARuN~JPFDP)A=DT!1@_9oec>=lZL
zBD0dcmA%Wz%&5pFWUsQfWW84Xuls(Gx9|Oa@B4kf-(Py%_jAs<?{l4NopYV*y3YAz
zgWzzOD=T?5ms^-RDcUl{lIG?MHfU;#`;!Q8OVt+hDzgOD^tyNz=BXB%H}3aHHX4?f
z7SjxmNlJ)gt81F#C=%1*md;BUQlVQ^4Hdq4CoD2c%lJ;(u6JVW3i&c8%w&(M<`1;$
z=?hNh044g?rn20x$7a5n<u$y$ASBo{5FJoow4zp38vP`8;-hQ+=>4p$&UkH#qI!|?
z)&9>TYW`Gvd<<a@P+H?ku5hQ2+pqfJLZod+irs}df9f0QvQ64C%;RAcvcnGAzFjMO
zMXkd}?4)(OM<2{Adn&06Q0Gl_A3wi**4`i}mG#beimtZ5M9toQ!#VXYomWCC-^rBO
z4XH0$c8jhQ4JX_^W4&e^CSQ=>VyeKS8uPI~jz^Mh9eLX{Fpdz_0VYB@O(%D}#|V?6
ztFNcHi6zV_DIc;S%#7+e+#bjdK4eDuJICgJzZP+`oIXFox!clKzBgs?>xZ5x>pP-z
z(VWeKZ{nD9v(wcEr6+DBMyKT~>ixtpT5DIg#PKBaMrzU%>RFmtNJ}&dSH>iJ#@(Af
z?AP>&s1z&taU?h^P3v<1w0&R;1fEjt?cfD7(a5mu_~Y)<<U_AoQe?uHiCG2)sg0~!
z?vL4<nKPEr*50sNeDM?WwlKX_X*O~G9aN0pXx)Z3e&nujnm0Z0k2Y)A7*H3w7^y-j
zk}f)HU^BsU9_!zRov1w-6Kd}{8kU$7P2`YdZ#LUAF&0X`K<^8-T4XL*!E3lLwtc5I
zt*LZtrgE?<wscU<>vi^M)BD8c3$^D|%Gh(x){ihTlgb-%%LxSrhJR^KY3}MV`C%}d
zI#E`sn!9{9EG+V??yxw!7{6e@i@aDJSvSAp5uEn2`@hj%M5+Z8=E-9x#PVb%j(o|p
zkPSFZsXB9%?1bY6=l+*0DcGuJt9~-yTH@G~ZuN7$taD!v5C7Ps=kZli$v!FZC&q<W
zZK2XE+Ea(hKG2VXyJg<qwY}h`NhDEs8+}AgnTU+tH_vWq^$x?pmCvn;hq>5VUo8fw
zr7>G*&J8<#xuYzZDoX3`$6VY|o&HLEMaaJ8L+UHfy!--bml<*gA+Dq`g|iCe5vJ!a
zv02`ckhIFKecad>O2L(6eLC(yoqJkB9Cpyko{1}F?EKtn-?Nsplc&E}c_t<4uMnwD
zj=qUviZ@VbsWKW1(KDe=R%;Jeyt@2qX1lSyMeqI0o<UD@nIu(C*`)FNnK>UyKP>Ci
z^-RkL?8S}`y`fAJ?)HdQ8*l4LoN(9S&>1sWBegwdd#77@7^^v9XKeRJT<t{9+eK4d
zi>ek~RkDQmZ|NaVsv^=_8mlcB+rH1UlPf$GS92{37Np!j0j%f1;2N+)N&4{)u-FSx
z5F8-z5D<i2NW}P7zG0$$OcDSUZjj+jwBYwZvil{@HRw1*?MuP-Bei^GT5GkAbuvqW
zcyXfYPfUD$nMq4cM@nMDBN5eW<qrz1T4W`rx=aggxXb1B59Z}B@FX@K_o)*)=Wk$Z
zZDrGyT4D0ur~7@#m+qud^6-Os+-5WShJmvBk0S(>*}qv~GtZ|AeBA4v|7k{TPUlHq
zLekp{+S<nTLi(L$jqXwPo@K!wGLI@R|Iq8DQoUkbH=jY>Ib9gp^nR%@t@D^6t<CA!
z+s||Cl<RA461wDF3aq-rnjg#*iKA7IuvVH{mA2}adS0}&9&Rx#kj%Pi5}%pJWMkB=
zv{G01(!4W{nUT}F+3r}&#}@^9w$;T0i=iScjPHa-z1WxSQw&4Zv&g9$bf}Cw@-mfr
z+qsht<!LPrixi}P{fVhC*pqFOYSQb|lbRCmSvs!YJ}_CHI`<Q!Uc=LTvZ-7Ah?Ht(
zp^?qP%9LKyd;16HrXRm3&`NH3U|KX}f9VYOVOCw!_q7QSf5pu1(Q6#+<`&0ha!ti8
zsip7<*u68tQpOcHRCltZw=;Pth5lhlp3?s*jp5x7KOcwpss~R;otc%FHRP7gYM&hS
zEcCh|o0Fp$81SJY%81#}=OoU=QaSk$f^dy5|HSNuePU3?f{R5;PpB&(Aox+nK*3Uk
z8k5b}lGf>;7}F-=S2Mi>KQYcL5gD4DpEf9I%ipr<=Q-p>Q75aKB#wMV8Q+SeY{aeP
z-TEpJs{Ri~Je|Q9*bTh${cw0+wu1>>y>`Wu5e;K5*`l>_L&u$;EV92%q<y@~`*l!{
zepz*@Ji8w2ywcLkVP{}`{y~n!+@&VQs96QMwGUx(g&s+v#C9^1$@<gm!U87~e7Xc9
zS*~2?-DwcZwU}2pY;m_R@a?TRxpMN<!B_g9t`1Droj*>$>s_B$Ux$9$p_ZADAosRF
z6$#>iSxNTZA=t%UT{&HlnkRZ7$+&RY$Lr{2iPm6)53YK~Da|z#v4lgz7BbE!Qj^of
zKN2gP*6LBkmp)WZzw@O*aJK_<zbNa)Y3UX9r>?hnZt~Kn#S_GFgK!$^%A;%_742qj
zu6U(QrTIXM^Ja0R{`c~X0B#Zc+@&H`-?KyzXn^|xmmBaL02{atY@3wRuvOtqmFvn9
zmVTuVFSMg;KEw=z?7K;0Dqu%)i<b`O1d{I}VW09qvLEx4E-!0teUnqqL*s%YLgVj+
z_T-%A8ENe*A|B2weAsBSD|p;!VNtuMvU~FOo9M(h19hMK>;-dP>fH&ew=1Spi1~@p
zwm<XHaE1E%`zATj?e@8?Hp$zSm3^PIq|W-5j%4wK=J_^TE@wL|*N&0py)hYNNNrmU
z65u5_b<Ll(^B9S%3+ii-P_kC4r9U2CGkA_G^zQU6-KoJ?h1Zoy7h{X447qJb;*zwi
z89O<R&oL$GFMcOW=*x8AFnxS>HTX=3#_Q~)s@$aTT(gNE;bBc#o@A6g+T)5w3haeq
zJT7*GQ#o%Rg^#s_iV7zM^_3QgDwy=ZeE!9hN@&b+QiWb&n$altBr|@^V4Ir(iQa9*
zj7nYKa~|Bbls1&CJgrD{GdgVat#9vr?rP`B{BDD{@(-~LPx6cwMYB{!`&%Cx>lv_L
zy2cgy*-B-8bwO9QMmO`I4XaADapej{_eo<pS@A<<?CJYwn&stdY9?xODd~3#3zW@~
zzpUT$7%`orYehTFL8kxpT9M$$8L*izyZJI9TY7_)Dgmeeh2=1RyH@1+tF_|3*ufo5
z^%i=W`Ci<tiK+oNhlk=~kM;VfT9!wR^{GuV3=2}TD(mJof6Ry-)Xy5rX_?97VZGgM
zuho(m-BwISZ%raqOhtMjwWnw)sV7CZF7I)=U3%!nq4VdDr4QYUWKGpiFX**snvjd&
zmL1`ltE=9lpOMDsdg-X<OrBTaL}9DJoLQ|^q&Nkqe=6rkay`u^cBeKS>rmyY!LM4~
zBNE+jL{*n-3o;&#T$L4%xzh^yR?KRQ>P`oJ7_*VRn-=uWmF|dYa7}li^*yiJR*U&^
z@EFYp595fC+u)rqNa(6QmS$d)Z?s@q^mhN^9@i*qe(WBX`sAmaDv1@V@pJ+c6axCA
zU6B*nfh^U&Z{|b2ze-4#6*RxCm3W`VGuBefyN^|tG}d5^<3qof@1~O?>I;BVnMXCu
zU;itwejx0J9db>Sml0#B5<dYAA1y9?!Ug!<i4QfEZs(JFCDLYcBlD)30y(y!-8Ri#
zfbhJKLyf|B&%gqYFXGK+yaXin4RRfl<j<NEgl{pkrk9OPYCpTykP*ULKS}Hw)-Ep7
zqI;<9Qf#Hn#6@x5y30M!<Vrdk^mQ&UdF>5VB^HPud!4*5<bGjMj(TYOnju3+v2VW5
zYC<`s-R)*dt=s^*R-w-J?+KBn>3^KsRn{o24>Vjk5ENwD)-=2H*x&0-XX;9Yh`Rd$
z-DBA{b|On0HOt596t(8}&dpwY(s|QbW)Ep~PE1mCLoawboA-YWBgtfref%gpS@-QB
z+2K1Oy^ItrnF=O4ScQ(yZv?~i5>@5j>}#+KT61gU!QM*iU@Q<1m28q=X%X?5IFtUc
z>O%8u?4VDr0r^z24R@k?gzj4T)A{zo)=wTIXC5k7)C+L5H$4n`x9?Ch)?YKptUAY;
zmN21=q0IE;otgrT0<Gqe3o7y|$4Dm#gCA<|i7M1pFcs<S_3Rxrqe=*4cNq$L$8_N7
zb?^HTtxF>4rmEAQH&u21qfJ%a!HUkOz>kM%_k2^yWAZ6ocI%tt*U<3T5bN;wZ+Y`C
z?Ku0g+L^HPYyK_SG6Oz^*3?QBdG~MKUam5KrW#bxEURrSkYy}bx@6lPe#9`H!&Z&Q
zx*77t=}xGe>GXA}5H(K}Xo#OUXB-FV;*8JMcSakAJboTLy~Oo3ZLr$Z`he<=r^$A^
zjcK<_BpV`sB!$`w^Q#TXf^NkJ`iFgv>Xwyx^ge0PhMdhN*|}YaV((Fn>GQiXpJFN5
zmWiemTC}=Peyie6kG!__n0v>O$EUt^{K$#X@%!F-=v-iQ?n~o1-!;y+x6asb8(q2`
z!F<nzXW=~gB({GWuSicq(#ilsF5A?Pos*$E537Z$9+X_wYxz<)#67XHE5|stZQ3N@
z_-JnTP+b_Q(AdY-a{9dP3AK8a4&vBK{d7<3c+N|o0|(k&b<F2;j)+HauMIIX8@#fy
zd|<9_Q$?2w=`zlAX0$eEuqzqL^`tO8jqEYDBHH^TJ%l+*&m=V<@4=h?4hiCfw)^kA
z?>cVa3AmGOQ~iDf8`8!mHEb6mIvC8ah|>#>r2~sLcp9e5QYUb3!Y3SeBUyRzUoglM
z1hNL#=)4mAp*Atm^C$%{;_N$;$jBj*=<anO{oKLF)H<;iWmShGNeRb%YL(TWhd8tH
zrVJDek5latKccC)YG%rlZ7bLT3A?7g_x{9aTKBNWWaQuPEwX;4_)YElY@Ks@xq{@Q
zB96i|MvGN-U+(I(-XX2#<o5gFca4-hAIzvWg_Bdg$M)$peKSiIQI=qs;}ufq;IUK6
zdnQ-kTgNeev^&&KdzpQaeT=qOM^hk@?gSN+sKNN4SoJsBH!YJ{T(K4tRI5IQiRwn9
z*{;UEc|zempZP}LkR|HTOYA<ABotSNrLtY<V&}?5tfH{4{9kLj+Un=d=AsF1=||Nc
zf|~PJm!{NJ^U&WqwFGS4gDqiR@uo{!!?nRYWL4oq@k@H0nM?6)-}_lvPE9ZG^Uj(k
z&73vI+EMYFUL(-23SXS!Rw2(ZQKWl$Y(Y3|4~a|fNML-7Udph=O3p-n^SAgsh81EH
zDyF;Rr$h7%)RM`@#yp~p24!!h>Q1JnH)uYi4-p<yh{`eU?y(_PJ(71OVtQBS%U79_
zu33XZ^z}!Jh&?>|^6!57KC5kE9kRF3QZUbU&2xWVa31CU0`vSUW({YaW!!sp#3B0x
zo%ON93nYdl2f25|W_9#L%LmsAcRm=r_S#kHaMie;;OE1Nh8MZm#_F%V#cX$`=lZzc
z({G^BOD5TP`lS0gM>{I_I3eFPzr2tdX=A~3O6=rxRau(rqD}9xv>AE$P-ju6x%Nau
z!2OI%fz|c$g5`|Xk%v1WY_w<Pthn)}`U1}km~0|@eK<>MzXt5}T}Su&7!h--bUBUJ
zSuZv=#F7gBZ?M4-h3Ab#$TE;Xr~vGTLhPRaW;+d@lsx_m2o~Ax#^Klj5dtB#?Hzd(
z-go?L+}T~U%(z3z%iINQO23{VH;Jyt%1n7)XC0d{|DbtE(vqSp{<Wugz*%GV%ktsp
zm|w13@6TQP9BMbbD=Uy8(^WmJI;C)N+xX#hp*B4$QcYKRxi5i~5)!O_9m@|$-ZV@z
zeZ5{XDw#*k`roZ&h`REQ3LQcz4Z<z{4W<1LW<|}I!j;WcOzp2#%&_63h0*5{mVvv4
z&%F8}B%V^h-0j{tWkbQ8rI;0(nR9{p<2ClSA&bUn8FA^Xh(Z0<ORb(+HwBNjC1GPn
z3VP`3?$;$7-ebxMeZym@9a4L1SV^@>b}cr(s5uL~EUrw=G1{HEsqM+5+OL&nJutnh
zl+P5G`$4qEq@zH0B2~>fwfm8IcwRgiT~3pv6~!UgxYyRN^l`*o*7c8u5K|K_p7Si0
zoIwF|EJ+P_ZY@UTo0^Sf=RgQAr{%+)$+zuTUQQ6ZjfHf*jO-8=IxI`O^M;bCty=wX
z@zk8S?yP-Qk>r8;xptGf%gkyy5i_=NRoHtsBG085EKMq3w&V$q;BGzd)8(a=6HQw3
zd?GzPt}cRwTil|hC0Qi5`7+6`XePwd5OL4|JAO5oC7$BU65x|jzHZLvI;6EOaFNx{
z<85G_*iQue&4NILJ4lff))4u-A#eF0B!hH6#GbDEU*=9bb=_#uNR727u4S1QITvM=
zZGEi4U^UpQH1mjRC8OD?PeM8zUtCpXAIqE)sxp4C?t(ykdQtl?To8`#`5QwuUT7dK
zVc&CP5};bZ<dfX<MTjggD#VNp=XS86WByKdb^L|wn&zgYPCjm>T=-bo!!BHnz$Hf0
z^&<VYf@^itnBmHCvTnxyS{+l7n#S(9xqNY+^5zSQ+TwAgACEAy7)0xyTA4OBsTyBs
zE=+FFwEliW!H%V^Yt=ktGV-;RtW|b;7?$&km+at_ol#cIgE}6`cQ(FLVzc#B;aQ3n
zH;Suk$~dV4^(fSzM0nhZoqDPoCSN$nYJ9$$v3Q_g#m6W`?et`X{D+rEZ@#K8F12j6
z?j22Ty}V>?<H>8qo5K_Sd>~Nt?rg|YJ;eg*?<_5B_ED~N$E?(+vqKLxiBqX5KMk2)
zkemA2<B(F$aQM5D(DU{u7wew;+bz-_Eyx(1VpNQq;SFw*cos6&uPo15C&?;HZ5%Te
z?m<g1VA@+8RLI>rB{DhwG&2u7NC#1cwBqa}53xa2Nx@-f`?+W~Mji6$mpJm#f|Gql
zG!YTo`eYsa6SV{=WeAa7B*Bv;<tH|Gj*!489Vej9ZTN=>9nrv0Bq;^Dv}PcQAq7wT
z7$i>^L^&gloVSUiz(>!5|Ir|}pbA@TQFO>_uiwh^?<<2r4Xf_Ge{l1P76%XZ<v36h
zJN(2ftg*qq$gv-ie@Nzy(;X|^=p^p%Ij)Z+Wh{Nnf=9j-SSy}VEG&6?j#Yr;%b%u`
zP!(@@_4U$uu^G=u?5#OHMw^hx!AO((p-Am&ueVuS9a$ze9a)5Z(g~Hk65EC4i*Jpm
zrJS9JV!Ni4yg$!CUe!n5b77ajjZ+3*Y^w^Kd%Q)?-DvE&Pj9SXekS)7LGYM&+yI3=
z)_g25#esV%G%)hkNWh%JOuIPyUQ+q9eO$SYTY=b*K~e&jRO7RuDx~BC<As48C#B11
zysoeBV8a|r(@%>J`P_6LM)VQwZ^IphImAFBrQp3W+};%6VQswK;>7>eaFd1g6ZQqn
zAY9wMm1{3lyx0m6T>lR~kwN;b4}N)9-`Mc3E~tsK-JhM>-Swf6W$nG9-eWU}1@1TG
zjLe?Qz1eNiWzo}h>aeBjt)#aSZ>Oz(dmSI_cJg6#oWL^;3_j?1nO6`A`%}sg96&q(
zC>UUU305GOjDj;x;M)!3?NM;C#aw-H1>Xf?w(wBnEy;F_yvzxRKEuUyKFoG(BrvBL
zxT5U7^CaJZn_|_Z=`Y#0#r^93KXkuB$I!RyM5(3&MUIYzyj>SzKLmVB>?HeT4_t@t
zZ_I+f^ywC>;IN_NZ({@YGVsvD5m+|ZttkkI{b3EBy^}H+rY-Dra^|lQGZ~B<#I%8v
zI*!JE_w7SAgJ}eIzXb2&?NS~O6UgyjaJX?mJl`h@ehN2*KJed%!KpTe+#CZesCOEu
zhW~tci0aIpRboa^#qf*7>^Z)eKd<-=uK#wK_@~EgL+%jv^CHULW|Z(jL+3SH+fk#0
zej_4bKl4gw^GZK0@FLNG<qQ$+0RkfUWCodtZmQFOdOeDscd_A}?Y4b4ntTe8czlfz
z6HEf>Payax_jM|S0bi*+O!~c3X>gBvJ~%@V{K*+2{vSC*;04#QdHRJPK#8X{7Kq2)
zl-8@dD8%eS#lWB7LT~=NW%SnP;3Hd;_;?sOWORtKNdl_Q!srlX%b8~b9X-j2KA-_3
zWd7Pq*y&@tAO&nof}a755Nu5%ZU>O23z1W9@}L!vC<jOv@B+h#9RI<9%!7f1&`8-1
zNECB>FF$Fnw}pVq{h}7xKU}uPfUG-Up)nwTq}IC-;5q#A7tsTM5uz>rB0hfFM^0Zn
zDd6^g^~fucf#gEcw@=TVS=KM<r}f?n+4}Xr-*o%;6IREq&q3Y$A$AlCp4-kk8D7~t
zlnIEP9#`Q;<RpZDl=S;DveN;#{Td%Mp7=ei6p)O}TOBSAVMs7&j0~R0%dLvjn;ay$
z1x;!xahdo1kInb4_D%&N&h5phbNfZ^=iJkk(S}Ns)ZFtmzFwvmL^@0T0?0Ue`qvI=
zu^9E`zT*}vY?)Vexo^vLgN?h+5*vx+wg^8~RbQoa?161LwQ!wo)5^+adXlb`)tJ`B
z6!W>TA>+%C?ZO<XBmNJoh|C6O{rFK|`SRCO1}BlH+_qu5e42A@oYJ12%T987Vl`y*
zu_Bh6ZQc$Q7ivF~#&w0x)jVT1<j4F|9wDw!T$7L0b%rY~7v@hcNp##6sFKa_>9wES
z+pp&#IdLS#e9Ve0O+Gt+vg-X>g0k8W&(OZ)e6@a^!PC^<J^cpSqpth7Ry4n29j<Ph
zI;<u$xb}3Z?pfSk%Y_f`jaHp^nq_?VT{$)zPA$gD)v5jUu)|fV20NF4(~=W`MR)Ak
zEW@*TN%RJePwxGy1Fs9L`)A+TAoaqAC!aarTp~o8+8ZM8jURm!Hktm-Q~fwz7jwE~
z%8&B<!?JVl>a5%T5Qy}4;)eImN48CejX4By)pzbA%>2Ip*!$|kvbYXX4o|u|x1-M+
zq+j43zQ~K#+J&oCB{_k<)iN@h>Y&~L4Yy06AM&h`WsTv>MwjU7EBI{oumW8Fq}Jv1
zUakh{m_yrL@knn+WZ)iX7g<I_|JPoB3%!i=|7{G?eW9kE>%&Wst8`Cz%jh!yX>`{+
ze-s8|kZH44IpDzSuW;}QdF4j;xsC3hXsx)`0b{WN<v3?;O3Qq;LaM>};}(Zc4jW(X
zcqE?0)1O~8EfDrKw!cVU)UbyCrkKP&>`n<AQL4pBf-TV);UgNU_h2jSH>C-2sf-w4
zOzbuz!Ztx=hHB6Xh};A9p!xbjC&JAXI!BFYLHL0}C3##0Dg$vWL_9Z0$dCkCFq^~R
zlWrtQam1&Ai5VX*7G58Z4@r<hlS+ei{Ndj2Ah~d!GxMULA$zP+UQn@5b$6k8UrIc;
zv|ngUt}>@+*>XpyNEBn6M|?+n${7V&J+WHub0ibiVVy?jgC`t{@7yum<8Y_I&gB{B
zz1+4397<~rBgi-5@5@6h&0qhxo!JTj-!8=$rm&aV9PC#8zTXRq;O;o)=@Wa<H?(W=
zX~^VwnpyJ&)hyMKI5vI_^Vw^auY%6@zUrpDSe2e<CD+IGa-g+_%(QjNRY~DoQanlR
zKDr`}YIrl0hs$4hdix&d><;Dmm6t8@USo-+mK*K&W~AuJOVEZ;iQj)00KKyE*S?r!
zPWkD(;Sf>I_~NycWU^*iw;@+wbvB)1_55QxH|mnYgg7pREIndbUi&o8_z_;Nb~_J?
zdwRM5*eF-jKqsy%R1#^vA!o$jqE9v-7#r19d1j%*Q#rAqAo}8SZ@>5WDY~jKv02Va
zo4FpzH-UH5vZJBzHLa(5o9^+psD2tZfX<xEqZlX@c$0bWVob+`PWN7<&cWEBR*myN
zrUyU*eCn?<ry1(hxE%kT`uM)v<^z3KYO_loNDlBKWtF9mLX91NL{{8)=6PA}o4n<&
zMb7HZD{Lp;+GX!0Lc41z3DEcKHY(!CidCrFB4Tx?*de^~JY9RJtp8+qC6}O_T#l<n
zWC(QYMn>%NQpiBTvMGH>b^bA9QDl$|eWpj>MjD<Ov3he1hFljs!a^$-GNxRWrIBLO
z--?(1zZSFp_HIa#|Eq6-!9}7FwDsLSr7*qabGSHkb_v&Dp<G$|a}&~8Tmx1k00u3`
z^%gB}oHU*|Q`wnAVLjJr?tH-OMA(RroM`v48Ha4QcOMrn#trIRo-v$~s9MVJRkQyz
zz0lR4r(`Mn`xhE3z8O6xIjxb|5Zqu~w?J=^G4xihqhn)#9+~zXfIJO+r}&;YQ4m(^
zkf01s1nm4Cng2x-!^{uS;#knzLKK=X=YbR;Z0M9`!@NgC<b;nWMT4HBfaHQlGs0ZK
zyN)LZS-qq<kTgh4!cJK`=hYy&B*Sg>pO{GhB{y>M@oB|b`AOqN(>IdUROM#(y1#6l
zPaxM06d}AfWi4d<4D%a%63yavJa{;`wpxsNuW|W5xp1gH%+i*f+9~I;%Ixtk(?fzD
zf~A4(j=Si~<#tKI8X1Hh{tFQ&Mx5Bg$4Up3RBLEvM6)<OF8P26JYuJEI&_36Ezny(
zO&B(aLxXT2o!4Hk(U@N_18lm(K&BiyjH3(#njHTSqqE#EQ-C*>f5!c+v5R!iw8d&i
zXFebI_s9t>=v56)HthPS>Qee`nq~3>$-M@S4n<D>8MDa=%|Fft+SAL2vx}8e>}bkY
zUwi1F+5h0`y?H7Ji6aiVwbdn!aMBFH>^_QRl7!jsW+DCOS@F}<Lw{nf_N!kN7moCG
zZY9gRORiFw^TYLHk+Xr=Y8V~bY;dS}<i6pEU`&1G`+T&ODzxH<R-AMW5(kxs2EXWA
zjPx$klPw=lJO@wiJ<m!Y8hH38rr~aV!$Fzhfv=oJCTcqZStfsCqRk_t$OA9a?@FDu
z_{NcEWV%M-wYL9r-qHne)6hVt*lN+)%gA#qzni7yAe|lzUy9tQVGK1CnP1gXYLB=h
zH9|TO7?h|(E|fPAivt8L?Et~B`%<)*{r=A|gA+$u-2397-%riYiM58#>JENUv-wfE
zeou-t*lQCRa<{zUiFi2f0Y}1Hhtk;Rv}N^fedWwHQ6u>6e*3WbQnHu*(a-Je=nEYG
z!+WQDoel>5)PkEG;`#^oKQYg?_9*AK9{%h7t3Q5X{`o5;tb0R>``0#MLi_l)@BGi+
z@lU|~Plx62>i-FZo$9F;!3lcbZO-PYWLX$YsF<jHoRZwrWxz_rU~}Vk((NS1;C_ue
zo%)P$-k0Fck7NoQ2=~*#f0**Xe^{*%KJh~)J7loP+d;vIuJ*8Uny=YlLlcpLuqe(Z
zd0bMxzOe@ro*g&%8LD9o0}<_D`h$d^=ynGmBm~8!g`>f{>U0P>D`0)r0~;S2Cd?ik
z8pdb$UVoih25Ua2iXg=kw<tUbd~n}0={v=gbZF?G-5n&KK+cDG0mA78bn-8LkmVN!
z?3FmVg(pR;NtVcu^j(>N#VG*fH_qH)M1<XO5~gW_;L*25a#0W<OV!Oun-}5!-A<6+
zYinL7Fk{lZz)yhn{0n_NX-KCI8BLAZu)&bUD5`?%Ac482%JW;4&yi0Q049BJq?k0T
zq)|hkjUyOx|FFT4AovIja+~`}n~;#=BPTi`w=nt`e|!+cw3?ud+WBGXi6B8b02C5j
zV1H>Q1RKa&67gyRYXvevMe?DzNe5gZ<A=ri)<k6>elahRQ!3#ADXABN50mhnq$tFY
z<Vt`Cnhs56G2*x@StSFWy9YesR>j@hgn2K2MQYrRCIaE-P)fJMmq6J2rprwyS%@rl
z;sbNQ3&!o6{YNfP9Dq873pv7V2^d-p5m*VkL9aJKKnV&50vV!QQ4mg+d;pR{w99)a
z2OV+?fIw^pfEK`n3*STZ;7wd^d%UY~(xCvHZih)iv@4P~QyQ#K-V_J`G4Hd3DBWS;
zapaWsKJP>YHi$wDp)v#+F&oGbV{|guj@b?{06I`m02<6X29R&|qwE0F0z6a;@*72g
z=>sJugc%S#>`-Pvy8Uaafb<_h2my;Ta85gf`GHFsq)LR~A}~rG=iAH(1r`uT%nPuL
z!%42*u*?URfJ|Wo*B`pTK1@l+EebK1FH{7>$m_dU&|S%TpB=pO1P%a%nvBmvaZE{~
zQ%nV;27(ZS?Fn!q2PuHF<%bWl-oP&n2Bj>2JgHNB{)9kRQRrd@Wou;|BmmY{NKhI>
zhz&srVkQMs4`7fapky<<)%L5%**APJM5tbejB=3p7tQ?0AO(;BX_52ET|tt3HPJwS
zx9hWU9YksDkv_1vLK6*wj#Px+)}fIl5O$I!kf(XGTW*gO3m<%-jE+J;iVzx@iy*iQ
z?ol?`B}KE_iIIeHTOxk~$!l7ebI@w&#*!J)0;_{aLN8F+gv?X|fZgF6#1?}9Ld&u)
z*I-4b1Y82CNlG>u1%uF-BfQEHNg;$}XT?uAw0k>ZpGtUiotO?KAQ*p;O9)*7vxosm
z2!c>#8J`6<LHOk+@XL0w-9hAHdt~-V#qzzu!$F1MWF1Ed7`QnFC&lvlW3~bQ6A(~N
zi2#;hxtV}tnS>`W;ethHhF9J;+{zO$f=sn=s6p8up*Db#mVlFhc|F?-%)F5EYEh=a
zO-La%CuB_LLz6ONP>Y)rE)N+S@IUnOk-m#QBFhkp10aCucOzs-97l@4Nse;=iL4+}
zHbxDD7dO3cI^usmEyVzxJ`7xg{2;<>7ea3sgzjjrBC|)Sgaa=GOP)A|I8lIAOqmhE
z6UsW-avK*Q%W%Lr;iTKT3?RXo&zMi(Q6MKJZp9ES24ZDVP4xl;PMb0>5Wf)@IPDa*
zBD!%rOhTkBu>2!o7h@2+{{j*q2q3|Mv^&vTpN)m@4Sw8qfaIn(BmPSTl-3Y%Hh*_X
zxuC!?0QUg4P|>U*2zU{!+9KNmX>cY#l)3~#>#WP<^$SE7q0?x-vu*r301+7cG*F>{
zY&mSCl7x{2)gT3jcWkG@?0x~SgVP_c?+)JKyBpOa2&xdcP*lMM4pof^suJ;HDpFA)
z4V)zWT%L_nij+Vep}RLI@i`&b0oFPV(D(xxG9dUu0YXIsLUe#G97F?%jTfW>IPO@0
z`lKM(EAVIL!f_ecfge}lu(}`RCS)fHL%@ur0YKx%&|pfMLpVp>7m$+_^@%^ku)`Nz
zeV{w!{0hGKaj0T3W@FsYL5*+$Top?L%E!-*BW8!6W5+E8KSvOFsL)H^fC&I2#s9pC
zC%8aK@D%cQ{llN(iL(gM9~WLA4fHg_ZGa?@28a;A0{oyD!^wknjM0K&$17W!0?t1I
z(+!ry=aB}4!eJ0pNztGg{WfGCpbCDZ@c1xNj_6(pBTx}Oj6IUE5SSlPm>}omKqDc<
z2tpz&1`&9msF+0fQTp?Hm=(MoPPzsGE=DZ3{rWm!zrh3~hYAXSNrV(6I4ZvnywIs2
zZ0ENitV6(heRg1niU)G>J46VX;=W~g0<sZWlkBDikPxdDhQWFLoJlapJM!VMgp(9-
z&O82RM+~DA9~?i5V2B2Co8qX;Tdo8_5Ta}W7(h!095e3Ns0kwP^nU&8#HaCMX_5eE
zZU|rX!N1QtXwJ}(o=6oTr2%?g|J@~Z)WaP|e?g8L|DHIp9}>GlW&zj=aiVmre$J1R
z=ui1HE26NVfKXAGjc!1ImPMo<07tW*mJ`$(nt%!8h)aF~x?(qm5D$kV_(bJ719EUZ
z9Q+Q`NCreO?+#LMY}5d7V1fyv9dL6CK?@?|5r#qlNj;4x2NVcMy5X2~MgIE3KKw*H
zb3AiQ>Gp)(P6nvZ0nx*b$Bs!jxSxnmj1Mm1#)9CC0MV6$`vDd$ME1cF8sO0+sUXV3
zg9{ym{+v<VpwlB@BveF#fl;u;=>Q1N5I;T|*p7njx-Cb<^3iPDfC$7nZkKXn3q=E%
zBGJhJW<Uv~Apa0K;S}>8C+HANZNU$mZja!HQ9~XO!|8^gC)sVsi9K$6;QFYe79Q>o
zK6-JAFUV0YN{cYaQ42uPBDmoA6rdD3;RY1<kk%U@0(^kj2HOeXf);cy@&zr66C*GY
zd=1bW0C0y8YXYXkQN$5{8{gJri}}_e;vN3%8q>vBez&eZX7R3CQ<SauT&UYVvi7-W
zdphn&%24^5<Mng%KL2Vb;XZb)(S+ubo?hc6R{aK^>$c*hJG~~Bg<K{t(kJc{&UKs#
zkG%e^FrI&&cJ%yys&kp6tY{JSuOb0^INSkkC5%2$s8Q|L1BGpIMWSet=wB7#TA@Yi
zxNfM+IQY!q^{uS;P!?&mSybd>{;No_QR2j}q8=Y}5@_Y~2Lf{7+%valM*w8vjysB<
z%VX~I-z}<-xoZMN!G9`hjZxVwDvDb>(MMahU{Cu&Z%*;^bj+peNUI2n%TYz~g~$7@
ztry8#UU|3p$bBDa`&=MWvw7dnp1mh8DMJ6T4+QL`*NRKaJzy9g*H;uJUby_soV~9A
zpqc&7n&hyrzf0_H8g%9Us^?hrWDgzMjMqV6UjE&xrN_R5(C2-T&+QfL^U8L*!$Vx_
zE0RNcv;TN8!xc{ZVR%3t&H^x=k?ym+h!hp2ICS(ymk!-Q8YyDcjm@FtY-Bn-L1`_s
zOvt^a%HgAffJ(<&dYS9`&AjnK`C%&BbEj9xmX0)+cdXvH>s1p!p*O&zvi7RX)eYBV
z-fE%vSFP5LuFYC%_Nis%xLVhmhda7d)|;y<78{zI_nm{+hkMW4ExbB{drA8~#a@G%
z^@8X2>h{U&&8@FBFLu0Di9ou-1+{)+HmiBhKY;eE=v$x~9Af%*{WZ6E)YrB=;9p8A
zH#%Vd>jC`p$jxSNinqMRZXsvAU}@j4{zpFN`4g1Azo3*<d|+s<iM}M#d+Q(_Y_8ur
zl=hoL$v<!UYryv@^crn6e@=}p{&mB1(|!|SS7!AV>Pe~SQ5+p?4urGZ?uMZ_l2o{i
z;`pKvAWTw$di@4S!8UEh6zC_o@e;2C|Ge@-?;$Gs%uy=p%O`A;SAJ0zk32$I2zf%A
zh$M&ZzDH%&K=H!^l5#&WCNmqfN;?!fIkiEZ*P2;7H|f@W?AhcGTnQH5B(U%kbAXBo
zUPS?~dO3$<jAz7=4Lnk|S4v%RoG=nSWY<V_5@lCl5*~@=Yo)H9D3grDC)Quj^`5Z@
zS<}9D@N@4LmW+ri++a!T@PnW0|5U_7i*oD9Z{6_%JYu#&r9$vPoUBoA<lPhvJfh3O
zXb~c7JZ$~vd{NO5_<jMN_$nrh4`uQrS<nwj;R}w?58?ZWI25rJF5L-F#EB@$EpkXw
zMs2Hz`b)v~w=(Zfl5#_c;zTdC@ZAm3E5LJo87Gx-4;1=afi3)Zvi$hEET;mHBVu^y
Y`UpM(0idISC=Nt#{MTxO^=JG40~ezDoB#j-

literal 0
HcmV?d00001

diff --git a/public/images/login/icons_login.png b/public/images/login/icons_login.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d1ba136d7e4a81d2390639b0409bdc20fb7e9de
GIT binary patch
literal 20685
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
VlFZvwh5rj<Yq`wgyxF>K{{dOtM^yj-

literal 0
HcmV?d00001

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 32e727ba4..2827b9a09 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -537,10 +537,10 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
+.navContainer {width:100%; margin:0 auto; background-color:#1065bd;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
@@ -751,8 +751,8 @@ a:hover .gz_btn{color:#ff5722;}
 #signUpBox {display:none; margin-top:79px;}
 #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginSignButton:hover {background-color:#297fb8;}
-#loginInButton:hover {background-color:#297fb8;}
+#loginSignButton:hover {background-color:#05488e;}
+#loginInButton:hover {background-color:#05488e;}
 .loginContentContainer {width:100%; background-color:#269ac9; margin-top:1px; height:580px;}
 .loginContent {width:1000px; margin:0px auto;}
 .loginLeft {width:595px; float:left;}
@@ -1628,3 +1628,139 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
 
+/* 新版登录注册 */
+.mr45{ margin-right:45px;}
+.mt100{ margin-top:100px;}
+.mt50{ margin-top:50px;}
+.new_login{
+    width:100%;
+    height:524px;
+    background-color:#1065bd;
+}
+.new_login_con{
+    width:1000px;
+    height:524px;
+    margin:0 auto;
+    background:url(../images/login/bg_login.jpg) 0 0 no-repeat;
+}
+.new_login_box{
+    background:#FFF;
+    width:265px;
+    padding:20px 15px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    background-color: rgba(255,255,255,0.3);
+}
+.new_login_h2{
+    font-size:18px;
+    color:#fff;
+    border-bottom:1px solid #fff;
+    font-weight:normal;
+    padding-bottom:5px;
+    margin-bottom:30px;
+}
+.new_login_h2 a{
+    font-size:12px;
+    color:#fff;
+    background:url(../images/login/icons_login.png) 0 -69px no-repeat;
+    padding-left:10px;
+}
+input.new_loggin_input{
+    width:250px;
+    height:45px;
+    background:#fff;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    padding-left:15px;
+    margin-bottom:2px;
+}
+input.new_login_users{
+    background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
+    width:215px;
+    height:45px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    padding-left:50px;
+    margin-bottom:2px;
+}
+input.new_login_lock{
+    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
+    width:215px;
+    height:45px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    padding-left:50px;
+    margin-bottom:2px;
+}
+
+.new_login_form ul li{
+    margin-bottom:15px;
+}
+.new_login_error{
+    color:#fff;
+}
+.new_login_submit{
+    width:265px;
+    height:40px;
+    background:#f27d0d;
+    color:#fff;
+    font-size:14px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    text-align:center;
+    cursor:pointer;
+
+}
+.new_login_check{
+    width:15px;
+    height:15px;
+    border:1px solid #fff;
+    border-style:none;
+    margin-right:5px;
+    vertical-align: -2px;
+}
+.new_login_form label{ color:#fff;}
+.new_login_form  a{ color:#fff; text-decoration:underline;}
+.new_register{
+    width:100%;
+    height:580px;
+    background-color:#1065bd;
+}
+.new_register_con{
+    width:1000px;
+    height:580px;
+    margin:0 auto;
+    background:url(../images/login/bg_register.jpg) 0 0 no-repeat;
+}
+.new_login_txt{
+    width:282px;
+    height:140px;
+    padding:30px 12px 0;
+    color:#fff;
+    margin:235px 0 0 165px;
+}
+.new_login_txt h3{
+    font-size:18px;
+    text-align:center;
+    margin-bottom:20px;
+}
+.new_login_txt p{
+    line-height:2.0;
+}
+.new_register_left{
+    margin-top:250px;
+}

From a2d1b6d6464e8f5f7003918041c05a22949c639d Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 15 Jun 2016 17:01:53 +0800
Subject: [PATCH 406/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E7=9B=B4=E6=8E=A5=E8=B7=B3=E5=85=A5?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_unlogged.html.erb | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index cd59123b1..223ee3f40 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -1,13 +1,4 @@
 <div class="visitor-box fontGrey2">
-  <a href='javascript:void(0);' class='linkBlue' onclick='loginClick()'>登录</a>后可添加回复
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
   <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
-</div>
-<script type="text/javascript">
-  function loginClick()
-  {
-      //获取登录页面地址
-      var signinPath = '<%= signin_url_without_domain %>';
-      var htmlvalue = "</br><div style='width:550px;text-align:center'>您还没有登录，请登录后再执行此操作，谢谢！</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href="+signinPath+" class='Blue-btn fl' target='_Blank' onclick=' hideModal()' >登录</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a></div>";
-      pop_up_box(htmlvalue,580,30,50);
-  }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file

From 43192b8648ff593c31ddb8c114d57bd1c28540a8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 15 Jun 2016 17:04:53 +0800
Subject: [PATCH 407/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86=E5=A2=9E=E5=8A=A0=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81=E3=80=81=E7=82=B9=E5=87=BB=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=BC=B9=E6=A1=86=E6=97=B6=E8=BF=98=E5=8E=9F=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E4=B8=AD=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_group_attr.html.erb |  3 ++
 public/javascripts/homework.js            | 48 +++++++++++++++++++++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 681f158e7..952a3396e 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -3,11 +3,14 @@
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最小人数：</span>
   <input id="min_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" />人
+  <span class="c_red undis" id="min_num_notice"></span>
 </div>
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最大人数：</span>
   <input id="max_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" />人
+  <span class="c_red undis" id="max_num_notice"></span>
 </div>
+<p class="c_red undis" id="min_max_num_notice"></p>
 <div class="mb10 mt10">
   <label>
     <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index e9ef7ad6c..1578d72df 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -194,9 +194,11 @@ $(function(){
             $("#GroupPopupBox").dialog("open");
             $(".ui-dialog-titlebar").hide();
             $("a.popClose").on('click', function(){
+                reset_group_attr();
                 $("#GroupPopupBox" ).dialog("close");
             });
             $("#cancel_group").on('click', function(){
+                reset_group_attr();
                 $("#GroupPopupBox" ).dialog("close");
             });
             $('#min_num').focus();
@@ -351,29 +353,67 @@ $(function(){
             $("#GroupPopupBox").dialog("open");
             $(".ui-dialog-titlebar").hide();
             $("a.popClose").on('click', function () {
+                reset_group_attr();
                 $("#GroupPopupBox").dialog("close");
             });
             $("#cancel_group").on('click', function () {
+                reset_group_attr();
                 $("#GroupPopupBox").dialog("close");
             });
             $('#min_num').focus();
         }
     });
 
+    var reset_group_attr = function() {
+        $("#min_num_notice").hide();
+        $("#min_max_num_notice").hide();
+        $("#max_num_notice").hide();
+        if($("input[name=min_num]").length > 0 && $("input[name=max_num]").length > 0) {
+            $("#min_num").val($("input[name=min_num]").val());
+            $("#max_num").val($("input[name=max_num]").val());
+        } else {
+            $("#min_num").val(2);
+            $("#max_num").val(10);
+        }
+    };
     var saveGroupAttr = function() {
         var valid = true;
         var base_on_project = 0;
         var min = $.trim($("#min_num").val());
         var max = $.trim($("#max_num").val());
-        if(min.length <= 0) {
+        var regex = /^\d+$/;
+        if(!regex.test(min) || parseInt(min) <= 0) {
+            $("#min_num_notice").html("请输入正整数");
+            $("#max_num_notice").html("");
+            $("#min_max_num_notice").html("");
+            $("#min_num_notice").show();
             $("#min_num").focus();
-            valid = false;
             return false;
+        } else {
+            $("#min_num_notice").html("");
+            $("#min_num_notice").hide();
+        }
+        if(!regex.test(max) || parseInt(max) <= 0) {
+            $("#max_num_notice").html("请输入正整数");
+            $("#min_num_notice").html("");
+            $("#min_max_num_notice").html("");
+            $("#max_num_notice").show();
+            $("#max_num").focus();
+            return false;
+        } else {
+            $("#max_num_notice").html("");
+            $("#max_num_notice").hide();
         }
-        if(max.length <= 0) {
+        if(parseInt(min) > parseInt(max)) {
+            $("#min_max_num_notice").html("最小人数不得大于最大人数");
+            $("#min_num_notice").html("");
+            $("#max_num_notice").html("");
+            $("#min_max_num_notice").show();
             $("#max_num").focus();
-            valid = false;
             return false;
+        } else {
+            $("#min_max_num_notice").html("");
+            $("#min_max_num_notice").hide();
         }
         if ($("#base_on_project").is(":checked")) {
             base_on_project = 1;

From a17fb86a17494ab96bba076421406017975ed81e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 15 Jun 2016 17:07:29 +0800
Subject: [PATCH 408/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E7=9B=B4=E6=8E=A5=E8=B7=B3=E5=85=A5?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_unlogged.html.erb | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index cd59123b1..223ee3f40 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -1,13 +1,4 @@
 <div class="visitor-box fontGrey2">
-  <a href='javascript:void(0);' class='linkBlue' onclick='loginClick()'>登录</a>后可添加回复
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
   <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
-</div>
-<script type="text/javascript">
-  function loginClick()
-  {
-      //获取登录页面地址
-      var signinPath = '<%= signin_url_without_domain %>';
-      var htmlvalue = "</br><div style='width:550px;text-align:center'>您还没有登录，请登录后再执行此操作，谢谢！</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href="+signinPath+" class='Blue-btn fl' target='_Blank' onclick=' hideModal()' >登录</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a></div>";
-      pop_up_box(htmlvalue,580,30,50);
-  }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file

From 1023b94f0d6561f66253d9aadc1ff04dfd268d55 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 15 Jun 2016 17:22:39 +0800
Subject: [PATCH 409/668] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E8=BD=AC=E5=85=A5=E8=BF=99=E4=B8=AA=E8=B4=B4?=
 =?UTF-8?q?=E5=90=A7=E7=95=8C=E9=9D=A2,=E7=BB=84=E7=BB=87=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A0=8F=E7=9B=AE=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb | 7 ++++---
 app/views/forums/create.js.erb              | 5 +++--
 app/views/org_subfields/create.js.erb       | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 34e996494..2b41983cc 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -9,14 +9,15 @@ class OrgSubfieldsController < ApplicationController
       @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id], :priority => @organization.org_subfields.order("priority").last.priority + 1)
       if !params[:sub_dir].blank?
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
-              "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
+            "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
         if SubfieldSubdomainDir.find_by_sql(sql).count == 0
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      @subfield.update_attributes(:field_type => params[:field_type])
+      #默认类型为帖子
+      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type])
+      update_status_by_type(@subfield, params[:field_type]||"Post")
     else
       @res = false
     end
diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index 88e535e72..8323ec6d7 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,6 +1,7 @@
 <%if @save_flag%>
-$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-$('#reorder_time').click();
+//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+//$('#reorder_time').click();
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
 $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 952ed7b2c..2149f6dcd 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,6 +4,8 @@
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+    //默认选中第一个
+    $("input[name='field_type']").get(0).checked=true;
 <% end %>
-$("#subfield_name").val("");
-$("#sub_dir").val("");
\ No newline at end of file
+    $("#subfield_name").val("");
+    $("#sub_dir").val("");
\ No newline at end of file

From 06f97d5cb7d5349430bb1279e16c0cdafe145a4a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jun 2016 17:24:46 +0800
Subject: [PATCH 410/668] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 221 ++++++++++---------------------
 app/views/layouts/login.html.erb |   6 +-
 public/javascripts/new_user.js   |  50 ++++++-
 3 files changed, 122 insertions(+), 155 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index fcfbe8422..4c29bc673 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -2,32 +2,6 @@
 <%= stylesheet_link_tag 'leftside'%>
 
 <script type="text/javascript">
-
-//    $(document).ready(function(){
-//        $("#loginSignButton").click(function(){
-//            $("#signUpBox").css({display:"block"});
-//            $("#loginInBox").css({display:"none"});
-//        });
-//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
-//        });
-//    });
-//    $(function(){
-//        $("#username").keypress(function(e){
-//            alert(11);
-//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
-//            }
-//        });
-//
-//        $("#password").keypress(function(e){
-//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
-//            }
-//        });
-//    });
-
     $(document).ready(function(){
         $(".homepageSearchIcon").click(function(){
             var val=$('input:radio[name="search_type"]:checked').val();
@@ -38,10 +12,6 @@
                 $("#navSearchAlert").css({display:"none"});
             }
         });
-//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
-//        });
     });
 
     $(document).ready(function(){
@@ -62,42 +32,6 @@
         }
     });
 
-//    $('#regist_btn').bind('keyup', function(event) {
-//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
-//       register();
-//    }
-//});
-    function clearInfo(id, content) {
-                var text = $('#' + id);
-                if (text.val() == content) {
-                    $('#' + id).val('');
-                }
-            }
-
-    function showInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == '') {
-            $('#' + id).val(content);
-        }
-    }
-
-    function login(){
-        $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
-    }
-
-    function register(){
-        if($("#loginUpButton").hasClass('loginUpDisableButton')){
-            return;
-        }
-        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
-            $("#main_reg_form").submit();
-        }else{
-            $('#user_login').blur();
-            $('#user_mail').blur();
-            $('#user_password').blur();
-            $('#user_password_confirmation').blur();
-        }
-    }
     var $login_correct = false;
     var $mail_correct = false;
     var $passwd_correct = false;
@@ -185,111 +119,96 @@
         });
     });
 
-        function user_name_keypress(e){
-            if (e.keyCode == '13') {
-                $('#main_login_form').submit();
-            }
-        }
 
-        function changeRegisterBtn(checkbox){
-            if(checkbox.checked == true){
-                $("#loginUpButton").removeClass('loginUpDisableButton');
-                $("#loginUpButton").addClass('loginUpButton');
-            }else{
-                $("#loginUpButton").removeClass('loginUpButton')
-                $("#loginUpButton").addClass('loginUpDisableButton');
-            }
-        }
 </script>
-<div class="new_login">
+
+<div class="new_login" id = "loginInBox">
   <div class="new_login_con">
     <div class="new_login_txt fl">
       <h3> 欢迎加入Trustie创新实践社区</h3>
       <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
     </div>
     <div class="new_login_box fr mr45 mt100">
-      <h2 class="new_login_h2">登录<a href="register.html" class="fr mt5">立即注册</a><div class="cl"></div></h2>
+      <h2 class="new_login_h2">登录
+        <a href="<%= register_url_without_domain %>" class="fr mt5">立即注册</a><div class="cl"></div>
+      </h2>
       <div class="new_login_form">
-        <form>
-          <ul>
-            <li>
-              <input type="text" class="new_loggin_input new_login_users" placeholder="请输入邮箱地址或登录名">
-              <p class="new_login_error" >请输入正确的邮箱或登录名</p>
-            </li>
-            <li>
-              <input type="text" class="new_loggin_input new_login_lock" placeholder="请输入登录密码">
-              <p class="new_login_error" style="display:none;">请输入位密码，区分大小写，不能使用空格！</p>
-            </li>
-            <li>
-              <label><input type="checkbox" checked=" checked" class=" new_login_check">记住密码</label>
-              <a href="javascript:void(0);"  class="fr">忘记密码</a><div class="cl"></div>
-            </li>
-            <li><button type="submit" class="new_login_submit">登录</button></li>
-          </ul>
-        </form>
+        <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
+            <%= back_url_hidden_field_tag %>
+            <ul>
+              <li>
+                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input new_login_users',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
+                <!--<input type="text" class="new_loggin_input new_login_users" placeholder="请输入邮箱地址或登录名">-->
+                <!--<p class="new_login_error" >请输入正确的邮箱或登录名</p>-->
+              </li>
+              <li>
+                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input new_login_lock' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+                <!--<input type="text" class="new_loggin_input new_login_lock" placeholder="请输入登录密码">-->
+                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+              </li>
+              <li>
+                <% if Setting.autologin? %>
+                    <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
+                <% end %>
+                <a href="<%= lost_password_path %>"  class="fr">
+                  <% if Setting.lost_password? %>忘记密码<% end %>
+                </a>
+                <div class="cl"></div>
+              </li>
+              <li><a href="javascript:void(0);" id="login_btn" class="new_login_submit" onclick="$('#main_login_form').submit();">登录</a></li>
+            </ul>
+        <% end %>
       </div>
 
     </div>
     <div class="cl"></div>
   </div>
 </div>
+<%# 注册 %>
+<div class="new_register">
+  <div class="new_register_con">
+    <div class="new_login_txt fl new_register_left">
+      <h3> 欢迎加入Trustie创新实践社区</h3>
+      <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
+    </div>
+    <div class="new_login_box fr mr45 mt50">
+      <h2 class="new_login_h2">登录<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
+      <div class="new_login_form">
+        <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
+            <%= error_messages_for 'user' %>
+            <ul>
+              <li>
+                <%= f.text_field :mail, :size => 25, :class => 'new_loggin_input' , :placeholder => "请输入邮箱地址"%>
+                <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
+              </li>
+              <li>
+                <input type="text" class="new_loggin_input " placeholder="请输入密码">
+                <p class="new_login_error" style="display:none;">请输入6-16位密码，区分大小写，不能使用空格！</p>
+              </li>
+              <li>
+                <input type="text" class="new_loggin_input " placeholder="请输入密码">
+                <p class="new_login_error" style="display:none;">两次密码不一致！</p>
+              </li>
+              <li>
+                <input type="text" class="new_loggin_input " placeholder="请输入登录名">
+                <p class="new_login_error" style="display:none;" >登录名已使用！</p>
+              </li>
+              <li>
+                <label><input type="checkbox" checked=" checked" class=" new_login_check">我已阅读并接受<a href="javascript:void(0);"  >Trustie服务协议条款</a></label>
+              </li>
+              <li><button type="submit" class="new_login_submit">注册</button></li>
+            </ul>
+        <% end %>
+      </div>
 
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
 
 <div class="loginContentContainer">
   <div class="loginContent">
-    <div class="loginLeft">
-      <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie创新实践社区！在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。<br/><br/>&nbsp;&nbsp;Trustie社区的理想是：让创新过程变的更美好！</div>
-    </div>
     <div class="loginRight">
-      <div id="loginInBox">
-        <div class="loginChooseBox">
-          <div class="mb5">
-          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
-            <li class="loginChooseBorder fl"></li>
-          </ul>
-        </div>
-        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
-        </div>
-        <div class="loginIn">
-
-          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
-          <%= back_url_hidden_field_tag %>
-          <div class="mb20">
-            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
-            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
-          </div>
-          <% if Setting.openid? %>
-                  <div class="mb20">
-                    <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
-                  </div>
-          <% end %>
-          <div>
-            <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
-            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
-          </div>
-          <div class="loginSignOption">
-            <% if Setting.autologin? %>
-                <div class="fl mt3 mr5">
-                  <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
-                </div>
-                <%= l(:label_stay_logged_in) %>
-            <% end %>
-            <a href="<%= lost_password_path %>" class="newsBlue mr40 fr">
-              <% if Setting.lost_password? %>
-              <u>忘记密码?</u>
-                  <% end %>
-            </a></div>
-        <% end %>
-          <div class="loginInButton" >
-            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
-          </div>
-
-        </div>
-
-      </div>
       <div id="signUpBox">
         <div class="loginChooseBox">
           <ul class="loginChooseList">
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 2c14ee0ad..18fbcfcd5 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -9,11 +9,12 @@
   <%= favicon %>
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-<body>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>
@@ -22,10 +23,9 @@
         <%= render :partial => 'layouts/unlogin_header' %>
     <% end%>
 </div>
+
 <%= yield %>
 <div class="cl"></div>
-<%= javascript_heads %>
-<%= javascript_include_tag "bootstrap","avatars","new_user"%>
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
 <%= call_hook :view_layouts_base_body_bottom %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index b6301afad..f5f0d78f0 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -627,4 +627,52 @@ var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
     addEvent(elem2, 'input', change);
     addEvent(elem2, 'focus', change);
     change();
-};
\ No newline at end of file
+};
+
+function user_name_keypress(e){
+    if (e.keyCode == '13') {
+        $('#main_login_form').submit();
+    }
+}
+
+function changeRegisterBtn(checkbox){
+    if(checkbox.checked == true){
+        $("#loginUpButton").removeClass('loginUpDisableButton');
+        $("#loginUpButton").addClass('loginUpButton');
+    }else{
+        $("#loginUpButton").removeClass('loginUpButton')
+        $("#loginUpButton").addClass('loginUpDisableButton');
+    }
+}
+
+function clearInfo(id, content) {
+    var text = $('#' + id);
+    if (text.val() == content) {
+        $('#' + id).val('');
+    }
+}
+
+function showInfo(id, content) {
+    var text = $('#' + id);
+    if (text.val() == '') {
+        $('#' + id).val(content);
+    }
+}
+
+function login(){
+    $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
+}
+
+function register(){
+    if($("#loginUpButton").hasClass('loginUpDisableButton')){
+        return;
+    }
+    if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
+        $("#main_reg_form").submit();
+    }else{
+        $('#user_login').blur();
+        $('#user_mail').blur();
+        $('#user_password').blur();
+        $('#user_password_confirmation').blur();
+    }
+}
\ No newline at end of file

From aa42044199d30c87ee1100a6a15d29d096059219 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 15 Jun 2016 17:58:02 +0800
Subject: [PATCH 411/668] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 70 +++++---------------------------
 1 file changed, 11 insertions(+), 59 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 4c29bc673..9031b5167 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -165,7 +165,7 @@
   </div>
 </div>
 <%# 注册 %>
-<div class="new_register">
+<div class="new_register" id = "signUpBox">
   <div class="new_register_con">
     <div class="new_login_txt fl new_register_left">
       <h3> 欢迎加入Trustie创新实践社区</h3>
@@ -174,7 +174,7 @@
     <div class="new_login_box fr mr45 mt50">
       <h2 class="new_login_h2">登录<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
       <div class="new_login_form">
-        <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
+        <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
             <ul>
               <li>
@@ -182,21 +182,22 @@
                 <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
               </li>
               <li>
-                <input type="text" class="new_loggin_input " placeholder="请输入密码">
-                <p class="new_login_error" style="display:none;">请输入6-16位密码，区分大小写，不能使用空格！</p>
+                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_loggin_input' %>
+                <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
               </li>
               <li>
-                <input type="text" class="new_loggin_input " placeholder="请输入密码">
-                <p class="new_login_error" style="display:none;">两次密码不一致！</p>
+                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_loggin_input' %>
+                <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
               </li>
               <li>
-                <input type="text" class="new_loggin_input " placeholder="请输入登录名">
-                <p class="new_login_error" style="display:none;" >登录名已使用！</p>
+                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_loggin_input'%>
+                <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
               <li>
-                <label><input type="checkbox" checked=" checked" class=" new_login_check">我已阅读并接受<a href="javascript:void(0);"  >Trustie服务协议条款</a></label>
+                <label><input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
               </li>
-              <li><button type="submit" class="new_login_submit">注册</button></li>
+              <li>
+                <button type="submit" class="new_login_submit"><a href="javascript:void(0);" class="new_login_submit" id="regist_btn" onclick="register();" >注册</a></button></li>
             </ul>
         <% end %>
       </div>
@@ -206,52 +207,3 @@
   </div>
 </div>
 
-<div class="loginContentContainer">
-  <div class="loginContent">
-    <div class="loginRight">
-      <div id="signUpBox">
-        <div class="loginChooseBox">
-          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></a></span>
-            <li class="loginChooseBorder fl"></li>
-          </ul>
-        </div>
-        <div class="loginIn">
-          <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
-              <%= error_messages_for 'user' %>
-          <div class="loginSignRow">
-            <!--<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />-->
-            <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
-            <div class="loginSignAlert" id="mail_req" style="display: none"  >请输入有效邮箱地址</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="passwd_req" style="display: none">至少需要 6 个字符</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请再次输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="confirm_req" style="display: none">密码不一致</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</div>
-          </div>
-              <div class="loginSignOption">
-                <div class="fl mt3 mr5">
-                  <input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);"/>
-                </div>
-                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
-          <div class="loginUpDisableButton" id="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();" >注册</a>
-
-          </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div>

From 5e3df51ad91b63fbff048d30d46bb7bd95c8e810 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 10:21:21 +0800
Subject: [PATCH 412/668] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 21 +++++++++------------
 app/views/layouts/login.html.erb |  1 +
 public/javascripts/new_user.js   | 10 +++++-----
 public/stylesheets/new_user.css  | 23 ++++++++++++++++++++---
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 9031b5167..c3b6a0946 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -52,7 +52,7 @@
                                 $('#login_req').html('<span style="color: green">'+data.message+'</span>');
                                 $login_correct = true;
                             } else {
-                                $('#login_req').html( '<span style="color: red">'+data.message+'</span>');
+                                $('#login_req').html( '<span style="color: #c00202">'+data.message+'</span>');
                                 $login_correct = false;
                             }
                             $('#login_req').css('display','block');
@@ -63,7 +63,7 @@
 
         $mail.blur(function (event) {
             if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
-                $('#mail_req').html( '<span style="color: red">邮件格式不对</span>').show();
+                $('#mail_req').html( '<span style="color: #c00202">邮件格式不对</span>').show();
                 $mail_correct = false;
                 return ;
             }
@@ -76,7 +76,7 @@
                                 $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
                                  $mail_correct = true;
                             } else {
-                                $('#mail_req').html( '<span style="color: red">'+data.message+'</span>' );
+                                $('#mail_req').html( '<span style="color: #c00202">'+data.message+'</span>' );
                                  $mail_correct = false;
                             }
                             $('#mail_req').css('display','block');
@@ -92,7 +92,7 @@
                  $passwd_correct = true;
             }
             else {
-                $('#passwd_req').html( '<span style="color: red">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
+                $('#passwd_req').html( '<span style="color: #c00202">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
                  $passwd_correct = false;
             }
             $('#passwd_req').css('display','block');
@@ -108,7 +108,7 @@
                  $passwd_comfirm_correct = true;
             }
             else {
-                $('#confirm_req').html('<span style="color: red">'+'<%= l(:setting_password_error) %>'+'</span>');
+                $('#confirm_req').html('<span style="color: #c00202">'+'<%= l(:setting_password_error) %>'+'</span>');
                  $passwd_comfirm_correct = false;
 
             }
@@ -118,8 +118,6 @@
 
         });
     });
-
-
 </script>
 
 <div class="new_login" id = "loginInBox">
@@ -138,12 +136,9 @@
             <ul>
               <li>
                 <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input new_login_users',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
-                <!--<input type="text" class="new_loggin_input new_login_users" placeholder="请输入邮箱地址或登录名">-->
-                <!--<p class="new_login_error" >请输入正确的邮箱或登录名</p>-->
               </li>
               <li>
                 <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input new_login_lock' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
-                <!--<input type="text" class="new_loggin_input new_login_lock" placeholder="请输入登录密码">-->
                 <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               </li>
               <li>
@@ -155,7 +150,7 @@
                 </a>
                 <div class="cl"></div>
               </li>
-              <li><a href="javascript:void(0);" id="login_btn" class="new_login_submit" onclick="$('#main_login_form').submit();">登录</a></li>
+              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();">登录</a></button></li>
             </ul>
         <% end %>
       </div>
@@ -197,7 +192,9 @@
                 <label><input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
               </li>
               <li>
-                <button type="submit" class="new_login_submit"><a href="javascript:void(0);" class="new_login_submit" id="regist_btn" onclick="register();" >注册</a></button></li>
+                <div class="new_login_submit_disable" id="loginUpButton">
+                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" class="new_login_submit_disable" style="text-decoration: none;">注册</a>
+                </div>
             </ul>
         <% end %>
       </div>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 18fbcfcd5..c20335b1d 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,6 +15,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
+<body style="background-color: #fff">
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index f5f0d78f0..d2eb7a168 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -637,11 +637,11 @@ function user_name_keypress(e){
 
 function changeRegisterBtn(checkbox){
     if(checkbox.checked == true){
-        $("#loginUpButton").removeClass('loginUpDisableButton');
-        $("#loginUpButton").addClass('loginUpButton');
+        $("#loginUpButton").removeClass('new_login_submit_disable');
+        $("#loginUpButton").addClass('new_login_submit');
     }else{
-        $("#loginUpButton").removeClass('loginUpButton')
-        $("#loginUpButton").addClass('loginUpDisableButton');
+        $("#loginUpButton").removeClass('new_login_submit')
+        $("#loginUpButton").addClass('new_login_submit_disable');
     }
 }
 
@@ -664,7 +664,7 @@ function login(){
 }
 
 function register(){
-    if($("#loginUpButton").hasClass('loginUpDisableButton')){
+    if($("#loginUpButton").hasClass('new_login_submit_disable')){
         return;
     }
     if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2827b9a09..062367a4c 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -747,8 +747,8 @@ a:hover .gz_btn{color:#ff5722;}
 .homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
 
 /*注册登陆页面*/
-#loginInBox {display:block; margin-top:143px;}
-#signUpBox {display:none; margin-top:79px;}
+#loginInBox {display:block;}
+#signUpBox {display:none;}
 #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginSignButton:hover {background-color:#05488e;}
@@ -1708,11 +1708,28 @@ input.new_login_lock{
     margin-bottom:15px;
 }
 .new_login_error{
+    color:#c00202;
+}
+.new_login_submit_disable{
+    width:265px;
+    height:40px;
+    line-height: 40px;
+    background:#ccc;
     color:#fff;
+    font-size:14px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    text-align:center;
+    cursor:pointer;
+    vertical-align: middle;
 }
 .new_login_submit{
     width:265px;
     height:40px;
+    line-height: 40px;
     background:#f27d0d;
     color:#fff;
     font-size:14px;
@@ -1723,7 +1740,7 @@ input.new_login_lock{
     border:none;
     text-align:center;
     cursor:pointer;
-
+    vertical-align: middle;
 }
 .new_login_check{
     width:15px;

From 474c183050988f3dd76592f6e53970134cc26b59 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 10:35:53 +0800
Subject: [PATCH 413/668] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css   | 2 +-
 public/stylesheets/org_custom.css | 2 +-
 public/stylesheets/public.css     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 062367a4c..53b252428 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -543,7 +543,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#297fb8;}
+.navHomepageMenu:hover {background-color:#05488e;}
 /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 0bdc8a670..051eb2a97 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -1,6 +1,6 @@
 /* 门户首页 */
 #por_header{ width:100%;   }
-.por_header_top{ width:100%; height:70px; background:#3b94d6; }
+.por_header_top{ width:100%; height:70px; background:#1065bd; }
 .por_header_con{ width:1000px; margin:0 auto; height:70px;  }
 .por_logo{ margin-top:5px;}
 .por_login li{ float:left;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9306fa0b..644aaee10 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -515,13 +515,13 @@ a.uploadIcon {background:url(../images/resource_icon_list.png) 8px -60px no-repe
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
+.navContainer {width:100%; margin:0 auto; background-color:#1065bd;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px; display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#297fb8;}
+.navHomepageMenu:hover {background-color:#05488e;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}

From 24b12513e5eb5948d3764354da54333e61398241 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 11:16:41 +0800
Subject: [PATCH 414/668] =?UTF-8?q?=E9=93=83=E9=93=9B=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/nav_icon.png | Bin 17834 -> 18065 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/nav_icon.png b/public/images/nav_icon.png
index c9144e074960f56907c82d888cc287ccfe964779..e76bd3d245d6eb59db868aeaf47a1c0bc615f6c9 100644
GIT binary patch
delta 2374
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
Be0u-@

delta 2221
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
a<R=hNCovzM_QAmbyYTV!$38k1k^Mi43{BVo


From 24458ecb48a4578854bc65f9a3bea82707348876 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 16 Jun 2016 11:31:39 +0800
Subject: [PATCH 415/668] =?UTF-8?q?table=E5=8F=AF=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb    | 25 ++++++++++---------
 .../student_work/_evaluation_title.html.erb   |  6 +----
 .../_evaluation_un_title.html.erb             |  6 +----
 app/views/student_work/index.js.erb           |  3 +--
 public/javascripts/resizeable_table.js        |  5 ++--
 public/stylesheets/courses.css                |  2 +-
 6 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index cbb56025e..f3a72b20e 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,23 +1,24 @@
+<%= javascript_include_tag 'resizeable_table'%>
+
 <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>
+  <tr class="b_grey hworkH30">
+    <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
+    <th class="hworkList50">&nbsp;&nbsp;</th>
+    <th class="hworkList60"><span class="c_dark f14 fb">姓名</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">学号</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">班级</span></th>
+    <th width="230">&nbsp;&nbsp;</th>
     <th class="hworkList130">
-      <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+      <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%>
     </th>
     <th class="hworkList50">
-      <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
+      <%= link_to "成绩",'',:class => "c_dark f14 fb",:remote => true%>
     </th>
   </tr>
 
   <% @exercise_users_list.each_with_index do |exercise, index|%>
       <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
-        <td class="pl5 pr5" style="width:28px; text-align:center;"><%=index + 1 %></td>
+        <td class="pl5 pr5" style="text-align:center;"><%=index + 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>
@@ -30,7 +31,7 @@
         <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
           --
         </td>
-        <td width="200">&nbsp;</td>
+        <td width="230">&nbsp;</td>
         <td class="hworkList130 c_grey">
           <% if exercise.created_at%>
               <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 6a89b51b1..950c1660a 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,8 +1,4 @@
-<!--
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
--->
-
-<table class="hwork-table-wrap" id="homework_table">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index c4a6a3e9b..5ed2e82d6 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,8 +1,4 @@
-<!--
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
--->
-
-<table class="hwork-table-wrap" id="homework_table">
+<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index da2428316..f65782805 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,4 +1,3 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
 $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-/*
-$("th").each(function(){$(this).css("width",$(this).width()-1);});*/
+$("th").each(function(){$(this).css("width",$(this).width()-1);});
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index a43078dee..1f84d4471 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -1,7 +1,7 @@
 /**
  * Created by ttang on 2016/5/24.
  */
-    /*$(document).ready(function(){
+    $(document).ready(function(){
         $("th").each(function(){
             $(this).css("width",$(this).width()-1);
         });
@@ -80,5 +80,4 @@
                element.addEventListener?element.addEventListener(type,listener,useCapture):element.attachEvent("on" + type,listener);
            }
        }
-    });
-*/
\ No newline at end of file
+    });
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 46fbc5950..382283f75 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1; text-align:center;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}

From 278160567046973b54e623ac26dff097103f1555 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 16 Jun 2016 14:04:12 +0800
Subject: [PATCH 416/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=A2=9E=E5=8A=A0=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb           |  9 ++++++--
 app/views/files/_file_description.html.erb    |  5 +++++
 app/views/files/_resource_detail.html.erb     | 21 ++++++++++++++++---
 .../files/update_file_description.js.erb      |  3 +++
 config/routes.rb                              |  2 +-
 public/javascripts/application.js             | 18 ++++++++++++++++
 6 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 app/views/files/_file_description.html.erb
 create mode 100644 app/views/files/update_file_description.js.erb

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7ec796b61..1c05399c4 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -26,7 +26,7 @@ class FilesController < ApplicationController
   before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
                                         :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
                                         :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
-                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file]
+                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file,:update_file_description]
 
   helper :sort
   include SortHelper
@@ -911,5 +911,10 @@ class FilesController < ApplicationController
 
   def upload_files_menu
 
-end
+  end
+  def update_file_description
+    @attachment = Attachment.find(params[:id])
+    @attachment.description = params[:description]
+    @attachment.save
+  end
 end
diff --git a/app/views/files/_file_description.html.erb b/app/views/files/_file_description.html.erb
new file mode 100644
index 000000000..5d46eaaeb
--- /dev/null
+++ b/app/views/files/_file_description.html.erb
@@ -0,0 +1,5 @@
+<p ondblclick=show_edit_file_description('<%= file.id %>')>
+  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">点击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
+  <%#= file.description.blank? ? "该资源暂无描述" : file.description %>
+  <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>
+</p>
\ No newline at end of file
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 2a03723ca..e7d43a9d4 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -35,10 +35,25 @@
         <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
       </div>
-      <% unless file.description.blank? %>
+      <%# unless file.description.blank? %>
           <div class="cl"></div>
-          <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-      <% end %>
+          <% if User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
+            <div>
+              <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                    <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+              </div>
+              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                        onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+            </div>
+          <% else %>
+            <div class="fontGrey2 mb4">
+                <% unless file.description.blank? %>
+                    <div class="cl"></div>
+                    <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+                <% end %>
+            </div>
+          <% end %>
+      <%# end %>
       <div class="cl"></div>
       <div class="tag_h">
         <!-- container_type = 1 代表是课程里的资源 -->
diff --git a/app/views/files/update_file_description.js.erb b/app/views/files/update_file_description.js.erb
new file mode 100644
index 000000000..2954fb567
--- /dev/null
+++ b/app/views/files/update_file_description.js.erb
@@ -0,0 +1,3 @@
+$("#file_description_show_<%= @attachment.id %>").html("<%= escape_javascript render(:partial => "files/file_description", :locals => {:file => @attachment}) %>");
+$("#file_description_show_<%= @attachment.id %>").show();
+$("#file_description_edit_<%= @attachment.id %>").hide();
diff --git a/config/routes.rb b/config/routes.rb
index e4b462d93..a778a8016 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -975,7 +975,6 @@ RedmineApp::Application.routes.draw do
       match 'delete_softapplications', :via =>  [:get, :post]
     end
   end
-
   resources :groups do
     member do
       get 'autocomplete_for_user'
@@ -1114,6 +1113,7 @@ RedmineApp::Application.routes.draw do
         match "quote_resource_show", :via => [:get]
         get "file_hidden"
         post "republish_file"
+        get "update_file_description"
       end
     end
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 73b667740..0437125e8 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1480,3 +1480,21 @@ function autoUrl(id){
     }
 }
 
+//编辑资源描述
+function show_edit_file_description(id) {
+    $("#file_description_show_"+id).hide();
+    $("#file_description_edit_"+id).show();
+    $("#file_description_edit_"+id).focus();
+}
+
+//编辑资源描述之后提交
+function edit_file_description(url,id){
+    $.get(
+        url,
+        {id: id ,description: $("#file_description_edit_"+id).val() },
+        function (data) {
+
+        }
+    );
+}
+

From 072807fe3721b434c0ecc213b62a1f8f9b2ceff6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 14:07:37 +0800
Subject: [PATCH 417/668] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95=E4=B8=8B?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF=E5=8E=BB=E6=8E=892=E3=80=81=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=94=B9=E6=88=90=E6=B3=A8=E5=86=8C3=E3=80=81?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E6=94=B9=E6=88=90=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index c3b6a0946..f492c5502 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -150,7 +150,7 @@
                 </a>
                 <div class="cl"></div>
               </li>
-              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();">登录</a></button></li>
+              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();" style="text-decoration: none;">登录</a></button></li>
             </ul>
         <% end %>
       </div>
@@ -167,7 +167,7 @@
       <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
     </div>
     <div class="new_login_box fr mr45 mt50">
-      <h2 class="new_login_h2">登录<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
+      <h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
       <div class="new_login_form">
         <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
@@ -189,11 +189,11 @@
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
               <li>
-                <label><input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
+                <label><input type="checkbox" checked id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
               </li>
               <li>
-                <div class="new_login_submit_disable" id="loginUpButton">
-                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" class="new_login_submit_disable" style="text-decoration: none;">注册</a>
+                <div class="new_login_submit" id="loginUpButton">
+                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" style="text-decoration: none;">注册</a>
                 </div>
             </ul>
         <% end %>

From 049a21c7d078d7b18a0db2d63d914e927b3222d4 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 16 Jun 2016 14:08:54 +0800
Subject: [PATCH 418/668] =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E7=BA=BF=E7=9A=84?=
 =?UTF-8?q?=E5=85=88=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb |  5 ++---
 app/views/forums/create.js.erb              |  5 ++---
 app/views/org_subfields/create.js.erb       | 16 +++++++---------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 2b41983cc..3edda8285 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -14,10 +14,9 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      #默认类型为帖子
-      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
+      @subfield.update_attributes(:field_type => params[:field_type])
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type]||"Post")
+      update_status_by_type(@subfield, params[:field_type])
     else
       @res = false
     end
diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index 8323ec6d7..88e535e72 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,7 +1,6 @@
 <%if @save_flag%>
-//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-//$('#reorder_time').click();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
 <%else%>
 $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 2149f6dcd..a7647b0ad 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,11 +1,9 @@
 <% if @res %>
-    $("#org_subfield_list").html("");
-    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
-    $("#sub_field_left_lists").html("");
-    $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-    $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
-    //默认选中第一个
-    $("input[name='field_type']").get(0).checked=true;
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
 <% end %>
-    $("#subfield_name").val("");
-    $("#sub_dir").val("");
\ No newline at end of file
+$("#subfield_name").val("");
+$("#sub_dir").val("");
\ No newline at end of file

From 7df91ebf703f87dcbe45fca14594cce628c289de Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 16 Jun 2016 14:14:54 +0800
Subject: [PATCH 419/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8F=8F=E8=BF=B0=E7=A9=BA=E7=99=BD=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_file_description.html.erb b/app/views/files/_file_description.html.erb
index 5d46eaaeb..bb838d415 100644
--- a/app/views/files/_file_description.html.erb
+++ b/app/views/files/_file_description.html.erb
@@ -1,5 +1,5 @@
 <p ondblclick=show_edit_file_description('<%= file.id %>')>
-  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">点击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
+  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">双击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
   <%#= file.description.blank? ? "该资源暂无描述" : file.description %>
   <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>
 </p>
\ No newline at end of file

From f9f66bac7b42fdb4ffab4f863aba8c71688469ae Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 16 Jun 2016 14:15:46 +0800
Subject: [PATCH 420/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8F=8F=E8=BF=B0=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_file_description.html.erb b/app/views/files/_file_description.html.erb
index 5d46eaaeb..bb838d415 100644
--- a/app/views/files/_file_description.html.erb
+++ b/app/views/files/_file_description.html.erb
@@ -1,5 +1,5 @@
 <p ondblclick=show_edit_file_description('<%= file.id %>')>
-  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">点击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
+  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">双击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
   <%#= file.description.blank? ? "该资源暂无描述" : file.description %>
   <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>
 </p>
\ No newline at end of file

From d4760bcd6d59a14eec4328b5a26d0ce62298b3a7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 14:43:19 +0800
Subject: [PATCH 421/668] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=83=8F=E7=B4=A0?=
 =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 53b252428..91eeb58fd 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1754,7 +1754,7 @@ input.new_login_lock{
 .new_login_form  a{ color:#fff; text-decoration:underline;}
 .new_register{
     width:100%;
-    height:580px;
+    height:579px;
     background-color:#1065bd;
 }
 .new_register_con{

From a63dffd9d3bf2e75618c1b94191883ea5e6cc8f0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 14:54:27 +0800
Subject: [PATCH 422/668] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=A2=9C=E8=89=B2=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 767d76cb2..6d2592de8 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -1,11 +1,11 @@
 /*新个人主页框架css*/
-.navContainer {width:100%; background-color:#3b94d6;}
+.navContainer {width:100%; background-color:#1065bd;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#297fb8;}
+.navHomepageMenu:hover {background-color:#05488e;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}

From d2d15710b58969a762696702b944787930fbd244 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:25:43 +0800
Subject: [PATCH 423/668] =?UTF-8?q?=E8=A7=A3=E5=86=B3chrome=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=83=8C=E6=99=AF=E9=BB=84=E8=89=B2=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/views/account/login.html.erb | 19 ++++++++++---------
 public/stylesheets/new_user.css  | 25 ++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index f492c5502..3ec5d3221 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -134,13 +134,14 @@
         <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
             <%= back_url_hidden_field_tag %>
             <ul>
-              <li>
-                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input new_login_users',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
+              <li class="new_login_li new_login_users">
+                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
               </li>
-              <li>
-                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input new_login_lock' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
-                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+              <li class="new_login_li  new_login_lock">
+                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+
               </li>
+              <span class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></span>
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
@@ -173,19 +174,19 @@
             <%= error_messages_for 'user' %>
             <ul>
               <li>
-                <%= f.text_field :mail, :size => 25, :class => 'new_loggin_input' , :placeholder => "请输入邮箱地址"%>
+                <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
                 <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
               </li>
               <li>
-                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_loggin_input' %>
+                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
                 <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
               </li>
               <li>
-                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_loggin_input' %>
+                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
                 <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
               </li>
               <li>
-                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_loggin_input'%>
+                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
               <li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 91eeb58fd..49d86c446 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1667,7 +1667,7 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
     background:url(../images/login/icons_login.png) 0 -69px no-repeat;
     padding-left:10px;
 }
-input.new_loggin_input{
+input.new_register_input{
     width:250px;
     height:45px;
     background:#fff;
@@ -1679,7 +1679,26 @@ input.new_loggin_input{
     padding-left:15px;
     margin-bottom:2px;
 }
-input.new_login_users{
+input.new_loggin_input{
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
+    outline: none;
+    width:205px;
+    height:45px;
+    border:none;
+}
+.new_loggin_li{ width:250px;
+    height:45px;
+    background:#fff;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    padding-left:15px;
+    margin-bottom:2px;
+    margin-bottom:20px;
+}
+.new_login_users{
     background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
     width:215px;
     height:45px;
@@ -1691,7 +1710,7 @@ input.new_login_users{
     padding-left:50px;
     margin-bottom:2px;
 }
-input.new_login_lock{
+.new_login_lock{
     background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
     width:215px;
     height:45px;

From e3ee99b486d1222841aa3e58833071902b6cad51 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 16 Jun 2016 15:46:16 +0800
Subject: [PATCH 424/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=B8=AD=E8=BF=87=E6=BB=A4=E6=8E=89=E5=B7=B2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E6=B6=88=E6=81=AF=E3=80=81=20at?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb |  2 +-
 app/controllers/users_controller.rb        | 31 +++++++++++++++-------
 app/helpers/users_helper.rb                |  4 ++-
 app/views/users/_user_at_message.html.erb  |  2 +-
 app/views/users/user_messages.html.erb     |  5 ++--
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 22047efee..d478b4d63 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1096,7 +1096,7 @@ class StudentWorkController < ApplicationController
       all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
     end
     all_students = User.where("id in #{all_student_ids}")
-    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
+    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).empty? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
     @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
     respond_to do |format|
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cad57b49f..ca63f496c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -130,8 +130,11 @@ class UsersController < ApplicationController
     onclick_time = User.current.onclick_time.onclick_time
     messages.each do |message_all|
       # 未读的消息存放在数组
-      if (message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0) || (message_all.message_type == "SystemMessage"&& !message_all.message.nil? && message_all.message.created_at > onclick_time)
-        @message_alls << message_all.message
+      mess = message_all.message
+      if (message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)) || (message_all.message_type == "SystemMessage"&& !mess.nil? && mess.created_at > onclick_time)
+        unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+          @message_alls << mess
+        end
         break if @message_alls.length == 5
       end
     end
@@ -154,33 +157,41 @@ class UsersController < ApplicationController
       update_message_viewed(@user)
     end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
+    courses = @user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
     case params[:type]
       when nil
         # 系统消息为管理员发送，我的消息中包含有系统消息
         @message_alls = []
         messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
         messages.each do |message_all|
-          @message_alls << message_all.message
+          mess = message_all.message
+          unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+            @message_alls << mess
+          end
         end
       when 'unviewed'
         @message_alls = []
-        messages = MessageAll.where("user_id =?", @user.id).includes(:message).order("created_at desc")
+        messages = MessageAll.where("message_alls.user_id =?", @user.id).includes(:message).order("created_at desc")
         messages.each do |message_all|
           # 在点击或者刷新消息列表后未读的消息存放在数组
-          if message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0
-            @message_alls << message_all.message
+          mess = message_all.message
+          if message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)
+            unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+              @message_alls << mess
+            end
           end
         end
       #课程相关消息
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =?",  @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =? and course_id NOT IN #{course_ids}",  @user.id).order("created_at desc")
       when 'course_message'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Message", @user.id).order("created_at desc")
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
-        @message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =?", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =? and course_id NOT IN #{course_ids}", @user.id).order("created_at desc")
       when 'poll'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Poll", @user.id).order("created_at desc")
       #项目相关消息
       when 'issue'
         @message_alls = ForgeMessage.where("forge_message_type in ('Issue', 'Journal') and user_id =?" , @user.id).order("created_at desc")
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 44b919121..4a6dbc6b6 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -147,7 +147,9 @@ module UsersHelper
 
   # 统计未读消息数
   def unviewed_message(user)
-    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    courses = user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+    course_count = CourseMessage.where("user_id =? and viewed =? and course_id not in #{course_ids}", user, 0).count
     forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
     org_count = OrgMessage.where("user_id =? and viewed =?", user, 0).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index 8f0c6acaf..81139ab8e 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -1,4 +1,4 @@
-<% if AtMessage === ma && ma.at_valid? %>
+<% if ma.class == AtMessage && ma.at_valid? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
           <li class="homepageNewsPubType fl">
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 391709b52..1ff8adc57 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -4,8 +4,9 @@
     <% if (!@message_alls.nil? && @message_alls.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
-              有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
-              <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
+              <% count = unviewed_message(@user) %>
+              有&nbsp;<span class="c_red"><%= count %></span>&nbsp;条未读
+              <% unless (count == 0 || User.current != @user) %>
                   <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
               <% end %>
             </div>

From 670786891516ce1b57f6fe5e97cc41ad2ac04978 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:52:54 +0800
Subject: [PATCH 425/668] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 15 +++++++------
 config/locales/account/zh.yml    |  2 +-
 public/stylesheets/new_user.css  | 36 ++++++++++++--------------------
 3 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 3ec5d3221..8d11a0697 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -134,14 +134,13 @@
         <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
             <%= back_url_hidden_field_tag %>
             <ul>
-              <li class="new_login_li new_login_users">
+              <li class="new_loggin_users">
                 <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
               </li>
-              <li class="new_login_li  new_login_lock">
+              <li class="new_login_lock">
                 <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
-
               </li>
-              <span class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></span>
+              <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
@@ -173,19 +172,19 @@
         <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
             <ul>
-              <li>
+              <li class="new_register_li">
                 <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
                 <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
                 <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
                 <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml
index c6a23b964..532806356 100644
--- a/config/locales/account/zh.yml
+++ b/config/locales/account/zh.yml
@@ -37,7 +37,7 @@ zh:
   label_password_lost: "忘记密码？"
   button_login: 登录
   #     account_controller中判断用户名或密码输入有误的提示信息
-  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写，谢谢！"
+  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写。"
   #     account_controller中判断未激活的提示信息
   notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 49d86c446..836596244 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1668,16 +1668,10 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
     padding-left:10px;
 }
 input.new_register_input{
+    margin-left:5px;
     width:250px;
     height:45px;
-    background:#fff;
-    -webkit-border-radius:5px;
-    -moz-border-radius:5px;
-    -o-border-radius:5px;
-    border-radius:5px;
     border:none;
-    padding-left:15px;
-    margin-bottom:2px;
 }
 input.new_loggin_input{
     -webkit-box-shadow: 0 0 0px 1000px white inset;
@@ -1685,46 +1679,42 @@ input.new_loggin_input{
     width:205px;
     height:45px;
     border:none;
+    margin-left:50px;
 }
-.new_loggin_li{ width:250px;
+.new_loggin_users{
+    width:265px;
     height:45px;
-    background:#fff;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:15px;
-    margin-bottom:2px;
-    margin-bottom:20px;
-}
-.new_login_users{
     background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
-    width:215px;
+
+}
+.new_login_lock{
+    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
+    width:265px;
     height:45px;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:50px;
-    margin-bottom:2px;
 }
-.new_login_lock{
-    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
-    width:215px;
+.new_register_li{
+    background:#fff;
+    width:265px;
     height:45px;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:50px;
-    margin-bottom:2px;
 }
 
 .new_login_form ul li{
-    margin-bottom:15px;
+    margin-bottom:20px;
 }
 .new_login_error{
     color:#c00202;

From 312fa61489eab94558d2fc3c50ede0ee76d47670 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:57:30 +0800
Subject: [PATCH 426/668] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=BA=BF?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 3 ++-
 public/stylesheets/new_user.css  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 8d11a0697..23acabd1f 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -139,8 +139,9 @@
               </li>
               <li class="new_login_lock">
                 <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               </li>
-              <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 836596244..c2e850dbe 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1672,6 +1672,7 @@ input.new_register_input{
     width:250px;
     height:45px;
     border:none;
+    outline: none;
 }
 input.new_loggin_input{
     -webkit-box-shadow: 0 0 0px 1000px white inset;

From 30db43eb13b59b04de4b45deb1ffffc1c3c34e37 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 16 Jun 2016 15:58:34 +0800
Subject: [PATCH 427/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8D=E4=BC=9A=E8=BF=9B=E5=85=A5=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=EF=BC=8C=E4=B9=9F=E4=B8=8D=E8=83=BD=E5=AF=B9=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BA=BA=E8=BF=9B=E8=A1=8C=E5=8C=BF=E8=AF=84=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=89=93=E5=BC=80=E4=BD=9C=E4=B8=9A=E6=97=B6?=
 =?UTF-8?q?=E5=88=99=E6=97=A0=E6=AD=A4=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E7=BB=9F=E4=B8=80=EF=BC=8C=E5=9D=87=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
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 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 4a7e5cee3..238102879 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -7,6 +7,15 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
+        <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
+            showModal('ajax-modal', '360px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().css("top","65%").css("left","60%").css("border","3px solid #269ac9");
+            $('#ajax-modal').parent().addClass("anonymos_work");
+        <% end%>
     });
 </script>
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->

From 3f697355d236e9f7174f059d51b354c153ce8fa7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 16:01:56 +0800
Subject: [PATCH 428/668] =?UTF-8?q?chorm=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index c2e850dbe..7d4a3e041 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1668,6 +1668,7 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
     padding-left:10px;
 }
 input.new_register_input{
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
     margin-left:5px;
     width:250px;
     height:45px;

From 439841fbd7b00ef0adf9004e51fe4c6c471468b4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 16 Jun 2016 16:10:42 +0800
Subject: [PATCH 429/668] =?UTF-8?q?=E4=BB=8E=E8=AF=BE=E7=A8=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E7=9A=84=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BE=E7=BD=AE=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=BA=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=9A=84=E5=8C=BF=E8=AF=84=E8=AE=BE=E7=BD=AE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2=E4=B8=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=EF=BC=8C=E5=BA=94=E8=AF=A5=E7=BB=9F=E4=B8=80=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 78f44aa31..eaea6c553 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,3 +1,4 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");

From 006965df5067d98b585d40a1b02435d4279913dd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 16:46:44 +0800
Subject: [PATCH 430/668] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css     | 6 +++---
 public/stylesheets/new_user.css   | 6 +++---
 public/stylesheets/org_custom.css | 2 +-
 public/stylesheets/public.css     | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 6d2592de8..767d76cb2 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -1,11 +1,11 @@
 /*新个人主页框架css*/
-.navContainer {width:100%; background-color:#1065bd;}
+.navContainer {width:100%; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#05488e;}
+.navHomepageMenu:hover {background-color:#297fb8;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 7d4a3e041..b1054652a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -537,13 +537,13 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#1065bd;}
+.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#05488e;}
+.navHomepageMenu:hover {background-color:#297fb8;}
 /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 051eb2a97..0bdc8a670 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -1,6 +1,6 @@
 /* 门户首页 */
 #por_header{ width:100%;   }
-.por_header_top{ width:100%; height:70px; background:#1065bd; }
+.por_header_top{ width:100%; height:70px; background:#3b94d6; }
 .por_header_con{ width:1000px; margin:0 auto; height:70px;  }
 .por_logo{ margin-top:5px;}
 .por_login li{ float:left;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 644aaee10..d9306fa0b 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -515,13 +515,13 @@ a.uploadIcon {background:url(../images/resource_icon_list.png) 8px -60px no-repe
 
 
 /*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#1065bd;}
+.navContainer {width:100%; margin:0 auto; background-color:#3b94d6;}
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#1065bd; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
 .navHomepageMenu {margin-right:20px; display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageMenu:hover {background-color:#05488e;}
+.navHomepageMenu:hover {background-color:#297fb8;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}

From 70a762220a9dcd3e393126b5b679df53613674d1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 16 Jun 2016 16:55:25 +0800
Subject: [PATCH 431/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9=E5=8F=8A=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E5=80=99=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AF=B9=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=BC=80=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb           |  4 ++++
 app/views/files/_org_subfield_list.html.erb   | 19 ++++++++++++++++++
 app/views/files/_project_file_list.html.erb   | 20 +++++++++++++++++--
 app/views/files/_project_list.html.erb        | 16 +++++++++++++++
 app/views/files/_resource_detail.html.erb     |  8 ++++----
 app/views/files/_tool_settings.html.erb       |  6 +++---
 app/views/files/_upload_project_files.erb     |  7 +++++++
 .../files/_upload_subfield_file.html.erb      |  7 +++++++
 config/routes.rb                              |  2 ++
 9 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 1c05399c4..f06725d01 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -483,6 +483,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -493,6 +494,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -600,6 +602,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -610,6 +613,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index a3337b1ce..2b0dce4fa 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -36,6 +36,25 @@
               <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
               <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></p>
             </div>
+            <div class="cl"></div>
+
+            <% if User.current.logged? && ((delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" )%>
+                <div>
+                  <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                    <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+                  </div>
+                  <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container.organization,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                </div>
+            <% else %>
+                <div class="fontGrey2 mb4">
+                  <% unless file.description.blank? %>
+                      <div class="cl"></div>
+                      <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+                  <% end %>
+                </div>
+            <% end %>
+
             <div class="cl"></div>
             <div class="tag_h">
               <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index 6dc5b6753..b8b38f7b9 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -21,8 +21,8 @@
           <%= link_to truncate(file.filename,length: 35, omission: '...'),
             download_named_attachment_path(file.id, file.filename),
             :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
-          <% if User.current.logged? %>
-              <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
+          <% if User.current.logged? || User.current.admin? %>
+              <% if ((manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file)) || User.current.admin? %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
                   <% if authority_pubilic_for_files(project, file) && delete_allowed %>
                     <span id="is_public_<%= file.id %>">
@@ -43,6 +43,22 @@
                        <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
         </div>
         <div class="cl"></div>
+        <% if User.current.admin? || ( User.current.logged? && ( (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file))) %>
+            <div>
+              <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+              </div>
+              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                        onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+            </div>
+        <% else %>
+            <div class="fontGrey2 mb4">
+              <% unless file.description.blank? %>
+                  <div class="cl"></div>
+                  <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+              <% end %>
+            </div>
+        <% end %>
         <div class="tag_h">
           <!-- container_type = 2 代表是项目里的资源 -->
           <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 831dc0e68..48fb4c86f 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -35,6 +35,22 @@
                 <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
               </div>
               <div class="cl"></div>
+              <% if User.current.admin? || (User.current.logged? && ( (is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project")) %>
+                  <div>
+                    <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                      <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+                    </div>
+                    <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                              onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                  </div>
+              <% else %>
+                  <div class="fontGrey2 mb4">
+                    <% unless file.description.blank? %>
+                        <div class="cl"></div>
+                        <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+                    <% end %>
+                  </div>
+              <% end %>
               <div class="tag_h">
                 <!-- container_type = 1 代表是课程里的资源 -->
                 <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index e7d43a9d4..8aedc3c03 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -37,7 +37,7 @@
       </div>
       <%# unless file.description.blank? %>
           <div class="cl"></div>
-          <% if User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
+          <% if User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course")) %>
             <div>
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
@@ -63,9 +63,9 @@
       <div class="homepagePostSetting">
         <ul>
           <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
-                    <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
+            <% if User.current.logged? || User.current.admin? %>
+                <% if User.current.admin? || ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) %>
+                    <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
                         <ul class="homepagePostSettiongText">
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                           <li><%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %></li>
diff --git a/app/views/files/_tool_settings.html.erb b/app/views/files/_tool_settings.html.erb
index 41d74b7df..a0ce42eac 100644
--- a/app/views/files/_tool_settings.html.erb
+++ b/app/views/files/_tool_settings.html.erb
@@ -1,8 +1,8 @@
 <ul>
   <li class="homepagePostSettingIcon">
-    <% if User.current.logged? %>
-        <% if (is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file) %>
-            <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project" %>
+    <% if User.current.admin? || (User.current.logged? ) %>
+        <% if User.current.admin? || ((is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file)) %>
+            <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project") %>
                 <ul class="homepagePostSettiongText">
                   <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>
                   <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
diff --git a/app/views/files/_upload_project_files.erb b/app/views/files/_upload_project_files.erb
index ed68e3b2d..478297af5 100644
--- a/app/views/files/_upload_project_files.erb
+++ b/app/views/files/_upload_project_files.erb
@@ -22,6 +22,13 @@
             <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => project} %>
           </div>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">文件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
+            </div>
+            <div class="cl"></div>
+          </div>
 
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index 3f8f1359a..8dcfe2dd5 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -16,6 +16,13 @@
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_subfield_upload_attachment_list', :locals => {:container => org_subfield}%>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">文件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
+            </div>
+            <div class="cl"></div>
+          </div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index a778a8016..10c3cb870 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -130,6 +130,7 @@ RedmineApp::Application.routes.draw do
       end
       member do
         match "quote_resource_show_org_subfield", :via => [:get]
+        get "update_file_description"
       end
     end
 
@@ -779,6 +780,7 @@ RedmineApp::Application.routes.draw do
       member do
         match "quote_resource_show", :via => [:get]
         get "file_hidden"
+        get "update_file_description"
       end
     end
 

From 28ee609eedb07df4166ce11500eeffa691754c30 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 16 Jun 2016 16:58:59 +0800
Subject: [PATCH 432/668] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=9A=84=E7=BB=9F=E8=AE=A1=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb                | 7 +++++++
 app/views/exercise/_exercise_student_result.html.erb | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 19bc520d4..c3f356a5d 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -63,4 +63,11 @@
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
+    <% if exercise.show_result == 1 %>
+        <% if exercise.end_time <= Time.now %>
+            <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
+        <% else %>
+            <li class="pollsbtn fr mr10 pollsbtn_grey" title="截止时间未到，暂不能查看统计结果">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index d8b4f55bf..59a58901c 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -22,7 +22,9 @@
     </div>
     <div>
         <div class="fl mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
-        <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+        <% if User.current.admin? || User.current.allowed_to?(:as_teacher,exercise.course) || (exercise.exercise_status == 3 && exercise.show_result == 1) %>
+            <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+        <% end %>
     </div>
     <div class="cl"></div>
     <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>

From 260bef0ebb921d94f1e9727055d840483b833b7d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 17:01:51 +0800
Subject: [PATCH 433/668] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=A5=96=E5=86=8C?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b1054652a..e329760b9 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -751,8 +751,8 @@ a:hover .gz_btn{color:#ff5722;}
 #signUpBox {display:none;}
 #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginSignButton:hover {background-color:#05488e;}
-#loginInButton:hover {background-color:#05488e;}
+#loginSignButton:hover {background-color:#297fb8;}
+#loginInButton:hover {background-color:#297fb8;}
 .loginContentContainer {width:100%; background-color:#269ac9; margin-top:1px; height:580px;}
 .loginContent {width:1000px; margin:0px auto;}
 .loginLeft {width:595px; float:left;}

From 227f2343a47830d33508f64e6ac834bbaaa62041 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 17:14:13 +0800
Subject: [PATCH 434/668] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/login/bg_login.jpg    | Bin 34003 -> 29922 bytes
 public/images/login/bg_register.jpg | Bin 37083 -> 32699 bytes
 public/images/nav_icon.png          | Bin 18065 -> 17834 bytes
 public/stylesheets/new_user.css     |   4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/images/login/bg_login.jpg b/public/images/login/bg_login.jpg
index c56af093d59b92d6c229e9cd43b193b70081471d..274dcb6f69127b6d59fa5e58ada26167470ada04 100644
GIT binary patch
literal 29922
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
Ng8Wqnp837uzW}>-sM7!d

literal 34003
zcmd?RcOaJE|1f^pQbLFjqO!90RvA(Dii{*=-MH<oA)7LiEwXMQnK$8`nVlrr*?aH(
zoa<J--`~&k{(YbC^Zfg}uI_W4>s)8N&N;9BIy(MwJPJ|ExmlV+kfI_xL<s$T9WOv+
zvd*T~?hqD)3yLKm=y(*z^^ud4y%;w)!ja45q1^*BE>k;OZZ{KqZeA`PZb(Af&ECY+
z+RTaZftiIRLXv5@vWAJ#@}VS?uAnlHvi(i7N0zrdkY<`5Dq5x<)~2ElnWUu{CEUc^
zZ0&8$oJ<(qY;6#ZVs4U5n9jvO9xmo)V#HK&vX*4J4v)%sS6PkmrXA9ZQIJcB)09U@
zm{C}ii&s!sSU~t1BOed1AU6*`H$M+2AHSFYkC*@-<FAVejD~z@E~X(X|7$GpCdu?`
zQm(G9T(10Fc1R0uUQtm|ZXP~vK0Z!RgVWI+;bh{*iEw28-Gi)|qbbtT-pSGq!3g(g
z^1#m7Ns<XbdNKuDdu8Q69slcU+1kSM!qj$j(lGlQjDM}|sO4^N#;sxIXy=SHH3QX|
ze>Vne_umf$R|L?AsUj`GrkL2s+L=1rnjxGNWhI%w7p{kv55;7KZi@1Y^2v%^=er>%
z#LIhKK!o?k4bkg21$lWz`T6C3_wjFS<*y6z^4z@6$Io|DfR|TJNK}}g@5W7jIU#V#
z^6>m=tB7!PGC`P{{T|m6jQguC?|<7?>?YF8#K{h+WoKve8w1oH**V!cKC-iCym=F|
z<BY7jmWYRTu8wT*7M;vk)(mOsV)jrTX=lrbSz|HFe}UnFsJWSt0FNmr?*sk^oV<Jj
zqMRlVh50%8d4>6Tghcs-%>)IQezkx2|FU-603dD{N&bN}zl#7S!r4D00ABtOkr@I|
z4ib>a@e*_vgZR+HzW^y>9S=ayAbeb0Ts&NSJUskU_~3V%5FelL^cf<e(?mpPNY7v{
z(lcjCNJ-9~At$GxASb7zrKP1~_;X<q5D*ZbA*LoJrKX`Iqon!s;eVPr{tF@_#3sg>
z!NDSfu*tA+$gqy<p|21Y78Zm9C%-Q&Y#e+7Ts%U!3>$p;T@Ge~hmVbeOF&2pVPoN7
zW8t1Udm5e=0r-MVhJ$+!5C0PHbpmyhml}~@$)l(o9>3`tW#U5?X;EsQ7b?8*B<(}3
z=2HqMolngC>Cu7@ZaQ8bGwl{wsjHWheO7$ssxToL7U&5Zm+%Z84mLgxJTd@=3|IZ-
zIXuwwV-0eCiWL)wH-(?NZXg9H@j>UB=O08euYUMCcGJ|6>PcGd<>P+n3}^}9A%mo$
znWiuOJbzE%|DQRvf15VxzZL%9ml0u_sNq5X@voRj4G)_FOC|$SyCegi|M4#a^9@cY
zh@!D%{7;%=M-%?t%`aH~Ddhf-;8B1Y*q}cO!c>4dV9*<<F(VV50FnC#jJJ4Dg^VTE
zTl^O^|9G4N#eV|;@|R?CKwn@cm_FfzRqgQ&e+(Sw{8+L5zzqiaKfs0e>pPL!X)seL
zm57uTFO>+7mFyArV<oId*nR?!o&3Jy+@iWg%xK6cfXT`bLjuqjye~K>ng4u{pA_T5
z-{BUxpgG7q#xy3sMFf4t_EUmVZ@`HL0Q50{76NMmF{(i_FgSj2@~;;W#3}=+VHOaq
z9+ncWJ{}A%45vPndIF;%4Cf1wLIVEahvoDeRPX{}V1_em_XV)vRN^(sRd@o*peE)s
z26~YFN`?Vl{nrG@!4v?z094#mBFqyr3CK??6+0Ec3Sb8p?!T`$EA$4!k^|U6!I*ji
zFJ9_-Kaj&DRJSN)pJe;PaG%`T5Z4oYKQ7Fj2~rxU0&?f!j>1aC2l+?89}|DY!!M^m
zDGT^^DwXNi+tnvQZ%+aAx%%s-k%_-?^#ujCNVGDe0_hb<?UW1zPXkv8j}_=+OfY6b
z5Gkt+c>5Q8!7RG^4G4M*LHc-V6xfd+!I0}iZ{UaFCEZ&z>NrY_+NA73c<R{MkF{=;
zq@GSCO2q>xA_IQ#jU%HCFFoPuHz!;0XQ{!u<6_nxUVU6}tJ6X8GVwAZkHLOCQ)ZO+
z3%_y!gF@uD;9C}KfqXD#4va*ABLh5_0azo0Cj+J+lZuU{hEXx$3H`Z#Pk@jW!lNY9
z@l%7Wz~bK`R(tXm?-tPu?OVi`!Q18Q8aP@+C`L<0t``Dn*PR|~$)GOjf5ihgjv}0b
z=N}?~Q5>cP7%ecEjSIu5C<{_>J79}EGpomJL1gGGw#Z{TnP|dR86_+l)-Ws@Y&F6!
z=lqm#l_-?3z&4QL0fhIH@grp=!}gZ}Kr2B+q+n`{f8d8RFfV%pr9FeNZb3xsOepNf
zGO22uP%&dMQ8A7pmInM|{3>I~n0FZu?8appcqcMQQEB+aFfCwiZBnimxo=Mc%;1WI
znG1%?z)%7{gAEu?8u*=h%LL~$umm0_F#>cs7dQr{V~HbngGQz`kgPtP6N?UHWK+pf
zndQh*`DLy^(bxiH@qi@!FQh_O;JHAL0Rzug1Ne>$$^F|*)cj7+36CN;n+Q)v%P&>S
zFNgFIM`WYqLCBY)2ZIGh<=<@kpCF?Xrj$5hJ}9e`g}#$*8zs3lI-D*NB{qn34f(!h
zquZLfTvMYO7$54(uDwWYGkjQNe$}DrtP$(?=E-g4mYp3*uKCA3#ySZ|<9Y>V=L+;t
zYh<W(zs^BqR(|_U;q7*c4vG%xGahpm*A8n`uUV&<ZgJXt#0xL(8+|95(Y7@3Y-GC8
z{M_^i)m1m9nx(of5@+$qL8N9*Zh|U~kv_t{gF^E#Dc8X_fiN<nnyZOU`*3IPRbH!=
zJKMK|kHdL;9|p<Q8fr=neb=uU#Bi*dFEy>-sn%UaSv<*ky_0@K6}&yLp-N$uVx41`
zB)3$W*UEgqy`)0Vp!$YZiRU+!{BxUw%9U5Pi4(fQC06Us2$?z#rf;n5W=!i<`XKP{
ztUB5lG&Yycit9cYy)w@)D(9eOdT0EMvX(Ocv&M6y>Y^gWFJRidq%BL#`odC{C=EYa
zrs4)F5HOrsY;a?pV8ee18klnco&h5Twk2ygj0U7vU%-ff!v(T@W9k6q0fG~b;p>CX
zW~t0FW~o6kAWaJb_|PgN|Abjai9+5l8XHO_C4>mcupj@z2Y|+;*#AUqRtW0`gdI$Z
zod!}lEj;WmL@y|aUeMfn;_pIF{4;4jc$;BVXveY$5y8P_xht;j9ox;)McKKKZ15cs
zA~3EiAbG*2MAxb|$<B3jiEcFcY}1;!a!eFjFpC*k5tZQ0&b_L8z`Hr;RpWCw1k8_`
zcIiXY0V(>clP`uS20|@X59oF;=v^T1^%zf>Dd5{AOEq_NwbL#^=AiUiIJ@tdkd8?#
z-G?AV&wQzQmKEZhA={V5BA-faTXp_BJBe1A?4ehhD@+z7ZU??EJ9yNhsL^4=M*C`D
zR%7PiVl-kPcBy}{hhivE!YgW3Azz|R-ql$hDN^;ZlXl#vz*XgZvu4y0hxNzVuq3?C
zds^l-=e0Idu5TK=@(FE_V92ct$~0fo)=OsS&gl83>iPL=AdNaB;89>d{k6{#vjQen
zA%kMHzC{e!Fpz(jVHx;KWD|ppJCR<1FTt$p4|jq$7BJXocrVFfNtpp%pZSs|@;H_>
zv>5l%nPT-<ei&{=*a}D--dsjN?`ff5AW}ly`+(U7LXZ|LIk52v@gVT>_mv8f$>32i
z;>p6CR-2KP5=)JO2tShXjWPPu0b99))V76nt-iD8LCB(xP#(*27WaZ7_lxzZB7wd%
zt5_eS23_mEfDI`ruD-f`!>SOofXK!VIX>Itg9$qt(Xry*+}{lX8hs}ApI7#@SFntw
z97DWgUq@VhZX`H05j>A=vkc9~0E4wPK2qOYk1kny^<91-vRH+DQoZ09qAwE@GOVky
zZq=pek&cS=kbWK;AR3jq$p2~Q<GlzG4rc#tU&e&WvI!kGQIgg4?hBf$=|)DgTW#S;
z?yd-Kj_Vy}=IwWpNU^b?MfYEn^;8LL$1lptk30=13d3PBOcfB=FD>qb&Hkb(tha<?
zu$W+tzrh@M0Z0oVAiz@BpD70t&#e9o5E;?nQU1&<6%ZTv2DTvZ%Y{dTUGn<a0{Hrb
zVL)&^O2YzT1Cn8sg&=kcKvY=R&wwxlT=)0Iip>g33{o{bN>Vixo{Sp1jGDkpJfg2M
zzH;^i#Q9{Sv`F+t@$U;U3$KnS%Qc7Z9Yh~o?TkAdt)6<_m*!^iMAF%l_SNKPo9@tE
ziyo5lT}=z<K%$zhC@jXMt|>7oM+D6#A0F^!jp2UBg9a*(#pDmKbBV*RnbJpTwtIJ<
z&+oCzZ8Fb^=t+-j*s5)6w-}Y(Jci~yYJ8-Njw}?`iF~bmD_5j`+}(Y5z#4IAr@P#=
z<=f`VleLw#UxTyg9}(YK8+Z(T-}E`~wK!<{@9Sf&h6VdBf+2i=4Pd(KFI^%%v?G3M
z{rnVGJ9_cFNO}NL=-$Q=`=D1o-mDMj=K{~xA2Z&W-UN%pn*yD>T1P38Vxnkj$;HT!
z=v{Aatf~l?hWS_A*J~GZL=2uzI7A!L_@qmfQOY**bY)&;IVE>4{rB$QKn20f_1A5Q
zJxf$^i$+Eb#svyk+n0fPs#=;Qp(VE3Z{>_Rko*?d_1VAiAPGp^P_XaygkPuuUPPOK
zjJ!S$Ck4QSFXtX#fQgd^hZBniM*tuJ4QuEr8AeiI?m~|tEHxPQ2`LyU|DiglVcmcg
zPwW>Eg$BnhZ0yHx@nkHSh+gPK;*>fY))kJpb>p00a31>+)zYFGBktn8$zY|~O*NOy
zIqsWV#82n=DR2IB-#k}6(xGbHrNv#emqovpTUPSczSs2h;%dVDI;Hkf6RtaR9aY!b
z*4CpyFLT~utS@D;%H5pD&=miM&gkxGhMnwV$VN)B%ExNCNjGE9WrsXC|6bVV``^ix
z)O|F1*{yO{!*_>WnC$!4RSQj>rmpe^d#x^7FOZx+s5=-i5|zq{opsOpQFE(p1C&es
zwQAQU-Ci;tfil}OvfN_$UF=}j=KH@DJMT6$bZ{pNhHUCGORkDEUUO<BfBKcAjidxZ
zjy=51aCK;A{ZmhV%dBBtcT`(@Nbz8Vi*HZuB&}AP#CG0cB(;G`(SrQz{frWC!S+e!
zWrVBuLY3q4KmtG2wWg3R3Dp$4+u~FX-Lp>4<kuRD(<n2}VVD8Tl&Nl=f2{KiX34-h
zxtMT&ZauIpkYlyDkf*<3Rh06HbrE&9R+YYHshcBhV^97WhZOQYQ)c8eg~{1ZXV3g3
zE{j4AEm;^FY^_GB6)0_^eBYYb+3jvWVD9+AH)3Ou`}~17L&(c}b7}P3GaqwPR_9ZW
zihZ%hllEOz<1bL}t2U@^Yqgac<vQvlxbkhyN<SHhj`4KXRT=QyD<7}*DqL_f+SkYq
zC+v~xZ76rvjpaDk^271nQYjVJvu|7;iA&tQk6O*P+bfPCU4mq4x{j$zgtz7=uGpA>
zs30G=U7f542NzkaCJY`{X|+`eHmHZH@YMI*=@z+T!bL-ucw#PL`vEERm=!hx$rWM6
z0dvDb=Yj)k_$3VYi-mQHS5Nr9T!1wUv-)(9q=uG1eih93g$y9Rygn;XD*W1^FkG|L
zOR|qn$uMI>*gTA+*`(NSWEg=?5eyih%rCyj3gM~&q=yw{HcB9V0LH_*F;O=0Wr9Ly
zyk~iOBik-jhq*ed3$5c;iM=j7g2oj^lG;J9Co*%UCoIY+^H5V>FP5@uX@5XxpMFFw
z#aS0Q9O3*Emlb~Da^IqJRDEgQjiHZcTnXjmIcqodm6FcP=Q{Ss#r3D~kI3&=k&zYB
zyHv3_sJ8KbJbl#HH1oYea|*e)xb)1uQ*lsp{fr&<F;prQW}P8rI$u^nHZA$P?vFje
z{OH|?{NWjeq_4wS`5KuyqDop*?-G3b&2vJT@$pfGaj{urKm4cJ+jS&Xm9-9zA@sJS
zXm&g*moWU+_`#*kgZACB00LS)>fk|VxzY+N$Kip9O7$|?Ma|X-x~s;5Wg@Dy(}L4^
zyONd<-c=I~tXtlD?M|;;UC(ksZl5=3i{V3&xQk`b%;;g!rztD(qh9WauWNGTp4LG1
z$RK5x0g~?}<s*za2pi#6=ckbl&zPn~OQ;*!^U6L)-ii{rCeMAVZ^zhT)JFVX7U`#l
zOJ(QZ8CJf`mI}Di)<0|a(n&kMV{Q0ok<KXPQ}I$*gLYq|X&-%`kI#04c=fVS!H|8^
zfq}Ji=()x1Ve~s)7gYJck?ti#o6p^Yes|*+&Q+<9=*oH#PXWhHY?k@lR3feFH}B}X
zDAS-`WRGAYr997~PMKkB@akykDsg#VXJ(>dOTW5D1^I$*;fnF2mI>Dw7t~6ve&*J`
zPkc^)`g4iZ#ef@QDl~&a#I<+htO|Yh8g>p&zgQ?(G{m2M)z<Bigff<HGn*^XId_1%
zxb(!I2)06hI|qPe2c^RLRCc@!(2Zdw*+3@zio5}^nqc(40uoMKAl-}ApZkU3nxygp
zp$<4YK>uIT9UFt>u$4#(UAPZ8J0r~5abctIw_^;pXj$JtgirjiAK%CZN*2v6qCkNc
z+Q9x3dPz{e$&E)}P-dMwdRz3<Uhq%~^_S|M+|!g^0>@BQiFXylQp(N36gu0Vkl5L^
z+zNB9_GTY|-9P_u>fhKsQn>fEZ(+Q@cxCPFVl6LHX^2*lOV!78ez4a(C(+V^bGcRh
zjy$EPB*(%CZ|l;%)edR7%FI~l{Jt*rS!46vaAV|1xKxO%GE1+`O!h`WkyjHp+OCNK
zREnA}b<$cp2=%8nsuBCDkr-_(T^(iVdDU1tDT^&Oer`OlR>HA)^iAN9c<H+%1gB<$
z);ND!vfj$1cY-wK5*cF4v}ZX%cXZjj!kB5olHqh^bUa7!LR*)Co1=$>YNgT8hBmdr
z`5@P@T%Yh+f3_Rym3VTKrl03K6&2nj^;NBUOc~`0=Nt?&B&eR1QgQ1cMr<vG2s4>J
zt=}VdZ~oLssyR1;v^z4KSCMk*KQx`Kd7!=PyW4a0!#d$e`tmOG*VP#E*+oHMc;mqW
z^}HYKQ#f&p5TveL?G7qlbag9oe4a&9XY=70qVekQMeS0V#>5}(cG@)7JMPn-A0I06
zC{H2m=587+yH?f2H)W)?IaGf5u!5QL%gbzStsarq*{y5cR<ARYS-qO59>M(0^<w5`
zI7c7Cerxi|f%9whB3ffdvB6QeTP3;8`zB|lV~>78-E*3NLE6mtoPkUcmUgLT_k5iz
z2X_+6`$+9;%n?JMrGn(T651&n)XC{Ic6+qi`Jb)UJr7{PI1QDcH?qK?2D^t~9TRX`
z8MFE{0kT(qVOa1l7Ned3wG`h#iRTN9)xhctg}-Am#Xvc&laU8}8)&PrqDlc+wHhI|
z-$Oz*CP?ND@RI#QL%{<MF$mx>8}N=XWz)z&umgh~uxj`z@RFc(lf~WOXVo&97l$7E
zx?xVO^qzd!c3uvu!I&V;!R8pU)2$2G^f2j*2o+|8E)uvGe2t5qUW?4KKcp;|y3usR
zE<Hf<a@jb(a<ymH17Ccu%CuiM<4M7zh-l@txwO1H-p&>-S;VC-L!uX7H<?mh%}04I
zoSm(+6F)?FULctfbk-cX?<zm+y4M~Wut8Iiv;1B>9egxzytzj&jW#@D7P`9?zowRm
zHf`@XhU6uZx^?y=JT|w5n0&8PlW-ao%>mK*Me57o%jiO3_J}pZ(KXGbrhNBeeh*<5
zj=OiedR*q!LaD@UySNR$Th89LMP&yzy1kjLyxL=JJ&^a{UV5}PqTNTZX(eOPCCr!K
z_gw+KihS<t8e!}BjO}FCn^WV~!JWE#yuL>)OoOKLDtyP#WQxZA`R^36J98;Q#1_6i
zyXF$fy%Cqa*|G&*QUVtj_S;|VS|(LHl|iSsY;aKcnhmWn$<+nhtRLTIM)EqGhtL$7
zf~uEA2hyxjY~i}z<AbegtxbIn-c$5_Ry?6pLS>XY%yL6go{5!$y|sJQV=WDp_w>C<
z=iM|N26?ihdZNs^K7I_J(3B`_qSrB>FqJbtvq%4?el>V-g*9?&<`@d2CP7;qLvux=
z%QrPYtM1INOt=`c*i{+UBi`xo9SpTT-%6_EW?*5eH*9m)jnl9Sf0<&&(&F4>6_;o>
zSD1uG#AU|)Oc8#$r_}Q{`wc}bpCa9gyUW`(m;IhWxxX5X?7oLFSNxP`yTU<5o3@~=
zxspuROD7aoSBF3!Wp9WjpEX;!)+*|9k*hC0k-^qUs#{{CgFJ-WWl;A{w}i%_QPIjZ
zRSp90My<jMJr&<g##m|FhKzaI>Zvx{fp{m6D{F@9uM%9nx+en^-o!ol?Ggrb1N_>s
zV-H9Kn1Id{<ECDC1Y`lMz_bQZJFvr~ai;t+AS4Xc$WenjfPCuYVC9|+$OMe8f8joG
zqR5dF{?!g)QIi7V!BR^l{ihJX_5%WeRR#+WQoqHj4QxB$oV<Kp4Jh`CSj9jV(5HVB
znmp~fG+sOya|vy#!%-y8x#mW7xs7D-!lO#lfF`=0o4n|yg~8X|a~{N>l?EqIu`6*l
z<o8cVVIhOkax&e<?7gvBs2k1_VSRB0`aJIz*X<RCv@(LvcaNb4g?*DX$@z6%AF(Pf
zu$w(Dov!pfeP$Cm2G1UTU31FSUM3;-oSV4Q*e>O3Ehs-)B2d4mJ+&n&NwF{@(R>VX
z*NYq?r{z<mOIl~nS7^Ieg{L%nNd^@n?(V$q<uVK#;9AIVRo47IE|($Oia40mosB~=
z@w}pSpU7$LA-mHyPM2R6_wqnWyd2GSd$@no!)#aj`E%(d&gr3dHr>(_1y3aOE$U+8
z_irLy2fz0?9B~*3x=lwW`xsM5ow+OD5a8jph~(<MvDq2bE7CzyUMY>WuvY0ZwfX{`
z@SNQ{*|PKd4o9y9ZR1g!%}tUjeuj<lq@gx`BCMS%TeElGS&#a<w-;NlZg>)N@-Cr2
z@B8-0iIzOzoycTPb~DScYaP&*bz9xM*%m3(i1pSl2MdMu2=5JuQs4ng;Jly9QmzBD
zZ-~vHRZX2f+S#MHYi~;2qt`!fwM}xrG!fAh%pf%%b1kov`>IO*W?$!bq>}*6^o2O@
zr`+-l6_#D3qxHv-{ih?Vrk46~I)_P@-aYmms}0GP%|yMHGSdr6(eKc+`bXr<j@$@z
zV|Gw7w{gb$o;6A&qj}PH`}30hqq7`&fH#rdEXLP#HXdP=SkIH*_O9IZtjQv;i$7HB
zcO@}1ZlDix>TYYVl$xmto2wn1Y?Z8JyTTPOs*y64KtGE1ce4zNxHo+aIqL<YESjaV
zlD`bZs{;oh9Hu%YLxBxHncy5od&l@J06AbN0O&xlC@BWsCmui#>BK<i`8$Krh;V^i
z0pbLs8ZiS47#O;+I^-|&1dqrM`1;=fH4B!AL=YAQ1pLVwz<~(xA9xS_zA^%9gF_MP
zZJ-eFBywzuIJ#ARSblvkFIjKQFszBP870vjF)3H<G*Uvv8gCIZU_Q}hpiLJslh?iD
z75HOt^>V(+^u4eFM}tlc)jor)+UlvHb@QWPI!cEF^`^z|dt5gTbQK7mN#W>w`iY%i
zJ(`a_hSZNClRXam1OJEvE#Fdx%fmH-uH(61cMS&?0fD%7DEnGQ&CPa^&>0ronU}~o
zh6aY#qgI1@)YAmH4UOWykE6wW-I2&BrI_f%Bypm=#I)C0L5)_Ze9?x!t)p`T+a0uZ
z)no6blqO0ZYM16UE=1{DD`-U|A2wL$we>_?rFKgv=sx<^(Q%KH+Ck-8n`NTC5B>C~
zgm1zeBH;r^XD53JCs7(f+Rcq65mi$KirK~`LTvG<F*~8{3{-Y})l4{xXG3FANQ51I
zn^S)YC80ub46)9nqoJnOYAcSRqgGod9a`lqcbP@~5i=i`@u>dxHtkf}l)N$WVP)e3
z-a~<vPL$~6bi3h?^d@fhaobfpFU6QR0)t02%wfln$_SHh^gOr0euq+%wiVmtq}RHz
z=Q}k2=L3O=du=&@NHDPsEE!G+gd!<$DmUd=n}U|JI<MUh@~GArII5$pW<F3~^~i`E
z@_xH38Bvd>y3oQm9b&nc{bl4qP$TW%B%wg(u5=8^850`?pof%OBl}}*<6Jwb)nj}=
z$#_E!h8jK1wu&xyFDN-14>tY4=@jcehFk|~Vk`F?Bt#2(h_mdsv=7v0VwEM@28tDi
zo$pmx9Yb+3#Pr1rJMTIXBFE4*$2}V9p{S;nru}3Oge@V6bYS~|$Rx%N01=&N*hQy)
z!v6tV$Jak$`yj(w7l_gKp9cf=Ngsz8aQjdJxLC#{6~=cAt$dcfZx#(G$xj{^n}QI8
zhO|In4i5|h5dRnB$7W20&09(=nQY+k4HS3+T>ZC*-(D|%Qu>1S*3({(l(9-tk*HD5
zmPy*Y_WX$ohT53?<?4w1O8lH{u9+-eD+^VIV0ZSdqWuI(0hRi7&x>`;^h=Vn`V~1M
z)yB3A=h`OciwwF9OtgeOID*ru9g@zfBvjanCk-`So&0FoLS8=jFh{;JYiOHmzga!9
zNLe?pL2DrM>ecK<7J@d{R|{=DacFI!`PcE&QH{Gk&xWck9oM~!u52CzEcYMnxK&5R
zAEGu%%!VTEc5X*}>t2i~n2`4A-L5@k5!`p4^Kx~O+?qhG<aar8doCt9)~xX#Lq@&Z
zbsvOv%%x|0bM_=I(Z64D?bDBq3Lw66QHL*k>h0X*gn*=CZ_M0wHTtc0UG;}=gYnrY
zt~;a8+s2z)CBiz9llk4|@m4`uXWR}xEbH10RvfNR%oq}MI=b(dO|Prshs%FbCQ~IR
z2x~VvHJE6EJ1HtA$Mvd1XR*gnU70tu<xagk-}tz4vn?%Msn@+AglN|>R9;?lZeYTC
zt(s`FZ*#d+Si)>3DEGPBbd%I)tI7fKl3ml-uAPt1U9u1ea;-?=>_q*Kjf5}NQKUc`
zoP@5i{jg-jsdRT&YscCyw0|9%6+d@4=MXWiwrY3UQ^#u6e$Hb}aA7D+wJ4a!==?F1
z@E|%O#xbA)y*$3aKfP^Po8#?!$@N{)ot-L@&cEqkK3rt2O8Y3dnx=}xIVronr?g7m
zY(&Ch$8G!T(&H9<7At;d+XD5+DWl^fw<`#eoU@LW%Y3<AH^$r?jZw5JqYJq^>0Mm$
z?r~-2V`UqzShnJh6IBTg69$H28puPp1eMXEx{@?W?ga1l*ZpW-8sLsfrM;;MkQDHK
z2pb%8fPSk&WU$8?*tD>gga7Eaw}+F$q@I}*>p4dKVJ60U4lD<G8bB4mE<SPl0LSNF
zq0Ef(>QE>ge7K~>h<5|Hy+O2^9rpNO$(#fnfF1D`n7>$nAm09i82tLL-@EnH63_82
z+NJ%6QHd~O5zRJ`cuylVZ7$wAF71wN<GDf+6`pM_qH!CpYjtI12+eS5QoS(FK_~Uk
zw=;YjMihDt{ZqZ0w|ayv`?I2go!qh-Mko8rbT*sTdYWbrjB}#Gd}-#(Jh=D_8!K6N
z<t;dn4W5*Z=lUO^f$!lYcm!eP>f{@i=M97;PPS9H=oe|Xq{TDSWU!-{cw>9e2sa7-
zko@tm!{G&AbYVwo%J}V)9S@SXhm~6+y1Vm-9!_rQP2(#`zHZB`z%G_35Nd7t+}4ba
ziV{X1_M#lUukGPc$nidN5DZ4eXI&WgahWs|w;G!cN#DFMWaVb>G#IWs_13jQ=dq5T
zK9&rYj2ei;ohMIZx$vpHgHxp0F%zwMxse0-MMeB?28y_n1o1|?E?&PoXhQE+(yj6>
z#UWjG*j=&Apy@eD`XTxwQ-uplY<J6?(A75y0YYEZn~ScFFr}5p1p|C5?N6s+kC@H<
zvL#&qTF`go$NKxNwk$mweQu|Mbe$ZjulJ9Jo00-bRXzw5IKm~!dt;n=jVkU!rmU#9
z`Ja0Gxb<iZEZ7{uCx^qgpAM@cBuQ+N9&%$U|7kAv`D;~2b(ns}mx}t%qPU9tD&Iy0
zX{pH9keV45^d9tg+SU1qLy-Nb5bbethIq+y2TSMsSSpvc-U$M;kzkU~?8_Uf_FaP}
zLzEEe(_H6NT01&7HVVXy_r0Gl*9^MQxVeSwcv(3LQZ2u&(sOjlw%f1a?$Hl*oAzIm
z*gX0$F%xi4vXdItKwwM<kxpPRgZK-GhZBN`I0&J^1~Y6FrvvAXU)@Qji4{0C0pmYG
zalrU#0KW$k0OJh8dcoJFPJQ9N3?tcNaF8LJ^u%5UA#~X9qlT-NN+!cZ1f{*yBJxWG
zK24lkPj7Jmo{taoo$CfcqzG2x20Wx3siS^Ut1B~dFp&j6<5WWz*j(jvrj$XS=IA)T
z51N_N`cm|}3+Y}KCS)IsKuqY??sQEq^6L-RAo|-hpUJ9*^htyc-}da09o4C^{`lil
z-JruU6w>F&IW;b|bz5Ums%}w?L137{a=3)QXJseriSw#zT=C>~3}vHKK)WZ^)w+xU
zjR4y$mDxPw7Q+(h<hZO>5^rI)++YKRq&6IvcSaSnR)d-QWXeZ4rQeMvn`?v33oeWF
z7%0$H?<{;Ru^j2FI&;Tutwl3Zb>+(sK4}}{O5U<vQw6$@u0<Q_bR-Q!Zu2<!gM}`q
zJ(j8!rwt5JB2%Obn){`KDyoM{V#BXV@=vCi8n!R%6>L<<?QgHysT}S{R(g!TTT<*P
zn@hMN&;V$Kr$?J#q?L`5LF(t%hDdMDD?>Sbc44*EER$**V(=jmeOROesauQ#{Dc&T
zrxL{VZnrGDhsYad=F090X7m@Z&ni5Xjtco^?~}dqY4P*aRJ+@nn|+OHh=_{F3%zpH
zov?(fQAHjkI$;Jm!ao-H<=V`qf@+PmhwgpnmbE|fy`6h_F=Aj#GQG9vOs`w^o;X9<
zg6B>1v#aVGF4A^Cww||L97~^B@EIvwBz`U4pwRW>u*S5Xmd7<X1<_eJ($*d>M2t45
za*QgDz4LbOoM@Nbg<5*A4g_nu6}t9Pzgvh?-Kck(Cw`xU!4RJ=5LA;2$)^gQq};TA
z$>rbL(VpeBwCt15t@?8}^I&-0B?rXXZf$|`q+AS6!v~!}20mH_&>KGb1VUFbfxq08
zuwovJ(a?#pf|vl3H=Zc+CaFAK@-)B;Wb(@|gfVP^FQ{4eK5zzspyiFnq(uHQ5b$gI
zX@LjUjc0!!007Z4SbzVb^IMxKqX6hVaf>68^=Tvqzb{|k{Apove?)iX1DC0hK`*Cb
zt>KSi`}`q6dBAU{<s9#flRqtAtU@?EzpTY=P?Ut%e0W&ntr})q*T>uIsvKXQX4<?{
z^?f_3-)+aZ&@Ny3_R;i%LKj0WVS%F<^y`5Xo4Y8t2XSlN=Qg{m=fhRSk@L^L8V}l>
zw{3k>i86jNs3PE95Sta5Y<0<M#JQ8@7_yk2+C(>qlG!)v@T7lPyw`JOe$dhA)5{X{
zLU*Q@ges@!*F}T7H{VUzdFGpIAss*DPb&L-RZ(Q=i1Z5iF1hg|?RD+zK)1OnZOt&v
zkPTY{|IcindiYVM1U4#MvJPiuQM+UcQ|88N+Z3E@jS}BxExaj4&&JO+#QI038(*EB
z*DXg5Jo^z#d{%`WJ}E>5<SqoAZK@r#O!%NnvvA(1*QHwboL3H;W4TW8V!pW>e;g6F
zyo9#pRu%frri;bXkh-8gV-ovi((4l|!w+pnthKiG2g9V|x%9ZrT-t97S8|j|@CLl8
zS^`Kko6l3Q?%^y=BJRI^z$WNRv=p<mVx%EO!5-?Yg9?{#u$DBRrc|HtdH6=8iZ3Lz
zl2|>-PV3I?*~b1diOg3*SLWNdUql&x3s;xzq!630K}7UuDTu!}u|IEM>r44@;@$wy
zc&o6eTu0InN3T!eY)Mo;`cqK5U8~Oc+RE;mh6;!3-r_M;+tJ(l254@CrqPjMd2h^K
zLBbnaAqB?<3BkFoV%y0Yjw%WA9rsIJETSFA#ED5!p-DEe(h&~ZB5AUx#&HdisbGn~
zg|Sk>Qwe6`Af!Zy`-tgp?rj2dZ&*8lIX2KvV2+K^PC^BM`@Z!$?7UHbg@5;g8PM4M
za2P=_icyA88${#%2;ayO0`@@!VLt;W=UBC|Q^9G7xA-sdU+4e@ow$M2mN5@bM46tT
znF3EzVG4rF>Xe`1?{DRR3-kqDY5rjG{3(&5(0Zl%pL?$+U&IO+BO(SwoYkhk-wt0=
zp8psX%i@71YhepiM44^bx}<07GSucrI}ar*h}-XX#9FVra;S%WZbyn{8EaqM%6i<5
z6fwTkKM&4&o}Bx`Zsd!4t7-Qhtr%REc^D_}6oY2D+ZrRVf9G}m>pRk}cH>JNwMsl4
zG4s}|+!?OxZ%aH`BBz#%j4K189?zvqx+ELg^+eqBx|6P8aZdHa;$T6c1HJp;R&meN
zmiV}bK^HyUasv0eqiZ!()J7#?MhQASo<-js)1CFg6_Z_w%EJ04KYd>>lWelDoODDY
z9;&_>jEa#|TK8zG7(zV?WecSjThi7V*BaXmZ^G=@uLKJ`aZki9E?`bdxF=p`*x171
zqy!rSwu+tS3!Kq1Nfqg5t$%SMb|1fb0yxxNpoqQ?RDXqw%>y%~-)@B)tZIaQfF=1s
zZ*Z^6P-qZQs?mU``Snx*IA(4MZ`xY|CRy5GqKRO}iC~;a)?iG^VM&U-jQ^FX6y{r(
zufGMJ)>|aGr`hzPLXU7OJkQMMhZ@Y}63j@vbG~S#A+YK08KBZu>GEb5?M|;hse9S9
znY=pKK0sOf!Ki3C5I!fDv?ijA`iG`5k#f&octG;RO65#AL6?ZUgF__BYuZ5NtR_jl
zRapL~dG{Boznc7hfHR)JW`yr(Y;fif_!==zd9XY*z!s%`bXEw1%&g;&m^rbUE~`I(
z0+y&1HbUQHR_DIiGkMJF0FwBJ_tB3OqF}wQ<VOjf8tkb8e%VBR{fyZhkBDW7(}>?v
zHd9<L_M7;%I)ATGzYOv+CG3_2rs*yAR8|m`1(NmmMUq9u+o!^(pStV$2wte!0s_Is
zW)YG85alEO8If-5+tGtxcFs=!UY6hO;3wEDR)`QtCI~(s1Jo{9pMs4D*rHAg7kUCv
zAQGM>ET!PrE_vz;;ElrUF`!#{Jy~olSmpB5BE*7^Ut&(df-}ac;1Cld7ACg#52}6Y
zaQ&VP(6D@1C=Jl3-Bv;eO@$>D#dM-GJTqB522o6}gT|Y_eO}sQGB*eD$CBIC-rdAy
zI<Iui1!%HHq-F+km2BjnYE@1T(K=fizW!nr>$RVb$h+G1NKm!f`@3>QaRP5@kJRq=
z?J}Jx&}RBi8-smJ8zJWF`QGbGg=IQ1ePQ_M?aqqEA$`pUn40rfhxFlrK%-fgxvw^j
zPvJ(UC*5~~?uF*QCXl7}g6{7EKo<UdXDg&3c3e(z4y!26uYV+w(SfO;SV%*{=6KQ!
z0NrA6QUmm`7AwB%3U_f*JPD7%_m4bB5!|vS7Va>C?2T7O$B`jCIDiQBGCA~cAXo8s
zl~@dTV9fto1@s7@!t~;lfLSW{+ertNCu=2<G5o7G0BZ<zcrr)O$>Fx%$;?{}{}kJs
zSt!-}&^r3!3&On$)UErx=qxxIn_FaS<~B*JXesU}qt8zw_(~hlQQ+RZZ<?2TC&^HZ
zaqp(|w6NDiRpIyEOqKj3(r?0&E##WvhBM7l^7%@+eb<Z%?!4{Kl9eoa=D5bc<4C}L
zX|4)MVt_`Cv(W70*Ttd*yC_v@Njw5Ga{|YF(1UaTKwBUgAV%0vgbhd4e!Dt}VYa0R
z#EeKkVf_m_Tkv{TlqpmZ7gnY4sR81eT>x|mFjpPK1pe|nv4&G2!oSFF_<<vLO#X5Z
z9wUX;br^3`fl~-0Yh-BybuX&{!dr1GN}$?KL79}5Rd&vq3A<Lc&wCkgmyIupAJLyz
z;0#%dwvg|hc=k5C*Or=gvt2-0t#fIg%;iu(yFvGZQN&DVfH;)|o2NN{&G!N6@E_f5
zphS9If@LxM7}7g%X^fM+urhsQ@$9g0Wd7uPYk;S)*FV48FPks_`OcC~e{o@G<@NGr
z*6IMw!wu8Aq0JFO*S*g1R|4N6a_Q-p^LONyH+Lf7cMqP?qod_#;)g!WJCk98^r0fY
zHI<`hk0Im0BT-Xj#hIFbW6098Lj2H!5iU?jJ7PG@SejYhoOud2U`acCx)ocQ?Yg&d
z!<ViwGrh~_)Be4oZ@=r`oU1fB%v+jcP%DsSXk3`hk)*PbF0C56IY$XP7)lbP4{>1_
zFkX7INwjhO0MV(G-i2t`_dM)bB+1rIBi|WHj!{S(3fbD;&+Y%!#|BDOE`gzgd)su8
z>ZF(C7$egz^QQHX!yo&<ItE1#H*`OEO@Z@L|0px<GHPB=0InWP_ax&k9@_3NH$lB=
z=5=ovh8w;#MPGB<JlOkuoL}xHf7$Z~^A@zo&`tR9Z)M5BrN&7UJ{HANZ;S$^!}MlB
zG=@Id<=@Kek{|k51WUcq2~-`|0mD`Wq$MRx$1%i>MPzHIk(`tT&7@oGE~)PNu<rTm
zGam7u49wbh<Qa8jjA<+#+6NE9k`|USjh3F=NuLvZ^mL~^ImyV*bh@VJc^5(Eg+7{!
zdpiAxWSi{8H<P5T^;3KbgbR1q=R&L#6En~c(NeCNBgLvYVAL^}3TOAY4e8=T)2N>V
zTLIrtU8fH;dQ}Q|XM8R9npi%SEt2H)fO@Y$y_ArKL!+NI_pX(lz7Sh57}n}?kko)j
zquf>Ff%4$%>(AFM;yr`d9MoAW^=Pp|Sx|@5i5gOWE(s`IAsM<@Io3J(&_-0M<rRZq
z|LynmS&9Fk+&>ZrJ^_DXy2I8zP!xfF=r{f-8xSs1j?NbM!L9T#5Yv#q0JM%X%-7Pd
zo#A07Y-Mc)@`mg&<d4lr3691?GO3UsDG>$sGeTDE;6N0?l>}is1D(Yix?Hz^)}Csv
z(K~0(9QNR<ah}D~@`??uJR48{&ozzDIcK>au-uu-Q@E%#A7Ep)q)I7h6?@kB?DCE}
zvTcBGH4Q!K(a>tWo))e(l9tb&=00duWGLal+qR?rW8M<a607`i@%3WL=5xgLB%j8X
zY*dGRa-I(lFH7e{4-Ib%=QaFQ<5}7nAsrc4U|uQqQS=_y^lq+?u~t>~C#m57vKs&O
z#cTHhjrW8U)$Ij3bHix$h|?1yl`kMjEJEMc3E|6Yu@Sd4bXXuz0uCxwYxuAmiC7p*
zc-ldST?5seoiTCmCo0+Rdi7dz{pFEt|IeO*LJdK%ZVn$RXg#qgfg(;xXA8I`?`5*4
z%LH^U)q@yCCScxK$6AM3@-t`N^VRaT0R8T_h$l)taUBA8p*A6wI)tULVBbq*_fawV
zeQBtkae4OA;8Yocdo^EqP0ok@X{Rr*9LfP@@2Xd5*jM}7W2&b|7-wa|)G-K|QMq(G
z=I0ND(1U$qmJ8A?kp&+2xtFa=R_=wpUau<Yde!PuRAwwMA<0!|5mLA{?{o7(f1%4f
z-M44w>`FISxfbs@J7_zGY4WY<)}X>qYiZtbbEnfB_qiN}Y7X^O8md_g5!rP5*j>HO
zzwDm=V<=f-j22OZMyxHU^c%l<3-o{a!?q?m;J4>-FrTnjIZ70HYFa{DG~M2)&&AS*
z43As$DEKCxXIyEwp)I9=3ImK6Z;ofR>A6&_%9v3G*E`E41LoL`e45Eubn$v*1{)z-
znwzXCD09Anv8yf!`L@{!*WQ<z6)p=sWvWS2{3Xbq=6jV?r(YoWpG9dXBL%vr%*|Qo
zuZo%C$=G6HaH#>$hk(lQfzSHp9igpl_rp8MOWWuw1Q*`^P^p*uL3F#PU|-K@OP{Mk
z`@OZjj79lV8~>)#ooqbT`ou%a?Uy@--0vOYT-4>cUyLou0G;-mNB4fZ<8Fxb+fKyt
zqI*WcVf$Lts>W)a#P0Zj8^Kce$ST6?U0A@CK8?DmN<|l(Z|i<1J^o6sz)zqt{w;Zb
zW0K!^B)iB2NLlL$K?0P<GiQLE2PCf^uop~#?2VSky>AB2+Je)D;4BNS$qg(uY@j8|
z5CuXm;m}Xz){t%gkO!sqHX81`c{)O=dsODgtSaLl?)>N$8}-oDwVOTBE$wsf!@2Z4
zwTD`*e+W&!UnwaG3$l*fGH^#2rU+ydB$bW0vWDqQIveI%p&RckZ3Hu;3O}iG>U$**
zss3eKI^b*<Q%ZBtf(t=7vjf}LhH5Su*H<hK8f;8OE+{$*C<ey*81oy(mu4qk*<4jP
zwJ72F*ijsNkY^{Co+b<LR^26qG~>s&lN_aP_C|JUKX9=cEt|0^UAouN9qMzhtBJ--
zqVw$MMsTCUULte~`l9>?G_|75sO00l*%IUgWgB_x8{7HGpRK-C5(3KqM4;|Z2VWtU
zWofNCJ3H5uZ_P`~o(bPae;QW}STv<H-{~zfOfsU&i*@qqso_Q$eY>9`_g^;TpD$<6
zgoe>?NuSQxI?K=1!rHK!X!sfa?o3~NG&6YgpmUagpmN{H()t*3^m==s_0hgl%57^H
zYd^ir>s|^6vq`gy*8AQ3uZDh`5<mahF~~Clb_>Zc<6JxQ9^-JuaP4rJ2Xb`C>vTxg
zaTCBzf+!r`hw_E;@BqHS^Vesv?Pg?;VTSE@BUJ|WTAc(QVD52CDy)Wp!@i^GQ~lG*
zs2HTsy8%P~gfye(#)`4m@maxi*_l?a1IJ@G<l3%Dk&J%yIX|H9el8eYVW#kM5G}a;
zk^6ywe3Hk;Fj}yazwhHZ*@MBm>EXUwJC+;L%v7{HK_WTo`C5@kyYKSC(#eS*WgEzi
z#OOJ@D#RDHH7UDgyR*WLRlBIfXWh}%%LS^7+M{iqzNd4yb9#1CWDS-xrY5ASq)T)I
zcn`P=hO>0XcD9WehWL2X?QjG~M|3Z-8O8(%j8f^{h^StOIBC9ExaFj&BRH6uT~`;g
zC7Cwu%`JRsbM_GRQ8dZ8cJ6S_*@xw1K$4RN|J`uAs~_xsn%5o)wip(%*ILJQ7xjBz
zMYMN(7}Vx1DxuTpLCERdTc_xuRHpRF9*b@MK5}*(u`ib_FkqWK6rLbnmA&Q8OdC-~
zb*sANQQK1Dw{A&ogZ8JqMLyq*(~qI3W+t06){%_1q)1tgf>nREp#9Dso`Hd(=}kV*
z%HgTaayP1Fm%i2MHBG^VUJKm-4znQ!LA%zu*b-`%E}8#8jo+_WpI*L9A8s0Ts{Yhy
z)+a|@%^!lse7mTSCtV>d{kmxH&eqaVZ@m67G&sU0P03Bi-<d2~=I1lBIC6fv<?|1u
zcQnuc2mS%<1Anmr3#GqW*?In|!#M}LmBMeOhu>ljmvQ)<J^q6Fr2^d(9)NjuK!|<D
zDErZX-@u_S;59YD90X<ZhXV14z^OTcoK1occPp!=SI-+*hkf{g81OBvc#Ep$EN`s{
z722!vCzJK;o_en8(oNB>Yc-a3F;<vs$;fapx1)?(vBRiF;obc-9&6qF_LeF1c$`le
z{^jj?OH=`i;|d*@1D|KeRC+Tw+cUAaoxMIbOsV&D>WR<$dWZhxi_;=~NtKbM{b*`M
z#fE&RuU^lB3n!7Npm32-HQ)@FTtgF1^T4t$3o~^<RGGrEF8@{LW{Z{S)r=jzMX%a?
z(X~n{g2ATdWTU3nC8G!z3xt~Y)~h6O$}sPz{+a@9+I03E2=Uc2A=IH@Q_3MdWu<Ld
zX;m*jqUMO};%r~SLb+mNZcm1COV8*0*C^5ZXxT2UZi$Fw7SpFMPp~22f8$0!{~x#!
z&Qs<~HvuyE;Dok*2<G*&?Tz`xjs6ExXy{+05Z0bJ*QbhQQK_4D@0SFRt~50hvUIaa
z$vPRgsax@)48PlGBkeOUMsQgDJbPYiOtN8miEQ%KP>`;|k5{ka4{~Hz2heeCE?NuS
zUsFiruT>@W$@-uhc4Iw8`&JU3H`R%3J*Xz0Ulgs;mKQwO^2ix<?&&v-TXXYBp1ani
zN^$dPcN2w9gx$bU^>*{{G1PNZm$Et_$$l{0WSTr;ATDLCHX>p{zhPWkWs)H{$0lEs
z98QT4n_XCHbN7-|saWXJrMtPY>XHwQ#i-B?8sU#}-CgW+*7gpZv#n{4j^J#KORTY0
z>5*hz+4#9KJQS@ulX%h5<A<<e0?TK_`HQ8;P+d9NM4-a-%I8kA&;}|~8neKv2f2>^
zY6s(0Uw_dcP>O*+E)-VXU_z)54&@P<AfO8l7sYB~N{8tr{T$)A8TEY=U<f~lov*-&
zgL94WFF+)$WcV1Z8usEr7!s-2v<-hRmR9qU@^(U|O)ggwuY<pIORQ7RcAlqRs2I=o
zP*P~<F=S{&|D1$e&u1F%7^)dKhO!(tR4PB-X&l|nUb~I9+aEsPRAjc)mv;=21Q8>H
zcQm3VLYW7mlSm|aLw^p<<q|ghw0pP2GvbzoaOKYm@Rw-ieSVg|%l7(EaQD@!ja|_J
zNl61)2}hTl*xqXM$)674voTLS?)IHuw-XsG-KcrKyU$VFZeEee5f{dtJ-Mjq$So%*
zFR)P8S1ugrll;TRqWwx_LP-qay8B(nlK#kazVBR%-64v@dQ!_Ck0QF8=oRYf#Lo&f
zB%mK2Ll<Ah9(ZlepigPg<!x==eigHDT1e=s1)T%3WBF`#JX>F|i-5QU%Y^~W2!SXo
zROpiFu%dK;bQpJSr}Y%2Lubs!q8>M`V?%Y4MA8q%y<ny4Pwb&4BQfYgm-u4svsu0J
zxDIaHToc;Nu~zMSE`t&YOO@tz71sTQ^w&(@FN^V1NeSNyigcq5q$?zvA2e<M-*~gg
z|2=QEfB5i`zUj&_gmo2I79rz^kMDlM3L$*`&$+W<%rz<N;@JC=sv;1{@Te4JP4%RT
zF3W+`Kxm2Cq}Ubed_%TsrEYYG+q!#s2_2oFDutxG!MmZ{Jp(V3@6MIy=|6oM*}7+l
zs$Fto&mZ<`uQfi!GUCP3FaAM1{ldK6k<|uL;dy2QVn{%qq6w!xgH1_A!?wAiboZW3
zCmOgsnc3u()NK{TGSM`To_=+cemC#B!1*-PciE+~*#F&Z&(Me6sKjdW+toX_OYid!
zq@S9%@zLKvsy@%6eFY*fC=t3uz1p&^YuQSJ$57w^Qs>>B4Ec=nxfvzR`mXLBiJ1tl
zCK5dLCSq5?m;`O#+bgQ37zGNf5^x3sw-HcapP59PJbsRULA?n!m@tGDE=1PYA~Hb+
zO67s0i5hk^J$^+-#0UK2j54TaGMGOxd<H_$&>JmAJjU%M3d>FI50*16RRx_R+r+AF
zUhM|Mfu4>d%nD7%5c#-7yX}4=)e#7`A0>5mi7l=2(+0o-#iwEw$tPCR;__hPopGVZ
znsHHRyxn)Cf_A~T!R4k&UkQ^*gZj3@SW6aH`U&oP8k72Ou3RzdQJ;$qzA~^T_N}wZ
zWl3%^!~*Ryk+`IC_bW0wg~M)Sy{KJO-0}10?y4ezMlyp@df}>-R~$ukJN(HP6Y1V1
zsMW+qgpsh=8YXJ`Y{#Yr&IYq(JxOLUb6qk3stL-=b}?>%%SCR+M7d+>TFuA&jBX`V
zwYFw-eO;?HuUzx%Ot+Nm-IVOl%kFeXbVmX;rzHzsYd1-0u%R!b=RXsU`&bx<bBC^4
zc9iZb85O*$I(%-2+~QyLcvHHJ_%6j@@Nw*_VF*(8?5&rEo}upVk0JNHOa@QSk4KrR
zuAYO#WdzuVO9N68M@r^Z@e6Y+lQxy<Q+d1I8e8eOd#o4~|IdT~U;f6EZieTFPwt?*
z<hjF2hm1u(4g3A7_CHaV^$z~SO7a$W!IvLRGCfTrRxqJ_<8*p###XGj*pfjo8?4SQ
zb_w=SG||;qygOnlEc&VUGb!G~RxkL~ypKdATJ#DhaeilQ?7NDyNnJ4sB`Oc5xo5Zb
zY2|X&5wA1p4Q#^yI(uvUVY7}<X0MrCQTR7Y<?IJ)(T0~3jZIMJuc)O$B<gc@f$!|7
zsoYrHlXG>`CQFQCujO@c=sX)S9R-JQu9j7;6<KAs-5ZbSS=_2v>JN!-=R2@%!eO@S
zsPT`wD7-o~D%jQhwNf?d;`b#vrv~)~PNPY3In6t(byMPWzt@iu;={c!4+{-|<@Yg4
z7abB<eL%th^lxn8sTKJ_ZANWE4UD}9G9U<oe<EETW24BROIqM>DPdnLw!fMm#nZvP
z{N{TB+M+v_-?w^SO{M=RljJX$RxP)t?GH;>m1KR$k@c=wo32<zirz_r)8t?2;n1fc
zVGD7$hH$9Rg^S9zS%)t)hE9J$z&)Yvv&hq9Xnh|YD?Wffep;m4_T8QG=3TK3`3d)4
zRQR5qr8}y1#wUPalQy7aT7OV@upB}4PEn=fN_P1VO#_rBa=SZyX6lNr!<haxlR9qA
z+&mAJ*f+a7Kgb)B`o`}z7IAcH_sJ=WO7)o=I_YP|#bq+_dVlFnAL%xv&y(m`B>S<Z
zcp!RU>2u!Gm?t;ftDwlN!TnzK#b>B27qMz~=h*k*f-0mN6M4?DIa$hTv)=YgyzS$I
zn*?_s$Pe>*mtPkx&__P%6V|RuAR8aGC=2t{&1(2-wvdnHbmS$2myCZT!~Q?C_Wx_i
zKqpG|?fmNl;e~T%9Y9G_E}h%$IJ@zCy9w0iRhPm#r>-4ENmkaBOueev7H&~(xZQMS
zeLBMSCqsp}YXf@igAiS;*=>^e#VbEZG&`_{#Hz!>Dydw@Y+lcmm5jH3&gw?0+hz=;
zsUM_MedI-JpEn&zAt52>tXMSF>UlGvhmN~|j$P+7UwZh^AZDP*n=c{P`@5~nOfXxp
zY4C;E-uDZll^s@%jatEzmCgs$3g8cd3NN~cHVEZ38VWCWTY*1mNDw}?Fktw)aVT)8
zYG-@t3Y+l!x<_NBuc%@3Xfl3{rzmn_b(EwxstiHt6w2KFB|@OJy>aG1z2@hXb$wBY
z)tc&vF`A|#f1`EcLrK$AT)dZxlQ~D4@3o4$BFpuGCkw2#9Q$XAMYWSEC7ea<?%yp(
zp9`(z)!GsbIk!~uF~3_vI-VinWf-zPhf8bstz(b{ayK5)9m;jyT>iXSXq#oFJN0_l
zfTrQOrzr1l4rp1--$^WcEZ^lVEFW8>Qx3Z*w0*~I_hAK>JlorSCxmpQRYDD|v#z;!
z^UBKV`+=|DDdqGHueI<p{@NQdKa5{a9>^i!VxhCiuJ;>%sX+0Bmnr-z*>eI~K$IuK
z=mJpoU_w-4#$lAlCB&2QBSnG#sRsQ2MvN5fAh=E+^G%hs@2|0t0jYbpNxVu9#8qFq
zKhhp3Xw-=I)(KVFDJ-+L5}DcHyH`3P=O|~KS^jCTOyYF;h3!?Y0}c&KsW$g<ZbO<w
z{!qce_Mjr<qhy8NI`>yAWmjSyU-3LkPb;?5coRM>I-K_Uph!pT!g49n+jh3VD&B=T
zHkQh2-^72P&FywSue9DVRHhri@3!R7on_#uz8X%XTxolyWgt?K>*rqQVZ}$$@ac<U
z&P^o|Wwbi}$ig+-F4dO0+uqN1QBp<65Tf9$1=o1p^B#_^UfZ?c?qFSgRM{kRPJTzS
z!)D69vzsFe@@EqwQKBZq*M_IYjQf=5&3Wmqxs@puOt;0qAz?THgm-W}OQn3Pg7RBT
z-`j5e6!yi6go`0nW@I|#)J+uC+6jd{hN%D5-j{$=xwQ>%bIBOW6yg{nV`UDNp=2IU
z#v}<Lgfhh`r3@ugk|82PDAUd?GKZ6SmMLY7BANQ{wKtu5-@fmE&--52cU|9gecNt7
z&$IT^v)8@ud)@1vSJ0Wv=+O{fi{UGlGnb9;?0mOyW~S3RvE)HY*FjImdjg}ZOFTu1
z0i%(YP9QdBcT}rg1Z6;&thuQ?HYPOY?xJ~pp-h)mPei@c$)0l)O0?>tYEH+pic->|
z;|y6<N5%qJLph7SFn+Sw0JEUn4`xBCziAdEy0N}!ukGBlN*wKy7-UXoUsPuB!%W9e
zC3VIRu*APUwa(+|e$}o?@an8%c>L|C5T=P1w!RAaOKx+4F37Mi^p|0uDBn?njapZy
zt?r9#2a{Yw(9}0fTO4bi{lo^j*I~h%?z;Zj`%CWkvQ0euXx8TF*!|SA*R1Y#sfVdx
zy}mo`Q|oMXcV5LqC5t^-W8j*fjZ+EkTrPKteR`@F%dZofK9@Yh)pifdFc1*OH+<^t
zO_kiSh$$aq!@FJV0#Am|XP340J$l{|LU)tpy2Tx8x<$$O>7iD0C{$s%i!3Z8TOeai
z<ALqCY@uAS<yyDBW&NXp`;$xMwJS#b8;#y1SZ~&BZwQO-H<?O`iHsPVSU$)dSDu;S
zNR>Tc9BWW5BRR8BPR8F*XnP{d$l0Tmt$wDuh0E=HF`FFONNn(<DVamHvF+`y&ZW7B
zYJ{I9OMk;Gl4eH-gF;lRdGpcm;K5P5dZBdB2Ol@5Eb(awNhkfC*6)ViUjigZks(s_
zPRF?@sKoW0o`KR<DN+HB4k8Lp5iq|0dd{*u_gM_=oa>3fdbEen^am!PfL!nJdQmz?
z)mN`IL^f{se(_}WtSrEKosC?@RvY!tTek2-xGK4EH}b7aCA1$nWz*Q-^TqmBXmj_R
zTTz3js^qBVO`azsd(@3i3+>CLim72T{PJ|liwmn>V|Xua#z%NfMj+~#U2bcsqS~no
z!Rhwe5>p|<ZOm4262nvC%jWid;{7L1veO-4ukXo=u@!Y3l6D&s*ioE4>XAMb$CUD9
zpl0om%SEiETVHwckoc2vCx>JAbZ?JGV0&iBH0EBnDK;@Ixqj5lUonv?8=Z^MFX=m>
zJW)}X+vYI2ti920V&*ldbD`^Ci$n-}s_2yhi^Un^a~k6@j&yqrbbMA!Y451T+pyYZ
zQ0;yq5Rty<q$K}-%?JA;d*`mFAKl(akDSgIteG~iDk;=sF<CL+Up}%((fpx7?P_F}
z)X0Lk?D(a=#QoYUHlqtAFPRFYUfkUhH+`sZrrEi_OtXL27{V$smth+i>Dc{SV=Vod
z<rw>pg@TLj37bR#hsnb>>u(Czs^eR&vF=MHtz8@MzMfc4yF45R^%_cuzNk1ZW91B#
ztL{ywS$r~mTud-|r9wtx*Aw@&(zMzQ<+uGG`rNyOZ`|2+?3%n`$em?lwz>F^werd1
z%FRoMtIpKjP;T;fqk0~3-(63~r#|i6zRI!M;PiL<D#x`)y=zY<w=E~Jx!a$8V_+~b
zzOUD8c&g6iwnL3<36;JIQECiJ+R9~PmgZXjev{W$&f(>Ee5NmGP?b!X(kHI+eKL7H
zt-+vcz#2w-=h1*tY-$aU)H1t}kKjY&hNhDHR;r>KOXFF_wyw*fVas|StnJg^rPf$l
zH`WZBimDBV2;bzH#M<h3t+QpT<hZ?^t?zv>`^sg~XK#0JTxR9I-bpC3`VABRf|vSK
zw|Q!lrF>QVlWLVUO*WsaRkDLozaP%r@^cZ2;B3>|a8?hn4SttNYdJ&q5nK4xG=zw6
zt%pot{6K=~>9gA^{t`@~8V_DD^(C9R7`4lxU$~@qK>S0i(--X1h9aT9tK@VilRnDn
zCLM@OS!6jRv+xCS*gJ&XDodX^HB(?6*a}%>g7jUM3iF;YmAOxSJ{i3ftFEzrds;u&
zeD`mqQcwMvQez@73yeRhTIXKI&d-ewM8qtO+fMJ{-p=!2_93UyK%=X+%pv8S%kxXq
ztX@xpGIs5C<Pv-m>LxIxUK^?(VOy-PSA9U1eqQc+?>nkz)bVsgJ17S)7wokfQy(aO
z#GURqA4`-|oNsueee@==yq$Ho1jzCa?JniT3Yka!#x?c1tW~l@?^s({oyltr`dZRB
zm8u#q@4SySd)5Q}XCa}j*vw2*{!-vm`_}y6B5AvEuOYI6uQ{jo3`p<@6tYL%JGeoy
zB)*W>wCjake1~qsQ~OgA<t4>}R3>Gsks77@Th!}9cy9>4E)<&nGQ3;B*>K+*RngrR
z=laVIx=Htkl8@aYGaF^Yxl3>2+@)bScj?Q2a+kjU@7$$7&8LxH%%}gqlj|4eMR&@g
zszHzELrbZv(+~IUZxsFT*v9#m+uFmZEK9qL^k(Dids)<mSxf_6W(U=!xyMMm>t(ti
z8!E`t&bIjhmUJrEO>;2))623DGfV0c=P<pQw&rR_ipL#aKTLRV+N5Xcy%yNERyxGc
zwH%P1t~0XH7E~20_MtDN>d-#ZDx<`&R@TX0x}p(-qBokFe7cxZ|6H@FyysNNtSS^D
zW|Fq@&g{YSpfjc}%q9{G_P?8bU1+<<_ncb8e4pu{5byZevF5eOubgER8cviq1tU`0
zEm%EFlswGJUvzs)7|4)z$a{vx@J4$ambNkux62>rEVa~4%)&}Jm#JPpY?fx}o_txG
z{zH_em>SIwi<OlhBlzt=emsNh>#uxALbYouK+0s<HhS73g7pFgxO#$Ml@jF;tK{OV
zqxHMXMM!)!RT1N_#evy|iq{b!YX^ZAyID_>gN&Jd$v`pZJ0a62#_pLXYEI_&X(k`=
zZ@kpSsLxmx%g~`Vsx~Za*dsmvvN@MRL#%I?MntlMWSa8GOv8Ys#^5dC+o$JdFG$*J
z9?UtsFwosouF-WTqG#URFs4$sS2Cn2`eY3Iz6_Ua3xPOQvno-nSXb)0p5}oTgAa}U
z!&nz;`sHJDcQCWN4W3?jZTzQKt8UbivPztTMJ-kNXqWZvbYAo4fhFwLw6^`&AX!PF
zE2=iSRc_6CP5M3$&KXFMXs=AA#8X+1pPM(=_at|?5;i0@+GM@Q7Hb|nXWzCEpXxE=
zu=+(x+_GjaX<t}wm0nXr$sp^(`!(Y(GMc$aD?dNR8J3eqS8vq%Y-mqwjA)O|C~^0s
z-EWvJc6(v{Ne}yJQJ>{tO*Ql0cJUa|!pMB*R9=3MheOxD^grA?ie+qkmelZB{Eu?>
zOZkjvC+~2+$d@;ajtkTck`_|gF@CFi%K4Q*w$p!VyeDH=o$O5<k9nsU?UM4)e1|<m
z{aTZG{Iy#B6pt|T5Ag``Tk#0{H~w+K62>?z^hvC`yeOYu(0v|0^in(OV65lPCz-l0
zOZG2DF3am(tm+Fbe(u6{;%$`H)DC}#i$god&L|6>9(35CSlN>%f6eSQd+9lAH*3!I
z`x%2F+ZQ$jgFA!%kkKTbUHy#pGGURTi{nWj%$N6OaFESO_Mv`incHa(+3T#rq#jMB
zx6&>Bhp=+|-380}p<ztwR~v4Yhb=}e-M2e+GGhK1wcS4FGQLZcbHUc3&f0x~vc|&m
zV^i{{TofCAAGp+3WlsGlBDXm0$&Iw?&Q6V^4^y&En#7*%%QSZ=d8e~4NW^n8UtRn9
ztJ7w6g`OHk2C_}gyY_Zj3#*s7T`{q8FBUc|5pcOB8OFX-+mW=<@Y9n&Gmoq>FP&ST
z6kTnR+O@yQ?DI#JsE>vhMoX7i%D!RTP!3H7%At{bxlr$AV-TCp=;a@h)o;1-<c86p
z8^nw`UmOV`GyR@M1M$2l0=uFSoL`MZ!60Qi)lo??usRckfR7f8{;U_kBafT1A`Rd~
z+ZIF-u1u-`ac~L&BB<abA>>FZ;C!<fJreQ+EhvA7O9h_l%i*%*7mNDMyfkd)fd8dY
zDm{&z(@w7ACaDXhf{6kP2e@4X_7;n{_~$1}rYF5o84ua5WOAV5YZ_nCiGy9zUK5tr
zoQSgLZ;G@3gO~eniBd$jaT-khCr-7(HVt9_f<F6>GPj>3DGcV{u~>{fw;3pA6pC~2
zmF$o_+Q!(pw0B!2zo_2rcPf$AyA${Je8c!xjGD0<lMXu>4Lqld?1~n0SNdpf9jbFO
z+4)mawR%HNlt;tm^YI-NHJS(VSq{|9XHHo47uZ+M4!!7c6SJ55z3f~O_wFXXvKzq#
z)hj}87_=o{m9|6<Om*g8k-2vx`Gk$VzS|zEo)q3-9?swSAuM-kx=(1lWOi4<dQoF}
znCpU)3pY5s&R1V5xHMF*l+KervCVHvYDndyJXPaO@y6RrpYDfaP3k_?WW3F)<$7#*
zbbR7mrdmf#ac9>{CHWM_{td@-;``QhK9K7Fu{D`}!J*25cavK9-68-P>ARN*c~h-`
zYO08W!@*Sq7Vk}05eH<UARbSMt44ydtH>Ep`Zxo@(R4x-(M-unnUKjLSK_r6BigpT
z^DwPf>aaeokhV$Hz1iUi4{0lDrB5}o*Kc#~vWxb4NBBo|eo~C8Pq}8!m8ntpwpYto
ze-gJobIK<f?eAsmoxt>6CK;QBH6Nw=A<XLU%MJfPJU4Wl?XjT$E??go3*7PFksQi0
z3$sV0JkGp#9T;)J)~p|Ep0lNkEv&g17Btcpl=!~Qr0L*^pyLnsge+a9cG92_AKaIp
z#Mzr7{=spunR3Z=kBrv?^An?qF@?4T(=B9za_o~0<DcHhGE7|x;hglm<u*BHZ!1$X
zxV~8YqTT)A(o6^TE5iXP)34_yNUq+?X5UrrKym%zytJ~ixbmScYtHuRfjgC0XCX1O
z^h@W?JV=CuVn$Z$z4dp3L&IE8)#ih_;iG+DV0e6L#HpI}#QQbY+x86IEQ%jdf4M)l
zOQQ*^WLxOTbNgM~1LJhNg?=?TJMW&PKkh8(kBoFpzlyH9VVdIk4MTM?i=-+0y5Lu}
zm_QAKIhP>~b@$9<vo4;9KcfRDh2GirmCLe*FJH}IcrYl+x@)n>sxeB)B%<-2OQHC<
zRDB0{bnK%g0|F`;Z62QD-$Vij1}c*wXJi$>SVh(8GfFC~zM~KjXoZfUpeciKONtoh
zexbdgeHZbtMm}Hg@Z)$G$x(>q#h_Ydgt(9*tpsKTJygEzF(ee^k-i}vVfftLSeKL6
z7jxU2HQ1Av31-`wwCfS|%^JE6I$kqT6cok*d#(odru-+-I3wlW#-`D7XHP^)+f;vS
z&;XNa&&wei-=7HW??>cB)*R|<N)=LS;f0{p^u2BLuM6XNlw}MpPuPrKlC-Zjp)x+e
zDqPmI>TZ!v-C@f2AwBvg<Ubu1xXH`2%fhfx;^P_Tl!qp^8DykAuZ#z~oLY#)#$z@0
z5@JseSyk!>&a%#qXZGJ|Vtmn8Zpxl=(M@tOKHj4@zsUYY%=O(@$t4E5*iX-U3*CQs
zK0V#6S0dS|mUjPo{;<*H>K^P@jc*wB_;tcBGDD^2@f*C39pz72mJbQ#ewyxcD=5X%
zIbNIFYf$`vYntxErPrgT`g)Vu9)_~oG*dCzG;_vz8858*%fiwN1~}qvX&)P2T<UG?
z!>(A8-JV&QTGtKy6!PUbe)tGcRb*J_P*yW#xYaX}iqS9#1{n?G8@;Q7d=Qn$?D;(k
z1ZPKqL={->z`so>vR8{kBvlVw<Xc_{$Wmd@3rH0>4rz0n384w%0pgHTbflgptGs$H
zjP85L_t`Hf<lE_@@Ze1DXv<iNT~AhXHkCnRk(}*NREMywh-Tu?NS4etGw3>}8NJi0
z;enHvSXh{SQNcwI&MgUhiy;2C`_;AY^EV7dT8m*uhhX!;q+6e*wYy>-zkRo+#LI*w
z9qqQeyZH8#lzd=)vTTy%^wF7<w+aS~GraeYjrec<CUR$@1RxYDP(W(TFV@X?fkK>=
zg<q71j5S)j7Jb4fN{->oQKR6`v;eoK)hB{T+DN21Lm(ei6v5}%;>uLhkSme%9ih>}
zXz@d-Kn|#<1KG9bDLEu|QYkXL$e}v!x6EqtRa724cPu#1ovzy|c<y%ptDZZ8T8{-R
z+v|9--ypeaWSN_nr_c4m+s}%pe;)FGCBpF^l)sY_vpufYCMHZNKI^NUOyR%pY}Qon
zCT*-L9INs;RPkt&i}1sDZ~q!N3=V(3XyCvZ{4A(II}&)6MNU$P8ihEF9BnNR>2J7|
zlt=p(vBjoEuZk~-LL{J~UJ=nQ)N`gGM0HqD4kyM}hYwePg`VFJvZY`NeZv4{Pg&Hi
z-P>y%0Edq+un}jF`4=A*nlkfuqC#QZKHJyk^1i+$Hm)vN#-yqf79MLXd6<?_><5tW
zr$59Q|Ce$-#2JVFw{gbXwK&NAA}fOZShh7<0Z|o@vhY<|FkYY%ZwNZ!SJR`yV!;?j
z6r2-;T;{;#al$H!Da;8VRe(vl&0i~k03T?K;UFdqJqp#W?}FEyGa(&h3#iqR$srDM
z>6jW&SIUuP*;7q{e}%5aU?Ftv`M+pRV0F({?)Mb)stXg+YYQ9>Pu?eWq9ga(8`^6e
z|1>oJj#&BQL*R+3;IQE*PNjXueN?PR*_cSs??y$Hl`;zvWw=uTo@j!^(X@jBLYlQW
zcv+bsf)Y7zP%7C^slOOpz6w6e%8&j>_QfF{AVp&^Qn4nq|6TQ3d51{x5DM!1J0n9S
z)0O0K7`KG+qa{oy{NZC*!`=tHy!#_e`1Aj4WVUNzAO{V}q1+0=*R67bfEf`{`b9PX
z_$)vrNtAxIJlZ!ZacoJMWm^>@DRJ6J2yJR4+RrH#^bE57Bf+b6G~vh(31~WeT7=hW
zNiYmYp}5z19B;o3{2d79#k0&5vf+6{apCceH2=X3T+DtM#O&9;l(6p`DJ>YUub~N=
zI8~ooZP0#i{9O5iAp7<n33Y9zbkUL84&k#aDvn<};-%Oxyj*lWAN8k9Q(1)c+wYC8
zuIIx_`abApQ9lL^E%wx>(4|^KgIoXG?qZc<>1;c5D9$PX`%$-;#B6GhsS&rOsIB*k
zYt`Gh#e5A7ot7H=Z<q<=`H;i#)euvL=v-SC(~9}|uS*hf*ipKS48_>l7LC}8-okla
zt1K<X^Ec5r48+C4Xl>m^m6f^Ez4)-S>&wq&Z$3>s9(JsOANp<1&EwM4wGZA&6WxOz
zLqXC-c_#*^KY!>VYh6`od0w(u&WMJ&wC6)x7IpH{op{SDQ$8Y-lW%xEbHQ`SesYFg
zuI5wcnng!PqQ)0%aN@~D^~!k%Ph>7v{a?2>M=O1Ew4}3772hD)pf7Z&(T~B(mPREG
z)T!#}xLyjh#_m<DZf1<**)hAnx@aMnzC*3K-APS0s3~vvW};93*HbK1Cv%c-Ho4uK
zCQF;x;tqOfTBGDyUw&djaZ=-L!62%Mbu+=#)dQKWo7Fzt;u&r=(7sXeYLnxMqjePI
z`6^f;QQ8UeeBm=ox6)1^0$2;Ti^q=%;S7(-W@k!vS9^x+De2#nv!Tr0`&H)8U`s(U
zr%Q{!J&;{|m#HnOucui2zR@II^!7Q6#jLCsqmw4_nBk$PpC2_A4!mzXnb9n<62n`;
z>yz7h4K>(h42qktLyIu9_|Lj~h^_f>PPW}~mi;65`MAl&_VME`2H|U@yjRZIcje}a
zN?J~y6_fG|w>+d+HNQ@`7`iSW{g$!B^5ov<($q?O&Uzn-eoL9!dO_pb8<kV+TIVhk
z*&d9cOZcqasnX6Ahv^OGdG-D<y=&+qskN_o(urUFr?#(gWJS2|cB5zfb%~yTRrB3t
zw)a0i#&0(G$KT^R-yKVq7?LBG@cN_jo9EI@@%o3Y_^@njufyIO*(@9F*Jsu_A4}a-
z+CE_v^(4znDso84a<@|VgpizMXAIq=+V{qp)E}N^lgf41)-tzc#F9O7$dgaWDPdf-
zWM{RLF8uROT3n8Y8%x^Kp&s)r@e*r8Y3gH#&w3wosmdJ<E@$d!zV>GefZqRcdU@2b
z#?>X^^8o-}LRLmjvUfh#<o#ia#jr(&7OL710J3BG&M_D@C6}t_qX37i5BFzLxZ6-x
zhE1|JnAdRR@Q%g%8)Vexg*{qsPc%u@ip>uE*r&75$>yv}Z2m=mZairCXgL$)<@9uN
z;>b@>{B%PU9tsbJsbed40x$0rh|bsKqDPwj4Cep94Q2k)xL#X~Qf&5G7eDrFB6zTN
zq?zRzN>Gkp7M;HV=((Wb|5>;*>hn8uXE~7?*^{}_Y?&|Dw%0JqO85sx<exRF%V+v}
z(t$M{``cHW$>^t9=LW<_cv7naUt7(pyNIflTTkDi^ESR(VVzWF^x@c(qJj7IODAuY
zWtP7cb8j@|lSv*7ia+}zYO-&GNZ2dC^;(hX`^JU2Q^n^#PY(q8_vu_LB&%x&L&qZ1
z`&+kyEZ&HUN}eQ9z+kxHA86$8N1RHtU5m?t7QeoO<kJ8PJ(7HY4Ir5Zt?VE|BbgA1
zMwHiqUEoZVDB}-TRsssSUE3^sf>D6zWO@#Ih#~VOAt%;jfU5j@s4|4%XRMw)L?hd?
zZ&*Tnw&@|t51$xZJoe_z&Q``<RV%*r))V#U#}~~W7ykB{F%uni&v#uGDGejTNz?Rv
zs~Fsym|U&`-t3t<y$|*4^N-haGcOoK?4WMr^!@P}piZ79xok+gK0F{FQ@)TRL6L2x
zS;clE<Ngf)@{?9va5m_zC<70(U5kMbxFh#bE-R)B+Ym>DaoE(pK+F*VH7tqpy2Ue5
zB=q2~{30uH^5TAq0@`~46)1v$hJyj0LWOg(fIb3yRe%ZsJ2b&Q6?!B@sGRj5<&Qlc
zG}M-MYz*19x6fK?tQXIl%!g-djA$<KM5j3#ofCfjq3X{bti87QnS+)e++A3=B3-`&
zN5HHZ%RA}&hHBBBhLUE^&<XR)Q(V22@Bay%kO~dtpKG5Tc!0It-ry2;;<qAWtAOZ-
zdwI@qF<lm)i*OWhYih_h=f280)8{(TCRHeG5fl7?=fS>|E1b;9lZol?EF-NJ_GCSS
zXQ}$8VnC%pqBDG4;6&?0FlZQ!r>%05@Io}x1ujaUDNzV~0+E{W0$1=e7%~<j!RtU%
zu<+0#?V<v5NAZTDP4xm_0xbdd{lKdj3c(ym#o!@PWOo=Uc8Iw&?&A2m{H9d8#_wNv
zZSsm(uIWpf<g0rzC~8JD2S(^tslC3!?lCGSyz=SdH;n$(8tLN9EPv@oJ%bLP)4K$P
z#74ehvL&b&4NEKr>@V%>AiGlBnqgA#qBgLsxL>}*Z2qQe{-00ugs&7ra~?GN6t}>0
zJZtuJb{&n?a*v7S&u_E~lEhAxKxBzw$r*QJQ*zfMgASMA=~==f<yjE*)IPZRm_6?%
zR5P7hM`rm~rsUVv=NRE`X4j)%a8C(!a%b>%iQP!~5~ML@m!y#@)6^VcG@f7mP<OG$
zeI;g4WVWE_;N-QE{tx<D#&>o(sdO<7O*&qFg=_Yo+bykc7um%yFW<#fKIyPrRn+^w
zEuCuKCE1|R-pP>8+c9P%aV|(EGb>p7k>}>4Wz`qU99II%L~+dta}u~`&^rlt_QX#L
zZ9U@?dWMaY{7!HC=<m-+*!)4ddEU-K+|9*C-+$1?NrHCW4tKN041&cB*AE*fVOnpy
z=!x0osvmCFe^sKim|`7YJW7STSEd@lot^iqR>Pf6)Sb~jJ^)BQ0D|vC#OjGx@<vu)
zSIb0ZJ7I|MWARt3=;pl$y1!cS_g*V8f#KB5^E$SeV*Ya%##UAEkB$5BR>K)~8gJ{U
ziP_6P!XWo%o(%PC0{T^k`h|WgY-abbZ~bQwetoNXp4XAZIP>^I7#T-I5olykx7bgO
ze_j2lTbg;su#L<Wd=I{l%&#9S_r{6rf9zHmEt_AC)<5_4zZ}^A;MVY8j+Tj(Ou<wH
zHE%?;&w82nZii;OLY`*5p2RrDfDmiutS&>=*JZl-oftx}O+!F5i9!TAgO8s$TTlTl
zVsW@N5#(aT)DVk9O9I~T*$t+F3y>E7jLU)vY)ih7aPULbJ9^wkVURF!8<t5zatxT3
zpw?;YX&V|n(lGMY)Ak|<qe<Jyd(X0{Q5}DlS$)@;hjgT}kh4zwK8xDzUie--n&ELp
z>uJ4;*0Z}F86+6_*^;DU_%IBFzKFqpe-ZE#Ch%jn!3S|Fj!DA@EeoL@aAtl`<pq%{
zk92x;BGQd`GH%TWqYwZGi$5p;V8jPjj=$^r*+l$uPe4wLuLR|Hlt6(KehvzA;Wob0
zfeJdLP&bG4E`tcv=(ukXMr3o>MkF(ZbObuj8fsyzcFo4GE}9{)0>BUxu<^?S5a6y8
zevd2C{2tc{9?ewH+o2_>pogKykfRDb@J8^!Mi4l&D1jEY0s%iP)!YgQCjbVaI5AqN
zjrkfaXhD5}afg)!))m}h4GIljW&vCwp+<1ij6o<8R6q=d)6IH>9K_@d@FRW-1Spdh
zDsMu(5j_V1jTQmaBSic7*&vkM#dj1SF=zw001fvIIRQzODN5)ZaD&Gk4mUO;{HJY1
z1dj_IjUa3%QOGAiKq0|v>ji2UphwjY+_?%7+knIp^|rxc$gR+LTDhXp3M4H+3!E^4
zpASr#B4gT-AanqDlt}2<0uM<app$jOr&s{q#|)`rxGm|>7G^XY=;vVQZ~&pQKfX2u
zx`bfMRQn?Vho2LEc?ckcD2M$BA$3ypzP+Ig`5XrylePzBLiyr~*1OCIHX9M41pd=N
zY)63HbP|kk=-HKkh-~Yvifh}68sJnhO%YFbOc%DNf<WcW7jlHQ4v=NyTNSDZaNT8c
z2AZ>~gXt5+fx{F|D%iqQ08R!Y1`<3PfP4f{BUK>)SIY>Dvq;iJuT5lO$Q8gV4%L@@
zTM1K+Jg&^U&#XqtLmI}>3q(iBb0n{_05Am92PaTU7+^AJ<3NCcOo4#YtLRY3$6<;C
zaK%8_z7Hnl4{t)fy+}MHQ3b+7)E9v$F&HouqNE7)2Q*kn0O$$@0SIPH9ax(YmH<BF
z2|@D*Kc~<M`d@V*_7tGPuia4k8$%32v%dlcnVhw@A>%)KX@Tgr#UEgQt!-dmjV4hO
zKvSg^Q5_G=B6K2Pt6(oinL--=M?o}cxNq-WW*yGF$E0XdC3Enf)mNj$&!`;;DnyAo
zB&rBB4gdy0gy6v)fd)YlIIXUru0&hMDNgE2!0HQqZ4euyjpD$;BBTV;oR9)20N*tM
zbON&q*8=7QFccoe+5K<{Sx|WjSKA+h!i_j^P{B^IcwT`j$7z8xg3wPFdaBFOYN3xv
z4G-Dlir!GtHlh>$_Q$W;D%czc!c69*+((eik(oxLk4Q7zH(kM0!6;P!_>R;aseer{
z1P|^F2-<=Q$H7w{_=YH`E2waYjRF0I0Eh^ZIzU?#XHX%ras{GBzQ(%%p&$Yp<|3L_
zh(4cj!2}HGrb#+PsJE>`1gx4+RLz%|-wz<#Vu5(z(6%32OkE*$hZZ03!D!f)4zcRf
zHe!e%$$|47zlLxFY%x4Q96<Ra@9~jjJW#En41lz|yS13xN!p3Dc5CUkD{P)oDjdQ<
z6Qu$_G47!1o2J;VsIEi_P@z8+4z9Z}y9()5ID!fRbs+#<5&{uWY2pij0dzQ@2#ywk
z$5<d<iB<ww-bA=n4*)^?LKOkzIs&i~Kqulu`{w%ML4!}I&y9f{ilI;|KiZ=e4_qp<
z8h;9o+8);dM**Y($H$$hDl+R3sUqxco*~46M^7l>P%3GH5c~-$*b+_>zy-6f?dE|H
zPPRh}547PirmjS%1;~;HfDrPC5t4vDr3ip10hPCL%nv|>6Qs5QCq!BZ;-bE)kVng}
z&5yj27$S}>wG4^_au9z93KX>O+s_iFLiIM_Wx(qA&whssXcN}lOdh}%B0Rv>=9zEn
zU44L15#fqNhj5Z`lDx>b2;c*7eu4`DV~dAudupQXHYtKwg+tJPuDb}dL<C9zjw%(b
za&RYTEfWKdk5i^1fB`Dw2=ai|EyQ)gm4O=)CZKHt6k+2Gv~;1A5sbnQK!JF{hXGxf
zgabpKphq%JxZtO+P?Df;R>7=4?fDyn;qz&KeY4se(#WjZ+*yL;jAzAVZ<#er{Rh5m
z<9D7GntMUo7H{G1U6IKvS2?@tt2fbYI&|^ciI!40Q1Z$x!dC}lo6#YY*9A3_!_{T8
zVbZX|!R#IVL?`;^4E<*bbm40Is)CJ7>Ey@w+YEN@rDk;V3i-v*y8M^{-%64>xOiE!
zny_=uql9<FH*;_ve|7oSSLVwK26LB7gx5F(+)Fl}CcJ$)Ve<-o$2;POu6A$GFcc5|
z@Lj~OuW)^W@1Rc!ssnR|*VnYT+&w#n<>|K@<N8gE?;&3V4mLuA3FznyvGVMfjLI(<
z)CeG26~|6~EUn;jm+2Vx^i`g9hwsR_9o#dDX9)ywBSeA49XKU$qbJtCx&yvqL8Dw5
z)aeZ)k7;y4BTwvr&_F2GUyN=L5JCuILujJc^zL5rt~fAP%+~UP*rS-OjxOr?^mPrh
pm&#W>F;WT-6I8T#`KaI@T{woeol^vZiv)s+i~&m7e35<Y`F}ndTJ`_{

diff --git a/public/images/login/bg_register.jpg b/public/images/login/bg_register.jpg
index 6989550c6a2a999d9a0583e35ec056e247a754d8..c1a027a861cf4da4ac4373eef260ee7a2278c9a5 100644
GIT binary patch
literal 32699
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

literal 37083
zcmd?RbzD`=-Z#89ErNoCv|ONqbf<)*(nv{*NNix!-3BOWP)bWTBHaoC!WIw^kXE`&
zI-gmfp6fdIxzGE4p7+mpZCQI})>^ZEGxPoRY>&Sk|9~iD-I3-Hbn6xiga`fWI9`N^
zWn4_HJs<>x1)8rz(D4sUH%n({dl61fTPF^a`*!!tI85zOobD#}oZK8-oX~X%cY704
zYcps1duA3$TQP=}>Usux<b5#)9e!mlWqWBeOXN*YM>7pi6-`r5Yg6I-3=-n>*WE?j
zQT8Y^XA^pNl#Q*Eh`SiWN#`P<3^#K!(4XAmY%Ruc1AZ(09c49oX*)+VdVUT8c2h0^
zL3%-94sL!yK|Vn?dLAxreoii4PF^l{9$pbXE)hN+`d<eFc$?#WbCKIJa=+dMYGMq(
z2Ic1F#^J`xVdrSU$t^4_%*n;W$-~1A?qGNFuyr<ZXSa1?{N00$nUkp_(%u<qXG;(F
zXmZca#aWC2P<lE9l)bX@pN{|IY@tx_xK8eNa=vZ$FEak)-A<Yw_GX;7&7AC998Jx@
z?To)426Ok{Uj*L>s1Z?hM1n;zv5~PebwQcgI^U8JV*pn;?j!Gu$OuRa^9u9G2;Jb3
zk`>_QzQHHNEhQy<Lz<tPTbP$u_IDru>De1n(sF#f!os{f@ZGWkLOlGkaspD)f^t&Q
zTwGi{zn{Hj>*Q==YijoUy-4uhU(X8t*Jnkf9nDOf?Ho1j>}-A`K+V$5+0Mz*&YoUc
z`eeoFnRSr1_wC%AuE9%mI${|!N2IISeK|)v6#dB@iy;344MJvof;_yY-0Wue1clgn
zP5AiPh52~-*ah!%nF{a<nelQ7fH9mtfB*kx?l=KKoG?iK2AbbZ0Euw%4-0_GA0{%h
z1)SpuSmbyaI(Gtm=>B`aiiqPO=rM$Yg@uKUg@cWaa|Q?eoyEh!!8=QUkAD^)pMZ$q
z<RBtAcb@3{IRX+AQc@BU8ft24noEBU1THQvAps!;5fKFy88I2vp9}wQ3&-yvVmu5P
z%vnqXF@!;kz$8W-e}uXq1OfqJ!l&N{0s|8p7Y7RuZo>dqez${>VB=t5V&UQuK^WjB
z1kO2vv)DK|nBWcs1~KLZENq;=xNoH4UQ{=E@PgrGH;JY*zm_?ZLl@8OcN!7J6QpM3
zZ;GVuIi@f=kqKyjc-SB<`-3;N=Q7{wT4UrDJkv)qF2o2x4+ak5SuFU?@Vmi_u!z;)
z+`}dVeLMWPz;io=#FX^%DtJZFhc3sLyf_SueB=)`q~3Kqtu;s=4?+ZhAV3Z=BmwQ1
z&Y~#(MgRX#N~9;_L`ahUfBg4ny8f<c{xtsg0zSB$4ypYmnGThlJdO_~;}bDs1mGhq
zC6n>7nKAs~e?-Y}J2w0cpKhPD{OuxWd?WJ)JOw}c>y7vbX3}JQEbut^0D$~=LjH9X
zOiMCEikA!?k-~;b5P&o_Yz%gcNH9$pKM;}>k|yBmF%A(ZAReFnUHDZ$`N9Af{$58s
zKJ%+Cc?EO^|ATvjI|M@~WmbdV4wEb8&rFK<-zh~%Lij+XgNY-Sgx+BIt3k|UmhhD5
zVSxgeE9?eLyo-1Q^ak`?5A6Nn${9?E0OCT}L+?)t@YhAqq6BgMt%U@>2YQdypavcx
z0nc+i;PP+4YB*T{1u**vFq5a>fLQ+v{>)Gg7W6<8CLLlpIsb<fKEx~uslk&8-H^mq
zBgOb~GNtU0+F5uuF|r=mKR+Qfz~Gc%=sor?@=ger{9QSv^ps?TGz3!%DhNO#CS0Lc
zg6V}RCI)}%r?mf}84&xMb|Q#0S%w*qg9kAKOe7NlX#D#D5by><$O1f)(!U`GOOj0P
z50idY@`P@7JeH>y!4zvXVE_K8(^p7VNZ!Txj$Z+RGsbs>KMur!fdf%McbV_f--WAi
z@f8G$XF%mDsJ;T9yLhi8Ur7o*;EGfNL!bfW(~k*;8UsMdD}^gW7vNdH;D3S`3^j-d
zapSS%3B`D%^rV1#|9>MNA&Cv(0j8bQA37_U0}#Rtu|p+*d@20r<PWrD@KbQ!KCpkF
zDVcMbN*yCBK#PdwDVfaK#}7}I1Hhz#%-+A@&ocZIBY;Y!zrftngSm$%Jd#GT18~9#
z)lyf97$p@*;gKlOD}d`%2+1HxxJdy94_I&rLk$niJRX>LKs6DwBs13kpg$P^8ygCS
z@FgK^{A4vq(;uc?k{u5oL>gI|e>NfqahtwdQuATSb8>$zBEFOxnqc;G=&iw$z;K6`
z<&+10aR2}_%m^^5PjCX`8VjK0<l6y5=&{+yGk`_0@p&KPeIfpMMl!SnEBQhIn0W*<
zDEKR2fr2^|31OX%fSwEkp@x9D_CE{(pa&s^ki;j#NP!@h(-CChW8cJofs;jglTeND
zGWJcv%Qw>eOYplTkusn;63~v6VFA4GAn)=;Ja{e6KE^n~n8pb!gJC>BAr|J%KVu+1
zMY#ip3HS&B0Lc^ajAJzrQ^C~-F&CbW<LF`V5i?_1o{<WY<oN;*hYAlZ3pg3e5)TV3
z0r-HSK$36%^H6|{QS*mV9z$smgwOYa%o5;<MN*AL63Kv1b{q2+0{%;T%9nCd0fpyO
zH}RiqpAP5Y4@?DmgTHjZ0N@pY*8`SHe_s)-lhFX6!0P~(=Zp*(3tl+A1s*N{61*lU
zd^na^$ugD%6%Uxzqy57Wv0wy|7<?yXDol2Gd1T(moUjK5f*HaC?2Lhp53|Grum=AS
zOMu;_V5Y`+4w2qw)r7DmHL;V)=)t%ovk__j08b|aU<E_+@0OtgYXq>?9rUl&$-4}%
z41UUQcwNNP00RQj3&s{avXg=gJd%?SyioE)SBb7(2(5Sw7r^RR;*G0=F@RyBpHf=l
zb;*Gh!qLNP$4I?#A%N2I4B!@Xe`aDZSS$cGVC8_-`4`k!AW1N?(*xE6M8DWPC50uK
zncQE~KUouyPRf#o^AfDgH>3!8QSR6ZmAS%}<M_71XPQXs#;fHFwGlbpgTai18bpi5
z?{X?XD4F;)zy72>Xnrp<&I2V*y)0N@8f(;)E_75BR@$S@w`7vUDLQ76l5aKi;oSHb
zy}ja5Dw0h<20tv`IDC-+<rif*mr&)y|540&mSx5*#bA=S^cYes5%%i-e!KM1_u&eC
zi8k9!l(Km6`0adL1KUaG!6XJR)XR{B5Lez+{rZi5Q5N5@Ce&um{k)Re0DUL!`uFR4
zmeqQ$Zxtt;2F>4Oj(K=*=`CyTjg@*{cwE(e^HUd6Sv~M|<9R}7Ev4_T-v3Y+t|$TM
zd!#@Q%LB4>SSZ}a_<?x`uoetL^2fhaA`on+tL2}3!brcMce-F#WKIMFmIEdq;2<jI
zFhmSd=nqhgr&k~~OXm3^lT2wzP@)baFBVG<;4wNF05$mv2BV~$Iu%$iz+ynFJb+Gl
z3J(e<#i0MaVi1&!@fgFOlpdQNVouY78A*)=1FRK&2|kR#Lt(aXJF(c($ku^`gZ4S*
z!D5uKg7U@%p?(7m3UhnuD86=$hXSKb?`lGku`anDO9j<qg{8q%hOb>&(;Xc~BIab%
zd(2ZaB(4=#H-G%T)v@6<_13`oa&NIwXPi^_e#QLrwyBB8?)AQRls9dqMzZAi=C8>1
zi6eavQbq?Yg7&=kT?9gCFUb-=I)+*%s(m;6^~<jac175&#ct-0cX!+OYxdT2qWEM`
z(zqJWaoOYh%p3D_-#xh{s8Tfhwsvqpbv6e%8iSuVmuq_|l{fy=yoX)(f(NVaV)6Fc
zofu{3OUh~k&TdoDeHygporwZWy`{o*XPd)Py1BfJF-r}e-55wreHUY7-nLkP>~X24
zi>j1x+2a|RE1rvGT^D6-66GbC*=e58s+;x9n;{f0eDvAEYO4BWxg*C#`eBPREPQ<v
z%DiSl4Go{~l1lxCL7G1-UGV`ZE}Zf%Hn0oq{eeygI*AL00pMF;<-j87f<LU(n6VrX
zkMV#gRgWPGf(s6q9Q1O*fPEcK*%k;^W|)5&*%1H=r^o=fz_Lu`!{Fip0$2^NOD35J
z?}UeeM0z6$K=5y>0>(lx5%d%gLB)`Th2x)v@1IR%dBVF}$XIhPjm~eM?%T8-S#w`G
ztDRamba2bA{JniiNk*`FP9~Og6sfWXF}35-;{mZ3-DQlb>JJ00Ejd5<SPS%Ol8k)7
zUy)x$`>Zlf8^1hKZA!dClmDq{CP|!mJ)u)}HY<gzvvA~mkLwb;oEH7kDZYHN^R?cP
z4pOt%;75)=E#F5uy!#8VQh=t==5|vBxzYD0uJl<acghZKB2A3xf<ADN4K%4gG&CQy
zQIWUiiQ%UeAx1A@zv`PRm8EGgxNxxI#gRH&n0q9+%Pvr|W;Hw%YUKXY!)|_1N7m#}
zb7|k*=$d2Gkf4RtB5ifq<b>k|%}BG0a<SgbV=4Dc3HWt`f<7=jrBVkv1PO#LtHNb6
zdKO9R6L|~x`3#1?9&D0Yo>-^M@WO$4gzcmN8L*bH^#R*b;XwW}%2GN2odUE8P=UlB
zQ`xZqBZCFR<hXLOfHabgvc!P3iIYQ1;ANGR^9O%m4G~n#{$SnciGUwVh7TL%K&7Yw
zgX`pgt*l>Giuz4h%d?#5Lm4fgH-PjV6}~p0=p|Zw47od%#jN=#@U=E5y7oS)sw&=A
zO_%NBlW5zRywk<4vf(kmBaQr0C2@W}p>oT<dalEb=~{cGipo2?fFzodlANlHoJ<0=
z-P5O`L{G>Ze5~0LL>F1=g(+!Oy^kT~!Y-W;lPlYPTk4zgANTrnCf*Ej+E{tb?4f*v
z>u~+5kD+(Za>SYX-qq8d8}KsK7?bF+-q2bVJsdlX^if|EFOAxnbwv+RCGH-@8K)FJ
z7+XGu7E|Y+1#RXPwn&#5efzrIxiNT1=6&uMayy31E@^tpzDAe5ti~A~S5Wkcx9-xZ
zLdNF2D+x9=H@D0+WsDLW!q3Fgk@-9$9l0vTp;UKo*=WOd&^g{{rle!PbiA5syow21
zZNiXP^KJ}!J^x*wlkOdqc7okm=fF%Wu}e<W3BJvS@?GKsJEJifYi7jHtlLFP4yaUK
zRkV||JX39&%DMXWeHk!0fCUJ%H87@_A6UxjAuKWR080brhE7=<00LMCpa!r3zF|`V
zAFyfw^a@z4jFL+9X2~bm07Bd!X66(=Vo(5PM=Bv~CP|tk^K=2rqXcd}K?u;-Ux2Ye
zA3%in-X8+kki;Wp0mdE$2D2I-j1Txw!%_oA2I3}!e~nBsSrZr;K)!e1&^$rKys+><
zREfU+%TEU3Y-yMLI-Et@^ZSzKMC5baSNg+q+N?$f!?tr~O#1X>Y;9{7blUTp9Tljf
zQLg0OqbcH;87sBpYeK?&i}H0ooT(!=6_FlOJE78F5HlB3=?<M7yejQ|og`G%MTu*6
zN*#(t7jKJU_X!I{KD*)K4;K+PH!j{e-;>cS@zF6Z<Z!d#e5V|zit2;%V`vI_4C#86
z+;@-TJc>Mq2I(I9I{7$bzU@v3nLmn)4Zoh@dZE<uyvMk*FIk06edyeoqVjQ*Z@Jdf
zVTDh!f7E}Ib@o7A=QZr+n4@ZTQm(FM%WuJE+EpKWTwhE6dYkp^ostxmu>MZ=yy@WS
z*TcS-!~6A54M<C}93rrK*zl^sqS+E>(QIX`np&H^ZE3((ZkQx8ZthBzLr&JyMpn|#
z9e6%hr6UXr+nW^U{d69UM(sAAFU?K*eqB3Op*dk#w9|}Ayf6PV^>VADSjjT~UbC`<
z*BFP+bVrzjS#Vy`Mcdqx7S)(HJH<6IOTKy>>S$?Rvbx3L5TCrat()P4eCc8O6@nu!
zvkP~I8+P+X<%J_^7N-{t(4+cW%S{c27SbcK&b<`Kc&@cxnI565TtduF4$K&j@k#%N
zH5hOwrkn!V1%H4tU?ITfEC5&xumN!l6kz!S5N4Ll1taVPcd{_LD1b&GJ&`})dL(lw
z9u_7&6pHsg0D~S2pA4YuUq&r#%|aL{{=k||#whWp=K~JLiP?IhK#)XUoPX(gqAmAE
zEBco%Pec}R1d@dtx(T_2Nv{vhXqgHLUVFXK@lk*s)1*1aqVv%hXMs4)$a~0RGt){W
z^onc3oUzK3mNuEwyPU1_JrPfWipra|#d%3+d=d%-Yv)vrCM!kwBLGh7cg>5x8ao{o
zkoS*rP$sEj_+6T;esg-oG^=jr(16Lk!rbRN?%I)J6{W;s?lBZC60+>q+u#-wXwmcj
z`&a%^WwYm>TR7e&-Eqyx>tX9@9$)R+t_$kuXx=50qZ1$y+A&~9Eo&%!A2<2X{@r6b
zLMNg1-q=c6?&3sHL{HKO7`?`aX8v7Ctw7$+sUE(WeOv4}QxRtA>sxKWo_{pLtBu=d
zU7C?ld21-1_HtH7u2*e(l!4wjGKR%EIF;Z^W!vzCP?Z9^0%u0K3b{)=nXGy_Nq{+5
zGw!GL*31TxW_iuBY=R@Bmp+t()^4To>f0lj9wGX)&-nIO0w1L>R+POE*FP_DvxA!*
z2!H%+B4CC~0!#xfMWjc{jQs|;-=^+^!B?JRsEOaYUaf1q$gNdfW&EIRg(FFq_o8pN
z^S4F0cHO@sDrVc3rnyxM3=g)-6}pxbuN70Cb^WWBZK_GPBVM#N;^^l*Rl>~8exxYx
z6EulWg|Db=yl?F@KCh`SGXhTxI$CR*T{n6T0+=YaiqiZLKXSUWhoW8EX3XTTzVgKt
zF4ti)3UgCAFNf#*Iioapips-gYC-cLO4ww+X_+RaD%HwRAV!~MSM%c@?U6BRX~rfm
zv1>Aao>HgYL6-H!!DKm^pWKso4TpyDKY~o`Vlg_pB~)`<>$nyK9^GYAy}If1y6R^o
zVZRf5z3Ygep^%x%qs7_?WW}5nN`Q5!WvZl$FYrl0vjvu?IK|j`X}*TjFj%%^06r-O
zh<8Mup7^kmfl3Cv!Jr0PRRkxB`Kg>9FuP+ez-k&6&ndqOW+w$qLM*eCr(b}1{+96u
zQ7Rimc~=sW^Y@oZmc$Q${9%I}$~qO&qzF<-T?)DlVFb&nF_QwefgRe1B`4p6X}ERk
z)@EkAoNc#kuaBB9PW7a>N*_ZvcVlLvE0|yX?4jf;=WLlhBo;k}a4o%yiv6LV3)-n}
z>H*pNAu(UCD7V})NR?1g`ks2uu5#^F#?=~<YMt6S?;)GQma$#S?W^Sl>}&GbCG(1P
zBDEF*L#%7tM|xtP`pI`vzgqooZFZeWliTKwy9Dj~ZiS-J`6`nnwd8T3`o=Gvio5%I
zG-W>8bTFMYBs5Xx<>oD-7)3?4>!XK@<EoFAzrJxr+I92XcIKgSG_BN^=^zkrk<Yky
zkEe)=e8n(-y)BrLU~R5d$fEar@t3U@&e(?yYajZ`vI8eYG!IfIbl5qq9iJALW)db&
zwnQtuwX3W2`LbVBB+T@E#ctYhH;%Z{+)C3cH$Y2l!;|lDzG2No*42sRx}B1ZZS$}#
zcZ@aF;=-#OE(z|e+K$X9QHAAJBxTHU{+MgToWcbl418i%(MJ3M5}fbs`3@!II%rmG
zuIDqlTB86bVWh!Y0agxgFdk_8Gvj_+<UpJ8I#d@}9fm)9G1ADsP;4C06MVqwlyc8G
z;TX!v457*X)HYjtNno?NnPO{IxGVzcq}O5Lwx!Fe^4j~|@GUzg7Q0W~D3p1nkHUmQ
zMngil_TsLsh-vmRkgvEVDb}x-E(sM=>e`C1mKj&ZdlLFybxNtsuy1Vltm;Ckk{22=
ztqd6^eVW<WEETzoG@m$zCV9}l!#ftTwbjd2(?3$2pU^P`*IvT??A#HO(_9%(eGFav
z@THRrgnrLRo(6rfF+e2+RIk8cJ=plX0-<GP8sLBpj)5dv7S;s7`Q#Z_kABDl^a5}?
z13}@$`wa9)-+;{(V8hbO5l06D3l-QSXb6i1i-=hh0s#<UnLY)hfz<v)Jkl{(fqqEV
z#Cd`9oD_sO0N6o@gLMx#VmEtTH~q?y)<T=1e!ua~v*;ram5&`h5}VO;I|oNkN0Y3#
zlelgCq3dgUZpArm&Te*hl~;vTq7InmIt1{!#-BM&&=~Q%b9dHm(R9tk753-3Mr?f+
zuPUDIkaJTTbeg!<PUqEV;~jta&N^4zW|E&UQ=BKhYo<n^rL}X2YQ8g0m{1zo8Ct;B
zf5oGwOnd8|F8V^)D}~9FHzK8^BZ7PKEPPD~8pKTr2{Tk1wCQ}G*CtGTW?}=5_E|lw
z^@m=@yz9L^&pvh#roUc$t)(z4!%vx}P|SdCWcqN2BVax+V-tC)peJHF^U|)DVE4vU
zO!--D>XrOF4*n*iC?S2m9Mdo%3uJu<VSlD&rA?o{a*>^&_-<@t@WHlN&-a|M###-d
z@>rptA45q?^_$YP4BD?Jv@DAlo-2<WU|y7ajoQyPU*j~9T5<MyvKniDM`OM7F!tFb
z$uVTPbv>KW)0!Ow{NTVD&;<xfGD#rj4n<t0w)`YwTJLC8zpA9RpJifFsCzjkq^BoK
z+OAQ0PTN^oOP0H8gRr#yTkBxk;;3{{>*QZ_hpKHAy>6a6Ny<qQ^+s2_D_{F4N*dhj
z=zKOCwtVr%o5?(j&G<yAjdVP7^Y2sm_l85Fr>rW@(-H?}1zK$)1zfdsF0DQJYA(R2
zR9c|d)4R~o`<Xw&zNsp1yW~5!PRNp`ad!1b`3rf}qSZooa`+O`zO}nEo{vcw`e~Bl
zu3}MEK1_YyC9`97VaPypYNrZ4{CZfgv|78EaIQNfe&rUMg9GyJ@UX4cu!X@$nRln5
zh@(j5>u3ETPCf&FdZ10{i-|BA9M9zZINd0-8sCYstDx;WZE0E))kvEv2{ZQ~sF`sj
zDnA=lDbLYSixq>IDoweTi^bc2wn@8B-B7)nbEt@_hNmjxlR5HwU`ln<g5yZ|HCx$D
z>wtYGv%x;g?5XbUo2Bnwe<)Thc3H1hO+m}`^XlU2*be8Ks|F5NGm96e&L!Qb8rm##
z(3so~p)06N@1=VJLe9UK^n_W1KyC)8B$!QMzYq@hoT!+J2hqV?UrzMVpF-fT7T{uV
z0X_wW9BlR7$0Lr$0*2gse>tqXQV)nugOgIf90qKVU?5fVCj~*)=W01Hdp@U<p}L_(
zF964~kchO0we>F+2iq4pQlIDBPCAKgay;gc<1r58<>PEG81|yd5U%ijJ@9GJ?^5aT
z&waz)wdPR>v-6_Q-uw#x%E<nf=2*+KqOrN8OaY-d(K}+Dp*Cw<0;~IDdh0d0I)~HN
zW$0I-g69Qq#eGQgJ|vm1$vv<IZJ<d&1Lwuh4MS}|;~^gjezpQ9_0PJWZ!oc<22s~o
z3Z2NGDMxiIAyuhj@0oV5>l+ukx;R+n-19l#m@q_}9)5eFHhVPwa=hr!hg-rKZ>!`z
z;|>{VGp;twnD94ow<H9+t?da6B(>PsiAen<chcN+C^kli^px!8#d9_5hCFlW?LE5K
zE3Rv8&?_`;Y?tvWgMoodMsz8t+sI2jG255FC_0KQvu1gvpv!ij@4C){Z$UU43Qe6>
zNTcWeqFkpqU>4_$KQvou_?cCk55+CsF;Y2NO&8ZlaYV+roD?!rm5UcNobhU7xx`1%
zy19VS*U0`w@ms6sWc2(}XW?8V#uo^9BDe$VIuYegmbNpt$58brvl-XgGm39_IOJFr
z2OVtQnno+i>N@1RCAfO=I|(M#$5t+{3`e#4d3^0+iRTU2+-DU^d6gmf*S>)2Zt<<d
zjXGO-Rt^IZyJM)iWOTc+cV)J1IhRnn?zZ-@eM4O2txTiJ9#o3Zc14Xt8S+EXbf}O|
zzEnuxS@Elc<@e1KCC>>PHC}ytt0w>on{Q>ip!EZ@ty203RX@Jv_tCVFrfllXF%))*
z-)N@e>iE})RQ>FNpzc;B@sP+0dEu8`{1pXge$(1fzXZ~>7^B;QVz}1L8K&L4;)&Ip
zuGKx<tKO7}cb@~T@hg(@$7?<fu!GzIh>C*9`!6*FVkM104G{n}^sDeoRRQ<;^qy39
zL^PHqBO6{D&wGDK=srCe{sV{wPFej9q~L@2C`h$kgYeZDaxh^9g(R{B8H8@kTSO?p
z1llh#zwDCr|Mh$@8@WBDRF;qYhFo#`wxzwWxTQY-%7@oAM4$4f7ZWO?%XL`MfM&(I
zr`W^8?57|b+V@=0h7RV!C8*9YqoFTX_!tU3hIaPI61=VM8OXo>jM+)nZy`GNGPl%=
zO4XyHqvQa0u7iV$%M{jUw(RZ>s<oTL3)WG?pQey|It1dWsR?Y;^(E5{PWc5p=XA;{
z_-Se8_z%6mc{dm5n)9Pnwo+f0pVi@LCblmd3RVlh)W+kcUvsCcDX8J&=nAi$F`X%9
zi1vV?o~!dgds;E2_g8NHQZoe|#yi<<w>4*NZ7&HQM2~h4u3aDG>LIQz7mw+eAWUgk
zacMGiX8|5sDcv*Mi>j=G#U8mLu6q2{jtYFU;z<guF0pw^8YG(K3Jby4Vl%Di-ek;e
z@g0Q4CnPyo@f8vz9;EG|mSdM{^9Hr}6*bFB;}kNoM|@MW`wnAOw5FZ<eke3>(i}eB
z_i9#^9ue7Z;sf9mu<*S8R)mv0Uhk@rNqOu?7gSb<IXjvxMETC!9WK4$oH+%p7|s2u
zhL+rSPe+El*Y~YkN?s2SI-j9yiMmY>n1=-<>_`C*LClxjTFXt-P-4ByKcd3vx_=%u
zA~G{KdX9{y{nln1QAe8l#@CUBxuVJuM>gGlKAdqcI?yra*}+=%#f|QGk+t#*?rYJ#
zh_uW;qj=%)oevA51D9Z^`53Z(k}i4q@*3xmPP+2y_3}uG>7gS|ivu~4HMFhXrJb&y
zTFc%)x?9C#kk#VKd`R?&JU?@x=@$Bcd5{n5sBmq&&S6){ck-a?7}9yKHmC<=Jwg)B
zrowIr;?yv^0?f2XkOiQElQh8j0MY*6kVoHujWQf67FgI5z-++<%rpS`6En>Wc=PXp
zm1ai#fC7YplZhYTV@cv^0q7&}-khYR@JZ<*7G|s)lBBm;l36ewNCGE>2#JlP=X*|l
z^U*DAM_~Ta&!9(Z?;TcenJ<l&GItD5)Kkj#@-Ome5pzE@NHJ$3ka)9^Z{G2BanxA<
z?aTH-!v(eCORbfcT)vKctWw&&G_^;LOnmohAd_9_kZ?i9_+EEH!kBgF?t&0vMlfcn
zz&E~*1VoEUsXIgZ%S9K}Cdb9zOVI8w`-J+moSjW@(Ok@k8M2XJ)}zam_)cLvwW%yJ
zSkA1%p%#y7VzaL#?JktkoKF(&F6}Y1Hgr+Jckfy9VU*WuE=u7w{kF`3j8$@4>zG=9
zTk6XlDLQ#O<Yh!Iii0k3H+fEsQMr7sIFxi>A6uX-UWHvtsWHB>!rvOXdCO+{vtcAl
zsn`us*Oz1E<mDFK4M~Qn^TtnSjV?RnKI;|bUCtcu+i2Rx7Gm@i=cK;5r>Kf#I4hY8
zC+G1Yd=T}+#$5Jbi?^M2LGf2zpH}a#j~({gB;bfGZnPko*(#<Y?+>z`PtvS9Bc~n_
z8g=EOToR_-^Sw!xix%(v+GAB$(tkP%4><mqu0MvTdc4NYo5ouNbr0XKVr%2m47CW-
z{;H#N?yisp<+yV>c@-NL<8_6yl&ZTP7R-L_<p)NcJE1NU(ZeMYYpK(@!@G^?FMX~K
zOXS%2cFuJVS2|V($p^UdkL+roz6iK;b;b?uKADW}(#kvNi7;7}`_u<82(skB41u$=
z5S;gi4UixyV0gezF+kgC2pcW{pBES#6qZ?yC$S_sIBe-q0+OS!g8++P|4(vvh(Im^
zg9|tbz(0VpK>i)}4<zxx=7wO185X_>*%RT5jd}CY4LwODy}%0)z(!)D7=SN)Sxx8b
z;<*8HS7Ys!uWrr<O@Ae#3)`Myr5d+|xrwv{9y*11a@j76xru)L*89ZCWr;GhPKP_H
zJO>#=ZmRN`%|2dG)A|?+&-f|MlvzUNW;LB-x?$TQ_=v=}a_m}ZhJd^A)4s%+AD&lV
z4%uBpmCcU`>Aq{3rcyoZ*#MjwP3Me_K6F?}3OYD{b5+sD<gn$|F;wLnE3s~MHfC?4
zUxM5$dA3_K`u30^{`uvT$9j&T2sMNHe!9w?qHQ~=RaV1$es<k{OGz0?2L*2`kD&rF
zr#0XB@R-c|j6##|`qt+ci$+!))E#5wRDCv;#MX}?lt*ruwGNecIityoqPHn+iR{D=
zFJ-M&`-@TwtjC(G=oMtF>XuiV_iSs#Om_Kl)U8$eiYBv^6tJ^Ci<UUbY!3>lA48_R
zewxIldcB`Nw4*4?pu=2{+f`u6F6)M!tRHgI>nufaW(c9kU>}O5ku$bqDk`q_Sw-Uf
zoU{6JN*>o*zseb3XD0_egk&<5%!~~{LEGGFwQzHgCec+T+VuKG5Rc~%RL#~))Sr5$
zYr(f%dr{x0pqs@9X9%hKSHWoH#Y1tst*!gz)nWr2Y4wPo3!Xxy;*}{Yw5U+iOp~20
zZ3R)Cw6fW#Ijv)8Z_@tVRAZOl5r4*Z9bM~YUVXEC!Tr?|Tec)U^uc}4i8D>ny=YsZ
zuhEx$3>z|V#7kp#K5e!JxWDtU=3INR5XwYuq|rt&A(mS+K3`X8;o|4sGAfK}1aT88
zajV*nYKx8R`PedJCel?Et(t!9ie(UMC3kkn#O(2^k&TM)ogWjH?|qYnx`Ni$^Y9MU
z)*BJbB_9S6>7FdRDxSt5GYZ%F0q-X_^&OTh+TZS)GOR{|836|z(SfsUYJgMZ9>PvE
z@kzXu2UzFKr!jmvJ-kK`%;)L?>;VcOT0|V^-+1a_M+ft~hqFB|L*Fuj>}@0lmQ<Du
zFi(;py!XUX{xT4R54KB?V$dhU;e4=*LlPL}H`KJhPz7Tmfr*megeZ9`@LcDzIxd5x
zkI~1a(ad7uCwPT<b1_MWatf*rtHL*ql<F^?`Cd27T%KuRhej<{8M726gsU(WAp19z
zQ`%~l173xuMcLh-`8NE>``q<QA<3OlbA=ysi*u~rh0>u~cP&PQsiV*e8c1s1wT%kf
zfogNxi+6uqdEZNTb+DnDrK0p>kGQK*Y)V!m0j-K81UXKvSB8FE)qNEABV&Eb7%^LI
z$d1YxAL!v%3~-I?p)fbj6n@pU<vUoLHLUZqBtI`+(9oTFYoK=4xQR<i2f3Fs+tPf;
zdO0%K6wAKutYQDpy*}&u>2yVhoZ@@p<7YNRe8_z+G^{8`-VH27*=eQyh|%+;<!sGP
zAHBEZ;AbkzRyNEokl-*nrv{`LoJ9md9B9KZvHja%e!|h2*RkP+nJwgUll2^fnhLd7
zzSX7jqqyxqTz4Ogk7yY3yVPB4c!#NH=2@t?-pZO7uUY`wenodNq2-&wt!_<+5mkqk
z*pELlyjS=5#SHUFNQ!0E4##}T8pj59g}f}p>&lZfN3I`LitnSI)EBSYZ?zcf=GeZ<
z>}TDcu+cQ|n#yDEE!Za9?4|X2bJBiod&oxYFe&0mnaEzdhI5nnzdf4hXHZXgu$-A~
zVfMPC+aoTRd_2F2C9C(!&3&dbIacvJ8yaR7X7c3WN+vP=D)!%M6B8D~e7=884Q#J%
zUXo5d9NF%2Ho$R{HMm;!wxe(5L(0*O^zp(TmA;vl??26lQ03a&`aUF%mY?9cf*=L>
zL<B(~_eh)!Vwj=7k^=As1WL=Slf1#H(Ekl)7}b2lum=hpPXdB>p>KKKhhg1M;o?C&
zc#a@q0egHj;Y<}sIj2AnHbVf|gCGN8lLiBi(?5%lfe-;84VxW^l82QS=m#ZjnOR>l
zKYBr5AoEm0TV6Q6)%>s5t)q#?+_-lP%b6%Sa)kP2v?#7}HAeBb^9C|u)ndv`J-HoF
zF}3+Qp;n=Lc%>`7x(=;r?{oj|N)<-)AlKaumCrooKAcFo(GL0UDc7Nh;XM`IkU^i8
z-HRqHIs?I#ml~{e3O{7MZd6k824VaRbF`|4sMEr;M{ffy?%U=J4HD#OjA~Tca&D%R
z5F7s>kBiXhdNR7zlVLOCnxv;HShS^OyD)&fvgY(SX}-;@_<*5uD7G%1Za|@=H{P~q
z!Iz+Kc#&LIe0^nJhkQNMz|<%%$;&vj-B1FrIK#e|!WX%HdvypoJDjBHZFto>N=!qP
zDeBWeU|fvV^A7_COIa`HIkHRdSn9J<xiVTiS&1nrXG9isy9$UEgu8JV#upewB(#dO
zIikw;*o#MqiHpu(?w~DUVb(Fs8o3=?R&H;%&$e8g>C%Jb{N!5oo|zOVU<`k-(li4~
zqZUlB%U`1nTnh(YMpeHUQ>I}}VF@KE<<RWq>!29&q|;IF66pTOHa$fX*d--o;^cWT
z`+b#o^WOLD93(9X-%*Y$a(&2F<dUlLr3@cq+)k@KoZPe#`;I#f0Z8huk#f#^#shWM
zn*;5lsOc52;<8Y_&QzEFc)I7%r9zc%7g~jFkJdX;bG{miMbGALEpueI#a_+NR4yG4
zVQw_|?js%eq{ubeR8(lDbXTs7=dDXv*^aUFM&im1%KS?y^Cj`3uZ{?Lm5>MAO_|o@
ziz~ZHh+M0IB^@y*(S*t|P6NM@VEwM(?>C3pY>+_fsr1N~mgZDd^rGr12Nz(p!v`?B
z!5K(l1jVV<^E(#?CuLJ$uhReHi{COFp#4OKgXCE=*hGcNjs;lYEeNDOzMsm52k)Hn
zhodcIlKv3An!g&JKlDbDSrT6o!yiA3ke&teCL!3umWI=fY553=ZOcrUcB7S)tRm&y
z&17MQrv*2YflOzRp}t9&CX0eCaxImb%d~;Uw~@>vTA5SqN7=nv(M&daroKsqQ^@7L
zNQ-j?20N?Y>$7@=1~d<5>c0y2ScEm_D#^(+QD=`-R^?VyF;uPENU5vP#w<o_a5DGQ
zruQg>E(A{v@HOVvn+;Tb-$qs?-CW7Y<C@LkQpCLsoy-Q95E5jsEq~1?@k042YQs;1
zx;A};icAWkx?uw*v)5L(db#_<E}9{WFJ*X_Q=TQfVr^0VWN5)P#L`3Lt0>!Of|qK|
z_LPMytrAC4mdTPcq5dl-MhUlrl<tI}*BgsdLq^-J){FJQ(=pR`lMa%Wt`COyli%^G
zFY~U;d9iRk_P!S@r9nrkgIBzZ`uw=PaZbm+7^cxO-bPLIF%;R)T_m2hQ-3bA%_!Fu
z-8QGqj?^`r%u8F=*Z}MzgC5yXPN4S7{q}y8FF!wR94%h{$)M74snwv8Ni@PGa&ib&
zM?Mhw^y#-i9*c8BSK#&kefR??fDcIC!+S76ZWQSAFgR0xiiKYqoDgvmcB8^1By|94
zJs5<_O@KSb14Dt*gg8<TN0N)@{R1dV6OUdk3&P;SQcEU=5I5hzDSB)&A~@(~2@*i`
z-S_|s@M@pvbD9@73|`3mJ_BhOJPGtYu|B{9yt9r-lPnDzv!tg$PMgbDlR9Tktfv!6
z&9N{1&9^bX{p-xKoX3+VF0v-sv&ErAvjz6(p9$e$FXicRuJPK7a#pLUULE#cI(%BP
zK@}RJrHoMP*iS<%wyx2XvfA+k>PR71?Hopje%j^dzn}a4O%DoS_W=aLGZ-K{Mob0F
z99T2_@&begK{N)qrnktziBG-xi`?Z?MtK_woK&1Uly{|07zB0*H1QB%QXnj_kI<h8
zU-ot~f=CTpiyjU`lEO*>Y_`Se!ubNiF)tVho3I^ai5z7St)#Nx{0RhU=qLa1$IXYy
z`Si@Bgi^O3HIeriFh@|_jJf>NBS@YgW3D^pK%OFnCL`N{W?1w0C?HXT=zAok6xtEN
z>0*!C4TY|Z$?6lD|0F86QYeknRNs;%{qZvAt#p<chyR~v{uDqH00#mJ1zA2g1HuSz
z)_`XKw)nWZz^Ex+GEcxMl$OitfyB*UD9!%h;yoHK6rO>*a#(l)YEKdP$&&EaEU>kb
zS?hG)2KEgtL>jR4fIE&tz%$T|KdeUc^ifWqOLgVhFU3~FX4mAYBXec7dzrJpaQCAZ
z2b4631C54C``8%?(5vkEod?PVCDo}d`PNP6wF@(8O3Lchj3);d6sxHEYSgUu9NG@o
zzv}D?cy=!bfqTy8&b6?!mwb&mX$dSTB&Dj0cg#g?N<1y@OLFE<cTeu!n26GM%JG&B
zFWG;S&)S3odM({v(bVr_bIBYbL~1jO1_(`Qk6G27H_aEHwN@y)F?_9sb^937-U*>a
zZcFQF1)uw&BCOSRF8}+kFWd=B6Rv$GO`(up{iCV9p5>stg{HIM873jm(}s||`CoU$
z{=Vb1A%5JN?tILGY86#So|+rJL)*`gJa=(p__ZP@uVoUdYB}jMusD~Lwjtip>ECW(
z?GPwDrQ+8+;wS#u<^QZN&=LNAWdhvevpjc!U$2zf#&>A#5HI{b0FUdmN6HR?qJOLZ
z<2p_Jgw@fX9>E~uC+7dH{?F_G{(}F|!9O4P_YPa(G5?LilMenqjsN~Yky~W@?O~d!
z7<5{d#>kfFUtnZs1gRYAIYncW{O>GfIQF?XX;d`xCbX-*XLIeL>hQ>P2(|cikw5;Y
z$^^ymYhNASggsX7=jEgNi^EsgZaHhYozt8XONe!)v8q_KQ9*a}^e;{GY!wc<l)Dng
zUs6!WYWw)HnZo@lmyP0cARYc3Kq<p}TR|{_9^R{R;$NNSIzafrBqdznA@^lmniuMU
z{vV&yph!)UfxrP`8V}8k#$+RS8~W}k7T6pK3**x)2qO?X2qJtkI1^9G@<5FYp+<EY
z14ESDC?PAsy?j%UsPNTbJ+t0n+s<t+Dvf1%^h&g;{5q50_XAJyXYsv1?XE@K8dY<<
z#-!5B&h-9pEvTdfq_dZJ`mOU_Hytd8J_L+7IhBl&og3Jfm-jAi{$wTE!5Ej2xs&DE
zIY_(SNo6J4$u~WNJYu0O-g*LV0Cj%hszJY?C#a)_ZS-~X)S90vwq;4<CPRL2-A?No
zakZH{Pq)SvK?jssE7yDCYP0^-vpKJKt$UQxou~T--=0?UQzNcDYt?<Lu}*hF`Ig6Y
z{3uHPQA?RLsPbQ#iFNWSr6Z`mFFKXTd)vq(Q?Oe7JNnPX_%W2~!-9cxyB48eV+xS%
zTVHormY%OfySLx+oX!;7*Z7{42U8szz1c2YKbVAdc-qluW#%wp_Nr>%Q}|v*&*^=V
zWt?93OAGQtw9B28*>(n<Cfk@+HH2GTTj<fnHSqlBEv8}GoK>cwzu$suRdWX1(&7as
zM!%o;n@_`FAtDBK$;PevIx@S^p!43}Tg)?Roy49Di{-AKaRoaG;D@aHc?Z_S$5F=q
zie*pAL`M>NHH<0~JA=g@57t95sPk|~@MBC&ANNB_eeIG^=VpKP-P#HsTr!TE8IrC#
zA-d22G^tip>rT&YeOZ12ckk8D<LLb#nlzTh`#j2KP<B<EUhih85;s4`Cz1SVqg_VF
z|9*5|cX}wHv<|$K!|}Auz|B?E3dMm|sv2Q=X^%R3yW(mv^>w>`vqLo`=d+FLfN|nA
zq|VzyC%Q(b%_pGys~NQ*rUbT@T^vRg{?uCe3TOi_jom(~dIyLbGM>&I%N{wmZPvlh
zzjEkuf2W>2vv{vB=Byh(O~U6qj@IVk%qQ=VTIq5-=g^{7tlu*1Yx?8DN*~J%YViGV
znXzu$KE(ax=@vY&TVm69{pn~RPEVBR%CKw2AJ&8mz+t=s%z`ik^U1G1Kx6|bM1m4c
zlVqVmOhRA{oD*g^<xy%l_CZK$@&JUYL23q#Nx;Cx(+1)naHtw0GWnOG^hT2&o1Rqj
zhExtlG9R`i3K%{mKp&0+=47BBR?|T*86O@Nj&KGrBGP>)z3X<(HvAaej?VSGT$%Q8
z&mRlGG_LolR}$!K@ryVjS@vvwVkh|zqW@9BrCsPMrwdJ7zl@IJ`{7Hea62M0L0?FW
zn1T|5&Pz-^X|1vdHP|g?N)^_!<Cj2-k0iB=x5Q9-AUS=%cn4&<=O@Jl6@Oc2^rWCx
z(Ojwb82tW^{w3jX5pWD7c^Y_5d<Fz;Maum$9)swGCWE;ez)9$v90i3L#a*+<CXr?j
zqCo=J3~VN%heP?vG8CHNCrb#tWQ-JqRMrh(FOdcpDVMy=^$KF&dcQ&VdQ!)RKSaIV
z{0AW;Lm$Use4ee)hF1E3>o+B{2}NDqMfv$8!KRg>uD&Qa%0s^0F_WmtqzEzLE7?}N
z2?~4L>P0v8eNvJ-DB3n^OATHHYZuH|v=xSl+i`krwU|{>J#5&p>Fw-vEA%tlIbzJb
zW8^Ww`2ELN0XK-W9n`lrdEND(@5rR~Gwiv)ole=NxzzhJLFD!twL25~OObm;f3+5!
zQH)}aBk`+hE8Vcyy^B`%`t>^1if$JbFF1zyr9a*pK<2pSUmLG>@z$ZR$qhcJDY`zP
z-Q|M1B*>PS8C4nix#gg`C|yU6(^D~{oS-%;U*HA&Lk#TnC`}doRIGXiQ5tF)ny0J|
zz_oh$moa;3om%OB)N0yYzQW<K74Kpyi5KwBDP*hL&+9eXD~%5d$BxD_sEsG;TaTeL
z+hX?{%ai}HY=5sHT0A#UEvZa3K|E8+LdJo&Bh#jsv^&nr07D<_-bq?-oE+h8=I|bf
z=!(xCwepMhsg{WKdB(xB-feUYCGVb9S<{ygB(W%(l-uAEh|eDLohW_(_ZI+soCXy6
za3tZl%Sn9QjN&EU1Z+~%I7&La3*`zIrsrk|7sfJ)Gy(7kJTa?H;9Sphz(g2-X)-`k
zSwyF1H7NwAcwDKj24ydJCL{<dy<M4JsggSD!9jUzg}H#dBUfL~W-c}-p7<P^l_fVf
zL}h5i)$hKm@m;otsc+KSgHK4OJQcTGsrCDMw#7TEd@i@^ZTc3B+RM+S4%L0q8@e-`
zipw!HFtsr1VC6ZQnLXSTS2IP`ClEb(v53?InekWQs9jmv&%nwJTZuERlMtd>aOF-#
z!9XRe4&$-~&UnApnI|HwIUwxvJ;vw2TA|<3xS_0&m0(m)Kl-P0I@;0eRW9w<J%@wK
z#W^6>_*LbMMZw@b*6=IiTrHv`=v~RlA<=i+rg3QH8RzSbAa2u<BS^KJWsouDNoXta
z-X@0nP@wCfD{ENiqq0q>IEh}8<`mcTwNIa}D<=a#TkyiUn*rWseY<k~%Q_7&{JWDJ
z#f|@f#Nz)7Bonos0uwq_qrc@yhsNLJ2>35AKw9C_)wx7&r|Hj$p;Ib9H4ciG1`c`_
zJse`9U&69h50<qRabnLH1m8R;nNr!`rY-mfNKT|J1oju=+#!AdlHDM*j0wA<p?tsq
zlDqs+XcCtuI9wPJ1SBqTAP%J*g`BP&1tpLua_Z0NfzN^kGBEz|W-SE#+hp(?M@dZA
ze1mFN@_gBjsaEC&VlBrA=UZ1AK6VgBJ#9D&7|6$DZ(Z(?!skx>I<I!S-Do(*<I%y>
zjnuvFk<pu9?aH%jbY4>%lPj#DF0!%_Z|An2E6Ux@WDQf8oLmrIZY|q()155n3l`QO
zu4i`)q1HFxRp!@vhNYA+4z{GC^Eznf(MhTWG}Te{dkcH_S1ulL7@CXr#)u~w(6)^o
zx*YNxcq~qR&M;*%nF8BYD;)+kN>ObBv$??&-=D5%8|?YmFTd-G2_DZL*P^-8SSl*o
zIWWq3U{LkhEtkVbyux{#)o-(ZqxJ7?qW|l=mNy9XSr&)8T%O8vr_PX+JC3yX;&RZv
zEYw|2sOI~urP8GKX}0#S-cBuKv4yrO$HfTLa`Uu+j&bD+)Nrez;WneskzvMm+;-P!
zjPc{a0-da~)UfKRjnU;EGb6(GmQKdLpTfjA<G{i!j2av~hKNrklym0rvzRfq=4X>C
z$Iyp?b;E;BPO|FN@7BPLDxVAN-&tArYw+pR<yxBkH#q#M(zq4M4O?yNkIKAu%!ub~
z6mD~LjL5aXO<}~Ohj03)8q=uxdJM7cyZZ6%(;1jkDUOv~`U^SAYB4?jH$^}CZ;BrD
z;(rn+1G|dQ;OCr_cTJMH8B)U@oM<qBx)xAL=4um~`~^J<N}#_?9?RkA%G?Er1!=`B
zBKRktCw@OEL`DQ{j7n|UHoF;rUf7-OXMCf-(v>spHko+d0?YK87aup(y|s_U!Hl-`
zrdLw)Cc*@w94$jR3w!y`4hH&e*{)Povt;dmTajb^CWrCr1EJ@pd(L3Dbwa=OJ6&pz
z#pZkM1Gl7xNyk&>sz!teQ2X)&`bt^`HcJA2O(g;ONpu}d8;)h=u1U(<##dHmhIl_@
z7wlyA4Q+-M#(nkaZ}r;U`fO!gcWpDaxxam0eDQwmVf)BYYnZZIlX&r+!QEQ<5$~A#
zB%9`p>hUDqJe2on>T;dpSZA53hT)oOUY|gnoyH^4;z~tfwx(GX_xz#A30<*`oI792
zy+t(^oJaZ6O9foCNGR^T9`+{GAMsjoiNlhSxf|Bf#sXsdyyc=C{Ybv4QiH^4`aUt8
z8;5m9`s-0?xy+k)W4G=-Q*Ic`DGNvG6DH0fM{SFh))x;Gjar_hTD$9m_!0hO5N_L&
zTO`VN%KI7x?X_*jsckfO>MlwBs;fbaA1}Je_CSd0@EBU!Gbue1JxE$ja_UnO^@Ne~
z9}dj$rEf!FK#^hmvXEfOmbf5PJ<i1=dvZUWANqWRb0<aRPjgi{$4rmxBi*gVBjncg
ziqCv8^|RtqJvG{$?H>p7Jcw%v2s2sS#wwQV0hrQ;Zn2ctJQa_-HMxT1KWnwIB!49)
z-D}ybLd4l#9bNF^ds(-(rV3sn-)`a%Ye2e}5SM(yUV+W@d*o(#cBw$RtN8M$K0&O{
zxt4l~_YNUmz1|_$Hg=_lRDv^IGpWiyEsj#4&Y3BuvN|cQPW4X+->q*shGyt0j-j4n
zt$~RoPU*zHkBie8bID6rb$C7Y<7->U1P5!3vs`+8N{jc)Tx3kwcdD$r3<hg$BlHFc
zle==SPit)l977xWi%XmLYdg2IJo7lCU29$sd|cHxM6qp6nDo$PzWP0lAV~<)guwqq
zv+%rc#3VQ;pm|Ty;ZxSca~enH2@{GJ^3-?}cY(q87}&+IMwhz-YjpT$KEK!n!h=(R
z5UD?IosFD2lIDe3I$7XR>8pgHS{fD=*6fF$J*TtN@`bj8!foz)t!TOEFh3nC$whxV
z$c)OXOTFv2QtVe{j5k*{Xk#39*mh*>waBZRSEj-4#vfZvO=(T+#%UCnW=gSA*6}oO
zglC7HHyXvHGZ<R%Bz@9$xF|M0KksmW+3S_Uom8u^o}wQXHUmm>7nKFN_+_MXzw8=*
zMVa>|*nZ`lqKP+qRZMe{K37SFKkelYt}VBLphJD-j?JAz5*6xeuX0J36u+AJk>A!?
zZ#B*@cWh8~oH7kQBhkTg$Cay5E7)G^VSZRb5^vT3p^ov_l7;fpnkTCVpE)Y@185wi
z;&#lcE4Eo1T<+*-sqdv?4y3WM+2lTbm-|cw*CNM*S9m`z2|Hn9spw)o*wiQ95+y%e
zcy~)2MXmbgoA;PUKjS_9vSRzF?4}j5&x+r_ER=)=THF|Nup_39l4+?OACk{t=d^U8
z73OGReO+yJ=?!HKXD$_W*l5o)3*|dM#_Z%TRA!Ra6R7lSy!^}H1^upa;d)r%aA5!=
zX1X}+f|&E2xFG0XF31z$f*b-Dr2hZW1>tsGL^T)sJ-A@j7HeORHFK@CP1SjP<>~uY
zkg9=?pGSAR<1*ZvI^%ded80(zRo6SqEq<yNO*I?o0nvT_x9Hyb<D;F3?!zj%7fHRv
zUs~^@s$(*%b{HvE+f*Mg<_r$TiMaQoMA`CkN^(OK=lR*~%!DPL^{)3#<e{XDOXBNC
z?x5`V$4p!e$)6F14G!)XOQf{0?Rv&x56;L&cZ}Q_MU{wJmsH<yy#2MfI3aq0CXenc
z_ZEALQ_g&Q;DUY8+h<)W9b#kp-{#KWgGe&w$1oQKOrzMdz6{$8*KE>CczRs#aa!~w
zipxvg(Ye`Vv>_H&_F0}h&tANDPE@c=&!=6(Ob=}(5Y0CFLPWNAzqcm$egC~ZrAFoS
z{Jw%KW$nDBIx)vkp4ozYlW|U1(8rzXvI0F|S>F5MNZ4%uGF91@uZPEhn>&!=Rw(s_
zR<+Z4{1v-}wO1pE4gF@t)bJZHD?XQ}@oxlQa=>Z=L0dBlOg6?}TL^&*hL3e40A%MO
zBJjg%X0UhV{A|r<vV;c%XVr&8-w7;Bm}{e24|tW!;{|#TdX_vlI-0^lJ!-$qg%i4L
zQez%NK5>WLJMzk9J@*dmmUY(mM>sk6!p)o8=XP0dI}|5;MlX;aq?@y-hs@n`xe{tq
z=Jj#$dfeSjrSPcIJ@Yq7m7|UxUN7AWemFM7U!nRDj9M<Ps%RuRFBWx&CCG;+f04|L
zsZ`OW((l`}kfD-5ZZ5U+QLn}4BxB5B0Vk#E%*ADmzt~#(5^^=m{murMu(VN!m1SR)
z?lF_;Qj%Hbazne9mF850b5c9({q?*)jP;$>bs<}o`o~KR>)-7(G`oLVzq#j!9qc;t
zo4HzkF_%h<#q^H?<dXd~d%@r>KV)-lwwJT__wv-~XV%|$bxWze-^{Ot|BQO=VsURc
zX+i)+DP+5`=ku<84(|g>CwgLv!7GvJvQ#C*jrBO=DQe?NV|+PW1)op5KI@+?k7QO3
zXk)I7eO_PFuRn)V@3-&!3gs7m3^5%r4R1!A8}<LSu>bt}9}I;iE$`si2_<+Td3xjj
zuC37MTV6+xCfP-sYz~H%6I)(Te|bOXnCY`0-VdEqB<C2bwQYJOJW_q-tiAs7ZRcAw
zRyhn@9o;=7ybmuKmx@d!Jou8Df^-TkdnSQ>ealv~;Pa*0xmD@1S-P`PgLcsgW`0%)
zSuIo5^EUnZHM$y)+*~Gl;%9_a93A8193xy%wS7b8y~Gb@rThV<hgAZ_S+jd#3DPRy
zw}5$7&59lc6s`76tEm~I4Iz40gC_`XZieaJ7eJf$^&+Et^A*|NTJ7Fk>0@;@6k-3m
zW7;EEXhCL(@{HX=CMxZEn3(bf^oP-Sx=x_huBtyeoeS8g^Oqzbcng9PZCtR1%KGR(
z@j{;TAvXw2XgYj4C!ijL1$&=74P0$JI26Q>%_8r^nNBz=fdT&y9)I-HhHM;KxHYkD
zdIJ24l3cegp<=uKkQ~{c<6gGelCap_)m*Ks6=I71I<Hbzu^0B>7^-VOn)7DN7(y2L
z3U0IR`Ybm_vOf#&U0hrzibT!Wv>SgKiK*0K$PP4)<FDwbV)?+H(;dzy5m#y$-@g(6
z^<7nX(kt}nqjcIz1<p)LS)o=h+#Hr5_l(zJ<-O}3t%1b_^B%x3i>i$1Vrw_3b=)wx
z;&nEs+?Hp=y~0@XhhduZyN)(<SJ$L2!6=(y1;drMNM&D@DH5X(Q(j<~LB_zowQ_4m
zhqd@mr}*KCtC=@5-xt{~uf*rXbMp5!=Ze^C=}?<}n@5Rp3iSOf5~$Wza2+o6Gp~>K
zdB*yz(&)pY_n<&R!Dn5!vPX>AA6!&R7LTC@hXPl+LrQt7H5m(&O`DpT$l<R}`aXFh
zAvs~2*16`yCC3l}VXC}F)7y;eqkTq)+SFF%WBerF)`jnpwO%+M0UU>Gr=e+)zlWw5
zD>;rVVuD9@?D_YPp`ndN>jSr4i67!Kd9PeIelPYvzMF=M%BgCPux`b$AR7)y;xpN9
zkNwT41NZ)S)wA)(YxtMyfy0A7F-*HQ87iZxCA*sj1ux8Rm(_0elW&VS4;u<IQl_!w
zRAw|MRLwA6OJ%d~<?oniD-F~6Kec@aAeLSG_=ARuN~JPFDP)A=DT!1@_9oec>=lZL
zBD0dcmA%Wz%&5pFWUsQfWW84Xuls(Gx9|Oa@B4kf-(Py%_jAs<?{l4NopYV*y3YAz
zgWzzOD=T?5ms^-RDcUl{lIG?MHfU;#`;!Q8OVt+hDzgOD^tyNz=BXB%H}3aHHX4?f
z7SjxmNlJ)gt81F#C=%1*md;BUQlVQ^4Hdq4CoD2c%lJ;(u6JVW3i&c8%w&(M<`1;$
z=?hNh044g?rn20x$7a5n<u$y$ASBo{5FJoow4zp38vP`8;-hQ+=>4p$&UkH#qI!|?
z)&9>TYW`Gvd<<a@P+H?ku5hQ2+pqfJLZod+irs}df9f0QvQ64C%;RAcvcnGAzFjMO
zMXkd}?4)(OM<2{Adn&06Q0Gl_A3wi**4`i}mG#beimtZ5M9toQ!#VXYomWCC-^rBO
z4XH0$c8jhQ4JX_^W4&e^CSQ=>VyeKS8uPI~jz^Mh9eLX{Fpdz_0VYB@O(%D}#|V?6
ztFNcHi6zV_DIc;S%#7+e+#bjdK4eDuJICgJzZP+`oIXFox!clKzBgs?>xZ5x>pP-z
z(VWeKZ{nD9v(wcEr6+DBMyKT~>ixtpT5DIg#PKBaMrzU%>RFmtNJ}&dSH>iJ#@(Af
z?AP>&s1z&taU?h^P3v<1w0&R;1fEjt?cfD7(a5mu_~Y)<<U_AoQe?uHiCG2)sg0~!
z?vL4<nKPEr*50sNeDM?WwlKX_X*O~G9aN0pXx)Z3e&nujnm0Z0k2Y)A7*H3w7^y-j
zk}f)HU^BsU9_!zRov1w-6Kd}{8kU$7P2`YdZ#LUAF&0X`K<^8-T4XL*!E3lLwtc5I
zt*LZtrgE?<wscU<>vi^M)BD8c3$^D|%Gh(x){ihTlgb-%%LxSrhJR^KY3}MV`C%}d
zI#E`sn!9{9EG+V??yxw!7{6e@i@aDJSvSAp5uEn2`@hj%M5+Z8=E-9x#PVb%j(o|p
zkPSFZsXB9%?1bY6=l+*0DcGuJt9~-yTH@G~ZuN7$taD!v5C7Ps=kZli$v!FZC&q<W
zZK2XE+Ea(hKG2VXyJg<qwY}h`NhDEs8+}AgnTU+tH_vWq^$x?pmCvn;hq>5VUo8fw
zr7>G*&J8<#xuYzZDoX3`$6VY|o&HLEMaaJ8L+UHfy!--bml<*gA+Dq`g|iCe5vJ!a
zv02`ckhIFKecad>O2L(6eLC(yoqJkB9Cpyko{1}F?EKtn-?Nsplc&E}c_t<4uMnwD
zj=qUviZ@VbsWKW1(KDe=R%;Jeyt@2qX1lSyMeqI0o<UD@nIu(C*`)FNnK>UyKP>Ci
z^-RkL?8S}`y`fAJ?)HdQ8*l4LoN(9S&>1sWBegwdd#77@7^^v9XKeRJT<t{9+eK4d
zi>ek~RkDQmZ|NaVsv^=_8mlcB+rH1UlPf$GS92{37Np!j0j%f1;2N+)N&4{)u-FSx
z5F8-z5D<i2NW}P7zG0$$OcDSUZjj+jwBYwZvil{@HRw1*?MuP-Bei^GT5GkAbuvqW
zcyXfYPfUD$nMq4cM@nMDBN5eW<qrz1T4W`rx=aggxXb1B59Z}B@FX@K_o)*)=Wk$Z
zZDrGyT4D0ur~7@#m+qud^6-Os+-5WShJmvBk0S(>*}qv~GtZ|AeBA4v|7k{TPUlHq
zLekp{+S<nTLi(L$jqXwPo@K!wGLI@R|Iq8DQoUkbH=jY>Ib9gp^nR%@t@D^6t<CA!
z+s||Cl<RA461wDF3aq-rnjg#*iKA7IuvVH{mA2}adS0}&9&Rx#kj%Pi5}%pJWMkB=
zv{G01(!4W{nUT}F+3r}&#}@^9w$;T0i=iScjPHa-z1WxSQw&4Zv&g9$bf}Cw@-mfr
z+qsht<!LPrixi}P{fVhC*pqFOYSQb|lbRCmSvs!YJ}_CHI`<Q!Uc=LTvZ-7Ah?Ht(
zp^?qP%9LKyd;16HrXRm3&`NH3U|KX}f9VYOVOCw!_q7QSf5pu1(Q6#+<`&0ha!ti8
zsip7<*u68tQpOcHRCltZw=;Pth5lhlp3?s*jp5x7KOcwpss~R;otc%FHRP7gYM&hS
zEcCh|o0Fp$81SJY%81#}=OoU=QaSk$f^dy5|HSNuePU3?f{R5;PpB&(Aox+nK*3Uk
z8k5b}lGf>;7}F-=S2Mi>KQYcL5gD4DpEf9I%ipr<=Q-p>Q75aKB#wMV8Q+SeY{aeP
z-TEpJs{Ri~Je|Q9*bTh${cw0+wu1>>y>`Wu5e;K5*`l>_L&u$;EV92%q<y@~`*l!{
zepz*@Ji8w2ywcLkVP{}`{y~n!+@&VQs96QMwGUx(g&s+v#C9^1$@<gm!U87~e7Xc9
zS*~2?-DwcZwU}2pY;m_R@a?TRxpMN<!B_g9t`1Droj*>$>s_B$Ux$9$p_ZADAosRF
z6$#>iSxNTZA=t%UT{&HlnkRZ7$+&RY$Lr{2iPm6)53YK~Da|z#v4lgz7BbE!Qj^of
zKN2gP*6LBkmp)WZzw@O*aJK_<zbNa)Y3UX9r>?hnZt~Kn#S_GFgK!$^%A;%_742qj
zu6U(QrTIXM^Ja0R{`c~X0B#Zc+@&H`-?KyzXn^|xmmBaL02{atY@3wRuvOtqmFvn9
zmVTuVFSMg;KEw=z?7K;0Dqu%)i<b`O1d{I}VW09qvLEx4E-!0teUnqqL*s%YLgVj+
z_T-%A8ENe*A|B2weAsBSD|p;!VNtuMvU~FOo9M(h19hMK>;-dP>fH&ew=1Spi1~@p
zwm<XHaE1E%`zATj?e@8?Hp$zSm3^PIq|W-5j%4wK=J_^TE@wL|*N&0py)hYNNNrmU
z65u5_b<Ll(^B9S%3+ii-P_kC4r9U2CGkA_G^zQU6-KoJ?h1Zoy7h{X447qJb;*zwi
z89O<R&oL$GFMcOW=*x8AFnxS>HTX=3#_Q~)s@$aTT(gNE;bBc#o@A6g+T)5w3haeq
zJT7*GQ#o%Rg^#s_iV7zM^_3QgDwy=ZeE!9hN@&b+QiWb&n$altBr|@^V4Ir(iQa9*
zj7nYKa~|Bbls1&CJgrD{GdgVat#9vr?rP`B{BDD{@(-~LPx6cwMYB{!`&%Cx>lv_L
zy2cgy*-B-8bwO9QMmO`I4XaADapej{_eo<pS@A<<?CJYwn&stdY9?xODd~3#3zW@~
zzpUT$7%`orYehTFL8kxpT9M$$8L*izyZJI9TY7_)Dgmeeh2=1RyH@1+tF_|3*ufo5
z^%i=W`Ci<tiK+oNhlk=~kM;VfT9!wR^{GuV3=2}TD(mJof6Ry-)Xy5rX_?97VZGgM
zuho(m-BwISZ%raqOhtMjwWnw)sV7CZF7I)=U3%!nq4VdDr4QYUWKGpiFX**snvjd&
zmL1`ltE=9lpOMDsdg-X<OrBTaL}9DJoLQ|^q&Nkqe=6rkay`u^cBeKS>rmyY!LM4~
zBNE+jL{*n-3o;&#T$L4%xzh^yR?KRQ>P`oJ7_*VRn-=uWmF|dYa7}li^*yiJR*U&^
z@EFYp595fC+u)rqNa(6QmS$d)Z?s@q^mhN^9@i*qe(WBX`sAmaDv1@V@pJ+c6axCA
zU6B*nfh^U&Z{|b2ze-4#6*RxCm3W`VGuBefyN^|tG}d5^<3qof@1~O?>I;BVnMXCu
zU;itwejx0J9db>Sml0#B5<dYAA1y9?!Ug!<i4QfEZs(JFCDLYcBlD)30y(y!-8Ri#
zfbhJKLyf|B&%gqYFXGK+yaXin4RRfl<j<NEgl{pkrk9OPYCpTykP*ULKS}Hw)-Ep7
zqI;<9Qf#Hn#6@x5y30M!<Vrdk^mQ&UdF>5VB^HPud!4*5<bGjMj(TYOnju3+v2VW5
zYC<`s-R)*dt=s^*R-w-J?+KBn>3^KsRn{o24>Vjk5ENwD)-=2H*x&0-XX;9Yh`Rd$
z-DBA{b|On0HOt596t(8}&dpwY(s|QbW)Ep~PE1mCLoawboA-YWBgtfref%gpS@-QB
z+2K1Oy^ItrnF=O4ScQ(yZv?~i5>@5j>}#+KT61gU!QM*iU@Q<1m28q=X%X?5IFtUc
z>O%8u?4VDr0r^z24R@k?gzj4T)A{zo)=wTIXC5k7)C+L5H$4n`x9?Ch)?YKptUAY;
zmN21=q0IE;otgrT0<Gqe3o7y|$4Dm#gCA<|i7M1pFcs<S_3Rxrqe=*4cNq$L$8_N7
zb?^HTtxF>4rmEAQH&u21qfJ%a!HUkOz>kM%_k2^yWAZ6ocI%tt*U<3T5bN;wZ+Y`C
z?Ku0g+L^HPYyK_SG6Oz^*3?QBdG~MKUam5KrW#bxEURrSkYy}bx@6lPe#9`H!&Z&Q
zx*77t=}xGe>GXA}5H(K}Xo#OUXB-FV;*8JMcSakAJboTLy~Oo3ZLr$Z`he<=r^$A^
zjcK<_BpV`sB!$`w^Q#TXf^NkJ`iFgv>Xwyx^ge0PhMdhN*|}YaV((Fn>GQiXpJFN5
zmWiemTC}=Peyie6kG!__n0v>O$EUt^{K$#X@%!F-=v-iQ?n~o1-!;y+x6asb8(q2`
z!F<nzXW=~gB({GWuSicq(#ilsF5A?Pos*$E537Z$9+X_wYxz<)#67XHE5|stZQ3N@
z_-JnTP+b_Q(AdY-a{9dP3AK8a4&vBK{d7<3c+N|o0|(k&b<F2;j)+HauMIIX8@#fy
zd|<9_Q$?2w=`zlAX0$eEuqzqL^`tO8jqEYDBHH^TJ%l+*&m=V<@4=h?4hiCfw)^kA
z?>cVa3AmGOQ~iDf8`8!mHEb6mIvC8ah|>#>r2~sLcp9e5QYUb3!Y3SeBUyRzUoglM
z1hNL#=)4mAp*Atm^C$%{;_N$;$jBj*=<anO{oKLF)H<;iWmShGNeRb%YL(TWhd8tH
zrVJDek5latKccC)YG%rlZ7bLT3A?7g_x{9aTKBNWWaQuPEwX;4_)YElY@Ks@xq{@Q
zB96i|MvGN-U+(I(-XX2#<o5gFca4-hAIzvWg_Bdg$M)$peKSiIQI=qs;}ufq;IUK6
zdnQ-kTgNeev^&&KdzpQaeT=qOM^hk@?gSN+sKNN4SoJsBH!YJ{T(K4tRI5IQiRwn9
z*{;UEc|zempZP}LkR|HTOYA<ABotSNrLtY<V&}?5tfH{4{9kLj+Un=d=AsF1=||Nc
zf|~PJm!{NJ^U&WqwFGS4gDqiR@uo{!!?nRYWL4oq@k@H0nM?6)-}_lvPE9ZG^Uj(k
z&73vI+EMYFUL(-23SXS!Rw2(ZQKWl$Y(Y3|4~a|fNML-7Udph=O3p-n^SAgsh81EH
zDyF;Rr$h7%)RM`@#yp~p24!!h>Q1JnH)uYi4-p<yh{`eU?y(_PJ(71OVtQBS%U79_
zu33XZ^z}!Jh&?>|^6!57KC5kE9kRF3QZUbU&2xWVa31CU0`vSUW({YaW!!sp#3B0x
zo%ON93nYdl2f25|W_9#L%LmsAcRm=r_S#kHaMie;;OE1Nh8MZm#_F%V#cX$`=lZzc
z({G^BOD5TP`lS0gM>{I_I3eFPzr2tdX=A~3O6=rxRau(rqD}9xv>AE$P-ju6x%Nau
z!2OI%fz|c$g5`|Xk%v1WY_w<Pthn)}`U1}km~0|@eK<>MzXt5}T}Su&7!h--bUBUJ
zSuZv=#F7gBZ?M4-h3Ab#$TE;Xr~vGTLhPRaW;+d@lsx_m2o~Ax#^Klj5dtB#?Hzd(
z-go?L+}T~U%(z3z%iINQO23{VH;Jyt%1n7)XC0d{|DbtE(vqSp{<Wugz*%GV%ktsp
zm|w13@6TQP9BMbbD=Uy8(^WmJI;C)N+xX#hp*B4$QcYKRxi5i~5)!O_9m@|$-ZV@z
zeZ5{XDw#*k`roZ&h`REQ3LQcz4Z<z{4W<1LW<|}I!j;WcOzp2#%&_63h0*5{mVvv4
z&%F8}B%V^h-0j{tWkbQ8rI;0(nR9{p<2ClSA&bUn8FA^Xh(Z0<ORb(+HwBNjC1GPn
z3VP`3?$;$7-ebxMeZym@9a4L1SV^@>b}cr(s5uL~EUrw=G1{HEsqM+5+OL&nJutnh
zl+P5G`$4qEq@zH0B2~>fwfm8IcwRgiT~3pv6~!UgxYyRN^l`*o*7c8u5K|K_p7Si0
zoIwF|EJ+P_ZY@UTo0^Sf=RgQAr{%+)$+zuTUQQ6ZjfHf*jO-8=IxI`O^M;bCty=wX
z@zk8S?yP-Qk>r8;xptGf%gkyy5i_=NRoHtsBG085EKMq3w&V$q;BGzd)8(a=6HQw3
zd?GzPt}cRwTil|hC0Qi5`7+6`XePwd5OL4|JAO5oC7$BU65x|jzHZLvI;6EOaFNx{
z<85G_*iQue&4NILJ4lff))4u-A#eF0B!hH6#GbDEU*=9bb=_#uNR727u4S1QITvM=
zZGEi4U^UpQH1mjRC8OD?PeM8zUtCpXAIqE)sxp4C?t(ykdQtl?To8`#`5QwuUT7dK
zVc&CP5};bZ<dfX<MTjggD#VNp=XS86WByKdb^L|wn&zgYPCjm>T=-bo!!BHnz$Hf0
z^&<VYf@^itnBmHCvTnxyS{+l7n#S(9xqNY+^5zSQ+TwAgACEAy7)0xyTA4OBsTyBs
zE=+FFwEliW!H%V^Yt=ktGV-;RtW|b;7?$&km+at_ol#cIgE}6`cQ(FLVzc#B;aQ3n
zH;Suk$~dV4^(fSzM0nhZoqDPoCSN$nYJ9$$v3Q_g#m6W`?et`X{D+rEZ@#K8F12j6
z?j22Ty}V>?<H>8qo5K_Sd>~Nt?rg|YJ;eg*?<_5B_ED~N$E?(+vqKLxiBqX5KMk2)
zkemA2<B(F$aQM5D(DU{u7wew;+bz-_Eyx(1VpNQq;SFw*cos6&uPo15C&?;HZ5%Te
z?m<g1VA@+8RLI>rB{DhwG&2u7NC#1cwBqa}53xa2Nx@-f`?+W~Mji6$mpJm#f|Gql
zG!YTo`eYsa6SV{=WeAa7B*Bv;<tH|Gj*!489Vej9ZTN=>9nrv0Bq;^Dv}PcQAq7wT
z7$i>^L^&gloVSUiz(>!5|Ir|}pbA@TQFO>_uiwh^?<<2r4Xf_Ge{l1P76%XZ<v36h
zJN(2ftg*qq$gv-ie@Nzy(;X|^=p^p%Ij)Z+Wh{Nnf=9j-SSy}VEG&6?j#Yr;%b%u`
zP!(@@_4U$uu^G=u?5#OHMw^hx!AO((p-Am&ueVuS9a$ze9a)5Z(g~Hk65EC4i*Jpm
zrJS9JV!Ni4yg$!CUe!n5b77ajjZ+3*Y^w^Kd%Q)?-DvE&Pj9SXekS)7LGYM&+yI3=
z)_g25#esV%G%)hkNWh%JOuIPyUQ+q9eO$SYTY=b*K~e&jRO7RuDx~BC<As48C#B11
zysoeBV8a|r(@%>J`P_6LM)VQwZ^IphImAFBrQp3W+};%6VQswK;>7>eaFd1g6ZQqn
zAY9wMm1{3lyx0m6T>lR~kwN;b4}N)9-`Mc3E~tsK-JhM>-Swf6W$nG9-eWU}1@1TG
zjLe?Qz1eNiWzo}h>aeBjt)#aSZ>Oz(dmSI_cJg6#oWL^;3_j?1nO6`A`%}sg96&q(
zC>UUU305GOjDj;x;M)!3?NM;C#aw-H1>Xf?w(wBnEy;F_yvzxRKEuUyKFoG(BrvBL
zxT5U7^CaJZn_|_Z=`Y#0#r^93KXkuB$I!RyM5(3&MUIYzyj>SzKLmVB>?HeT4_t@t
zZ_I+f^ywC>;IN_NZ({@YGVsvD5m+|ZttkkI{b3EBy^}H+rY-Dra^|lQGZ~B<#I%8v
zI*!JE_w7SAgJ}eIzXb2&?NS~O6UgyjaJX?mJl`h@ehN2*KJed%!KpTe+#CZesCOEu
zhW~tci0aIpRboa^#qf*7>^Z)eKd<-=uK#wK_@~EgL+%jv^CHULW|Z(jL+3SH+fk#0
zej_4bKl4gw^GZK0@FLNG<qQ$+0RkfUWCodtZmQFOdOeDscd_A}?Y4b4ntTe8czlfz
z6HEf>Payax_jM|S0bi*+O!~c3X>gBvJ~%@V{K*+2{vSC*;04#QdHRJPK#8X{7Kq2)
zl-8@dD8%eS#lWB7LT~=NW%SnP;3Hd;_;?sOWORtKNdl_Q!srlX%b8~b9X-j2KA-_3
zWd7Pq*y&@tAO&nof}a755Nu5%ZU>O23z1W9@}L!vC<jOv@B+h#9RI<9%!7f1&`8-1
zNECB>FF$Fnw}pVq{h}7xKU}uPfUG-Up)nwTq}IC-;5q#A7tsTM5uz>rB0hfFM^0Zn
zDd6^g^~fucf#gEcw@=TVS=KM<r}f?n+4}Xr-*o%;6IREq&q3Y$A$AlCp4-kk8D7~t
zlnIEP9#`Q;<RpZDl=S;DveN;#{Td%Mp7=ei6p)O}TOBSAVMs7&j0~R0%dLvjn;ay$
z1x;!xahdo1kInb4_D%&N&h5phbNfZ^=iJkk(S}Ns)ZFtmzFwvmL^@0T0?0Ue`qvI=
zu^9E`zT*}vY?)Vexo^vLgN?h+5*vx+wg^8~RbQoa?161LwQ!wo)5^+adXlb`)tJ`B
z6!W>TA>+%C?ZO<XBmNJoh|C6O{rFK|`SRCO1}BlH+_qu5e42A@oYJ12%T987Vl`y*
zu_Bh6ZQc$Q7ivF~#&w0x)jVT1<j4F|9wDw!T$7L0b%rY~7v@hcNp##6sFKa_>9wES
z+pp&#IdLS#e9Ve0O+Gt+vg-X>g0k8W&(OZ)e6@a^!PC^<J^cpSqpth7Ry4n29j<Ph
zI;<u$xb}3Z?pfSk%Y_f`jaHp^nq_?VT{$)zPA$gD)v5jUu)|fV20NF4(~=W`MR)Ak
zEW@*TN%RJePwxGy1Fs9L`)A+TAoaqAC!aarTp~o8+8ZM8jURm!Hktm-Q~fwz7jwE~
z%8&B<!?JVl>a5%T5Qy}4;)eImN48CejX4By)pzbA%>2Ip*!$|kvbYXX4o|u|x1-M+
zq+j43zQ~K#+J&oCB{_k<)iN@h>Y&~L4Yy06AM&h`WsTv>MwjU7EBI{oumW8Fq}Jv1
zUakh{m_yrL@knn+WZ)iX7g<I_|JPoB3%!i=|7{G?eW9kE>%&Wst8`Cz%jh!yX>`{+
ze-s8|kZH44IpDzSuW;}QdF4j;xsC3hXsx)`0b{WN<v3?;O3Qq;LaM>};}(Zc4jW(X
zcqE?0)1O~8EfDrKw!cVU)UbyCrkKP&>`n<AQL4pBf-TV);UgNU_h2jSH>C-2sf-w4
zOzbuz!Ztx=hHB6Xh};A9p!xbjC&JAXI!BFYLHL0}C3##0Dg$vWL_9Z0$dCkCFq^~R
zlWrtQam1&Ai5VX*7G58Z4@r<hlS+ei{Ndj2Ah~d!GxMULA$zP+UQn@5b$6k8UrIc;
zv|ngUt}>@+*>XpyNEBn6M|?+n${7V&J+WHub0ibiVVy?jgC`t{@7yum<8Y_I&gB{B
zz1+4397<~rBgi-5@5@6h&0qhxo!JTj-!8=$rm&aV9PC#8zTXRq;O;o)=@Wa<H?(W=
zX~^VwnpyJ&)hyMKI5vI_^Vw^auY%6@zUrpDSe2e<CD+IGa-g+_%(QjNRY~DoQanlR
zKDr`}YIrl0hs$4hdix&d><;Dmm6t8@USo-+mK*K&W~AuJOVEZ;iQj)00KKyE*S?r!
zPWkD(;Sf>I_~NycWU^*iw;@+wbvB)1_55QxH|mnYgg7pREIndbUi&o8_z_;Nb~_J?
zdwRM5*eF-jKqsy%R1#^vA!o$jqE9v-7#r19d1j%*Q#rAqAo}8SZ@>5WDY~jKv02Va
zo4FpzH-UH5vZJBzHLa(5o9^+psD2tZfX<xEqZlX@c$0bWVob+`PWN7<&cWEBR*myN
zrUyU*eCn?<ry1(hxE%kT`uM)v<^z3KYO_loNDlBKWtF9mLX91NL{{8)=6PA}o4n<&
zMb7HZD{Lp;+GX!0Lc41z3DEcKHY(!CidCrFB4Tx?*de^~JY9RJtp8+qC6}O_T#l<n
zWC(QYMn>%NQpiBTvMGH>b^bA9QDl$|eWpj>MjD<Ov3he1hFljs!a^$-GNxRWrIBLO
z--?(1zZSFp_HIa#|Eq6-!9}7FwDsLSr7*qabGSHkb_v&Dp<G$|a}&~8Tmx1k00u3`
z^%gB}oHU*|Q`wnAVLjJr?tH-OMA(RroM`v48Ha4QcOMrn#trIRo-v$~s9MVJRkQyz
zz0lR4r(`Mn`xhE3z8O6xIjxb|5Zqu~w?J=^G4xihqhn)#9+~zXfIJO+r}&;YQ4m(^
zkf01s1nm4Cng2x-!^{uS;#knzLKK=X=YbR;Z0M9`!@NgC<b;nWMT4HBfaHQlGs0ZK
zyN)LZS-qq<kTgh4!cJK`=hYy&B*Sg>pO{GhB{y>M@oB|b`AOqN(>IdUROM#(y1#6l
zPaxM06d}AfWi4d<4D%a%63yavJa{;`wpxsNuW|W5xp1gH%+i*f+9~I;%Ixtk(?fzD
zf~A4(j=Si~<#tKI8X1Hh{tFQ&Mx5Bg$4Up3RBLEvM6)<OF8P26JYuJEI&_36Ezny(
zO&B(aLxXT2o!4Hk(U@N_18lm(K&BiyjH3(#njHTSqqE#EQ-C*>f5!c+v5R!iw8d&i
zXFebI_s9t>=v56)HthPS>Qee`nq~3>$-M@S4n<D>8MDa=%|Fft+SAL2vx}8e>}bkY
zUwi1F+5h0`y?H7Ji6aiVwbdn!aMBFH>^_QRl7!jsW+DCOS@F}<Lw{nf_N!kN7moCG
zZY9gRORiFw^TYLHk+Xr=Y8V~bY;dS}<i6pEU`&1G`+T&ODzxH<R-AMW5(kxs2EXWA
zjPx$klPw=lJO@wiJ<m!Y8hH38rr~aV!$Fzhfv=oJCTcqZStfsCqRk_t$OA9a?@FDu
z_{NcEWV%M-wYL9r-qHne)6hVt*lN+)%gA#qzni7yAe|lzUy9tQVGK1CnP1gXYLB=h
zH9|TO7?h|(E|fPAivt8L?Et~B`%<)*{r=A|gA+$u-2397-%riYiM58#>JENUv-wfE
zeou-t*lQCRa<{zUiFi2f0Y}1Hhtk;Rv}N^fedWwHQ6u>6e*3WbQnHu*(a-Je=nEYG
z!+WQDoel>5)PkEG;`#^oKQYg?_9*AK9{%h7t3Q5X{`o5;tb0R>``0#MLi_l)@BGi+
z@lU|~Plx62>i-FZo$9F;!3lcbZO-PYWLX$YsF<jHoRZwrWxz_rU~}Vk((NS1;C_ue
zo%)P$-k0Fck7NoQ2=~*#f0**Xe^{*%KJh~)J7loP+d;vIuJ*8Uny=YlLlcpLuqe(Z
zd0bMxzOe@ro*g&%8LD9o0}<_D`h$d^=ynGmBm~8!g`>f{>U0P>D`0)r0~;S2Cd?ik
z8pdb$UVoih25Ua2iXg=kw<tUbd~n}0={v=gbZF?G-5n&KK+cDG0mA78bn-8LkmVN!
z?3FmVg(pR;NtVcu^j(>N#VG*fH_qH)M1<XO5~gW_;L*25a#0W<OV!Oun-}5!-A<6+
zYinL7Fk{lZz)yhn{0n_NX-KCI8BLAZu)&bUD5`?%Ac482%JW;4&yi0Q049BJq?k0T
zq)|hkjUyOx|FFT4AovIja+~`}n~;#=BPTi`w=nt`e|!+cw3?ud+WBGXi6B8b02C5j
zV1H>Q1RKa&67gyRYXvevMe?DzNe5gZ<A=ri)<k6>elahRQ!3#ADXABN50mhnq$tFY
z<Vt`Cnhs56G2*x@StSFWy9YesR>j@hgn2K2MQYrRCIaE-P)fJMmq6J2rprwyS%@rl
z;sbNQ3&!o6{YNfP9Dq873pv7V2^d-p5m*VkL9aJKKnV&50vV!QQ4mg+d;pR{w99)a
z2OV+?fIw^pfEK`n3*STZ;7wd^d%UY~(xCvHZih)iv@4P~QyQ#K-V_J`G4Hd3DBWS;
zapaWsKJP>YHi$wDp)v#+F&oGbV{|guj@b?{06I`m02<6X29R&|qwE0F0z6a;@*72g
z=>sJugc%S#>`-Pvy8Uaafb<_h2my;Ta85gf`GHFsq)LR~A}~rG=iAH(1r`uT%nPuL
z!%42*u*?URfJ|Wo*B`pTK1@l+EebK1FH{7>$m_dU&|S%TpB=pO1P%a%nvBmvaZE{~
zQ%nV;27(ZS?Fn!q2PuHF<%bWl-oP&n2Bj>2JgHNB{)9kRQRrd@Wou;|BmmY{NKhI>
zhz&srVkQMs4`7fapky<<)%L5%**APJM5tbejB=3p7tQ?0AO(;BX_52ET|tt3HPJwS
zx9hWU9YksDkv_1vLK6*wj#Px+)}fIl5O$I!kf(XGTW*gO3m<%-jE+J;iVzx@iy*iQ
z?ol?`B}KE_iIIeHTOxk~$!l7ebI@w&#*!J)0;_{aLN8F+gv?X|fZgF6#1?}9Ld&u)
z*I-4b1Y82CNlG>u1%uF-BfQEHNg;$}XT?uAw0k>ZpGtUiotO?KAQ*p;O9)*7vxosm
z2!c>#8J`6<LHOk+@XL0w-9hAHdt~-V#qzzu!$F1MWF1Ed7`QnFC&lvlW3~bQ6A(~N
zi2#;hxtV}tnS>`W;ethHhF9J;+{zO$f=sn=s6p8up*Db#mVlFhc|F?-%)F5EYEh=a
zO-La%CuB_LLz6ONP>Y)rE)N+S@IUnOk-m#QBFhkp10aCucOzs-97l@4Nse;=iL4+}
zHbxDD7dO3cI^usmEyVzxJ`7xg{2;<>7ea3sgzjjrBC|)Sgaa=GOP)A|I8lIAOqmhE
z6UsW-avK*Q%W%Lr;iTKT3?RXo&zMi(Q6MKJZp9ES24ZDVP4xl;PMb0>5Wf)@IPDa*
zBD!%rOhTkBu>2!o7h@2+{{j*q2q3|Mv^&vTpN)m@4Sw8qfaIn(BmPSTl-3Y%Hh*_X
zxuC!?0QUg4P|>U*2zU{!+9KNmX>cY#l)3~#>#WP<^$SE7q0?x-vu*r301+7cG*F>{
zY&mSCl7x{2)gT3jcWkG@?0x~SgVP_c?+)JKyBpOa2&xdcP*lMM4pof^suJ;HDpFA)
z4V)zWT%L_nij+Vep}RLI@i`&b0oFPV(D(xxG9dUu0YXIsLUe#G97F?%jTfW>IPO@0
z`lKM(EAVIL!f_ecfge}lu(}`RCS)fHL%@ur0YKx%&|pfMLpVp>7m$+_^@%^ku)`Nz
zeV{w!{0hGKaj0T3W@FsYL5*+$Top?L%E!-*BW8!6W5+E8KSvOFsL)H^fC&I2#s9pC
zC%8aK@D%cQ{llN(iL(gM9~WLA4fHg_ZGa?@28a;A0{oyD!^wknjM0K&$17W!0?t1I
z(+!ry=aB}4!eJ0pNztGg{WfGCpbCDZ@c1xNj_6(pBTx}Oj6IUE5SSlPm>}omKqDc<
z2tpz&1`&9msF+0fQTp?Hm=(MoPPzsGE=DZ3{rWm!zrh3~hYAXSNrV(6I4ZvnywIs2
zZ0ENitV6(heRg1niU)G>J46VX;=W~g0<sZWlkBDikPxdDhQWFLoJlapJM!VMgp(9-
z&O82RM+~DA9~?i5V2B2Co8qX;Tdo8_5Ta}W7(h!095e3Ns0kwP^nU&8#HaCMX_5eE
zZU|rX!N1QtXwJ}(o=6oTr2%?g|J@~Z)WaP|e?g8L|DHIp9}>GlW&zj=aiVmre$J1R
z=ui1HE26NVfKXAGjc!1ImPMo<07tW*mJ`$(nt%!8h)aF~x?(qm5D$kV_(bJ719EUZ
z9Q+Q`NCreO?+#LMY}5d7V1fyv9dL6CK?@?|5r#qlNj;4x2NVcMy5X2~MgIE3KKw*H
zb3AiQ>Gp)(P6nvZ0nx*b$Bs!jxSxnmj1Mm1#)9CC0MV6$`vDd$ME1cF8sO0+sUXV3
zg9{ym{+v<VpwlB@BveF#fl;u;=>Q1N5I;T|*p7njx-Cb<^3iPDfC$7nZkKXn3q=E%
zBGJhJW<Uv~Apa0K;S}>8C+HANZNU$mZja!HQ9~XO!|8^gC)sVsi9K$6;QFYe79Q>o
zK6-JAFUV0YN{cYaQ42uPBDmoA6rdD3;RY1<kk%U@0(^kj2HOeXf);cy@&zr66C*GY
zd=1bW0C0y8YXYXkQN$5{8{gJri}}_e;vN3%8q>vBez&eZX7R3CQ<SauT&UYVvi7-W
zdphn&%24^5<Mng%KL2Vb;XZb)(S+ubo?hc6R{aK^>$c*hJG~~Bg<K{t(kJc{&UKs#
zkG%e^FrI&&cJ%yys&kp6tY{JSuOb0^INSkkC5%2$s8Q|L1BGpIMWSet=wB7#TA@Yi
zxNfM+IQY!q^{uS;P!?&mSybd>{;No_QR2j}q8=Y}5@_Y~2Lf{7+%valM*w8vjysB<
z%VX~I-z}<-xoZMN!G9`hjZxVwDvDb>(MMahU{Cu&Z%*;^bj+peNUI2n%TYz~g~$7@
ztry8#UU|3p$bBDa`&=MWvw7dnp1mh8DMJ6T4+QL`*NRKaJzy9g*H;uJUby_soV~9A
zpqc&7n&hyrzf0_H8g%9Us^?hrWDgzMjMqV6UjE&xrN_R5(C2-T&+QfL^U8L*!$Vx_
zE0RNcv;TN8!xc{ZVR%3t&H^x=k?ym+h!hp2ICS(ymk!-Q8YyDcjm@FtY-Bn-L1`_s
zOvt^a%HgAffJ(<&dYS9`&AjnK`C%&BbEj9xmX0)+cdXvH>s1p!p*O&zvi7RX)eYBV
z-fE%vSFP5LuFYC%_Nis%xLVhmhda7d)|;y<78{zI_nm{+hkMW4ExbB{drA8~#a@G%
z^@8X2>h{U&&8@FBFLu0Di9ou-1+{)+HmiBhKY;eE=v$x~9Af%*{WZ6E)YrB=;9p8A
zH#%Vd>jC`p$jxSNinqMRZXsvAU}@j4{zpFN`4g1Azo3*<d|+s<iM}M#d+Q(_Y_8ur
zl=hoL$v<!UYryv@^crn6e@=}p{&mB1(|!|SS7!AV>Pe~SQ5+p?4urGZ?uMZ_l2o{i
z;`pKvAWTw$di@4S!8UEh6zC_o@e;2C|Ge@-?;$Gs%uy=p%O`A;SAJ0zk32$I2zf%A
zh$M&ZzDH%&K=H!^l5#&WCNmqfN;?!fIkiEZ*P2;7H|f@W?AhcGTnQH5B(U%kbAXBo
zUPS?~dO3$<jAz7=4Lnk|S4v%RoG=nSWY<V_5@lCl5*~@=Yo)H9D3grDC)Quj^`5Z@
zS<}9D@N@4LmW+ri++a!T@PnW0|5U_7i*oD9Z{6_%JYu#&r9$vPoUBoA<lPhvJfh3O
zXb~c7JZ$~vd{NO5_<jMN_$nrh4`uQrS<nwj;R}w?58?ZWI25rJF5L-F#EB@$EpkXw
zMs2Hz`b)v~w=(Zfl5#_c;zTdC@ZAm3E5LJo87Gx-4;1=afi3)Zvi$hEET;mHBVu^y
Y`UpM(0idISC=Nt#{MTxO^=JG40~ezDoB#j-

diff --git a/public/images/nav_icon.png b/public/images/nav_icon.png
index e76bd3d245d6eb59db868aeaf47a1c0bc615f6c9..c9144e074960f56907c82d888cc287ccfe964779 100644
GIT binary patch
delta 2221
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
a<R=hNCovzM_QAmbyYTV!$38k1k^Mi43{BVo

delta 2374
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
Be0u-@

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index e329760b9..ba7836a3e 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1635,7 +1635,7 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 .new_login{
     width:100%;
     height:524px;
-    background-color:#1065bd;
+    background-color:#3b94d6;
 }
 .new_login_con{
     width:1000px;
@@ -1766,7 +1766,7 @@ input.new_loggin_input{
 .new_register{
     width:100%;
     height:579px;
-    background-color:#1065bd;
+    background-color:#3b94d6;
 }
 .new_register_con{
     width:1000px;

From 795917688c7dfeb44c7415400f40267c15b2ff23 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 17 Jun 2016 09:34:48 +0800
Subject: [PATCH 435/668] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E5=BC=80=E3=80=81=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_course_journalsformessage.html.erb | 24 +++++++++++++------
 .../users/_user_journalsformessage.html.erb   | 24 +++++++++++--------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index e04dd3006..b824f36a3 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -14,13 +14,23 @@
         <% course=Course.find(activity.jour_id) %>
         <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
-      <div class="homepagePostTitle break_word list_style upload_img">
-        <% if activity.parent %>
-            <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
-        <% else %>
-            <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
-        <% end %>
-      </div>
+      <!--<div class="homepagePostTitle break_word list_style upload_img">
+        <%# if activity.parent %>
+            <%#= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <%# else %>
+            <%#= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <%# end %>
+      </div>-->
+      <% if activity.parent %>
+          <% content = activity.parent.notes %>
+      <% else %>
+          <% content = activity.notes %>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
       <div class="homepagePostDate fl">
         留言时间：<%= format_time(activity.created_on) %>
       </div>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index e7f42c661..9331839ce 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -16,22 +16,26 @@
             <% end %>
         <% end %>
       </div>
-      <% if is_activity.to_i == 1 %>
-          <div class="homepagePostTitle break_word list_style upload_img">
-            <% if activity.parent %>
-                <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
-            <% else %>
-                <%= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
-            <% end %>
-          </div>
-      <% else %>
+      <%# if is_activity.to_i == 1 %>
+          <!--<div class="homepagePostTitle break_word list_style upload_img">
+            <%# if activity.parent %>
+                <%#= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+            <%# else %>
+                <%#= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+            <%# end %>
+          </div>-->
+      <%# else %>
           <% if activity.parent %>
               <% content = activity.parent.notes %>
           <% else %>
               <% content = activity.notes %>
           <% end %>
           <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-    <% end %>
+          <div class="cl"></div>
+          <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+          <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+          <div class="cl"></div>
+    <%# end %>
       <div class="homepagePostDate fl">
         留言时间：<%= format_time(activity.created_on) %>
       </div>

From d127c6e12c38bc90afb967bf53423e01d40e4de4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 09:45:10 +0800
Subject: [PATCH 436/668] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E6=9F=90=E5=B9=B4=E6=9F=90=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb  | 2 +-
 app/views/layouts/base_org.html.erb      | 2 +-
 app/views/layouts/base_projects.html.erb | 2 +-
 app/views/layouts/new_base_user.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c3f3a4a60..ad5baac41 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -173,7 +173,7 @@
       </div><!--项目标签 end-->
       <!--课程推荐-->
       <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 2a33a8acd..114bb7219 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -136,7 +136,7 @@
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
 
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
     </div>
     <div class="homepageRight" style="margin-top:<%= (params[:show_homepage].nil? && User.current.logged?) ? '10px':'0px' %>;">
       <%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 44dfeeea2..52e42f1be 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -146,7 +146,7 @@
         <div class="cl"></div>
       </div><!--项目标签 end-->
 
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
     </div>
   </div>
 
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index d67b2d3f3..a7d908212 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -284,7 +284,7 @@
           <div class="cl"></div>
         </div>
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
     </div>
     <div class="homepageRight">
       <%= yield %>

From 3ae26a6530a22fff9e7db3db6b1b53509332c756 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 17 Jun 2016 11:23:49 +0800
Subject: [PATCH 437/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=90=8D=E5=B8=88=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E7=83=AD=E9=97=A8=E9=A1=B9=E7=9B=AE=20=E5=AD=A6=E9=9C=B8=20?=
 =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E5=AD=97=E6=A0=B7=E5=8F=AA=E5=AF=B9=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=98=BE=E7=A4=BA,=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E6=97=B6=E5=A6=82=E6=9E=9C=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=B8=A6=E4=BA=86=E9=93=BE=E6=8E=A5=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB=E5=BC=B9=E6=A1=86=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/courses.html.erb  | 8 +++++---
 app/views/organizations/projects.html.erb | 8 +++++---
 app/views/organizations/students.html.erb | 8 +++++---
 app/views/organizations/teachers.html.erb | 8 +++++---
 public/javascripts/application.js         | 6 ++++++
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/app/views/organizations/courses.html.erb b/app/views/organizations/courses.html.erb
index 875fc3340..6abc6e127 100644
--- a/app/views/organizations/courses.html.erb
+++ b/app/views/organizations/courses.html.erb
@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "精品课程", courses_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "精品课程", courses_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_container_list">
diff --git a/app/views/organizations/projects.html.erb b/app/views/organizations/projects.html.erb
index 1c6cfa1d1..427443950 100644
--- a/app/views/organizations/projects.html.erb
+++ b/app/views/organizations/projects.html.erb
@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "热门项目", projects_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "热门项目", projects_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_container_list">
diff --git a/app/views/organizations/students.html.erb b/app/views/organizations/students.html.erb
index 770967210..bfc51fd50 100644
--- a/app/views/organizations/students.html.erb
+++ b/app/views/organizations/students.html.erb
@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "学霸列表", students_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "学霸列表", students_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_students_list">
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index dac36f7a5..03334f14f 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -22,9 +22,11 @@
       <!--<option value="2">学生数</option>-->
       <!--<option value="3">资源数</option>-->
     <!--</select>-->
-    <div class="sn-font-grey fr">
-      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_teachers_list">
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0437125e8..22483c1d5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1045,6 +1045,12 @@ function showNormalImage(id) {
                 $(image).attr('src',_src);
                 return;
             }
+
+            //已被加链接则不处理
+            if ($(image).parent() && $(image).parent().attr('href')){
+                return;
+            }
+
             //无格式的图片不让点击显示大图，显示的话会有问题
             var tmpsrc = image.attr('src');
             if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {

From d0791253d9f56c532a3d970f43cf3fd722a9ca2c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 11:29:49 +0800
Subject: [PATCH 438/668] quality

---
 app/assets/javascripts/quality_analyses.js.coffee |  3 +++
 app/assets/stylesheets/quality_analyses.css.scss  |  3 +++
 app/controllers/projects_controller.rb            |  2 +-
 app/controllers/quality_analyses_controller.rb    | 15 +++++++++++++++
 app/helpers/quality_analyses_helper.rb            |  2 ++
 app/views/quality_analyses/index.html.erb         |  0
 config/routes.rb                                  |  7 +++++++
 .../quality_analyses_controller_spec.rb           |  5 +++++
 8 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/quality_analyses.js.coffee
 create mode 100644 app/assets/stylesheets/quality_analyses.css.scss
 create mode 100644 app/controllers/quality_analyses_controller.rb
 create mode 100644 app/helpers/quality_analyses_helper.rb
 create mode 100644 app/views/quality_analyses/index.html.erb
 create mode 100644 spec/controllers/quality_analyses_controller_spec.rb

diff --git a/app/assets/javascripts/quality_analyses.js.coffee b/app/assets/javascripts/quality_analyses.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/quality_analyses.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/quality_analyses.css.scss b/app/assets/stylesheets/quality_analyses.css.scss
new file mode 100644
index 000000000..9404eb70f
--- /dev/null
+++ b/app/assets/stylesheets/quality_analyses.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the QualityAnalyses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c8b272480..7e1738842 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -645,7 +645,7 @@ class ProjectsController < ApplicationController
     params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
     params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0
     # 更新公开私有时同步gitlab公开私有
-    unless @project.gpid.nil?
+    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? true : false)
       g = Gitlab.client
       params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
     end
diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analyses_controller.rb
new file mode 100644
index 000000000..0ea288a91
--- /dev/null
+++ b/app/controllers/quality_analyses_controller.rb
@@ -0,0 +1,15 @@
+class QualityAnalysesController < ApplicationController
+  before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  layout "base_projects"
+
+  def index
+
+  end
+
+  # Find project of id params[:project_id]
+  def find_project_by_project_id
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end
diff --git a/app/helpers/quality_analyses_helper.rb b/app/helpers/quality_analyses_helper.rb
new file mode 100644
index 000000000..a47f571bb
--- /dev/null
+++ b/app/helpers/quality_analyses_helper.rb
@@ -0,0 +1,2 @@
+module QualityAnalysesHelper
+end
diff --git a/app/views/quality_analyses/index.html.erb b/app/views/quality_analyses/index.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index 33a59b46b..17614f4b6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -782,6 +782,13 @@ RedmineApp::Application.routes.draw do
       end
     end
 
+    resources :quality_analyses, :only => [:index] do
+      collection do
+      end
+      member do
+
+      end
+    end
     # resources :files, :only => [:index, :new, :create] do
     #   member do
     #     match "quote_resource_show_project",:via => [:get]
diff --git a/spec/controllers/quality_analyses_controller_spec.rb b/spec/controllers/quality_analyses_controller_spec.rb
new file mode 100644
index 000000000..c5076c53f
--- /dev/null
+++ b/spec/controllers/quality_analyses_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe QualityAnalysesController, :type => :controller do
+
+end

From 747b2007cd80b9dd2aa0cbb9128f3e7270169995 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 17 Jun 2016 13:44:11 +0800
Subject: [PATCH 439/668] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/public.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9306fa0b..61d398bdf 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1029,7 +1029,8 @@ span.at a{color:#269ac9;text-decoration: none;}
 .blueBtn:hover {background-color:#298fbd;}
 a.blue-btn{ padding:4px 7px; color:#FFF; border:none; background-color:#269ac9; cursor:pointer; text-align:center;}
 a.blue-btn:hover {background-color:#298fbd;}
-
+a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.Blue-btn{ background:#3598db; color:#fff;}
 /*文本描述展开高度*/
 .maxh360 {max-height: 810px;}
 .lh18 { line-height: 18px;}

From a105f4eaf03e0b2f6572c9939eef14fba4d93412 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 17 Jun 2016 14:09:43 +0800
Subject: [PATCH 440/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=9A=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?issue=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB=E3=80=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=20=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E5=8A=A8=E6=80=81=EF=BC=9A=E5=A6=82=E4=B8=8A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=20=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=BD=BF=E8=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 54 ++++++++++++-----------
 app/views/users/_course_news.html.erb     | 52 +++++++++++-----------
 app/views/users/_project_issue.html.erb   | 44 +++++++++---------
 app/views/users/_project_message.html.erb | 54 ++++++++++++-----------
 app/views/users/_project_news.html.erb    | 52 +++++++++++-----------
 5 files changed, 133 insertions(+), 123 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 76971e240..9fb844926 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -49,33 +49,35 @@
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
 
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.course_editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.course_destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.course_editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.course_destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
 
     </div>
     <div class="cl"></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5ffa78158..65bc970e3 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -35,31 +35,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {controller:'news', :action => 'edit', :id => activity.id},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {controller:'news', :action => 'edit', :id => activity.id},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index d8714400d..ccf0e456e 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -13,29 +13,31 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li>
-                <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
-              </li>
-              <li>
-                <% if !defined?(project_id) && !defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(project_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% end %>
-              </li>
-              <li>
-                <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+                  </li>
+                  <li>
+                    <% if !defined?(project_id) && !defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(project_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+                  </li>
+                </ul>
               </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
       <div class="homepagePostTitle break_word">
         <% case activity.tracker_id %>
         <% when 1%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index f82dc35e7..51f29be83 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -49,33 +49,35 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 43b22b193..1e56b7555 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -32,31 +32,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => activity},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {:action => 'edit', :id => activity},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>

From c51c73f225d2638a2c7c0d250f5dd3aef92cf806 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 17 Jun 2016 14:31:14 +0800
Subject: [PATCH 441/668] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AA=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_simple_ke_reply_form.html.erb            | 32 +++++++++-------
 app/views/courses/syllabus.html.erb           | 32 +++++++++-------
 app/views/issues/_issue_replies.html.erb      | 38 ++++++++++---------
 .../issues/_issue_reply_ke_form.html.erb      | 34 +++++++++--------
 app/views/memos/show.html.erb                 | 30 ++++++++-------
 app/views/messages/_reply_message.html.erb    | 26 +++++++------
 .../_simple_ke_reply_form.html.erb            | 26 +++++++------
 .../_org_course_homework.html.erb             | 26 +++++++------
 .../_org_course_message.html.erb              | 26 +++++++------
 .../organizations/_org_course_news.html.erb   | 24 +++++++-----
 .../organizations/_org_project_issue.html.erb | 24 +++++++-----
 .../_org_subfield_message.html.erb            | 26 +++++++------
 .../organizations/_org_subfield_news.html.erb | 24 +++++++-----
 .../organizations/_project_message.html.erb   | 26 +++++++------
 app/views/projects/_project_news.html.erb     | 24 +++++++-----
 app/views/users/_course_homework.html.erb     | 26 +++++++------
 .../users/_course_journalsformessage.html.erb | 32 +++++++++-------
 app/views/users/_course_message.html.erb      | 26 +++++++------
 app/views/users/_course_news.html.erb         | 24 +++++++-----
 app/views/users/_project_issue_reply.html.erb | 24 +++++++-----
 app/views/users/_project_message.html.erb     | 26 +++++++------
 app/views/users/_project_news.html.erb        | 24 +++++++-----
 app/views/users/_reply_to.html.erb            | 30 ++++++++-------
 app/views/users/_user_blog.html.erb           | 34 +++++++++--------
 .../users/_user_homework_detail.html.erb      | 26 +++++++------
 .../users/_user_journalsformessage.html.erb   | 34 +++++++++--------
 public/stylesheets/courses.css                |  2 +
 public/stylesheets/new_user.css               |  4 ++
 public/stylesheets/project.css                |  3 ++
 public/stylesheets/public.css                 |  3 ++
 30 files changed, 426 insertions(+), 310 deletions(-)

diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index ac953b254..8339ae5ad 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -1,20 +1,24 @@
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <% if course_id%>
-              <input type="hidden" name="course_id" id="" value="<%= course_id%>">
-          <% end %>
-          <input type="hidden" name="blog_comment[title]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <% if course_id%>
+                  <input type="hidden" name="course_id" id="" value="<%= course_id%>">
+              <% end %>
+              <input type="hidden" name="blog_comment[title]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index 66bc8ff9a..f2d9cbdbd 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -184,20 +184,24 @@
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
           <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @article.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer" style="margin-top: 8px">
-            <div nhname='new_message_<%= @article.id%>' style="display:none;">
-              <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
-                  <input type="hidden" name="course_id" value="<%= @course.id%>">
-                <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
-                  <input type="hidden" name="blog_comment[sticky]" value="0">
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="blog_comment[locked]" value="0">
-                  <div nhname='toolbar_container_<%= @article.id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= @article.id%>'></p>
-              <% end%>
-            </div>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= @article.id%>' style="display:none;">
+                  <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
+                      <input type="hidden" name="course_id" value="<%= @course.id%>">
+                    <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
+                      <input type="hidden" name="blog_comment[sticky]" value="0">
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="blog_comment[locked]" value="0">
+                      <div nhname='toolbar_container_<%= @article.id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= @article.id%>'></p>
+                  <% end%>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 197cd9c02..7b5383c1e 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -62,23 +62,27 @@
   </div>
 
   <div class="homepagePostReplyInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id %>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id %>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
-          <div class="cl"></div>
-          <div class="mt5 fl">
-            <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-          </div>
-          <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= @issue.id %>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
+              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+              <!--<div class="cl"></div>-->
+              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+              <div nhname='toolbar_container_<%= @issue.id %>' ></div>
+              <div class="cl"></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
+              <div class="cl"></div>
+              <div class="mt5 fl">
+                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
+              </div>
+              <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index a2975237b..7fbb0d191 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -5,21 +5,25 @@
   </div>
 
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="quote" value=""/>
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
-          <div class="cl"></div>
-          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+              <!--<div class="cl"></div>-->
+              <input type="hidden" name="quote" value=""/>
+              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+              <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+              <div class="cl"></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+              <div class="cl"></div>
+              <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index ca179f9fc..9b3e82447 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -119,19 +119,23 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @memo.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= @memo.id%>' style="display:none;">
-          <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
-              <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
-              <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
-              <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
-              <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
-              <div nhname='toolbar_container_<%= @memo.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
-              <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= @memo.id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= @memo.id%>' style="display:none;">
+              <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
+                  <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
+                  <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
+                  <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
+                  <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
+                  <div nhname='toolbar_container_<%= @memo.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= @memo.id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index faa0bd0ce..d4d9d77a0 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -2,17 +2,21 @@
 <div class="ReplyToMessageContainer borderBottomNone" id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <input type="hidden" name="reply[subject]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <input type="hidden" name="reply[subject]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/org_document_comments/_simple_ke_reply_form.html.erb b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
index 1813f5b5f..2494687b4 100644
--- a/app/views/org_document_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
@@ -1,17 +1,21 @@
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <input type="hidden" name="org_document_comment[title]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <input type="hidden" name="org_document_comment[title]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index bcbeca778..e33787a09 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -387,17 +387,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 03e986716..80125a03e 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -131,18 +131,22 @@
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
           <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= user_activity_id%>'></p>
+                  <% end%>
                   <div class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-              <div class="cl"></div>
-            </div>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 8c260c21c..24870b470 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -98,16 +98,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 94eb2820a..42f725d12 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -115,16 +115,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index ef8ea55d9..245651daf 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -103,17 +103,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index a822b4a0d..22f88e91b 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -87,16 +87,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 4407d86bd..7252d2494 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -108,17 +108,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index b974b4499..0ca46e59b 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -67,16 +67,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 701f81da1..8de9b3dce 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -319,17 +319,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index e04dd3006..658e14c53 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -60,20 +60,24 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
-              <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
-              <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
-              <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
+                  <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
+                  <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
+                  <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 76971e240..e8972fcb3 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -116,18 +116,22 @@
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
           <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= user_activity_id%>'></p>
+                  <% end%>
                   <div class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-              <div class="cl"></div>
-            </div>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5ffa78158..fff0348ca 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -92,16 +92,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 1f4c4b44b..d1f7363a7 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -27,16 +27,20 @@
   <div class="homepagePostReplyContainer borderBottomNone minHeight48">
     <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
     <div class="homepagePostReplyInputContainer mb10">
-      <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
-        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-            <div class="cl"></div>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-        <% end%>
-      </div>
+      <% if User.current.logged? %>
+          <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
+            <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
+                <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+                <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                <div class="cl"></div>
+                <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <% end%>
+          </div>
+      <% else %>
+          <%= render :partial => "users/show_unlogged" %>
+      <% end %>
       <div class="cl"></div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index f82dc35e7..daee1a71c 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -111,17 +111,21 @@
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
           <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-            </div>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= user_activity_id%>'></p>
+                  <% end%>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 43b22b193..34c124b5e 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -89,16 +89,20 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 30f4e3542..23090265c 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,19 +1,23 @@
 <div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="orig_textarea mb10 fl">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
-          <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
-          <input type="hidden" name="course_activity" value=<%=@course_activity %>>
-          <input type="hidden" name="reply[subject]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+              <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+              <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+              <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+              <input type="hidden" name="reply[subject]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 97b2737c8..f0761ff78 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -74,21 +74,25 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="in_user_center" value="true">
-              <input type="hidden" name="blog_comment[sticky]" value="0">
-              <input type="hidden" name="blog_comment[locked]" value="0">
-              <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="in_user_center" value="true">
+                  <input type="hidden" name="blog_comment[sticky]" value="0">
+                  <input type="hidden" name="blog_comment[locked]" value="0">
+                  <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></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 97eeec89f..e7cd740f7 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -329,17 +329,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= homework_common.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= homework_common.id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
-              <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
-              <div nhname='toolbar_container_<%= homework_common.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= homework_common.id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= homework_common.id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
+                  <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
+                  <div nhname='toolbar_container_<%= homework_common.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
+                  <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= homework_common.id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index e7f42c661..fb7abafaa 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -87,21 +87,25 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
-              <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
-              <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
-              <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
+                  <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
+                  <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
+                  <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 56ae81f8d..785fb2ba3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1418,3 +1418,5 @@ a.pages-big{ width:50px;}
 .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;}
 
+/*未登录回复提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 32e727ba4..38d58a126 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1628,3 +1628,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
 
+/*未登录回复提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 90a94b52f..ac65d34c2 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1246,3 +1246,6 @@ a.pages-big{ width:50px;}
 
 .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;}
+
+/*未登录回复提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 61d398bdf..333c410ca 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1162,3 +1162,6 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .shadowbox_news_list li:hover{ background-color:#eee;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+
+/*未登录回复提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}

From 87419178234eae026fdd532491780f6405f602c7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 14:31:42 +0800
Subject: [PATCH 442/668] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=EF=BC=88=E8=87=AA2016=E5=B9=B45=E6=9C=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb  | 2 +-
 app/views/layouts/base_org.html.erb      | 2 +-
 app/views/layouts/base_projects.html.erb | 2 +-
 app/views/layouts/new_base_user.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index ad5baac41..181eefb98 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -173,7 +173,7 @@
       </div><!--项目标签 end-->
       <!--课程推荐-->
       <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 114bb7219..9ba31bfe6 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -136,7 +136,7 @@
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
 
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight" style="margin-top:<%= (params[:show_homepage].nil? && User.current.logged?) ? '10px':'0px' %>;">
       <%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 52e42f1be..f7b04924d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -146,7 +146,7 @@
         <div class="cl"></div>
       </div><!--项目标签 end-->
 
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %> （自2016年5月）</div>
     </div>
   </div>
 
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index a7d908212..8455d5693 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -284,7 +284,7 @@
           <div class="cl"></div>
         </div>
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自<%= Time.now.year %>年<%= Time.now.month %>月）</div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight">
       <%= yield %>

From fde3fd0d94c5e52e611b88ba7d93d85243b8f74d Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 17 Jun 2016 14:40:00 +0800
Subject: [PATCH 443/668] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E8=B7=B3=E5=85=A5=E8=AF=A5=E8=B4=B4=E5=90=A7=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A0=8F=E7=9B=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb |  5 +++--
 app/views/forums/create.js.erb              |  9 +++++----
 app/views/org_subfields/create.js.erb       | 12 +++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 3edda8285..2b41983cc 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -14,9 +14,10 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      @subfield.update_attributes(:field_type => params[:field_type])
+      #默认类型为帖子
+      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type])
+      update_status_by_type(@subfield, params[:field_type]||"Post")
     else
       @res = false
     end
diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index 88e535e72..bea3f3872 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,6 +1,7 @@
 <%if @save_flag%>
-$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-$('#reorder_time').click();
+//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+//$('#reorder_time').click();
+    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
-$("#error").html("<%= @forum.errors.full_messages[0]%>").show();
-<%end %>
\ No newline at end of file
+    $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+<%end %>
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index a7647b0ad..a65f53719 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,9 +1,11 @@
 <% if @res %>
-$("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
-$("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+    $("#org_subfield_list").html("");
+    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)}) %>");
+    $("#sub_field_left_lists").html("");
+    $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+    $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+    //默认选中第一个
+    $("input[name='field_type']").get(0).checked=true;
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");
\ No newline at end of file

From 7d68df79a02d04f0dee32d5bb4ec804b39b499fb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 14:44:12 +0800
Subject: [PATCH 444/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=87=8C=E5=BD=AC=E4=BB=A3=E7=A0=81500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 7661b64d0..ee88f3315 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -25,7 +25,7 @@
                         <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                         <% if message.board.org_subfield_id %>
                             <li>
-                              <%= link_to document.title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
@@ -33,7 +33,7 @@
                             </li>
                         <% else %>
                             <li>
-                              <%= link_to document.title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>

From eb3694dbe6bab546527507e6cf3145220ec65ffe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 17 Jun 2016 14:45:07 +0800
Subject: [PATCH 445/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ca63f496c..87c7d8f54 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -132,7 +132,7 @@ class UsersController < ApplicationController
       # 未读的消息存放在数组
       mess = message_all.message
       if (message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)) || (message_all.message_type == "SystemMessage"&& !mess.nil? && mess.created_at > onclick_time)
-        unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+        unless (message_all.message_type == 'CourseMessage' && mess && mess.course  && mess.course.is_delete == 1)
           @message_alls << mess
         end
         break if @message_alls.length == 5
@@ -166,7 +166,7 @@ class UsersController < ApplicationController
         messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
         messages.each do |message_all|
           mess = message_all.message
-          unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+          unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
             @message_alls << mess
           end
         end
@@ -177,7 +177,7 @@ class UsersController < ApplicationController
           # 在点击或者刷新消息列表后未读的消息存放在数组
           mess = message_all.message
           if message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)
-            unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+            unless (message_all.message_type == 'CourseMessage' && mess && mess.course  && mess.course.is_delete == 1)
               @message_alls << mess
             end
           end
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 0c18dbcc3..3e83b0f7a 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -326,7 +326,7 @@
 
         </ul>
     <% end %>
-    <% if ma.course_message_type == "StudentWorksScore" %>
+    <% if ma.course_message_type == "StudentWorksScore" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <% if ma.course_message.reviewer_role == 3 %>

From 994ce342d71abe8efed5ef605c380ab2775603a8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 17 Jun 2016 15:35:58 +0800
Subject: [PATCH 446/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1ul=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 514cb92aa..9954ac755 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -3,7 +3,8 @@
 
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-body, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+body, h1,h2,h3,h4,h5,p,pre,ul {padding:0px; margin:0px;}
+ul li {margin-left:40px;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
 .text-control {word-break:normal; word-wrap:break-word;}
@@ -88,7 +89,7 @@ a.underline {text-decoration:underline;}
 .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.num-block {width:12px; text-align:center; display:inline-block; vertical-align:top;}
+.num-block {display:inline-block; vertical-align:top;}
 
 /* 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;}

From acf17d625218eb8482a99b6cd93c02b0d95534c4 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 17 Jun 2016 15:45:29 +0800
Subject: [PATCH 447/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=93=BE=E6=8E=A5=E6=B7=BB=E5=8A=A0=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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/stylesheets/weui/weixin.css            | 1 +
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 509e0171a..ee651eadf 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -8,7 +8,7 @@
                 <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="blog.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 2e7ed3151..aa1b05fd9 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -15,7 +15,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
                     </tr></table>
-                    <div class="f13 c-grey3 mt10 text-control" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                     <div class="cl"></div>
                     <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index cca135681..bbf08e03d 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="news.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{news.created_on}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 4de1c7b37..c22e89021 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -24,7 +24,7 @@
                         </td>
                     </tr>
                 </table>
-                <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="homework.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
                 <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评开启时间：{{homework.evaluation_start}}<br /></span>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 1d7f9a536..70b9286dd 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目问题</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="issue.description|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div>
                 <span class="c-grey f13">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
                 优先级：{{issue.issue_priority}}<br />
                 指派给：{{issue.issue_assigned_to}}<br />
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index dc6b1409f..a1b79379f 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -7,7 +7,7 @@
                 <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
                 <div class="post-title">{{message.created_on}}</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="message.notes|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="message.notes|safeHtml"></div>
                 <div class="cl"></div>
             </div>
             <div class="post-interactive border-bottom">
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 4831e1521..7bc4b0005 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="discussion.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
                 <div class="cl"></div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 9954ac755..d664be450 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -68,6 +68,7 @@ a.underline {text-decoration:underline;}
 .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-all-content a {color:#136ec2;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,

From 18df93ba9fcfed58d91109fa8e68f6d2fe6b381a Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 17 Jun 2016 16:16:24 +0800
Subject: [PATCH 448/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 126 +++++++++++++++------------
 public/stylesheets/weui/weixin.css   |   2 +
 2 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 476ae3690..54a00c1f7 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -27,16 +27,18 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
-                <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
-                <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
-                <span class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15">普通作业</span>
+                  <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15">编程作业</span>
+                  <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15">分组作业</span>
+                  <span class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -58,14 +60,16 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -87,14 +91,16 @@
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -134,14 +140,16 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -164,14 +172,16 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -208,13 +218,15 @@
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+                <div class="post-op-banner">
+                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                  <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                  <div class="cl"></div>
+                </div>
               </div>
             </div>
           </div>
@@ -237,13 +249,15 @@
                 <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                 <div class="cl"></div>
               </div>
-              <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-              <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-              <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">赞</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5" /><span class="num-block">{{act.praise_count}}</span></div>
-              <div class="cl"></div>
+              <div class="post-op-banner">
+                <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
+                <div class="cl"></div>
+              </div>
             </div>
           </div>
         </div>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index d664be450..3fd9acd37 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -13,6 +13,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
 .mt2 {margin-top:2px;}
+.mt3 {margin-top:3px;}
 .mt4 {margin-top:4px;}
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
@@ -91,6 +92,7 @@ a.underline {text-decoration:underline;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .num-block {display:inline-block; vertical-align:top;}
+.post-op-banner {height:20px; line-height:20px; vertical-align:middle;}
 
 /* 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;}

From 3492f65a9be91d795f3a97626fd38fea7fa15ee3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 17 Jun 2016 16:57:11 +0800
Subject: [PATCH 449/668] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=97=B6=E7=9A=84=E5=88=97=E8=A1=A8=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 6a89b51b1..419407eae 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -7,7 +7,7 @@
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-        <th class="hworkList260 hide-text" style="text-align:left;">作品名称</th>
+        <th class="<%= @homework.homework_type == 2 ? 'hworkList210' : 'hworkList260' %> hide-text" style="text-align:left;">作品名称</th>
         <th class="hworkList80 hide-text">
           <span class="HomeworkStuTitle f14 fb">姓名</span>
         </th>

From 948ec58248e863369d4c9bcd14f40676f601a668 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 17 Jun 2016 17:18:36 +0800
Subject: [PATCH 450/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=9C=AA=E7=99=BB=E5=BD=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_reply_to.html.erb            | 40 +++++++++----------
 app/views/users/_show_unlogged_reply.html.erb |  4 ++
 public/stylesheets/courses.css                |  1 +
 public/stylesheets/new_user.css               |  1 +
 4 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 app/views/users/_show_unlogged_reply.html.erb

diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 23090265c..a7034ffc7 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,23 +1,23 @@
-<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-  <div class="orig_textarea mb10 fl">
-    <% if User.current.logged? %>
-        <div nhname='new_message_<%= reply.id%>'>
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
-              <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
-              <input type="hidden" name="course_activity" value=<%=@course_activity %>>
-              <input type="hidden" name="reply[subject]" id="reply_subject">
-              <div nhname='toolbar_container_<%= reply.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
-              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= reply.id%>'></p>
-          <% end%>
-        </div>
-    <% else %>
-        <%= render :partial => "users/show_unlogged" %>
-    <% end %>
+<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <% if User.current.logged? %>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+      <div class="orig_textarea mb10 fl">
+      <div nhname='new_message_<%= reply.id%>'>
+      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+          <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+          <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+          <input type="hidden" name="reply[subject]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+      </div>
+  <% else %>
+    <%= render :partial => "users/show_unlogged_reply" %>
+  <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/users/_show_unlogged_reply.html.erb b/app/views/users/_show_unlogged_reply.html.erb
new file mode 100644
index 000000000..b428fd249
--- /dev/null
+++ b/app/views/users/_show_unlogged_reply.html.erb
@@ -0,0 +1,4 @@
+<div class="visitor-box fontGrey2 mt10">
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+</div>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 785fb2ba3..393903177 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1372,6 +1372,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
 .comment_content{ color:#333;}
 .t_txt{ margin-top:10px;}
 .orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
 .orig_textarea{width:90%;  margin-bottom:10px;}
 .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
 .orig_sub:hover{ background:#297fb8;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index dcd275d92..5fc6110fd 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1553,6 +1553,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
 .comment_content{ color:#333;}
 .t_txt{ margin-top:10px;}
 .orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
 .orig_textarea{width:90%;  margin-bottom:10px;}
 .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
 .orig_sub:hover{ background:#297fb8;}

From 2464586ed207df76f58f47c7094285e0d644591f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 17:20:17 +0800
Subject: [PATCH 451/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F?=
 =?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/org_custom.css | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 95df98738..5ff340272 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -25,31 +25,31 @@ a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
 .por_h2_index{ font-size:18px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
 a.por_more_index{ font-size:12px; color:#999; }
 .por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
-a.por_hot_title{ font-size:16px; display:block; font-weight:bold; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.por_hot_txt{ color:#666; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
+a.por_hot_title{ font-size:16px; display:block; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
+.por_hot_txt{ color:#637379; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
 .por_time{ color:#999;}
 a.por_hot_name{color:#3b94d6;}
 .por_hotbar_right{  padding:5px 0 5px 10px; margin-top:15px; width:300px; }
 .por_hotbar_right img{ width:300px; height:246px;}
-.por_hot_title_r{ font-size:16px; display:block; font-weight:bold; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hot_title_r{ font-size:16px; display:block; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
 .por_hot_txt_r{color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course{ }
 .por_course_bar{ width:328px; margin:0 7px; padding:20px 0 0px;}
-a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_course_title{font-size:16px; margin-bottom:10px; display:block; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
 .por_course_bar img{ width:140px; height:100px; }
-.por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
+.por_course_txt { width:180px; margin-left:5px;color:#637379; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course_time{color:#3b94d6; margin-left:5px;}
 .por_post{  padding-bottom:5px;}
-.por_post_left{ width:394px; margin-top:15px;}
+.por_post_left{ width:385px; margin-top:15px; margin-right: 9px;}
 .por_post_leftbar img{ width:377px; height:163px;}
 .por_post_leftbar { border-bottom:1px dashed #e8e5e5; padding-bottom:5px; margin-bottom:10px;}
-a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.por_post_txt{color:#666; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
+a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
+.por_post_txt{color:#637379; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-bottom: 5px;}
 .post_icons_grey{ width:4px; height:4px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
 .por_post_list li{  height:35px;}
 .por_post_list li a{ font-size:14px; }
-a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
+a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_post_right{ width:280px; border-left:1px solid #e8e5e5; margin-top:15px; padding-left:10px;}
 .por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
 .por_users_img{ width:40px; height:40px;  -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
@@ -57,11 +57,11 @@ a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: now
 .por_news_p{ line-height:20px;max-height:40px;min-width:240px;overflow:hidden;text-overflow:ellipsis;  }
 a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
 a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
-.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_projects{ padding-bottom:10px; margin-top:10px;}
 .por_projects ul li{ padding:5px 0;}
 .por_projects ul{ margin-top:5px;}
-.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#666;  }
+.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#637379; margin-bottom: 5px;}
 .por_project_li{border-bottom:1px dashed #ccc; padding-bottom:10px; margin-bottom:5px;}
 .por_time a{ color:#3b94d6;}
 .por_teachers{ margin-top:20px; }
@@ -78,7 +78,7 @@ a.por_more_teacher{ font-size:12px; }
 .por_teachers_li{ margin-top:10px;}
 .por_teachers_li li{ padding:10px 0;}
 .por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_teachers_span{ color:#999;}
 .por_teachers_span a{ margin:0 5px; color:#999;}

From 6af0bf7b8396d6496bbc7276ce2398f78ab220af Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 17:35:46 +0800
Subject: [PATCH 452/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left1.html.erb  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index ee88f3315..8632dd57a 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -66,7 +66,7 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <div style="background: #f8fafb;">
+                <div style="background: #f8fafb; padding:3px 5px">
                   <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
                   <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
@@ -85,9 +85,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% else %>
                       <div class="por_hotbar_right fl">
@@ -96,9 +98,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% end %>
               <% end %>
@@ -111,9 +115,11 @@
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
-                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
-                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    <div style="background: #f8fafb; padding:3px 5px">
+                      <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
+                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    </div>
                   </div>
               <% end %>
           <% end %>
@@ -121,4 +127,8 @@
 
   <%# end %>
   <div class="cl"></div>
-</div><!--por_hotbar end-->
\ No newline at end of file
+</div><!--por_hotbar end-->
+
+<script>
+  $(".por_hotbar_left li:last").css("borderBottom","none");
+</script>
\ No newline at end of file

From fce93de29682b60ebf392ae5ebc6e204b001e84c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Jun 2016 18:03:58 +0800
Subject: [PATCH 453/668] =?UTF-8?q?500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_custom_left3.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index fb2b83dd2..ff412d869 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -71,7 +71,7 @@
               <% end %>
           <% end %>
         </div>
-        <% unless acts[1..4].nil? %>
+        <% unless acts[1..4].blank? %>
             <% acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
@@ -110,10 +110,10 @@
             <% end %>
         <% end %>
       </div>
-      <% unless acts[5..16].nil? %>
+      <% unless acts[5..16].blank? %>
           <div class="fl">
             <ul class="por_post_right por_post_list">
-              <% acts[6..16].each do |activity| %>
+              <% acts[5..16].each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>

From 98c6548e3933cc92302182f7f079d9a9b1497ebb Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:18:03 +0800
Subject: [PATCH 454/668] =?UTF-8?q?=E9=87=8D=E5=86=99=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=92=8C=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/users.rb                  |  11 +++
 app/controllers/wechats_controller.rb         |   4 +-
 app/models/course.rb                          |   5 -
 public/assets/wechat/app.html                 |   8 +-
 public/assets/wechat/login.html               |  25 +++++
 public/assets/wechat/reg.html                 |  43 +++++++++
 public/assets/wechat/templates/alert.html     |  12 +++
 public/images/wechat/QR-code.jpg              | Bin 0 -> 29738 bytes
 public/images/wechat/arrow.png                | Bin 0 -> 21159 bytes
 public/images/wechat/checked.png              | Bin 0 -> 1092 bytes
 public/images/wechat/dot.png                  | Bin 0 -> 27646 bytes
 public/images/wechat/female.jpg               | Bin 0 -> 3783 bytes
 public/images/wechat/female.png               | Bin 0 -> 22752 bytes
 public/images/wechat/male.jpg                 | Bin 0 -> 4136 bytes
 public/images/wechat/male.png                 | Bin 0 -> 23849 bytes
 public/images/wechat/minus.png                | Bin 0 -> 23318 bytes
 public/images/wechat/plus.png                 | Bin 0 -> 23367 bytes
 public/images/wechat/post-avatar.jpg          | Bin 0 -> 2756 bytes
 public/images/wechat/search.png               | Bin 0 -> 1550 bytes
 public/images/wechat/setting.png              | Bin 0 -> 23839 bytes
 public/images/wechat/tr-like.png              | Bin 0 -> 2027 bytes
 public/images/wechat/tr-reply.png             | Bin 0 -> 1908 bytes
 public/javascripts/wechat/app.js              |   7 ++
 .../javascripts/wechat/controllers/login.js   |  54 +++++++++++
 public/javascripts/wechat/controllers/reg.js  |  42 +++++++++
 public/javascripts/wechat/directives/alert.js |  16 ++++
 .../wechat/directives/form_validate.js        |  10 ++
 public/javascripts/wechat/others/factory.js   |  57 ++++++++++-
 public/javascripts/wechat/others/routes.js    |  12 ++-
 public/stylesheets/weui/weixin.css            |  89 +++++++++++++++++-
 30 files changed, 378 insertions(+), 17 deletions(-)
 create mode 100644 public/assets/wechat/login.html
 create mode 100644 public/assets/wechat/reg.html
 create mode 100644 public/assets/wechat/templates/alert.html
 create mode 100644 public/images/wechat/QR-code.jpg
 create mode 100644 public/images/wechat/arrow.png
 create mode 100644 public/images/wechat/checked.png
 create mode 100644 public/images/wechat/dot.png
 create mode 100644 public/images/wechat/female.jpg
 create mode 100644 public/images/wechat/female.png
 create mode 100644 public/images/wechat/male.jpg
 create mode 100644 public/images/wechat/male.png
 create mode 100644 public/images/wechat/minus.png
 create mode 100644 public/images/wechat/plus.png
 create mode 100644 public/images/wechat/post-avatar.jpg
 create mode 100644 public/images/wechat/search.png
 create mode 100644 public/images/wechat/setting.png
 create mode 100644 public/images/wechat/tr-like.png
 create mode 100644 public/images/wechat/tr-reply.png
 create mode 100644 public/javascripts/wechat/controllers/login.js
 create mode 100644 public/javascripts/wechat/controllers/reg.js
 create mode 100644 public/javascripts/wechat/directives/alert.js
 create mode 100644 public/javascripts/wechat/directives/form_validate.js

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 6ce3cacbb..7800382ad 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -4,6 +4,17 @@ module Mobile
     class Users < Grape::API
       resource :users do
 
+
+        desc "绑定微信用户"
+        params do
+          requires :login, type: String, desc: 'username'
+          requires :mail, type: String, desc: 'mail'
+          requires :password, type: String, desc: 'password'
+        end
+        post '/bindwx' do
+
+        end
+
         desc "注册用户"
         params do
           requires :login, type: String, desc: 'username'
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 169a33fce..887587a5f 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -145,7 +145,7 @@ class WechatsController < ActionController::Base
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/assets/wechat/app.html#login'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
       pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
@@ -175,7 +175,7 @@ class WechatsController < ActionController::Base
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-        raise "无法获取到openid" unless openid
+        raise "无法获取到openid,请在微信中打开本页面" unless openid
         raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
 
         user, last_login_on = User.try_to_login(params[:username], params[:password])
diff --git a/app/models/course.rb b/app/models/course.rb
index d379b24d3..c9ef010e6 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -465,11 +465,6 @@ class Course < ActiveRecord::Base
     code
   end
 
-  def 
-    
-  end
-
-
 end
 
 
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index cabd224c4..6965d24f3 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -10,6 +10,7 @@
     <meta content='True' name='HandheldFriendly' />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 
+    <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
 </head>
@@ -17,8 +18,9 @@
 <div ng-view>
 </div>
 
+
 <script type="text/javascript">
-    window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
+    //window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
     window.g_debug = true; //调试标志,如果在本地请置为true
     window.apiUrl = 'http://localhost:3000/api/v1/';
 </script>
@@ -30,8 +32,12 @@
 <script src="/javascripts/wechat/app.js"></script>
 <script src="/javascripts/wechat/others/factory.js"></script>
 <script src="/javascripts/wechat/others/filter.js"></script>
+<script src="/javascripts/wechat/directives/alert.js"></script>
+<script src="/javascripts/wechat/directives/form_validate.js"></script>
 <script src="/javascripts/wechat/directives/input_auto.js"></script>
 <script src="/javascripts/wechat/directives/loading_spinner.js"></script>
+<script src="/javascripts/wechat/controllers/reg.js"></script>
+<script src="/javascripts/wechat/controllers/login.js"></script>
 <script src="/javascripts/wechat/controllers/activity.js"></script>
 <script src="/javascripts/wechat/controllers/add_class.js"></script>
 <script src="/javascripts/wechat/controllers/blog.js"></script>
diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
new file mode 100644
index 000000000..d34d0054c
--- /dev/null
+++ b/public/assets/wechat/login.html
@@ -0,0 +1,25 @@
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <form name="loginFrm" novalidate>
+    <div class="blue-title">绑定<span class="f13 blue-title-sub" ng-click="goReg()">注册</span></div>
+    <div class="input-box-wrap login-wrap mt30">
+        <input name="login" ng-model="user.login" required class="input-box f12" placeholder="请输入电子邮箱地址或登录名" />
+        <div ng-show="loginFrm.$submitted || loginFrm.login.$touched">
+            <span ng-show="loginFrm.login.$error.required" class="c-red fl f12">电子邮箱地址或登录名不能为空</span>
+        </div>
+    </div>
+    <div class="input-box-wrap login-wrap mt10 mb20">
+        <input class="input-box f12" placeholder="请输入密码" name="password" type="password" ng-model="user.password" required />
+        <div ng-show="loginFrm.$submitted || loginFrm.password.$touched">
+            <span ng-show="loginFrm.password.$error.required" class="c-red fl f12">密码不能为空</span>
+        </div>
+
+    </div>
+    <div class="login-wrap mt5"><a href="javascript:void(0);" ng-class="['btn1', 'bg-blue', 'f18', {'btn-disabled':!loginFrm.$valid} ]" ng-click="login(loginFrm, user)">确定绑定</a></div>
+    <div class="forget-psw-wrap"><a href="javascript:void(0);" class="f12 forget-psw" ng-click="showBox()">忘记密码？</a></div>
+        <my-alert message="findPwdDialog.message" title="findPwdDialog.title" visible="findPwdDialog.visible"></my-alert>
+    </form>
+</div>
+
+<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/reg.html b/public/assets/wechat/reg.html
new file mode 100644
index 000000000..9184fd0ed
--- /dev/null
+++ b/public/assets/wechat/reg.html
@@ -0,0 +1,43 @@
+<div class="post-container">
+    <form name="regFrm" novalidate>
+        <div class="blue-title">注册<span class="f13 blue-title-sub" ng-click="goLogin()">登录</span></div>
+        <img src="/images/wechat/male.jpg" width="60" class="img-circle mt15 block-center"/>
+        <div class="input-box-wrap login-wrap mt10 mb20">
+            <input class="input-box f12" type="email" ng-model="user.email" name="email" required placeholder="请输入电子邮箱地址"/>
+            <div ng-show="regFrm.$submitted || regFrm.email.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" type="password" ng-model="user.password" name="password" ng-maxlength="20" ng-minlength="8" required placeholder="请输入密码"/>
+            <div ng-show="regFrm.$submitted || regFrm.password.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.required">密码不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.minlength">密码长度为8-20位</span>
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.maxlength">密码长度为8-20位</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" type="password" ng-model="user.password_confirm" name="password_confirm"  required placeholder="请再次输入密码" pwdconfirm/>
+            <div ng-show="regFrm.$submitted || regFrm.password_confirm.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.password_confirm.$error.pwdconfirm">两次密码不一致</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" required ng-model="user.username" name="username" placeholder="输入用户登录名"/>
+            <div ng-show="regFrm.$submitted || regFrm.username.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.username.$error.required">用户名不能为空</span>
+            </div>
+        </div>
+
+        <div class="login-op-wrap login-wrap f12 c-grey3">
+            <span ng-class="['login-box', 'mr5',{'checked': isagreed}]"
+                                                                ng-click="agreed(isagreed)"></span>我已阅读并接受<a
+                href="javascript:void(0);" class="link-blue2">Trustie服务协议</a>条款
+        </div>
+        <div class="login-wrap mt5"><a href="javascript:void(0);" ng-class="['btn1', 'bg-blue', 'f18', {'btn-disabled':!regFrm.$valid} ]" ng-click="reg(regFrm, user)">确定注册</a></div>
+
+    </form>
+</div>
+
+<my-alert message="errDialog.message" title="errDialog.title" visible="errDialog.visible"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/templates/alert.html b/public/assets/wechat/templates/alert.html
new file mode 100644
index 000000000..b59a1b87f
--- /dev/null
+++ b/public/assets/wechat/templates/alert.html
@@ -0,0 +1,12 @@
+<!--BEGIN dialog2-->
+<div class="weui_dialog_alert" id="dialog2" ng-show="visible">
+    <div class="weui_mask"></div>
+    <div class="weui_dialog">
+        <div class="weui_dialog_hd"><strong class="weui_dialog_title">{{title}}</strong></div>
+        <div class="weui_dialog_bd"><span class="weui_dialog_info">{{message}}</span></div>
+        <div class="weui_dialog_ft">
+            <a href="javascript:;" class="weui_btn_dialog primary" ng-click="dismiss()">确定</a>
+        </div>
+    </div>
+</div>
+<!--END dialog2-->
\ No newline at end of file
diff --git a/public/images/wechat/QR-code.jpg b/public/images/wechat/QR-code.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ba2a9e6a3ed11d223342f0093c71b845735700d3
GIT binary patch
literal 29738
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
T6OyWr!$CfJ)GO$>f9C!db}~`>

literal 0
HcmV?d00001

diff --git a/public/images/wechat/arrow.png b/public/images/wechat/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f9b18c5bf500b5b1d95f33e0c4404217148aad
GIT binary patch
literal 21159
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
Oz}bGf-4Ukm^8W#<!gzH6

literal 0
HcmV?d00001

diff --git a/public/images/wechat/checked.png b/public/images/wechat/checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..77986d62ec83b4cb56f0bb5b95dac6598a24f128
GIT binary patch
literal 1092
zcmaJ=TWHfz7|u3PS2qzahyyW37!z&NbZu(my3sc6R<&hzh1C~XmYl9(OHNGA)~w=f
zC_3>$AM{a&h?f_czDyAj5rxSfoCt~tUQjk4hD=ZfV)3MFJ0Gke$+_@--~XTg|ITP<
zyuIGmU?T{kKH9-2@VMIgRxZc?Egkl0JZwVY6zYO$lofP91SHrC$fzRpfdmkw;X{+4
zg&=AuIhjJK*gj5#ibJq44pY%En;=@+Oid8`0U~=rpRD?+Zx0?(q%8TVZcoe^(?TF4
zcjR=?m5V3ET)*g(sJ2$J#pJMn0+2wO%7AKcrk^V4a(HfS(-c{NpngBKm{cm(Nrs>f
zNROl0E;<>8WLXE}_OL9olXN*57wyC^YiHb?hvi&eviMLqnl7ce1Rp8J!Ye<OK}h3h
zI-AWpvds>t_tA{c=d(0iE;~lpjbRlDrd>6*l@xejh`OvH8LFhEDD=WX<fm|^i$_qj
zvaD(p%Y+L?n}S9&4ySdb5-=9~KU7i5Xagm{QojEbHj={{pcBA=gSv<tm)>TD(zuWg
z1O)XYgaf52c4i=gMh0qRsEZ|=x@A>@Sz~(vAB%BO)j)zOf++8&u!2LDCC=-0GT!j6
zP_x_ZVVE%MbL|TGB0+D&$2NQUaInPXp*W}j6_vQs5|^*YwXC3MI5H1(c?d`m9V%qu
z$edg`mq10mB3G)MORyrB#>voDWB+P&X$!l@nwD*g7iHrE6}w%>w*G$b++KVo?nU`P
z(tJDh^3Lk2z?x_CzHIHOk>L8vfm@ANJHIx~uK)D$%qrXH=RKqCFAi6osuq5CNAv@>
ziHp&rlj*zfRo8<POyk-MyU$5CkB==R<1IU$k57y&SKs7wV(pQ-{aIKyzu>w?MKW6-
zKd-;E|7mUe+!rRYZts*fbXt7v-}mEubz{R>=Gf_XGvhZVrk`%u_-gzyw>fvQ{`$$;
xo)gPz=I;M$z5FCURx`xqAO6gLm@!vesjedos*Aaj=!jeQIvS4iw}U++e*h%3Y4rdA

literal 0
HcmV?d00001

diff --git a/public/images/wechat/dot.png b/public/images/wechat/dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf1c0104e6d8c36a867507e927431299c758b9f8
GIT binary patch
literal 27646
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/female.jpg b/public/images/wechat/female.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..219865572d134fd727a6192ff01f539322e3a780
GIT binary patch
literal 3783
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/female.png b/public/images/wechat/female.png
new file mode 100644
index 0000000000000000000000000000000000000000..a13733ffc6ae61ff00cd58a8a8682517ebeb4d3a
GIT binary patch
literal 22752
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
V@p|N`$Lg!%^t29W79t&w{TD%ZzaIbq

literal 0
HcmV?d00001

diff --git a/public/images/wechat/male.jpg b/public/images/wechat/male.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..46d58f26ee38288c5bf2df069e6a7d25bf5ef099
GIT binary patch
literal 4136
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
X#=BIQwe5HrP^?{gp7sR$-?#riPNQ%>

literal 0
HcmV?d00001

diff --git a/public/images/wechat/male.png b/public/images/wechat/male.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1214a4c8258b5015485c899ecee3caed81f48f
GIT binary patch
literal 23849
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/minus.png b/public/images/wechat/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..32d82ea8484c3c4d07a6474e8e2f41976ef0db7b
GIT binary patch
literal 23318
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/plus.png b/public/images/wechat/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5d83d212ab2e03d50b3447946b6bd0c32ba5caa
GIT binary patch
literal 23367
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
EKcXtm5C8xG

literal 0
HcmV?d00001

diff --git a/public/images/wechat/post-avatar.jpg b/public/images/wechat/post-avatar.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bd2597dd2a623d59dea9b37ed4452281a69496d3
GIT binary patch
literal 2756
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
JwKT%?;6G!sTH^o!

literal 0
HcmV?d00001

diff --git a/public/images/wechat/search.png b/public/images/wechat/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..a04c1496c728f78f3a778117bb00807994bbc659
GIT binary patch
literal 1550
zcmeAS@N?(olHy`uVBq!ia0vp^azHH0!3HGvF1f=4q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1Ffc1+hD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU
ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um
zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT
zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYex<p&aMi^nL8%D$Vl}upq_QAY
zKPa_0zqBYB7;$OJAgc<joQqNuOY)0C^7C_Gp%{>nUy@&(kzb(T9Bihb5uTZsl3!k|
z30CjxYvq|&T#}fVoa*Ufs{}MbFEca6%G}Aq$;{Q&(%8_@#L&>y%+bZo)Wy`*&D_$$
z%*4{w5vJEAKe;qFHLnDwHwB^B5vN{IQpha;+U$~Alv$RV;#QQOs{r=0RVHq?nBz1L
zsy79<TP$$u)dxC89~7}j5e*XprXCOzo@{{}c*0N31E%&OV6raK+ULl?z|`dF;uunK
zYs)n63=v0xw({_%uJsc%x-=x5^}24xG%Z@u@#KLcuZCq8ze)e%CIQYScE`!hmMd33
z@^n4ud@aT`FhoH9O~<_22gOq>j8?FJ)n3uMNV2*r?PgQ|!tCwO->-VP?p4jwpp%t3
z%x~ICH}HrZ7O83D$UB&_G2+i$@64b7Il3=o-VpiFcin*LdgOum0S}vu=P@q+pb-$V
zhIgHlW!Iw0NF}k0*%!n=@83S_me!dTKh^ht-iziaep;WYWGAXz#cy_)>jo!#B7cda
zbqw3=dsht{pZG33^vSnh;(xq_&g%Bx^YW`1svhkAxc>T1$3u(#ZlyeujBU8?@mf~y
z_JMbA5*Ow93cYLVJ*F<$x7<>y!~R*}p&eowW_u3p?aNo0e)ibcp6hGOJ$D@Mu|L$T
zv&zMGE$h;>Y|rmC^9y!M+H?L~C)YiveEk>B?K3`3kEsnSJyu+M$o@=4*xW;#=YHJc
z|6{IX`Blw3FMIC)ZkcZ-eA}q@j>aUb4R?3k+wgFe-9yjg<vPh*YR@e??Rk9V8s7zJ
zzZ0@gWuyxCN>0D>-rMs~(5pV{wI7#-Z4tQGT2(h)`a4Tzon+AJ^#@`f=U=;2d1dou
z?kelbg=df4;uABGxYaLy(D_A&<?K|^3B`8o*Iu~2`miUO>!QHK`TRS7>0I1Wntmgu
zh<|e56%nPlj+r`hU#a}z5}7jn{skQ#OV#kc8<Cgn1gdTdM{^k^im&PV`FFD1Q6WKF
z^Vz<6nySn9pH5=?8L#PbBdS~MPukvGk2JfC@UGi0J0G<kDDlf|-OYPGYtcNh%8Bmv
zKDW+qT=CE3P~@-8{x$iBTY7&u^!$i$ZVmn8)brzf8@KewzaM<phqwRZG+<c8yn}P~
Sz0}{J657+%&t;ucLK6TXfLKBR

literal 0
HcmV?d00001

diff --git a/public/images/wechat/setting.png b/public/images/wechat/setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c1159fc90d5322dc8c81a8b5c1550ac65a92d8c
GIT binary patch
literal 23839
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/tr-like.png b/public/images/wechat/tr-like.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d9d38dc36d2d5300c8ec7e3450d9a6496506ccf
GIT binary patch
literal 2027
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

literal 0
HcmV?d00001

diff --git a/public/images/wechat/tr-reply.png b/public/images/wechat/tr-reply.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef9cffcfa3af43edff64105ba501023925f4002
GIT binary patch
literal 1908
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
aErqzxOGXDO3I?n6=OB+0z%KF=?)(QwYX}wq

literal 0
HcmV?d00001

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4d947e440..d4275e9df 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1 +1,8 @@
 var app = angular.module('wechat', ['ngRoute']);
+
+app.constant('config', {
+    rootPath: '/assets/wechat/',
+    rootUrl: '/',
+    apiUrl: '/api/v1/'
+
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
new file mode 100644
index 000000000..011f11baa
--- /dev/null
+++ b/public/javascripts/wechat/controllers/login.js
@@ -0,0 +1,54 @@
+app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session',
+    function ($scope, $http, $location, $routeParams, alertService, config, auth,session) {
+
+        if($routeParams.code){
+            session.save('code', $routeParams.code);
+        }
+
+        var vm = $scope;
+        vm.loginFailed = false;
+        vm.alertService = alertService.create();
+        vm.findPwdDialog = alertService.create();
+
+        vm.login = function (frm, user) {
+            frm.$setSubmitted();
+            console.log(user);
+
+            if (!frm.$valid) {
+                console.log(frm.$error);
+                return;
+            }
+
+            console.log(apiUrl + "auth");
+
+            auth.getOpenId().then(
+                function(){
+                    return $http.post(
+                        config.rootUrl + "wxbind",
+                        {login: user.login, password: user.password, openid: openid}
+                    );
+                }
+            ).then(
+                function(response) {
+                    vm.loginFailed = (response.data.status != 0);
+                    console.log(response.data);
+                    vm.alertService.showMessage('出错了', response.data.msg);
+
+                    if (!$scope.loginFailed) { //绑定成功
+                    } else {
+                        vm.alertService.showMessage('出错了', response.data.msg);
+                    }
+                }
+            ).catch(function(e){
+                vm.alertService.showMessage('出错了', e);
+            });
+        };
+
+        vm.showBox = function () {
+            vm.findPwdDialog.showMessage("提示", "请访问www.trustie.net获取密码，谢谢！");
+        }
+
+        vm.goReg = function () {
+            $location.path('/reg');
+        }
+    }]);
diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
new file mode 100644
index 000000000..dfa010ad7
--- /dev/null
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -0,0 +1,42 @@
+app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
+    function ($scope, $http, $location, alertService) {
+
+        var vm = $scope;
+        vm.errDialog = alertService.create();
+
+        vm.goLogin = function () {
+            $location.path("/login");
+        }
+
+        vm.isagreed = true;
+        vm.agreed = function (_isagreed) {
+            vm.isagreed = !_isagreed;
+        };
+
+        vm.reg = function (frm, user) {
+
+            frm.$setSubmitted();
+
+            console.log(frm);
+            if (!frm.$valid) {
+                console.log(frm.$error);
+                return;
+            }
+
+            console.log(user);
+
+            $http.post(
+                apiUrl + "users",
+                {login: user.username, password: user.password, mail: user.email}
+            ).then(function (response) {
+                if (response.data.status != 0) {
+                    vm.errDialog.showMessage('出错了',response.data.message);
+                } else {
+                    vm.errDialog.showMessage("提示","注册且绑定微信成功");
+                }
+            }, function (response) {
+                vm.errDialo.showMessage('出错了',response.data);
+            });
+        }
+
+    }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
new file mode 100644
index 000000000..aa346cb8c
--- /dev/null
+++ b/public/javascripts/wechat/directives/alert.js
@@ -0,0 +1,16 @@
+app.directive('myAlert', ['config', function(config){
+    return {
+        templateUrl: config.rootPath+ 'templates/alert.html',
+        scope: {
+            message: "=",
+            title: "=",
+            visible: "="
+        },
+        link: function(scope){
+            scope.visible = false;
+            scope.dismiss = function(){
+                scope.visible = false;
+            };
+        }
+    }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/form_validate.js b/public/javascripts/wechat/directives/form_validate.js
new file mode 100644
index 000000000..553560c56
--- /dev/null
+++ b/public/javascripts/wechat/directives/form_validate.js
@@ -0,0 +1,10 @@
+app.directive('pwdconfirm', function(){
+   return {
+       require: 'ngModel',
+       link: function(scope, elm, attrs, ctrl){
+           ctrl.$validators.pwdconfirm = function(modelValue, viewValue) {
+               return scope.user && scope.user.password == viewValue;
+           }
+       }
+   }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index cefef3ab9..27fbeb1c4 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -1,23 +1,60 @@
-app.factory('auth', ['$http','$routeParams', '$q', function($http,$routeParams, $q){
+app.factory('alertService', function(){
+    function Alert(){
+        this.title = null;
+        this.message = null;
+        this.visible = null;
+    }
+
+    Alert.prototype.showMessage = function(title, msg){
+        this.message = msg;
+        this.title = title;
+        this.visible = true;
+    }
+
+    Alert.prototype.dismiss = function(){
+        this.message = null;
+        this.title = null;
+        this.visible = false;
+    }
+
+    return {
+        create: function(){
+            return new Alert();
+        }
+    }
+});
+
+
+app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$routeParams, $q, session){
     var _openid = '';
 
     if(typeof g_openid !== 'undefined'){
         _openid = g_openid;
     }
 
+    if(!_openid){
+        _openid = session.get("openid");
+    }
+
     var getOpenId = function() {
         var deferred = $q.defer();
-        if (typeof _openid !== 'undefined' && _openid.length > 0){
+        console.log(_openid);
+        if (typeof _openid !== 'undefined' && _openid && _openid.length > 0){
             deferred.resolve(_openid);
         } else {
-            var code = $routeParams.code;
+            var code = $routeParams.code || session.get("code");
             $http({
                 url: '/wechat/get_open_id',
                 data: {code: code},
                 method: 'POST'
             }).then(function successCallback(response) {
-                _openid = response.data.openid;
-                deferred.resolve(_openid);
+                if(response.data.status != 0){
+                    deferred.reject(response.data.msg);
+                } else{
+                    _openid = response.data.openid;
+                    session.save("openid", _openid);
+                    deferred.resolve(_openid);
+                }
             }, function errorCallback(response) {
                 deferred.reject(response);
             });
@@ -30,6 +67,16 @@ app.factory('auth', ['$http','$routeParams', '$q', function($http,$routeParams,
     return {getOpenId: getOpenId, openid: openid};
 }]);
 
+app.factory("session", function(){
+    return {
+        save: function(key,value){
+            sessionStorage.setItem(key,value);
+        },
+        get: function(key){
+            return sessionStorage.getItem(key);
+        }
+    }
+});
 
 app.factory('rms', function(){
     var _saveStorage = {};
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 7ea270c6e..ded374930 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -1,7 +1,15 @@
-app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
-    var rootPath = '/assets/wechat/'
+app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', function ($routeProvider, $httpProvider, $locationProvider, config) {
+    var rootPath = config.rootPath;
     //$locationProvider.html5Mode(true);
     $routeProvider
+        .when('/login', {
+            templateUrl: rootPath + 'login.html',
+            controller: 'LoginController'
+        })
+        .when('/reg', {
+            templateUrl: rootPath + 'reg.html',
+            controller: 'RegController'
+        })
         .when('/activites', {
             templateUrl: rootPath + 'activities.html',
             controller: 'ActivityController'
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 6cccb3615..fd5a56bd6 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -3,7 +3,8 @@
 
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+body, ul, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+ul li {list-style:none;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
 .text-control {word-break:normal; word-wrap:break-word;}
@@ -12,29 +13,42 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
 .mt2 {margin-top:2px;}
+.mt4 {margin-top:4px;}
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
+.mt11 {margin-top:11px;}
+.mt15 {margin-top:15px;}
+.mt30 {margin-top:30px;}
+.mt70 {margin-top:70px;}
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
+.mb20 {margin-bottom:20px;}
 .ml10 {margin-left:10px;}
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
 .mr15 {margin-right:15px;}
 .mr20 {margin-right:20px;}
+.ml25 {margin-left:25px;}
 .mr25 {margin-right:25px;}
 .ml55 {margin-left:55px;}
 .mr55 {margin-right:55px;}
+.c-red {color:#e81a1a;}
 .c-blue {color:#269ac9;}
 .c-grey {color:#9a9a9a;}
 .c-grey2 {color:#707070;}
 .c-grey3 {color:#555555;}
+.c-grey4 {color:#888888;}
+.c-grey5 {color:#aaaaaa;}
+.c-grey6 {color:#777777;}
+.c-blue {color:#3b94d6;}
 a {color:#707070;}
 a.c-grey {color:#707070;}
 a.c-grey2 {color:#9a9a9a;}
 a:link,a:visited{text-decoration:none;}
 a:hover,a:active{cursor:pointer;}
 a.link-blue {color:#269ac9;}
+a.link-blue2 {color:#3b94d6;}
 a.underline {text-decoration:underline;}
 .border-radius {border-radius:5px;}
 .w36 {width:36px;}
@@ -42,9 +56,21 @@ a.underline {text-decoration:underline;}
 .max-width-130 {max-width:130px;}
 .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .inline-block {display:inline-block;}
+.dis {display:block;}
 .undis {display:none;}
 .text-nowrap {white-space:nowrap;}
 .v-top {vertical-align:top;}
+.tac {text-align:center;}
+.block-center {margin-left:auto; margin-right:auto; display:block;}
+
+/*背景色*/
+.bg-grey {background-color:#c1c1c1;}
+.bg-blue {background-color:#3b94d6;}
+
+/*按钮样式*/
+.btn1 {width:100%; height:40px; line-height:40px; vertical-align:middle; text-align:center; color:#fff; display:block; border-radius:5px;}
+.bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
+.btn-disabled {background-color:#ccc;}
 
 /*动态样式*/
 .post-container {width:100%;}
@@ -88,4 +114,63 @@ a.underline {text-decoration:underline;}
 /*帖子锁定样式*/
 .locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
 
-.bg-grey {background-color:#c1c1c1;}
+/*20150612加入班级样式*/
+.add-class-box {width:80%; max-width:300px; min-width:240px; height:150px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; margin-top:100px;}
+.add-class-tip {padding-top:20px; padding-bottom:20px;}
+.class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
+.cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.slice {width:2%; text-align:center; border-top:1px solid #ccc;}
+.slice-line {width:1px; height:37px; margin:auto; background:#ccc;}
+
+/*20160613邀请码样式*/
+.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
+.qr-code-box {width:225px; height:332px; background-color:#fff; border-radius:3px; margin:0 auto;}
+.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
+.qr-code-img {margin:36px auto; display:block;}
+.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}
+.share-code-wrap {width:100%; background-color:#efeff4;}
+.share-code-btn, .finish-btn {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:0 auto;}
+
+/*20160613班级详情*/
+.class-detail-name, .blue-title {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;}
+.blue-title-sub {position:absolute; right:10px;}
+.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
+.class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-detail-tab2 {width:32%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-tab-active {border-bottom:1px solid #3b94d6;}
+.class-search-wrap {padding:8px 12px; position:relative;}
+.class-search-inner {padding:0 30px; background-color:#fff;}
+.class-search-icon {position:absolute; top:16px; left:16px;}
+.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
+.border-top {border-top:1px solid #ccc;}
+.class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
+.img-circle {border-radius:50%;}
+
+/*20160614班级列表*/
+.course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-list {width:100%; border-bottom:1px solid #ccc;}
+.class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;}
+.class-list-name {max-width:75%; display:inline-block;}
+.class-list-dot {position:absolute; top:13px; left:-8px;}
+.border-bottom-none {border-bottom:none !important;}
+.students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
+.new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
+.join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
+.new-class-input {width:60%; color:#aaa; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
+
+/*20160616登录注册*/
+.login-wrap {padding:0 10px;}
+.input-box-wrap {padding-right:17px;}
+.input-box {width:100%; height:36px; padding-left:5px; line-height:36px; vertical-align:middle; border:1px solid #ccc; border-radius:5px;}
+.login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
+.login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
+.login-box.checked{background:#63c360;}
+.login-box.checked:after{content:url(/images/wechat/checked.png);}
+.forget-psw-wrap {width:60px; margin:0 auto;}
+.forget-psw {position:fixed; bottom:10px;}
\ No newline at end of file

From 7aec37bb3a852b3e92f91d932c343f6547dc1060 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:25:55 +0800
Subject: [PATCH 455/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 887587a5f..8c39c773e 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -139,6 +139,8 @@ class WechatsController < ActionController::Base
   end
 
   def sendBind(request)
+    root_url = "http://wechat.trustie.net"
+
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
 我们将会与微信不断结合，为您提供更有价值的服务。

From a0c0a65d18d4c62b4e4139bb5802ba6d14fe32ad Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:37:26 +0800
Subject: [PATCH 456/668] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/users.rb                  | 21 ++++++++++++++++++-
 .../javascripts/wechat/controllers/login.js   |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 7800382ad..ab2ba49b4 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -12,7 +12,26 @@ module Mobile
           requires :password, type: String, desc: 'password'
         end
         post '/bindwx' do
-
+            code = params[:code] || session[:wechat_code]
+            openid = get_openid_from_code(code)
+
+            raise "无法获取到openid,请在微信中打开本页面" unless openid
+            raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
+
+            user, last_login_on = User.try_to_login(params[:username], params[:password])
+            raise "用户名或密码错误,请重新输入" unless user
+            #补全用户信息
+
+            raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
+
+            UserWechat.create!(
+                openid: openid,
+                user: user
+            )
+            ws = WechatService.new
+            ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+            present status: 0
+            present message: '绑定成功'
         end
 
         desc "注册用户"
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index 011f11baa..e8efad177 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -22,7 +22,7 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
             console.log(apiUrl + "auth");
 
             auth.getOpenId().then(
-                function(){
+                function(openid){
                     return $http.post(
                         config.rootUrl + "wxbind",
                         {login: user.login, password: user.password, openid: openid}

From 3582849ef32801557a95e858c502d663a2cdf3e8 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:40:03 +0800
Subject: [PATCH 457/668] .

---
 public/javascripts/wechat/controllers/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index e8efad177..5695e63ff 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -24,7 +24,7 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
             auth.getOpenId().then(
                 function(openid){
                     return $http.post(
-                        config.rootUrl + "wxbind",
+                        config.apiUrl + "wxbind",
                         {login: user.login, password: user.password, openid: openid}
                     );
                 }

From 46018ad388fd67dffcd03c9c302f24b29e82ce88 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:41:16 +0800
Subject: [PATCH 458/668] .

---
 public/javascripts/wechat/controllers/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index 5695e63ff..97fe785f5 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -24,7 +24,7 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
             auth.getOpenId().then(
                 function(openid){
                     return $http.post(
-                        config.apiUrl + "wxbind",
+                        config.apiUrl + "users/wxbind",
                         {login: user.login, password: user.password, openid: openid}
                     );
                 }

From 64ad182a845abae1791986697bee5716a10a1913 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:42:58 +0800
Subject: [PATCH 459/668] .

---
 app/api/mobile/apis/users.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index ab2ba49b4..28fbb8839 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -11,7 +11,7 @@ module Mobile
           requires :mail, type: String, desc: 'mail'
           requires :password, type: String, desc: 'password'
         end
-        post '/bindwx' do
+        post 'wxbind' do
             code = params[:code] || session[:wechat_code]
             openid = get_openid_from_code(code)
 

From b9280caf367fcd45d7f9e84f830114d35ea6c76d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:46:15 +0800
Subject: [PATCH 460/668] .

---
 app/api/mobile/apis/users.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 28fbb8839..d83283081 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -8,15 +8,13 @@ module Mobile
         desc "绑定微信用户"
         params do
           requires :login, type: String, desc: 'username'
-          requires :mail, type: String, desc: 'mail'
           requires :password, type: String, desc: 'password'
+          requires :openid, type: String, desc: 'wechat openid'
         end
         post 'wxbind' do
-            code = params[:code] || session[:wechat_code]
-            openid = get_openid_from_code(code)
-
+            openid = params[:openid]
             raise "无法获取到openid,请在微信中打开本页面" unless openid
-            raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
+            raise "此微信号已绑定用户, 不能重复绑定" if UserWechat.where(openid: openid).first
 
             user, last_login_on = User.try_to_login(params[:username], params[:password])
             raise "用户名或密码错误,请重新输入" unless user

From 9d19caa736bdec95fae4a2cb5a1b7454b5a35020 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:48:27 +0800
Subject: [PATCH 461/668] .

---
 app/controllers/wechats_controller.rb          | 2 +-
 public/javascripts/wechat/controllers/login.js | 4 ++--
 public/javascripts/wechat/others/factory.js    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 8c39c773e..930318fa5 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -167,7 +167,7 @@ class WechatsController < ActionController::Base
         raise "无法获取到微信openid" unless openid
         render :json => {status:0, openid: openid}
       rescue Exception=>e
-        render :json => {status: -1, msg: e.message}
+        render :json => {status: -1, message: e.message}
       end
     end
 
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index 97fe785f5..a760ce8ea 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -32,11 +32,11 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
                 function(response) {
                     vm.loginFailed = (response.data.status != 0);
                     console.log(response.data);
-                    vm.alertService.showMessage('出错了', response.data.msg);
+                    vm.alertService.showMessage('出错了', response.data.message);
 
                     if (!$scope.loginFailed) { //绑定成功
                     } else {
-                        vm.alertService.showMessage('出错了', response.data.msg);
+                        vm.alertService.showMessage('出错了', response.data.message);
                     }
                 }
             ).catch(function(e){
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 27fbeb1c4..3cb601d2b 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -49,7 +49,7 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$ro
                 method: 'POST'
             }).then(function successCallback(response) {
                 if(response.data.status != 0){
-                    deferred.reject(response.data.msg);
+                    deferred.reject(response.data.message);
                 } else{
                     _openid = response.data.openid;
                     session.save("openid", _openid);

From 762ca9c3cb8f5881c30590416f028864a9cb0389 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:50:43 +0800
Subject: [PATCH 462/668] .

---
 app/api/mobile/apis/users.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index d83283081..637f55565 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -16,7 +16,7 @@ module Mobile
             raise "无法获取到openid,请在微信中打开本页面" unless openid
             raise "此微信号已绑定用户, 不能重复绑定" if UserWechat.where(openid: openid).first
 
-            user, last_login_on = User.try_to_login(params[:username], params[:password])
+            user, last_login_on = User.try_to_login(params[:login], params[:password])
             raise "用户名或密码错误,请重新输入" unless user
             #补全用户信息
 

From f40794282f160f6cdece3e7f33cf05a0dc5551d2 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 17 Jun 2016 18:54:24 +0800
Subject: [PATCH 463/668] .

---
 app/api/mobile/apis/users.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 637f55565..5aee29fe2 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -14,7 +14,8 @@ module Mobile
         post 'wxbind' do
             openid = params[:openid]
             raise "无法获取到openid,请在微信中打开本页面" unless openid
-            raise "此微信号已绑定用户, 不能重复绑定" if UserWechat.where(openid: openid).first
+            uw = UserWechat.where(openid: openid).first
+            raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw
 
             user, last_login_on = User.try_to_login(params[:login], params[:password])
             raise "用户名或密码错误,请重新输入" unless user
@@ -26,8 +27,8 @@ module Mobile
                 openid: openid,
                 user: user
             )
-            ws = WechatService.new
-            ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+            # ws = WechatService.new
+            # ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
             present status: 0
             present message: '绑定成功'
         end

From 4b7fa3a040d00ad1c6fa4340205d07f2a165fd34 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 09:19:50 +0800
Subject: [PATCH 464/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8F=8F=E8=BF=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 2b0dce4fa..fcf0e9982 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -44,7 +44,7 @@
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
                   <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container.organization,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">

From 7c729107cca630eb1f4478fb7fa48ae624fd788c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 09:40:21 +0800
Subject: [PATCH 465/668] =?UTF-8?q?KE=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=BF=9D=E7=95=99=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/pasteimg.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 97d5e33c5..d7ffead5b 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -371,7 +371,8 @@ function df(myself) {
                     sstr += that.attr("src") + "|";
             }
             else if (that.attr("src").indexOf("data:image") >= 0){
-                that.parents().removeAttr("href"); //删除所有父节点的href
+                //去掉外链
+//                that.parents().removeAttr("href"); //删除所有父节点的href
             }
         }
     });
@@ -421,10 +422,10 @@ function uploadpic(piclist,myself) {
 
                             //复制过来带的链接class等都要去掉 和视频图片有关系
                             that.removeAttr("class");
-                            that.parent().removeAttr("class");
-                            that.parents().removeAttr("href"); //删除所有父节点的href
-//                            that.parent().removeAttr("href");
-                            that.parent().removeAttr("data-ke-src");
+                            //去掉外链
+//                            that.parent().removeAttr("class");
+//                            that.parents().removeAttr("href"); //删除所有父节点的href
+//                            that.parent().removeAttr("data-ke-src");
                             tIndex = tIndex + 1;
                         }
                     }

From b17b92cc3ec7341ef1d1e2179be0de623605a725 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Mon, 20 Jun 2016 11:08:57 +0800
Subject: [PATCH 466/668] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E5=85=88=E5=8A=A0=E8=BD=BD=E5=90=8E=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         |  2 +-
 public/assets/wechat/jour_message_detail.html |  2 +-
 public/javascripts/wechat/app.js              | 16 +++++++++++++---
 public/stylesheets/weui/weixin.css            |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index ee651eadf..509e0171a 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -8,7 +8,7 @@
                 <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
                 <div class="cl"></div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index a1b79379f..dc6b1409f 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -7,7 +7,7 @@
                 <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
                 <div class="post-title">{{message.created_on}}</div>
                 <div class="cl"></div>
-                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="message.notes|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="message.notes|safeHtml"></div>
                 <div class="cl"></div>
             </div>
             <div class="post-interactive border-bottom">
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ca9682db2..61ec717a2 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -16,7 +16,7 @@ app.factory('auth', function($http,$routeParams, $q){
     }
 
     if(debug===true){
-        _openid = "orgVLv8TlS6e7FDiI6xdTGHRaaRo"; //guange的帐号
+        _openid = "1"; //guange的帐号
     }
 
     var getOpenId = function() {
@@ -147,8 +147,6 @@ app.factory('common', function($http, auth, $routeParams){
             data: userInfo
         }).then(function successCallback(response) {
             //alert("提交成功");
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
             if(typeof cb === 'function'){
                 cb();
             }
@@ -219,6 +217,8 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth, co
         common.addCommonReply($routeParams.id, 'Issue', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
 
     };
@@ -256,6 +256,8 @@ app.controller('HomeworkController', function($scope, $http, $routeParams, auth,
         common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
     };
 
@@ -292,6 +294,8 @@ app.controller('CourseNoticeController', function($scope, $http, $routeParams, a
         common.addCommonReply($routeParams.id, 'News', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
     };
 
@@ -328,6 +332,8 @@ app.controller('DiscussionController', function($scope, $http, $routeParams, aut
         common.addCommonReply($routeParams.id, 'Message', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
     };
 
@@ -364,6 +370,8 @@ app.controller('JournalsController', function($scope, $http, $routeParams, auth,
         common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
     };
 
@@ -402,6 +410,8 @@ app.controller('BlogController', function($scope, $http, $routeParams, auth, com
         common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
             $scope.formData = {comment: ''};
             loadData($routeParams.id);
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
         });
     };
 
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 3fd9acd37..f77cf1e2a 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -56,7 +56,7 @@ a.underline {text-decoration:underline;}
 .tac {text-align:center;}
 
 /*背景色*/
-.bg-grey {background-color:#c1c1c1;}
+.bg-grey {background-color:#c1c1c1 !important;}
 
 /*动态样式*/
 .post-container {width:100%;}

From b26a6b5195b42a670abf74cb73277f3c189c71a1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 20 Jun 2016 11:24:34 +0800
Subject: [PATCH 467/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_show_messages_list.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index addd04815..966c04b4d 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -123,12 +123,14 @@
       <% elsif AtMessage === ma && ma.at_valid? %>
           <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
             <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+            <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
           <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
-              <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+            <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+            <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
           <% else %>
-            <% href = ma.url %>
+            <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
+            <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
           <% end %>
-          <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
       <% end %>
   <% end %>
 </ul>

From 36e47fa8b1e6554ae40f91af752bce65f523e8f4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 20 Jun 2016 14:21:40 +0800
Subject: [PATCH 468/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E5=BC=B9=E6=A1=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        |  2 +-
 .../quality_analyses_controller.rb            | 11 ++++
 app/controllers/repositories_controller.rb    | 52 ++++++++++++-------
 .../repositories/_quality_analyses.html.erb   |  8 +--
 config/routes.rb                              |  2 +-
 5 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7e1738842..c216491b1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -393,7 +393,7 @@ class ProjectsController < ApplicationController
     unless @project.gpid.nil?
       g = Gitlab.client
       @gitlab_branches = g.branches(@project.gpid)
-      @branch_names = g.branches(@project.gpid).map{|b| b.name}
+      @branch_names = @gitlab_branches.map{|b| b.name}
       @gitlab_default_branch = g.project(@project.gpid).default_branch
     end
   end
diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analyses_controller.rb
index 0ea288a91..8f9a51666 100644
--- a/app/controllers/quality_analyses_controller.rb
+++ b/app/controllers/quality_analyses_controller.rb
@@ -1,6 +1,17 @@
 class QualityAnalysesController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   layout "base_projects"
+  include ApplicationHelper
+
+  def new
+
+  end
+
+  def create
+    branch = params[:branch]
+    language = params[:language]
+    path = params[:path]
+  end
 
   def index
 
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index d41def4af..3f630ce51 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -35,6 +35,8 @@ class RepositoriesController < ApplicationController
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analyses]
+  # 链接gitlab
+  before_filter :connect_gitlab, :only => [:quality_analyses]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -308,26 +310,30 @@ update
   end
 
   def quality_analyses
-    language = params[:language]
-    branch = params[:branch]
-    path = params[:path]
-    user_name = User.find(@project.user_id).try(:login)
-    rep_name = params[:repository_id]
-    host = "192.168.0.200"
-    port = "1125"
-    username = "git"
-    password = "123123"
-    server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name
-    # 连接到远程主机 foobar
-    ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
-      result = ssh.exec!(server_cmd1)
-      path = "/home/git/repo/" + user_name + "/" + rep_name
-      # sonar 分析
-      # server_cmd2
-      # 删除clone的版本库
-      # server_cmd3
-    end
+    gitlab_branches = @g.branches(@project.gpid)
+    @branch_names = gitlab_branches.map{|b| b.name}
+    @gitlab_default_branch = @g.project(@project.gpid).default_branch
+    # language = params[:language]
+    # branch = params[:branch]
+    # path = params[:path]
+    # user_name = User.find(@project.user_id).try(:login)
+    # rep_name = params[:repository_id]
+    # host = "192.168.0.200"
+    # port = "1125"
+    # username = "git"
+    # password = "123123"
+    # server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name
+    # # 连接到远程主机 foobar
+    # ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
+    #   result = ssh.exec!(server_cmd1)
+    #   path = "/home/git/repo/" + user_name + "/" + rep_name
+    #   # sonar 分析
+    #   # server_cmd2
+    #   # 删除clone的版本库
+    #   # server_cmd3
+    # end
     respond_to do |format|
+      format.js
       format.html{
         render :layout => "base_projects"
       }
@@ -643,6 +649,14 @@ update
     project.project_score.update_attribute(:commit_time, date.created_at)
   end
 
+  # 链接gitlab
+  def connect_gitlab
+    @g = Gitlab.client
+    unless @project.gpid.nil?
+      @g_project = @g.project(@project.gpid)
+    end
+  end
+
   def find_repository
     @repository = Repository.find(params[:id])
     @project = @repository.project
diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb
index 7424e0369..56951f3b6 100644
--- a/app/views/repositories/_quality_analyses.html.erb
+++ b/app/views/repositories/_quality_analyses.html.erb
@@ -1,5 +1,7 @@
-<%= form_tag( url_for(:controller => 'repositories', :action => 'quality_analyses'), :remote => true , :method => 'post', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %>
-    <textarea  id="path_description" name="rep[path]" rows="8" placeholder="最多3000个汉字(或6000个英文字符)"></textarea>
+<%= form_tag( url_for(:controller => 'quality_analyses', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
+    <textarea  id="path_description" name="path" rows="8" placeholder="目录相当于根目录，用半逗号隔开。如：src/main/java,libs"></textarea>
     <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
-    <%= select_tag :language, options_for_select(["Java","C"]), :id => 'branch' %>
+    <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %>
+    <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
 <% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 17614f4b6..b32816673 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -782,7 +782,7 @@ RedmineApp::Application.routes.draw do
       end
     end
 
-    resources :quality_analyses, :only => [:index] do
+    resources :quality_analyses, :only => [:index, :new, :create] do
       collection do
       end
       member do

From 61c117b8cbc86ccb8de23c40f86295f727c6ce1e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 14:39:20 +0800
Subject: [PATCH 469/668] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=80=81=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=9C=AC=E5=9C=B0=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?session=E6=9D=A5=E5=AD=98=E6=94=BEtoken,=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BF=E9=97=AE=E7=9B=B4=E6=8E=A5=E7=94=A8=E8=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
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/apis/issues.rb                 |  3 +-
 app/api/mobile/apis/journal_for_messages.rb   |  3 +-
 app/api/mobile/apis/messages.rb               |  3 +-
 app/api/mobile/apis/new_comment.rb            |  4 +-
 app/api/mobile/apis/newss.rb                  |  3 +-
 app/api/mobile/apis/praise.rb                 |  5 +-
 app/api/mobile/apis/users.rb                  | 17 ++++-
 app/api/mobile/apis/whomeworks.rb             |  3 +-
 public/assets/wechat/activities.html          |  1 +
 public/assets/wechat/app.html                 |  2 +-
 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.html               | 50 ------------
 public/assets/wechat/issue_detail.html        |  2 +-
 public/assets/wechat/jour_message_detail.html |  2 +-
 public/assets/wechat/login.html               |  2 +-
 public/assets/wechat/project_discussion.html  |  2 +-
 public/javascripts/wechat/app.js              | 21 ++++-
 .../wechat/controllers/activity.js            | 14 ++--
 public/javascripts/wechat/controllers/blog.js | 44 +++--------
 .../wechat/controllers/course_notice.js       | 40 +++-------
 .../wechat/controllers/discussion.js          | 42 +++-------
 .../wechat/controllers/homework.js            | 42 +++-------
 .../javascripts/wechat/controllers/issue.js   | 43 +++--------
 .../wechat/controllers/journals.js            | 44 +++--------
 .../javascripts/wechat/controllers/login.js   | 13 ++--
 public/javascripts/wechat/directives/alert.js | 10 ++-
 public/javascripts/wechat/others/factory.js   | 76 ++++++++++++++++---
 public/javascripts/wechat/others/routes.js    | 57 +++++---------
 32 files changed, 232 insertions(+), 326 deletions(-)
 delete mode 100644 public/assets/wechat/issue.html

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 49fdaff8f..661925012 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -9,7 +9,7 @@ module Mobile
 
         params do
           requires :page, type: Integer
-          requires :openid, type: String
+          requires :token, type: String
         end
         post do
           authenticate!
diff --git a/app/api/mobile/apis/issues.rb b/app/api/mobile/apis/issues.rb
index b767bd768..4a6417cb4 100644
--- a/app/api/mobile/apis/issues.rb
+++ b/app/api/mobile/apis/issues.rb
@@ -8,7 +8,8 @@ module Mobile
 
         desc "get special issuse"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           issue = Issue.find params[:id]
           present :data, issue, with: Mobile::Entities::Issue,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/journal_for_messages.rb b/app/api/mobile/apis/journal_for_messages.rb
index 15a571a82..5f2d01185 100644
--- a/app/api/mobile/apis/journal_for_messages.rb
+++ b/app/api/mobile/apis/journal_for_messages.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special journal"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           jour = JournalsForMessage.find params[:id]
           present :data, jour, with: Mobile::Entities::Jours,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/messages.rb b/app/api/mobile/apis/messages.rb
index ae2f9a39c..bab82de8d 100644
--- a/app/api/mobile/apis/messages.rb
+++ b/app/api/mobile/apis/messages.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special topic"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           message = Message.find params[:id]
           present :data, message, with: Mobile::Entities::Message,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/new_comment.rb b/app/api/mobile/apis/new_comment.rb
index 694ec0613..5b7159301 100644
--- a/app/api/mobile/apis/new_comment.rb
+++ b/app/api/mobile/apis/new_comment.rb
@@ -11,12 +11,12 @@ module Mobile
         params do
           requires :type, type: String
           requires :content, type: String
-          requires :openid, type: String
+          requires :token, type: String
         end
         post ':id' do
+          authenticate!
           type = params[:type]
           result = 1
-          current_user = UserWechat.find_by_openid(params[:openid]).user
           if params[:content]!="" && current_user
             case type
               when "HomeworkCommon"
diff --git a/app/api/mobile/apis/newss.rb b/app/api/mobile/apis/newss.rb
index 8bdd460cc..d42177783 100644
--- a/app/api/mobile/apis/newss.rb
+++ b/app/api/mobile/apis/newss.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special news"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           news = News.find params[:id]
           present :data, news, with: Mobile::Entities::News,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/praise.rb b/app/api/mobile/apis/praise.rb
index 57dbd0729..834d1195b 100644
--- a/app/api/mobile/apis/praise.rb
+++ b/app/api/mobile/apis/praise.rb
@@ -9,12 +9,13 @@ module Mobile
 
         params do
           requires :type, type: String
-          requires :openid, type: String
+          requires :token, type: String
         end
         post ':id' do
+          authenticate!
           obj_id = params[:id]
           obj_type = params[:type]
-          user = UserWechat.find_by_openid(params[:openid]).user
+          user = current_user
           pts = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",obj_id,obj_type.to_s,user.id).first
           if pts.blank?
             praise_or_cancel(obj_type,obj_id,user,1)
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 5aee29fe2..e3041abcd 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -4,6 +4,20 @@ module Mobile
     class Users < Grape::API
       resource :users do
 
+        desc "查询是否已绑定"
+        params do
+          requires :openid, type: String, desc: 'wechat openid'
+        end
+        post 'isbind' do
+          openid = params[:openid]
+          uw = UserWechat.where(openid: openid).first
+          raise "还未绑定trustie帐户" unless uw
+
+          user = uw.user
+          ::ApiKey.delete_all(user_id: user.id)
+          key = ::ApiKey.create!(user_id: user.id)
+          present status: 0, token: key.access_token
+        end
 
         desc "绑定微信用户"
         params do
@@ -29,8 +43,7 @@ module Mobile
             )
             # ws = WechatService.new
             # ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
-            present status: 0
-            present message: '绑定成功'
+            present status: 0, message: '您已成功绑定Trustie平台'
         end
 
         desc "注册用户"
diff --git a/app/api/mobile/apis/whomeworks.rb b/app/api/mobile/apis/whomeworks.rb
index a88d509a3..c8377aa0d 100644
--- a/app/api/mobile/apis/whomeworks.rb
+++ b/app/api/mobile/apis/whomeworks.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get one homework"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           homework = HomeworkCommon.find params[:id]
           present :data, homework, with: Mobile::Entities::Whomework,user: user
           present :status, 0
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 69ea8f1fa..fd5b44b2b 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -254,6 +254,7 @@
   <div ng-if="has_more">
     <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
   </div>
+  <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible"></my-alert>
 
 </div>
 
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 6965d24f3..a3977ec5c 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -20,7 +20,7 @@
 
 
 <script type="text/javascript">
-    //window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
+    window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
     window.g_debug = true; //调试标志,如果在本地请置为true
     window.apiUrl = 'http://localhost:3000/api/v1/';
 </script>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 509e0171a..762bd090e 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -39,7 +39,7 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 2e7ed3151..69daf2b05 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -46,7 +46,7 @@
                             <textarea class="copy-input"></textarea>
                             <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                         </div>
-                        <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                         <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                         <div class="cl"></div>
                     </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index cca135681..6d2d49d23 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -45,7 +45,7 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addNoticeReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 0fc39c735..974af2246 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -59,7 +59,7 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment"></textarea>
                     </div>
-                    <button ng-click="addHomeworkReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/assets/wechat/issue.html b/public/assets/wechat/issue.html
deleted file mode 100644
index 558496ef0..000000000
--- a/public/assets/wechat/issue.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>react js</title>
-  <meta charset='utf-8' />
-  <meta name="keywords" content="" />
-  <meta name="description" content="" />
-  <meta name="apple-mobile-web-app-capable" content="no">
-  <meta content='True' name='HandheldFriendly' />
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
-
-</head>
-<body>
-<div id="container"></div>
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<script id="t:result-list" type="text/html">
-
-  <! for(var i =0; i < issues.length; ++i){ !>
-  <div class="post-container">
-    <div class="post-wrapper">
-      <div class="post-main">
-        <div class="post-avatar fl"><img src="<!=issues[i].author.img_url!>" width="45" height="45" class="border-radius" /></div>
-        <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues[i].subject!></span></div>
-        <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues[i].author.nickname!></a>项目问题</div>
-        <div class="cl"></div>
-        <div class="post-content c-grey2 mt10">
-          <div class="post-all-content"><!=issues[i].description!></div>
-        </div>
-        <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more " style="text-decoration:underline">点击展开</a>
-        <div class="cl"></div>
-        <span  class="c-grey f13 mt10 fl"><!=issues[i].created_on!></span>
-        <div class="cl"></div>
-      </div>
-    </div>
-  </div>
-  <! } !>
-
-
-
-</script>
-
-<script src="/javascripts/jquery-1.3.2.js"></script>
-<script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/auth.js"></script>
-<script src="/javascripts/wechat/wechat-dev.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 1d7f9a536..4438c453d 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -49,7 +49,7 @@
                             <textarea class="copy-input"></textarea>
                             <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                         </div>
-                        <button ng-click="addIssueReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                         <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index dc6b1409f..9fd09de2c 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -37,7 +37,7 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addJournalReply(formData)" ng-hide="formData.disabled" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addReply(formData)" ng-hide="formData.disabled" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
index d34d0054c..309db29de 100644
--- a/public/assets/wechat/login.html
+++ b/public/assets/wechat/login.html
@@ -22,4 +22,4 @@
     </form>
 </div>
 
-<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible"></my-alert>
\ No newline at end of file
+<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 4831e1521..696ffd7d1 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -45,7 +45,7 @@
                         <textarea class="copy-input"></textarea>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
                     <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
                     <div class="cl"></div>
                 </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index d4275e9df..472a5a377 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -4,5 +4,24 @@ app.constant('config', {
     rootPath: '/assets/wechat/',
     rootUrl: '/',
     apiUrl: '/api/v1/'
+});
 
-});
\ No newline at end of file
+
+app.run(['$rootScope', 'auth', '$location', function($rootScope, auth, $location){
+    $rootScope.$on('$routeChangeError', function(event, next, current){
+
+        if(next && next.templateUrl){
+            if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
+                $location.path("/login");
+            }
+        }
+    });
+
+    $rootScope.$on('$routeChangeStart', function(event, next, current){
+        if(next && next.templateUrl){
+            if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
+            }
+        }
+    });
+}
+]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index e17b7c5b3..e44eb3ea2 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -1,11 +1,12 @@
 
 app.controller('ActivityController',
-    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common',
-    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
+    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
+    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
     $scope.replaceUrl = function(url){
         return url;
     };
 
+    $scope.alertService = alertService.create();
     console.log("ActivityController load");
 
     $scope.page = rms.get('page') || 0;
@@ -18,7 +19,7 @@ app.controller('ActivityController',
         $http({
             method: 'POST',
             url: apiUrl+ "activities",
-            data: {openid: auth.openid(), page: page}
+            data: {token: auth.token(), page: page}
         }).then(function successCallback(response) {
             if(response.data.page >0) {
                 $scope.activities = $scope.activities.concat(response.data.data);
@@ -38,18 +39,17 @@ app.controller('ActivityController',
     };
 
     if($scope.activities.length<=0){
-        auth.getOpenId().then(
-            function successCallback(response){
+        auth.isBind().then(
+            function(){
                 $scope.loadActData(0);
             }, function errorCallback(response) {
-                alert("获取openid出错:"+response);
+                $scope.alertService.showMessage("获取token出错",response);
             }
         );
     } else {
         $timeout(function(){
             window.scrollTo(0, rms.get("yoffset"));
         });
-
     }
 
     //跳到详情页
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 8eb45b604..4c2403944 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -1,40 +1,16 @@
-
 app.controller('BlogController',
     ['$scope', '$http', '$routeParams', 'auth', 'common',
     function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.blog = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
 
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addBlogReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
+    common.init({
+            id: $routeParams.id,
+            scope: $scope,
+            type: 'blog_comments',
+            replyType: 'BlogComment',
+            loadCallback: function(data){
+                $scope.blog = data.data;
+            },
+            replyCallback: function(){
+            }
         });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
index 24b0fdbe1..77d2e6ab0 100644
--- a/public/javascripts/wechat/controllers/course_notice.js
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -1,36 +1,16 @@
 app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'auth', 'common',
     function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
 
-    var loadData = function(id){
-        common.loadCommonData(id, 'newss').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.news = response.data.data;
-        }, function errorCallback(response) {
+    common.init({
+            id: $routeParams.id,
+            scope: $scope,
+            type: 'newss',
+            replyType: 'News',
+            loadCallback: function(data){
+                $scope.news = data.data;
+            },
+            replyCallback: function(){
+            }
         });
-    };
 
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addNoticeReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'News', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
index 4828cb39a..7e0811a0d 100644
--- a/public/javascripts/wechat/controllers/discussion.js
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -1,36 +1,14 @@
 
 app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.discussion = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'messages',
+        replyType: 'Message',
+        loadCallback: function(data){
+            $scope.discussion = data.data;
+        },
+        replyCallback: function(){
         }
-    );
-
-    $scope.addDiscussionReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Message', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
+    });
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
index 795bf30e9..58f70db5a 100644
--- a/public/javascripts/wechat/controllers/homework.js
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -1,36 +1,16 @@
 
 app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.homework = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'whomeworks',
+        replyType: 'HomeworkCommon',
+        loadCallback: function(data){
+            console.log(data);
+            $scope.homework = data.data;
+        },
+        replyCallback: function(){
         }
-    );
-
-    $scope.addHomeworkReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
+    });
 
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
 }]);
diff --git a/public/javascripts/wechat/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
index 09602f9e1..ae0cc4450 100644
--- a/public/javascripts/wechat/controllers/issue.js
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -1,36 +1,15 @@
 app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
 
-    var loadData = function(id){
-        common.loadCommonData(id, 'issues').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.issue = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'issues',
+        replyType: 'Issue',
+        loadCallback: function(data){
+            console.log(data);
+            $scope.issue = data.data;
+        },
+        replyCallback: function(){
         }
-    );
-
-    $scope.addIssueReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Issue', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
+    });
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
index f379525d7..76b4f8cf6 100644
--- a/public/javascripts/wechat/controllers/journals.js
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -1,37 +1,13 @@
 app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.message = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'journal_for_messages',
+        replyType: 'JournalsForMessage',
+        loadCallback: function(data){
+            $scope.message = data.data;
+        },
+        replyCallback: function(){
         }
-    );
-
-    $scope.addJournalReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
+    });
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index a760ce8ea..35b750e8c 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -1,5 +1,8 @@
 app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session',
     function ($scope, $http, $location, $routeParams, alertService, config, auth,session) {
+        if(auth.isBind().then(function(){
+                $location.path("/activities");
+         }));
 
         if($routeParams.code){
             session.save('code', $routeParams.code);
@@ -21,7 +24,7 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
 
             console.log(apiUrl + "auth");
 
-            auth.getOpenId().then(
+            auth.openid().then(
                 function(openid){
                     return $http.post(
                         config.apiUrl + "users/wxbind",
@@ -30,11 +33,12 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
                 }
             ).then(
                 function(response) {
-                    vm.loginFailed = (response.data.status != 0);
                     console.log(response.data);
-                    vm.alertService.showMessage('出错了', response.data.message);
-
+                    vm.loginFailed = (response.data.status != 0);
                     if (!$scope.loginFailed) { //绑定成功
+                        vm.alertService.showMessage('提示', response.data.message, function(){
+                            $location.path("/activities");
+                        });
                     } else {
                         vm.alertService.showMessage('出错了', response.data.message);
                     }
@@ -47,7 +51,6 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
         vm.showBox = function () {
             vm.findPwdDialog.showMessage("提示", "请访问www.trustie.net获取密码，谢谢！");
         }
-
         vm.goReg = function () {
             $location.path('/reg');
         }
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
index aa346cb8c..332ec65bf 100644
--- a/public/javascripts/wechat/directives/alert.js
+++ b/public/javascripts/wechat/directives/alert.js
@@ -2,14 +2,16 @@ app.directive('myAlert', ['config', function(config){
     return {
         templateUrl: config.rootPath+ 'templates/alert.html',
         scope: {
-            message: "=",
             title: "=",
-            visible: "="
+            message: "=",
+            visible: "=",
+            cb: "="
         },
         link: function(scope){
-            scope.visible = false;
             scope.dismiss = function(){
-                scope.visible = false;
+                if(typeof scope.cb === 'function'){
+                    scope.cb();
+                }
             };
         }
     }
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 3cb601d2b..c4aca60f4 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -3,18 +3,21 @@ app.factory('alertService', function(){
         this.title = null;
         this.message = null;
         this.visible = null;
+        this.cb = null;
     }
 
-    Alert.prototype.showMessage = function(title, msg){
+    Alert.prototype.showMessage = function(title, msg, cb){
         this.message = msg;
         this.title = title;
         this.visible = true;
+        this.cb = cb;
     }
 
     Alert.prototype.dismiss = function(){
         this.message = null;
         this.title = null;
         this.visible = false;
+        if(this.cb) {this.cb();}
     }
 
     return {
@@ -25,7 +28,7 @@ app.factory('alertService', function(){
 });
 
 
-app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$routeParams, $q, session){
+app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function($http,$routeParams, $q, session,config){
     var _openid = '';
 
     if(typeof g_openid !== 'undefined'){
@@ -36,6 +39,34 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$ro
         _openid = session.get("openid");
     }
 
+    //是否已经绑定
+    var isBind = function(){
+        var defer = $q.defer();
+
+        var token = getToken();
+        if(token && token.length>10){
+            defer.resolve(token);
+        } else {
+            getOpenId().then(function(openid){
+                return $http.post(
+                    config.apiUrl+ 'users/isbind',
+                    {openid: openid}
+                )
+            }).then(function(response){
+                if(response.data.status!=0){
+                    defer.reject(response.data.message);
+                }else {
+                    session.save("token", response.data.token);
+                    defer.resolve(response.data.token);
+                }
+            }).catch(function(e){
+                defer.reject(e);
+            });
+        }
+
+        return defer.promise;
+    }
+
     var getOpenId = function() {
         var deferred = $q.defer();
         console.log(_openid);
@@ -52,7 +83,7 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$ro
                     deferred.reject(response.data.message);
                 } else{
                     _openid = response.data.openid;
-                    session.save("openid", _openid);
+                    //session.save("openid", _openid);
                     deferred.resolve(_openid);
                 }
             }, function errorCallback(response) {
@@ -64,7 +95,10 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', function($http,$ro
     var openid = function(){
         return _openid;
     };
-    return {getOpenId: getOpenId, openid: openid};
+    var getToken = function(){
+        return session.get("token");
+    }
+    return {isBind: isBind, token: getToken, openid: getOpenId};
 }]);
 
 app.factory("session", function(){
@@ -103,7 +137,7 @@ app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $r
         var userInfo = {
             type: type,
             content: temp,
-            openid: auth.openid()
+            token: auth.token()
         };
         //回复按钮禁用
         data.disabled = true;
@@ -126,7 +160,7 @@ app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $r
     var loadCommonData = function(id, type){
         return $http({
             method: 'GET',
-            url: apiUrl+ type + "/" + id+"?openid="+auth.openid()
+            url: apiUrl+ type + "/" + id+"?token="+auth.token()
         })
     };
 
@@ -137,7 +171,7 @@ app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $r
         $http({
             method: 'POST',
             url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
+            data:{token:auth.token(),type:act.act_type}
         }).then(function successCallback(response) {
             console.log(response.data);
         }, function errorCallback(response) {
@@ -152,12 +186,36 @@ app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $r
         $http({
             method: 'POST',
             url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
+            data:{token:auth.token(),type:act.act_type}
         }).then(function successCallback(response) {
             console.log(response.data);
         }, function errorCallback(response) {
         });
     };
 
-    return {addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
+    var init = function(args){
+        args.scope.formData = {comment: ''};
+        var loadData = function(id){
+            loadCommonData(id, args.type).then(function successCallback(response) {
+                args.loadCallback(response.data);
+            }, function errorCallback(response) {
+            });
+        };
+
+        loadData(args.id);
+        args.scope.addReply = function(data){
+            console.log(data.comment);
+            addCommonReply(args.id, args.replyType, data, function(){
+                args.scope.formData = {comment: ''};
+                loadData(args.id);
+                if(typeof args.replyCallback === 'function'){
+                    args.replyCallback();
+                }
+            });
+        };
+        args.scope.addPraise = addCommonPraise;
+        args.scope.decreasePraise = decreaseCommonPraise;
+    }
+
+    return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index ded374930..b4a4e4067 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -1,5 +1,17 @@
 app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', function ($routeProvider, $httpProvider, $locationProvider, config) {
     var rootPath = config.rootPath;
+    var resolve = {
+        delay: ['auth',function(auth){
+            return auth.isBind();
+        }]
+    };
+    var makeRoute = function(path, ctrl){
+        return {
+            templateUrl: rootPath + path,
+            controller: ctrl,
+            resolve: resolve
+        }
+    }
     //$locationProvider.html5Mode(true);
     $routeProvider
         .when('/login', {
@@ -10,42 +22,15 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
             templateUrl: rootPath + 'reg.html',
             controller: 'RegController'
         })
-        .when('/activites', {
-            templateUrl: rootPath + 'activities.html',
-            controller: 'ActivityController'
-        })
-        .when('/issues/:id', {
-            templateUrl: rootPath + 'issue_detail.html',
-            controller: 'IssueController'
-        })
-        .when('/project_discussion/:id', {
-            templateUrl: rootPath + 'project_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/homework/:id', {
-            templateUrl: rootPath + 'homework_detail.html',
-            controller: 'HomeworkController'
-        })
-        .when('/course_notice/:id', {
-            templateUrl: rootPath + 'course_notice.html',
-            controller: 'CourseNoticeController'
-        })
-        .when('/course_discussion/:id', {
-            templateUrl: rootPath + 'course_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/journal_for_message/:id', {
-            templateUrl: rootPath + 'jour_message_detail.html',
-            controller: 'JournalsController'
-        })
-        .when('/blog_comment/:id', {
-            templateUrl: rootPath + 'blog_detail.html',
-            controller: 'BlogController'
-        })
-        .when('/add_class', {
-            templateUrl: rootPath + 'add_class.html',
-            controller: 'AddClassController'
-        })
+        .when('/activites', makeRoute('activities.html', 'ActivityController'))
+        .when('/issues/:id', makeRoute('issue_detail.html', 'IssueController'))
+        .when('/project_discussion/:id', makeRoute('project_discussion.html', 'DiscussionController'))
+        .when('/homework/:id', makeRoute('homework_detail.html', 'HomeworkController'))
+        .when('/course_notice/:id', makeRoute('course_notice.html', 'CourseNoticeController'))
+        .when('/course_discussion/:id', makeRoute('course_discussion.html', 'DiscussionController'))
+        .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
+        .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
+        .when('/add_class', makeRoute('add_class.html', 'AddClassController'))
         .otherwise({
             redirectTo: '/activites'
         });

From 3f98562c0fe304f828c9c8c4d782ba1767ae514e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 14:45:19 +0800
Subject: [PATCH 470/668] =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb      | 16 +++++++--------
 app/views/wechats/user_activities.html.erb |  2 +-
 public/javascripts/wechat/build/app.min.js | 24 +++++++++++++---------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 930318fa5..cfd83cce1 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -207,14 +207,14 @@ class WechatsController < ActionController::Base
     end
 
     def user_activities
-      session[:wechat_code] = params[:code] if params[:code]
-      code = params[:code] || session[:wechat_code]
-      openid = get_openid_from_code(code)
-      @wechat_user = user_binded?(openid)
-      unless @wechat_user
-        redirect_to login_wechat_path
-        return
-      end
+      # session[:wechat_code] = params[:code] if params[:code]
+      # code = params[:code] || session[:wechat_code]
+      # openid = get_openid_from_code(code)
+      # @wechat_user = user_binded?(openid)
+      # unless @wechat_user
+      #   redirect_to login_wechat_path
+      #   return
+      # end
 
       render 'wechats/user_activities', layout: nil
     end
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 073d45495..ccbf2a2b1 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -12,7 +12,7 @@
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">
-    window.g_openid = '<%= @wechat_user.openid %>';
+//    window.g_openid = '<%= @wechat_user.openid %>';
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
   </script>
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index d8eacbf1b..26995dea2 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,14 +1,18 @@
-var app=angular.module("wechat",["ngRoute"]);
-app.factory("auth",["$http","$routeParams","$q",function(e,n,t){var o="";"undefined"!=typeof g_openid&&(o=g_openid);var a=function(){var a=t.defer();if("undefined"!=typeof o&&o.length>0)a.resolve(o);else{var i=n.code;e({url:"/wechat/get_open_id",data:{code:i},method:"POST"}).then(function(e){o=e.data.openid,a.resolve(o)},function(e){a.reject(e)})}return a.promise},i=function(){return o};return{getOpenId:a,openid:i}}]),app.factory("rms",function(){var e={},n=function(n,t){e[n]=t},t=function(n){return e[n]};return{save:n,get:t}}),app.factory("common",["$http","auth","$routeParams",function(e,n,t){var o=function(t,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),d={type:o,content:r,openid:n.openid()};a.disabled=!0,e({method:"POST",url:apiUrl+"new_comment/"+t,data:d}).then(function(e){a.disabled=!1,"function"==typeof i&&i()},function(e){})}},a=function(t,o){return e({method:"GET",url:apiUrl+o+"/"+t+"?openid="+n.openid()})},i=function(t){t.praise_count+=1,t.has_praise=!0,e({method:"POST",url:apiUrl+"praise/"+t.act_id,data:{openid:n.openid(),type:t.act_type}}).then(function(e){console.log(e.data)},function(e){})},r=function(t){t.praise_count-=1,t.has_praise=!1,e({method:"POST",url:apiUrl+"praise/"+t.act_id,data:{openid:n.openid(),type:t.act_type}}).then(function(e){console.log(e.data)},function(e){})};return{addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
+var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location",function(t,e,a){t.$on("$routeChangeError",function(t,e,l){e&&e.templateUrl&&(e.templateUrl.endsWith("login.html")||e.templateUrl.endsWith("reg.html")||a.path("/login"))}),t.$on("$routeChangeStart",function(t,e,a){e&&e.templateUrl&&!e.templateUrl.endsWith("login.html")&&!e.templateUrl.endsWith("reg.html")})}]);
+app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i="";"undefined"!=typeof g_openid&&(i=g_openid),i||(i=o.get("openid"));var r=function(){var e=n.defer(),i=c();return i&&i.length>10?e.resolve(i):s().then(function(e){return t.post(a.apiUrl+"users/isbind",{openid:e})}).then(function(t){0!=t.data.status?e.reject(t.data.message):(o.save("token",t.data.token),e.resolve(t.data.token))})["catch"](function(t){e.reject(t)}),e.promise},s=function(){var a=n.defer();if(console.log(i),"undefined"!=typeof i&&i&&i.length>0)a.resolve(i);else{var r=e.code||o.get("code");t({url:"/wechat/get_open_id",data:{code:r},method:"POST"}).then(function(t){0!=t.data.status?a.reject(t.data.message):(i=t.data.openid,a.resolve(i))},function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{isBind:r,token:c,openid:s}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:r,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},r=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=r};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
 app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]);
-app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common",function(t,a,e,o,i,n,c,s){e.replaceUrl=function(t){return t},console.log("ActivityController load"),e.page=c.get("page")||0,e.activities=c.get("activities")||[],e.has_more=c.get("has_more"),e.loadActData=function(t){e.page=t,o({method:"POST",url:apiUrl+"activities",data:{openid:n.openid(),page:t}}).then(function(t){t.data.page>0?e.activities=e.activities.concat(t.data.data):e.activities=t.data.data,c.save("activities",e.activities),e.has_more=t.data.count+10*t.data.page<t.data.all_count,c.save("has_more",e.has_more),c.save("page",t.data.page),console.log(t.data)},function(t){})},e.activities.length<=0?n.getOpenId().then(function(t){e.loadActData(0)},function(t){alert("获取openid出错:"+t)}):i(function(){window.scrollTo(0,c.get("yoffset"))}),e.goDetail=function(t,e,o){c.save("yoffset",window.document.body.scrollTop),a.path("/"+t+"/"+e)},e.addPraise=function(t){s.addCommonPraise(t)},e.decreasePraise=function(t){s.decreaseCommonPraise(t)}}]);
+app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(t,a,e,o,i,c,n,s,r){e.replaceUrl=function(t){return t},e.alertService=r.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(t){e.page=t,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:t}}).then(function(t){t.data.page>0?e.activities=e.activities.concat(t.data.data):e.activities=t.data.data,n.save("activities",e.activities),e.has_more=t.data.count+10*t.data.page<t.data.all_count,n.save("has_more",e.has_more),n.save("page",t.data.page),console.log(t.data)},function(t){})},e.activities.length<=0?c.isBind().then(function(){e.loadActData(0)},function(t){e.alertService.showMessage("获取token出错",t)}):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(t,e,o){n.save("yoffset",window.document.body.scrollTop),a.path("/"+t+"/"+e)},e.addPraise=function(t){s.addCommonPraise(t)},e.decreasePraise=function(t){s.decreaseCommonPraise(t)}}]);
 app.controller("AddClassController",["$scope",function(o){}]);
-app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,n,e,t,a){o.formData={comment:""};var c=function(n){a.loadCommonData(n,"blog_comments").then(function(n){console.log(n.data),o.blog=n.data.data},function(o){})};t.getOpenId().then(function(o){c(e.id)},function(o){alert("获取openid出错:"+o)}),o.addBlogReply=function(n){console.log(n.comment),a.addCommonReply(e.id,"BlogComment",n,function(){o.formData={comment:""},c(e.id)})},o.addPraise=function(o){console.log(o),a.addCommonPraise(o)},o.decreasePraise=function(o){console.log(o),a.decreaseCommonPraise(o)}}]);
-app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,n,e,t,a){o.formData={comment:""};var c=function(n){a.loadCommonData(n,"newss").then(function(n){console.log(n.data),o.news=n.data.data},function(o){})};t.getOpenId().then(function(o){c(e.id)},function(o){alert("获取openid出错:"+o)}),o.addNoticeReply=function(n){console.log(n.comment),a.addCommonReply(e.id,"News",n,function(){o.formData={comment:""},c(e.id)})},o.addPraise=function(o){a.addCommonPraise(o)},o.decreasePraise=function(o){a.decreaseCommonPraise(o)}}]);
-app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,n,a,e,t){o.formData={comment:""};var i=function(n){t.loadCommonData(n,"messages").then(function(n){console.log(n.data),o.discussion=n.data.data},function(o){})};e.getOpenId().then(function(o){i(a.id)},function(o){alert("获取openid出错:"+o)}),o.addDiscussionReply=function(n){console.log(n.comment),t.addCommonReply(a.id,"Message",n,function(){o.formData={comment:""},i(a.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
-app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,n,e,a,t){o.formData={comment:""};var m=function(n){t.loadCommonData(n,"whomeworks").then(function(n){console.log(n.data),o.homework=n.data.data},function(o){})};a.getOpenId().then(function(o){m(e.id)},function(o){alert("获取openid出错:"+o)}),o.addHomeworkReply=function(n){console.log(n.comment),t.addCommonReply(e.id,"HomeworkCommon",n,function(){o.formData={comment:""},m(e.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
-app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,n,e,a,t){o.formData={comment:""};var s=function(n){t.loadCommonData(n,"issues").then(function(n){console.log(n.data),o.issue=n.data.data},function(o){})};a.getOpenId().then(function(o){s(e.id)},function(o){alert("获取openid出错:"+o)}),o.addIssueReply=function(n){console.log(n.comment),t.addCommonReply(e.id,"Issue",n,function(){o.formData={comment:""},s(e.id)})},o.addPraise=function(o){t.addCommonPraise(o)},o.decreasePraise=function(o){t.decreaseCommonPraise(o)}}]);
-app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,n,a,e,t){o.formData={comment:""};var c=function(n){t.loadCommonData(n,"journal_for_messages").then(function(n){console.log(n.data),o.message=n.data.data},function(o){})};e.getOpenId().then(function(o){c(a.id)},function(o){alert("获取openid出错:"+o)}),o.addJournalReply=function(n){console.log(n.comment),t.addCommonReply(a.id,"JournalsForMessage",n,function(){o.formData={comment:""},c(a.id)})},o.addPraise=function(o){console.log(o),t.addCommonPraise(o)},o.decreasePraise=function(o){console.log(o),t.decreaseCommonPraise(o)}}]);
+app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
+app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
+app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
+app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
+app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
+app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
+app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,i,a,n,s,r){s.isBind().then(function(){t.path("/activities")}),i.code&&r.save("code",i.code);var l=e;l.loginFailed=!1,l.alertService=a.create(),l.findPwdDialog=a.create(),l.login=function(i,a){return i.$setSubmitted(),console.log(a),i.$valid?(console.log(apiUrl+"auth"),void s.openid().then(function(e){return o.post(n.apiUrl+"users/wxbind",{login:a.login,password:a.password,openid:e})}).then(function(o){console.log(o.data),l.loginFailed=0!=o.data.status,e.loginFailed?l.alertService.showMessage("出错了",o.data.message):l.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){l.alertService.showMessage("出错了",e)})):void console.log(i.$error)},l.showBox=function(){l.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},l.goReg=function(){t.path("/reg")}}]);
+app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
+app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){"function"==typeof t.cb&&t.cb()}}}}]);
+app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
 app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
-app.config(["$routeProvider","$httpProvider","$locationProvider",function(e,r,t){var o="/assets/wechat/";e.when("/activites",{templateUrl:o+"activities.html",controller:"ActivityController"}).when("/issues/:id",{templateUrl:o+"issue_detail.html",controller:"IssueController"}).when("/project_discussion/:id",{templateUrl:o+"project_discussion.html",controller:"DiscussionController"}).when("/homework/:id",{templateUrl:o+"homework_detail.html",controller:"HomeworkController"}).when("/course_notice/:id",{templateUrl:o+"course_notice.html",controller:"CourseNoticeController"}).when("/course_discussion/:id",{templateUrl:o+"course_discussion.html",controller:"DiscussionController"}).when("/journal_for_message/:id",{templateUrl:o+"jour_message_detail.html",controller:"JournalsController"}).when("/blog_comment/:id",{templateUrl:o+"blog_detail.html",controller:"BlogController"}).when("/add_class",{templateUrl:o+"add_class.html",controller:"AddClassController"}).otherwise({redirectTo:"/activites"}),r.interceptors.push(["$q","$rootScope",function(e,r){return void 0==r.activeCalls&&(r.activeCalls=0),{request:function(e){return r.activeCalls+=1,e},requestError:function(e){return r.activeCalls-=1,e},response:function(e){return r.activeCalls-=1,e},responseError:function(e){return r.activeCalls-=1,e}}}])}]);
\ No newline at end of file
+app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.isBind()}]},i=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",i("activities.html","ActivityController")).when("/issues/:id",i("issue_detail.html","IssueController")).when("/project_discussion/:id",i("project_discussion.html","DiscussionController")).when("/homework/:id",i("homework_detail.html","HomeworkController")).when("/course_notice/:id",i("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",i("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",i("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",i("blog_detail.html","BlogController")).when("/add_class",i("add_class.html","AddClassController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file

From b7230333dcbf6427774698a57de80bc55bd8f7b4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 15:21:13 +0800
Subject: [PATCH 471/668] =?UTF-8?q?code=E8=8E=B7=E5=8F=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb       | 3 ++-
 app/views/wechats/user_activities.html.erb  | 2 +-
 public/javascripts/wechat/app.js            | 3 ++-
 public/javascripts/wechat/build/app.min.js  | 4 ++--
 public/javascripts/wechat/others/factory.js | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index cfd83cce1..39e093cdd 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -215,7 +215,8 @@ class WechatsController < ActionController::Base
       #   redirect_to login_wechat_path
       #   return
       # end
-
+      session[:wechat_code] = params[:code] if params[:code]
+      @code = params[:code] || session[:wechat_code]
       render 'wechats/user_activities', layout: nil
     end
 
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index ccbf2a2b1..a3f5c741b 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -12,7 +12,7 @@
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">
-//    window.g_openid = '<%= @wechat_user.openid %>';
+    window.g_code = <%= @code %>;
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
   </script>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 472a5a377..a7c4d13d5 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -7,7 +7,7 @@ app.constant('config', {
 });
 
 
-app.run(['$rootScope', 'auth', '$location', function($rootScope, auth, $location){
+app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope, auth, $location, $routeParams){
     $rootScope.$on('$routeChangeError', function(event, next, current){
 
         if(next && next.templateUrl){
@@ -18,6 +18,7 @@ app.run(['$rootScope', 'auth', '$location', function($rootScope, auth, $location
     });
 
     $rootScope.$on('$routeChangeStart', function(event, next, current){
+        console.log($routeParams);
         if(next && next.templateUrl){
             if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
             }
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 26995dea2..57664c550 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,5 +1,5 @@
-var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location",function(t,e,a){t.$on("$routeChangeError",function(t,e,l){e&&e.templateUrl&&(e.templateUrl.endsWith("login.html")||e.templateUrl.endsWith("reg.html")||a.path("/login"))}),t.$on("$routeChangeStart",function(t,e,a){e&&e.templateUrl&&!e.templateUrl.endsWith("login.html")&&!e.templateUrl.endsWith("reg.html")})}]);
-app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i="";"undefined"!=typeof g_openid&&(i=g_openid),i||(i=o.get("openid"));var r=function(){var e=n.defer(),i=c();return i&&i.length>10?e.resolve(i):s().then(function(e){return t.post(a.apiUrl+"users/isbind",{openid:e})}).then(function(t){0!=t.data.status?e.reject(t.data.message):(o.save("token",t.data.token),e.resolve(t.data.token))})["catch"](function(t){e.reject(t)}),e.promise},s=function(){var a=n.defer();if(console.log(i),"undefined"!=typeof i&&i&&i.length>0)a.resolve(i);else{var r=e.code||o.get("code");t({url:"/wechat/get_open_id",data:{code:r},method:"POST"}).then(function(t){0!=t.data.status?a.reject(t.data.message):(i=t.data.openid,a.resolve(i))},function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{isBind:r,token:c,openid:s}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:r,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},r=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=r};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
+var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,e,o,a){t.$on("$routeChangeError",function(t,e,a){e&&e.templateUrl&&(e.templateUrl.endsWith("login.html")||e.templateUrl.endsWith("reg.html")||o.path("/login"))}),t.$on("$routeChangeStart",function(t,e,o){console.log(a),e&&e.templateUrl&&!e.templateUrl.endsWith("login.html")&&!e.templateUrl.endsWith("reg.html")})}]);
+app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i="";"undefined"!=typeof g_openid&&(i=g_openid),i||(i=o.get("openid"));var r=function(){var e=n.defer(),i=s();return i&&i.length>10?e.resolve(i):c().then(function(e){return t.post(a.apiUrl+"users/isbind",{openid:e})}).then(function(t){0!=t.data.status?e.reject(t.data.message):(o.save("token",t.data.token),e.resolve(t.data.token))})["catch"](function(t){e.reject(t)}),e.promise},c=function(){var a=n.defer();if(console.log(i),"undefined"!=typeof i&&i&&i.length>0)a.resolve(i);else{var r=window.g_code||e.code||o.get("code");t({url:"/wechat/get_open_id",data:{code:r},method:"POST"}).then(function(t){0!=t.data.status?a.reject(t.data.message):(i=t.data.openid,a.resolve(i))},function(t){a.reject(t)})}return a.promise},s=function(){return o.get("token")};return{isBind:r,token:s,openid:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),c={type:o,content:r,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:c}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},r=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=r};return{init:c,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
 app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]);
 app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(t,a,e,o,i,c,n,s,r){e.replaceUrl=function(t){return t},e.alertService=r.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(t){e.page=t,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:t}}).then(function(t){t.data.page>0?e.activities=e.activities.concat(t.data.data):e.activities=t.data.data,n.save("activities",e.activities),e.has_more=t.data.count+10*t.data.page<t.data.all_count,n.save("has_more",e.has_more),n.save("page",t.data.page),console.log(t.data)},function(t){})},e.activities.length<=0?c.isBind().then(function(){e.loadActData(0)},function(t){e.alertService.showMessage("获取token出错",t)}):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(t,e,o){n.save("yoffset",window.document.body.scrollTop),a.path("/"+t+"/"+e)},e.addPraise=function(t){s.addCommonPraise(t)},e.decreasePraise=function(t){s.decreaseCommonPraise(t)}}]);
 app.controller("AddClassController",["$scope",function(o){}]);
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index c4aca60f4..aefd359a8 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -73,7 +73,7 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function(
         if (typeof _openid !== 'undefined' && _openid && _openid.length > 0){
             deferred.resolve(_openid);
         } else {
-            var code = $routeParams.code || session.get("code");
+            var code = window.g_code || $routeParams.code || session.get("code");
             $http({
                 url: '/wechat/get_open_id',
                 data: {code: code},

From 05ddbe5874266880774c2d78d9f95479f0428689 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 15:28:19 +0800
Subject: [PATCH 472/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index a3f5c741b..061099571 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -12,7 +12,7 @@
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">
-    window.g_code = <%= @code %>;
+    window.g_code = '<%= @code %>';
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
   </script>

From 048bb7fed5435682f605a695073448531b8ca33a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 20 Jun 2016 15:38:43 +0800
Subject: [PATCH 473/668] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E3=80=81=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |  2 +-
 app/views/layouts/_logined_header.html.erb    | 29 ++++++++++++++++---
 .../layouts/_show_messages_list.html.erb      | 26 ++++++++++++++++-
 public/stylesheets/public.css                 |  2 +-
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 87c7d8f54..29e6a4980 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -135,7 +135,7 @@ class UsersController < ApplicationController
         unless (message_all.message_type == 'CourseMessage' && mess && mess.course  && mess.course.is_delete == 1)
           @message_alls << mess
         end
-        break if @message_alls.length == 5
+        break if @message_alls.length == 10
       end
     end
   end
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7ba0a23be..da22cce7a 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -91,6 +91,8 @@
 </div>
 
 <script type="text/javascript">
+    var onUserMessages = false;
+    var onNotice = false;
     //搜索相关
     $("#navHomepageSearch").mouseover(function(){
         $("#navHomepageSearchType").show();
@@ -99,13 +101,32 @@
     });
 
     $("#user_messages").mouseenter(function(){
+        onNotice = true;
         $("#user_messages_list").show();
-        $.get('<%=user_messages_unviewed_users_path %>');
-        $("#ajax-indicator").hide();
+        if($("#message_list_detail").length == 0){
+            $.get('<%=user_messages_unviewed_users_path %>');
+            $("#ajax-indicator").hide();
+        }
+        var obj = $("#user_messages_list");
+        clearTimeout(obj.timer);
     }).mouseleave(function(){
-        $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        onNotice = false;
+        var obj = $("#user_messages_list");
+        obj.timer = setTimeout(function(){
+            if(!onNotice && !onUserMessages)
+            obj.hide(0);
+            obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        }, 500);
+    });
 
+    $("#user_messages_list").mouseenter(function(event){
+        event.stopPropagation();
+        onUserMessages = true;
+        $(this).show();
+    }).mouseleave(function(){
+        onUserMessages = false;
+        $(this).hide();
+        $(this).html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
     });
 
     $("#navHomepageProfile").mouseenter(function(){
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 966c04b4d..423011e3c 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,4 +1,5 @@
 <font></font>
+<div id="message_list_detail">
 <h4 class="shadowbox_news_title">未读消息</h4>
 <ul class="shadowbox_news_list">
   <% messages.each do |ma| %>
@@ -134,4 +135,27 @@
       <% end %>
   <% end %>
 </ul>
-<%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file
+  <a onclick = "show_more();" id = "show_more_messages"  class = "shadowbox_news_all undis">展开更多</a>
+<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all undis", :target =>"_Blank" %>
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        if($(".shadowbox_news_list li").length > 5) {
+            $(".shadowbox_news_list li").hide();
+            $(".shadowbox_news_list li").eq(0).show();
+            $(".shadowbox_news_list li").eq(1).show();
+            $(".shadowbox_news_list li").eq(2).show();
+            $(".shadowbox_news_list li").eq(3).show();
+            $(".shadowbox_news_list li").eq(4).show();
+            $("#show_more_messages").show();
+        } else {
+            $("#show_all_messages").show();
+        }
+    });
+    function show_more() {
+        $(".shadowbox_news_list li").show();
+        $("#show_more_messages").hide();
+        $("#show_all_messages").show();
+    }
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index ff71bf5c4..333c410ca 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -533,7 +533,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
 .newsActive {width:16px; height:16px; border-radius:50%;  background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 2px;padding-right: 1px;font-weight: bold;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
 .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
 .navHomepageProfile ul li ul {display:none;}
 .navHomepageProfile ul li:hover ul {display:block;}

From c6f04db19e1a94eb2616b72a21e7744a6131a7bf Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 15:50:52 +0800
Subject: [PATCH 474/668] wechat

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 39e093cdd..3a6be2016 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -147,7 +147,7 @@ class WechatsController < ActionController::Base
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/assets/wechat/app.html#login'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities#login'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
       pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],

From 47c443e59d35a238fc759da22440d3b14b9130b8 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 15:56:57 +0800
Subject: [PATCH 475/668] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=98?=
 =?UTF-8?q?=E5=A4=A7=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index fd5a56bd6..9ec0f6823 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -167,7 +167,7 @@ a.underline {text-decoration:underline;}
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}
 .input-box-wrap {padding-right:17px;}
-.input-box {width:100%; height:36px; padding-left:5px; line-height:36px; vertical-align:middle; border:1px solid #ccc; border-radius:5px;}
+.input-box {font-size: 16px;width:100%; height:36px; padding-left:5px; line-height:36px; vertical-align:middle; border:1px solid #ccc; border-radius:5px;}
 .login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
 .login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
 .login-box.checked{background:#63c360;}

From f4d67bc027a1ea6365cb271b26a73983010020a5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 20 Jun 2016 16:03:57 +0800
Subject: [PATCH 476/668] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E2=80=9C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E2=80=9D=E6=98=BE=E7=A4=BA10=E6=9D=A1=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_show_messages_list.html.erb | 11 ++++++++---
 public/stylesheets/new_user.css                |  3 ++-
 public/stylesheets/public.css                  |  5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 423011e3c..762109bf5 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,6 +1,7 @@
 <font></font>
 <div id="message_list_detail">
 <h4 class="shadowbox_news_title">未读消息</h4>
+<p style="display: none;" id="none_message" class="shadowbox_news_p text_c">无未读消息</p>
 <ul class="shadowbox_news_list">
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
@@ -135,8 +136,8 @@
       <% end %>
   <% end %>
 </ul>
-  <a onclick = "show_more();" id = "show_more_messages"  class = "shadowbox_news_all undis">展开更多</a>
-<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all undis", :target =>"_Blank" %>
+  <a onclick = "show_more();" id = "show_more_messages" style="display: none" class = "shadowbox_news_all">展开更多</a>
+<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all", :style => "display:none", :target =>"_Blank" %>
 </div>
 
 <script type="text/javascript">
@@ -149,7 +150,11 @@
             $(".shadowbox_news_list li").eq(3).show();
             $(".shadowbox_news_list li").eq(4).show();
             $("#show_more_messages").show();
-        } else {
+        } else if ($(".shadowbox_news_list li").length == 0) {
+            $("#none_message").show();
+            $("#show_all_messages").show();
+        }
+        else {
             $("#show_all_messages").show();
         }
     });
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index dcd275d92..6812faf34 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1620,8 +1620,9 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*消息弹框*/
 .shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
 .shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
 .shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 333c410ca..6c7bde896 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1155,8 +1155,9 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 /*消息弹框*/
 .shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
 .shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
-.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
+.shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}

From b4a3d4a5a200a8e4e1a4ec7050981b3999d33f2d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 16:04:38 +0800
Subject: [PATCH 477/668] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/build/app.min.js    | 2 +-
 public/javascripts/wechat/directives/alert.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 57664c550..c41e0bb7b 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -11,7 +11,7 @@ app.controller("IssueController",["$scope","$http","$routeParams","auth","common
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
 app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,i,a,n,s,r){s.isBind().then(function(){t.path("/activities")}),i.code&&r.save("code",i.code);var l=e;l.loginFailed=!1,l.alertService=a.create(),l.findPwdDialog=a.create(),l.login=function(i,a){return i.$setSubmitted(),console.log(a),i.$valid?(console.log(apiUrl+"auth"),void s.openid().then(function(e){return o.post(n.apiUrl+"users/wxbind",{login:a.login,password:a.password,openid:e})}).then(function(o){console.log(o.data),l.loginFailed=0!=o.data.status,e.loginFailed?l.alertService.showMessage("出错了",o.data.message):l.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){l.alertService.showMessage("出错了",e)})):void console.log(i.$error)},l.showBox=function(){l.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},l.goReg=function(){t.path("/reg")}}]);
 app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
-app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){"function"==typeof t.cb&&t.cb()}}}}]);
+app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
 app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
index 332ec65bf..f53ecdb5a 100644
--- a/public/javascripts/wechat/directives/alert.js
+++ b/public/javascripts/wechat/directives/alert.js
@@ -9,6 +9,7 @@ app.directive('myAlert', ['config', function(config){
         },
         link: function(scope){
             scope.dismiss = function(){
+                scope.visible = false;
                 if(typeof scope.cb === 'function'){
                     scope.cb();
                 }

From 29a815aeaf887f118f3fd43f526b957263cb5b65 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 16:09:04 +0800
Subject: [PATCH 478/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0weui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 061099571..2dcd89bbb 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -9,6 +9,7 @@
   <meta name="apple-mobile-web-app-capable" content="no" />
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">

From 96e00f7bf37ba8779d2a34f2c183c4275f21a4f4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 20 Jun 2016 16:21:37 +0800
Subject: [PATCH 479/668] =?UTF-8?q?jenkins=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/quality_analyses_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analyses_controller.rb
index 8f9a51666..1cbcb14a8 100644
--- a/app/controllers/quality_analyses_controller.rb
+++ b/app/controllers/quality_analyses_controller.rb
@@ -8,9 +8,14 @@ class QualityAnalysesController < ApplicationController
   end
 
   def create
+    user_name = User.find(params[:user_id]).try(:login)
     branch = params[:branch]
     language = params[:language]
     path = params[:path]
+    @client = JenkinsApi::Client.new(:server_url => 'http://123.59.135.93:8890',
+                                        :username => user_name,
+                                        :password => '')
+    
   end
 
   def index

From 311f21ee5a1fcb6868129143f00b7f94fa5f284d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 16:23:59 +0800
Subject: [PATCH 480/668] css

---
 public/stylesheets/weui/weixin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 9ec0f6823..f64729a14 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -167,7 +167,7 @@ a.underline {text-decoration:underline;}
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}
 .input-box-wrap {padding-right:17px;}
-.input-box {font-size: 16px;width:100%; height:36px; padding-left:5px; line-height:36px; vertical-align:middle; border:1px solid #ccc; border-radius:5px;}
+.input-box {    -webkit-appearance: none; font-size: 16px;width:100%; height:36px; padding-left:5px; line-height:36px; border:1px solid #ccc; border-radius:5px;}
 .login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
 .login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
 .login-box.checked{background:#63c360;}

From 4db1df0a4d9c52838110e60321e63aece7df1c93 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 16:29:52 +0800
Subject: [PATCH 481/668] css

---
 public/stylesheets/weui/weixin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index f64729a14..d30d6bf8a 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -2,8 +2,8 @@
 /* CSS Document */
 
 /*基本样式*/
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-body, ul, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体","Helvetica Neue", Helvetica, Arial, sans-serif;}
+body, ul, h1,h2,h3,h4,h5,p,pre,input {padding:0px; margin:0px;}
 ul li {list-style:none;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}

From fde06a2327529901961e2742280b18da43ed754f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 16:35:16 +0800
Subject: [PATCH 482/668] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_attachment_history.html.erb         | 12 ++---
 app/views/files/_org_subfield_list.html.erb   |  7 +--
 app/views/files/_project_file_list.html.erb   |  7 +--
 app/views/files/_project_list.html.erb        | 11 ++---
 app/views/files/_resource_detail.html.erb     |  7 +--
 public/assets/kindeditor/pasteimg.js          | 44 +++++++++----------
 public/stylesheets/courses.css                |  6 +++
 public/stylesheets/new_user.css               |  6 +++
 public/stylesheets/project.css                |  6 +++
 9 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index 6e2994a8d..ee607cec4 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -39,19 +39,19 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
+      <div class="W300 uploadResourceIntr fontGrey2">
+        <span id="upload_file_count" class="mr15">(未选择文件)</span>
+        <span>您可以上传小于<span class="c_red">50MB</span>的文件</span>
+      </div>
       <div class="cl"></div>
       <div class="mb5 mt5">
-        <label class="fl c_dark f14" style="line-height:30px;">描述：</label>
+        <p class="c_dark f14" style="line-height:30px;">描述：</p>
         <div class="fl">
-          <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
+          <textarea style="resize:none"  type="text" name="description" class="InputBox fl H60 W420" value="<%= @attachment.description %>"></textarea>
         </div>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
-      <div class="uploadResourceIntr">
-        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
-        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
-      </div>
       </div>
       <div class="cl"></div>
       <div style="margin-top: 10px" >
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index fcf0e9982..1bbdc0e93 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -43,15 +43,12 @@
                   <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
-                  <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                             onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">
-                  <% unless file.description.blank? %>
-                      <div class="cl"></div>
-                      <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                  <% end %>
+                    资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
                 </div>
             <% end %>
 
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index b8b38f7b9..4d3645a33 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -48,15 +48,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                 <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
         <% else %>
             <div class="fontGrey2 mb4">
-              <% unless file.description.blank? %>
-                  <div class="cl"></div>
-                  <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-              <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
         <% end %>
         <div class="tag_h">
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 48fb4c86f..36dc80a18 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -40,16 +40,13 @@
                     <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                       <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                     </div>
-                    <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                    <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                               onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                   </div>
               <% else %>
-                  <div class="fontGrey2 mb4">
-                    <% unless file.description.blank? %>
-                        <div class="cl"></div>
-                        <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                    <% end %>
-                  </div>
+                    <div class="fontGrey2 mb4">
+                        资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+                    </div>
               <% end %>
               <div class="tag_h">
                 <!-- container_type = 1 代表是课程里的资源 -->
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 8aedc3c03..0edf22e58 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -42,15 +42,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
           <% else %>
             <div class="fontGrey2 mb4">
-                <% unless file.description.blank? %>
-                    <div class="cl"></div>
-                    <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
           <% end %>
       <%# end %>
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index d7ffead5b..479b1101a 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -327,28 +327,28 @@ function enablePasteImg(_editor) {
     };
 
     $(nodeBody).on('pasteImage', function(ev, data) {
-        console.log('pasteImage');
-        console.log("dataURL: " + data.dataURL);
-        console.log("width: " + data.width);
-        console.log("height: " + data.height);
-        var blob = dataURItoBlob(data.dataURL);
-        if (data.blob !== null) {
-            var data = new FormData();
-            data.append("imgFile",blob, "imageFilename.png");
-            console.log(data);
-            $.ajax({
-                url: '/kindeditor/upload?dir=image',
-                contentType: false,
-                type: 'POST',
-                data: data,
-                processData: false,
-                success: function(data) {
-                    console.log(data);
-                    editor.exec('insertimage', JSON.parse(data).url);
-                }
-            });
-        }
-
+        //粘贴图片时走这里会出现两张图片走df()即可
+//        console.log('pasteImage');
+//        console.log("dataURL: " + data.dataURL);
+//        console.log("width: " + data.width);
+//        console.log("height: " + data.height);
+//        var blob = dataURItoBlob(data.dataURL);
+//        if (data.blob !== null) {
+//            var data = new FormData();
+//            data.append("imgFile",blob, "imageFilename.png");
+//            console.log(data);
+//            $.ajax({
+//                url: '/kindeditor/upload?dir=image',
+//                contentType: false,
+//                type: 'POST',
+//                data: data,
+//                processData: false,
+//                success: function(data) {
+//                    console.log(data);
+//                    editor.exec('insertimage', JSON.parse(data).url);
+//                }
+//            });
+//        }
     });
     return;
 };
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 393903177..ed99217b8 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1421,3 +1421,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5fc6110fd..ee3ddf6df 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1796,3 +1796,9 @@ input.new_loggin_input{
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index ac65d34c2..d8b8cc74a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1249,3 +1249,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file

From d3f3f019a0c664871c31a060cfecf6e431087973 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 16:40:56 +0800
Subject: [PATCH 483/668] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9C=89=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/public.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index ff71bf5c4..333c410ca 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -533,7 +533,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
 .newsActive {width:16px; height:16px; border-radius:50%;  background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 2px;padding-right: 1px;font-weight: bold;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
 .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
 .navHomepageProfile ul li ul {display:none;}
 .navHomepageProfile ul li:hover ul {display:block;}

From 62a1b5de7ce953352b36463d45cc4df58a7d53dd Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 17:04:42 +0800
Subject: [PATCH 484/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 4 ++++
 public/stylesheets/weui/weixin.css    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 3a6be2016..00585722c 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -128,6 +128,10 @@ class WechatsController < ActionController::Base
     default_msg(request)
   end
 
+  on :click, with: 'JOIN_CLASS' do |reques, key|
+    request.reply.text "请直接回复班级邀请码 (不区分大小写):"
+  end
+
   def default_msg(request)
     uw = user_binded?(request[:FromUserName])
     if uw && uw.user
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index d30d6bf8a..ab8081173 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -112,7 +112,7 @@ a.underline {text-decoration:underline;}
 .loading-box span {display: block; font-size:12px;}
 
 /*帖子锁定样式*/
-.locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
+.locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
 
 /*20150612加入班级样式*/
 .add-class-box {width:80%; max-width:300px; min-width:240px; height:150px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; margin-top:100px;}
@@ -167,7 +167,7 @@ a.underline {text-decoration:underline;}
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}
 .input-box-wrap {padding-right:17px;}
-.input-box {    -webkit-appearance: none; font-size: 16px;width:100%; height:36px; padding-left:5px; line-height:36px; border:1px solid #ccc; border-radius:5px;}
+.input-box { -webkit-appearance: none; font-size: 16px;width:100%; height:16px; padding: 10px 0px 10px 5px; line-height:16px; border:1px solid #ccc; border-radius:5px;}
 .login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
 .login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
 .login-box.checked{background:#63c360;}

From c940527694d88576b68629512c54deb0841b2585 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 17:12:53 +0800
Subject: [PATCH 485/668] .

---
 app/controllers/wechats_controller.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 00585722c..5edaf63e5 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -128,8 +128,13 @@ class WechatsController < ActionController::Base
     default_msg(request)
   end
 
-  on :click, with: 'JOIN_CLASS' do |reques, key|
-    request.reply.text "请直接回复班级邀请码 (不区分大小写):"
+  on :click, with: 'JOIN_CLASS' do |request, key|
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      sendBind(request)
+    else
+      request.reply.text "请直接回复班级邀请码 (不区分大小写):"
+    end
   end
 
   def default_msg(request)

From a5ffd013b92fd55e3839b9010f12deae288ca2a1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 17:13:14 +0800
Subject: [PATCH 486/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=89=88=E6=9C=AC=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?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/attachments/_show_attachment_history.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index ee607cec4..9764908ab 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -1,7 +1,7 @@
 <!--<div class="resourceUploadPopup">-->
 <span class="uploadDialogText">更新资源版本</span>
 <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer mt0">
+<div>
   <div>
     <div>当前版本
             <span class="attachment" >

From 4b813ef5352affd3124044db986f8b25c56d4b15 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 17:26:29 +0800
Subject: [PATCH 487/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb |  23 ++++++++++++++++++++++-
 public/images/wechat/class.jpg        | Bin 0 -> 96384 bytes
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 public/images/wechat/class.jpg

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 5edaf63e5..d528094d6 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -6,6 +6,23 @@ class WechatsController < ActionController::Base
 
   # default text responder when no other match
   on :text do |request, content|
+    if content.size == 6
+      #邀请码
+      if join_class(content)
+        root_url = "http://wechat.trustie.net"
+
+        news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
+                                                                 content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!0"} }
+        request.reply.news(news) do |article, n, index| # article is return object
+          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities#myclass'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+          pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/class.jpg"
+          article.item title: "#{n[:title]}",
+                       description: n[:content],
+                       pic_url: pic_url,
+                       url: url
+        end
+      end
+    end
     request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
   end
 
@@ -133,7 +150,7 @@ class WechatsController < ActionController::Base
     unless uw
       sendBind(request)
     else
-      request.reply.text "请直接回复班级邀请码 (不区分大小写):"
+      request.reply.text "请直接回复6位班级邀请码\n(不区分大小写):"
     end
   end
 
@@ -165,6 +182,10 @@ class WechatsController < ActionController::Base
     end
   end
 
+  def join_class(content)
+    true
+  end
+
   ###  controller method
   module Controllers
     def get_open_id
diff --git a/public/images/wechat/class.jpg b/public/images/wechat/class.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e3eebb977168771f333bff2c7b858a70b48b1b45
GIT binary patch
literal 96384
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

literal 0
HcmV?d00001


From 6f14b61ccef00b33cb941d1774d033009e6beaaf Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 17:28:21 +0800
Subject: [PATCH 488/668] .

---
 app/controllers/wechats_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index d528094d6..7ef2831a0 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -21,6 +21,7 @@ class WechatsController < ActionController::Base
                        pic_url: pic_url,
                        url: url
         end
+        return
       end
     end
     request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo

From 40792ff22206f17e7a7217ef2253d25bdd4c8716 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 17:34:35 +0800
Subject: [PATCH 489/668] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8F=8F=E8=BF=B0=E9=BB=98=E8=AE=A4=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/views/attachments/_show_attachment_history.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index 9764908ab..61ccef344 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -47,7 +47,7 @@
       <div class="mb5 mt5">
         <p class="c_dark f14" style="line-height:30px;">描述：</p>
         <div class="fl">
-          <textarea style="resize:none"  type="text" name="description" class="InputBox fl H60 W420" value="<%= @attachment.description %>"></textarea>
+          <textarea style="resize:none"  type="text" placeholder="请编辑资源描述" name="description" class="InputBox fl H60 W420" ><%= @attachment.description %></textarea>
         </div>
         <div class="cl"></div>
       </div>

From 1d6d100983fbdc6af96004bced4d6a00fa816141 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 17:37:35 +0800
Subject: [PATCH 490/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 7ef2831a0..6517c756e 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -21,8 +21,10 @@ class WechatsController < ActionController::Base
                        pic_url: pic_url,
                        url: url
         end
-        return
+      else
+        request.reply.text "课程邀请码不正确"
       end
+      return
     end
     request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
   end

From d5631defb5fc363d951b06cc32dd89bb7f405e9a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 20 Jun 2016 17:53:56 +0800
Subject: [PATCH 491/668] added xml to jenkins and added some gems

---
 Gemfile                                       |   2 +
 .../quality_analyses_controller.rb            |  29 +-
 config.xml                                    |  69 +++
 db/schema.rb                                  | 407 +++++++++++++++++-
 4 files changed, 502 insertions(+), 5 deletions(-)
 create mode 100644 config.xml

diff --git a/Gemfile b/Gemfile
index 789c2011e..39234b05e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,8 @@ unless RUBY_PLATFORM =~ /w32/
 end
 
 gem 'net-ssh'
+gem 'jenkins_api_client'
+gem 'nokogiri'
 
 gem 'certified'
 
diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analyses_controller.rb
index 1cbcb14a8..962ce2524 100644
--- a/app/controllers/quality_analyses_controller.rb
+++ b/app/controllers/quality_analyses_controller.rb
@@ -2,20 +2,41 @@ class QualityAnalysesController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   layout "base_projects"
   include ApplicationHelper
+  require 'jenkins_api_client'
+  require 'nokogiri'
 
   def new
 
   end
 
   def create
+    gitlab_address = Redmine::Configuration['gitlab_address']
     user_name = User.find(params[:user_id]).try(:login)
-    branch = params[:branch]
+    branch = params[:branch].nil? ? "master" : params[:branch]
     language = params[:language]
     path = params[:path]
+    properties = "sonar.projectKey=#{user_name}:#{@project.name}
+        sonar.projectName=My #{@project.name}
+        sonar.projectVersion=1.11
+        sonar.sources=#{path}
+        sonar.language=#{language}
+        sonar.sourceEncoding=utf-8"
+    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
     @client = JenkinsApi::Client.new(:server_url => 'http://123.59.135.93:8890',
-                                        :username => user_name,
-                                        :password => '')
-    
+                                     :username => user_name,
+                                     :password => '')
+
+    # modify config
+    @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+    @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+    @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+    @doc.at_xpath("//hudson.plugins.git.BranchSpec/properties").content = properties
+    sonar_properties = @doc.xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").text #sonar-properties
+
+    # replace config.xml of jenkins
+    @client = @client.job.create("tesc_create", File.read(File.join(Rails.root, 'tmp', 'config.xml')))
+
+
   end
 
   def index
diff --git a/config.xml b/config.xml
new file mode 100644
index 000000000..7e0029986
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.2.3">
+      <gitLabConnection>trustie-gitlab</gitLabConnection>
+    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.4.4">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>http://192.168.8.158:8889/root/badboy.git</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>*/master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <com.dabsquared.gitlabjenkins.GitLabPushTrigger plugin="gitlab-plugin@1.2.3">
+      <spec></spec>
+      <triggerOnPush>true</triggerOnPush>
+      <triggerOnMergeRequest>true</triggerOnMergeRequest>
+      <triggerOpenMergeRequestOnPush>never</triggerOpenMergeRequestOnPush>
+      <ciSkip>true</ciSkip>
+      <setBuildDescription>true</setBuildDescription>
+      <addNoteOnMergeRequest>true</addNoteOnMergeRequest>
+      <addCiMessage>false</addCiMessage>
+      <addVoteOnMergeRequest>true</addVoteOnMergeRequest>
+      <branchFilterType>All</branchFilterType>
+      <includeBranchesSpec></includeBranchesSpec>
+      <excludeBranchesSpec></excludeBranchesSpec>
+      <targetBranchRegex></targetBranchRegex>
+      <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess>
+    </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.sonar.SonarRunnerBuilder plugin="sonar@2.4.2">
+      <project></project>
+      <properties>
+        sonar.projectKey=my:project985
+        sonar.projectName=My project985
+        sonar.projectVersion=1.11
+        sonar.sources=src
+        sonar.language=java
+        sonar.sourceEncoding=utf-8
+      </properties>
+      <javaOpts></javaOpts>
+      <additionalArguments></additionalArguments>
+      <jdk>(Inherit From Job)</jdk>
+      <task></task>
+    </hudson.plugins.sonar.SonarRunnerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/db/schema.rb b/db/schema.rb
index 95ffceef1..e8e7e25cb 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 => 20160612043259) do
+ActiveRecord::Schema.define(:version => 20160613065840) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -156,6 +178,20 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -253,6 +289,17 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -550,8 +597,11 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
   end
 
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -613,6 +663,15 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -662,6 +721,16 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -684,6 +753,25 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -786,6 +874,15 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -915,6 +1012,17 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1058,6 +1166,20 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1069,6 +1191,27 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1119,6 +1262,47 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1153,6 +1337,39 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1178,6 +1395,31 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1187,6 +1429,49 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1344,6 +1629,23 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1426,6 +1728,11 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1516,6 +1823,16 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1650,6 +1967,25 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1688,6 +2024,26 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1826,6 +2182,27 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2066,6 +2443,17 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2117,6 +2505,23 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"

From 5a8de44c43542645c9e06492ce76f06caf76ba18 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 20 Jun 2016 19:42:51 +0800
Subject: [PATCH 492/668] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/myclass.html                | 0
 public/javascripts/wechat/controllers/myclass.js | 3 +++
 public/javascripts/wechat/others/routes.js       | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 public/assets/wechat/myclass.html
 create mode 100644 public/javascripts/wechat/controllers/myclass.js

diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/myclass.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/myclass.js
new file mode 100644
index 000000000..f6cd77e17
--- /dev/null
+++ b/public/javascripts/wechat/controllers/myclass.js
@@ -0,0 +1,3 @@
+app.controller('MyClassController', ['$scope', function($scope){
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index b4a4e4067..fdfd72492 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -31,6 +31,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
         .when('/add_class', makeRoute('add_class.html', 'AddClassController'))
+        .when('/myclass', makeRoute('myclass.html', 'MyClassController'))
         .otherwise({
             redirectTo: '/activites'
         });

From 860068f7ed31acbbc7bc3c35c9030e1b2039b142 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:03:50 +0800
Subject: [PATCH 493/668] =?UTF-8?q?=E6=96=B0=E6=B3=A8=E5=86=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 258fe2ea5..19b60e9c2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -248,7 +248,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy,:delete_user_ealasticsearch_index
   # added by fq
-  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index
+  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index,:add_new_jour
   # end
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list,:update_user_ealasticsearch_index
@@ -1145,6 +1145,22 @@ class User < Principal
     end
   end
 
+  #为新注册用户发送留言
+  def add_new_jour
+    if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+      lead_message1 = Message.find(19278)
+      notes1 = lead_message1.content
+      # lead_message2 = Message.find(19292)
+      # notes2 = lead_message2.content
+      # lead_message3 = Message.find(19291)
+      # notes3 = lead_message3.content
+      # user_id 默认为课程使者创建
+      self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    end
+  end
+
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
   def update_invite_list
     invite_lists = InviteList.where("user_id =?",self.id).all

From dc70b40309a4afb449b472680a1d62c37f9c5b1c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:04:35 +0800
Subject: [PATCH 494/668] =?UTF-8?q?kindeditor=E4=B8=AD=E7=9A=84a=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=B1=9E=E6=80=A7=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 0354ed467..c78fd430e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -300,8 +300,8 @@ K.options = {
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
 			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
 		],
-		a : ['id', 'class', 'href', 'target', 'name'],
-		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+        a : ['id', 'class', 'href', 'target', 'name','data-method','data-remote','rel'],
+        embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
 		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',

From 4f80e259e84dfbf422c2e45c4efeccc1ae1f0af5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:16:45 +0800
Subject: [PATCH 495/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E5=BB=B6=E6=97=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                         | 24 +++++++++++-----------
 app/views/layouts/_logined_header.html.erb | 16 ++++++---------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 19b60e9c2..2db66dc31 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1147,18 +1147,18 @@ class User < Principal
 
   #为新注册用户发送留言
   def add_new_jour
-    if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
-      lead_message1 = Message.find(19278)
-      notes1 = lead_message1.content
-      # lead_message2 = Message.find(19292)
-      # notes2 = lead_message2.content
-      # lead_message3 = Message.find(19291)
-      # notes3 = lead_message3.content
-      # user_id 默认为课程使者创建
-      self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-    end
+    # if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+    #   lead_message1 = Message.find(19278)
+    #   notes1 = lead_message1.content
+    #   lead_message2 = Message.find(19292)
+    #   notes2 = lead_message2.content
+    #   lead_message3 = Message.find(19291)
+    #   notes3 = lead_message3.content
+    #   # user_id 默认为课程使者创建
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    # end
   end
 
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index da22cce7a..d8adece15 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -112,21 +112,17 @@
     }).mouseleave(function(){
         onNotice = false;
         var obj = $("#user_messages_list");
-        obj.timer = setTimeout(function(){
-            if(!onNotice && !onUserMessages)
-            obj.hide(0);
-            obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
-        }, 500);
+        setTimeout(function(){
+            if(!onNotice && !onUserMessages) {
+                obj.hide();
+                obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+            } }, 500);
     });
-
-    $("#user_messages_list").mouseenter(function(event){
+    $("#message_list_detail").mouseenter(function(event){
         event.stopPropagation();
         onUserMessages = true;
-        $(this).show();
     }).mouseleave(function(){
         onUserMessages = false;
-        $(this).hide();
-        $(this).html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
     });
 
     $("#navHomepageProfile").mouseenter(function(){

From c4cea93a4451003c53ca9f0c4f9edac37d398c1a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 13:58:17 +0800
Subject: [PATCH 496/668] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E6=89=8B=E5=8A=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                             | 10 +++++-----
 app/views/layouts/_show_messages_list.html.erb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2db66dc31..3d491c8ab 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1147,18 +1147,18 @@ class User < Principal
 
   #为新注册用户发送留言
   def add_new_jour
-    # if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
-    #   lead_message1 = Message.find(19278)
-    #   notes1 = lead_message1.content
+     if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+       lead_message1 = Message.find(19278)
+       notes1 = lead_message1.content
     #   lead_message2 = Message.find(19292)
     #   notes2 = lead_message2.content
     #   lead_message3 = Message.find(19291)
     #   notes3 = lead_message3.content
     #   # user_id 默认为课程使者创建
-    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+       self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
     #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
     #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-    # end
+     end
   end
 
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 762109bf5..f67250e46 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -136,7 +136,7 @@
       <% end %>
   <% end %>
 </ul>
-  <a onclick = "show_more();" id = "show_more_messages" style="display: none" class = "shadowbox_news_all">展开更多</a>
+  <a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>
 <%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all", :style => "display:none", :target =>"_Blank" %>
 </div>
 

From 44334913ee21681bc370a878179ed638b09e8534 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 14:28:26 +0800
Subject: [PATCH 497/668] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=BC=8F=E4=BA=86=E4=B8=80=E6=9D=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_show_messages_list.html.erb      | 200 +++++++++---------
 1 file changed, 101 insertions(+), 99 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index f67250e46..a4df961d3 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -5,18 +5,20 @@
 <ul class="shadowbox_news_list">
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
-      <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
+        <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
     <% elsif ma.class == CourseMessage %>
       <% if ma.course_message_type == "News" %>
-        <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
+          <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
       <% elsif ma.course_message_type == "Comment" %>
-        <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
+          <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
           <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程作业：作业标题：<%= ma.course_message.name%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了</a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 关闭了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>关闭了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)</a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
@@ -34,106 +36,106 @@
               <% href = 'javascript:void(0)' %>
           <% end %>
           <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.user.show_name %> 申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
-          <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
-              <% if ma.course_message.container_type == "Course" %>
-                  <% href = course_files_path(ma.course_message.container_id) %>
-              <% elsif ma.course_message.container_type == "Project" %>
-                  <% href = project_files_path(ma.course_message.container_id) %>
-              <% elsif ma.course_message.container_type == "OrgSubfield" %>
-                  <% href = org_subfield_files_path(ma.course_message.container_id) %>
-              <% else %>
-                  <% href = 'javascript:void(0)' %>
-              <% end %>
-              <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
-          <% elsif ma.course_message_type == "Poll" %>
-              <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
-          <% elsif ma.course_message_type == "Message" %>
-              <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
-              <% href = 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) %>
-              <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%></a></li>
-          <% elsif ma.course_message_type == "StudentWorksScore" %>
-              <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
-          <% elsif ma.course_message_type == "JournalsForMessage" %>
-              <% if ma.course_message.jour_type == 'Course' %>
-                  <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
-              <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
-                  <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
-              <% else %>
-                  <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
-              <% end %>
-          <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
-          <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
-          <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
-          <% elsif ma.course_message_type == "Course" %>
-              <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
-          <% elsif ma.course_message_type == "JoinCourseRequest" %>
-              <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
-              <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
-          <% elsif ma.course_message_type == "CourseRequestDealResult" %>
-              <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
-              <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
-          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
-              <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
-          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
-              <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
-          <% elsif ma.course_message_type == "RemoveFromCourse" %>
-              <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
-          <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
-              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
-          <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
-              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
-          <% end %>
-      <% elsif ma.class == ForgeMessage %>
-          <% if ma.forge_message_type == "AppliedProject" %>
-              <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "JoinProject" %>
-              <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "RemoveFromProject" %>
-              <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "RemoveFromProject" %>
-              <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
-              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
-          <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
-              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
-          <% elsif ma.forge_message_type == "Journal" %>
-              <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
-          <% elsif ma.forge_message_type == "Message" %>
-              <li><a href="<%=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) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
-          <% elsif ma.forge_message_type == "News" %>
-              <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
-          <% elsif ma.forge_message_type == "Comment" %>
-              <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
-          <% end %>
-      <% elsif ma.class == MemoMessage %>
-          <% if ma.memo_type == "Memo" %>
-              <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
-          <% end %>
-      <% elsif ma.class == UserFeedbackMessage %>
-          <% if ma.journals_for_message_type == "JournalsForMessage" %>
-              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
-          <% end %>
-      <% elsif ma.class == OrgMessage %>
-          <% if ma.message_type == 'ApplySubdomain' %>
-              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
-          <% elsif ma.message_type == 'AgreeApplySubdomain' %>
-              <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+      <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+          <% if ma.course_message.container_type == "Course" %>
+              <% href = course_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "Project" %>
+              <% href = project_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "OrgSubfield" %>
+              <% href = org_subfield_files_path(ma.course_message.container_id) %>
+          <% else %>
+              <% href = 'javascript:void(0)' %>
           <% end %>
-      <% elsif AtMessage === ma && ma.at_valid? %>
-          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
-            <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
-            <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
-          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
-            <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
-            <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+          <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+      <% elsif ma.course_message_type == "Poll" %>
+          <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
+      <% elsif ma.course_message_type == "Message" %>
+          <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
+          <% href = 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) %>
+          <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%></a></li>
+      <% elsif ma.course_message_type == "StudentWorksScore" %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
+      <% elsif ma.course_message_type == "JournalsForMessage" %>
+          <% if ma.course_message.jour_type == 'Course' %>
+              <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
+          <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+              <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
           <% else %>
-            <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
-            <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
+              <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
           <% end %>
+      <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
+      <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
+      <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
+      <% elsif ma.course_message_type == "Course" %>
+          <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
+      <% elsif ma.course_message_type == "JoinCourseRequest" %>
+          <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
+          <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
+      <% elsif ma.course_message_type == "CourseRequestDealResult" %>
+          <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+          <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
+      <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+          <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
+      <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+          <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
+      <% elsif ma.course_message_type == "RemoveFromCourse" %>
+          <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
+      <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
+          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
+      <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
+          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
+      <% end %>
+    <% elsif ma.class == ForgeMessage %>
+      <% if ma.forge_message_type == "AppliedProject" %>
+          <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "JoinProject" %>
+          <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "RemoveFromProject" %>
+          <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "RemoveFromProject" %>
+          <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
+          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
+      <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
+          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
+      <% elsif ma.forge_message_type == "Journal" %>
+          <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
+      <% elsif ma.forge_message_type == "Message" %>
+          <li><a href="<%=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) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
+      <% elsif ma.forge_message_type == "News" %>
+          <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
+      <% elsif ma.forge_message_type == "Comment" %>
+          <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
+      <% end %>
+    <% elsif ma.class == MemoMessage %>
+      <% if ma.memo_type == "Memo" %>
+          <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
+      <% end %>
+    <% elsif ma.class == UserFeedbackMessage %>
+      <% if ma.journals_for_message_type == "JournalsForMessage" %>
+          <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
+      <% end %>
+    <% elsif ma.class == OrgMessage %>
+      <% if ma.message_type == 'ApplySubdomain' %>
+          <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
+      <% elsif ma.message_type == 'AgreeApplySubdomain' %>
+          <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+      <% end %>
+    <% elsif AtMessage === ma && ma.at_valid? %>
+      <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+        <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+        <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+        <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+        <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% else %>
+        <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
+        <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
       <% end %>
+    <% end %>
   <% end %>
 </ul>
   <a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>

From 7e25ec1a001138e96d7751e620fd7e3e7052f239 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 15:07:37 +0800
Subject: [PATCH 498/668] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 29e6a4980..ba1a51343 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1489,8 +1489,8 @@ class UsersController < ApplicationController
       # 减少数据库交互
       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 + ")"
-      watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
-      blog_ids = "(" + watched_user_blog_ids + ")"
+      watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
+      blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
 
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
                                                 "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+

From fd765b1d733b3f64518ccfb7d51d882981256bca Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 21 Jun 2016 15:17:24 +0800
Subject: [PATCH 499/668] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E5=BC=B9=E6=A1=86js=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/course_outline.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
index 490361a24..df968955a 100644
--- a/app/views/courses/course_outline.js.erb
+++ b/app/views/courses/course_outline.js.erb
@@ -6,4 +6,5 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before(' <a href="javascript:void(0);" onclick="hideModal()" class="resourceClose" style="margin-left: 285px"></a>');
 $('#ajax-modal').parent().css("top","30%").css("left","50%");
 $('#ajax-modal').parent().addClass("courseOutlinePopup");
+$('#ajax-modal').parent().removeClass("copyCoursePopup");
 $('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");

From 26b7c3e70b5eae994a0667e838faa9a2e8c8a38b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 21 Jun 2016 16:46:34 +0800
Subject: [PATCH 500/668] aqulity analysis

---
 .../quality_analyses_controller.rb            | 49 +++++++++----
 .../repositories/_quality_analyses.html.erb   |  2 +-
 config.xml                                    | 69 -------------------
 3 files changed, 35 insertions(+), 85 deletions(-)
 delete mode 100644 config.xml

diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analyses_controller.rb
index 962ce2524..cba3cd537 100644
--- a/app/controllers/quality_analyses_controller.rb
+++ b/app/controllers/quality_analyses_controller.rb
@@ -1,46 +1,55 @@
 class QualityAnalysesController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :authorize
   layout "base_projects"
   include ApplicationHelper
   require 'jenkins_api_client'
   require 'nokogiri'
+  require 'json'
+  require 'open-uri'
 
   def new
 
   end
 
   def create
+    @client = JenkinsApi::Client.new(:server_url => 'http://123.59.135.93:8890',
+                                     :username => "temp",
+                                     :password => '123123')
+    #@client.exists?(job_name)
+    @g = Gitlab.client
     gitlab_address = Redmine::Configuration['gitlab_address']
     user_name = User.find(params[:user_id]).try(:login)
     branch = params[:branch].nil? ? "master" : params[:branch]
     language = params[:language]
     path = params[:path]
-    properties = "sonar.projectKey=#{user_name}:#{@project.name}
-        sonar.projectName=My #{@project.name}
-        sonar.projectVersion=1.11
+    identifier = params[:identifier]
+    properties = "sonar.projectKey=#{user_name}:#{identifier}
+        sonar.projectName=#{user_name}:#{identifier}
+        sonar.projectVersion=1.0
         sonar.sources=#{path}
-        sonar.language=#{language}
+        sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
-    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
-    @client = JenkinsApi::Client.new(:server_url => 'http://123.59.135.93:8890',
-                                     :username => user_name,
-                                     :password => '')
+    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier+"."+"git"
+
 
-    # modify config
+    # # modify config
     @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
     @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
     @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
-    @doc.at_xpath("//hudson.plugins.git.BranchSpec/properties").content = properties
-    sonar_properties = @doc.xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").text #sonar-properties
+    @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties #sonar-properties
 
     # replace config.xml of jenkins
-    @client = @client.job.create("tesc_create", File.read(File.join(Rails.root, 'tmp', 'config.xml')))
-
-
+    @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+    # relace gitlab hook
+    # genkins address
+    @g.add_project_hook(@project.gpid,"http://123.59.135.93:8890/project/#{user_name}_#{identifier}")
   end
 
   def index
-
+    data = open('http://123.59.135.93:8891/api/resources/index?resource=my:project985&depth=-1&metrics=complexity,class_complexity,lines,comment_lines,blocker_violations').read
+    cc=JSON.parse(data)
+    p cc
   end
 
   # Find project of id params[:project_id]
@@ -49,4 +58,14 @@ class QualityAnalysesController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+
+  # Authorize the user for the requested action
+  def authorize(ctrl = params[:controller], action = params[:action], global = false)
+    unless @project.archived? && @project.gpid.nil?
+      true
+    else
+      render_403 :message => :notice_not_authorized_archived_project
+    end
+  end
+
 end
diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb
index 56951f3b6..7809c5e36 100644
--- a/app/views/repositories/_quality_analyses.html.erb
+++ b/app/views/repositories/_quality_analyses.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag( url_for(:controller => 'quality_analyses', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
+<%= form_tag( url_for(:controller => 'quality_analyses', :action => 'create', :project_id => @project.id, :identifier => @repository.identifier, :user_id => User.current.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
     <textarea  id="path_description" name="path" rows="8" placeholder="目录相当于根目录，用半逗号隔开。如：src/main/java,libs"></textarea>
     <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
     <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %>
diff --git a/config.xml b/config.xml
deleted file mode 100644
index 7e0029986..000000000
--- a/config.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.2.3">
-      <gitLabConnection>trustie-gitlab</gitLabConnection>
-    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
-  </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.4.4">
-    <configVersion>2</configVersion>
-    <userRemoteConfigs>
-      <hudson.plugins.git.UserRemoteConfig>
-        <url>http://192.168.8.158:8889/root/badboy.git</url>
-      </hudson.plugins.git.UserRemoteConfig>
-    </userRemoteConfigs>
-    <branches>
-      <hudson.plugins.git.BranchSpec>
-        <name>*/master</name>
-      </hudson.plugins.git.BranchSpec>
-    </branches>
-    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-    <submoduleCfg class="list"/>
-    <extensions/>
-  </scm>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <com.dabsquared.gitlabjenkins.GitLabPushTrigger plugin="gitlab-plugin@1.2.3">
-      <spec></spec>
-      <triggerOnPush>true</triggerOnPush>
-      <triggerOnMergeRequest>true</triggerOnMergeRequest>
-      <triggerOpenMergeRequestOnPush>never</triggerOpenMergeRequestOnPush>
-      <ciSkip>true</ciSkip>
-      <setBuildDescription>true</setBuildDescription>
-      <addNoteOnMergeRequest>true</addNoteOnMergeRequest>
-      <addCiMessage>false</addCiMessage>
-      <addVoteOnMergeRequest>true</addVoteOnMergeRequest>
-      <branchFilterType>All</branchFilterType>
-      <includeBranchesSpec></includeBranchesSpec>
-      <excludeBranchesSpec></excludeBranchesSpec>
-      <targetBranchRegex></targetBranchRegex>
-      <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess>
-    </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.plugins.sonar.SonarRunnerBuilder plugin="sonar@2.4.2">
-      <project></project>
-      <properties>
-        sonar.projectKey=my:project985
-        sonar.projectName=My project985
-        sonar.projectVersion=1.11
-        sonar.sources=src
-        sonar.language=java
-        sonar.sourceEncoding=utf-8
-      </properties>
-      <javaOpts></javaOpts>
-      <additionalArguments></additionalArguments>
-      <jdk>(Inherit From Job)</jdk>
-      <task></task>
-    </hudson.plugins.sonar.SonarRunnerBuilder>
-  </builders>
-  <publishers/>
-  <buildWrappers/>
-</project>

From e3b6bd19e13742316117ac5a1ac361ef5121f6eb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 21 Jun 2016 16:50:45 +0800
Subject: [PATCH 501/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E6=8E=A7=E5=88=B6=E5=99=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                                      | 2 +-
 ...analyses_controller.rb => quality_analysis_controller.rb} | 2 +-
 app/helpers/quality_analyses_helper.rb                       | 2 --
 app/helpers/quality_analysis_helper.rb                       | 2 ++
 .../{quality_analyses => quality_analysis}/index.html.erb    | 0
 app/views/repositories/_quality_analyses.html.erb            | 2 +-
 config/routes.rb                                             | 4 ++--
 spec/controllers/quality_analyses_controller_spec.rb         | 5 -----
 spec/controllers/quality_analysis_controller_spec.rb         | 5 +++++
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename app/controllers/{quality_analyses_controller.rb => quality_analysis_controller.rb} (96%)
 delete mode 100644 app/helpers/quality_analyses_helper.rb
 create mode 100644 app/helpers/quality_analysis_helper.rb
 rename app/views/{quality_analyses => quality_analysis}/index.html.erb (100%)
 delete mode 100644 spec/controllers/quality_analyses_controller_spec.rb
 create mode 100644 spec/controllers/quality_analysis_controller_spec.rb

diff --git a/Gemfile b/Gemfile
index 39234b05e..37ce76624 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'net-ssh'
 gem 'jenkins_api_client'
 gem 'nokogiri'
 
-gem 'certified'
+# gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analysis_controller.rb
similarity index 96%
rename from app/controllers/quality_analyses_controller.rb
rename to app/controllers/quality_analysis_controller.rb
index 962ce2524..0eff67be7 100644
--- a/app/controllers/quality_analyses_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -1,4 +1,4 @@
-class QualityAnalysesController < ApplicationController
+class QualityAnalysisController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   layout "base_projects"
   include ApplicationHelper
diff --git a/app/helpers/quality_analyses_helper.rb b/app/helpers/quality_analyses_helper.rb
deleted file mode 100644
index a47f571bb..000000000
--- a/app/helpers/quality_analyses_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module QualityAnalysesHelper
-end
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
new file mode 100644
index 000000000..f2a1effba
--- /dev/null
+++ b/app/helpers/quality_analysis_helper.rb
@@ -0,0 +1,2 @@
+module QualityAnalysisHelper
+end
diff --git a/app/views/quality_analyses/index.html.erb b/app/views/quality_analysis/index.html.erb
similarity index 100%
rename from app/views/quality_analyses/index.html.erb
rename to app/views/quality_analysis/index.html.erb
diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb
index 56951f3b6..bf45ba167 100644
--- a/app/views/repositories/_quality_analyses.html.erb
+++ b/app/views/repositories/_quality_analyses.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag( url_for(:controller => 'quality_analyses', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
+<%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
     <textarea  id="path_description" name="path" rows="8" placeholder="目录相当于根目录，用半逗号隔开。如：src/main/java,libs"></textarea>
     <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
     <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %>
diff --git a/config/routes.rb b/config/routes.rb
index b32816673..52629604c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -782,7 +782,7 @@ RedmineApp::Application.routes.draw do
       end
     end
 
-    resources :quality_analyses, :only => [:index, :new, :create] do
+    resources :quality_analysis, :only => [:index, :new, :create] do
       collection do
       end
       member do
@@ -909,7 +909,7 @@ RedmineApp::Application.routes.draw do
 
   # repositories routes
   get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats', :as => "stats_repository_project"
-  get 'projects/:id/repository/:repository_id/quality_analyses', :to => 'repositories#quality_analyses', :as => "quality_analyses"
+  get 'projects/:id/repository/:repository_id/quality_analysis', :to => 'repositories#quality_analysis', :as => "quality_analysis"
   get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
 
   get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))', :to => 'repositories#changes'
diff --git a/spec/controllers/quality_analyses_controller_spec.rb b/spec/controllers/quality_analyses_controller_spec.rb
deleted file mode 100644
index c5076c53f..000000000
--- a/spec/controllers/quality_analyses_controller_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe QualityAnalysesController, :type => :controller do
-
-end
diff --git a/spec/controllers/quality_analysis_controller_spec.rb b/spec/controllers/quality_analysis_controller_spec.rb
new file mode 100644
index 000000000..d25575a85
--- /dev/null
+++ b/spec/controllers/quality_analysis_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe QualityAnalysisController, :type => :controller do
+
+end

From 3f8beaf97c6d6b449441c8dbce4ec8c161f4fa60 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 16:53:31 +0800
Subject: [PATCH 502/668] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8Dban?=
 =?UTF-8?q?ner=E7=9A=84=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb         | 17 ++----------
 app/views/courses/syllabus.html.erb           | 17 ++----------
 app/views/memos/show.html.erb                 |  5 ----
 app/views/messages/_course_show.html.erb      | 12 ++-------
 .../messages/_org_subfield_show.html.erb      | 17 ++----------
 .../_org_subfield_message.html.erb            | 18 ++-----------
 .../organizations/_org_subfield_news.html.erb | 24 +++--------------
 .../organizations/_show_org_document.html.erb | 17 ++----------
 app/views/projects/_project_news.html.erb     | 24 +++--------------
 app/views/users/_course_homework.html.erb     |  7 ++---
 .../users/_course_journalsformessage.html.erb | 24 +++--------------
 app/views/users/_course_message.html.erb      | 23 ++--------------
 app/views/users/_course_news.html.erb         | 24 +++--------------
 app/views/users/_project_issue_reply.html.erb | 17 +-----------
 app/views/users/_project_message.html.erb     | 19 ++------------
 app/views/users/_project_news.html.erb        | 26 +++----------------
 app/views/users/_reply_banner.html.erb        | 18 +++++++++++++
 app/views/users/_user_blog.html.erb           | 24 +++--------------
 .../users/_user_journalsformessage.html.erb   | 17 +-----------
 public/stylesheets/public.css                 |  2 ++
 20 files changed, 59 insertions(+), 293 deletions(-)
 create mode 100644 app/views/users/_reply_banner.html.erb

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 9617b7f76..7d8aaed86 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -87,11 +87,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -126,11 +122,6 @@
             </span>
           </div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -146,11 +137,7 @@
                 </div>
                 <div class="homepagePostReplyDes">
                   <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 %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index f2d9cbdbd..f369f2b49 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -75,11 +75,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -109,11 +105,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -129,11 +120,7 @@
                 </div>
                 <div class="homepagePostReplyDes">
                   <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 %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 9b3e82447..69e36ca34 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -81,11 +81,6 @@
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
       <div class="homepagePostReplyBannerTime"></div>
-      <!--<div class="homepagePostReplyBannerMore">-->
-        <!--<%# if @reply_count > 2%>-->
-        <!--<a# href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @memo.id%>" onclick="expand_reply('#reply_div_<%#= @memo.id %>','#reply_btn_<%#= @memo.id%>')" data-count="<%= @reply_count %>" data-init="0" >点击展开更多回复</a>-->
-        <!--<%# end %>-->
-      <!--</div>-->
     </div>
     <div class="" id="reply_div_<%=  @memo.id %>">
     <% @replies.each_with_index  do |reply,i| %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 746881bdc..560925070 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -71,11 +71,7 @@
       </div>
       <div class="cl"></div>
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -114,11 +110,7 @@
             </div>
             <div class="homepagePostReplyDes">
               <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 %>
-                    <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                <% end %>
+                <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
               </div>
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 145afcfd7..e5455bc85 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -103,11 +103,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -127,11 +123,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @topic.id %>">
           <% @replies.each_with_index  do |reply,i| %>
@@ -147,11 +138,7 @@
                 </div>
                 <div class="homepagePostReplyDes">
                   <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 %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 245651daf..19a6f0eaa 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -80,17 +76,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 22f88e91b..d6e27daf1 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -60,22 +57,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%= user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index cfbbcb5e6..06950258e 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -71,21 +71,8 @@
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=document.id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
-        </span>
-      </div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>',<%= document.id %>,'OrgDocumentComment',<%= document.id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => document, :user_activity_id => document.id} %>
+
     <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
       <%= render :partial => 'users/all_replies', :locals => {:comments => comments_for_doc}%>
     </div>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 0ca46e59b..2d498e827 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO
         <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -40,22 +37,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 8de9b3dce..ee12c04dd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -7,11 +7,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %> TO <!--+"(课程名称)" -->
+        <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+         TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 9ed7e6e76..85e0e9335 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
+         TO
         <% course=Course.find(activity.jour_id) %>
         <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
@@ -43,22 +40,7 @@
   </div>
   <% count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 88fbcef6c..135013a62 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -89,22 +85,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent ? activity.parent : activity%>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index dd234ac90..efd3770aa 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -67,22 +64,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index d1f7363a7..3dac8026a 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -1,21 +1,6 @@
 <% count = activity.journals.count %>
 <div class="homepagePostReply">
-  <div class="homepagePostReplyBanner">
-    <div class="homepagePostReplyBannerCount">回复
-      <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-    </div>
-    <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-    <% if count > 3 %>
-        <div class="homepagePostReplyBannerMore">
-          <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Issue',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-            展开更多
-          </a>
-        </div>
-    <% end %>
-  </div>
+  <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
   <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 502706289..1abc36a31 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
@@ -88,18 +84,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 04edc05e0..cdceb490d 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(名称)"-->
         <%= link_to activity.project.name.to_s+" | 新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -64,23 +61,8 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
new file mode 100644
index 000000000..0d7e0b2bd
--- /dev/null
+++ b/app/views/users/_reply_banner.html.erb
@@ -0,0 +1,18 @@
+<div class="homepagePostReplyBanner">
+  <div class="homepagePostReplyBannerCount">
+    <span>回复</span>
+    <span  class="reply_iconup" > ︿</span>
+    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
+  </div>
+  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+  <%if count>3 %>
+      <div class="homepagePostReplyBannerMore">
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index f0761ff78..77510c858 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <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 %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
@@ -46,22 +43,7 @@
   </div>
   <% count=activity.children.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'BlogComment',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index b84adf5fe..dd36d1328 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -64,22 +64,7 @@
   </div>
   <% count=fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 6c7bde896..74cbff5dd 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1166,3 +1166,5 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
\ No newline at end of file

From 494b69c89baa0008facc6591f852206924e56a6b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 22 Jun 2016 09:12:57 +0800
Subject: [PATCH 503/668] =?UTF-8?q?sonar=E6=95=B0=E6=8D=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/quality_analysis_controller.rb | 4 ++--
 app/views/quality_analysis/index.html.erb      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 21e094407..be3dee0dd 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -48,8 +48,8 @@ class QualityAnalysisController < ApplicationController
 
   def index
     data = open('http://123.59.135.93:8891/api/resources/index?resource=my:project985&depth=-1&metrics=complexity,class_complexity,lines,comment_lines,blocker_violations').read
-    cc=JSON.parse(data)
-    p cc
+    @cc =JSON.parse(data)
+
   end
 
   # Find project of id params[:project_id]
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index e69de29bb..1f70644db 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -0,0 +1,3 @@
+<% @cc.each do |c| %>
+    <%= c %>
+<% end %>
\ No newline at end of file

From b6892cfc2da70380783d33605422b8ace784f19d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 10:00:07 +0800
Subject: [PATCH 504/668] =?UTF-8?q?=E6=8A=8Aangularjs=E6=8D=A2=E6=88=907?=
 =?UTF-8?q?=E7=89=9Bcdn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 2dcd89bbb..6cb32850a 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -23,7 +23,8 @@
 <div ng-view>
 </div>
 
-<script src="/javascripts/wechat/build/angular.all.min.js"></script>
+<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
+<!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
 <script src="/javascripts/wechat/build/app.min.js"></script>
 </body>
 

From 9e7cde60563795c2c9d2e740f86a63ecdb26bd5f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 22 Jun 2016 11:25:59 +0800
Subject: [PATCH 505/668] stable version for sonar

---
 app/controllers/quality_analysis_controller.rb        |  8 ++++----
 app/controllers/repositories_controller.rb            |  8 ++++----
 app/models/quality_analysis.rb                        |  3 +++
 ...y_analyses.html.erb => _quality_analysis.html.erb} |  2 +-
 ...uality_analyses.js.erb => quality_analysis.js.erb} |  2 +-
 app/views/repositories/show.html.erb                  |  2 +-
 db/migrate/20160622015019_create_quality_analyses.rb  | 11 +++++++++++
 db/schema.rb                                          | 10 +++++++++-
 spec/factories/quality_analyses.rb                    |  7 +++++++
 spec/models/quality_analysis_spec.rb                  |  5 +++++
 10 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 app/models/quality_analysis.rb
 rename app/views/repositories/{_quality_analyses.html.erb => _quality_analysis.html.erb} (77%)
 rename app/views/repositories/{quality_analyses.js.erb => quality_analysis.js.erb} (89%)
 create mode 100644 db/migrate/20160622015019_create_quality_analyses.rb
 create mode 100644 spec/factories/quality_analyses.rb
 create mode 100644 spec/models/quality_analysis_spec.rb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 21e094407..77acdfd05 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -30,20 +30,20 @@ class QualityAnalysisController < ApplicationController
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
-    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier+"."+"git"
+    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
 
-
-    # # modify config
+    # # # modify config
     @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
     @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
     @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
     @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties #sonar-properties
-
+    #
     # replace config.xml of jenkins
     @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
     # relace gitlab hook
     # genkins address
     @g.add_project_hook(@project.gpid,"http://123.59.135.93:8890/project/#{user_name}_#{identifier}")
+    QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier)
   end
 
   def index
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3f630ce51..cbb5b2f69 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -30,13 +30,13 @@ class RepositoriesController < ApplicationController
   menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
   default_search_scope :changesets
 
-  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats, :quality_analyses]
+  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats, :quality_analysis]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analyses]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analysis]
   # 链接gitlab
-  before_filter :connect_gitlab, :only => [:quality_analyses]
+  before_filter :connect_gitlab, :only => [:quality_analysis]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -309,7 +309,7 @@ update
     end
   end
 
-  def quality_analyses
+  def quality_analysis
     gitlab_branches = @g.branches(@project.gpid)
     @branch_names = gitlab_branches.map{|b| b.name}
     @gitlab_default_branch = @g.project(@project.gpid).default_branch
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
new file mode 100644
index 000000000..45778ff3f
--- /dev/null
+++ b/app/models/quality_analysis.rb
@@ -0,0 +1,3 @@
+class QualityAnalysis < ActiveRecord::Base
+  attr_accessible :author_login, :project_id, :rep_identifier
+end
diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analysis.html.erb
similarity index 77%
rename from app/views/repositories/_quality_analyses.html.erb
rename to app/views/repositories/_quality_analysis.html.erb
index bf45ba167..64dd837b7 100644
--- a/app/views/repositories/_quality_analyses.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
+<%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
     <textarea  id="path_description" name="path" rows="8" placeholder="目录相当于根目录，用半逗号隔开。如：src/main/java,libs"></textarea>
     <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
     <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %>
diff --git a/app/views/repositories/quality_analyses.js.erb b/app/views/repositories/quality_analysis.js.erb
similarity index 89%
rename from app/views/repositories/quality_analyses.js.erb
rename to app/views/repositories/quality_analysis.js.erb
index 89d8685cf..c9427c246 100644
--- a/app/views/repositories/quality_analyses.js.erb
+++ b/app/views/repositories/quality_analysis.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analyses', :locals => {}) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analysis', :locals => {}) %>');
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index d1c041d73..1e874544a 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,7 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <%= link_to "质量分析", quality_analyses_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
+  <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
 
 </div>
 <div class="repository_con" style="line-height:1.9;">
diff --git a/db/migrate/20160622015019_create_quality_analyses.rb b/db/migrate/20160622015019_create_quality_analyses.rb
new file mode 100644
index 000000000..6316d5764
--- /dev/null
+++ b/db/migrate/20160622015019_create_quality_analyses.rb
@@ -0,0 +1,11 @@
+class CreateQualityAnalyses < ActiveRecord::Migration
+  def change
+    create_table :quality_analyses do |t|
+      t.integer :project_id
+      t.string :author_login
+      t.string :rep_identifier
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e8e7e25cb..51e0682d0 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 => 20160613065840) do
+ActiveRecord::Schema.define(:version => 20160622015019) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1833,6 +1833,14 @@ ActiveRecord::Schema.define(:version => 20160613065840) do
 
   add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
 
+  create_table "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
diff --git a/spec/factories/quality_analyses.rb b/spec/factories/quality_analyses.rb
new file mode 100644
index 000000000..a48e6e33f
--- /dev/null
+++ b/spec/factories/quality_analyses.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :quality_analyasis, class: 'QualityAnalysis' do
+    project_id 1
+    author_login "MyString"
+    rep_identifier "MyString"
+  end
+end
diff --git a/spec/models/quality_analysis_spec.rb b/spec/models/quality_analysis_spec.rb
new file mode 100644
index 000000000..d18ede452
--- /dev/null
+++ b/spec/models/quality_analysis_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe QualityAnalysis, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 13273d02de69f5a535c57c304772547ed3c17320 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:11:34 +0800
Subject: [PATCH 506/668] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=8D=E6=9A=B4=E9=9C=B2?=
 =?UTF-8?q?openid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb                         |  5 ++
 app/api/mobile/apis/users.rb                  |  4 +-
 app/controllers/wechats_controller.rb         | 31 ++++++-----
 app/views/wechats/open_wechat.html.erb        | 18 +++++++
 app/views/wechats/user_activities.html.erb    | 20 +++++++-
 config/routes.rb                              |  2 +-
 public/javascripts/wechat/app.js              | 11 ++--
 public/javascripts/wechat/build/app.min.js    | 11 ++--
 .../wechat/controllers/activity.js            |  8 +--
 .../javascripts/wechat/controllers/login.js   | 12 ++---
 public/javascripts/wechat/others/factory.js   | 51 +++----------------
 public/javascripts/wechat/others/routes.js    |  2 +-
 12 files changed, 88 insertions(+), 87 deletions(-)
 create mode 100644 app/views/wechats/open_wechat.html.erb

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index 058687776..9ffac4e10 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -23,6 +23,7 @@ module Mobile
     version 'v1', using: :path
     format :json
     content_type :json, "application/json;charset=UTF-8"
+    use ActionDispatch::Session::CookieStore
     use Mobile::Middleware::ErrorHandler
 
     helpers do
@@ -34,6 +35,10 @@ module Mobile
         raise('Unauthorized. 用户认证失败.') unless current_user
       end
 
+      def session
+        env['rack.session']
+      end
+
       def current_user
         openid = params[:openid]
         if openid
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index e3041abcd..b5ee14d19 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -23,10 +23,10 @@ module Mobile
         params do
           requires :login, type: String, desc: 'username'
           requires :password, type: String, desc: 'password'
-          requires :openid, type: String, desc: 'wechat openid'
         end
         post 'wxbind' do
-            openid = params[:openid]
+            openid = session[:wechat_openid]
+            logger.debug "openid ============== #{openid}"
             raise "无法获取到openid,请在微信中打开本页面" unless openid
             uw = UserWechat.where(openid: openid).first
             raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 6517c756e..dc1e26508 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -191,14 +191,22 @@ class WechatsController < ActionController::Base
 
   ###  controller method
   module Controllers
-    def get_open_id
+    def get_bind
       begin
-
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
         raise "无法获取到微信openid" unless openid
-        render :json => {status:0, openid: openid}
+
+        uw = UserWechat.where(openid: openid).first
+        raise "还未绑定trustie帐户" unless uw
+        logger.debug "get_bind ============= #{uw}"
+
+        user = uw.user
+        ::ApiKey.delete_all(user_id: user.id)
+        key = ::ApiKey.create!(user_id: user.id)
+
+        render :json =>{status: 0, token: key.access_token}
       rescue Exception=>e
         render :json => {status: -1, message: e.message}
       end
@@ -240,21 +248,20 @@ class WechatsController < ActionController::Base
     end
 
     def user_activities
-      # session[:wechat_code] = params[:code] if params[:code]
-      # code = params[:code] || session[:wechat_code]
-      # openid = get_openid_from_code(code)
-      # @wechat_user = user_binded?(openid)
-      # unless @wechat_user
-      #   redirect_to login_wechat_path
-      #   return
-      # end
       session[:wechat_code] = params[:code] if params[:code]
-      @code = params[:code] || session[:wechat_code]
+      @path = '/'+(params[:state] || '')
+      open_id = get_openid_from_code(params[:code]) rescue
+      unless open_id
+        render 'wechats/open_wechat', layout: nil and return
+      end
+      session[:wechat_openid] = open_id
       render 'wechats/user_activities', layout: nil
     end
 
+
     private
     def get_openid_from_code(code)
+      return 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg' if code =='only-for-test'
       openid = session[:wechat_openid]
 
       unless openid
diff --git a/app/views/wechats/open_wechat.html.erb b/app/views/wechats/open_wechat.html.erb
new file mode 100644
index 000000000..4584e81b5
--- /dev/null
+++ b/app/views/wechats/open_wechat.html.erb
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
+</head>
+<body>
+<script type="text/javascript">
+    var ua = navigator.userAgent.toLowerCase();
+    var isWeixin = ua.indexOf('micromessenger') != -1;
+    var isAndroid = ua.indexOf('android') != -1;
+    var isIos = (ua.indexOf('iphone') != -1) || (ua.indexOf('ipad') != -1);
+    if (!isWeixin) {
+        document.head.innerHTML = '<title>抱歉，出错了</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0"><link rel="stylesheet" type="text/css" href="https://res.wx.qq.com/connect/zh_CN/htmledition/style/wap_err1a9853.css">';
+        document.body.innerHTML = '<div class="page_msg"><div class="inner"><span class="msg_icon_wrp"><i class="icon80_smile"></i></span><div class="msg_content"><h4>请在微信客户端打开链接</h4></div></div></div>';
+    }
+</script>
+</body>
+</html>
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 6cb32850a..f920aed4b 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -13,9 +13,9 @@
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">
-    window.g_code = '<%= @code %>';
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
+    window.g_redirect_path = '<%= @path %>';
   </script>
 
 </head>
@@ -26,6 +26,24 @@
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
 <!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
 <script src="/javascripts/wechat/build/app.min.js"></script>
+<!--<script src="/javascripts/wechat/app.js"></script>-->
+<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
+<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/add_class.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
+<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
 </body>
 
 </html>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index e4b462d93..0998044ff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1249,7 +1249,7 @@ RedmineApp::Application.routes.draw do
       get :login
       get :user_activities
       post :bind
-      post :get_open_id
+      post :get_bind
     end
   end
 
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index a7c4d13d5..ea2bdf318 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -8,6 +8,12 @@ app.constant('config', {
 
 
 app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope, auth, $location, $routeParams){
+
+    if(g_redirect_path && g_redirect_path.length>0){
+        $location.path(g_redirect_path);
+        g_redirect_path = null;
+    }
+
     $rootScope.$on('$routeChangeError', function(event, next, current){
 
         if(next && next.templateUrl){
@@ -18,11 +24,6 @@ app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope,
     });
 
     $rootScope.$on('$routeChangeStart', function(event, next, current){
-        console.log($routeParams);
-        if(next && next.templateUrl){
-            if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
-            }
-        }
     });
 }
 ]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index c41e0bb7b..365ed28c0 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,7 +1,7 @@
-var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,e,o,a){t.$on("$routeChangeError",function(t,e,a){e&&e.templateUrl&&(e.templateUrl.endsWith("login.html")||e.templateUrl.endsWith("reg.html")||o.path("/login"))}),t.$on("$routeChangeStart",function(t,e,o){console.log(a),e&&e.templateUrl&&!e.templateUrl.endsWith("login.html")&&!e.templateUrl.endsWith("reg.html")})}]);
-app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i="";"undefined"!=typeof g_openid&&(i=g_openid),i||(i=o.get("openid"));var r=function(){var e=n.defer(),i=s();return i&&i.length>10?e.resolve(i):c().then(function(e){return t.post(a.apiUrl+"users/isbind",{openid:e})}).then(function(t){0!=t.data.status?e.reject(t.data.message):(o.save("token",t.data.token),e.resolve(t.data.token))})["catch"](function(t){e.reject(t)}),e.promise},c=function(){var a=n.defer();if(console.log(i),"undefined"!=typeof i&&i&&i.length>0)a.resolve(i);else{var r=window.g_code||e.code||o.get("code");t({url:"/wechat/get_open_id",data:{code:r},method:"POST"}).then(function(t){0!=t.data.status?a.reject(t.data.message):(i=t.data.openid,a.resolve(i))},function(t){a.reject(t)})}return a.promise},s=function(){return o.get("token")};return{isBind:r,token:s,openid:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var r=a.comment.replace(/\n/g,"<br/>"),c={type:o,content:r,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:c}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},r=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=r};return{init:c,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:r}}]);
+var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e,r){g_redirect_path&&g_redirect_path.length>0&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a,r){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(t,a,e){})}]);
+app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i=function(){var a=n.defer(),i=c();if(i&&i.length>10)a.resolve(i);else{window.g_code||e.code||o.get("code");t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?a.reject(t.data.message):(o.save("token",t.data.token),a.resolve(t.data.token))})["catch"](function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{get_bind:i,token:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var c=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:c,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=c};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:c}}]);
 app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]);
-app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(t,a,e,o,i,c,n,s,r){e.replaceUrl=function(t){return t},e.alertService=r.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(t){e.page=t,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:t}}).then(function(t){t.data.page>0?e.activities=e.activities.concat(t.data.data):e.activities=t.data.data,n.save("activities",e.activities),e.has_more=t.data.count+10*t.data.page<t.data.all_count,n.save("has_more",e.has_more),n.save("page",t.data.page),console.log(t.data)},function(t){})},e.activities.length<=0?c.isBind().then(function(){e.loadActData(0)},function(t){e.alertService.showMessage("获取token出错",t)}):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(t,e,o){n.save("yoffset",window.document.body.scrollTop),a.path("/"+t+"/"+e)},e.addPraise=function(t){s.addCommonPraise(t)},e.decreasePraise=function(t){s.decreaseCommonPraise(t)}}]);
+app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,t,e,o,i,c,n,r,s){e.replaceUrl=function(a){return a},e.alertService=s.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(a){e.page=a,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:a}}).then(function(a){a.data.page>0?e.activities=e.activities.concat(a.data.data):e.activities=a.data.data,n.save("activities",e.activities),e.has_more=a.data.count+10*a.data.page<a.data.all_count,n.save("has_more",e.has_more),n.save("page",a.data.page),console.log(a.data)},function(a){})},e.activities.length<=0?e.loadActData(0):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(a,e,o){n.save("yoffset",window.document.body.scrollTop),t.path("/"+a+"/"+e)},e.addPraise=function(a){r.addCommonPraise(a)},e.decreasePraise=function(a){r.decreaseCommonPraise(a)}}]);
 app.controller("AddClassController",["$scope",function(o){}]);
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
@@ -9,10 +9,11 @@ app.controller("DiscussionController",["$scope","$http","$routeParams","auth","c
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
 app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
-app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,i,a,n,s,r){s.isBind().then(function(){t.path("/activities")}),i.code&&r.save("code",i.code);var l=e;l.loginFailed=!1,l.alertService=a.create(),l.findPwdDialog=a.create(),l.login=function(i,a){return i.$setSubmitted(),console.log(a),i.$valid?(console.log(apiUrl+"auth"),void s.openid().then(function(e){return o.post(n.apiUrl+"users/wxbind",{login:a.login,password:a.password,openid:e})}).then(function(o){console.log(o.data),l.loginFailed=0!=o.data.status,e.loginFailed?l.alertService.showMessage("出错了",o.data.message):l.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){l.alertService.showMessage("出错了",e)})):void console.log(i.$error)},l.showBox=function(){l.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},l.goReg=function(){t.path("/reg")}}]);
+app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("出错了",o.data.message):r.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("出错了",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},r.goReg=function(){t.path("/reg")}}]);
+app.controller("MyClassController",["$scope",function(o){}]);
 app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
 app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
 app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
-app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.isBind()}]},i=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",i("activities.html","ActivityController")).when("/issues/:id",i("issue_detail.html","IssueController")).when("/project_discussion/:id",i("project_discussion.html","DiscussionController")).when("/homework/:id",i("homework_detail.html","HomeworkController")).when("/course_notice/:id",i("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",i("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",i("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",i("blog_detail.html","BlogController")).when("/add_class",i("add_class.html","AddClassController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
+app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},s=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",s("activities.html","ActivityController")).when("/issues/:id",s("issue_detail.html","IssueController")).when("/project_discussion/:id",s("project_discussion.html","DiscussionController")).when("/homework/:id",s("homework_detail.html","HomeworkController")).when("/course_notice/:id",s("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",s("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",s("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",s("blog_detail.html","BlogController")).when("/add_class",s("add_class.html","AddClassController")).when("/myclass",s("myclass.html","MyClassController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index e44eb3ea2..73bd09f26 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -39,13 +39,7 @@ app.controller('ActivityController',
     };
 
     if($scope.activities.length<=0){
-        auth.isBind().then(
-            function(){
-                $scope.loadActData(0);
-            }, function errorCallback(response) {
-                $scope.alertService.showMessage("获取token出错",response);
-            }
-        );
+        $scope.loadActData(0);
     } else {
         $timeout(function(){
             window.scrollTo(0, rms.get("yoffset"));
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index 35b750e8c..1dbf804ed 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -1,6 +1,6 @@
 app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session',
     function ($scope, $http, $location, $routeParams, alertService, config, auth,session) {
-        if(auth.isBind().then(function(){
+        if(auth.get_bind().then(function(){
                 $location.path("/activities");
          }));
 
@@ -24,13 +24,9 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
 
             console.log(apiUrl + "auth");
 
-            auth.openid().then(
-                function(openid){
-                    return $http.post(
-                        config.apiUrl + "users/wxbind",
-                        {login: user.login, password: user.password, openid: openid}
-                    );
-                }
+            $http.post(
+                config.apiUrl + "users/wxbind",
+                {login: user.login, password: user.password}
             ).then(
                 function(response) {
                     console.log(response.data);
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index aefd359a8..6acf25c59 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -29,16 +29,6 @@ app.factory('alertService', function(){
 
 
 app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function($http,$routeParams, $q, session,config){
-    var _openid = '';
-
-    if(typeof g_openid !== 'undefined'){
-        _openid = g_openid;
-    }
-
-    if(!_openid){
-        _openid = session.get("openid");
-    }
-
     //是否已经绑定
     var isBind = function(){
         var defer = $q.defer();
@@ -47,12 +37,11 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function(
         if(token && token.length>10){
             defer.resolve(token);
         } else {
-            getOpenId().then(function(openid){
-                return $http.post(
-                    config.apiUrl+ 'users/isbind',
-                    {openid: openid}
-                )
-            }).then(function(response){
+            var code = window.g_code || $routeParams.code || session.get("code");
+            $http.post(
+                '/wechat/get_bind',
+                {}  ///不用传code了,都由服务器来处理
+            ).then(function(response){
                 if(response.data.status!=0){
                     defer.reject(response.data.message);
                 }else {
@@ -67,38 +56,10 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function(
         return defer.promise;
     }
 
-    var getOpenId = function() {
-        var deferred = $q.defer();
-        console.log(_openid);
-        if (typeof _openid !== 'undefined' && _openid && _openid.length > 0){
-            deferred.resolve(_openid);
-        } else {
-            var code = window.g_code || $routeParams.code || session.get("code");
-            $http({
-                url: '/wechat/get_open_id',
-                data: {code: code},
-                method: 'POST'
-            }).then(function successCallback(response) {
-                if(response.data.status != 0){
-                    deferred.reject(response.data.message);
-                } else{
-                    _openid = response.data.openid;
-                    //session.save("openid", _openid);
-                    deferred.resolve(_openid);
-                }
-            }, function errorCallback(response) {
-                deferred.reject(response);
-            });
-        }
-        return deferred.promise;
-    };
-    var openid = function(){
-        return _openid;
-    };
     var getToken = function(){
         return session.get("token");
     }
-    return {isBind: isBind, token: getToken, openid: getOpenId};
+    return {get_bind: isBind, token: getToken};
 }]);
 
 app.factory("session", function(){
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index fdfd72492..7fa5e6d74 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -2,7 +2,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
     var rootPath = config.rootPath;
     var resolve = {
         delay: ['auth',function(auth){
-            return auth.isBind();
+            return auth.get_bind();
         }]
     };
     var makeRoute = function(path, ctrl){

From 4663f48496c221e30544ece1ce7bb8f577d57217 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:13:50 +0800
Subject: [PATCH 507/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index dc1e26508..458c5024a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -14,7 +14,7 @@ class WechatsController < ActionController::Base
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
                                                                  content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!0"} }
         request.reply.news(news) do |article, n, index| # article is return object
-          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities#myclass'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
           pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/class.jpg"
           article.item title: "#{n[:title]}",
                        description: n[:content],
@@ -176,7 +176,7 @@ class WechatsController < ActionController::Base
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities#login'}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login#wechat_redirect"
       pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],

From 833c5a5ede74b391af1d25cc09f2e5ce74cd19af Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:27:23 +0800
Subject: [PATCH 508/668] .

---
 app/controllers/wechats_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 458c5024a..8a596a470 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -20,11 +20,10 @@ class WechatsController < ActionController::Base
                        description: n[:content],
                        pic_url: pic_url,
                        url: url
-        end
+        end and return
       else
-        request.reply.text "课程邀请码不正确"
+        request.reply.text "课程邀请码不正确" and return
       end
-      return
     end
     request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
   end

From 5b087179ebdeafcde9adc7c89aacf5f9aa4a18db Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:31:47 +0800
Subject: [PATCH 509/668] .

---
 app/controllers/wechats_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 8a596a470..b664c4474 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -6,7 +6,6 @@ class WechatsController < ActionController::Base
 
   # default text responder when no other match
   on :text do |request, content|
-    if content.size == 6
       #邀请码
       if join_class(content)
         root_url = "http://wechat.trustie.net"
@@ -20,12 +19,10 @@ class WechatsController < ActionController::Base
                        description: n[:content],
                        pic_url: pic_url,
                        url: url
-        end and return
+        end
       else
-        request.reply.text "课程邀请码不正确" and return
+        request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
       end
-    end
-    request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
   end
 
   # When receive 'help', will trigger this responder

From f791f372059b37284b1497aa58f99f4533beab35 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:36:46 +0800
Subject: [PATCH 510/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index b664c4474..20ef9f473 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -11,10 +11,10 @@ class WechatsController < ActionController::Base
         root_url = "http://wechat.trustie.net"
 
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
-                                                                 content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!0"} }
+                                                                 content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!"} }
         request.reply.news(news) do |article, n, index| # article is return object
           url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
-          pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/class.jpg"
+          pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/wechat/class.jpg"
           article.item title: "#{n[:title]}",
                        description: n[:content],
                        pic_url: pic_url,

From 8129e29d5ba35c8c89eb3906d1f087f60e1e96de Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 12:52:26 +0800
Subject: [PATCH 511/668] .

---
 app/controllers/wechats_controller.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 20ef9f473..b1bab6c56 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -3,18 +3,18 @@ class WechatsController < ActionController::Base
   wechat_responder
 
   include ApplicationHelper
-
+  # ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}/"
+  ROOT_URL = "http://wechat.trustie.net"
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
       if join_class(content)
-        root_url = "http://wechat.trustie.net"
 
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
                                                                  content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!"} }
         request.reply.news(news) do |article, n, index| # article is return object
-          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
-          pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/wechat/class.jpg"
+          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
+          pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
           article.item title: "#{n[:title]}",
                        description: n[:content],
                        pic_url: pic_url,
@@ -164,16 +164,14 @@ class WechatsController < ActionController::Base
   end
 
   def sendBind(request)
-    root_url = "http://wechat.trustie.net"
-
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
 我们将会与微信不断结合，为您提供更有价值的服务。
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{root_url+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login#wechat_redirect"
-      pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login#wechat_redirect"
+      pic_url = "#{ROOT_URL}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
                    pic_url: pic_url,

From b68e227531bd4adcfeb834ea08dea3cb06276b83 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 22 Jun 2016 14:04:47 +0800
Subject: [PATCH 512/668] =?UTF-8?q?=E6=B2=A1=E6=BF=80=E6=B4=BB=E7=9A=84?=
 =?UTF-8?q?=E5=B8=90=E5=8F=B7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb       |  15 +-
 app/controllers/users_controller.rb         |   6 +
 app/controllers/words_controller.rb         |  20 +++
 app/views/account/email_activation.html.erb |  52 ++++++
 config/routes.rb                            |   5 +-
 public/stylesheets/header.css               | 176 ++++++++++++++++++++
 6 files changed, 270 insertions(+), 4 deletions(-)
 create mode 100644 app/views/account/email_activation.html.erb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 33d988e35..8bf40d472 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -239,14 +239,21 @@ class AccountController < ApplicationController
 
   end
   def resendmail
+    status = 1
     user = User.find(params[:user]) if params[:user]
     token = Token.new(:user => user, :action => "register")
     if token.save
       Mailer.run.register(token)
-
     else
       yield if block_given?
+      status = 0
     end
+    render :json => status
+  end
+
+  def email_activation
+
+
   end
   private
 
@@ -264,6 +271,7 @@ class AccountController < ApplicationController
     if user.nil?
       invalid_credentials
     elsif user.status == 2
+      @user = user
       invalid_credentials_new
     elsif user.new_record?
       onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
@@ -375,8 +383,9 @@ class AccountController < ApplicationController
   
   def invalid_credentials_new
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
-    flash[:error] = l(:notice_account_invalid_creditentials_new)
-    render signin_path(:login=>true)
+    # flash[:error] = l(:notice_account_invalid_creditentials_new)
+    # render signin_path(:login=>true)
+    render :action => 'email_activation'
   end
 
   # Register a user for email activation.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 87c7d8f54..ed8a9fa36 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1239,6 +1239,12 @@ class UsersController < ApplicationController
     render :layout=>'new_base_user'
   end
 
+  #给某人留言
+  def feedBackTo
+
+
+  end
+
   def user_comments
 
   end
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 22b7f1f52..3b540f0d0 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -337,6 +337,26 @@ class WordsController < ApplicationController
     UserExtensions.introduction(user, message)
     redirect_to user_url(user.id)
   end
+
+  #邮箱激活问题留言 留言成功给出提示框
+  def leave_email_activation_message
+    status = 1 #成功
+    me = User.find(params[:user])
+    if me
+      @user = User.find(params[:id])
+      if params[:text].size>0 && @user
+          # @user.add_jour(me, params[:text])
+          #私信
+          message = "<span style='color:red;'>【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】</span><br>"+params[:text]
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+      else
+          status = 0
+      end
+      render :json => status
+    else
+      render_403
+    end
+  end
   
   private
 
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
new file mode 100644
index 000000000..abd010a96
--- /dev/null
+++ b/app/views/account/email_activation.html.erb
@@ -0,0 +1,52 @@
+<div class="new_content">
+  <div class="email_verify">
+    <p class="email_verify_prompt"><span class="icons_email_prompt"></span>您的账号尚未激活，请先进入您的注册邮箱，激活您的账号。</p>
+    <button class="email_verify_btn mt30 ml30" onclick = "resendMail('<%= resendmail_path(@user) %>','<%= @user.id %>');">重新发送激活邮件</button>
+    <%#= link_to l(:label_mail_resend), { :controller => 'account', :action => 'resendmail',:user => @user}, :class=>"email_verify_btn mt30 ml30", :remote => true, :method => 'get' %>
+    <ul class="email_prompt_txt ml30 mt30">
+      <p class="email_prompt_p">如果您尚未收到激活邮件，请按照以下步骤操作：</p>
+      <li>检查邮箱的“订阅邮件”、“垃圾邮件”，可能会发现激活邮件。 </li>
+      <li>如果激活邮件已无效，请点击重新发送激活邮件按钮。</li>
+      <li>如果您无法收到激活邮件，请您直接给我们管理员留言：</li>
+      <div class="  mt10">
+        <textarea style="resize: none;" class="email_prompt_mes" placeholder="请管理员尽快帮我解决邮箱激活问题"></textarea>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>','<%= 1 %>');">确定</button>
+        <div class="cl"></div>
+      </div>
+    </ul>
+  </div>
+</div>
+<script type="text/javascript">
+  function resendMail(url,id)
+  {
+      $.get(
+              url,
+              {user: id },
+              function (data) {
+                  console.log("1111111111");
+                  console.log(data);
+                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱，请及时登录邮箱进行验证。</p>");
+              }
+      );
+  }
+  function leave_email_activation_message(url,user,id)
+  {
+      if ($(".email_prompt_mes").val().length == 0){
+        //弹框请他输入文字
+          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;
+      }
+      $.get(
+              url,
+              {user:user,id: 1,text:$(".email_prompt_mes").val() },
+              function (data) {
+                  console.log("2222222");
+                  console.log(data);
+                  var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
+                  pop_up_box(htmlvalue,580,30,50);
+                  $(".email_prompt_mes").val("");
+              }
+      );
+  }
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index ec8fa2337..6e720ffba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -489,10 +489,13 @@ RedmineApp::Application.routes.draw do
   match 'account/activate',  :via => :get
   match 'account/valid_ajax',  :via => :get
   match 'account/email_valid', :to => 'account#email_valid', :via => :get
-  match 'account/resendmail', :to => 'account#resendmail', :via=> :get
+  match 'account/resendmail', :to => 'account#resendmail', :via=> :get, :as => 'resendmail'
   match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
   match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
 
+  #激活邮箱反馈问题
+  match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message',  :via => :get, :as => "leave_email_activation_message"
+
   # boards
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
   match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields'
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 767d76cb2..5700d0b00 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -117,3 +117,179 @@ a.f_grey:hover {color:#000000 !important;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginSignButton:hover {background-color:#297fb8;}
 #loginInButton:hover {background-color:#297fb8;}
+
+/* 邮箱验证 */
+.email_verify body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.mt30{ margin-top:30px;}
+.ml30{ margin-left:30px;}
+.new_content{
+    width:1000px;
+    margin:10px auto;
+    padding:30px 0;
+    background-color:#fff;
+}
+.email_verify{
+    width:720px;
+    margin:0px auto;
+}
+.email_verify_prompt{
+    border:2px solid #dd0000;
+    background:#ffe3e3 url(../images/icons_prompt.png) 25px 10px no-repeat;;
+    height:35px;
+    line-height:35px;
+    padding-left:45px;
+    color:#8b0000;
+    font-size:14px;
+}
+.email_verify_btn{
+    border-style:none;
+    height:35px;
+    padding:0 15px;
+    line-height:35px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_verify_btn:hover{
+    background:#017bd3;
+}
+.email_sub_btn{
+    border-style:none;
+    height:30px;
+    padding:0 25px;
+    line-height:30px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_sub_btn:hover{
+    background:#017bd3;
+}
+.email_prompt_p{
+    font-size:14px;
+    color:#000;
+    margin-bottom:10px;
+}
+.email_prompt_txt{ width:480px;}
+.email_prompt_txt li{
+    margin-left:15px;
+    list-style-type: disc;
+    color:#777;
+    line-height:1.9;
+    font-size:14px;
+}
+.email_prompt_mes{
+    border:1px solid #ccc;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    width:468px;
+    height:60px;
+    background:#fff;
+    padding:5px;
+    margin-bottom: 5px;
+}
+.email_tanbox{
+    border:2px solid #3a95d7;
+    background:#fff;
+    width:480px;
+
+}
+.email_tancon{
+    width:420px;
+    margin:0 auto;
+    text-align:center;
+    padding:20px 30px;
+    background:#fff;
+}
+.email_tan_title{
+    font-size:18px;
+    color:#3a95d7;
+    font-weight:normal;
+    margin-bottom:5px;
+}
+.email_tan_p{
+    font-size:14px;
+    color:#4c4c4c;
+
+}
+.email_verify_p{
+    font-size:14px;
+    color:#3a95d7;
+}
+
+/***** Ajax indicator ******/
+/*-------resendmail---------*/
+#ajax-indicator {
+    position: absolute; /* fixed not supported by IE */
+    background-color:#eee;
+    border: 1px solid #bbb;
+    top:35%;
+    left:40%;
+    width:20%;
+    font-weight:bold;
+    text-align:center;
+    padding:0.6em;
+    z-index:100000;
+    opacity: 0.5;
+}
+
+html>body #ajax-indicator { position: fixed; }
+
+#ajax-indicator span {
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    background-image: url(../images/loading.gif);
+    padding-left: 26px;
+    vertical-align: bottom;
+}
+
+div.modal {
+    border-radius: 5px;
+    background: #fff;
+    z-index: 50;
+    padding: 4px;
+}
+.ui-widget-content {
+    border: 1px solid #ddd;
+    color: #333;
+}
+.ui-widget {
+    font-family: Verdana, sans-serif;
+    font-size: 1.1em;
+}
+.ui-dialog .ui-dialog-content {
+    position: relative;
+    border: 0;
+    padding: .5em 1em;
+    background: none;
+    overflow: auto;
+    zoom: 1;
+}
+.ui-widget-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.ui-widget-overlay {
+    background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat;
+    opacity: .5;
+    filter: Alpha(Opacity=50);
+}
+.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;}
+a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.Blue-btn{ background:#3598db; color:#fff;}
+/***** end Ajax indicator ******/
\ No newline at end of file

From 9461c41fa72bd1aadd835cc47903cab985bad9f2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 22 Jun 2016 14:14:36 +0800
Subject: [PATCH 513/668] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E7=95=99=E8=A8=80?=
 =?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/controllers/words_controller.rb         | 3 ++-
 app/views/account/email_activation.html.erb | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 3b540f0d0..1bbbb1190 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -343,7 +343,8 @@ class WordsController < ApplicationController
     status = 1 #成功
     me = User.find(params[:user])
     if me
-      @user = User.find(params[:id])
+      #课程使者id=1
+      @user = User.find(1)
       if params[:text].size>0 && @user
           # @user.add_jour(me, params[:text])
           #私信
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index abd010a96..d625e7fc9 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -10,7 +10,7 @@
       <li>如果您无法收到激活邮件，请您直接给我们管理员留言：</li>
       <div class="  mt10">
         <textarea style="resize: none;" class="email_prompt_mes" placeholder="请管理员尽快帮我解决邮箱激活问题"></textarea>
-        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>','<%= 1 %>');">确定</button>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
         <div class="cl"></div>
       </div>
     </ul>
@@ -29,7 +29,7 @@
               }
       );
   }
-  function leave_email_activation_message(url,user,id)
+  function leave_email_activation_message(url,user)
   {
       if ($(".email_prompt_mes").val().length == 0){
         //弹框请他输入文字
@@ -39,7 +39,7 @@
       }
       $.get(
               url,
-              {user:user,id: 1,text:$(".email_prompt_mes").val() },
+              {user:user,text:$(".email_prompt_mes").val() },
               function (data) {
                   console.log("2222222");
                   console.log(data);

From 7700445c178938c23db5f0dbde9b9a8d4d6b780e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 16:42:20 +0800
Subject: [PATCH 514/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb                |  4 +-
 app/controllers/wechats_controller.rb         | 17 +++++---
 app/views/wechats/user_activities.html.erb    | 39 ++++++++++---------
 public/assets/wechat/myclass.html             | 32 +++++++++++++++
 .../javascripts/wechat/controllers/myclass.js |  8 ++++
 public/stylesheets/weui/weixin.css            |  2 +
 6 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index b585e7dae..de2e48c8e 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -97,15 +97,13 @@ module Mobile
 
         desc "加入课程"
         params do
-          optional :openid, type: String, desc: '微信ID'
+          requires :token, type: String
           requires :invite_code, type: String, desc: '邀请码'
         end
         post "join" do
           authenticate!
-
           cs = CoursesService.new
           status = cs.join_course({openid: params[:openid], invite_code: params[:invite_code]}, current_user)
-
           {
               status: status[:state],
               messsge:CoursesService::JoinCourseError.message(status[:state])
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index b1bab6c56..f6e73e088 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -8,12 +8,14 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-      if join_class(content)
-
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        sendBind()
+      elsif (course = join_class(content, uw.user)) && course
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
-                                                                 content: "课程名称: 数据结构\n班级名称: 数据结构A班\n任课老师: 尹刚\n进入班级,和小伙伴愉快的学习吧!"} }
+                                                                 content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
         request.reply.news(news) do |article, n, index| # article is return object
-          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
+          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
           pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
           article.item title: "#{n[:title]}",
                        description: n[:content],
@@ -179,8 +181,11 @@ class WechatsController < ActionController::Base
     end
   end
 
-  def join_class(content)
-    true
+  def join_class(content, user)
+    cs = CoursesService.new
+    status = cs.join_course({invite_code: content.trim}, current_user)
+    logger.info status
+    status[:state] == 0 ? status[:course] : nil
   end
 
   ###  controller method
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index f920aed4b..b5bd82fc5 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -25,25 +25,26 @@
 
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
 <!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
-<script src="/javascripts/wechat/build/app.min.js"></script>
-<!--<script src="/javascripts/wechat/app.js"></script>-->
-<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
-<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/add_class.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
-<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
+<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
+<script src="/javascripts/wechat/app.js"></script>
+<script src="/javascripts/wechat/others/factory.js"></script>
+<script src="/javascripts/wechat/others/filter.js"></script>
+<script src="/javascripts/wechat/directives/alert.js"></script>
+<script src="/javascripts/wechat/directives/form_validate.js"></script>
+<script src="/javascripts/wechat/directives/input_auto.js"></script>
+<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
+<script src="/javascripts/wechat/controllers/reg.js"></script>
+<script src="/javascripts/wechat/controllers/login.js"></script>
+<script src="/javascripts/wechat/controllers/activity.js"></script>
+<script src="/javascripts/wechat/controllers/add_class.js"></script>
+<script src="/javascripts/wechat/controllers/blog.js"></script>
+<script src="/javascripts/wechat/controllers/course_notice.js"></script>
+<script src="/javascripts/wechat/controllers/discussion.js"></script>
+<script src="/javascripts/wechat/controllers/homework.js"></script>
+<script src="/javascripts/wechat/controllers/issue.js"></script>
+<script src="/javascripts/wechat/controllers/journals.js"></script>
+<script src="/javascripts/wechat/controllers/myclass.js"></script>
+<script src="/javascripts/wechat/others/routes.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/myclass.html
index e69de29bb..25d29008a 100644
--- a/public/assets/wechat/myclass.html
+++ b/public/assets/wechat/myclass.html
@@ -0,0 +1,32 @@
+<div class="post-container">
+    <div class="class-detail-name">分布式计算环境A班<span class="f13 blue-title-sub">邀请码</span></div>
+    <div class="slice3 fl"></div>
+    <div id="class_tab_1" ng-class="['class-detail-tab3',{'class-tab-active':currentTab==1}]" ng-click="tab(1);"><a herf="javascript:void(0);">课堂资源</a></div>
+    <div class="slice2 fl">
+        <div class="slice-line2"></div>
+    </div>
+    <div id="class_tab_2" ng-class="['class-detail-tab3',{'class-tab-active':currentTab==2}]" ng-click="tab(2);"><a herf="javascript:void(0);">我的同学</a></div>
+    <div class="slice3 fl"></div>
+    <div class="cl"></div>
+    <div class="class-search-wrap">
+        <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
+            <input class="class-detail-search" placeholder="输入关键词进行搜索" />
+        </div>
+    </div>
+    <div ng-class="{'undis': currentTab!=1}">
+        <div class="class-detail-row border-top f13 c-grey3"><span class="fl ml10">资源名称001</span></div>
+        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称002</span></div>
+        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称003</span></div>
+        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称004</span></div>
+        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称005</span></div>
+        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称006</span></div>
+    </div>
+    <div ng-class="{'undis': currentTab!=2}">
+        <div class="member-banner f13 c-grey3">授课老师</div>
+        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">jacknudt</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
+        <div class="member-banner f13 mt10 c-grey3">我的同学</div>
+        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">jingquan</span><span class="fr mr10 c-grey2">教辅</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
+        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">yuanke</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
+        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/female.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">sasameimei</span><img src="/images/wechat/female.png" width="15" class="fl ml10 mt10" /></div>
+    </div>
+</div>
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/myclass.js
index f6cd77e17..cb5cf9037 100644
--- a/public/javascripts/wechat/controllers/myclass.js
+++ b/public/javascripts/wechat/controllers/myclass.js
@@ -1,3 +1,11 @@
 app.controller('MyClassController', ['$scope', function($scope){
 
+    var vm = $scope;
+
+    vm.currentTab = 1;
+    vm.tab = function(index){
+       vm.currentTab = index;
+        console.log(vm.currentTab);
+    }
+
 }]);
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ab8081173..12e11b5fa 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -142,6 +142,7 @@ a.underline {text-decoration:underline;}
 .slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
 .class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
 .class-detail-tab2 {width:32%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-detail-tab3 {width:48%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
 .class-tab-active {border-bottom:1px solid #3b94d6;}
 .class-search-wrap {padding:8px 12px; position:relative;}
 .class-search-inner {padding:0 30px; background-color:#fff;}
@@ -151,6 +152,7 @@ a.underline {text-decoration:underline;}
 .class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;}
 .class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
 .img-circle {border-radius:50%;}
+.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
 
 /*20160614班级列表*/
 .course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}

From 0929d2ac284a8623d47dffe0d74229d7ea9bfe4e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 16:48:34 +0800
Subject: [PATCH 515/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index f6e73e088..2cb114a56 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -183,7 +183,7 @@ class WechatsController < ActionController::Base
 
   def join_class(content, user)
     cs = CoursesService.new
-    status = cs.join_course({invite_code: content.trim}, current_user)
+    status = cs.join_course({invite_code: content.strip}, current_user)
     logger.info status
     status[:state] == 0 ? status[:course] : nil
   end

From 40217d5c564aba1bf9ead1bba534f579156fc337 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 16:57:01 +0800
Subject: [PATCH 516/668] .

---
 app/controllers/wechats_controller.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 2cb114a56..7e87d353c 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -8,6 +8,7 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
+    begin
       uw = user_binded?(request[:FromUserName])
       if !uw
         sendBind()
@@ -25,6 +26,9 @@ class WechatsController < ActionController::Base
       else
         request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
       end
+    rescue => e
+      request.reply.text e
+    end
   end
 
   # When receive 'help', will trigger this responder
@@ -183,9 +187,12 @@ class WechatsController < ActionController::Base
 
   def join_class(content, user)
     cs = CoursesService.new
-    status = cs.join_course({invite_code: content.strip}, current_user)
+    status = cs.join_course({invite_code: content.upcase.strip}, current_user)
     logger.info status
-    status[:state] == 0 ? status[:course] : nil
+    if status[:state] != 0
+      raise CoursesService::JoinCourseError.message(status[:state])
+    end
+    status[:course]
   end
 
   ###  controller method

From fc5895e74f314622a4564ebbde5994b05b8b9ca2 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 17:02:33 +0800
Subject: [PATCH 517/668] .

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

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 93529f57c..4d9231287 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -334,7 +334,7 @@ class CoursesService
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
           roleName = member.roles[0].name if member
-          if params[:course_password] == course.password
+          if params[:course_password] == course.password || params[:invite_code].present?
             #如果加入角色为学生 并且当前是学生
             if params[:role] == "10" && roleName == "Student"
               @state = 3
@@ -367,7 +367,7 @@ class CoursesService
             @state = 1
           end
         else
-          if params[:course_password] == course.password
+          if params[:course_password] == course.password || params[:invite_code].present?
             if params[:role] == "10" || params[:role] == nil
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)

From 9b42b4e7f739a79459f58a44bef82787b8f2cf88 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 17:04:01 +0800
Subject: [PATCH 518/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 7e87d353c..94b02d082 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -16,7 +16,7 @@ class WechatsController < ActionController::Base
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
                                                                  content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
         request.reply.news(news) do |article, n, index| # article is return object
-          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
+          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
           pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
           article.item title: "#{n[:title]}",
                        description: n[:content],

From 1470cafe57ad6a02f7bcb58ad3f3607a4b5fd465 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 17:09:49 +0800
Subject: [PATCH 519/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 94b02d082..30e2be847 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -187,7 +187,7 @@ class WechatsController < ActionController::Base
 
   def join_class(content, user)
     cs = CoursesService.new
-    status = cs.join_course({invite_code: content.upcase.strip}, current_user)
+    status = cs.join_course({invite_code: content.upcase.strip}, user)
     logger.info status
     if status[:state] != 0
       raise CoursesService::JoinCourseError.message(status[:state])

From ce6e6116b5836819c65338cb1739ad3a7d8678db Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 22 Jun 2016 17:09:54 +0800
Subject: [PATCH 520/668] get data from sonar API

---
 .../quality_analysis_controller.rb            | 25 ++++++++++++++-----
 app/models/quality_analysis.rb                |  2 +-
 app/models/sonar_analysis.rb                  |  3 +++
 app/views/quality_analysis/index.html.erb     | 13 +++++++---
 app/views/quality_analysis/show.html.erb      |  0
 ...20160622033322_create_quality_analyses.rb} |  0
 ...4138_add_jk_version_to_quality_analysis.rb |  5 ++++
 db/schema.rb                                  |  8 +++---
 8 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 app/models/sonar_analysis.rb
 create mode 100644 app/views/quality_analysis/show.html.erb
 rename db/migrate/{20160622015019_create_quality_analyses.rb => 20160622033322_create_quality_analyses.rb} (100%)
 create mode 100644 db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 1cf38308e..6be51da70 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -8,7 +8,7 @@ class QualityAnalysisController < ApplicationController
   require 'json'
   require 'open-uri'
 
-  def new
+  def show
 
   end
 
@@ -24,9 +24,11 @@ class QualityAnalysisController < ApplicationController
     language = params[:language]
     path = params[:path]
     identifier = params[:identifier]
+    qa = QualityAnalysis.where(:project_id => @project.id).first
+    version = qa.sonar_version + 1
     properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
-        sonar.projectVersion=1.0
+        sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
@@ -43,13 +45,24 @@ class QualityAnalysisController < ApplicationController
     # relace gitlab hook
     # genkins address
     @g.add_project_hook(@project.gpid,"http://123.59.135.93:8890/project/#{user_name}_#{identifier}")
-    QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier)
+    if qa.nil?
+      QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :version => version)
+    else
+      qa.update_attribute(:version, version)
+    end
   end
 
   def index
-    data = open('http://123.59.135.93:8891/api/resources/index?resource=my:project985&depth=-1&metrics=complexity,class_complexity,lines,comment_lines,blocker_violations').read
-    @cc =JSON.parse(data)
-
+    if params[:name].nil?
+      @name_flag = true
+      projects_date = open("http://123.59.135.93:8891/api/projects/index").read
+      @results = JSON.parse(projects_date)
+    else
+      @name_flag = false
+      project_key = params[:name]
+      data = open("http://123.59.135.93:8891/api/resources/index?resource=#{project_key}&depth=-1&metrics=complexity,class_complexity,lines,comment_lines,blocker_violations").read
+      @cc =JSON.parse(data)
+    end
   end
 
   # Find project of id params[:project_id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 45778ff3f..09803467e 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,3 +1,3 @@
 class QualityAnalysis < ActiveRecord::Base
-  attr_accessible :author_login, :project_id, :rep_identifier
+  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version
 end
diff --git a/app/models/sonar_analysis.rb b/app/models/sonar_analysis.rb
new file mode 100644
index 000000000..0bb2089de
--- /dev/null
+++ b/app/models/sonar_analysis.rb
@@ -0,0 +1,3 @@
+class SonarAnalysis < ActiveRecord::Base
+  attr_accessible :author_login, :project_id, :rep_identifier
+end
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 1f70644db..627d33d96 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,3 +1,10 @@
-<% @cc.each do |c| %>
-    <%= c %>
-<% end %>
\ No newline at end of file
+<% if @name_flag %>
+    <%= @results.each do |result| %>
+        <p>
+          <%=link_to result["k"], project_quality_analysis_path(:name => result["k"]) %>
+        </p>
+    <% end %>
+<% else %>
+    <%= @cc %>
+<% end %>
+
diff --git a/app/views/quality_analysis/show.html.erb b/app/views/quality_analysis/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/db/migrate/20160622015019_create_quality_analyses.rb b/db/migrate/20160622033322_create_quality_analyses.rb
similarity index 100%
rename from db/migrate/20160622015019_create_quality_analyses.rb
rename to db/migrate/20160622033322_create_quality_analyses.rb
diff --git a/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
new file mode 100644
index 000000000..838d6d896
--- /dev/null
+++ b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
@@ -0,0 +1,5 @@
+class AddJkVersionToQualityAnalysis < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :sonar_version, :integer, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 51e0682d0..01a001769 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 => 20160622015019) do
+ActiveRecord::Schema.define(:version => 20160622074138) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1837,8 +1837,10 @@ ActiveRecord::Schema.define(:version => 20160622015019) do
     t.integer  "project_id"
     t.string   "author_login"
     t.string   "rep_identifier"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.float    "version",        :default => 0.0
+    t.integer  "sonar_version",  :default => 1
   end
 
   create_table "queries", :force => true do |t|

From d466b09f3f3cdbfab9d27b1865cb652f05a69000 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 22 Jun 2016 17:20:34 +0800
Subject: [PATCH 521/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 30e2be847..d6ab11f92 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -11,11 +11,11 @@ class WechatsController < ActionController::Base
     begin
       uw = user_binded?(request[:FromUserName])
       if !uw
-        sendBind()
+        return sendBind()
       elsif (course = join_class(content, uw.user)) && course
         news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
                                                                  content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
-        request.reply.news(news) do |article, n, index| # article is return object
+        return request.reply.news(news) do |article, n, index| # article is return object
           url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
           pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
           article.item title: "#{n[:title]}",
@@ -24,10 +24,10 @@ class WechatsController < ActionController::Base
                        url: url
         end
       else
-        request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
+        return request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
       end
     rescue => e
-      request.reply.text e
+      return request.reply.text e
     end
   end
 

From 9f15a8aa4e41d0d19f86447be297669d5a08f81e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 22 Jun 2016 17:40:13 +0800
Subject: [PATCH 522/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality_analysis/_result_list.html.erb    |   0
 app/views/quality_analysis/_show.html.erb     | 148 ++++++++++++++++++
 app/views/quality_analysis/index.html.erb     |   2 +-
 .../repositories/_quality_analysis.html.erb   |  32 +++-
 public/images/code-analysis-icon.png          | Bin 0 -> 1682 bytes
 public/stylesheets/project.css                |  22 +++
 public/stylesheets/public.css                 |   3 +
 7 files changed, 199 insertions(+), 8 deletions(-)
 create mode 100644 app/views/quality_analysis/_result_list.html.erb
 create mode 100644 app/views/quality_analysis/_show.html.erb
 create mode 100644 public/images/code-analysis-icon.png

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
new file mode 100644
index 000000000..4cb86f22c
--- /dev/null
+++ b/app/views/quality_analysis/_show.html.erb
@@ -0,0 +1,148 @@
+<div style="min-height: 687px;" id="RSide" class="fl">
+  <div class="project_r_h">
+    <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
+  </div>
+  <div class="repositorytitle mr15">
+    <form accept-charset="UTF-8" action="/projects/2/repository" class="fl c_grey02 ml5" id="revision_selector" method="get">
+      <!-- Branches Dropdown -->
+      分支:
+      <select id="branch" name="branch">
+        <option value=""></option>
+        <option value="Branch_szzh">Branch_szzh</option>
+        <option value="CourseModify">CourseModify</option>
+        <option value="GitlabVersion">GitlabVersion</option>
+        <option value="Homework">Homework</option>
+        <option value="Poll">Poll</option>
+        <option value="alan_competition">alan_competition</option>
+        <option value="api">api</option>
+        <option value="competition">competition</option>
+        <option value="course_group">course_group</option>
+        <option value="dev_chuangbin">dev_chuangbin</option>
+        <option value="dev_cxt2">dev_cxt2</option>
+        <option value="dev_dingxu">dev_dingxu</option>
+        <option value="dev_hjq">dev_hjq</option>
+        <option value="dev_repository_hjq">dev_repository_hjq</option>
+        <option value="dev_zanle">dev_zanle</option>
+        <option value="develop">develop</option>
+        <option value="email_verify">email_verify</option>
+        <option value="enterprise">enterprise</option>
+        <option value="exceptionHandle">exceptionHandle</option>
+        <option value="gitlab">gitlab</option>
+        <option value="gitlab_guange">gitlab_guange</option>
+        <option value="guange_dev">guange_dev</option>
+        <option value="guange_homework">guange_homework</option>
+        <option value="master" selected="selected">master</option>
+        <option value="memcached_alan">memcached_alan</option>
+        <option value="ouyang">ouyang</option>
+        <option value="ouyangxuhua">ouyangxuhua</option>
+        <option value="president">president</option>
+        <option value="redis_cache">redis_cache</option>
+        <option value="shapgroup">shapgroup</option>
+        <option value="sw_new_course">sw_new_course</option>
+        <option value="szzh">szzh</option>
+        <option value="yutao">yutao</option>
+        <option value="zh">zh</option>
+      </select>
+    </form>
+  </div>
+  <a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">开始分析</a>
+  <div class="cl"></div>
+  <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
+  <div class="analysis-block mt10 mb40 flex f14">
+    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
+      <p class="fontGrey3 mt15">质量等级</p>
+      <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+    </div>
+    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
+      <p class="fontGrey3 mt15">复杂度</p>
+      <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+    </div>
+    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
+      <p class="fontGrey3 mt15">重复</p>
+      <p class="fontBlue2 pr">44%<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+    </div>
+    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
+      <p class="fontGrey3 mt15">注释率</p>
+      <p class="fontBlue2 pr">12%<span class="f8 c_white analysis-genral-icon b_red borderRadius">偏低</span></p>
+    </div>
+  </div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;">2</span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量中等</span></span></div>
+  <div class="analysis-block mt10 mb40 f14">
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline">14天</span><span class="fontGrey2">查看详情</span></div>
+    <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline">130</span><span class="fontGrey2">问题分类如下：</span></div>
+    <div class="ml90 mt15">
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline">4</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline">75</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline">428</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline">225</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline">114</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+    </div>
+  </div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red">规模中等</span></span></div>
+  <div class="analysis-block mt10 mb40 flex f14">
+    <div class="analysis-genral">
+      <p class="fontGrey3">代码行数</p>
+      <p class="fontBlue2">9,337</p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">文件</p>
+      <p class="fontBlue2">10</p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">目录</p>
+      <p class="fontBlue2">6</p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">类</p>
+      <p class="fontBlue2">15</p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">方法</p>
+      <p class="fontBlue2">36</p>
+    </div>
+  </div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>
+  <div class="analysis-block mt10 f12">
+    <ul class="contribute-list">
+      <li class="fl fontGrey2 contribute-list-avatar">&nbsp;</li>
+      <li class="fl fontGrey2 contribute-list-code">代码行数</li>
+      <li class="fl fontGrey2 contribute-list-problem">引入质量问题数</li>
+      <li class="fl fontGrey2 contribute-list-rate">引入质量问题数/代码行数</li>
+      <div class="cl"></div>
+    </ul>
+    <ul class="contribute-list">
+      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
+        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
+          <p class="fontGrey2 hidden">小明</p>
+        </div>
+      </li>
+      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">18340</li>
+      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">230</li>
+      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.012540</li>
+      <div class="cl"></div>
+    </ul>
+    <ul class="contribute-list">
+      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
+        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
+          <p class="fontGrey2 hidden">小王</p>
+        </div>
+      </li>
+      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">834</li>
+      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">34</li>
+      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.04077</li>
+      <div class="cl"></div>
+    </ul>
+    <ul class="contribute-list">
+      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
+        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
+          <p class="fontGrey2 hidden">小亮</p>
+        </div>
+      </li>
+      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">134</li>
+      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">10</li>
+      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.07462</li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 627d33d96..3ce1a8e4a 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -5,6 +5,6 @@
         </p>
     <% end %>
 <% else %>
-    <%= @cc %>
+    <%= render "show" %>
 <% end %>
 
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index 64dd837b7..bf1b9ea41 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,7 +1,25 @@
-<%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %>
-    <textarea  id="path_description" name="path" rows="8" placeholder="目录相当于根目录，用半逗号隔开。如：src/main/java,libs"></textarea>
-    <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
-    <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %>
-    <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">确定</a></div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
-<% end %>
\ No newline at end of file
+<div class="popupWrap w800"> <a href="javascript:void(0);" class="popupClose"></a>
+  <div class="f16 fb fontBlue mb10">代码质量分析</div>
+  <div>
+    <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+      <div class="ui form">
+        <div class="mb10" style="margin-right:13px;">
+          <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+        <div class="cl"></div>
+      </div>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/public/images/code-analysis-icon.png b/public/images/code-analysis-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..18869da0e413a92e76acb80a4b2fa2c7ea4dbb62
GIT binary patch
literal 1682
zcmb_dX;2eq7~Y0)ro$AgGCH1}HC7u?a*{|=!j(-Vl|)S97!O*OWQ9mJ8#fCi(5l6Q
zqUdz2C~8I9A0BmTbwKKfU=>mEsMRq;00Y`01T-9iNgyQY1_Aq{^jE*x{jPbQ=Y78S
zdv~@tRlXuDbZ#gB0AbQ(NI{M>$hYYI5VBuZJyc2#a|p4TP-2^iJQzoSL@kzqfKn9B
zL=*_DwQOlXVgVq8s#B>6wJb%T!B9FJ#L&&Ckz@lvY`obBYqAjn%s?`A1|hY#`Wh9~
zX@%6aTp3el6d_r<<a``a=F3%@{A>+hOO1~MW6c6m07VEGG^2WhNnjRIM|B0{Jh;uE
zf};>3TS$FtN-awTMHr5NTskL8!(_2Q9*@q7=JI%~Wgwf$Vl$ZJ!;4}?3%EQ1dpS7P
zsAM!;yGfvcBxAA2m5`c65Jmxmk(ZZ8&*RWBJd?rV^Z7vyHam($M42oG0yak(OpC@9
zAjG7>bw)ym8Ni?-oPp&KLMrL>?GaGpgsj0dmL@V`3^QzGu;|R-k;Z{C*?&V(bOLQ6
z6v#Wj|0--!S&RrnftauyTti;mrbWR}Mu7-NU;@Kc7^WZ3VrmvfV5Th02#S<EkhWH5
z&|-O}h*7*uCXgCT1Z>bCQb<T873eyhR={1(ispzRE+-~BiNzB0Vq%y{F<d5_9V6!Q
zB+<-qE`(`vP{crtbG7fdyh*viQb3JlWC+1^xrkPRV<<R!WPxsSFPusB#<<$ay+lvS
zWsqhV!HfOJMUQWh)f1dflr6cKD15{~Ry$6Xbs>E5CHYB=q^79E{WaGEet&a!z1P_@
zJmPMWud~COeQu9UqBwdBF29p?_Mv5PsAr`A^>A0Wl_%;sU+Fk-q`T}yi}Le*wJB~}
zbFZtz@AtnM>ig~K@!pEd0iW-{^)<KKPIvArt+W3a2>AQm-EGbXuRSjZ>hHAoS*?y5
zug`P$`MHC2>fsli1D;on2`Np|HN%cB|Im=%?`ssTay@B$+;Mrhv#V8Wc!uT{UzH3#
zeEcU~aOma+k9V+r+it(tYfDx($<$W9_^+>a^|>7#eYPj0y*KRx4G)Gp90ML_W8BKu
zH*U4U+1}p1{%du9@5u9>KZ>eFPdEvI(YE9E2|Jkw6`_zT-|qacJ)m^sj{xAkaw(Lk
zGB>{}U5njdPTO7qmLzQ7X=Q&FF=ah%$`yBOU7SC#t!u%SlGSbIGwVy0#Qu1@bbtJY
zM@!n0yy83e#nh(C!oje(Fxg>Ro#l(7xXvTfoN(d?&nQKe3H;5J*@|-sUeDIkb)2c0
zlp2MVzY(sTMO*23R<?AX?&z0}gR-wr?hZem8rH73lzw*Uxrz@d%Dob9_*T0lu(+j%
z*86+QejzYF?WZbxY!53vjTUudMS4h_<)cy>RsfXyXsZuZi(;3=^0J?X%BQ|qV0EQm
zsPu(bS$?@avt^0hsfs+cv3CA+AcNDAtUqSE@0w>TFG{)SGZcJZ;JSC!2`07tu<m)T
zu3%xiD!e#fnV9`jKUczn7EUio-O*s1b>^;M)y!Lw@}fDE#kPopk)<=#%OX}kEu3-S
zGL$1J`9`m2XFz4)txmT5N?HnH`E{@4!p;Y2^;MdWzuR3=S#!qOF#EKVcd8${6vo7k
z4ecBe)#u*Z6LRzC4fQVJx9e%NDj&s139Z#%g<rLYpWJn2-X8SYc5a~Abr=W%HWt>a
Tpie)c2mcaMu^c*|lwSBZiC*=^

literal 0
HcmV?d00001

diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 90a94b52f..0774fa892 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1246,3 +1246,25 @@ a.pages-big{ width:50px;}
 
 .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;}
+
+/*20160622质量分析*/
+.analysis-tag-wrap {width:100%; color:#000; height:20px; line-height:20px; vertical-align:middle;}
+.analysis-tag {width:10px; height:20px; background-color:#777;}
+.analysis-block {padding:15px; border:1px solid #d9d9d9;}
+.flex {display:flex;}
+.analysis-genral {flex:1; display:block; text-align:center;}
+.analysis-block-icon {background:url(../images/code-analysis-icon.png) -2px -8px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-serious-icon {background:url(../images/code-analysis-icon.png) -2px -34px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-main-icon {background:url(../images/code-analysis-icon.png) -2px -59px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-secondary-icon {background:url(../images/code-analysis-icon.png) -2px -85px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-info-icon {background:url(../images/code-analysis-icon.png) -2px -111px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.quality-percentage {width:320px; height:14px; display:inline-block;}
+.quality-percentage-rate {width:50%; height:14px; background-color:#0a6c99; display:inline-block;}
+.image-cir {border-radius:50%;}
+.analysis-genral-icon {position:absolute; padding:1px 5px; display:inline-block; top:5px;}
+.contribute-list-avatar {width:80px; vertical-align:middle; text-align:center;}
+.contribute-list-code {width:160px; vertical-align:middle; text-align:center;}
+.contribute-list-problem {width:170px; vertical-align:middle; text-align:center;}
+.contribute-list-rate {width:228px; vertical-align:middle; text-align:center;}
+.contribute-list-height {height:80px;}
+.contribute-list-line-height {line-height:80px;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9306fa0b..e33ac601e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1161,3 +1161,6 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .shadowbox_news_list li:hover{ background-color:#eee;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+
+/*20160622代码分析弹窗*/
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}

From 3fe5d9a1a31d164cd12376a4524ac9b5d218e97b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 23 Jun 2016 11:24:58 +0800
Subject: [PATCH 523/668] get date froma sonar

---
 .../quality_analysis_controller.rb            |  8 +--
 app/views/quality_analysis/_show.html.erb     | 70 +++++--------------
 app/views/quality_analysis/index.html.erb     |  2 +-
 .../repositories/_quality_analysis.html.erb   | 12 ++--
 .../repositories/quality_analysis.js.erb      |  2 +-
 5 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 6be51da70..fd000aa72 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -53,15 +53,15 @@ class QualityAnalysisController < ApplicationController
   end
 
   def index
-    if params[:name].nil?
+    if params[:resource_id].nil?
       @name_flag = true
       projects_date = open("http://123.59.135.93:8891/api/projects/index").read
       @results = JSON.parse(projects_date)
     else
       @name_flag = false
-      project_key = params[:name]
-      data = open("http://123.59.135.93:8891/api/resources/index?resource=#{project_key}&depth=-1&metrics=complexity,class_complexity,lines,comment_lines,blocker_violations").read
-      @cc =JSON.parse(data)
+      resource_id = params[:resource_id]
+      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=139&depth=0&metrics=complexity,function_complexity,class_complexity,file_complexity,lines,file_line,files,functions,classes,directories").read
+      @complexity =JSON.parse(complexity_date).first
     end
   end
 
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 4cb86f22c..46a5e2e3d 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,51 +1,20 @@
-<div style="min-height: 687px;" id="RSide" class="fl">
+<p> lines: <%= @complexity["msr"][0]["frmt_val"] %></p>
+<p> files: <%= @complexity["msr"][2]["frmt_val"] %></p>
+<p> directories: <%= @complexity["msr"][3]["frmt_val"] %></p>
+<p> classes: <%= @complexity["msr"][1]["frmt_val"] %></p>
+<p> function: <%= @complexity["msr"][4]["frmt_val"] %></p>
+<p> total Complexity: <%= @complexity["msr"][5]["frmt_val"] %></p>
+<p>file_complexity: <%=  @complexity["msr"][6]["frmt_val"] %></p>
+<p>class_complexity: <%=  @complexity["msr"][7]["frmt_val"] %></p>
+<p>function_complexity: <%=  @complexity["msr"][8]["frmt_val"] %></p>
+
+
+
+
   <div class="project_r_h">
     <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
   </div>
-  <div class="repositorytitle mr15">
-    <form accept-charset="UTF-8" action="/projects/2/repository" class="fl c_grey02 ml5" id="revision_selector" method="get">
-      <!-- Branches Dropdown -->
-      分支:
-      <select id="branch" name="branch">
-        <option value=""></option>
-        <option value="Branch_szzh">Branch_szzh</option>
-        <option value="CourseModify">CourseModify</option>
-        <option value="GitlabVersion">GitlabVersion</option>
-        <option value="Homework">Homework</option>
-        <option value="Poll">Poll</option>
-        <option value="alan_competition">alan_competition</option>
-        <option value="api">api</option>
-        <option value="competition">competition</option>
-        <option value="course_group">course_group</option>
-        <option value="dev_chuangbin">dev_chuangbin</option>
-        <option value="dev_cxt2">dev_cxt2</option>
-        <option value="dev_dingxu">dev_dingxu</option>
-        <option value="dev_hjq">dev_hjq</option>
-        <option value="dev_repository_hjq">dev_repository_hjq</option>
-        <option value="dev_zanle">dev_zanle</option>
-        <option value="develop">develop</option>
-        <option value="email_verify">email_verify</option>
-        <option value="enterprise">enterprise</option>
-        <option value="exceptionHandle">exceptionHandle</option>
-        <option value="gitlab">gitlab</option>
-        <option value="gitlab_guange">gitlab_guange</option>
-        <option value="guange_dev">guange_dev</option>
-        <option value="guange_homework">guange_homework</option>
-        <option value="master" selected="selected">master</option>
-        <option value="memcached_alan">memcached_alan</option>
-        <option value="ouyang">ouyang</option>
-        <option value="ouyangxuhua">ouyangxuhua</option>
-        <option value="president">president</option>
-        <option value="redis_cache">redis_cache</option>
-        <option value="shapgroup">shapgroup</option>
-        <option value="sw_new_course">sw_new_course</option>
-        <option value="szzh">szzh</option>
-        <option value="yutao">yutao</option>
-        <option value="zh">zh</option>
-      </select>
-    </form>
-  </div>
-  <a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">开始分析</a>
+  <a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">branch:master</a>
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
@@ -83,23 +52,23 @@
   <div class="analysis-block mt10 mb40 flex f14">
     <div class="analysis-genral">
       <p class="fontGrey3">代码行数</p>
-      <p class="fontBlue2">9,337</p>
+      <p class="fontBlue2"><%= @complexity["msr"][0]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">文件</p>
-      <p class="fontBlue2">10</p>
+      <p class="fontBlue2"><%= @complexity["msr"][2]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">目录</p>
-      <p class="fontBlue2">6</p>
+      <p class="fontBlue2"><%= @complexity["msr"][3]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">类</p>
-      <p class="fontBlue2">15</p>
+      <p class="fontBlue2"><%= @complexity["msr"][1]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">方法</p>
-      <p class="fontBlue2">36</p>
+      <p class="fontBlue2"><%= @complexity["msr"][4]["frmt_val"] %></p>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>
@@ -145,4 +114,3 @@
       <div class="cl"></div>
     </ul>
   </div>
-</div>
\ No newline at end of file
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 3ce1a8e4a..e8fd5f8e2 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,7 +1,7 @@
 <% if @name_flag %>
     <%= @results.each do |result| %>
         <p>
-          <%=link_to result["k"], project_quality_analysis_path(:name => result["k"]) %>
+          <%=link_to result["k"], project_quality_analysis_path(:resource_id => result["id"]) %>
         </p>
     <% end %>
 <% else %>
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index bf1b9ea41..7f6ab7ea1 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,7 +1,6 @@
-<div class="popupWrap w800"> <a href="javascript:void(0);" class="popupClose"></a>
-  <div class="f16 fb fontBlue mb10">代码质量分析</div>
-  <div>
-    <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+<div class="f16 fb fontBlue mb10">代码质量分析</div>
+<div>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
@@ -20,6 +19,5 @@
         <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
         <div class="cl"></div>
       </div>
-    <% end %>
-  </div>
-</div>
\ No newline at end of file
+  <% end %>
+</div>
diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb
index c9427c246..eff2825f6 100644
--- a/app/views/repositories/quality_analysis.js.erb
+++ b/app/views/repositories/quality_analysis.js.erb
@@ -2,7 +2,7 @@ $('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/q
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","20%").css("left","30%").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");
 
 

From ad6e3c3364726eaffc3ddfe3f320268e319c8782 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jun 2016 13:52:03 +0800
Subject: [PATCH 524/668] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/show.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 1e874544a..d3ffdb5b9 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,8 +2,11 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
-
+  <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+      <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
+  <% else %>
+      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+  <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

From 723540044d30d500f4c9be084ff21ae77e1a0ea6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jun 2016 13:59:45 +0800
Subject: [PATCH 525/668] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality_analysis/_result_list.html.erb    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index e69de29bb..114c054a3 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -0,0 +1,39 @@
+<div style="min-height: 687px;" id="RSide" class="fl">
+  <div class="project_r_h">
+    <h2 class="project_h2">分析结果</h2>
+  </div>
+  <ul class="analysis-result-list">
+    <li class="analysis-result-name fl fontBlue2" title="Name">NAME</li>
+    <li class="analysis-result-version fl fontBlue2" title="Version">VERSION</li>
+    <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
+    <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
+    <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="analysis-result-list b_grey">
+    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="analysis-result-list">
+    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="analysis-result-list b_grey">
+    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+    <div class="cl"></div>
+  </ul>
+
+</div>
+<div style="clear:both;"></div>
\ No newline at end of file

From 8438bc7bcd81037abb9ba5005f89c9ca1bb420c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 23 Jun 2016 14:31:23 +0800
Subject: [PATCH 526/668] somethint to added

---
 .../quality_analysis/_result_list.html.erb    | 45 +++++--------------
 app/views/quality_analysis/index.html.erb     |  6 +--
 app/views/repositories/show.html.erb          |  2 +-
 public/stylesheets/project.css                | 13 +++++-
 4 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 114c054a3..4008bf6e5 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -2,38 +2,15 @@
   <div class="project_r_h">
     <h2 class="project_h2">分析结果</h2>
   </div>
-  <ul class="analysis-result-list">
-    <li class="analysis-result-name fl fontBlue2" title="Name">NAME</li>
-    <li class="analysis-result-version fl fontBlue2" title="Version">VERSION</li>
-    <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
-    <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
-    <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
-    <div class="cl"></div>
-  </ul>
-  <ul class="analysis-result-list b_grey">
-    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-    <div class="cl"></div>
-  </ul>
-  <ul class="analysis-result-list">
-    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-    <div class="cl"></div>
-  </ul>
-  <ul class="analysis-result-list b_grey">
-    <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-    <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-    <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-    <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-    <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-    <div class="cl"></div>
-  </ul>
-
+  <% @results.each do |result| %>
+      <ul class="analysis-result-list">
+        <li title="Name"><%=link_to result["k"], project_quality_analysis_path(:resource_id => result["id"]), :class => "analysis-result-name fl fontBlue2" %></li>
+        <li class="analysis-result-version fl fontBlue2" title="Version">1.0</li>
+        <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
+        <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
+        <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
+        <div class="cl"></div>
+      </ul>
+  <% end %>
 </div>
-<div style="clear:both;"></div>
\ No newline at end of file
+
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index e8fd5f8e2..9b06e6483 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,9 +1,5 @@
 <% if @name_flag %>
-    <%= @results.each do |result| %>
-        <p>
-          <%=link_to result["k"], project_quality_analysis_path(:resource_id => result["id"]) %>
-        </p>
-    <% end %>
+    <%= render :partial => "result_list" %>
 <% else %>
     <%= render "show" %>
 <% end %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index d3ffdb5b9..c639bcb6e 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,7 +5,7 @@
   <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
   <% else %>
-      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fr" %>
   <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 0774fa892..0d1c4fe85 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1267,4 +1267,15 @@ a.pages-big{ width:50px;}
 .contribute-list-problem {width:170px; vertical-align:middle; text-align:center;}
 .contribute-list-rate {width:228px; vertical-align:middle; text-align:center;}
 .contribute-list-height {height:80px;}
-.contribute-list-line-height {line-height:80px;}
\ No newline at end of file
+.contribute-list-line-height {line-height:80px;}
+
+/*20160623分析结果*/
+.analysis-result-list {padding:5px;}
+.analysis-result-list:nth-of-type(odd){background:#fff;}/*奇数行*/
+.analysis-result-list:nth-of-type(even){background:#f5f5f5;}/*偶数行*/
+.analysis-result-name {width:200px; cursor:pointer;}
+.analysis-result-version {width:90px; text-align:right; cursor:pointer;}
+.analysis-result-loc {width:60px; text-align:right; cursor:pointer;}
+.analysis-result-debt {width:160px; text-align:right; cursor:pointer;}
+.analysis-result-time {width:150px; text-align:right; cursor:pointer;}
+.analysis-name-icon {background:url(../images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
\ No newline at end of file

From 126bf9c195a2342065c112070cf6be7385a192fd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 23 Jun 2016 14:47:22 +0800
Subject: [PATCH 527/668] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E7=9A=84=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 17 +++-
 app/controllers/words_controller.rb           | 74 +++++++++-------
 app/helpers/application_helper.rb             | 20 +++++
 app/views/users/_all_replies.html.erb         |  2 +-
 .../users/_comment_reply_detail.html.erb      | 17 +---
 .../users/_course_journalsformessage.html.erb | 12 ++-
 app/views/users/_homework_replies.html.erb    | 11 +--
 .../users/_journal_comment_reply.html.erb     |  8 ++
 app/views/users/_journal_replies.html.erb     | 85 +++++++++++++++++++
 .../users/_journal_reply_banner.html.erb      | 18 ++++
 app/views/users/_reply_to.html.erb            | 41 ++++++---
 app/views/users/_user_activities.html.erb     |  2 +-
 .../users/_user_journalsformessage.html.erb   | 14 +--
 app/views/users/_user_jours_list.html.erb     |  2 +-
 app/views/users/all_journals.js.erb           |  4 +-
 app/views/users/show_all_replies.js.erb       |  6 +-
 app/views/words/create_reply.js.erb           |  6 +-
 app/views/words/destroy.js.erb                | 10 ++-
 public/javascripts/application.js             |  5 +-
 19 files changed, 267 insertions(+), 87 deletions(-)
 create mode 100644 app/views/users/_journal_comment_reply.html.erb
 create mode 100644 app/views/users/_journal_replies.html.erb
 create mode 100644 app/views/users/_journal_reply_banner.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 29e6a4980..c1f5863b8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -87,7 +87,10 @@ class UsersController < ApplicationController
 
   #展开所有回复
   def show_all_replies
-    @comment = JournalsForMessage.find params[:comment].to_i
+    case params[:type]
+      when 'JournalsForMessage'
+        @comment = JournalsForMessage.find params[:comment].to_i
+    end
   end
 
   #二级回复
@@ -95,6 +98,7 @@ class UsersController < ApplicationController
     case params[:type]
       when 'HomeworkCommon'
         @reply = JournalsForMessage.find params[:reply_id]
+        @type = 'HomeworkCommon'
         if params[:user_activity_id]
           @user_activity_id = params[:user_activity_id]
         else
@@ -102,6 +106,11 @@ class UsersController < ApplicationController
         end
         @is_in_course = params[:is_in_course].to_i
         @course_activity = params[:course_activity].to_i
+      when 'JournalsForMessage'
+        @reply = JournalsForMessage.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'JournalsForMessage'
     end
     respond_to do |format|
       format.js
@@ -3261,7 +3270,11 @@ class UsersController < ApplicationController
           @journals = obj.comments.reorder("created_on desc")
         when 'JournalsForMessage'
           obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
-          @journals = obj.children.reorder("created_on desc")
+          journals = []
+          @journals = get_all_children(journals, obj)
+          @type = 'JournalsForMessage'
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
+          @allow_delete = params[:allow_delete]
         when 'Issue'
           obj = Issue.where('id = ?', params[:id].to_i).first
           @journals = obj.journals.reorder("created_on desc")
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 22b7f1f52..668269a26 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -54,15 +54,16 @@ class WordsController < ApplicationController
               :reply_id => reply_user_id,
               :notes => content, 
               :is_readed => false}
-    @jfm = add_reply_adapter options
+    @activity = params[:activity_id].nil? ? JournalsForMessage.find(parent_id) : JournalsForMessage.find(params[:activity_id].to_i)
+    @jfm = add_reply_adapter(@activity, options)
     @save_succ = true if @jfm.errors.empty?
     if @save_succ
-      update_course_activity('JournalsForMessage',parent_id)
-      update_user_activity('JournalsForMessage',parent_id)
-      update_forge_activity('JournalsForMessage',parent_id)
-      update_org_activity('JournalsForMessage',parent_id)
-      update_principal_activity('JournalsForMessage',parent_id)
-      (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
+      update_course_activity('JournalsForMessage',@activity.id)
+      update_user_activity('JournalsForMessage',@activity.id)
+      update_forge_activity('JournalsForMessage',@activity.id)
+      update_org_activity('JournalsForMessage',@activity.id)
+      update_principal_activity('JournalsForMessage',@activity.id)
+      @activity.update_attribute(:updated_on,Time.now)
     end
     respond_to do |format|
       # format.html {
@@ -76,8 +77,6 @@ class WordsController < ApplicationController
       format.js {
         #@reply_type = params[:reply_type]
         @user_activity_id = params[:user_activity_id]
-        @activity = JournalsForMessage.find(parent_id)
-        @is_activity = params[:is_activity] if params[:is_activity]
       }
     end
 
@@ -92,13 +91,14 @@ class WordsController < ApplicationController
       elsif @journal_destroyed.jour_type == "Course"
         @course = Course.find @journal_destroyed.jour_id
         @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+        @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+        @activity = JournalsForMessage.where("id = #{params[:activity_id].to_i}").first if params[:activity_id]
       elsif @journal_destroyed.jour_type == "Principal"
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
         @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
-        @is_activity = params[:is_activity].to_i if params[:is_activity]
-        @activity = @journal_destroyed.parent if @journal_destroyed.parent
+        @activity = JournalsForMessage.where("id = #{params[:activity_id].to_i}").first if params[:activity_id]
         unless @activity
           redirect_to feedback_path(@user)
           return
@@ -374,28 +374,44 @@ class WordsController < ApplicationController
     obj
   end
 
-  def add_reply_adapter options
+  def add_reply_adapter obj, options
     #modify by nwb
     #添加对课程留言的支持
     #留言回复应该不关系其所属的Class，而关心的是其所属的父留言
-    obj = obj_distinguish_url_origin || User.find_by_id(2)
-    if obj.kind_of? User
-      obj.add_jour(nil, nil, nil, options)
-    elsif obj.kind_of? Project
-      Project.add_new_jour(nil, nil, obj.id, options)
-    elsif obj.kind_of? Course
-      Course.add_new_jour(nil, nil, obj.id, options)
-    elsif obj.kind_of? Bid
-      obj.add_jour(nil, nil, nil, options)
-    elsif obj.kind_of? Contest
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    elsif obj.kind_of? Softapplication
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    elsif obj.kind_of? HomeworkAttach
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    else
-      raise "create reply obj unknow type.#{obj.class}"
+    case obj.jour_type
+      when 'Principal'
+        obj.jour.add_jour(nil, nil, nil, options)
+      when 'Project'
+        Project.add_new_jour(nil, nil, obj.jour_id, options)
+      when 'Course'
+        Course.add_new_jour(nil, nil, obj.jour_id, options)
+      when 'Bid'
+        obj.jour.add_jour(nil, nil, nil, options)
+      when 'Contest'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
+      when 'Softapplication'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
+      when 'HomeworkAttach'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
     end
+    # obj = obj_distinguish_url_origin || User.find_by_id(2)
+    # if obj.kind_of? User
+    #   obj.add_jour(nil, nil, nil, options)
+    # elsif obj.kind_of? Project
+    #   Project.add_new_jour(nil, nil, obj.id, options)
+    # elsif obj.kind_of? Course
+    #   Course.add_new_jour(nil, nil, obj.id, options)
+    # elsif obj.kind_of? Bid
+    #   obj.add_jour(nil, nil, nil, options)
+    # elsif obj.kind_of? Contest
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # elsif obj.kind_of? Softapplication
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # elsif obj.kind_of? HomeworkAttach
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # else
+    #   raise "create reply obj unknow type.#{obj.class}"
+    # end
   end
   #######end of message
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 46fdb02f3..2552a6e84 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3127,6 +3127,26 @@ def get_reply_parents parents_rely, comment
   parents_rely
 end
 
+#获取回复的所有父节点(不包括根节点)
+def get_reply_parents_no_root parents_rely, comment
+  if !comment.parent.nil? && !comment.parent.parent.nil?
+    parents_rely << comment.parent
+    get_reply_parents_no_root parents_rely, comment.parent
+  end
+  parents_rely
+end
+
+#获取留言的所有子节点
+def get_all_children result, jour
+  if jour.kind_of? JournalsForMessage
+    jour.children.each do |jour_child|
+      result << jour_child
+      get_all_children result, jour_child
+    end
+  end
+  result.sort! { |a,b| b.created_on <=> a.created_on }
+end
+
 #将有置顶属性的提到数组前面
 def sort_by_sticky topics
   tmpTopics = []
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 20a3289ff..45404ed84 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -13,7 +13,7 @@
         <div class="homepagePostReplyDes">
           <div class="homepagePostReplyPublisher">
             <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= format_activity_day(comment.created_time) %> <%= format_time(comment.created_time, false) %>
+            <%= time_from_now(comment.created_on) %>
             <span id="reply_praise_count_<%=comment.id %>">
                  <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
             </span>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index caac3ee62..4ced798d0 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,20 +1,9 @@
-<!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
-  <%# if comment.user == User.current %>
-    <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-  <%# else %>
-    <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-  <%# end %>
-</span>-->
 <div class="orig_user fl">
 <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
 </div>
 <div class="orig_right fl">
-<% if comment.try(:user).try(:realname) == ' ' %>
-    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
-<% else %>
-    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
-<% end %>
-<span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-<div class="orig_content "><%= comment.notes.html_safe %></div>
+  <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "content-username" %>
+  <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
+  <div class="orig_content "><%= comment.notes.html_safe %></div>
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 85e0e9335..83519b1b1 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -38,14 +38,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count = fetch_user_leaveWord_reply(activity).count %>
+  <% all_comments = []%>
+  <% count=get_all_children(all_comments, activity).count %>
+  <% allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
+  <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
 
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
index 7f4dc379b..285d464b1 100644
--- a/app/views/users/_homework_replies.html.erb
+++ b/app/views/users/_homework_replies.html.erb
@@ -12,11 +12,7 @@
         </div>
         <div class="homepagePostReplyDes">
           <div class="homepagePostReplyPublisher">
-            <% if comment.try(:user).try(:realname) == ' ' %>
-                <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-            <% else %>
-                <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-            <% end %>
+            <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
             <%= time_from_now(comment.created_on) %>
           </div>
           <% unless comment.m_parent_id.nil? %>
@@ -37,7 +33,7 @@
                       <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 %>
+                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
                       </div>
                       <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
                     </div>
@@ -45,7 +41,8 @@
               </div>
           <% end %>
           <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
-            <%= comment.notes.html_safe %></div>
+            <%= comment.notes.html_safe %>
+          </div>
           <div class="orig_reply mb10 mt-10">
             <div class="reply">
                 <span class="reply-right">
diff --git a/app/views/users/_journal_comment_reply.html.erb b/app/views/users/_journal_comment_reply.html.erb
new file mode 100644
index 000000000..9906abeb5
--- /dev/null
+++ b/app/views/users/_journal_comment_reply.html.erb
@@ -0,0 +1,8 @@
+<div class="orig_cont clearfix">
+  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+      <div>
+        <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment} %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_journal_replies.html.erb b/app/views/users/_journal_replies.html.erb
new file mode 100644
index 000000000..7fc708ebb
--- /dev/null
+++ b/app/views/users/_journal_replies.html.erb
@@ -0,0 +1,85 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+            <%= time_from_now(comment.created_on) %>
+          </div>
+          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+              <% parents_rely = [] %>
+              <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+              <% length = parents_rely.length %>
+              <div id="comment_reply_<%=comment.id %>">
+                <% if length <= 3 %>
+                    <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+                <% else %>
+                    <div class="orig_cont clearfix">
+                      <div class="orig_cont clearfix">
+                        <div>
+                          <%=render :partial => 'users/journal_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, :type => comment.class),:remote=>true %>
+                      </div>
+                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                    </div>
+                <% end %>
+              </div>
+          <% end %>
+          <% if !comment.content_detail.blank? || comment.class == Journal %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <% if comment.class == Journal %>
+                    <% if comment.details.any? %>
+                        <% details_to_strings(comment.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= comment.notes.html_safe %></P>
+                <% else %>
+                    <%= comment.content_detail.html_safe %>
+                <% end %>
+              </div>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <% if allow_delete %>
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                    <% end %>
+                </span>
+                  <div class="cl"></div>
+                </div>
+              </div>
+              <p id="reply_message_<%= comment.id%>"></p>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb
new file mode 100644
index 000000000..31934328f
--- /dev/null
+++ b/app/views/users/_journal_reply_banner.html.erb
@@ -0,0 +1,18 @@
+<div class="homepagePostReplyBanner">
+  <div class="homepagePostReplyBannerCount">
+    <span>回复</span>
+    <span  class="reply_iconup" > ︿</span>
+    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
+  </div>
+  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+  <%if count>3 %>
+      <div class="homepagePostReplyBannerMore">
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 23090265c..fd56eb712 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,19 +1,36 @@
 <div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+  </div>
   <div class="orig_textarea mb10 fl">
     <% if User.current.logged? %>
         <div nhname='new_message_<%= reply.id%>'>
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
-              <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
-              <input type="hidden" name="course_activity" value=<%=@course_activity %>>
-              <input type="hidden" name="reply[subject]" id="reply_subject">
-              <div nhname='toolbar_container_<%= reply.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
-              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= reply.id%>'></p>
-          <% end%>
+          <% if @type == 'HomeworkCommon' %>
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+                  <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+                  <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+                  <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+                  <input type="hidden" name="reply[subject]" id="reply_subject">
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>'></p>
+              <% end%>
+          <% elsif @type == 'JournalsForMessage' %>
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'reference_id', params[:reference_id], :value => reply.id %>
+                  <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => reply.user.id %>
+                  <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => reply.id %>
+                  <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="user_notes"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+              <% end%>
+          <% end %>
         </div>
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 3b327c080..5d06a7001 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -86,7 +86,7 @@
                         <% case user_activity.act_type.to_s %>
                             <% when 'JournalsForMessage' %>
                             <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                                <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
+                                <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                             <% end %>
                         <% end %>
                     <% when 'Blog'%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index dd36d1328..4fb79ee2d 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -50,7 +50,7 @@
                 <ul class="homepagePostSettiongText">
                   <li>
                     <%= link_to(l(:label_bid_respond_delete),
-                                {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
+                                {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id, :activity_id => activity.id},
                                 :confirm => l(:text_are_you_sure), :method => 'delete',
                                 :class => "postOptionLink", :title => l(:button_delete))  %>
                   </li>
@@ -62,14 +62,17 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=fetch_user_leaveWord_reply(activity).count %>
+  <% all_comments = []%>
+  <% count=get_all_children(all_comments, activity).count %>
+  <% allow_delete = (activity.user == User.current || User.current.admin?) %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
 
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
         </div>
     <% end %>
 
@@ -84,7 +87,6 @@
                   <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
                   <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
                   <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-                  <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
                   <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 6211aac7d..517d66038 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -11,7 +11,7 @@
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");
                 });
             </script>
-            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id} %>
             <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
         <% end %>
     <%end%>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index c18c6aae4..d4c42368d 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -1,5 +1,7 @@
 <% if params[:type] == 'HomeworkCommon' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+<% elsif params[:type] == 'JournalsForMessage' %>
+$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
 <% else %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
+$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
 <% end %>
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index 99ab73b46..5f5ea6c3f 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,3 +1,7 @@
 <% unless @comment.parent.nil? %>
-$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% if params[:type] == 'JournalsForMessage' && (@comment.jour_type == 'Principal' || @comment.jour_type == 'Course') %>
+        $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% else %>
+        $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index ded05887f..9f3b0164e 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,8 +1,8 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        <% if @is_activity %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        <% else %>
+        <% if @activity.jour_type == 'Principal' %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+        <% elsif @activity.jour_type == 'Course' %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
         //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index a2d606e76..c527474cd 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -3,8 +3,7 @@
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon'].include? @journal_destroyed.jour_type)%>
   <% if @is_user%>
     <% if @activity %>
-        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         $("#user_activity_<%= @user_activity_id%>").hide();
@@ -20,7 +19,12 @@
       <% if @bid && @jours_count %>
         $('#jours_count').html("<%= @jours_count %>");
       <% elsif @course && @jours_count%>
-        $('#course_jour_count').html("(<%= @jours_count %>)");
+        <% if @user_activity_id %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+            sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
+        <% else %>
+            $('#course_jour_count').html("(<%= @jours_count %>)");
+        <% end %>
       <% elsif @user && @jours_count%>
         $('#jour_count').html("<%= @jours_count %>");
       <% elsif @homework%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 22483c1d5..2b674b60d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1289,7 +1289,7 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container, btnid, id, type, div_id) {
+function expand_reply(container, btnid, id, type, div_id, allow_delete) {
     var target = $(container);
     var btn = $(btnid);
     if (btn.data('init') == '0') {
@@ -1299,7 +1299,8 @@ function expand_reply(container, btnid, id, type, div_id) {
             {
                 type: type,
                 id: id,
-                div_id: div_id
+                div_id: div_id,
+                allow_delete: allow_delete
             },
             function(data) {
 

From 5cf108030f7095e6696caf637264ce696119fd84 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jun 2016 14:48:55 +0800
Subject: [PATCH 528/668] =?UTF-8?q?hight=20char=E9=92=9F=E8=A1=A8=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/quality_analysis/_show.html.erb | 119 +++++++++++++++++++++-
 1 file changed, 118 insertions(+), 1 deletion(-)

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 46a5e2e3d..17865ad32 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -8,6 +8,123 @@
 <p>class_complexity: <%=  @complexity["msr"][7]["frmt_val"] %></p>
 <p>function_complexity: <%=  @complexity["msr"][8]["frmt_val"] %></p>
 
+<script>
+    $(function () {
+
+        $('#container_complex').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+
+                    title: {
+                        text: 'Speedometer'
+                    },
+
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 200,
+
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+                        title: {
+                            text: 'km/h'
+                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 120,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 120,
+                            to: 160,
+                            color: '#DDDF0D' // yellow
+                        }, {
+                            from: 160,
+                            to: 200,
+                            color: '#DF5353' // red
+                        }]
+                    },
+
+                    series: [{
+                        name: 'Speed',
+                        data: [80],
+                        tooltip: {
+                            valueSuffix: ' km/h'
+                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+                    if (!chart.renderer.forExport) {
+                        setInterval(function () {
+                            var point = chart.series[0].points[0],
+                                    newVal,
+                                    inc = Math.round((Math.random() - 0.5) * 20);
+
+                            newVal = point.y + inc;
+                            if (newVal < 0 || newVal > 200) {
+                                newVal = point.y - inc;
+                            }
+
+                            point.update(newVal);
+
+                        }, 3000);
+                    }
+                });
+    });
+</script>
 
 
 
@@ -23,7 +140,7 @@
       <p class="fontGrey3 mt15">质量等级</p>
       <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
     </div>
-    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
+    <div class="analysis-genral" id="container_complex">
       <p class="fontGrey3 mt15">复杂度</p>
       <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
     </div>

From 3964631ed1d5c0c5080f25f3cd830fe6fadf62db Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 23 Jun 2016 14:58:09 +0800
Subject: [PATCH 529/668] hight charts

---
 app/views/quality_analysis/_show.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 17865ad32..cf81680b0 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -7,10 +7,9 @@
 <p>file_complexity: <%=  @complexity["msr"][6]["frmt_val"] %></p>
 <p>class_complexity: <%=  @complexity["msr"][7]["frmt_val"] %></p>
 <p>function_complexity: <%=  @complexity["msr"][8]["frmt_val"] %></p>
-
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
 <script>
     $(function () {
-
         $('#container_complex').highcharts({
 
                     chart: {
@@ -20,10 +19,10 @@
                         plotBorderWidth: 0,
                         plotShadow: false
                     },
-
-                    title: {
-                        text: 'Speedometer'
-                    },
+//
+//                    title: {
+//                        text: '复杂度'
+//                    },
 
                     pane: {
                         startAngle: -150,
@@ -140,7 +139,8 @@
       <p class="fontGrey3 mt15">质量等级</p>
       <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
     </div>
-    <div class="analysis-genral" id="container_complex">
+    <div class="analysis-genral" >
+      <p id="container_complex">复杂度</p>
       <p class="fontGrey3 mt15">复杂度</p>
       <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
     </div>

From 563fb3b4593e123450a1010fd7b65bf1602bf0db Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 23 Jun 2016 14:58:40 +0800
Subject: [PATCH 530/668] =?UTF-8?q?=E6=8E=A7=E5=88=B6table=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E4=B8=8D=E9=9D=A0=E5=9C=A8=E4=B8=80=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/resizeable_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index 1f84d4471..0b46f9a35 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -38,7 +38,7 @@
                if (mousedown == true){
                    var width = (tdWidth + (evt.screenX - screenXStart)) - p1 + "px";//计算后的新的宽度
                    var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - p2 + "px";
-                   if (parseInt(width)<0  || parseInt(width2)<0 || tdWidth > totalWidth || tdWidth2 > totalWidth){
+                   if (parseInt(width)<5  || parseInt(width2)<5 || tdWidth > totalWidth || tdWidth2 > totalWidth){
                        tartgetTd = null;
                        resizeable = false;
                        mousedown = false;

From 8940c5f4ca8ed88444d7f2ac563c8f5b4fc18758 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 23 Jun 2016 15:05:16 +0800
Subject: [PATCH 531/668] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E5=AF=BC=E5=87=BA=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E3=80=81=E5=AF=BC=E5=87=BA=E7=BC=BA=E8=AF=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E2=80=9D=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 5d9df57c1..6bdc3753e 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -118,12 +118,14 @@
                                     remote: true, class: "hworkExport resourcesGrey", :id => "download_homework_attachments" %>
                     <% end%>
                   </li>
-                  <li>
-                    <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-                  </li>
-                  <li>
-                    <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-                  </li>
+                  <% if @homework.anonymous_comment == 0 %>
+                      <li>
+                        <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                      </li>
+                      <li>
+                        <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                      </li>
+                  <% end %>
                   <li>
                     <a href="javascript:void(0);" class="hworkSetting resourcesGrey" onclick="set_score_rule();">评分设置</a>
                   </li>

From 53b9cbee72733cc995aa3fea601c9fe6ec9f962d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 23 Jun 2016 17:21:18 +0800
Subject: [PATCH 532/668] added hightcharts and added some api for sonar

---
 .../quality_analysis_controller.rb            |   2 +-
 .../quality_analysis/_hightchars.html.erb     | 376 ++++++++++++++++++
 app/views/quality_analysis/_show.html.erb     | 170 ++------
 3 files changed, 409 insertions(+), 139 deletions(-)
 create mode 100644 app/views/quality_analysis/_hightchars.html.erb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index fd000aa72..58ae02add 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -60,7 +60,7 @@ class QualityAnalysisController < ApplicationController
     else
       @name_flag = false
       resource_id = params[:resource_id]
-      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=139&depth=0&metrics=complexity,function_complexity,class_complexity,file_complexity,lines,file_line,files,functions,classes,directories").read
+      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=139&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
       @complexity =JSON.parse(complexity_date).first
     end
   end
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
new file mode 100644
index 000000000..5acb0e20f
--- /dev/null
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -0,0 +1,376 @@
+<script>
+    $(function () {
+        $('#container_complex').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 1000,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 500,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 500,
+                            to: 800,
+                            color: '#DDDF0D' // yellow
+                        }, {
+                            from: 800,
+                            to: 1000,
+                            color: '#DF5353' // red
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: 'Fuction Complexity',
+                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+                    if (!chart.renderer.forExport) {
+                        setInterval(function () {
+                            var point = chart.series[0].points[0],
+                                    newVal,
+                                    inc = Math.round((Math.random() - 0.5) * 20);
+
+                            newVal = point.y + inc;
+                            if (newVal < 0 || newVal > 200) {
+                                newVal = point.y - inc;
+                            }
+
+                            point.update(newVal);
+
+                        }, 3000);
+                    }
+                });
+    });
+
+//    quality
+    $(function () {
+        $('#container_quality').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    xAxis: {
+                        title: {
+                            text: '复杂度',
+                            x: -23, //center设置标题的位置
+                            y: 6
+                        },
+                        style:{
+                            fontSize: '18px'
+                        }
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 5,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 6,
+                            to: 10,
+                            color: '#adde18' // yellow
+                        }, {
+                            from: 11,
+                            to: 20,
+                            color: '#DDDF0D' // red
+                        }, {
+                            from: 21,
+                            to: 50,
+                            color: '#df8538' // yellow
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: 'SQALE Rating',
+                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+                    if (!chart.renderer.forExport) {
+                        setInterval(function () {
+                            var point = chart.series[0].points[0],
+                                    newVal,
+                                    inc = Math.round((Math.random() - 0.5) * 20);
+
+                            newVal = point.y + inc;
+                            if (newVal < 0 || newVal > 200) {
+                                newVal = point.y - inc;
+                            }
+
+                            point.update(newVal);
+
+                        }, 3000);
+                    }
+                });
+    });
+
+    //    quality
+    $(function () {
+        $('#container_quality').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    xAxis: {
+                        style:{
+                            fontSize: '18px'
+                        }
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 5,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 6,
+                            to: 10,
+                            color: '#adde18' // yellow
+                        }, {
+                            from: 11,
+                            to: 20,
+                            color: '#DDDF0D' // red
+                        }, {
+                            from: 21,
+                            to: 50,
+                            color: '#df8538' // yellow
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: 'duplicated_lines_density',
+                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+                    if (!chart.renderer.forExport) {
+                        setInterval(function () {
+                            var point = chart.series[0].points[0],
+                                    newVal,
+                                    inc = Math.round((Math.random() - 0.5) * 20);
+
+                            newVal = point.y + inc;
+                            if (newVal < 0 || newVal > 200) {
+                                newVal = point.y - inc;
+                            }
+
+                            point.update(newVal);
+
+                        }, 3000);
+                    }
+                });
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index cf81680b0..674507c4c 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,132 +1,19 @@
 <p> lines: <%= @complexity["msr"][0]["frmt_val"] %></p>
+<p> classes: <%= @complexity["msr"][1]["frmt_val"] %></p>
 <p> files: <%= @complexity["msr"][2]["frmt_val"] %></p>
 <p> directories: <%= @complexity["msr"][3]["frmt_val"] %></p>
-<p> classes: <%= @complexity["msr"][1]["frmt_val"] %></p>
 <p> function: <%= @complexity["msr"][4]["frmt_val"] %></p>
-<p> total Complexity: <%= @complexity["msr"][5]["frmt_val"] %></p>
-<p>file_complexity: <%=  @complexity["msr"][6]["frmt_val"] %></p>
-<p>class_complexity: <%=  @complexity["msr"][7]["frmt_val"] %></p>
-<p>function_complexity: <%=  @complexity["msr"][8]["frmt_val"] %></p>
-<%= javascript_include_tag 'highcharts','highcharts-more' %>
-<script>
-    $(function () {
-        $('#container_complex').highcharts({
-
-                    chart: {
-                        type: 'gauge',
-                        plotBackgroundColor: null,
-                        plotBackgroundImage: null,
-                        plotBorderWidth: 0,
-                        plotShadow: false
-                    },
-//
-//                    title: {
-//                        text: '复杂度'
-//                    },
-
-                    pane: {
-                        startAngle: -150,
-                        endAngle: 150,
-                        background: [{
-                            backgroundColor: {
-                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
-                                stops: [
-                                    [0, '#FFF'],
-                                    [1, '#333']
-                                ]
-                            },
-                            borderWidth: 0,
-                            outerRadius: '109%'
-                        }, {
-                            backgroundColor: {
-                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
-                                stops: [
-                                    [0, '#333'],
-                                    [1, '#FFF']
-                                ]
-                            },
-                            borderWidth: 1,
-                            outerRadius: '107%'
-                        }, {
-                            // default background
-                        }, {
-                            backgroundColor: '#DDD',
-                            borderWidth: 0,
-                            outerRadius: '105%',
-                            innerRadius: '103%'
-                        }]
-                    },
-
-                    // the value axis
-                    yAxis: {
-                        min: 0,
-                        max: 200,
-
-                        minorTickInterval: 'auto',
-                        minorTickWidth: 1,
-                        minorTickLength: 10,
-                        minorTickPosition: 'inside',
-                        minorTickColor: '#666',
-
-                        tickPixelInterval: 30,
-                        tickWidth: 2,
-                        tickPosition: 'inside',
-                        tickLength: 10,
-                        tickColor: '#666',
-                        labels: {
-                            step: 2,
-                            rotation: 'auto'
-                        },
-                        title: {
-                            text: 'km/h'
-                        },
-                        plotBands: [{
-                            from: 0,
-                            to: 120,
-                            color: '#55BF3B' // green
-                        }, {
-                            from: 120,
-                            to: 160,
-                            color: '#DDDF0D' // yellow
-                        }, {
-                            from: 160,
-                            to: 200,
-                            color: '#DF5353' // red
-                        }]
-                    },
-
-                    series: [{
-                        name: 'Speed',
-                        data: [80],
-                        tooltip: {
-                            valueSuffix: ' km/h'
-                        }
-                    }]
-
-                },
-                // Add some life
-                function (chart) {
-                    if (!chart.renderer.forExport) {
-                        setInterval(function () {
-                            var point = chart.series[0].points[0],
-                                    newVal,
-                                    inc = Math.round((Math.random() - 0.5) * 20);
-
-                            newVal = point.y + inc;
-                            if (newVal < 0 || newVal > 200) {
-                                newVal = point.y - inc;
-                            }
-
-                            point.update(newVal);
-
-                        }, 3000);
-                    }
-                });
-    });
-</script>
+<p> comment_lines_density: <%= @complexity["msr"][5]["frmt_val"] %></p>
+<p> function_complexity: <%= @complexity["msr"][6]["frmt_val"] %></p>
+<p> duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %></p>
+<p> sqale_index: <%= @complexity["msr"][8]["frmt_val"] %></p>
+<p> sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %></p>
 
+<%dd %>
 
 
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+  <%= render :partial => "hightchars" %>
   <div class="project_r_h">
     <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
   </div>
@@ -134,23 +21,30 @@
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
-  <div class="analysis-block mt10 mb40 flex f14">
-    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
-      <p class="fontGrey3 mt15">质量等级</p>
-      <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
-    </div>
-    <div class="analysis-genral" >
-      <p id="container_complex">复杂度</p>
-      <p class="fontGrey3 mt15">复杂度</p>
-      <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
-    </div>
-    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
-      <p class="fontGrey3 mt15">重复</p>
-      <p class="fontBlue2 pr">44%<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+  <div class="analysis-block mt10 mb40 f14">
+    <div class="flex">
+      <div class="analysis-genral">
+        <p id="container_quality" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p class="fontGrey3">质量等级</p>
+        <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+      </div>
+      <div class="analysis-genral" >
+        <p id="container_complex" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p class="fontGrey3">复杂度</p>
+        <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+      </div>
     </div>
-    <div class="analysis-genral"><img src="images/homepageImage.jpg" width="90" class="image-cir" />
-      <p class="fontGrey3 mt15">注释率</p>
-      <p class="fontBlue2 pr">12%<span class="f8 c_white analysis-genral-icon b_red borderRadius">偏低</span></p>
+    <div class="flex">
+      <div class="analysis-genral">
+        <p id="container_repeat" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p class="fontGrey3 mt15">重复</p>
+        <p class="fontBlue2 pr">44%<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+      </div>
+      <div class="analysis-genral">
+        <p id="container_zhushi" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p class="fontGrey3">注释率</p>
+        <p class="fontBlue2 pr">12%<span class="f8 c_white analysis-genral-icon b_red borderRadius">偏低</span></p>
+      </div>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;">2</span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量中等</span></span></div>

From e45759341673ea2ef21bab10e3e26d5661e10dc2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 23 Jun 2016 17:34:46 +0800
Subject: [PATCH 533/668] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BD=9C=E4=B8=9A=E6=88=90=E7=BB=A9=EF=BC=9A?=
 =?UTF-8?q?excel=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=BC=BA=E8=AF=84=E6=89=A3?=
 =?UTF-8?q?=E5=88=86=E3=80=81=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 46 +++++++++++++++++-----
 config/locales/zh.yml                      |  2 +
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d478b4d63..a9a0f6081 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1210,8 +1210,13 @@ class StudentWorkController < ApplicationController
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
     if @homework.homework_type == 1 #匿评作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
-                            l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+      if @homework.anonymous_comment ==0
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                            l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      else
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      end
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
@@ -1223,14 +1228,27 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,6] = strip_html homework.description
         sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
-        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-        sheet1[count_row,11] = format_time(homework.created_at)
+        if @homework.anonymous_comment ==0
+          sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+          sheet1[count_row,10] = homework.absence_penalty
+          sheet1[count_row,11] = homework.late_penalty
+          sheet1[count_row,12] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,13] = format_time(homework.created_at)
+        else
+          sheet1[count_row,9] = homework.late_penalty
+          sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,11] = format_time(homework.created_at)
+        end
         count_row += 1
       end
     elsif @homework.homework_type == 2 #编程作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
-                            l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+      if @homework.anonymous_comment ==0
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      else
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      end
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
@@ -1243,9 +1261,17 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
-        sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-        sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-        sheet1[count_row,12] = format_time(homework.created_at)
+        if @homework.anonymous_comment ==0
+          sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+          sheet1[count_row,11] = homework.absence_penalty
+          sheet1[count_row,12] = homework.late_penalty
+          sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,14] = format_time(homework.created_at)
+        else
+          sheet1[count_row,10] = homework.late_penalty
+          sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,12] = format_time(homework.created_at)
+        end
         count_row += 1
       end
     end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 94be8af6d..8e3e29b16 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1870,6 +1870,8 @@ zh:
   excel_ta_score: 教辅评分
   excel_n_score: 匿名评分
   excel_s_score: 系统评分
+  excel_a_penalty: 缺评扣分
+  excel_l_penalty: 迟交扣分
   excel_f_score: 成绩
   excel_commit_time: 提交时间
   excel_homework_score: 作业积分

From eca189335b844dd1579af189f11c402334be6d82 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jun 2016 17:40:27 +0800
Subject: [PATCH 534/668] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality_analysis/_hightchars.html.erb     | 196 ++++++++++++++----
 app/views/quality_analysis/_show.html.erb     |   8 +-
 2 files changed, 158 insertions(+), 46 deletions(-)

diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index 5acb0e20f..cea38f691 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -1,6 +1,7 @@
 <script>
+    //    sqale_rating
     $(function () {
-        $('#container_complex').highcharts({
+        $('#container_sqale_rating').highcharts({
 
                     chart: {
                         type: 'gauge',
@@ -43,10 +44,16 @@
                         }]
                     },
 
+                    xAxis: {
+                        style:{
+                            fontSize: '18px'
+                        }
+                    },
+
                     // the value axis
                     yAxis: {
                         min: 0,
-                        max: 1000,
+                        max: 100,
                         minorTickInterval: 'auto',
                         minorTickWidth: 1,
                         minorTickLength: 10,
@@ -66,15 +73,137 @@
 //                        },
                         plotBands: [{
                             from: 0,
-                            to: 500,
+                            to: 5,
                             color: '#55BF3B' // green
                         }, {
-                            from: 500,
-                            to: 800,
+                            from: 6,
+                            to: 10,
+                            color: '#adde18' // yellow
+                        }, {
+                            from: 11,
+                            to: 20,
+                            color: '#DDDF0D' // red
+                        }, {
+                            from: 21,
+                            to: 50,
+                            color: '#df8538' // yellow
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: '代码质量',
+                        data: [<%= @complexity["msr"][9]["frmt_val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+                    if (!chart.renderer.forExport) {
+                        setInterval(function () {
+                            var point = chart.series[0].points[0],
+                                    newVal,
+                                    inc = Math.round((Math.random() - 0.5) * 20);
+
+                            newVal = point.y + inc;
+                            if (newVal < 0 || newVal > 200) {
+                                newVal = point.y - inc;
+                            }
+
+                            point.update(newVal);
+
+                        }, 3000);
+                    }
+                });
+    });
+
+//    function_complexity
+    $(function () {
+        $('#container_function_complexity').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 10,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 11,
+                            to: 15,
                             color: '#DDDF0D' // yellow
                         }, {
-                            from: 800,
-                            to: 1000,
+                            from: 16,
+                            to: 30,
                             color: '#DF5353' // red
                         }]
                     },
@@ -84,7 +213,7 @@
                         enabled: false
                     },
                     series: [{
-                        name: 'Fuction Complexity',
+                        name: '复杂度',
                         data: [<%= @complexity["msr"][5]["frmt_val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
@@ -112,9 +241,9 @@
                 });
     });
 
-//    quality
+//    duplicated_lines_density
     $(function () {
-        $('#container_quality').highcharts({
+        $('#container_duplicated_lines_density').highcharts({
 
                     chart: {
                         type: 'gauge',
@@ -158,11 +287,6 @@
                     },
 
                     xAxis: {
-                        title: {
-                            text: '复杂度',
-                            x: -23, //center设置标题的位置
-                            y: 6
-                        },
                         style:{
                             fontSize: '18px'
                         }
@@ -191,20 +315,12 @@
 //                        },
                         plotBands: [{
                             from: 0,
-                            to: 5,
+                            to: 30,
                             color: '#55BF3B' // green
                         }, {
-                            from: 6,
-                            to: 10,
-                            color: '#adde18' // yellow
-                        }, {
-                            from: 11,
-                            to: 20,
-                            color: '#DDDF0D' // red
-                        }, {
-                            from: 21,
+                            from: 31,
                             to: 50,
-                            color: '#df8538' // yellow
+                            color: '#DDDF0D' // red
                         }, {
                             from: 51,
                             to: 100,
@@ -217,8 +333,8 @@
                         enabled: false
                     },
                     series: [{
-                        name: 'SQALE Rating',
-                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+                        name: '重复率',
+                        data: [<%= @complexity["msr"][7]["frmt_val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -245,9 +361,9 @@
                 });
     });
 
-    //    quality
+//    comment_lines_density
     $(function () {
-        $('#container_quality').highcharts({
+        $('#container_comment_lines_density').highcharts({
 
                     chart: {
                         type: 'gauge',
@@ -291,6 +407,11 @@
                     },
 
                     xAxis: {
+                        title: {
+                            text: '复杂度',
+                            x: -23, //center设置标题的位置
+                            y: 6
+                        },
                         style:{
                             fontSize: '18px'
                         }
@@ -319,20 +440,12 @@
 //                        },
                         plotBands: [{
                             from: 0,
-                            to: 5,
-                            color: '#55BF3B' // green
-                        }, {
-                            from: 6,
-                            to: 10,
-                            color: '#adde18' // yellow
-                        }, {
-                            from: 11,
                             to: 20,
-                            color: '#DDDF0D' // red
+                            color: '#55BF3B' // green
                         }, {
                             from: 21,
                             to: 50,
-                            color: '#df8538' // yellow
+                            color: '#DDDF0D' // red
                         }, {
                             from: 51,
                             to: 100,
@@ -345,7 +458,7 @@
                         enabled: false
                     },
                     series: [{
-                        name: 'duplicated_lines_density',
+                        name: '质量等级',
                         data: [<%= @complexity["msr"][5]["frmt_val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
@@ -372,5 +485,4 @@
                     }
                 });
     });
-
 </script>
\ No newline at end of file
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 674507c4c..24fd990df 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -24,24 +24,24 @@
   <div class="analysis-block mt10 mb40 f14">
     <div class="flex">
       <div class="analysis-genral">
-        <p id="container_quality" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_sqale_rating" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
         <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
       </div>
       <div class="analysis-genral" >
-        <p id="container_complex" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_function_complexity" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
         <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
-        <p id="container_repeat" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_duplicated_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3 mt15">重复</p>
         <p class="fontBlue2 pr">44%<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
       </div>
       <div class="analysis-genral">
-        <p id="container_zhushi" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_comment_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
         <p class="fontBlue2 pr">12%<span class="f8 c_white analysis-genral-icon b_red borderRadius">偏低</span></p>
       </div>

From 0dc1a1c047f985d9a8af77dd83cf0e27c27c430e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 23 Jun 2016 18:24:22 +0800
Subject: [PATCH 535/668] get status

---
 app/helpers/quality_analysis_helper.rb        | 43 +++++++++++++++++++
 .../quality_analysis/_hightchars.html.erb     | 17 +++-----
 app/views/quality_analysis/_show.html.erb     | 13 +++---
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index f2a1effba..62993ea1b 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -1,2 +1,45 @@
 module QualityAnalysisHelper
+
+  def sqale_rating_status val
+    if val.to_i > 0 && val.to_i < 5
+      "henhao"
+    elsif  val.to_i > 5  && val.to_i < 10
+
+    elsif  val.to_i > 10  && val.to_i < 20
+    elsif  val.to_i > 20  && val.to_i < 50
+      "yiban"
+    elsif val.to_i > 20
+      "cha"
+    end
+  end
+
+  def complexity_status val
+    if val.to_i < 10
+      "zhengchang"
+    elsif  val.to_i > 10  && val.to_i < 15
+      "yiban"
+    elsif val.to_i > 15
+      "cha"
+    end
+  end
+
+  def duplicated_lines_density_status val
+    if val.to_i < 30
+      "zhengchang"
+    elsif  val.to_i > 30  && val.to_i < 50
+      "jiaogao"
+    elsif val.to_i > 50
+      "gao"
+    end
+  end
+
+  def comment_lines_density_status val
+    if val.to_i < 20
+      "paindi"
+    elsif  val.to_i > 20  && val.to_i < 50
+      "jiaohao"
+    elsif val.to_i > 50
+      "hao"
+    end
+  end
 end
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index cea38f691..620e2d4fb 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -44,12 +44,6 @@
                         }]
                     },
 
-                    xAxis: {
-                        style:{
-                            fontSize: '18px'
-                        }
-                    },
-
                     // the value axis
                     yAxis: {
                         min: 0,
@@ -100,7 +94,7 @@
                     },
                     series: [{
                         name: '代码质量',
-                        data: [<%= @complexity["msr"][9]["frmt_val"] %>]
+                        data: [<%= @complexity["msr"][9]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -127,6 +121,7 @@
                 });
     });
 
+
 //    function_complexity
     $(function () {
         $('#container_function_complexity').highcharts({
@@ -175,7 +170,7 @@
                     // the value axis
                     yAxis: {
                         min: 0,
-                        max: 100,
+                        max: 30,
                         minorTickInterval: 'auto',
                         minorTickWidth: 1,
                         minorTickLength: 10,
@@ -214,7 +209,7 @@
                     },
                     series: [{
                         name: '复杂度',
-                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+                        data: [<%= @complexity["msr"][5]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -334,7 +329,7 @@
                     },
                     series: [{
                         name: '重复率',
-                        data: [<%= @complexity["msr"][7]["frmt_val"] %>]
+                        data: [<%= @complexity["msr"][7]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -459,7 +454,7 @@
                     },
                     series: [{
                         name: '质量等级',
-                        data: [<%= @complexity["msr"][5]["frmt_val"] %>]
+                        data: [<%= @complexity["msr"][5]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 24fd990df..4265a6e6c 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -8,12 +8,13 @@
 <p> duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %></p>
 <p> sqale_index: <%= @complexity["msr"][8]["frmt_val"] %></p>
 <p> sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %></p>
-
-<%dd %>
+<%# DD %>
 
 
 <%= javascript_include_tag 'highcharts','highcharts-more' %>
   <%= render :partial => "hightchars" %>
+
+
   <div class="project_r_h">
     <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
   </div>
@@ -26,24 +27,24 @@
       <div class="analysis-genral">
         <p id="container_sqale_rating" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr">A<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></p>
       </div>
       <div class="analysis-genral" >
         <p id="container_function_complexity" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
-        <p class="fontBlue2 pr">44<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= complexity_status(@complexity["msr"][6]["val"]) %></span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3 mt15">重复</p>
-        <p class="fontBlue2 pr">44%<span class="f8 c_white analysis-genral-icon b_green2 borderRadius">正常</span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"]) %></span></p>
       </div>
       <div class="analysis-genral">
         <p id="container_comment_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
-        <p class="fontBlue2 pr">12%<span class="f8 c_white analysis-genral-icon b_red borderRadius">偏低</span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_red borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"]) %></span></p>
       </div>
     </div>
   </div>

From 52d4d36097da17d2ea3decd65921b4861f4238ba Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 09:01:12 +0800
Subject: [PATCH 536/668] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 Gemfile                                       |  2 +-
 app/api/mobile/apis/courses.rb                |  1 +
 app/api/mobile/entities/course.rb             |  1 +
 app/controllers/wechats_controller.rb         |  7 ++++
 app/views/wechats/user_activities.html.erb    |  4 ++
 public/assets/wechat/invite_code.html         | 15 +++++++
 public/assets/wechat/myclass.html             | 17 +++++---
 public/javascripts/wechat/app.js              |  2 +-
 .../wechat/controllers/invite_code.js         | 18 +++++++++
 .../javascripts/wechat/controllers/myclass.js | 40 ++++++++++++++++++-
 public/javascripts/wechat/others/routes.js    |  1 +
 12 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 public/assets/wechat/invite_code.html
 create mode 100644 public/javascripts/wechat/controllers/invite_code.js

diff --git a/.gitignore b/.gitignore
index ba7890841..dbc349c80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ vendor/cache
 /config/initializers/gitlab_config.rb
 1234567
 public/javascripts/wechat/node_modules/
+.ruby-version
diff --git a/Gemfile b/Gemfile
index d392c6561..a8131fb3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
+  # gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index de2e48c8e..58d4a4f8c 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -196,6 +196,7 @@ module Mobile
         end
         route_param :id do
           get do
+            authenticate!
             cs = CoursesService.new
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index 50812b349..fc5c95ef5 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -45,6 +45,7 @@ module Mobile
       course_expose :tea_id
       course_expose :term
       course_expose :time
+      course_expose :invite_code
       course_expose :updated_at
       course_expose :course_student_num
       expose :teacher, using: Mobile::Entities::User do |c, opt|
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index d6ab11f92..75a8bac92 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -260,7 +260,14 @@ class WechatsController < ActionController::Base
       unless open_id
         render 'wechats/open_wechat', layout: nil and return
       end
+      if params[:state] == 'myclass'
+        @course_id = params[:id];
+      end
+
       session[:wechat_openid] = open_id
+      if params[:code]
+        redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+      end
       render 'wechats/user_activities', layout: nil
     end
 
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index b5bd82fc5..2b4ebc703 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -16,6 +16,9 @@
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
     window.g_redirect_path = '<%= @path %>';
+    <% if @course_id %>
+    window.g_courseid = <%= @course_id %>;
+    <% end %>
   </script>
 
 </head>
@@ -34,6 +37,7 @@
 <script src="/javascripts/wechat/directives/input_auto.js"></script>
 <script src="/javascripts/wechat/directives/loading_spinner.js"></script>
 <script src="/javascripts/wechat/controllers/reg.js"></script>
+<script src="/javascripts/wechat/controllers/invite_code.js"></script>
 <script src="/javascripts/wechat/controllers/login.js"></script>
 <script src="/javascripts/wechat/controllers/activity.js"></script>
 <script src="/javascripts/wechat/controllers/add_class.js"></script>
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
new file mode 100644
index 000000000..116dad8da
--- /dev/null
+++ b/public/assets/wechat/invite_code.html
@@ -0,0 +1,15 @@
+<div class="post-container">
+    <div class="qr-code-wrap">
+        <div class="qr-code-box">
+            <div class="share-class-name">{{course.name}}</div>
+            <div class="qr-img-wrap"><img src="/images/wechat/QR-code.jpg" width="152" class="qr-code-img" /></div>
+            <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
+        </div>
+    </div>
+    <div class="share-code-wrap">
+        <a href="javascript:void(0);" class="share-code-btn">分享邀请码</a>
+        <div class="share-code-instruction"> 1.将此页面分享给好友，邀请好友加入班级<br />
+            2.通过微信扫一扫加入班级<br />
+            3.输入邀请码加入班级</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/myclass.html
index 25d29008a..f12364130 100644
--- a/public/assets/wechat/myclass.html
+++ b/public/assets/wechat/myclass.html
@@ -1,5 +1,6 @@
 <div class="post-container">
-    <div class="class-detail-name">分布式计算环境A班<span class="f13 blue-title-sub">邀请码</span></div>
+    <div loading-spinner></div>
+    <div class="class-detail-name">{{course.name}}<span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
     <div class="slice3 fl"></div>
     <div id="class_tab_1" ng-class="['class-detail-tab3',{'class-tab-active':currentTab==1}]" ng-click="tab(1);"><a herf="javascript:void(0);">课堂资源</a></div>
     <div class="slice2 fl">
@@ -10,7 +11,7 @@
     <div class="cl"></div>
     <div class="class-search-wrap">
         <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
-            <input class="class-detail-search" placeholder="输入关键词进行搜索" />
+            <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
         </div>
     </div>
     <div ng-class="{'undis': currentTab!=1}">
@@ -23,10 +24,14 @@
     </div>
     <div ng-class="{'undis': currentTab!=2}">
         <div class="member-banner f13 c-grey3">授课老师</div>
-        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">jacknudt</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
+
+        <div class="class-detail-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
+            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{teacher.realname}}</span><span class="fr mr10 c-grey2">教辅</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+        </div>
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
-        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">jingquan</span><span class="fr mr10 c-grey2">教辅</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
-        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/male.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">yuanke</span><img src="/images/wechat/male.png" width="15" class="fl ml10 mt10" /></div>
-        <div class="class-detail-row f13 c-grey3"><img src="/images/wechat/female.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">sasameimei</span><img src="/images/wechat/female.png" width="15" class="fl ml10 mt10" /></div>
+        <div class="class-detail-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
+            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{student.realname}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+        </div>
+
     </div>
 </div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ea2bdf318..00d6bf3bc 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -9,7 +9,7 @@ app.constant('config', {
 
 app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope, auth, $location, $routeParams){
 
-    if(g_redirect_path && g_redirect_path.length>0){
+    if(g_redirect_path && g_redirect_path.length>1){
         $location.path(g_redirect_path);
         g_redirect_path = null;
     }
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
new file mode 100644
index 000000000..b21653b1e
--- /dev/null
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -0,0 +1,18 @@
+/**
+ * Created by guange on 16/6/22.
+ */
+
+
+app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+    var vm = $scope;
+    
+    vm.course = {};
+    var courseid = $routeParams.id;
+    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+        function(response){
+            console.log(response.data);
+            vm.course = response.data.data;
+        }
+    );
+    
+}]);
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/myclass.js
index cb5cf9037..bf864ab88 100644
--- a/public/javascripts/wechat/controllers/myclass.js
+++ b/public/javascripts/wechat/controllers/myclass.js
@@ -1,11 +1,47 @@
-app.controller('MyClassController', ['$scope', function($scope){
+app.controller('MyClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
 
     var vm = $scope;
+    var courseid = $routeParams.id;
 
     vm.currentTab = 1;
     vm.tab = function(index){
        vm.currentTab = index;
-        console.log(vm.currentTab);
+        vm.searchText = '';
+       console.log(vm.currentTab);
+        if(index == 2){
+            if(vm.students.length<=0){
+                $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
+                    function(response) {
+                        console.log(response.data);
+                        vm.students = response.data.data;
+                    }
+                )
+            }
+        }
+    }
+    vm.course = {};
+    vm.students = [];
+    vm.teachers = [];
+    
+    vm.invite = function(){
+       $location.path("/invite_code").search({id: courseid}); 
+    };
+    
+    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+        function(response){
+            console.log(response.data);
+           vm.course = response.data.data; 
+        }
+    );
+
+    
+    if(vm.teachers.length<=0){
+        $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
+            function(response) {
+                console.log(response.data);
+                vm.teachers = response.data.data;
+            }
+        )
     }
 
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 7fa5e6d74..3fa7ca6df 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -32,6 +32,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
         .when('/add_class', makeRoute('add_class.html', 'AddClassController'))
         .when('/myclass', makeRoute('myclass.html', 'MyClassController'))
+        .when('/invite_code', makeRoute('invite_code.html', 'InviteCodeController'))
         .otherwise({
             redirectTo: '/activites'
         });

From e6b263feb5774d3c68cf7e864fe544f08d219e32 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 09:58:51 +0800
Subject: [PATCH 537/668] issues from sonar

---
 .../quality_analysis_controller.rb            |  4 ++-
 app/helpers/quality_analysis_helper.rb        | 32 +++++++++++++++++--
 app/views/quality_analysis/_show.html.erb     | 20 ++++++------
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 58ae02add..99d63dfe3 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -60,8 +60,10 @@ class QualityAnalysisController < ApplicationController
     else
       @name_flag = false
       resource_id = params[:resource_id]
-      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=139&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
       @complexity =JSON.parse(complexity_date).first
+      issue_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+      @sonar_issues = JSON.parse(issue_date).first
     end
   end
 
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 62993ea1b..98b5cadd7 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -4,12 +4,13 @@ module QualityAnalysisHelper
     if val.to_i > 0 && val.to_i < 5
       "henhao"
     elsif  val.to_i > 5  && val.to_i < 10
-
+      "jiaohao"
     elsif  val.to_i > 10  && val.to_i < 20
+      "zhongdeng"
     elsif  val.to_i > 20  && val.to_i < 50
-      "yiban"
+      "jiaocha"
     elsif val.to_i > 20
-      "cha"
+      "hencha"
     end
   end
 
@@ -42,4 +43,29 @@ module QualityAnalysisHelper
       "hao"
     end
   end
+
+  def score_sqale_rating val
+    if val.to_i > 0 && val.to_i < 5
+      "5"
+    elsif  val.to_i > 5  && val.to_i < 10
+      "4"
+    elsif  val.to_i > 10  && val.to_i < 20
+      "3"
+    elsif  val.to_i > 20  && val.to_i < 50
+      "2"
+    elsif val.to_i > 20
+      "1"
+    end
+  end
+
+  def lines_scale val
+    if val.to_i < 5000
+      "zhongdeng"
+    elsif val.to_i >5000 && val.to_i < 50000
+      "zhongdneg"
+    else
+      "da"
+    end
+  end
+
 end
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 4265a6e6c..522b004a8 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -8,6 +8,8 @@
 <p> duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %></p>
 <p> sqale_index: <%= @complexity["msr"][8]["frmt_val"] %></p>
 <p> sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %></p>
+
+<p> issues: <%= @sonar_issues["msr"][0]["frmt_val"] %></p>
 <%# DD %>
 
 
@@ -48,19 +50,19 @@
       </div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;">2</span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量中等</span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline">14天</span><span class="fontGrey2">查看详情</span></div>
-    <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline">130</span><span class="fontGrey2">问题分类如下：</span></div>
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2">查看详情</span></div>
+    <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][0]["frmt_val"] %></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline">4</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline">75</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline">428</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline">225</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline">114</span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red">规模中等</span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= lines_scale(@complexity["msr"][0]["frmt_val"]) %></span></span></div>
   <div class="analysis-block mt10 mb40 flex f14">
     <div class="analysis-genral">
       <p class="fontGrey3">代码行数</p>

From dcd2aa7848457244e1ad34526729ae4ee7173935 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 10:05:49 +0800
Subject: [PATCH 538/668] =?UTF-8?q?=E5=8F=82=E8=80=83=E4=B8=B4=E7=95=8C?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/quality_analysis_helper.rb | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 98b5cadd7..68ceb0996 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -2,45 +2,45 @@ module QualityAnalysisHelper
 
   def sqale_rating_status val
     if val.to_i > 0 && val.to_i < 5
-      "henhao"
+      "很好"
     elsif  val.to_i > 5  && val.to_i < 10
-      "jiaohao"
+      "较好"
     elsif  val.to_i > 10  && val.to_i < 20
-      "zhongdeng"
+      "中等"
     elsif  val.to_i > 20  && val.to_i < 50
-      "jiaocha"
+      "较差"
     elsif val.to_i > 20
-      "hencha"
+      "很差"
     end
   end
 
   def complexity_status val
     if val.to_i < 10
-      "zhengchang"
+      "良好"
     elsif  val.to_i > 10  && val.to_i < 15
-      "yiban"
+      "较高"
     elsif val.to_i > 15
-      "cha"
+      "很高"
     end
   end
 
   def duplicated_lines_density_status val
     if val.to_i < 30
-      "zhengchang"
+      "良好"
     elsif  val.to_i > 30  && val.to_i < 50
-      "jiaogao"
+      "较高"
     elsif val.to_i > 50
-      "gao"
+      "很高"
     end
   end
 
   def comment_lines_density_status val
     if val.to_i < 20
-      "paindi"
+      "较低"
     elsif  val.to_i > 20  && val.to_i < 50
-      "jiaohao"
+      "正常"
     elsif val.to_i > 50
-      "hao"
+      "较高"
     end
   end
 
@@ -60,11 +60,11 @@ module QualityAnalysisHelper
 
   def lines_scale val
     if val.to_i < 5000
-      "zhongdeng"
+      "小型"
     elsif val.to_i >5000 && val.to_i < 50000
-      "zhongdneg"
+      "中型"
     else
-      "da"
+      "大型"
     end
   end
 

From a0635bbb2daac1e1218f8bf5dc87c19b5785635f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 10:47:21 +0800
Subject: [PATCH 539/668] =?UTF-8?q?=E6=89=80=E5=8D=A0=E7=99=BE=E5=88=86?=
 =?UTF-8?q?=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/quality_analysis_helper.rb    | 7 +++++++
 app/views/quality_analysis/_show.html.erb | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 68ceb0996..0454a6943 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -68,4 +68,11 @@ module QualityAnalysisHelper
     end
   end
 
+  #统计答题百分比，统计结果保留两位小数
+  def statistics_result_percentage(e, t)
+    e = e.to_f
+    t = t.to_f
+    t == 0 ? 0 : format("%.2f", e*100/t)
+  end
+
 end
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 522b004a8..d3dc277bc 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -55,8 +55,8 @@
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2">查看详情</span></div>
     <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][0]["frmt_val"] %></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"], 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" ></span></span></div>
       <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
       <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
       <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>

From 05eb71036ded75dbaf4b4b46c47f31fd957f09bb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 10:47:24 +0800
Subject: [PATCH 540/668] some css to added

---
 app/views/quality_analysis/_show.html.erb | 21 ++-------------------
 public/stylesheets/public.css             |  9 +++++++++
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 522b004a8..828b5a98d 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,26 +1,9 @@
-<p> lines: <%= @complexity["msr"][0]["frmt_val"] %></p>
-<p> classes: <%= @complexity["msr"][1]["frmt_val"] %></p>
-<p> files: <%= @complexity["msr"][2]["frmt_val"] %></p>
-<p> directories: <%= @complexity["msr"][3]["frmt_val"] %></p>
-<p> function: <%= @complexity["msr"][4]["frmt_val"] %></p>
-<p> comment_lines_density: <%= @complexity["msr"][5]["frmt_val"] %></p>
-<p> function_complexity: <%= @complexity["msr"][6]["frmt_val"] %></p>
-<p> duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %></p>
-<p> sqale_index: <%= @complexity["msr"][8]["frmt_val"] %></p>
-<p> sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %></p>
-
-<p> issues: <%= @sonar_issues["msr"][0]["frmt_val"] %></p>
-<%# DD %>
-
-
 <%= javascript_include_tag 'highcharts','highcharts-more' %>
   <%= render :partial => "hightchars" %>
-
-
   <div class="project_r_h">
     <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
   </div>
-  <a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">branch:master</a>
+  <!--<a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">branch:master</a>-->
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
@@ -40,7 +23,7 @@
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
-        <p class="fontGrey3 mt15">重复</p>
+        <p class="fontGrey3">重复</p>
         <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"]) %></span></p>
       </div>
       <div class="analysis-genral">
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index e33ac601e..c6d7853e5 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -27,6 +27,7 @@ a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color
 h2{ font-size:18px; }
 h3{ font-size:14px; }
 h4{ font-size:14px; }
+.f8 {font-size:8px;}
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}
@@ -130,6 +131,7 @@ h4{ font-size:14px; }
 .mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
+.mt35 {margin-top:35px;}
 .ml70{margin-left: 70px;}
 .mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
@@ -137,6 +139,8 @@ h4{ font-size:14px; }
 .mb8 {margin-bottom:8px;}
 .mb10{ margin-bottom:10px !important;}
 .mb20{ margin-bottom:20px;}
+.mb30 {margin-bottom:30px;}
+.mb40 {margin-bottom:40px;}
 .pl10 {padding-left:10px;}
 .pl15{ padding-left:15px;}
 .pl5{ padding-left:5px;}
@@ -228,6 +232,7 @@ a.c_green{ color:#28be6c;}
 
 .b_grey{ background: #F5F5F5;}
 .b_dgrey{ background: #CCC;}
+.c_white {color:#fff;}
 .c_orange{color:#e8770d;}
 .c_dark{ color:#2d2d2d;}
 .c_lorange{ color:#ff9900;}
@@ -239,6 +244,8 @@ a.c_green{ color:#28be6c;}
 .c_dblue{ color:#09658c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
+.b_green2 {background:#63c360;}
+.b_red {background:#d60308;}
 .b_w{ background:#fff !important;}
 
 /*add by Tim*/
@@ -341,6 +348,8 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
 .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
 .grey_border{border:1px solid #dddddd !important;}
+.borderRadius {border-radius:5px;}
+.tac {text-align:center;}
 /* commonpic */
 .pic_date{ display:block; background:url(../images/new_project/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
 .pic_add{ display:block; background:url(../images/new_project/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}

From bd3277681c291593da53f073f47db337efc039a2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 10:50:40 +0800
Subject: [PATCH 541/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=88=90=E7=BB=A9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 117 ++++++++++++++++++++-
 app/controllers/student_work_controller.rb |  35 +++++-
 app/helpers/application_helper.rb          |  17 +++
 config/locales/zh.yml                      |   4 +
 4 files changed, 169 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e421b8c69..2e8aebce5 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1224,7 +1224,7 @@ class CoursesController < ApplicationController
   def member_to_xls homeworks, course, members,groups
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
-    sheet1 = book.create_worksheet :name => "student"
+    sheet1 = book.create_worksheet :name => "总成绩"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     #sheet1.row(0).default_format = blue
     #sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_class),l(:excel_f_score),l(:excel_commit_time)])
@@ -1268,6 +1268,121 @@ class CoursesController < ApplicationController
       count_row += 1
     end
 
+    homeworks.each_with_index do |home, i|
+      sheet = book.create_worksheet :name => "第#{i+1}次作业"
+      sheet[0,0] = "课程编号"
+      sheet[0,1] = course.id
+      sheet[1,0] = "课程学期"
+      sheet[1,1] = course.time.to_s+"年"+course.term
+      sheet[2,0] = "课程名称"
+      sheet[2,1] = course.name
+      sheet[3,0] = "教师团队"
+      sheet[3,1] = (searchTeacherAndAssistant course).map{|member| member.user.show_name}.join('、')
+      sheet[4,0] = "主讲教师"
+      sheet[4,1] = course.teacher.show_name
+      sheet[4,0] = "作业批次"
+      sheet[4,1] = "第#{i+1}次作业"
+      sheet[4,0] = "作业名称"
+      sheet[4,1] = home.name
+      if home.homework_type == 1 #普通作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0]= j + 1
+          sheet[count_row,1] = stu.user.show_name
+          sheet[count_row,2] = stu.user.login
+          sheet[count_row,3] = stu.user.user_extensions.student_id
+          sheet[count_row,4] = stu.name
+          sheet[count_row,5] = strip_html stu.description
+          sheet[count_row,6] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,8] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,9] = stu.absence_penalty
+            sheet[count_row,10] = stu.late_penalty
+            sheet[count_row,11] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,12] = format_time(stu.created_at)
+          else
+            sheet[count_row,8] = stu.late_penalty
+            sheet[count_row,9] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,10] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      elsif home.homework_type == 2 #编程作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0]= j + 1
+          sheet[count_row,1] = stu.user.show_name
+          sheet[count_row,2] = stu.user.login
+          sheet[count_row,3] = stu.user.user_extensions.student_id
+          sheet[count_row,4] = stu.name
+          sheet[count_row,5] = stu.description
+          sheet[count_row,6] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          sheet[count_row,8] = stu.system_score.nil? ? l(:label_without_score) : stu.system_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,10] = stu.absence_penalty
+            sheet[count_row,11] = stu.late_penalty
+            sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,13] = format_time(stu.created_at)
+          else
+            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,11] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      elsif home.homework_type == 3 #分组作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0] = j + 1
+          sheet[count_row,1] = get_group_member_names stu
+          sheet[count_row,2] = stu.name
+          sheet[count_row,3] = (stu.project_id == 0 || stu.project_id.nil?) ? l(:excel_no_project) : stu.project.name
+          sheet[count_row,4] = strip_html stu.description
+          sheet[count_row,5] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,8] = stu.absence_penalty
+            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,11] = format_time(stu.created_at)
+          else
+            sheet[count_row,7] = stu.late_penalty
+            sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,9] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      end
+    end
+
 =begin
     group0 = CourseGroup.new();
     group0.id = 0;
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index a9a0f6081..b92dbb935 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1209,7 +1209,7 @@ class StudentWorkController < ApplicationController
     sheet1 = book.create_worksheet :name => "homework"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    if @homework.homework_type == 1 #匿评作业
+    if @homework.homework_type == 1 #普通作业
       if @homework.anonymous_comment ==0
         sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
@@ -1220,7 +1220,7 @@ class StudentWorkController < ApplicationController
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
-        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        sheet1[count_row,1] = homework.user.show_name
         sheet1[count_row,2] = homework.user.login
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
@@ -1252,7 +1252,7 @@ class StudentWorkController < ApplicationController
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
-        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        sheet1[count_row,1] = homework.user.show_name
         sheet1[count_row,2] = homework.user.login
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
@@ -1274,6 +1274,35 @@ class StudentWorkController < ApplicationController
         end
         count_row += 1
       end
+    elsif @homework.homework_type == 3 #分组作业
+        if @homework.anonymous_comment ==0
+          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 1
+        items.each do |homework|
+          sheet1[count_row,0] = get_group_member_names homework
+          sheet1[count_row,1] = homework.name
+          sheet1[count_row,2] = (homework.project_id == 0 || homework.project_id.nil?) ? l(:excel_no_project) : homework.project.name
+          sheet1[count_row,3] = strip_html homework.description
+          sheet1[count_row,4] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+          sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+          if @homework.anonymous_comment ==0
+            sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+            sheet1[count_row,7] = homework.absence_penalty
+            sheet1[count_row,8] = homework.late_penalty
+            sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,10] = format_time(homework.created_at)
+          else
+            sheet1[count_row,6] = homework.late_penalty
+            sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,8] = format_time(homework.created_at)
+          end
+          count_row += 1
+        end
     end
     book.write xls_report
     xls_report.string
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2552a6e84..ee2e2d74a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3303,3 +3303,20 @@ def get_hw_index(hw,is_teacher)
   index = hw_ids.index(hw.id)
   return index
 end
+
+def get_group_member_names work
+  result = ""
+  unless work.nil?
+    work.student_work_projects.each do |member|
+      user = User.where(:id => member.user_id).first
+      unless user.nil?
+        if result != ""
+          result += "、#{user.show_name}"
+        else
+          result += user.show_name
+        end
+      end
+    end
+  end
+  result
+end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8e3e29b16..5d9b3c2a1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1864,8 +1864,12 @@ zh:
   excel_nickname: 登录名
   excel_student_id: 学号
   excel_mail: 电子邮箱
+  excel_rank: 排名
   excel_homework_name: 作品名
   excel_homework_des: 作品描述
+  excel_homework_project: 关联项目
+  excel_no_project: 无关联项目
+  excel_group_member: 组员
   excel_t_score: 教师评分
   excel_ta_score: 教辅评分
   excel_n_score: 匿名评分

From a41d18dd0ec33d0f0e62957f85e52a7949716e66 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 11:02:29 +0800
Subject: [PATCH 542/668] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E8=AF=A6=E6=83=85=E5=9C=A8=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=94=B6=E8=B5=B7=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 4ca5a8f2d..c4df9e715 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -4,6 +4,7 @@
         <li class="fl" >
           <span class="tit_fb">上交时间：</span>
           <%=format_time work.created_at %>
+          <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:165px; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
         </li>
 
         <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>

From e17aa4c5d881537dbb8259449d0c4f2f38a0a54b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 11:20:39 +0800
Subject: [PATCH 543/668] color

---
 app/helpers/quality_analysis_helper.rb    | 50 ++++++++++++++++-------
 app/views/quality_analysis/_show.html.erb | 22 +++++-----
 public/stylesheets/public.css             |  3 ++
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 0454a6943..8356c476b 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -1,47 +1,69 @@
 module QualityAnalysisHelper
 
   def sqale_rating_status val
+    arr = []
     if val.to_i > 0 && val.to_i < 5
-      "很好"
+      arr << "很好"
+      arr << "b_green2"
     elsif  val.to_i > 5  && val.to_i < 10
-      "较好"
+      arr << "较好"
+      arr << "b_slow_yellow"
     elsif  val.to_i > 10  && val.to_i < 20
-      "中等"
+      arr << "中等"
+      arr << "b_yellow"
     elsif  val.to_i > 20  && val.to_i < 50
-      "较差"
+      arr << "较差"
+      arr << "b_slow_red"
     elsif val.to_i > 20
-      "很差"
+      arr << "很差"
+      arr << "b_red"
     end
+    arr.first
   end
 
   def complexity_status val
+    arr = []
     if val.to_i < 10
-      "良好"
+      arr << "良好"
+      arr << "b_green2"
     elsif  val.to_i > 10  && val.to_i < 15
-      "较高"
+      arr << "较高"
+      arr << "b_yellow"
     elsif val.to_i > 15
-      "很高"
+      arr << "很高"
+      arr << "b_red"
     end
+    arr.first
   end
 
   def duplicated_lines_density_status val
+    arr = []
     if val.to_i < 30
-      "良好"
+      arr << "良好"
+      arr << "b_green2"
     elsif  val.to_i > 30  && val.to_i < 50
-      "较高"
+      arr << "较高"
+      arr << "b_yellow"
     elsif val.to_i > 50
-      "很高"
+      arr << "很高"
+      arr << "b_red"
     end
+    arr.first
   end
 
   def comment_lines_density_status val
+    arr = []
     if val.to_i < 20
-      "较低"
+      arr << "较低"
+      arr << "b_yellow"
     elsif  val.to_i > 20  && val.to_i < 50
-      "正常"
+      arr << "正常"
+      arr << "b_green2"
     elsif val.to_i > 50
-      "较高"
+      arr << "较高"
+      arr << "b_red"
     end
+    arr.first
   end
 
   def score_sqale_rating val
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 3b80d775c..86ff6782b 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -10,39 +10,39 @@
   <div class="analysis-block mt10 mb40 f14">
     <div class="flex">
       <div class="analysis-genral">
-        <p id="container_sqale_rating" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon #{<%= sqale_rating_status(@complexity["msr"][9]["val"])[1] %>} borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></p>
       </div>
       <div class="analysis-genral" >
-        <p id="container_function_complexity" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
         <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= complexity_status(@complexity["msr"][6]["val"]) %></span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
-        <p id="container_duplicated_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">重复</p>
         <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"]) %></span></p>
       </div>
       <div class="analysis-genral">
-        <p id="container_comment_lines_density" style="max-width:260px;min-height:260px;width:260px; margin:0 auto;"></p>
+        <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
         <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_red borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"]) %></span></p>
       </div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2">查看详情</span></div>
     <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][0]["frmt_val"] %></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"], 200) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" ></span></span></div>
-      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
-      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate"></span></span></div>
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= lines_scale(@complexity["msr"][0]["frmt_val"]) %></span></span></div>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c6d7853e5..743c81014 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -244,6 +244,9 @@ a.c_green{ color:#28be6c;}
 .c_dblue{ color:#09658c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
+.b_slow_yellow{background:#adde18;}
+.b_yellow{background:#DDDF0D;}
+.b_slow_red{background:#df8538;}
 .b_green2 {background:#63c360;}
 .b_red {background:#d60308;}
 .b_w{ background:#fff !important;}

From 295939143861f35f9d6999171470e528b10e9f35 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 11:20:48 +0800
Subject: [PATCH 544/668] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=B2=A1=E6=9C=89=E4=BD=9C=E4=B8=9A=E6=97=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E8=A2=AB=E7=82=B9=E5=87=BB=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=80=E6=9D=A1=E8=AE=B0=E5=BD=95=EF=BC=9A?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=B0=9A=E6=9C=AA=E5=8F=91=E5=B8=83=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/homework_common/index.html.erb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 35f4658f9..167ae98f0 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -45,11 +45,15 @@
         <li>
           <a href="javascript:void(0);" class="menu_arrow" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">作业</a>
           <ul style="max-height:240px; overflow-y:auto; overflow-x:hidden;">
-            <% @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),:target=>"_blank"%>
-                </li>
-            <% end%>
+            <% if @homework_commons.empty? %>
+                <li class="pr10" style="font-weight: normal; color: #888888; width: 120px; padding-left: 15px; padding-bottom: 5px;">目前尚未发布作业</li>
+            <% else %>
+                <% @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),:target=>"_blank"%>
+                    </li>
+                <% end%>
+            <% end %>
           </ul>
         </li>
       </ul>

From e818b5fb073f4c1ef02b9d321e8a05dee8aa8d3b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 11:22:43 +0800
Subject: [PATCH 545/668] =?UTF-8?q?=E6=97=A7=E7=9A=84=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/register.html.erb | 127 ----------------------------
 config/routes.rb                    |   2 +-
 2 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 app/views/account/register.html.erb

diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
deleted file mode 100644
index 0bebfdf5f..000000000
--- a/app/views/account/register.html.erb
+++ /dev/null
@@ -1,127 +0,0 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
-
-
-
-
-<!-- end -->
-
-<h3><%= l(:label_register) %> <%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3>
-
-<%= labelled_form_for @user, :url => register_path do |f| %>
-    <%= error_messages_for 'user' %>
-    <div class="box tabular">
-
-      <% if @user.auth_source_id.nil? %>
-          <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
-            <em class="info" style="color: #acaeb1"><%= l(:label_max_number) %></em>
-          </p>
-          <p><%= f.password_field :password, :size => 25, :required => true %><span id="valid_user_password"></span>
-            <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
-          </p>
-          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password" style="padding-left: 10px;"></span></p>
-      <% end %>
-
-      <p>
-        <%= f.text_field :mail,:size => 25, :required => true %>
-        <span id="valid_user_mail" ></span>
-      </p>
-      <p>
-        <em class="info" style="color: #acaeb1">
-          <p><%= "#{l(:label_mail_attention)} " %></p>
-          <p><%= "#{l(:label_mail_attention1)} " %></p>
-        </em>
-      </p>
-
-
-
-      <!-- end -->
-    </div>
-
-    <p>
-    <table>
-      <tr>
-        <td><%= submit_tag l(:button_submit) %></td>
-      </tr>
-    </table>
-    </p>
-<% end %>
-<% if Setting.openid? %>
-    <p><%= f.text_field :identity_url %></p>
-<% end %>
-<% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %>
-    <p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-</div>
-<% password_min_length = Setting.password_min_length %>
-<script type="text/javascript">
-    jQuery(document).ready(function () {
-        var $login = $('#user_login')
-        var $mail = $('#user_mail')
-        var $password = $('#user_password')
-        var $password_confirmation = $('#user_password_confirmation')
-        $login.blur(function (event) {
-            if ($(this).is('#user_login')) {
-                $.get(
-                        '<%=account_valid_ajax_path%>',
-                        { valid: "login",
-                            value: this.value },
-                        function (data) {
-                            if (data.valid) {
-                                $('#valid_user_login').html('<span class="green">' + data.message + "</span>");
-                            } else {
-                                $('#valid_user_login').html('<span class="red">' + data.message + "</span>");
-                            }
-                        });
-            }
-            ;
-        });
-
-        $mail.blur(function (event) {
-            if ($(this).is('#user_mail')) {
-                $.get('<%=account_valid_ajax_path%>',
-                        { valid: "mail",
-                            value: this.value },
-                        function (data) {
-                            if (data.valid) {
-                                $('#valid_user_mail').html('<span class="green">' + data.message + "</span>");
-                            } else {
-                                $('#valid_user_mail').html('<span class="red">' + data.message + "</span>");
-                            }
-                        });
-            }
-            ;
-        });
-        $password.blur(function () {
-            var pas1 = document.getElementById("user_password").value;
-            var password_min_length = <%= password_min_length %>
-            if (pas1.length >= password_min_length) {
-
-                $('#valid_user_password').html('<span class="green">'+ "</span>");
-            }
-            else {
-                $('#valid_user_password').html('<span class="red">' +  "<%= l(:setting_password_min_length_limit, :count => password_min_length) %>" + "</span>");
-            }
-
-
-
-        });
-        $password_confirmation.blur(function () {
-            var password_min_length = <%= password_min_length %>
-            var pas1 = document.getElementById("user_password").value;
-            var pas2 = document.getElementById("user_password_confirmation").value;
-            if (pas1.length >= password_min_length && pas1 == pas2 ) {
-                $('#valid_password').html('<span class="green">' + "<%= l(:setting_password_success) %>"+ "</span>");
-            }
-            else {
-                 $('#valid_password').html('<span class="red">' +  "<%= l(:setting_password_error) %>" + "</span>");
-            }
-
-
-
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 6e720ffba..8d822aafc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -484,7 +484,7 @@ RedmineApp::Application.routes.draw do
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
   match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get]
   match 'about_us',:to=>'account#about_us',:as=>'about_us',:via=>[:get]
-  match 'account/register', :via => [:get, :post], :as => 'register'
+  match 'account/register',:to=>'account#register', :via => [:get, :post], :as => 'register'
   match 'account/lost_password',  :via => [:get, :post], :as => 'lost_password'
   match 'account/activate',  :via => :get
   match 'account/valid_ajax',  :via => :get

From 2a971c3bc6e436c8d01e5a6719001ed9429522b5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 11:24:48 +0800
Subject: [PATCH 546/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index ebf3f5445..3a5a8c175 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,7 +112,7 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>

From e4e0e7b16625850bbd9f7261f195887c0d964f04 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 12:17:05 +0800
Subject: [PATCH 547/668] helper

---
 app/helpers/quality_analysis_helper.rb          | 4 ----
 app/views/quality_analysis/_hightchars.html.erb | 4 ++--
 app/views/quality_analysis/_show.html.erb       | 8 ++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 8356c476b..e13882f6f 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -18,7 +18,6 @@ module QualityAnalysisHelper
       arr << "很差"
       arr << "b_red"
     end
-    arr.first
   end
 
   def complexity_status val
@@ -33,7 +32,6 @@ module QualityAnalysisHelper
       arr << "很高"
       arr << "b_red"
     end
-    arr.first
   end
 
   def duplicated_lines_density_status val
@@ -48,7 +46,6 @@ module QualityAnalysisHelper
       arr << "很高"
       arr << "b_red"
     end
-    arr.first
   end
 
   def comment_lines_density_status val
@@ -63,7 +60,6 @@ module QualityAnalysisHelper
       arr << "较高"
       arr << "b_red"
     end
-    arr.first
   end
 
   def score_sqale_rating val
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index 620e2d4fb..c4d884287 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -436,11 +436,11 @@
                         plotBands: [{
                             from: 0,
                             to: 20,
-                            color: '#55BF3B' // green
+                            color: '#DDDF0D' // green
                         }, {
                             from: 21,
                             to: 50,
-                            color: '#DDDF0D' // red
+                            color: '#55BF3B' // red
                         }, {
                             from: 51,
                             to: 100,
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 86ff6782b..f44bb9325 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -12,24 +12,24 @@
       <div class="analysis-genral">
         <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon #{<%= sqale_rating_status(@complexity["msr"][9]["val"])[1] %>} borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"]) %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"])[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></p>
       </div>
       <div class="analysis-genral" >
         <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= complexity_status(@complexity["msr"][6]["val"]) %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"])[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"])[0] %></span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">重复</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_green2 borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"]) %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[0] %></span></p>
       </div>
       <div class="analysis-genral">
         <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon b_red borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"]) %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"])[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"])[0] %></span></p>
       </div>
     </div>
   </div>

From de80403e8dc9aaeb23840ae3475b2b9eca25979f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 12:38:39 +0800
Subject: [PATCH 548/668] add address to config

---
 app/controllers/quality_analysis_controller.rb  | 10 ++++++----
 app/views/quality_analysis/_hightchars.html.erb |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 99d63dfe3..ac31ee198 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -19,6 +19,7 @@ class QualityAnalysisController < ApplicationController
     #@client.exists?(job_name)
     @g = Gitlab.client
     gitlab_address = Redmine::Configuration['gitlab_address']
+    jenkins_address = Redmine::Configuration['jenkins_address']
     user_name = User.find(params[:user_id]).try(:login)
     branch = params[:branch].nil? ? "master" : params[:branch]
     language = params[:language]
@@ -44,7 +45,7 @@ class QualityAnalysisController < ApplicationController
     @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
     # relace gitlab hook
     # genkins address
-    @g.add_project_hook(@project.gpid,"http://123.59.135.93:8890/project/#{user_name}_#{identifier}")
+    @g.add_project_hook(@project.gpid, (jenkins_address + "/project/#{user_name}_#{identifier}"))
     if qa.nil?
       QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :version => version)
     else
@@ -53,16 +54,17 @@ class QualityAnalysisController < ApplicationController
   end
 
   def index
+    @sonar_address = Redmine::Configuration['sonar_address']
     if params[:resource_id].nil?
       @name_flag = true
-      projects_date = open("http://123.59.135.93:8891/api/projects/index").read
+      projects_date = open(sonar_address + "/api/projects/index").read
       @results = JSON.parse(projects_date)
     else
       @name_flag = false
       resource_id = params[:resource_id]
-      complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
       @complexity =JSON.parse(complexity_date).first
-      issue_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+      issue_date = open(@sonar_address + "/api/resources/index?resource=#{resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
       @sonar_issues = JSON.parse(issue_date).first
     end
   end
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index c4d884287..6e63bcecd 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -209,7 +209,7 @@
                     },
                     series: [{
                         name: '复杂度',
-                        data: [<%= @complexity["msr"][5]["val"] %>]
+                        data: [<%= @complexity["msr"][6]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }

From 128f6721be7117513de59ec92075487b825de766 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 13:00:02 +0800
Subject: [PATCH 549/668] stoped the zhizhen

---
 .../quality_analysis_controller.rb            |   6 +-
 .../quality_analysis/_hightchars.html.erb     | 120 +++++++++---------
 app/views/quality_analysis/_show.html.erb     |  93 +++++++-------
 3 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index ac31ee198..152335dd8 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -61,10 +61,10 @@ class QualityAnalysisController < ApplicationController
       @results = JSON.parse(projects_date)
     else
       @name_flag = false
-      resource_id = params[:resource_id]
-      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+      @resource_id = params[:resource_id]
+      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
       @complexity =JSON.parse(complexity_date).first
-      issue_date = open(@sonar_address + "/api/resources/index?resource=#{resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+      issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
       @sonar_issues = JSON.parse(issue_date).first
     end
   end
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index 6e63bcecd..fb60eaed3 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -103,21 +103,21 @@
                 },
                 // Add some life
                 function (chart) {
-                    if (!chart.renderer.forExport) {
-                        setInterval(function () {
-                            var point = chart.series[0].points[0],
-                                    newVal,
-                                    inc = Math.round((Math.random() - 0.5) * 20);
-
-                            newVal = point.y + inc;
-                            if (newVal < 0 || newVal > 200) {
-                                newVal = point.y - inc;
-                            }
-
-                            point.update(newVal);
-
-                        }, 3000);
-                    }
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
                 });
     });
 
@@ -218,21 +218,21 @@
                 },
                 // Add some life
                 function (chart) {
-                    if (!chart.renderer.forExport) {
-                        setInterval(function () {
-                            var point = chart.series[0].points[0],
-                                    newVal,
-                                    inc = Math.round((Math.random() - 0.5) * 20);
-
-                            newVal = point.y + inc;
-                            if (newVal < 0 || newVal > 200) {
-                                newVal = point.y - inc;
-                            }
-
-                            point.update(newVal);
-
-                        }, 3000);
-                    }
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+////                                    newVal,
+////                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+////                            newVal = point.y + inc;
+////                            if (newVal < 0 || newVal > 200) {
+////                                newVal = point.y - inc;
+////                            }
+//
+////                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
                 });
     });
 
@@ -338,21 +338,21 @@
                 },
                 // Add some life
                 function (chart) {
-                    if (!chart.renderer.forExport) {
-                        setInterval(function () {
-                            var point = chart.series[0].points[0],
-                                    newVal,
-                                    inc = Math.round((Math.random() - 0.5) * 20);
-
-                            newVal = point.y + inc;
-                            if (newVal < 0 || newVal > 200) {
-                                newVal = point.y - inc;
-                            }
-
-                            point.update(newVal);
-
-                        }, 3000);
-                    }
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
                 });
     });
 
@@ -463,21 +463,21 @@
                 },
                 // Add some life
                 function (chart) {
-                    if (!chart.renderer.forExport) {
-                        setInterval(function () {
-                            var point = chart.series[0].points[0],
-                                    newVal,
-                                    inc = Math.round((Math.random() - 0.5) * 20);
-
-                            newVal = point.y + inc;
-                            if (newVal < 0 || newVal > 200) {
-                                newVal = point.y - inc;
-                            }
-
-                            point.update(newVal);
-
-                        }, 3000);
-                    }
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
                 });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index f44bb9325..b49cbb03f 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag 'highcharts','highcharts-more' %>
   <%= render :partial => "hightchars" %>
   <div class="project_r_h">
-    <h2 class="project_h2" style="width:180px;">SonarQube质量分析</h2>
+    <h2 class="project_h2" style="width:180px;">质量分析</h2>
   </div>
   <!--<a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">branch:master</a>-->
   <div class="cl"></div>
@@ -35,8 +35,9 @@
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2">查看详情</span></div>
-    <div><span class="fontGrey3 mr30">质量问题</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][0]["frmt_val"] %></span><span class="fontGrey2">问题分类如下：</span></div>
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+    <div><span class="fontGrey3 mr30">质量问题</span>
+      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%= @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
       <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 200) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 200) %>%;"></span></span></div>
@@ -68,46 +69,46 @@
       <p class="fontBlue2"><%= @complexity["msr"][4]["frmt_val"] %></p>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>
-  <div class="analysis-block mt10 f12">
-    <ul class="contribute-list">
-      <li class="fl fontGrey2 contribute-list-avatar">&nbsp;</li>
-      <li class="fl fontGrey2 contribute-list-code">代码行数</li>
-      <li class="fl fontGrey2 contribute-list-problem">引入质量问题数</li>
-      <li class="fl fontGrey2 contribute-list-rate">引入质量问题数/代码行数</li>
-      <div class="cl"></div>
-    </ul>
-    <ul class="contribute-list">
-      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
-        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
-          <p class="fontGrey2 hidden">小明</p>
-        </div>
-      </li>
-      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">18340</li>
-      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">230</li>
-      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.012540</li>
-      <div class="cl"></div>
-    </ul>
-    <ul class="contribute-list">
-      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
-        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
-          <p class="fontGrey2 hidden">小王</p>
-        </div>
-      </li>
-      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">834</li>
-      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">34</li>
-      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.04077</li>
-      <div class="cl"></div>
-    </ul>
-    <ul class="contribute-list">
-      <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
-        <div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />
-          <p class="fontGrey2 hidden">小亮</p>
-        </div>
-      </li>
-      <li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">134</li>
-      <li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">10</li>
-      <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.07462</li>
-      <div class="cl"></div>
-    </ul>
-  </div>
+  <!--<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>-->
+  <!--<div class="analysis-block mt10 f12">-->
+    <!--<ul class="contribute-list">-->
+      <!--<li class="fl fontGrey2 contribute-list-avatar">&nbsp;</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-code">代码行数</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-problem">引入质量问题数</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-rate">引入质量问题数/代码行数</li>-->
+      <!--<div class="cl"></div>-->
+    <!--</ul>-->
+    <!--<ul class="contribute-list">-->
+      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+          <!--<p class="fontGrey2 hidden">小明</p>-->
+        <!--</div>-->
+      <!--</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">18340</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">230</li>-->
+      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.012540</li>-->
+      <!--<div class="cl"></div>-->
+    <!--</ul>-->
+    <!--<ul class="contribute-list">-->
+      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+          <!--<p class="fontGrey2 hidden">小王</p>-->
+        <!--</div>-->
+      <!--</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">834</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">34</li>-->
+      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.04077</li>-->
+      <!--<div class="cl"></div>-->
+    <!--</ul>-->
+    <!--<ul class="contribute-list">-->
+      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+          <!--<p class="fontGrey2 hidden">小亮</p>-->
+        <!--</div>-->
+      <!--</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">134</li>-->
+      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">10</li>-->
+      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.07462</li>-->
+      <!--<div class="cl"></div>-->
+    <!--</ul>-->
+  <!--</div>-->

From d34898172192365390bef7e0cbafef341d47204e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 13:29:36 +0800
Subject: [PATCH 550/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/user.rb               |  7 ++++
 app/helpers/courses_helper.rb                 | 34 ++++++++-----------
 app/models/course.rb                          |  5 +--
 app/services/courses_service.rb               |  7 ++--
 ...20160624032138_add_index_to_invite_code.rb |  6 ++++
 db/schema.rb                                  |  5 ++-
 public/assets/wechat/myclass.html             | 11 ++----
 .../javascripts/wechat/controllers/myclass.js |  7 ++++
 public/javascripts/wechat/others/filter.js    | 11 +++++-
 public/stylesheets/weui/weixin.css            |  5 +--
 10 files changed, 63 insertions(+), 35 deletions(-)
 create mode 100644 db/migrate/20160624032138_add_index_to_invite_code.rb

diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb
index 8c6a839b3..2eb20f0db 100644
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@@ -26,6 +26,8 @@ module Mobile
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.student_id
                 when :realname
                   u.nil? ? "" : get_user_realname(u)
+                when :name
+                  u.nil? ? "" : u.show_name
               end
             end
           end
@@ -57,6 +59,11 @@ module Mobile
       user_expose :student_num
       # 活跃值
       user_expose :active_count
+
+      user_expose :role_name
+
+      user_expose :name
+
     end
   end
 
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index c10652c6f..47d343e8f 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -270,13 +270,22 @@ module CoursesHelper
 
   # =====================================================================================
   # return people list
+  def searchPeopleByName(course, role_name)
+    course.members.select{|m|
+      m.roles.any?{|r|r.name == role_name}
+    }
+  end
+
   def searchTeacherAndAssistant project
-    #searchPeopleByRoles(project, TeacherRoles)
-    members = []
-    project.members.includes(:user).each do |m|
-       members << m  if m && m.user && m.user.allowed_to?(:as_teacher,project)
-    end
-    members
+    searchPeopleByName(project, 'Manager').concat(
+        searchPeopleByName(project, 'Teacher')
+    ).concat(
+        searchPeopleByName(project, 'TeachingAsistant')
+    )
+  end
+
+  def searchStudent project
+    searchPeopleByName(project, 'Student')
   end
 
   def TeacherAndAssistantCount course
@@ -293,19 +302,6 @@ module CoursesHelper
     members
   end
 
-  def searchStudent project
-    #searchPeopleByRoles(project, StudentRoles)
-    members = []
-    project.members.each do |m|
-      if m && m.user && m.user.allowed_to?(:as_student,project)
-        members << m
-      end
-    end
-    members
-  end
-
-  
- 
   def searchStudent_by_name  project, name
     #searchPeopleByRoles(project, StudentRoles)
     members = []
diff --git a/app/models/course.rb b/app/models/course.rb
index c9ef010e6..d0266b381 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -457,8 +457,9 @@ class Course < ActiveRecord::Base
   CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
   def generate_invite_code
     code = invite_code
-    if !invite_code || invite_code.size <6
-      self.invite_code = CODES.sample(6).join
+    if !invite_code || invite_code.size <5
+      self.invite_code = CODES.sample(5).join
+      return generate_invite_code if Course.where(invite_code: invite_code).present?
       save! && reload
       code = invite_code
     end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 4d9231287..0eb699459 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -68,7 +68,6 @@ class CoursesService
     if current_user.nil? || !(current_user.admin? || c.is_public == 1 || (c.is_public == 0 && current_user.member_of_course?(c)))
       raise '403'
     end
-    @teachers= searchTeacherAndAssistant(c)
     #@canShowCode = isCourseTeacher(User.current.id,course) && params[:role] != '1'
     case params[:role]
       when '1'
@@ -87,7 +86,11 @@ class CoursesService
       gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
       work_unit = get_user_work_unit m.user
       location = get_user_location m.user
-      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
+      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender,
+                :work_unit => work_unit, :mail => m.user.mail, :location => location,
+                role_name: m.roles.first.name,
+                name: m.user.show_name,
+                :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
     end
     users
   end
diff --git a/db/migrate/20160624032138_add_index_to_invite_code.rb b/db/migrate/20160624032138_add_index_to_invite_code.rb
new file mode 100644
index 000000000..420951874
--- /dev/null
+++ b/db/migrate/20160624032138_add_index_to_invite_code.rb
@@ -0,0 +1,6 @@
+class AddIndexToInviteCode < ActiveRecord::Migration
+  def change
+    add_column :courses, :qrcode, :string
+    add_index :courses, :invite_code, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 820c6a035..9db65aca0 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 => 20160614072229) do
+ActiveRecord::Schema.define(:version => 20160624032138) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -551,8 +551,11 @@ ActiveRecord::Schema.define(:version => 20160614072229) do
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
     t.string   "invite_code"
+    t.string   "qrcode"
   end
 
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/myclass.html
index f12364130..30a8b9083 100644
--- a/public/assets/wechat/myclass.html
+++ b/public/assets/wechat/myclass.html
@@ -15,22 +15,17 @@
         </div>
     </div>
     <div ng-class="{'undis': currentTab!=1}">
-        <div class="class-detail-row border-top f13 c-grey3"><span class="fl ml10">资源名称001</span></div>
-        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称002</span></div>
-        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称003</span></div>
-        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称004</span></div>
-        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称005</span></div>
-        <div class="class-detail-row f13 c-grey3"><span class="fl ml10">资源名称006</span></div>
+            <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span></div>
     </div>
     <div ng-class="{'undis': currentTab!=2}">
         <div class="member-banner f13 c-grey3">授课老师</div>
 
         <div class="class-detail-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
-            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{teacher.realname}}</span><span class="fr mr10 c-grey2">教辅</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{teacher.name}}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
         </div>
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
         <div class="class-detail-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
-            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{student.realname}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
         </div>
 
     </div>
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/myclass.js
index bf864ab88..b689e0f55 100644
--- a/public/javascripts/wechat/controllers/myclass.js
+++ b/public/javascripts/wechat/controllers/myclass.js
@@ -22,10 +22,17 @@ app.controller('MyClassController', ['$scope', 'config','$http', 'auth','$locati
     vm.course = {};
     vm.students = [];
     vm.teachers = [];
+    vm.resources = [];
     
     vm.invite = function(){
        $location.path("/invite_code").search({id: courseid}); 
     };
+
+    $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
+        {token: auth.token(), name: ''}
+    ).then(function(response){
+        vm.resources = response.data.data;
+    });
     
     $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
         function(response){
diff --git a/public/javascripts/wechat/others/filter.js b/public/javascripts/wechat/others/filter.js
index dcb8e9e6a..96007958d 100644
--- a/public/javascripts/wechat/others/filter.js
+++ b/public/javascripts/wechat/others/filter.js
@@ -2,4 +2,13 @@ app.filter('safeHtml', ['$sce',function ($sce) {
     return function (input) {
         return $sce.trustAsHtml(input);
     }
-}]);
\ No newline at end of file
+}]);
+
+app.filter('identify', function () {
+    return function(input){
+        if (input == 'TeachingAsistant'){
+            return '教辅'
+        }
+        return '';
+    }
+})
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 12e11b5fa..8391b1083 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -4,6 +4,7 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体","Helvetica Neue", Helvetica, Arial, sans-serif;}
 body, ul, h1,h2,h3,h4,h5,p,pre,input {padding:0px; margin:0px;}
+body{background-color: #EFEFF4;}
 ul li {list-style:none;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
@@ -125,8 +126,8 @@ a.underline {text-decoration:underline;}
 
 /*20160613邀请码样式*/
 .qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
-.qr-code-box {width:225px; height:332px; background-color:#fff; border-radius:3px; margin:0 auto;}
-.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.qr-code-box {width:225px; background-color:#fff; border-radius:3px; margin:0 auto;}
+.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc;}
 .qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
 .qr-code-img {margin:36px auto; display:block;}
 .invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}

From 64d87b73988657765cd4852b287ea4ffbe87bb95 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 13:50:28 +0800
Subject: [PATCH 551/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  8 +++++++
 .../org_member_autocomplete.js.erb            | 23 +++++++++++++++++++
 app/views/organizations/setting.html.erb      |  3 ++-
 config/routes.rb                              |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/views/organizations/org_member_autocomplete.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b36ef592d..e052ec20f 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -642,4 +642,12 @@ class OrganizationsController < ApplicationController
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end
   end
+
+  def org_member_autocomplete
+    @org = Organization.find(params[:org])
+    @flag = params[:flag] || false
+    respond_to do |format|
+      format.js
+    end
+  end
 end
diff --git a/app/views/organizations/org_member_autocomplete.js.erb b/app/views/organizations/org_member_autocomplete.js.erb
new file mode 100644
index 000000000..1dbb972f8
--- /dev/null
+++ b/app/views/organizations/org_member_autocomplete.js.erb
@@ -0,0 +1,23 @@
+<% if @org%>
+var checked = $("#principals_for_new_member input:checked").size();
+if(checked > 0)
+{
+    alert('翻页或搜索后将丢失当前选择的用户数据!');
+}
+<% if @flag == "true"%>
+$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
+<% else%>
+$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
+<% end%>
+
+<%end%>
+var collection=$("#principals_for_new_member").children("#principals").children("label");
+collection.css("text-overflow","ellipsis");
+collection.css("white-space","nowrap");
+collection.css("width","200px");
+collection.css("overflow","hidden");
+for(i=0;i<collection.length;i++){    //增加悬浮显示
+    var label=collection[i];
+    var text=$(label).text();
+    $(label).attr("title",text);
+}
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 3a5a8c175..edf00cd78 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,7 +112,8 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>
diff --git a/config/routes.rb b/config/routes.rb
index ec8fa2337..7008b3ab7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,6 +104,7 @@ RedmineApp::Application.routes.draw do
       post 'agree_apply_subdomain'
       post 'update_field_by_admin'
       post 'reset_update_field_by_admin'
+      get 'org_member_autocomplete'
     end
   end
 

From e21f4e0b4dda91f1efab82d73b283b2e58272344 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 13:52:11 +0800
Subject: [PATCH 552/668] merge

---
 public/javascripts/wechat/app.js | 439 +------------------------------
 1 file changed, 1 insertion(+), 438 deletions(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 5c0d7d5bf..00d6bf3bc 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,66 +1,9 @@
 var app = angular.module('wechat', ['ngRoute']);
 
-<<<<<<< HEAD
 app.constant('config', {
     rootPath: '/assets/wechat/',
     rootUrl: '/',
     apiUrl: '/api/v1/'
-=======
-if(debug===true){
-    //apiUrl = 'http://localhost:3000/api/v1/';
-    apiUrl = 'http://www.trustie.net/api/v1/';
-}
-
-
-app.factory('auth', function($http,$routeParams, $q){
-    var _openid = '';
-
-    if(typeof g_openid !== 'undefined'){
-        _openid = g_openid;
-    }
-
-    if(debug===true){
-        _openid = "1"; //guange的帐号
-    }
-
-    var getOpenId = function() {
-        var deferred = $q.defer();
-        if (typeof _openid !== 'undefined' && _openid.length > 0){
-            deferred.resolve(_openid);
-        } else {
-            var code = $routeParams.code;
-            $http({
-                url: '/wechat/get_open_id',
-                data: {code: code},
-                method: 'POST'
-            }).then(function successCallback(response) {
-                _openid = response.data.openid;
-                deferred.resolve(_openid);
-            }, function errorCallback(response) {
-                deferred.reject(response);
-            });
-        }
-        return deferred.promise;
-    };
-    var openid = function(){
-        return _openid;
-    };
-    return {getOpenId: getOpenId, openid: openid};
-});
-
-
-app.factory('rms', function(){
-    var _saveStorage = {};
-    var save = function(key, value){
-        _saveStorage[key] = value;
-    };
-
-    var get = function(key){
-        return _saveStorage[key];
-    };
-
-    return {save: save, get: get};
->>>>>>> b17b92cc3ec7341ef1d1e2179be0de623605a725
 });
 
 
@@ -73,394 +16,14 @@ app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope,
 
     $rootScope.$on('$routeChangeError', function(event, next, current){
 
-<<<<<<< HEAD
         if(next && next.templateUrl){
             if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
                 $location.path("/login");
-=======
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.factory('common', function($http, auth, $routeParams){
-    var addCommonReply = function(id, type, data, cb){
-
-        if(!data.comment || data.comment.length<=0){
-            return;
-        }
-
-        var temp =  data.comment.replace(/\n/g,'<br/>');
-
-        var userInfo = {
-            type: type,
-            content: temp,
-            openid: auth.openid()
-        };
-        //回复按钮禁用
-        data.disabled = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl+ "new_comment/"+id,
-            data: userInfo
-        }).then(function successCallback(response) {
-            //alert("提交成功");
-            if(typeof cb === 'function'){
-                cb();
->>>>>>> b17b92cc3ec7341ef1d1e2179be0de623605a725
             }
         }
-<<<<<<< HEAD
     });
 
     $rootScope.$on('$routeChangeStart', function(event, next, current){
     });
 }
-]);
-=======
-    );
-
-    $scope.addIssueReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Issue', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.homework = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addHomeworkReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'newss').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.news = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addNoticeReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'News', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.discussion = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addDiscussionReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Message', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.message = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addJournalReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.blog = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addBlogReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.filter('safeHtml', function ($sce) {
-    return function (input) {
-        return $sce.trustAsHtml(input);
-    }
-});
-
-//app.directive('textAutoHeight', function($timeout){
-//    return {
-//        restrict: 'A',
-//        scope: {},
-//        link: function(scope, element, attr){
-//            scope.text = '点击展开';
-//            $timeout(function(){
-//                var e = element.parent().children().eq(5);
-//                var height = e[0].scrollHeight;
-//                if(height>90){
-//                    element.css('display', 'block');
-//                    element.on('click', function(){
-//                        if(element.text() == "点击展开"){
-//                            e.css("height", height+'px');
-//                            element.text("点击隐藏");
-//                        } else {
-//                            e.css("height", '90px');
-//                            element.text("点击展开");
-//                        }
-//
-//                    });
-//                }
-//            }, false);
-//
-//        }
-//    }
-//});
-
-app.directive('inputAuto',function(){
-    return{
-        restrict: 'A',
-        scope: {},
-        link: function(scope, element){
-                var copyContainer = element.parent().children().eq(0);
-                var sendButton = element.parent().next();
-                element.on('input',function(){
-                    console.log(sendButton);
-                    copyContainer.html(element[0].value);
-                    var textHeight = copyContainer[0].scrollHeight;
-                    element.css('height', textHeight + 'px');
-                });
-                sendButton.on('click',function(){
-                    element.css('height','28px');
-                });
-            }
-    }
-});
-
-app.directive('loadingSpinner', ['$http', function ($http) {
-    return {
-        restrict: 'A',
-        replace: true,
-        template: '<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
-    };
-}]);
-
-app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
-    var rootPath = '/assets/wechat/'
-    //$locationProvider.html5Mode(true);
-    $routeProvider
-        .when('/activites', {
-            templateUrl: rootPath + 'activities.html',
-            controller: 'ActivityController'
-        })
-        .when('/issues/:id', {
-            templateUrl: rootPath + 'issue_detail.html',
-            controller: 'IssueController'
-        })
-        .when('/project_discussion/:id', {
-            templateUrl: rootPath + 'project_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/homework/:id', {
-            templateUrl: rootPath + 'homework_detail.html',
-            controller: 'HomeworkController'
-        })
-        .when('/course_notice/:id', {
-            templateUrl: rootPath + 'course_notice.html',
-            controller: 'CourseNoticeController'
-        })
-        .when('/course_discussion/:id', {
-            templateUrl: rootPath + 'course_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/journal_for_message/:id', {
-            templateUrl: rootPath + 'jour_message_detail.html',
-            controller: 'JournalsController'
-        })
-        .when('/blog_comment/:id', {
-            templateUrl: rootPath + 'blog_detail.html',
-            controller: 'BlogController'
-        })
-        .otherwise({
-            redirectTo: '/activites'
-        });
-
-        //监听异步请求,实现加载中显隐标记
-        $httpProvider.interceptors.push(function ($q, $rootScope) {
-            if ($rootScope.activeCalls == undefined) {
-                $rootScope.activeCalls = 0;
-            }
-
-            return {
-                request: function (config) {
-                    $rootScope.activeCalls += 1;
-                    return config;
-                },
-                requestError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                },
-                response: function (response) {
-                    $rootScope.activeCalls -= 1;
-                    return response;
-                },
-                responseError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                }
-            };
-        });
-}]);
->>>>>>> b17b92cc3ec7341ef1d1e2179be0de623605a725
+]);
\ No newline at end of file

From 86a5eccae6731968f43c80cdca011e62f3e2f726 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 14:16:39 +0800
Subject: [PATCH 553/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98BUG=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  8 -------
 .../org_member_autocomplete.js.erb            | 23 -------------------
 app/views/organizations/setting.html.erb      |  4 ++--
 config/routes.rb                              |  1 -
 public/javascripts/application.js             |  1 +
 5 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 app/views/organizations/org_member_autocomplete.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index e052ec20f..b36ef592d 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -642,12 +642,4 @@ class OrganizationsController < ApplicationController
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end
   end
-
-  def org_member_autocomplete
-    @org = Organization.find(params[:org])
-    @flag = params[:flag] || false
-    respond_to do |format|
-      format.js
-    end
-  end
 end
diff --git a/app/views/organizations/org_member_autocomplete.js.erb b/app/views/organizations/org_member_autocomplete.js.erb
deleted file mode 100644
index 1dbb972f8..000000000
--- a/app/views/organizations/org_member_autocomplete.js.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @org%>
-var checked = $("#principals_for_new_member input:checked").size();
-if(checked > 0)
-{
-    alert('翻页或搜索后将丢失当前选择的用户数据!');
-}
-<% if @flag == "true"%>
-$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-<% else%>
-$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-<% end%>
-
-<%end%>
-var collection=$("#principals_for_new_member").children("#principals").children("label");
-collection.css("text-overflow","ellipsis");
-collection.css("white-space","nowrap");
-collection.css("width","200px");
-collection.css("overflow","hidden");
-for(i=0;i<collection.length;i++){    //增加悬浮显示
-    var label=collection[i];
-    var text=$(label).text();
-    $(label).attr("title",text);
-}
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index edf00cd78..a2f8a8f29 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,8 +112,8 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>
diff --git a/config/routes.rb b/config/routes.rb
index 7008b3ab7..ec8fa2337 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,7 +104,6 @@ RedmineApp::Application.routes.draw do
       post 'agree_apply_subdomain'
       post 'update_field_by_admin'
       post 'reset_update_field_by_admin'
-      get 'org_member_autocomplete'
     end
   end
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 22483c1d5..a2f14332d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -547,6 +547,7 @@ function observeSearchfield(fieldId, targetId, url) {
         $.ajax({
           url: url,
           type: 'get',
+          dataType: 'jsonp',
           data: {q: $this.val()},
           success: function(data){ if(targetId) $('#'+targetId).html(data); },
           beforeSend: function(){ $this.addClass('ajax-loading'); },

From 06fe02890fb8ba2a522d7baea010b681b2919c31 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 14:59:17 +0800
Subject: [PATCH 554/668] index for sonar result

---
 .../quality_analysis_controller.rb            | 13 ++++----
 app/models/quality_analysis.rb                |  2 +-
 .../projects/_development_group.html.erb      |  4 +++
 .../quality_analysis/_result_list.html.erb    | 30 ++++++++++---------
 .../repositories/_quality_analysis.html.erb   |  2 +-
 app/views/repositories/show.html.erb          |  8 +++--
 ...24054614_add_column_to_quality_analyses.rb |  6 ++++
 ...4055127_add_languae_to_quality_analyses.rb |  5 ++++
 db/schema.rb                                  |  5 +++-
 9 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 db/migrate/20160624054614_add_column_to_quality_analyses.rb
 create mode 100644 db/migrate/20160624055127_add_languae_to_quality_analyses.rb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 152335dd8..45d5a0ebf 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -25,8 +25,8 @@ class QualityAnalysisController < ApplicationController
     language = params[:language]
     path = params[:path]
     identifier = params[:identifier]
-    qa = QualityAnalysis.where(:project_id => @project.id).first
-    version = qa.sonar_version + 1
+    qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
+    version = qa.nil? ? 1 : qa.sonar_version + 1
     properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
         sonar.projectVersion=#{version}
@@ -47,9 +47,9 @@ class QualityAnalysisController < ApplicationController
     # genkins address
     @g.add_project_hook(@project.gpid, (jenkins_address + "/project/#{user_name}_#{identifier}"))
     if qa.nil?
-      QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :version => version)
+      QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
     else
-      qa.update_attribute(:version, version)
+      qa.update_attribute(:sonar_version, version)
     end
   end
 
@@ -57,8 +57,9 @@ class QualityAnalysisController < ApplicationController
     @sonar_address = Redmine::Configuration['sonar_address']
     if params[:resource_id].nil?
       @name_flag = true
-      projects_date = open(sonar_address + "/api/projects/index").read
-      @results = JSON.parse(projects_date)
+      @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+      # projects_date = open(@sonar_address + "/api/projects/index").read
+      # @results = JSON.parse(projects_date)
     else
       @name_flag = false
       @resource_id = params[:resource_id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 09803467e..40a0d82e9 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,3 +1,3 @@
 class QualityAnalysis < ActiveRecord::Base
-  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version
+  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier
 end
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 2c7d36fb5..298416fd1 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -56,6 +56,10 @@
     <% end %>
   </div>
 <% end %>
+<!--quality_analysis-->
+<div class="subNav">
+  <%= link_to "zhiliangfenxi", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
+</div>
 <!-- more -->
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
 <ul class="navContent" id="navContent">
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 4008bf6e5..a6e1f6431 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -1,16 +1,18 @@
-<div style="min-height: 687px;" id="RSide" class="fl">
-  <div class="project_r_h">
-    <h2 class="project_h2">分析结果</h2>
-  </div>
-  <% @results.each do |result| %>
-      <ul class="analysis-result-list">
-        <li title="Name"><%=link_to result["k"], project_quality_analysis_path(:resource_id => result["id"]), :class => "analysis-result-name fl fontBlue2" %></li>
-        <li class="analysis-result-version fl fontBlue2" title="Version">1.0</li>
-        <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
-        <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
-        <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
-        <div class="cl"></div>
-      </ul>
-  <% end %>
+<div class="project_r_h">
+  <h2 class="project_h2">分析结果</h2>
 </div>
+<% if @quality_analyses.count >0 %>
+    <% @quality_analyses.each do |qa| %>
+        <ul class="analysis-result-list">
+          <li title="Name"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li class="analysis-result-version fl fontBlue2" title="Version">1.0</li>
+          <li class="analysis-result-loc fl fontBlue2" title="branch"><%= qa.branch %></li>
+          <li class="analysis-result-debt fl fontBlue2" title="Language"><%= qa.language %></li>
+          <li class="analysis-result-time fl fontBlue2" title="User"><<%= qa.author_login
+                                                                      %>/li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>
+
 
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index 7f6ab7ea1..f9726fb9b 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -12,7 +12,7 @@
         </div>
         <div class="mb10">
           <div>
-            <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
         <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index c639bcb6e..c096b732e 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,11 +2,13 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+  <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+  <% if User.current.member_of?(@project) %>
       <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
-  <% else %>
-      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fr" %>
   <% end %>
+  <%# else %>
+      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fr" %>
+  <%# end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>
diff --git a/db/migrate/20160624054614_add_column_to_quality_analyses.rb b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
new file mode 100644
index 000000000..ed3e6b137
--- /dev/null
+++ b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
@@ -0,0 +1,6 @@
+class AddColumnToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :path, :string
+    add_column :quality_analyses, :branch, :string
+  end
+end
diff --git a/db/migrate/20160624055127_add_languae_to_quality_analyses.rb b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
new file mode 100644
index 000000000..de531b1db
--- /dev/null
+++ b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddLanguaeToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :language, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 01a001769..ee2da177b 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 => 20160622074138) do
+ActiveRecord::Schema.define(:version => 20160624055127) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1841,6 +1841,9 @@ ActiveRecord::Schema.define(:version => 20160622074138) do
     t.datetime "updated_at",                      :null => false
     t.float    "version",        :default => 0.0
     t.integer  "sonar_version",  :default => 1
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
   end
 
   create_table "queries", :force => true do |t|

From 485d0e3743495ddda1e63d3b6d083bd11fed67a1 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 14:59:50 +0800
Subject: [PATCH 555/668] =?UTF-8?q?ticket=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/course.rb             |  1 +
 app/controllers/wechats_controller.rb         | 47 ++++++++++++-------
 app/models/course.rb                          | 13 +++++
 app/services/courses_service.rb               |  3 ++
 public/assets/wechat/invite_code.html         |  4 +-
 .../wechat/controllers/invite_code.js         | 16 +++++++
 6 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index fc5c95ef5..487a75c4d 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -46,6 +46,7 @@ module Mobile
       course_expose :term
       course_expose :time
       course_expose :invite_code
+      course_expose :qrcode
       course_expose :updated_at
       course_expose :course_student_num
       expose :teacher, using: Mobile::Entities::User do |c, opt|
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 75a8bac92..120de197a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -12,19 +12,8 @@ class WechatsController < ActionController::Base
       uw = user_binded?(request[:FromUserName])
       if !uw
         return sendBind()
-      elsif (course = join_class(content, uw.user)) && course
-        news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
-                                                                 content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
-        return request.reply.news(news) do |article, n, index| # article is return object
-          url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
-          pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
-          article.item title: "#{n[:title]}",
-                       description: n[:content],
-                       pic_url: pic_url,
-                       url: url
-        end
       else
-        return request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
+        return join_class(content, uw.user)
       end
     rescue => e
       return request.reply.text e
@@ -57,7 +46,16 @@ class WechatsController < ActionController::Base
 
   # When subscribe user scan scene_id in public account
   on :scan, with: 'scene_id' do |request, ticket|
-    request.reply.text "Subscribe user #{request[:FromUserName]} Ticket #{ticket}"
+    begin
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        return sendBind()
+      else
+        return join_class({ticket: ticket}, uw.user)
+      end
+    rescue => e
+      return request.reply.text e
+    end
   end
 
   # When no any on :scan responder can match subscribe user scaned scene_id
@@ -185,14 +183,31 @@ class WechatsController < ActionController::Base
     end
   end
 
-  def join_class(content, user)
+  def join_class(params, user)
+    course = nil
+    course = Course.where(qrcode: params[:ticket]) if params[:ticket]
+    course = Course.where(invite_code: params[:invite_code]) if params[:invite_code]
+    raise "课程不存在" if course.blank?
+
     cs = CoursesService.new
-    status = cs.join_course({invite_code: content.upcase.strip}, user)
+    status = cs.join_course(course.invite_code, user)
     logger.info status
     if status[:state] != 0
       raise CoursesService::JoinCourseError.message(status[:state])
     end
-    status[:course]
+
+    course = status[:course]
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
+                                                             content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
+    return request.reply.news(news) do |article, n, index| # article is return object
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
+      pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
+      article.item title: "#{n[:title]}",
+                   description: n[:content],
+                   pic_url: pic_url,
+                   url: url
+    end
+
   end
 
   ###  controller method
diff --git a/app/models/course.rb b/app/models/course.rb
index d0266b381..b8ec4181d 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -466,6 +466,19 @@ class Course < ActiveRecord::Base
     code
   end
 
+
+  def generate_qrcode
+    ticket = self.qrcode
+    if !ticket || ticket.size < 10
+      response = Wechat.api.qrcode_create_scene(invite_code)
+      logger.debug "response = #{response}"
+      self.qrcode = response['ticket']
+      save! && reload
+      ticket = qrcode
+    end
+    ticket
+  end
+
 end
 
 
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 0eb699459..3c74c328c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -165,6 +165,9 @@ class CoursesService
   #显示课程
   def show_course(params,current_user)
     course = Course.find(params[:id])
+    course.generate_invite_code
+    course.generate_qrcode
+
     if course.school
       work_unit = course.school.name
     else
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
index 116dad8da..6f56f7e86 100644
--- a/public/assets/wechat/invite_code.html
+++ b/public/assets/wechat/invite_code.html
@@ -2,12 +2,12 @@
     <div class="qr-code-wrap">
         <div class="qr-code-box">
             <div class="share-class-name">{{course.name}}</div>
-            <div class="qr-img-wrap"><img src="/images/wechat/QR-code.jpg" width="152" class="qr-code-img" /></div>
+            <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div>
             <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
         </div>
     </div>
     <div class="share-code-wrap">
-        <a href="javascript:void(0);" class="share-code-btn">分享邀请码</a>
+        <a ng-click="share()" href="javascript:void(0);" class="share-code-btn">分享邀请码</a>
         <div class="share-code-instruction"> 1.将此页面分享给好友，邀请好友加入班级<br />
             2.通过微信扫一扫加入班级<br />
             3.输入邀请码加入班级</div>
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
index b21653b1e..1b92f592c 100644
--- a/public/javascripts/wechat/controllers/invite_code.js
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -15,4 +15,20 @@ app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config
         }
     );
     
+    vm.share = function(){
+        window.WeixinJSBridge.invoke('sendAppMessage',{
+            'appid': 'wxf694495398c7d470', // 公众号appID
+            'type': 'link', // 非必填，music,vido或link,默认为link。
+            'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
+            'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
+            'img_height':370, // 缩略图高度
+            'img_width':550, // 缩略图宽度
+            'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
+            'desc':'desc', // 描述
+            'title':'title' // 标题
+        },function(res){
+            //alert(res.err_msg);
+        });
+    }
+    
 }]);

From 09b78fc5461255fa10a7c39d036bfe81193415a1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 15:13:09 +0800
Subject: [PATCH 556/668] =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_development_group.html.erb   | 2 +-
 app/views/quality_analysis/_result_list.html.erb | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 298416fd1..f3e1d0a1e 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -58,7 +58,7 @@
 <% end %>
 <!--quality_analysis-->
 <div class="subNav">
-  <%= link_to "zhiliangfenxi", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
+  <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
 </div>
 <!-- more -->
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index a6e1f6431..9bfb8e449 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -5,11 +5,10 @@
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
           <li title="Name"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier), :class => "analysis-result-name fl fontBlue2" %></li>
-          <li class="analysis-result-version fl fontBlue2" title="Version">1.0</li>
-          <li class="analysis-result-loc fl fontBlue2" title="branch"><%= qa.branch %></li>
-          <li class="analysis-result-debt fl fontBlue2" title="Language"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="User"><<%= qa.author_login
-                                                                      %>/li>
+          <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
+          <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
+          <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
+          <li class="analysis-result-time fl fontBlue2" title="用户"><<%= qa.author_login %>/li>
           <div class="cl"></div>
         </ul>
     <% end %>

From 16a9f017b683e98469d96952ed9861e762ddb726 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:28:44 +0800
Subject: [PATCH 557/668] error

---
 app/controllers/wechats_controller.rb | 4 ++++
 app/models/course.rb                  | 3 +++
 config/wechat.yml                     | 8 ++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 120de197a..bdd11d660 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -16,6 +16,8 @@ class WechatsController < ActionController::Base
         return join_class(content, uw.user)
       end
     rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
       return request.reply.text e
     end
   end
@@ -54,6 +56,8 @@ class WechatsController < ActionController::Base
         return join_class({ticket: ticket}, uw.user)
       end
     rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
       return request.reply.text e
     end
   end
diff --git a/app/models/course.rb b/app/models/course.rb
index b8ec4181d..d36f0e636 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -424,12 +424,14 @@ class Course < ActiveRecord::Base
   #   __elasticsearch__.delete_document
   # end
   def create_course_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public == 1 and self.is_delete == 0  #公开 和 没有被删除的课程才被索引
       self.__elasticsearch__.index_document
     end
   end
 
   def update_course_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
         self.__elasticsearch__.update_document
@@ -446,6 +448,7 @@ class Course < ActiveRecord::Base
   end
 
   def delete_course_ealasticsearch_index
+    return if Rails.env.development?
     begin
         self.__elasticsearch__.delete_document
     rescue => e
diff --git a/config/wechat.yml b/config/wechat.yml
index cf5be1f2b..711f2f1f8 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -5,11 +5,11 @@ default: &default
 # Or if using public account, only need above two line
 
   # guange test
-  #appid: "wxf694495398c7d470"
-  #secret: "743e038392f1d89540e95f8f7645849a"
+  appid: "wxf694495398c7d470"
+  secret: "743e038392f1d89540e95f8f7645849a"
 
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+#  appid: "wx8e1ab05163a28e37"
+#  secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
   access_token: "1234567"

From 7e2482167d15a723462b417af09f04d854b87a08 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:31:45 +0800
Subject: [PATCH 558/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index bdd11d660..15d4ab2e1 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -13,7 +13,7 @@ class WechatsController < ActionController::Base
       if !uw
         return sendBind()
       else
-        return join_class(content, uw.user)
+        return join_class({invite_code: content}, uw.user)
       end
     rescue => e
       logger.error e.inspect

From ac629440b1fc4838ad8046b8a90ffb9a451c6f11 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 15:33:45 +0800
Subject: [PATCH 559/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb                            |  2 +-
 app/services/courses_service.rb                 |  4 ++--
 app/views/courses/_copy_course.html.erb         | 12 ++++++------
 app/views/courses/_join_private_course.html.erb | 14 +++++---------
 app/views/courses/new.html.erb                  |  6 +++---
 app/views/courses/settings.html.erb             |  8 ++++----
 app/views/layouts/base_courses.html.erb         |  6 ++++++
 public/javascripts/course.js                    |  4 ++--
 8 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index e3a845b11..92794bd53 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -65,7 +65,7 @@ class Course < ActiveRecord::Base
   acts_as_attachable :view_permission => :view_course_files,
                      :delete_permission => :manage_files
   
-  validates_presence_of :password, :term,:name
+  validates_presence_of :term,:name
   validates_format_of  :class_period, :with =>/^[1-9]\d*$/
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 2c8387349..ba5a38b0e 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -193,7 +193,7 @@ class CoursesService
       @course.extra = 'course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
       @course.send(:safe_attributes=, params[:course], current_user)
       #@course.safe_attributes(current_user,params[:course])
-      @course.password = params[:course][:password]
+      #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]
@@ -252,7 +252,7 @@ class CoursesService
   def edit_course(params,course,current_user)
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
-    course.password = params[:course][:password]
+    #course.password = params[:course][:password]
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3b6d55d96..dbe03d67f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
 <script type="text/javascript">
     function submit_copy_course() {
-        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
         {
             $("#new_course").submit();
             document.getElementById("submit_copy_course").onclick = "";
@@ -79,15 +79,15 @@
       <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
     </li>
     <div class="cl"></div>
-    <li class="ml45 mb10">
-      <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+    <!--<li class="ml45 mb10">
+      <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
       <input type="text" style="display: none;">
-      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%=@course.password %>">
-      <!--<a id="psw_btn" href="javascript:void(0)">显示明码</a>-->
+      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%#=@course.password %>">
+      &lt;!&ndash;<a id="psw_btn" href="javascript:void(0)">显示明码</a>&ndash;&gt;
       <span class="c_red" id="new_course_course_password_notice"></span>
       <div class="cl"></div>
       <span class="ml95 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-    </li>
+    </li>-->
     <li class="ml50">
       <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
       <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl grey_border"  ><%= @course.description.nil? ? "" : @course.description %></textarea>
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 873144afe..7a7f85930 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -50,7 +50,7 @@
   <div class="C"  >
     <div class="C_top">
       <h2>快速进入课程通道</h2>
-      <p>只要持有课程ID和密码，就可快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
+      <p>只要持有课程邀请码，就可以快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
     </div>
     <div class="C_form">
       <%= form_tag({:controller => 'courses',
@@ -62,16 +62,12 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 68px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
-              <input class=" width190" name="object_id" id="object_id" type="text" value="" >
+              <span class="tips" style="width: 90px; display: inline-block;">课程邀请码：</span>
+              <input class="width190" style="margin-left: 0px;" name="object_id" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
-            <li class="mB5">课程ID是所在课程网址中显示的序号</li>
-            <li>
-              <span class="tips" style="width: 68px; display: inline-block;">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
-              <input class=" width190" type="password" name="course_password" id="course_password" value="" >
-            </li>
-            <li style="margin-top: 30px;">
+            <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
+            <li style="margin-top: 15px;">
               <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
               <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
                   <select name="role" class="IDType">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index ef1a0fc58..ddaf17ae8 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -32,15 +32,15 @@
           <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
         </li>
         <div class="cl"></div>
-        <li class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+        <!--<li class="ml45 mb10">
+          <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
           <input type="text" style="display: none;">
           <input  type="password" name="course[password]" id="new_course_course_password" class="hwork_input02" onkeyup="regex_course_password('new');">
           <a id="psw_btn" href="javascript:void(0)">显示明码</a>
           <span class="c_red" id="new_course_course_password_notice"></span>
           <div class="cl"></div>
           <span class="ml80 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-        </li>
+        </li>-->
         <li class="ml45">
           <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
           <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  ></textarea>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 82123a767..3afa8387a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -57,14 +57,14 @@
             <span class="c_red" id="edit_course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
-          <li class="ml45 mb10">
-            <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password('edit');">
+          <!--<li class="ml45 mb10">
+            <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%#= @course.password%>" onkeyup="regex_course_password('edit');">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
             <span class="c_red" id="edit_course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-          </li>
+          </li>-->
           <li class="ml45">
             <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
             <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  maxlength="6000"><%= @course.description%></textarea>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 181eefb98..7b935105f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,6 +57,12 @@
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
         <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
+      <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
+          <div class="info_box mb10">
+            <p class="f14">邀请码</p>
+            <p class="f14 fontBlue2">123456</p>
+          </div>
+      <% end %>
       <div class="info_box">
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 6fbf9f8c4..8b5e58618 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -185,7 +185,7 @@ function regex_course_password(str)
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
     {
         $("#new_course").submit();
     }
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit')&&regex_course_password('edit'))
+    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit'))
     {
         $("#edit_course_"+id).submit();
     }

From 9ec1f916b6851bab2894411d78a48b7b395c4f45 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:38:46 +0800
Subject: [PATCH 560/668] .

---
 app/controllers/wechats_controller.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 15d4ab2e1..78484ca7f 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -189,9 +189,9 @@ class WechatsController < ActionController::Base
 
   def join_class(params, user)
     course = nil
-    course = Course.where(qrcode: params[:ticket]) if params[:ticket]
-    course = Course.where(invite_code: params[:invite_code]) if params[:invite_code]
-    raise "课程不存在" if course.blank?
+    course = Course.where(qrcode: params[:ticket]).first if params[:ticket]
+    course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]
+    raise "课程不存在" unless course
 
     cs = CoursesService.new
     status = cs.join_course(course.invite_code, user)
@@ -200,7 +200,6 @@ class WechatsController < ActionController::Base
       raise CoursesService::JoinCourseError.message(status[:state])
     end
 
-    course = status[:course]
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
                                                              content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
     return request.reply.news(news) do |article, n, index| # article is return object

From c522d7160cafbd6b2f3a4537f6db061da3a66722 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:40:27 +0800
Subject: [PATCH 561/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 78484ca7f..c2891e850 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -194,7 +194,7 @@ class WechatsController < ActionController::Base
     raise "课程不存在" unless course
 
     cs = CoursesService.new
-    status = cs.join_course(course.invite_code, user)
+    status = cs.join_course({invite_code: course.invite_code}, user)
     logger.info status
     if status[:state] != 0
       raise CoursesService::JoinCourseError.message(status[:state])

From 9a9f6400da0376131e91a3b5413e554f7b6067b9 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:42:00 +0800
Subject: [PATCH 562/668] .

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index c2891e850..33561c242 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -13,7 +13,7 @@ class WechatsController < ActionController::Base
       if !uw
         return sendBind()
       else
-        return join_class({invite_code: content}, uw.user)
+        return join_class({invite_code: content}, uw.user, request)
       end
     rescue => e
       logger.error e.inspect
@@ -53,7 +53,7 @@ class WechatsController < ActionController::Base
       if !uw
         return sendBind()
       else
-        return join_class({ticket: ticket}, uw.user)
+        return join_class({ticket: ticket}, uw.user, request)
       end
     rescue => e
       logger.error e.inspect
@@ -187,7 +187,7 @@ class WechatsController < ActionController::Base
     end
   end
 
-  def join_class(params, user)
+  def join_class(params, user, request)
     course = nil
     course = Course.where(qrcode: params[:ticket]).first if params[:ticket]
     course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]

From 657e5060712eedab31b2b68bb7fa47768d63437c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 15:45:50 +0800
Subject: [PATCH 563/668] .

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

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 3c74c328c..bdd6564ae 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -355,7 +355,7 @@ class CoursesService
               #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
             elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
               #如果已经发送过消息了，那么就要给个提示
-              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
                 @state = 7
               else
                 Mailer.run.join_course_request(course, User.current, params[:role])

From 4ea210a05b5b38ca33158e83802bbc44dbf6c532 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 15:46:04 +0800
Subject: [PATCH 564/668] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index b49cbb03f..4fd1beb25 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -23,7 +23,7 @@
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-        <p class="fontGrey3">重复</p>
+        <p class="fontGrey3">代码重复度</p>
         <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[0] %></span></p>
       </div>
       <div class="analysis-genral">

From ec33569033c7b4cce628981af86f06e57fa207c2 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 24 Jun 2016 15:54:56 +0800
Subject: [PATCH 565/668] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb           | 4 +---
 app/views/student_work/_evaluation_title.html.erb    | 2 +-
 app/views/student_work/_evaluation_un_title.html.erb | 2 +-
 app/views/student_work/index.js.erb                  | 1 -
 public/javascripts/resizeable_table.js               | 5 +++--
 public/stylesheets/courses.css                       | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index f3a72b20e..bdfd2c96f 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,6 +1,4 @@
-<%= javascript_include_tag 'resizeable_table'%>
-
-<table class="hwork-table-wrap">
+<table class="hwork-table-wrap" style="border-bottom:1px solid #eaeaea;">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
     <th class="hworkList50">&nbsp;&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 950c1660a..1914b1018 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 5ed2e82d6..1b3683506 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,4 +1,4 @@
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
+<table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index f65782805..16aac9945 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,3 +1,2 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
 $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-$("th").each(function(){$(this).css("width",$(this).width()-1);});
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index 0b46f9a35..e5b57844a 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -1,7 +1,7 @@
 /**
  * Created by ttang on 2016/5/24.
  */
-    $(document).ready(function(){
+   /* $(document).ready(function(){
         $("th").each(function(){
             $(this).css("width",$(this).width()-1);
         });
@@ -80,4 +80,5 @@
                element.addEventListener?element.addEventListener(type,listener,useCapture):element.attachEvent("on" + type,listener);
            }
        }
-    });
\ No newline at end of file
+    });
+*/
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index b45bc1f32..c69f3c0cc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1; text-align:center;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}

From afc8fad7fd0935cad703e5951b028dfd32a7a0f1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 16:12:24 +0800
Subject: [PATCH 566/668] =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         |  2 +-
 app/services/courses_service.rb               | 14 ++++-----
 .../courses/_join_private_course.html.erb     |  2 +-
 app/views/layouts/base_courses.html.erb       |  2 +-
 db/schema.rb                                  | 29 +++++++++++++++++++
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2e8aebce5..2e66f29a3 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -74,7 +74,7 @@ class CoursesController < ApplicationController
     else
       @state = 5 #未登录
     end
-    @object_id = params[:object_id]
+    @object_id = @course.id if @course
     respond_to do |format|
       format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 8bec9040c..41fb18b61 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -326,11 +326,7 @@ class CoursesService
   #object_id：课程id
   #course_password ：加入课程的密码
   def join_course params,current_user
-    course = if params[:invite_code]
-      Course.find_by_invite_code(params[:invite_code])
-    else
-      Course.find_by_id params[:object_id]
-    end
+    course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
 
     @state = 10
     if course
@@ -340,7 +336,7 @@ class CoursesService
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
           roleName = member.roles[0].name if member
-          if params[:course_password] == course.password || params[:invite_code].present?
+          if params[:invite_code].present?
             #如果加入角色为学生 并且当前是学生
             if params[:role] == "10" && roleName == "Student"
               @state = 3
@@ -366,19 +362,19 @@ class CoursesService
             elsif params[:role] == "10" && roleName != "Student"
               member.role_ids = [params[:role]]
               member.save
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             end
           else
             @state = 1
           end
         else
-          if params[:course_password] == course.password || params[:invite_code].present?
+          if params[:invite_code].present?
             if params[:role] == "10" || params[:role] == nil
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)
               course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             else
               #如果已经发送过消息了，那么就要给个提示
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 7a7f85930..0799953bf 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -63,7 +63,7 @@
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
               <span class="tips" style="width: 90px; display: inline-block;">课程邀请码：</span>
-              <input class="width190" style="margin-left: 0px;" name="object_id" id="object_id" type="text" value="" >
+              <input class="width190" style="margin-left: 0px;" name="invite_code" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
             <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 7b935105f..62ccb3a86 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -60,7 +60,7 @@
       <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
           <div class="info_box mb10">
             <p class="f14">邀请码</p>
-            <p class="f14 fontBlue2">123456</p>
+            <p class="f14 fontBlue2"><%=@course.generate_invite_code %></p>
           </div>
       <% end %>
       <div class="info_box">
diff --git a/db/schema.rb b/db/schema.rb
index 9db65aca0..148a6e21b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -550,11 +550,13 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
 
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
@@ -1123,6 +1125,23 @@ ActiveRecord::Schema.define(:version => 20160624032138) 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"
@@ -1830,6 +1849,16 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"

From eae70f9c713b042da1e44f8c95eedddd6ac2b633 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 16:18:17 +0800
Subject: [PATCH 567/668] some config

---
 app/controllers/quality_analysis_controller.rb | 8 ++++----
 app/models/project.rb                          | 2 +-
 app/views/repositories/quality_analysis.js.erb | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 45d5a0ebf..e9b5c5e4f 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -13,13 +13,13 @@ class QualityAnalysisController < ApplicationController
   end
 
   def create
-    @client = JenkinsApi::Client.new(:server_url => 'http://123.59.135.93:8890',
+    gitlab_address = Redmine::Configuration['gitlab_address']
+    jenkins_address = Redmine::Configuration['jenkins_address']
+    @client = JenkinsApi::Client.new(:server_url => jenkins_address,
                                      :username => "temp",
                                      :password => '123123')
     #@client.exists?(job_name)
     @g = Gitlab.client
-    gitlab_address = Redmine::Configuration['gitlab_address']
-    jenkins_address = Redmine::Configuration['jenkins_address']
     user_name = User.find(params[:user_id]).try(:login)
     branch = params[:branch].nil? ? "master" : params[:branch]
     language = params[:language]
@@ -45,7 +45,7 @@ class QualityAnalysisController < ApplicationController
     @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
     # relace gitlab hook
     # genkins address
-    @g.add_project_hook(@project.gpid, (jenkins_address + "/project/#{user_name}_#{identifier}"))
+    @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}")
     if qa.nil?
       QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
     else
diff --git a/app/models/project.rb b/app/models/project.rb
index ceec0e182..55fbb3310 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -155,7 +155,7 @@ class Project < ActiveRecord::Base
   #ActiveModel::Dirty 这里有一个changed方法。对任何对象都可以用
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
-  after_create :create_board_sync,:acts_as_forge_activities,:create_project_ealasticsearch_index
+  after_create :create_board_sync,:acts_as_forge_activities
   before_destroy :delete_all_members,:delete_project_ealasticsearch_index
   after_update :update_project_ealasticsearch_index
   def remove_references_before_destroy
diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb
index eff2825f6..bafe28cdf 100644
--- a/app/views/repositories/quality_analysis.js.erb
+++ b/app/views/repositories/quality_analysis.js.erb
@@ -2,7 +2,7 @@ $('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/q
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","20%").css("left","30%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");
 
 

From c0e58d19faa88ba4ef08a7100639bb22fecb3bc3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 16:25:29 +0800
Subject: [PATCH 568/668] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=88=90=E7=BB=A9=E4=B8=AD=E7=9A=84=E7=BC=BA=E8=AF=84?=
 =?UTF-8?q?=E3=80=81=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86=E5=BA=94=E4=B8=8E?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E7=9A=84=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 18 +++++++++---------
 app/controllers/student_work_controller.rb | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2e66f29a3..43b488e96 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1305,12 +1305,12 @@ class CoursesController < ApplicationController
           sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,8] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,9] = stu.absence_penalty
-            sheet[count_row,10] = stu.late_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,11] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,12] = format_time(stu.created_at)
           else
-            sheet[count_row,8] = stu.late_penalty
+            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,9] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,10] = format_time(stu.created_at)
           end
@@ -1338,12 +1338,12 @@ class CoursesController < ApplicationController
           sheet[count_row,8] = stu.system_score.nil? ? l(:label_without_score) : stu.system_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,10] = stu.absence_penalty
-            sheet[count_row,11] = stu.late_penalty
+            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,11] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,13] = format_time(stu.created_at)
           else
-            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           end
@@ -1369,12 +1369,12 @@ class CoursesController < ApplicationController
           sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,8] = stu.absence_penalty
-            sheet[count_row,9] = stu.late_penalty
+            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
+            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           else
-            sheet[count_row,7] = stu.late_penalty
+            sheet[count_row,7] = home.teacher_priority == 1 ? 0 : stu.late_penalty
             sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,9] = format_time(stu.created_at)
           end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index b92dbb935..3a72ba55e 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1230,12 +1230,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,10] = homework.absence_penalty
-          sheet1[count_row,11] = homework.late_penalty
+          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,12] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,13] = format_time(homework.created_at)
         else
-          sheet1[count_row,9] = homework.late_penalty
+          sheet1[count_row,9] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,11] = format_time(homework.created_at)
         end
@@ -1263,12 +1263,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,11] = homework.absence_penalty
-          sheet1[count_row,12] = homework.late_penalty
+          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+          sheet1[count_row,12] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,14] = format_time(homework.created_at)
         else
-          sheet1[count_row,10] = homework.late_penalty
+          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
           sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,12] = format_time(homework.created_at)
         end
@@ -1292,12 +1292,12 @@ class StudentWorkController < ApplicationController
           sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
           if @homework.anonymous_comment ==0
             sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-            sheet1[count_row,7] = homework.absence_penalty
-            sheet1[count_row,8] = homework.late_penalty
+            sheet1[count_row,7] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
+            sheet1[count_row,8] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
             sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,10] = format_time(homework.created_at)
           else
-            sheet1[count_row,6] = homework.late_penalty
+            sheet1[count_row,6] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
             sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,8] = format_time(homework.created_at)
           end

From 4436e87c8475e3e2776b586ff14399f279150f77 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 16:35:27 +0800
Subject: [PATCH 569/668] .

---
 app/controllers/wechats_controller.rb | 44 ++++++++++++---------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 33561c242..2afb85ace 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -8,18 +8,7 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-    begin
-      uw = user_binded?(request[:FromUserName])
-      if !uw
-        return sendBind()
-      else
-        return join_class({invite_code: content}, uw.user, request)
-      end
-    rescue => e
-      logger.error e.inspect
-      logger.error e.backtrace.join("\n")
-      return request.reply.text e
-    end
+    sendBindClass(request, {invite_code: content})
   end
 
   # When receive 'help', will trigger this responder
@@ -48,24 +37,13 @@ class WechatsController < ActionController::Base
 
   # When subscribe user scan scene_id in public account
   on :scan, with: 'scene_id' do |request, ticket|
-    begin
-      uw = user_binded?(request[:FromUserName])
-      if !uw
-        return sendBind()
-      else
-        return join_class({ticket: ticket}, uw.user, request)
-      end
-    rescue => e
-      logger.error e.inspect
-      logger.error e.backtrace.join("\n")
-      return request.reply.text e
-    end
+    sendBindClass(request, {ticket: ticket})
   end
 
   # When no any on :scan responder can match subscribe user scaned scene_id
   on :event, with: 'scan' do |request|
     if request[:EventKey].present?
-      request.reply.text "event scan got EventKey #{request[:EventKey]} Ticket #{request[:Ticket]}"
+      sendBindClass(request, {ticket: request[:Ticket]})
     end
   end
 
@@ -161,6 +139,22 @@ class WechatsController < ActionController::Base
     end
   end
 
+
+  def sendBindClass(request, params)
+    begin
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        return sendBind(request)
+      else
+        return join_class(params, uw.user, request)
+      end
+    rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
+      return request.reply.text e
+    end
+  end
+
   def default_msg(request)
     uw = user_binded?(request[:FromUserName])
     if uw && uw.user

From eab000306cb758157be8343ce176fcc4fac8f12e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 16:38:36 +0800
Subject: [PATCH 570/668] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E3=80=81=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_all_replies.html.erb         |  2 +-
 .../users/_journal_reply_banner.html.erb      |  2 +-
 app/views/users/all_journals.js.erb           |  2 +-
 public/javascripts/application.js             | 35 ++++++++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 45404ed84..a74acc77c 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -13,7 +13,7 @@
         <div class="homepagePostReplyDes">
           <div class="homepagePostReplyPublisher">
             <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
+            <%= time_from_now(comment.created_time) %>
             <span id="reply_praise_count_<%=comment.id %>">
                  <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
             </span>
diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb
index 31934328f..c231f473d 100644
--- a/app/views/users/_journal_reply_banner.html.erb
+++ b/app/views/users/_journal_reply_banner.html.erb
@@ -10,7 +10,7 @@
   <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
   <%if count>3 %>
       <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_journal_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
           展开更多
         </a>
       </div>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index d4c42368d..6d227e93b 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -3,5 +3,5 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :p
 <% elsif params[:type] == 'JournalsForMessage' %>
 $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
 <% else %>
-$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
 <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 2b674b60d..66ead54ba 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1289,7 +1289,40 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container, btnid, id, type, div_id, allow_delete) {
+function expand_reply(container, btnid, id, type, div_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
+function expand_journal_reply(container, btnid, id, type, div_id, allow_delete) {
     var target = $(container);
     var btn = $(btnid);
     if (btn.data('init') == '0') {

From c39a982093650a6f23049d4ff670d921857d93cf Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 16:51:40 +0800
Subject: [PATCH 571/668] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb | 42 +++++++++++-----------
 public/assets/wechat/invite_code.html      |  3 +-
 public/javascripts/wechat/build/app.min.js |  9 ++---
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 2b4ebc703..80d254dae 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -28,27 +28,27 @@
 
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
 <!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
-<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
-<script src="/javascripts/wechat/app.js"></script>
-<script src="/javascripts/wechat/others/factory.js"></script>
-<script src="/javascripts/wechat/others/filter.js"></script>
-<script src="/javascripts/wechat/directives/alert.js"></script>
-<script src="/javascripts/wechat/directives/form_validate.js"></script>
-<script src="/javascripts/wechat/directives/input_auto.js"></script>
-<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
-<script src="/javascripts/wechat/controllers/reg.js"></script>
-<script src="/javascripts/wechat/controllers/invite_code.js"></script>
-<script src="/javascripts/wechat/controllers/login.js"></script>
-<script src="/javascripts/wechat/controllers/activity.js"></script>
-<script src="/javascripts/wechat/controllers/add_class.js"></script>
-<script src="/javascripts/wechat/controllers/blog.js"></script>
-<script src="/javascripts/wechat/controllers/course_notice.js"></script>
-<script src="/javascripts/wechat/controllers/discussion.js"></script>
-<script src="/javascripts/wechat/controllers/homework.js"></script>
-<script src="/javascripts/wechat/controllers/issue.js"></script>
-<script src="/javascripts/wechat/controllers/journals.js"></script>
-<script src="/javascripts/wechat/controllers/myclass.js"></script>
-<script src="/javascripts/wechat/others/routes.js"></script>
+<script src="/javascripts/wechat/build/app.min.js"></script>
+<!--<script src="/javascripts/wechat/app.js"></script>-->
+<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
+<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/invite_code.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/add_class.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/myclass.js"></script>-->
+<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
index 6f56f7e86..1aa0c8830 100644
--- a/public/assets/wechat/invite_code.html
+++ b/public/assets/wechat/invite_code.html
@@ -7,7 +7,8 @@
         </div>
     </div>
     <div class="share-code-wrap">
-        <a ng-click="share()" href="javascript:void(0);" class="share-code-btn">分享邀请码</a>
+        <!--<a ng-click="share()" href="javascript:void(0);" class="share-code-btn">分享邀请码</a>-->
+        <p/>
         <div class="share-code-instruction"> 1.将此页面分享给好友，邀请好友加入班级<br />
             2.通过微信扫一扫加入班级<br />
             3.输入邀请码加入班级</div>
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 365ed28c0..52dcd34ca 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,19 +1,20 @@
-var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e,r){g_redirect_path&&g_redirect_path.length>0&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a,r){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(t,a,e){})}]);
+var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e,r){g_redirect_path&&g_redirect_path.length>1&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a,r){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(t,a,e){})}]);
 app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i=function(){var a=n.defer(),i=c();if(i&&i.length>10)a.resolve(i);else{window.g_code||e.code||o.get("code");t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?a.reject(t.data.message):(o.save("token",t.data.token),a.resolve(t.data.token))})["catch"](function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{get_bind:i,token:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var c=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:c,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=c};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:c}}]);
-app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]);
+app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"教辅":""}});
 app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,t,e,o,i,c,n,r,s){e.replaceUrl=function(a){return a},e.alertService=s.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(a){e.page=a,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:a}}).then(function(a){a.data.page>0?e.activities=e.activities.concat(a.data.data):e.activities=a.data.data,n.save("activities",e.activities),e.has_more=a.data.count+10*a.data.page<a.data.all_count,n.save("has_more",e.has_more),n.save("page",a.data.page),console.log(a.data)},function(a){})},e.activities.length<=0?e.loadActData(0):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(a,e,o){n.save("yoffset",window.document.body.scrollTop),t.path("/"+a+"/"+e)},e.addPraise=function(a){r.addCommonPraise(a)},e.decreasePraise=function(a){r.decreaseCommonPraise(a)}}]);
 app.controller("AddClassController",["$scope",function(o){}]);
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
 app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
+app.controller("InviteCodeController",["$scope","$http","$routeParams","config","auth",function(t,e,i,n,o){var a=t;a.course={};var c=i.id;e.get(n.apiUrl+"courses/"+c+"?token="+o.token()).then(function(t){console.log(t.data),a.course=t.data.data}),a.share=function(){window.WeixinJSBridge.invoke("sendAppMessage",{appid:"wxf694495398c7d470",type:"link",data_url:"",img_url:"http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640",img_height:370,img_width:550,link:"http://view.inews.qq.com/a/WXN2013101101385701",desc:"desc",title:"title"},function(t){})}}]);
 app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
 app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("出错了",o.data.message):r.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("出错了",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},r.goReg=function(){t.path("/reg")}}]);
-app.controller("MyClassController",["$scope",function(o){}]);
+app.controller("MyClassController",["$scope","config","$http","auth","$location","$routeParams",function(t,e,o,a,n,s){var c=t,r=s.id;c.currentTab=1,c.tab=function(t){c.currentTab=t,c.searchText="",console.log(c.currentTab),2==t&&c.students.length<=0&&o.get(e.apiUrl+"courses/students?token="+a.token()+"&course_id="+r).then(function(t){console.log(t.data),c.students=t.data.data})},c.course={},c.students=[],c.teachers=[],c.resources=[],c.invite=function(){n.path("/invite_code").search({id:r})},o.post(e.apiUrl+"courses/"+r+"/attachments",{token:a.token(),name:""}).then(function(t){c.resources=t.data.data}),o.get(e.apiUrl+"courses/"+r+"?token="+a.token()).then(function(t){console.log(t.data),c.course=t.data.data}),c.teachers.length<=0&&o.get(e.apiUrl+"courses/teachers?token="+a.token()+"&course_id="+r).then(function(t){console.log(t.data),c.teachers=t.data.data})}]);
 app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
 app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
 app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
-app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},s=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",s("activities.html","ActivityController")).when("/issues/:id",s("issue_detail.html","IssueController")).when("/project_discussion/:id",s("project_discussion.html","DiscussionController")).when("/homework/:id",s("homework_detail.html","HomeworkController")).when("/course_notice/:id",s("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",s("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",s("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",s("blog_detail.html","BlogController")).when("/add_class",s("add_class.html","AddClassController")).when("/myclass",s("myclass.html","MyClassController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
+app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,t,r){var l=r.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},i=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",i("activities.html","ActivityController")).when("/issues/:id",i("issue_detail.html","IssueController")).when("/project_discussion/:id",i("project_discussion.html","DiscussionController")).when("/homework/:id",i("homework_detail.html","HomeworkController")).when("/course_notice/:id",i("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",i("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",i("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",i("blog_detail.html","BlogController")).when("/add_class",i("add_class.html","AddClassController")).when("/myclass",i("myclass.html","MyClassController")).when("/invite_code",i("invite_code.html","InviteCodeController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file

From b2f939fa92778a241204639535f61b1f81b74f02 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 17:01:35 +0800
Subject: [PATCH 572/668] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_reply_to.html.erb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 381295dfc..621b56fbd 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,11 +1,9 @@
-
 <div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
   <% if User.current.logged? %>
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="orig_textarea mb10 fl">
-      <div nhname='new_message_<%= reply.id%>'>
-
-      <% if @type == 'HomeworkCommon' %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <% if @type == 'HomeworkCommon' %>
               <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
                   <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
                   <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
@@ -31,12 +29,11 @@
                   <div class="cl"></div>
               <% end%>
           <% end %>
-
+        </div>
+        <div class="cl"></div>
       </div>
   <% else %>
     <%= render :partial => "users/show_unlogged_reply" %>
   <% end %>
-    <div class="cl"></div>
-  </div>
   <div class="cl"></div>
 </div>
\ No newline at end of file

From 084b545be97c9d436a1be66107791eda31535c1b Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 17:14:58 +0800
Subject: [PATCH 573/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb |  2 +-
 config/wechat.yml                     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 2afb85ace..912d92c70 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -4,7 +4,7 @@ class WechatsController < ActionController::Base
 
   include ApplicationHelper
   # ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}/"
-  ROOT_URL = "http://wechat.trustie.net"
+  ROOT_URL = "http://www.trustie.net"
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
diff --git a/config/wechat.yml b/config/wechat.yml
index 711f2f1f8..1e3389837 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -5,14 +5,14 @@ default: &default
 # Or if using public account, only need above two line
 
   # guange test
-  appid: "wxf694495398c7d470"
-  secret: "743e038392f1d89540e95f8f7645849a"
+  #appid: "wxf694495398c7d470"
+  #secret: "743e038392f1d89540e95f8f7645849a"
 
-#  appid: "wx8e1ab05163a28e37"
-#  secret: "beb4d3bc4b32b3557811680835357841"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
-  access_token: "1234567"
+  access_token: ".access_token"
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
@@ -30,4 +30,4 @@ development:
   <<: *default
 
 test:
-  <<: *default
\ No newline at end of file
+  <<: *default

From f1682edf64e12247c0120dd7ce35fe7ceea7de0b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 17:18:04 +0800
Subject: [PATCH 574/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/create.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index bea3f3872..ee8172cbd 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,7 +1,7 @@
 <%if @save_flag%>
 //$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
 //$('#reorder_time').click();
-    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+    window.location.href= "<%= host_with_protocol %>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
     $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>

From b5bfe40693f161790151b7f5994310a5e99ad70c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 17:35:55 +0800
Subject: [PATCH 575/668] .

---
 app/api/mobile/apis/courses.rb        |  2 +-
 app/controllers/wechats_controller.rb |  3 +++
 config/menu.yml                       | 16 ++++------------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 58d4a4f8c..6696b8360 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -103,7 +103,7 @@ module Mobile
         post "join" do
           authenticate!
           cs = CoursesService.new
-          status = cs.join_course({openid: params[:openid], invite_code: params[:invite_code]}, current_user)
+          status = cs.join_course({role: "10", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
           {
               status: status[:state],
               messsge:CoursesService::JoinCourseError.message(status[:state])
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 912d92c70..7dcfa1948 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -64,6 +64,9 @@ class WechatsController < ActionController::Base
     request.reply.text "User: #{request[:FromUserName]} click #{key}"
   end
 
+  on :click, with: 'DEV' do |request, key|
+    request.reply.text "此功能正在开发中,请耐心等待。"
+  end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
     request.reply.text "#{request[:FromUserName]} view #{view}"
diff --git a/config/menu.yml b/config/menu.yml
index c2579d8e6..735cd202f 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -7,13 +7,13 @@ button:
   name: "我的课程"
   sub_button:
   -
-    type: "view"
+    type: "click"
     name: "课程"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    key: "DEV"
   -
-    type: "view"
+    type: "click"
     name: "资源"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    key: "DEV"
 
  -
   name: "更多"
@@ -22,14 +22,6 @@ button:
     type: "view"
     name: "加入班级"
     url:  "https://www.trustie.net/"
-  -
-    type: "view"
-    name: "点名"
-    url:  "https://www.trustie.net/organizations/1/downloads"
-  -
-    type: "click"
-    name: "反馈"
-    key:  "FEEDBACK"
   -
     type: "view"
     name: "历史推文"

From 244c1787583e6e117e08b35de55c131156ed3e98 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 17:39:10 +0800
Subject: [PATCH 576/668] 666

---
 app/models/project.rb                         |  2 +-
 app/models/quality_analysis.rb                |  2 +-
 .../quality_analysis/_result_list.html.erb    | 42 ++++++++++++++++++-
 app/views/quality_analysis/_show.html.erb     |  2 +-
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 55fbb3310..d1da50469 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -157,7 +157,7 @@ class Project < ActiveRecord::Base
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
   after_create :create_board_sync,:acts_as_forge_activities
   before_destroy :delete_all_members,:delete_project_ealasticsearch_index
-  after_update :update_project_ealasticsearch_index
+  # after_update :update_project_ealasticsearch_index
   def remove_references_before_destroy
     return if self.id.nil?
     Watcher.delete_all ['watchable_id = ?', id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 40a0d82e9..6cc575b59 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,3 +1,3 @@
 class QualityAnalysis < ActiveRecord::Base
-  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier
+  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language
 end
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 9bfb8e449..00e5f1a27 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -3,12 +3,50 @@
 </div>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
+        <div style="min-height: 687px;" id="RSide" class="fl">
+          <div class="project_r_h">
+            <h2 class="project_h2">分析结果</h2>
+          </div>
+          <ul class="analysis-result-list">
+            <li class="analysis-result-name fl fontBlue2" title="Name"></li>
+            <li class="analysis-result-version fl fontBlue2" title="Version">VERSION</li>
+            <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
+            <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
+            <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
+            <div class="cl"></div>
+          </ul>
+          <ul class="analysis-result-list b_grey">
+            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+            <div class="cl"></div>
+          </ul>
+          <ul class="analysis-result-list">
+            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+            <div class="cl"></div>
+          </ul>
+          <ul class="analysis-result-list b_grey">
+            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
+            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
+            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
+            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
+            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
+            <div class="cl"></div>
+          </ul>
+
+        </div>
         <ul class="analysis-result-list">
-          <li title="Name"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li title="Name"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
           <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
           <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="用户"><<%= qa.author_login %>/li>
+          <li class="analysis-result-time fl fontBlue2" title="用户"><%= qa.author_login %></li>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 4fd1beb25..8f1cb8443 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -3,7 +3,7 @@
   <div class="project_r_h">
     <h2 class="project_h2" style="width:180px;">质量分析</h2>
   </div>
-  <!--<a href="javascript:void(0);" class="blue_btn_cir fl mt5 c_white" style="background-color:#64bdd9;">branch:master</a>-->
+<div class="button-rep">当前分支：<%= params[:branch] %></div>
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>

From 6bc4dec6364d5b22331db1f68e0168bf26f75510 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 17:46:21 +0800
Subject: [PATCH 577/668] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality_analysis/_result_list.html.erb    | 51 +++++--------------
 1 file changed, 12 insertions(+), 39 deletions(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 00e5f1a27..73b5ebd3f 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -3,50 +3,23 @@
 </div>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
-        <div style="min-height: 687px;" id="RSide" class="fl">
-          <div class="project_r_h">
-            <h2 class="project_h2">分析结果</h2>
-          </div>
-          <ul class="analysis-result-list">
-            <li class="analysis-result-name fl fontBlue2" title="Name"></li>
-            <li class="analysis-result-version fl fontBlue2" title="Version">VERSION</li>
-            <li class="analysis-result-loc fl fontBlue2" title="Non Commenting Lines of Code">LOC</li>
-            <li class="analysis-result-debt fl fontBlue2" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">TECHNICAL DEBT</li>
-            <li class="analysis-result-time fl fontBlue2" title="Last Analysis">LAST ANALYSIS</li>
-            <div class="cl"></div>
-          </ul>
-          <ul class="analysis-result-list b_grey">
-            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-            <div class="cl"></div>
-          </ul>
-          <ul class="analysis-result-list">
-            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-            <div class="cl"></div>
-          </ul>
-          <ul class="analysis-result-list b_grey">
-            <li class="analysis-result-name fl fontBlue2 hidden" title="Name"><span class="analysis-name-icon mr5"></span><a href="/dashboard/index/139" title="shitou:sonar_rep" class="fontBlue2">shitou:sonar_rep</a></li>
-            <li class="analysis-result-version fl fontGrey3" title="Version">1</li>
-            <li class="analysis-result-loc fl fontGrey3" title="Non Commenting Lines of Code">1,814</li>
-            <li class="analysis-result-debt fl fontGrey3" title="Total effort (in days) to fix all the issues on the component and therefore to comply to all the requirements.">3d 2h</li>
-            <li class="analysis-result-time fl fontGrey3" title="Last Analysis">2016-06-22</li>
-            <div class="cl"></div>
-          </ul>
-
+        <div class="project_r_h">
+          <h2 class="project_h2">分析结果</h2>
         </div>
         <ul class="analysis-result-list">
-          <li title="Name"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li class="analysis-result-name fl fontBlue2" >名称</li>
+          <li class="analysis-result-version fl fontBlue2" >版本</li>
+          <li class="analysis-result-loc fl fontBlue2" >分支</li>
+          <li class="analysis-result-debt fl fontBlue2" >语言</li>
+          <li class="analysis-result-time fl fontBlue2" >时间</li>
+          <div class="cl"></div>
+        </ul>
+        <ul class="analysis-result-list">
+          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
           <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
           <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="用户"><%= qa.author_login %></li>
+          <li class="analysis-result-time fl fontBlue2" title="时间"><%= format_time(qa.created_at) %></li>
           <div class="cl"></div>
         </ul>
     <% end %>

From e5ad64831a22aa13fe566c75e96202efe86d2efb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 17:50:26 +0800
Subject: [PATCH 578/668] 0

---
 app/views/quality_analysis/_result_list.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 73b5ebd3f..a674d143b 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -3,9 +3,6 @@
 </div>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
-        <div class="project_r_h">
-          <h2 class="project_h2">分析结果</h2>
-        </div>
         <ul class="analysis-result-list">
           <li class="analysis-result-name fl fontBlue2" >名称</li>
           <li class="analysis-result-version fl fontBlue2" >版本</li>

From 4f342142e6f87caf7805d22bea5ae32fb4d2f184 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 17:58:50 +0800
Subject: [PATCH 579/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_reply_banner.html.erb |  2 +-
 public/javascripts/application.js      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
index 0d7e0b2bd..25175542f 100644
--- a/app/views/users/_reply_banner.html.erb
+++ b/app/views/users/_reply_banner.html.erb
@@ -10,7 +10,7 @@
   <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
   <%if count>3 %>
       <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_all_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
           展开更多
         </a>
       </div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 06304a8b0..a04df39ac 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1290,7 +1290,24 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container, btnid, id, type, div_id) {
+function expand_reply(container,btnid){
+    var target = $(container).children();
+    var btn = $(btnid);
+    if(btn.data('init')=='0'){
+        btn.data('init',1);
+        btn.html('收起回复');
+        target.show();
+    }else{
+        btn.data('init',0);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+}
+
+function expand_all_reply(container, btnid, id, type, div_id) {
     var target = $(container);
     var btn = $(btnid);
     if (btn.data('init') == '0') {

From 8d5501615c6d2d4c324c58399fdd44050f391056 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 18:09:18 +0800
Subject: [PATCH 580/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 0799953bf..96c9a2b7d 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -49,7 +49,7 @@
 <div id="popbox">
   <div class="C"  >
     <div class="C_top">
-      <h2>快速进入课程通道</h2>
+      <h2>快速加入课程通道</h2>
       <p>只要持有课程邀请码，就可以快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
     </div>
     <div class="C_form">
@@ -68,7 +68,7 @@
             </li>
             <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
             <li style="margin-top: 15px;">
-              <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
+              <span style="margin-right: 5px;"><span style="margin-right:43px;">身</span><span>份</span>：</span>
               <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
                   <select name="role" class="IDType">
                     <option value="9">教师</option>

From 0d66763026f837c3f6a4a43cf4a0224ade5b5265 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 18:23:00 +0800
Subject: [PATCH 581/668] =?UTF-8?q?=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 18 +++++++++---------
 app/controllers/student_work_controller.rb | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 43b488e96..7dea90e4b 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1305,12 +1305,12 @@ class CoursesController < ApplicationController
           sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,8] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
-            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,10] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,11] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,12] = format_time(stu.created_at)
           else
-            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,8] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,9] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,10] = format_time(stu.created_at)
           end
@@ -1338,12 +1338,12 @@ class CoursesController < ApplicationController
           sheet[count_row,8] = stu.system_score.nil? ? l(:label_without_score) : stu.system_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,10] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
-            sheet[count_row,11] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,10] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,11] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,13] = format_time(stu.created_at)
           else
-            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           end
@@ -1369,12 +1369,12 @@ class CoursesController < ApplicationController
           sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
             sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,8] = home.teacher_priority == 1 ? 0 : stu.absence_penalty
-            sheet[count_row,9] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,8] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
           else
-            sheet[count_row,7] = home.teacher_priority == 1 ? 0 : stu.late_penalty
+            sheet[count_row,7] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,9] = format_time(stu.created_at)
           end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3a72ba55e..9006c8a79 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1230,12 +1230,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
-          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+          sheet1[count_row,10] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+          sheet1[count_row,11] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
           sheet1[count_row,12] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,13] = format_time(homework.created_at)
         else
-          sheet1[count_row,9] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+          sheet1[count_row,9] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
           sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,11] = format_time(homework.created_at)
         end
@@ -1263,12 +1263,12 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
         if @homework.anonymous_comment ==0
           sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-          sheet1[count_row,11] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
-          sheet1[count_row,12] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+          sheet1[count_row,11] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+          sheet1[count_row,12] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
           sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,14] = format_time(homework.created_at)
         else
-          sheet1[count_row,10] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+          sheet1[count_row,10] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
           sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
           sheet1[count_row,12] = format_time(homework.created_at)
         end
@@ -1292,12 +1292,12 @@ class StudentWorkController < ApplicationController
           sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
           if @homework.anonymous_comment ==0
             sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-            sheet1[count_row,7] = @homework.teacher_priority == 1 ? 0 : homework.absence_penalty
-            sheet1[count_row,8] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+            sheet1[count_row,7] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+            sheet1[count_row,8] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
             sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,10] = format_time(homework.created_at)
           else
-            sheet1[count_row,6] = @homework.teacher_priority == 1 ? 0 : homework.late_penalty
+            sheet1[count_row,6] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
             sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
             sheet1[count_row,8] = format_time(homework.created_at)
           end

From b5c9156c107e83d5590a7397640ee5cfc6a9b63e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 18:43:12 +0800
Subject: [PATCH 582/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=A5403?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 47d343e8f..1b186b5f2 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -749,7 +749,7 @@ module CoursesHelper
     if user.logged?
       joined = course.members.includes(:user).map{|member| member.user_id}.include? user.id
       text = joined ? l(:label_course_exit_student) : l(:label_course_join_student)
-      url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
+      url = joined ? course_path(course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
       if joined
         link = link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))

From 537f152562e8133a2ecf9bf71626bb24ede33317 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 18:47:54 +0800
Subject: [PATCH 583/668] 0

---
 app/controllers/quality_analysis_controller.rb   | 11 ++++++++++-
 app/models/quality_analysis.rb                   |  4 ++++
 app/views/quality_analysis/_result_list.html.erb | 16 ++++++++--------
 ...0160624103411_add_name_to_quality_analyses.rb |  5 +++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20160624103411_add_name_to_quality_analyses.rb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index e9b5c5e4f..b14f024d7 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -48,6 +48,7 @@ class QualityAnalysisController < ApplicationController
     @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}")
     if qa.nil?
       QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
+
     else
       qa.update_attribute(:sonar_version, version)
     end
@@ -58,8 +59,16 @@ class QualityAnalysisController < ApplicationController
     if params[:resource_id].nil?
       @name_flag = true
       @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+      # @quality_analyses.map {|qa| qa.}
+      # if @quality_analyses.count > 0
+      #   @quality_analyses.each do |qa|
+      #     ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+      #
+      #   end
+      # end
       # projects_date = open(@sonar_address + "/api/projects/index").read
-      # @results = JSON.parse(projects_date)
+      # arr = JSON.parse(projects_date).map {|m| m["nm"]}
+      # arr.map
     else
       @name_flag = false
       @resource_id = params[:resource_id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 6cc575b59..229be9826 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,3 +1,7 @@
 class QualityAnalysis < ActiveRecord::Base
   attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language
+
+  def user_rep_name
+    self.author_login+":"+self.rep_identifier
+  end
 end
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index a674d143b..507ded0fe 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -1,16 +1,16 @@
 <div class="project_r_h">
   <h2 class="project_h2">分析结果</h2>
 </div>
+<ul class="analysis-result-list">
+  <li class="analysis-result-name fl fontBlue2" >名称</li>
+  <li class="analysis-result-version fl fontBlue2" >版本</li>
+  <li class="analysis-result-loc fl fontBlue2" >分支</li>
+  <li class="analysis-result-debt fl fontBlue2" >语言</li>
+  <li class="analysis-result-time fl fontBlue2" >时间</li>
+  <div class="cl"></div>
+</ul>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
-        <ul class="analysis-result-list">
-          <li class="analysis-result-name fl fontBlue2" >名称</li>
-          <li class="analysis-result-version fl fontBlue2" >版本</li>
-          <li class="analysis-result-loc fl fontBlue2" >分支</li>
-          <li class="analysis-result-debt fl fontBlue2" >语言</li>
-          <li class="analysis-result-time fl fontBlue2" >时间</li>
-          <div class="cl"></div>
-        </ul>
         <ul class="analysis-result-list">
           <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
           <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
new file mode 100644
index 000000000..bf61fd5ac
--- /dev/null
+++ b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddNameToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :language, :string
+  end
+end

From f984a01cdcee9e26e96cf6e0d98871d7a48275ef Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 24 Jun 2016 18:50:47 +0800
Subject: [PATCH 584/668] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8D=8F=E8=AE=AE?=
 =?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/helpers/courses_helper.rb |  2 +-
 app/views/courses/join.js.erb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 1b186b5f2..47d343e8f 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -749,7 +749,7 @@ module CoursesHelper
     if user.logged?
       joined = course.members.includes(:user).map{|member| member.user_id}.include? user.id
       text = joined ? l(:label_course_exit_student) : l(:label_course_join_student)
-      url = joined ? course_path(course.id) : try_join_path(:object_id => course.id)
+      url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
       if joined
         link = link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb
index 8102098d5..04a77f87b 100644
--- a/app/views/courses/join.js.erb
+++ b/app/views/courses/join.js.erb
@@ -6,14 +6,14 @@ $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@c
 alert("加入成功");
 hideModal();
 $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>@course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 1 %>
 alert("密码错误");
 <% elsif @state == 2 %>
 alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 <% elsif @state == 3 %>
 alert("您已经加入了课程");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 4 %>
 alert("您加入的课程不存在");
 <% elsif @state == 5 %>
@@ -27,15 +27,15 @@ hidden_join_course_form();
 <% elsif @state == 8%>
 alert("您已经是该课程的教师了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 9%>
 alert("您已经是该课程的教辅了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 10%>
 alert("您已经是该课程的管理员了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% else %>
 alert("未知错误，请稍后再试");
 <% end %>

From c658296e2b8270a1e6fcbbc331b181df531faa59 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 19:12:07 +0800
Subject: [PATCH 585/668] config

---
 .../quality_analysis_controller.rb            | 43 ++++++++++---------
 .../projects/_development_group.html.erb      |  4 --
 app/views/repositories/show.html.erb          | 12 +++---
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index b14f024d7..83e5960b9 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -56,27 +56,28 @@ class QualityAnalysisController < ApplicationController
 
   def index
     @sonar_address = Redmine::Configuration['sonar_address']
-    if params[:resource_id].nil?
-      @name_flag = true
-      @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
-      # @quality_analyses.map {|qa| qa.}
-      # if @quality_analyses.count > 0
-      #   @quality_analyses.each do |qa|
-      #     ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
-      #
-      #   end
-      # end
-      # projects_date = open(@sonar_address + "/api/projects/index").read
-      # arr = JSON.parse(projects_date).map {|m| m["nm"]}
-      # arr.map
-    else
-      @name_flag = false
-      @resource_id = params[:resource_id]
-      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
-      @complexity =JSON.parse(complexity_date).first
-      issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
-      @sonar_issues = JSON.parse(issue_date).first
-    end
+    # if params[:resource_id].nil?
+    #   @name_flag = true
+    #   @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+    #   # @quality_analyses.map {|qa| qa.}
+    #   # if @quality_analyses.count > 0
+    #   #   @quality_analyses.each do |qa|
+    #   #     ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+    #   #
+    #   #   end
+    #   # end
+    #   # projects_date = open(@sonar_address + "/api/projects/index").read
+    #   # arr = JSON.parse(projects_date).map {|m| m["nm"]}
+    #   # arr.map
+    # else
+    qa = QualityAnalysis.where(:project_id => @project.id).first
+    @resource_id = qa.author_login+":"+qa.rep_identifier
+    @name_flag = false
+    complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+    @complexity =JSON.parse(complexity_date).first
+    issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+    @sonar_issues = JSON.parse(issue_date).first
+    # end
   end
 
   # Find project of id params[:project_id]
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index f3e1d0a1e..2c7d36fb5 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -56,10 +56,6 @@
     <% end %>
   </div>
 <% end %>
-<!--quality_analysis-->
-<div class="subNav">
-  <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
-</div>
 <!-- more -->
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
 <ul class="navContent" id="navContent">
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index c096b732e..124e3ef4d 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,13 +2,13 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
-  <% if User.current.member_of?(@project) %>
-      <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier), :remote => true, :class => "btn_zipdown fr" %>
-  <% end %>
-  <%# else %>
-      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fr" %>
+  <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+  <%# if User.current.member_of?(@project) %>
+      <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
   <%# end %>
+  <% else %>
+      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
+  <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

From 6f2ce2668c86c661e7303d84c259a35a7dfb36c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 19:23:13 +0800
Subject: [PATCH 586/668] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89gem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Gemfile b/Gemfile
index e0f9ed2d1..99c9570b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-gem 'net-ssh'
+# gem 'net-ssh'
 gem 'jenkins_api_client'
 gem 'nokogiri'
 

From 5aa79defbe2c23bf103ab8d774d68d97aaeca633 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 19:27:15 +0800
Subject: [PATCH 587/668] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20160624103411_add_name_to_quality_analyses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
index bf61fd5ac..a40342b42 100644
--- a/db/migrate/20160624103411_add_name_to_quality_analyses.rb
+++ b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
@@ -1,5 +1,5 @@
 class AddNameToQualityAnalyses < ActiveRecord::Migration
   def change
-    add_column :quality_analyses, :language, :string
+    # add_column :quality_analyses, :language, :string
   end
 end

From 4a4c613c55c626c8a1cd4d3312674563f44a48af Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 19:38:08 +0800
Subject: [PATCH 588/668] =?UTF-8?q?utf-8=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index e13882f6f..9c6c07109 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 module QualityAnalysisHelper
 
   def sqale_rating_status val

From 01bedc4bc2b380fb50f7d21071c295150d01c031 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 19:40:06 +0800
Subject: [PATCH 589/668] =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index e13882f6f..9c6c07109 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 module QualityAnalysisHelper
 
   def sqale_rating_status val

From 012eae9b93f1545e0f1f5713015c6accb25199b1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jun 2016 19:54:01 +0800
Subject: [PATCH 590/668] gems

---
 Gemfile               | 2 +-
 app/models/project.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 99c9570b4..11acafe3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-# gem 'net-ssh'
+gem 'net-ssh', '2.9.1'
 gem 'jenkins_api_client'
 gem 'nokogiri'
 
diff --git a/app/models/project.rb b/app/models/project.rb
index d1da50469..bbc639f3d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -155,9 +155,9 @@ class Project < ActiveRecord::Base
   #ActiveModel::Dirty 这里有一个changed方法。对任何对象都可以用
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
-  after_create :create_board_sync,:acts_as_forge_activities
+  after_create :create_board_sync,:acts_as_forge_activities, :create_project_ealasticsearch_index
   before_destroy :delete_all_members,:delete_project_ealasticsearch_index
-  # after_update :update_project_ealasticsearch_index
+  after_update :update_project_ealasticsearch_index
   def remove_references_before_destroy
     return if self.id.nil?
     Watcher.delete_all ['watchable_id = ?', id]

From 69f7dab04d68142a53c8953d43f77e21f09d6a0b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 24 Jun 2016 21:33:35 +0800
Subject: [PATCH 591/668] some modified

---
 app/controllers/quality_analysis_controller.rb | 11 +++++++----
 app/controllers/repositories_controller.rb     |  7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 83e5960b9..6453ef5a8 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -21,11 +21,11 @@ class QualityAnalysisController < ApplicationController
     #@client.exists?(job_name)
     @g = Gitlab.client
     user_name = User.find(params[:user_id]).try(:login)
-    branch = params[:branch].nil? ? "master" : params[:branch]
+    branch = params[:branch].blank? ? "master" : params[:branch]
     language = params[:language]
     path = params[:path]
     identifier = params[:identifier]
-    qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
+    qa = QualityAnalysis.where(:project_id => @project.id).first
     version = qa.nil? ? 1 : qa.sonar_version + 1
     properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
@@ -42,16 +42,19 @@ class QualityAnalysisController < ApplicationController
     @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties #sonar-properties
     #
     # replace config.xml of jenkins
-    @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+    @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
     # relace gitlab hook
     # genkins address
     @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}")
-    if qa.nil?
+    if qa.blank?
       QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
 
     else
       qa.update_attribute(:sonar_version, version)
     end
+
+    # scan
+    @client.job.build("#{user_name}_#{identifier}")
   end
 
   def index
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index cbb5b2f69..7c3acb2cc 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -20,6 +20,8 @@ require 'SVG/Graph/BarHorizontal'
 require 'digest/sha1'
 require 'redmine/scm/adapters/abstract_adapter'
 require 'tempfile'
+require 'json'
+require 'open-uri'
 
 class ChangesetNotFound < Exception; end
 class InvalidRevisionParam < Exception; end
@@ -358,6 +360,11 @@ update
   end
 
   def show
+    # sonar_address = Redmine::Configuration['sonar_address']
+    # projects_date = open(sonar_address + "/api/projects/index").read
+    # arr = JSON.parse(projects_date).map {|m| m["nm"]}
+    # arr.map
+
     ## TODO: the below will move to filter, done.
     if !User.current.member_of?(@project) && @project.hidden_repo
       render_403

From c501af70baa7207d854498d17e1f57fe3a61664d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 27 Jun 2016 11:09:25 +0800
Subject: [PATCH 592/668] .

---
 .access_token                                 |  1 +
 Gemfile                                       |  3 +-
 app/api/mobile/apis/courses.rb                |  3 +-
 app/controllers/projects_controller.rb        | 21 +++--
 app/controllers/wechats_controller.rb         | 15 ++--
 app/helpers/courses_helper.rb                 | 86 ++++++++++---------
 app/models/course.rb                          |  9 ++
 app/views/wechats/user_activities.html.erb    | 43 +++++-----
 config/menu.yml                               | 10 ++-
 config/wechat.yml                             |  2 +-
 public/assets/wechat/class_list.html          | 10 +++
 .../wechat/controllers/class_list.js          | 18 ++++
 public/javascripts/wechat/others/routes.js    |  1 +
 13 files changed, 140 insertions(+), 82 deletions(-)
 create mode 100644 .access_token
 create mode 100644 public/assets/wechat/class_list.html
 create mode 100644 public/javascripts/wechat/controllers/class_list.js

diff --git a/.access_token b/.access_token
new file mode 100644
index 000000000..ae71675eb
--- /dev/null
+++ b/.access_token
@@ -0,0 +1 @@
+{"access_token":"_-LoF1vaOEfUwHI2E5iF7IOIyhvTQAhdkyrwp0ISL0q2Nqb8QMcO9K4Z_kNXxporFsN3xJxOdd8EcCPLVxxzqbBm02m9gmGdp_ENBf9K5nHcneKNTpdoIII7B-9FXHRwCYPaADAJFW","expires_in":7200,"got_token_at":1466770839}
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index a8131fb3f..4012237ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source 'https://ruby.taobao.org/'
-### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
+  gem "rmagick", ">= 2.0.0"
 end
 
 gem 'certified'
@@ -31,7 +31,6 @@ 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'
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 6696b8360..08b4dc98b 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -14,8 +14,9 @@ module Mobile
           optional :token, type: String
         end
         get do
+          authenticate!
           cs = CoursesService.new
-          courses = cs.course_list(params,current_user.nil? ? User.find(2):current_user)
+          courses = cs.course_list(params,current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c8b272480..6029e7e37 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -100,8 +100,8 @@ class ProjectsController < ApplicationController
     render_404
   end
   
-  def course
-    render_404
+  def courserender_404
+
   end
 
   # Time 2015-01-29 11:19:11
@@ -299,6 +299,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+
+    logger.debug "111111111"*100
     # over
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
     @page = params[:page] ? params[:page].to_i + 1 : 0
@@ -319,6 +321,7 @@ class ProjectsController < ApplicationController
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
+    logger.debug "2"*100
     # g = Gitlab.client
     unless @project.gpid.nil? || @project.project_score.changeset_num == 0
       # rep_statics_commit = @project.rep_statics.order("commits_num desc")
@@ -332,12 +335,20 @@ class ProjectsController < ApplicationController
       @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
       @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
       g = Gitlab.client
+      logger.debug "3"*100
       begin
-        g_branch = g.project(@project.gpid).default_branch.to_s
-      rescue
-        logger.error("get gitlab project failed!")
+        gid = @project.gpid
+        logger.debug "31"*100
+        g_branch = g.project(gid)
+        logger.debug "4"*100
+        g_branch = g_branch.default_branch.to_s
+        logger.debug "5"*100
+      rescue =>e
+        logger.error("get gitlab project failed: " + e)
       end
+      logger.debug "6"*100
       @rev = g_branch.nil? ? "master" : g_branch
+      logger.debug "7"*100
     end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 7dcfa1948..09bcba78c 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -65,7 +65,7 @@ class WechatsController < ActionController::Base
   end
 
   on :click, with: 'DEV' do |request, key|
-    request.reply.text "此功能正在开发中,请耐心等待。"
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
   end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
@@ -138,7 +138,7 @@ class WechatsController < ActionController::Base
     unless uw
       sendBind(request)
     else
-      request.reply.text "请直接回复6位班级邀请码\n(不区分大小写):"
+      request.reply.text "请直接回复5位班级邀请码\n(不区分大小写):"
     end
   end
 
@@ -163,7 +163,6 @@ class WechatsController < ActionController::Base
     if uw && uw.user
       request.reply.text "欢迎回来, #{uw.user.show_name}"
     else
-      request.reply.text "欢迎关注Trustie创新实践社区"
       sendBind(request)
     end
   end
@@ -188,7 +187,7 @@ class WechatsController < ActionController::Base
     course = nil
     course = Course.where(qrcode: params[:ticket]).first if params[:ticket]
     course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]
-    raise "课程不存在" unless course
+    raise "班级不存在，请确认您的邀请码是否输入正确，谢谢！" unless course
 
     cs = CoursesService.new
     status = cs.join_course({invite_code: course.invite_code}, user)
@@ -239,14 +238,14 @@ class WechatsController < ActionController::Base
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-        raise "无法获取到openid,请在微信中打开本页面" unless openid
-        raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
+        raise "无法获取到openid，请在微信中打开本页面" unless openid
+        raise "此微信号已绑定用户，不能重复绑定" if user_binded?(openid)
 
         user, last_login_on = User.try_to_login(params[:username], params[:password])
-        raise "用户名或密码错误,请重新输入" unless user
+        raise "用户名或密码错误，请重新输入" unless user
         #补全用户信息
 
-        raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
+        raise "此用户已经绑定过公众号，请换一个帐户试试" if user.user_wechat
 
         UserWechat.create!(
             openid: openid,
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 47d343e8f..bb144472b 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -44,9 +44,9 @@ module CoursesHelper
   def visible_excellent_course obj
     # if course.is_pu
   end
-  
+
   # 返回x项目成员数量，即roles表中定义的所有成员
-  def projectCount project    
+  def projectCount project
     #searchCountByRoles project, AllPeople
     project.members.count
   end
@@ -147,10 +147,10 @@ module CoursesHelper
 
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
-   # searchStudent(project).count
-    # or
-    # searchStudent(project).count
- # end
+  # searchStudent(project).count
+  # or
+  # searchStudent(project).count
+  # end
 
   # 判断用户是否是课程的管理员
   # add by nwb
@@ -225,11 +225,11 @@ module CoursesHelper
   #end
 
   # 注意：此方法有问题，速度慢且结果不准
- # alias studentCountOrigin studentCount
+  # alias studentCountOrigin studentCount
   #def studentCount course
-   # count = studentCountOrigin course
-    #garble count
- # end
+  # count = studentCountOrigin course
+  #garble count
+  # end
 
   #获取课程所有成员
   def course_all_member course
@@ -265,27 +265,18 @@ module CoursesHelper
   def garble count
     count = count.round( 1-count.to_s.size ).to_i
     return count.to_s if count.to_s.size.eql?(1)
-    count.to_s << '+' 
+    count.to_s << '+'
   end
 
   # =====================================================================================
   # return people list
-  def searchPeopleByName(course, role_name)
-    course.members.select{|m|
-      m.roles.any?{|r|r.name == role_name}
-    }
-  end
-
   def searchTeacherAndAssistant project
-    searchPeopleByName(project, 'Manager').concat(
-        searchPeopleByName(project, 'Teacher')
-    ).concat(
-        searchPeopleByName(project, 'TeachingAsistant')
-    )
-  end
-
-  def searchStudent project
-    searchPeopleByName(project, 'Student')
+    #searchPeopleByRoles(project, TeacherRoles)
+    members = []
+    project.members.includes(:user).each do |m|
+      members << m  if m && m.user && m.user.allowed_to?(:as_teacher,project)
+    end
+    members
   end
 
   def TeacherAndAssistantCount course
@@ -302,6 +293,19 @@ module CoursesHelper
     members
   end
 
+  def searchStudent project
+    #searchPeopleByRoles(project, StudentRoles)
+    members = []
+    project.members.each do |m|
+      if m && m.user && m.user.allowed_to?(:as_student,project)
+        members << m
+      end
+    end
+    members
+  end
+
+
+
   def searchStudent_by_name  project, name
     #searchPeopleByRoles(project, StudentRoles)
     members = []
@@ -320,29 +324,29 @@ module CoursesHelper
     mems = []
     if name != ""
       name = name.to_s.downcase
-     members.each do |m|
+      members.each do |m|
         username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase
         if(m.user[:login].to_s.downcase.include?(name) ||  m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
           mems << m
         end
       end
     else
-     mems = members
-   end
+      mems = members
+    end
     mems
   end
   def searchgroupmember_by_name  members, name, group
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
     if name != ""
-    members.each do |m|
-    if m.course_group_id == group.id
-      username = m.user[:lastname].to_s + m.user[:firstname].to_s
-      if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
-        mems << m
+      members.each do |m|
+        if m.course_group_id == group.id
+          username = m.user[:lastname].to_s + m.user[:firstname].to_s
+          if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
+            mems << m
+          end
+        end
       end
-    end
-    end
     else
       mems = members
     end
@@ -454,7 +458,7 @@ module CoursesHelper
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
   end
-  
+
   def findCourseTime project
     str = ""
     begin
@@ -679,9 +683,9 @@ module CoursesHelper
     #file_count
     Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment|
       if attachment.is_public? || User.current.member_of_course?(@course) || User.current.admin?
-      activities[attachment.container_id]+=1
+        activities[attachment.container_id]+=1
       else
-      activities[attachment.container_id]
+        activities[attachment.container_id]
       end
     end
 
@@ -700,8 +704,8 @@ module CoursesHelper
     #news
     News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news|
       if news.author.member_of_course?(@course)
-      activities[news.course_id]+=1
-      end  
+        activities[news.course_id]+=1
+      end
     end
 
     #homework_count
diff --git a/app/models/course.rb b/app/models/course.rb
index 195e7cf9f..b623f1f5c 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -457,6 +457,15 @@ class Course < ActiveRecord::Base
     end
   end
 
+  # 延迟生成邀请码
+  def invite_code
+    code = read_attribute[:invite_code]
+    if !code || code.size < 5
+      code = generate_invite_code
+    end
+    return code
+  end
+
   # 生成邀请码
   CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
   def generate_invite_code
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 80d254dae..e21f5d6c7 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -28,27 +28,28 @@
 
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
 <!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
-<script src="/javascripts/wechat/build/app.min.js"></script>
-<!--<script src="/javascripts/wechat/app.js"></script>-->
-<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
-<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/invite_code.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/add_class.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/myclass.js"></script>-->
-<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
+<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
+<script src="/javascripts/wechat/app.js"></script>
+<script src="/javascripts/wechat/others/factory.js"></script>
+<script src="/javascripts/wechat/others/filter.js"></script>
+<script src="/javascripts/wechat/directives/alert.js"></script>
+<script src="/javascripts/wechat/directives/form_validate.js"></script>
+<script src="/javascripts/wechat/directives/input_auto.js"></script>
+<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
+<script src="/javascripts/wechat/controllers/reg.js"></script>
+<script src="/javascripts/wechat/controllers/invite_code.js"></script>
+<script src="/javascripts/wechat/controllers/login.js"></script>
+<script src="/javascripts/wechat/controllers/activity.js"></script>
+<script src="/javascripts/wechat/controllers/add_class.js"></script>
+<script src="/javascripts/wechat/controllers/blog.js"></script>
+<script src="/javascripts/wechat/controllers/course_notice.js"></script>
+<script src="/javascripts/wechat/controllers/discussion.js"></script>
+<script src="/javascripts/wechat/controllers/homework.js"></script>
+<script src="/javascripts/wechat/controllers/issue.js"></script>
+<script src="/javascripts/wechat/controllers/journals.js"></script>
+<script src="/javascripts/wechat/controllers/myclass.js"></script>
+<script src="/javascripts/wechat/controllers/class_list.js"></script>
+<script src="/javascripts/wechat/others/routes.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/config/menu.yml b/config/menu.yml
index 735cd202f..213130240 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button:
@@ -19,9 +19,13 @@ button:
   name: "更多"
   sub_button:
   -
-    type: "view"
+    type: "click"
     name: "加入班级"
-    url:  "https://www.trustie.net/"
+    key:  "JOIN_CLASS"
+  -
+    type: "click"
+    name: "反馈"
+    key:  "FEEDBACK"
   -
     type: "view"
     name: "历史推文"
diff --git a/config/wechat.yml b/config/wechat.yml
index 1e3389837..9bc33029e 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -15,7 +15,7 @@ default: &default
   access_token: ".access_token"
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
+  jsapi_ticket: "tmp/wechat_jsapi_ticket"
 
   #template
   binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
new file mode 100644
index 000000000..b436a4bf2
--- /dev/null
+++ b/public/assets/wechat/class_list.html
@@ -0,0 +1,10 @@
+<div class="post-container">
+    <div class="blue-title">课程列表</div>
+    <div class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" width="15" class="fl ml10 mt11 retract-btn undis" /><span class="fl ml10">未命名课程</span><img src="/images/wechat/setting.png" width="15" class="fr mr10 mt10" /></div>
+    <ul class="class-list f13 c-grey3">
+        <li ng-repeat="course in courses" ng-class="{'border-bottom-none': $last}"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">{{course.name}}</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>
+        <!--<li><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">分布式计算环境B班</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>-->
+        <!--<li class="border-bottom-none"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">分布式计算环境C班</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>-->
+    </ul>
+
+</div>
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
new file mode 100644
index 000000000..73dffc9ec
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -0,0 +1,18 @@
+/**
+ * Created by guange on 16/6/27.
+ */
+
+
+app.controller('ClassListController', ['$scope','config','auth','$http', function($scope, config, auth, $http){
+    var vm = $scope;
+    vm.courses = [];
+
+    $http.get(config.apiUrl + "courses?token="+ auth.token() + "&per_page_count=10&page=1").then(
+        function(response){
+            console.log(response.data);
+            vm.courses = response.data.data;
+        }
+    );
+
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 3fa7ca6df..36f54863a 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -32,6 +32,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
         .when('/add_class', makeRoute('add_class.html', 'AddClassController'))
         .when('/myclass', makeRoute('myclass.html', 'MyClassController'))
+        .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
         .when('/invite_code', makeRoute('invite_code.html', 'InviteCodeController'))
         .otherwise({
             redirectTo: '/activites'

From 5c2ac3e02fed0990f49b611275da5bfd56099c10 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 27 Jun 2016 15:47:06 +0800
Subject: [PATCH 593/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_member_controller.rb          | 4 ++++
 app/views/org_member/deleteOrgMember.js.erb       | 3 +++
 app/views/organizations/_org_member_list.html.erb | 6 ++++--
 config/routes.rb                                  | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/views/org_member/deleteOrgMember.js.erb

diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb
index 642a100c3..2eaa790cd 100644
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@@ -54,4 +54,8 @@ class OrgMemberController < ApplicationController
   def index
 
   end
+
+  def deleteOrgMember
+    destroy
+  end
 end
diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb
new file mode 100644
index 000000000..d87e62c17
--- /dev/null
+++ b/app/views/org_member/deleteOrgMember.js.erb
@@ -0,0 +1,3 @@
+$("#org_members_count_id").html("");
+$("#org_members_count_id").html("<%= @org.org_members.count %>")
+$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
\ No newline at end of file
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index 8e8a23b60..8af7986fc 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -1,6 +1,7 @@
 <% members.each do |member|%>
     <ul class="orgListRow">
-      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
+      <% username = User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
+      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= username %></a></li>
       <li class="orgListRole">
         <%= get_org_member_role_name member %>
         <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,
@@ -32,7 +33,8 @@
       </li>
         <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
         <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height();$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
-            <%= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
+          <a href="javascript:void(0)" style = "color: #0781B4;margin-left: 30px;float: left" onclick = "ifDeleteOrgMember('<%= member.id %>','<%= username %>')" >删除</a>
+          <%#= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
       <div class="cl"></div>
     </ul>
     <div class="cl"></div>
diff --git a/config/routes.rb b/config/routes.rb
index ec8fa2337..189c2671d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,6 +116,7 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       get 'org_member_autocomplete'
+      get 'deleteOrgMember'
     end
   end
 

From dd397a060b67f292841e58fce8dbfc1d3f26d795 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 27 Jun 2016 15:48:33 +0800
Subject: [PATCH 594/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a2f14332d..f5edb5ef4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1504,4 +1504,18 @@ function edit_file_description(url,id){
         }
     );
 }
+//删除组织成员
+function ifDeleteOrgMember(id,name){
+    var htmlvalue = "</br><div style='width:550px;text-align:center'>您确定要删除"+name+"吗?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='deleteOrgMember("+id+")'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>" +
+        "<script>function deleteOrgMember(id){" +
+        "$.ajax({\n\
+            url: '/org_member/deleteOrgMember',\n\
+            type: 'get',\n\
+            dataType: 'jsonp',\n\
+            data: {id:id},\n\
+            success: function(data){},\n\
+        });\n\
+        hideModal();}</script>";
+    pop_up_box(htmlvalue,580,30,50);
+}
 

From a83400f23337bd8daedfe8c98224715299a5b3b7 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 27 Jun 2016 15:57:45 +0800
Subject: [PATCH 595/668] =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87=20?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E5=92=8C=E5=9B=9E=E5=A4=8D=E6=A1=86=20?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E7=9B=B4=E6=88=AA=E5=9B=BE=E9=83=BD?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=B2=98=E8=B4=B4=E8=BF=9B=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/pasteimg.js | 42 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 479b1101a..9f848b8e2 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -328,27 +328,27 @@ function enablePasteImg(_editor) {
 
     $(nodeBody).on('pasteImage', function(ev, data) {
         //粘贴图片时走这里会出现两张图片走df()即可
-//        console.log('pasteImage');
-//        console.log("dataURL: " + data.dataURL);
-//        console.log("width: " + data.width);
-//        console.log("height: " + data.height);
-//        var blob = dataURItoBlob(data.dataURL);
-//        if (data.blob !== null) {
-//            var data = new FormData();
-//            data.append("imgFile",blob, "imageFilename.png");
-//            console.log(data);
-//            $.ajax({
-//                url: '/kindeditor/upload?dir=image',
-//                contentType: false,
-//                type: 'POST',
-//                data: data,
-//                processData: false,
-//                success: function(data) {
-//                    console.log(data);
-//                    editor.exec('insertimage', JSON.parse(data).url);
-//                }
-//            });
-//        }
+        console.log('pasteImage');
+        console.log("dataURL: " + data.dataURL);
+        console.log("width: " + data.width);
+        console.log("height: " + data.height);
+        var blob = dataURItoBlob(data.dataURL);
+        if (data.blob !== null) {
+            var data = new FormData();
+            data.append("imgFile",blob, "imageFilename.png");
+            console.log(data);
+            $.ajax({
+                url: '/kindeditor/upload?dir=image',
+                contentType: false,
+                type: 'POST',
+                data: data,
+                processData: false,
+                success: function(data) {
+                    console.log(data);
+                    editor.exec('insertimage', JSON.parse(data).url);
+                }
+            });
+        }
     });
     return;
 };

From 3b383dfa65f8c1dad4cee626eebb889e77099aad Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 27 Jun 2016 16:03:07 +0800
Subject: [PATCH 596/668] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .access_token                                 |   2 +-
 Gemfile                                       |   3 +-
 app/api/mobile/apis/courses.rb                |  13 +-
 app/api/mobile/entities/exercise.rb           |   8 ++
 app/models/course.rb                          |  16 +--
 app/services/courses_service.rb               |  12 ++
 public/assets/wechat/class_list.html          |  19 ++-
 public/assets/wechat/myclass.html             |  37 ++++-
 .../wechat/controllers/class_list.js          |   7 +-
 .../javascripts/wechat/controllers/myclass.js | 126 ++++++++++++++----
 public/stylesheets/weui/weixin.css            |  14 +-
 11 files changed, 203 insertions(+), 54 deletions(-)
 create mode 100644 app/api/mobile/entities/exercise.rb

diff --git a/.access_token b/.access_token
index ae71675eb..610b08d2e 100644
--- a/.access_token
+++ b/.access_token
@@ -1 +1 @@
-{"access_token":"_-LoF1vaOEfUwHI2E5iF7IOIyhvTQAhdkyrwp0ISL0q2Nqb8QMcO9K4Z_kNXxporFsN3xJxOdd8EcCPLVxxzqbBm02m9gmGdp_ENBf9K5nHcneKNTpdoIII7B-9FXHRwCYPaADAJFW","expires_in":7200,"got_token_at":1466770839}
\ No newline at end of file
+{"access_token":"oEEf8ZKAB8Y2G0o_xnTPkPJHKKk8iHkLC-f5ptvQ2nCMj9IpC86ivLD2-p38GfOkuG-HuQp3pWZqhs3NJXUMdPLWsr5k67hPZYuqg4ozLccx0xdLswapj0mn8ovZhK1tKIKiAFAOMO","expires_in":7200,"got_token_at":1467012449}
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 86f98629d..334f15853 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,14 +4,13 @@ unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
   gem "rmagick", ">= 2.0.0"
+  gem 'certified'
 end
 
 gem 'net-ssh', '2.9.1'
 gem 'jenkins_api_client'
 gem 'nokogiri'
 
-# gem 'certified'
-
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 08b4dc98b..42303b63d 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -16,7 +16,7 @@ module Mobile
         get do
           authenticate!
           cs = CoursesService.new
-          courses = cs.course_list(params,current_user)
+          courses = cs.user_courses_list(current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
@@ -385,7 +385,16 @@ module Mobile
         end
 
 
-
+        desc '获取测验列表'
+        params do
+          requires :token, type:String
+        end
+        get ':course_id/exercises' do
+          authenticate!
+          exercises = Course.find(params[:course_id]).exercises
+          present :data,exercises,with:Mobile::Entities::Exercise
+          present :status,0
+        end
 
       end
     end
diff --git a/app/api/mobile/entities/exercise.rb b/app/api/mobile/entities/exercise.rb
new file mode 100644
index 000000000..3218264fb
--- /dev/null
+++ b/app/api/mobile/entities/exercise.rb
@@ -0,0 +1,8 @@
+module Mobile
+  module Entities
+    class Exercise < Grape::Entity
+      expose :exercise_name
+      expose :exercise_description
+    end
+  end
+end
diff --git a/app/models/course.rb b/app/models/course.rb
index b623f1f5c..a562f91b7 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -94,6 +94,7 @@ class Course < ActiveRecord::Base
 
   acts_as_customizable
 
+  scope :not_deleted, lambda{where(is_delete: 0)}
   scope :all_course
   scope :active, lambda { where(:status => STATUS_ACTIVE) }
   scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
@@ -459,22 +460,17 @@ class Course < ActiveRecord::Base
 
   # 延迟生成邀请码
   def invite_code
-    code = read_attribute[:invite_code]
-    if !code || code.size < 5
-      code = generate_invite_code
-    end
-    return code
+    return generate_invite_code
   end
 
   # 生成邀请码
   CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
   def generate_invite_code
-    code = invite_code
-    if !invite_code || invite_code.size <5
-      self.invite_code = CODES.sample(5).join
-      return generate_invite_code if Course.where(invite_code: invite_code).present?
+    code = read_attribute(:invite_code)
+    if !code || code.size <5
+      code = CODES.sample(5).join
+      return generate_invite_code if Course.where(invite_code: code).present?
       save! && reload
-      code = invite_code
     end
     code
   end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 60c053997..dce3e1f18 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -32,6 +32,18 @@ class CoursesService
     course_list
   end
 
+
+  def user_courses_list(current_user)
+    courses = current_user.courses.not_deleted
+    courses.inject([]) {|course_list, course|
+      course_list << {:course => course,:img_url => url_to_avatar(course),
+                      :current_user_is_member => current_user.member_of_course?(course),
+                      :current_user_is_teacher => is_course_teacher(current_user,course),
+                      course_student_num: searchStudent(course).count
+      }
+    }
+  end
+
   #搜索课程
   def search_course params,current_user
     courses_all = Course.all_course
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index b436a4bf2..a449279f8 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -1,10 +1,21 @@
-<div class="post-container">
+<div class="post-container" style="padding-bottom: 50px;">
+    <div loading-spinner></div>
     <div class="blue-title">课程列表</div>
     <div class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" width="15" class="fl ml10 mt11 retract-btn undis" /><span class="fl ml10">未命名课程</span><img src="/images/wechat/setting.png" width="15" class="fr mr10 mt10" /></div>
     <ul class="class-list f13 c-grey3">
-        <li ng-repeat="course in courses" ng-class="{'border-bottom-none': $last}"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">{{course.name}}</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>
-        <!--<li><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">分布式计算环境B班</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>-->
-        <!--<li class="border-bottom-none"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">分布式计算环境C班</span><span class="fr c-grey4">&gt;</span><span class="students-amount f12 fr mt10">10人</span></li>-->
+        <li ng-click="goClass(course.id)" ng-repeat="course in courses" ng-class="{'border-bottom-none': $last}">
+            <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
+            <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
+            <span class="fr c-grey4">&gt;</span>
+            <span class="students-amount f12 fr mt10">{{course.course_student_num}}人</span>
+        </li>
     </ul>
 
+
+    <div class="bottom-tab-wrap mt10">
+        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>
+        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">加入班级</a>
+        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
+    </div>
+
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/myclass.html
index 30a8b9083..dc575dc64 100644
--- a/public/assets/wechat/myclass.html
+++ b/public/assets/wechat/myclass.html
@@ -2,11 +2,15 @@
     <div loading-spinner></div>
     <div class="class-detail-name">{{course.name}}<span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
     <div class="slice3 fl"></div>
-    <div id="class_tab_1" ng-class="['class-detail-tab3',{'class-tab-active':currentTab==1}]" ng-click="tab(1);"><a herf="javascript:void(0);">课堂资源</a></div>
-    <div class="slice2 fl">
-        <div class="slice-line2"></div>
+
+
+    <div ng-repeat="menu in menus">
+        <div id="class_tab_1" ng-class="[{'class-detail-tab': isTeacher},{'class-detail-tab3': !isTeacher},{'class-tab-active':currentTab==$index+1}]" ng-click="tab($index+1);"><a herf="javascript:void(0);">{{menu}}</a></div>
+        <div ng-if="!$last" class="slice2 fl">
+            <div class="slice-line2"></div>
+        </div>
     </div>
-    <div id="class_tab_2" ng-class="['class-detail-tab3',{'class-tab-active':currentTab==2}]" ng-click="tab(2);"><a herf="javascript:void(0);">我的同学</a></div>
+
     <div class="slice3 fl"></div>
     <div class="cl"></div>
     <div class="class-search-wrap">
@@ -14,10 +18,13 @@
             <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
         </div>
     </div>
-    <div ng-class="{'undis': currentTab!=1}">
-            <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span></div>
+
+    <div ng-class="{'undis': !showResources}">
+            <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="resources.length<=0" class="class-test-tip">暂无课件,<br />
+            请登录Trustie网站,在PC浏览器中上传课件。</p>
     </div>
-    <div ng-class="{'undis': currentTab!=2}">
+    <div ng-class="{'undis': !showClassMate}">
         <div class="member-banner f13 c-grey3">授课老师</div>
 
         <div class="class-detail-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
@@ -27,6 +34,22 @@
         <div class="class-detail-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
             <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
         </div>
+    </div>
+
+    <div ng-class="{'undis': !showHomework}">
+        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="homeworks.length<=0" class="class-test-tip">暂无作业,<br />
+            请登录Trustie网站,在PC浏览器中上传作业。</p>
 
     </div>
+
+    <div ng-class="{'undis': !showTestcase}">
+        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="exercises.length<=0" class="class-test-tip">暂无小测验,<br />
+            请登录Trustie网站,在PC浏览器中上传小测验。</p>
+    </div>
+
+
+
+
 </div>
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 73dffc9ec..81e485453 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -3,7 +3,7 @@
  */
 
 
-app.controller('ClassListController', ['$scope','config','auth','$http', function($scope, config, auth, $http){
+app.controller('ClassListController', ['$scope','config','auth','$http','$location', function($scope, config, auth, $http, $location){
     var vm = $scope;
     vm.courses = [];
 
@@ -14,5 +14,10 @@ app.controller('ClassListController', ['$scope','config','auth','$http', functio
         }
     );
 
+    vm.goClass = function(course_id){
+        console.log(course_id);
+        $location.path("/myclass").search({id: course_id});
+    }
+
 
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/myclass.js
index b689e0f55..815f6aa54 100644
--- a/public/javascripts/wechat/controllers/myclass.js
+++ b/public/javascripts/wechat/controllers/myclass.js
@@ -3,52 +3,126 @@ app.controller('MyClassController', ['$scope', 'config','$http', 'auth','$locati
     var vm = $scope;
     var courseid = $routeParams.id;
 
+
+
+    var getUsers = function(){
+        if(vm.teachers.length<=0){
+            $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.teachers = response.data.data;
+                }
+            )
+        }
+
+        if(vm.students.length<=0){
+            $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.students = response.data.data;
+                }
+            )
+        }
+    }
+
+    var getResources = function(){
+        if(vm.resources.length<=0){
+            $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
+                {token: auth.token(), name: ''}
+            ).then(function(response){
+                vm.resources = response.data.data;
+            });
+        }
+    }
+
+    var getHomeworks = function(){
+        if(vm.homeworks.length <=0){
+            $http.get(config.apiUrl + "courses/homeworks/"+courseid+"?token="+auth.token()).then(function(response){
+                vm.homeworks = response.data.data;
+                console.log(response.data);
+            });
+        }
+    }
+
+    var getExercises = function(){
+        if(vm.exercises.length <=0){
+            $http.get(config.apiUrl + "courses/"+courseid+"/exercises?token="+auth.token()).then(function(response){
+                vm.exercises = response.data.data;
+                console.log(response.data);
+            });
+        }
+    }
+
+
+    vm.isTeacher = false;
     vm.currentTab = 1;
     vm.tab = function(index){
        vm.currentTab = index;
-        vm.searchText = '';
-       console.log(vm.currentTab);
-        if(index == 2){
-            if(vm.students.length<=0){
-                $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
-                    function(response) {
-                        console.log(response.data);
-                        vm.students = response.data.data;
-                    }
-                )
+       vm.searchText = '';
+
+        vm.showClassMate = false;
+        vm.showResources = false;
+        vm.showHomework = false;
+        vm.showTestcase = false;
+
+        if(vm.isTeacher){
+            if(index == 1){ //课件
+                getResources();
+                vm.showResources = true;
+            } else if(index==2){ //作业
+                getHomeworks();
+                vm.showHomework = true;
+            } else if(index==3){ //小测验
+                getExercises();
+                vm.showTestcase = true;
+            } else if(index==4){ //学生管理
+                getUsers();
+                vm.showClassMate = true;
+            }
+
+        } else {
+            if(index == 2){
+                getUsers();
+                vm.showClassMate = true;
+            } else if(index==1){
+                getResources();
+                vm.showResources = true;
             }
         }
     }
+
+
+
+
     vm.course = {};
     vm.students = [];
     vm.teachers = [];
     vm.resources = [];
+    vm.homeworks = [];
+    vm.exercises = [];
     
     vm.invite = function(){
        $location.path("/invite_code").search({id: courseid}); 
     };
 
-    $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
-        {token: auth.token(), name: ''}
-    ).then(function(response){
-        vm.resources = response.data.data;
-    });
-    
     $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
-        function(response){
+        function(response) {
             console.log(response.data);
-           vm.course = response.data.data; 
+            vm.course = response.data.data;
+            resetMenu(vm.course.current_user_is_teacher);
+            vm.tab(1);
         }
     );
 
-    
-    if(vm.teachers.length<=0){
-        $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
-            function(response) {
-                console.log(response.data);
-                vm.teachers = response.data.data;
-            }
-        )
+
+    var resetMenu = function(is_teacher){
+        vm.isTeacher = is_teacher;
+        if(is_teacher){
+            vm.menus = ["课件", "作业", "小测验", "学生管理"];
+        } else {
+            vm.menus = ['课堂资源', "我的同学"];
+        }
+
     }
 
 }]);
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 955a7ab73..3360d81ee 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -74,7 +74,19 @@ a.underline {text-decoration:underline;}
 .bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
 .btn-disabled {background-color:#ccc;}
 
-/*背景色*/
+
+/*tab*/
+.tab-wrap {position:relative; line-height:38px; display:flex; font-size:13px; background-color:#fff;}
+.tab-wrap a {position:relative; display:block; flex:1;}
+.tab-wrap a:first-child:after {display:none;}
+.tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
+.weixin-tab {text-align:center; border-bottom:1px solid #ccc;}
+
+/*bottom-tab*/
+.bottom-tab-wrap {position:fixed; width:100%; bottom:0; line-height:38px; display:flex; font-size:13px; background-color:#fff;}
+.bottom-tab-wrap a {display:block; flex:1; position:relative;}
+.bottom-tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
+
 
 /*动态样式*/
 .post-container {width:100%;}

From 845141a1891fab3ad969e29bb45802574186361e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 27 Jun 2016 16:03:43 +0800
Subject: [PATCH 597/668] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B4=A8=E9=87=8F=E5=88=86=E6=9E=90=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/show.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 124e3ef4d..22a64a219 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,13 +2,13 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+  <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
   <%# if User.current.member_of?(@project) %>
-      <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+      <%#= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+  <%# end %>
+  <%# else %>
+      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
   <%# end %>
-  <% else %>
-      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
-  <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

From 1e6454efc05d390184a2daa27c7da0620f54ea34 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 27 Jun 2016 17:24:06 +0800
Subject: [PATCH 598/668] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb                         |  2 +
 app/api/mobile/apis/resources.rb              | 55 +++++++++++++++++++
 app/models/user.rb                            |  1 +
 app/views/wechats/user_activities.html.erb    |  3 +-
 public/assets/wechat/add_class.html           | 13 -----
 public/assets/wechat/class_list.html          |  4 +-
 public/assets/wechat/myresource.html          | 26 +++++++++
 public/assets/wechat/new_class.html           |  7 +++
 .../wechat/controllers/add_class.js           |  4 --
 .../wechat/controllers/class_list.js          |  7 +++
 .../wechat/controllers/myresource.js          | 30 ++++++++++
 .../wechat/controllers/new_class.js           | 12 ++++
 public/javascripts/wechat/others/routes.js    |  3 +-
 13 files changed, 146 insertions(+), 21 deletions(-)
 create mode 100644 app/api/mobile/apis/resources.rb
 delete mode 100644 public/assets/wechat/add_class.html
 create mode 100644 public/assets/wechat/myresource.html
 create mode 100644 public/assets/wechat/new_class.html
 delete mode 100644 public/javascripts/wechat/controllers/add_class.js
 create mode 100644 public/javascripts/wechat/controllers/myresource.js
 create mode 100644 public/javascripts/wechat/controllers/new_class.js

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index 9ffac4e10..c555eb633 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -18,6 +18,7 @@ module Mobile
   require_relative 'apis/blog_comments'
   require_relative 'apis/new_comment'
   require_relative 'apis/praise'
+  require_relative 'apis/resources'
 
   class API < Grape::API
     version 'v1', using: :path
@@ -71,6 +72,7 @@ module Mobile
     mount Apis::BlogComments
     mount Apis::NewComment
     mount Apis::Praise
+    mount Apis::Resources
 
     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb
new file mode 100644
index 000000000..fca94a642
--- /dev/null
+++ b/app/api/mobile/apis/resources.rb
@@ -0,0 +1,55 @@
+#coding=utf-8
+module Mobile
+  module Apis
+    class Resources < Grape::API
+
+      resource :resources do
+
+        desc '获取所有课件'
+        params do
+          requires :token, type: String
+        end
+        get do
+          authenticate!
+          data = current_user.course_attachments
+          present :data, data, with: Mobile::Entities::Attachment
+          present :status, 0
+
+        end
+
+
+
+        desc '获取所有作业'
+        params do
+          requires :token, type: String
+        end
+        get 'homeworks' do
+          authenticate!
+
+          homeworks = current_user.homework_commons
+
+          present :data, homeworks, with: Mobile::Entities::Homework
+          present :status, 0
+
+        end
+
+        desc '获取所有测验'
+        params do
+          requires :token, type: String
+        end
+        get 'exercies' do
+          authenticate!
+
+          exercises = current_user.exercises
+          present :data, exercises, with: Mobile::Entities::Exercise
+          present :status, 0
+        end
+
+
+      end
+
+
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 3d491c8ab..daf1237cf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -145,6 +145,7 @@ class User < Principal
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   has_many :principal_acts, :class_name => 'PrincipalActivity',:as =>:principal_act ,:dependent => :destroy
   has_many :file_commit, :class_name => 'Attachment', :foreign_key => 'author_id', :conditions => "container_type = 'Project' or container_type = 'Version'"
+  has_many :course_attachments , :class_name => 'Attachment', :foreign_key => 'author_id', :conditions => "container_type = 'Course'"
 ####
 # added by bai
   has_many :join_in_contests, :dependent => :destroy
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index e21f5d6c7..08221d00d 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -40,7 +40,7 @@
 <script src="/javascripts/wechat/controllers/invite_code.js"></script>
 <script src="/javascripts/wechat/controllers/login.js"></script>
 <script src="/javascripts/wechat/controllers/activity.js"></script>
-<script src="/javascripts/wechat/controllers/add_class.js"></script>
+<script src="/javascripts/wechat/controllers/new_class.js"></script>
 <script src="/javascripts/wechat/controllers/blog.js"></script>
 <script src="/javascripts/wechat/controllers/course_notice.js"></script>
 <script src="/javascripts/wechat/controllers/discussion.js"></script>
@@ -49,6 +49,7 @@
 <script src="/javascripts/wechat/controllers/journals.js"></script>
 <script src="/javascripts/wechat/controllers/myclass.js"></script>
 <script src="/javascripts/wechat/controllers/class_list.js"></script>
+<script src="/javascripts/wechat/controllers/myresource.js"></script>
 <script src="/javascripts/wechat/others/routes.js"></script>
 </body>
 
diff --git a/public/assets/wechat/add_class.html b/public/assets/wechat/add_class.html
deleted file mode 100644
index 2543d5cc4..000000000
--- a/public/assets/wechat/add_class.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="post-container">
-    <div class="add-class-box">
-        <p class="tac add-class-tip">输入班级邀请码，即刻加入班级！</p>
-        <form class="mb20">
-            <input type="text" class="class-number-input" />
-        </form>
-        <a href="javascript:void(0);" class="c-grey4 fl cancel-btn">取消</a>
-        <div class="slice fl">
-            <div class="slice-line"></div>
-        </div>
-        <a href="javascript:void(0);" class="c-blue fl submit-btn">确定</a>
-    </div>
-</div>
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index a449279f8..8ec8bcaa5 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -13,9 +13,9 @@
 
 
     <div class="bottom-tab-wrap mt10">
-        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>
+        <a ng-click="newClass()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>
         <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">加入班级</a>
-        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
+        <a ng-click="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
     </div>
 
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
new file mode 100644
index 000000000..9d3bf0fda
--- /dev/null
+++ b/public/assets/wechat/myresource.html
@@ -0,0 +1,26 @@
+<div class="post-container">
+    <div class="class-detail-name">我的资源</div>
+    <div class="tab-wrap">
+        <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
+    </div>
+    <div class="class-search-wrap">
+        <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
+            <input class="class-detail-search" placeholder="输入关键词进行搜索" />
+        </div>
+    </div>
+    <div ng-class="{'undis': currentTab!=1}">
+        <div ng-repeat="r in resources" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="resources.length<=0" class="class-test-tip">暂无课件,<br />
+            请登录Trustie网站,在PC浏览器中上传课件。</p>
+    </div>
+    <div ng-class="{'undis': currentTab!=2}">
+        <div ng-repeat="r in homeworks" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="homeworks.length<=0" class="class-test-tip">暂无作业,<br />
+            请登录Trustie网站,在PC浏览器中创建作业。</p>
+    </div>
+    <div ng-class="{'undis': currentTab!=3}">
+        <div ng-repeat="r in exercise" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="exercise.length<=0" class="class-test-tip">暂无测验,<br />
+            请登录Trustie网站,在PC浏览器中创建测验。</p>
+    </div>
+</div>
diff --git a/public/assets/wechat/new_class.html b/public/assets/wechat/new_class.html
new file mode 100644
index 000000000..2bb5d2aac
--- /dev/null
+++ b/public/assets/wechat/new_class.html
@@ -0,0 +1,7 @@
+<div class="post-container">
+    <div class="blue-title">新建课程</div>
+    <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25" placeholder="请输入课程名" /></div>
+    <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">班级</span><input class="new-class-input ml25" placeholder="请输入班级名" /></div>
+    <div class="tac"><a herf="javascript:void(0);" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
+    <a href="javascript:void(0);" class="finish-btn">完成</a>
+</div>
diff --git a/public/javascripts/wechat/controllers/add_class.js b/public/javascripts/wechat/controllers/add_class.js
deleted file mode 100644
index 099bb8e8e..000000000
--- a/public/javascripts/wechat/controllers/add_class.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-app.controller('AddClassController', ['$scope',function($scope){
-
-}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 81e485453..7c40f57a0 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -19,5 +19,12 @@ app.controller('ClassListController', ['$scope','config','auth','$http','$locati
         $location.path("/myclass").search({id: course_id});
     }
 
+    vm.newClass = function(){
+        $location.path("/new_class");
+    }
+
+    vm.goResource =function(){
+        $location.path("/myresource");
+    }
 
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
new file mode 100644
index 000000000..87b2a4d82
--- /dev/null
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -0,0 +1,30 @@
+app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+    var vm = $scope;
+    vm.menus = ['课件', '作业', '测验'];
+
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercise  = [];
+
+    vm.tab = function(index){
+        vm.currentTab = index;
+        if(index==1){
+            $http.get(config.apiUrl + "resources?token="+auth.token()).then(function(response){
+                console.log(response.data);
+                vm.resources = response.data.data;
+            });
+        } else if(index==2){
+            $http.get(config.apiUrl + "resources/homeworks?token="+auth.token()).then(function(response){
+                console.log(response.data);
+                vm.homeworks = response.data.data;
+            });
+        } else if(index==3){
+            $http.get(config.apiUrl + "resources/exercies?token="+auth.token()).then(function(response){
+                console.log(response.data);
+                vm.exercise = response.data.data;
+            });
+        }
+    }
+
+    vm.tab(1);
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/new_class.js b/public/javascripts/wechat/controllers/new_class.js
new file mode 100644
index 000000000..488db31c6
--- /dev/null
+++ b/public/javascripts/wechat/controllers/new_class.js
@@ -0,0 +1,12 @@
+
+
+app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+    var vm = $scope;
+
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercises = [];
+
+    
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 36f54863a..af274cfd9 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -30,9 +30,10 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/course_discussion/:id', makeRoute('course_discussion.html', 'DiscussionController'))
         .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
-        .when('/add_class', makeRoute('add_class.html', 'AddClassController'))
         .when('/myclass', makeRoute('myclass.html', 'MyClassController'))
+        .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
         .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
+        .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
         .when('/invite_code', makeRoute('invite_code.html', 'InviteCodeController'))
         .otherwise({
             redirectTo: '/activites'

From e5b93ac7ed7c8cdad1e02d7a726f2e1730b712b8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 27 Jun 2016 18:13:46 +0800
Subject: [PATCH 599/668] modified main method

---
 .../quality_analysis_controller.rb            | 109 +++++++++---------
 app/helpers/quality_analysis_helper.rb        |  38 +++---
 app/views/quality_analysis/_show.html.erb     |  20 ++--
 app/views/repositories/show.html.erb          |   8 +-
 ...0624103411_add_name_to_quality_analyses.rb |   5 -
 ...0316_add_sonar_name_to_quality_analyses.rb |   5 +
 db/schema.rb                                  |   3 +-
 7 files changed, 93 insertions(+), 95 deletions(-)
 delete mode 100644 db/migrate/20160624103411_add_name_to_quality_analyses.rb
 create mode 100644 db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 6453ef5a8..9a5745dc1 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -1,6 +1,7 @@
 class QualityAnalysisController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize
+  before_filter :connect_jenkins, :only => [:create]
   layout "base_projects"
   include ApplicationHelper
   require 'jenkins_api_client'
@@ -13,74 +14,61 @@ class QualityAnalysisController < ApplicationController
   end
 
   def create
-    gitlab_address = Redmine::Configuration['gitlab_address']
-    jenkins_address = Redmine::Configuration['jenkins_address']
-    @client = JenkinsApi::Client.new(:server_url => jenkins_address,
-                                     :username => "temp",
-                                     :password => '123123')
-    #@client.exists?(job_name)
-    @g = Gitlab.client
     user_name = User.find(params[:user_id]).try(:login)
-    branch = params[:branch].blank? ? "master" : params[:branch]
-    language = params[:language]
-    path = params[:path]
     identifier = params[:identifier]
-    qa = QualityAnalysis.where(:project_id => @project.id).first
-    version = qa.nil? ? 1 : qa.sonar_version + 1
-    properties = "sonar.projectKey=#{user_name}:#{identifier}
+    job_name = "#{user_name}:#{identifier}"
+    # Checks if the given job exists in Jenkins.
+    unless @client.job.exists?(job_name)
+      @g = Gitlab.client
+      branch = params[:branch].blank? ? "master" : params[:branch]
+      language = params[:language]
+      path = params[:path]
+      qa = QualityAnalysis.where(:project_id => @project.id).first
+      version = qa.nil? ? 1 : qa.sonar_version + 1
+      properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
         sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
-    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
-
-    # # # modify config
-    @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
-    @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
-    @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
-    @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties #sonar-properties
-    #
-    # replace config.xml of jenkins
-    @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
-    # relace gitlab hook
-    # genkins address
-    @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}")
-    if qa.blank?
-      QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
-
-    else
-      qa.update_attribute(:sonar_version, version)
+      git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+      # modify config.yml
+      @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+      @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+      @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+      @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+      @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+      # relace gitlab hook
+      @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+      # build job
+      opts = {'build_start_timeout' => 30, 'cancel_on_build_start_timeout' => true}
+      code = @client.job.build("#{user_name}_#{identifier}", opts)
+      # sucessed will return "201"
+      raise "Unable to build job: #{user_name}_#{identifier}" unless code == '201'
+      if qa.blank? && code == '201'
+        QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+                               :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+      else
+        qa.update_attribute(:sonar_version, version)
+      end
     end
-
-    # scan
-    @client.job.build("#{user_name}_#{identifier}")
   end
 
   def index
     @sonar_address = Redmine::Configuration['sonar_address']
-    # if params[:resource_id].nil?
-    #   @name_flag = true
-    #   @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
-    #   # @quality_analyses.map {|qa| qa.}
-    #   # if @quality_analyses.count > 0
-    #   #   @quality_analyses.each do |qa|
-    #   #     ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
-    #   #
-    #   #   end
-    #   # end
-    #   # projects_date = open(@sonar_address + "/api/projects/index").read
-    #   # arr = JSON.parse(projects_date).map {|m| m["nm"]}
-    #   # arr.map
-    # else
-    qa = QualityAnalysis.where(:project_id => @project.id).first
-    @resource_id = qa.author_login+":"+qa.rep_identifier
-    @name_flag = false
-    complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
-    @complexity =JSON.parse(complexity_date).first
-    issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
-    @sonar_issues = JSON.parse(issue_date).first
-    # end
+    projects_date = open(@sonar_address + "/api/projects/index").read
+    arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+    if params[:resource_id].nil?
+      @quality_analyses = QualityAnalysis.where("sonar_name in #{arr}")
+    else
+      qa = QualityAnalysis.where(:project_id => @project.id).first
+      @resource_id = qa.author_login+":"+qa.rep_identifier
+      @name_flag = false
+      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+      @complexity =JSON.parse(complexity_date).first
+      # issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+      # @sonar_issues = JSON.parse(issue_date).first
+    end
   end
 
   # Find project of id params[:project_id]
@@ -99,4 +87,13 @@ class QualityAnalysisController < ApplicationController
     end
   end
 
+  def connect_jenkins
+    @gitlab_address = Redmine::Configuration['gitlab_address']
+    @jenkins_address = Redmine::Configuration['jenkins_address']
+    # connect jenkins
+    @client = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => "temp", :password => '123123')
+  rescue
+    logger.error("failed to connect Jenkins")
+  end
+
 end
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 9c6c07109..d2948e02b 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -3,19 +3,19 @@ module QualityAnalysisHelper
 
   def sqale_rating_status val
     arr = []
-    if val.to_i > 0 && val.to_i < 5
+    if val > 0 && val < 5
       arr << "很好"
       arr << "b_green2"
-    elsif  val.to_i > 5  && val.to_i < 10
+    elsif  val. > 5  && val < 10
       arr << "较好"
       arr << "b_slow_yellow"
-    elsif  val.to_i > 10  && val.to_i < 20
+    elsif  val > 10  && val < 20
       arr << "中等"
       arr << "b_yellow"
-    elsif  val.to_i > 20  && val.to_i < 50
+    elsif  val > 20  && val < 50
       arr << "较差"
       arr << "b_slow_red"
-    elsif val.to_i > 20
+    elsif val > 20
       arr << "很差"
       arr << "b_red"
     end
@@ -23,13 +23,13 @@ module QualityAnalysisHelper
 
   def complexity_status val
     arr = []
-    if val.to_i < 10
+    if val < 10
       arr << "良好"
       arr << "b_green2"
-    elsif  val.to_i > 10  && val.to_i < 15
+    elsif  val > 10  && val < 15
       arr << "较高"
       arr << "b_yellow"
-    elsif val.to_i > 15
+    elsif val > 15
       arr << "很高"
       arr << "b_red"
     end
@@ -37,13 +37,13 @@ module QualityAnalysisHelper
 
   def duplicated_lines_density_status val
     arr = []
-    if val.to_i < 30
+    if val < 30
       arr << "良好"
       arr << "b_green2"
-    elsif  val.to_i > 30  && val.to_i < 50
+    elsif  val > 30  && val < 50
       arr << "较高"
       arr << "b_yellow"
-    elsif val.to_i > 50
+    elsif val > 50
       arr << "很高"
       arr << "b_red"
     end
@@ -51,28 +51,28 @@ module QualityAnalysisHelper
 
   def comment_lines_density_status val
     arr = []
-    if val.to_i < 20
+    if val < 20
       arr << "较低"
       arr << "b_yellow"
-    elsif  val.to_i > 20  && val.to_i < 50
+    elsif  val > 20  && val < 50
       arr << "正常"
       arr << "b_green2"
-    elsif val.to_i > 50
+    elsif val > 50
       arr << "较高"
       arr << "b_red"
     end
   end
 
   def score_sqale_rating val
-    if val.to_i > 0 && val.to_i < 5
+    if val > 0 && val < 5
       "5"
-    elsif  val.to_i > 5  && val.to_i < 10
+    elsif  val > 5  && val < 10
       "4"
-    elsif  val.to_i > 10  && val.to_i < 20
+    elsif  val > 10  && val < 20
       "3"
-    elsif  val.to_i > 20  && val.to_i < 50
+    elsif  val > 20  && val < 50
       "2"
-    elsif val.to_i > 20
+    elsif val > 20
       "1"
     end
   end
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 8f1cb8443..864512bdd 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,8 +1,8 @@
 <%= javascript_include_tag 'highcharts','highcharts-more' %>
-  <%= render :partial => "hightchars" %>
-  <div class="project_r_h">
-    <h2 class="project_h2" style="width:180px;">质量分析</h2>
-  </div>
+<%= render :partial => "hightchars" %>
+<div class="project_r_h">
+  <h2 class="project_h2" style="width:180px;">质量分析</h2>
+</div>
 <div class="button-rep">当前分支：<%= params[:branch] %></div>
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
@@ -12,28 +12,28 @@
       <div class="analysis-genral">
         <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"])[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
       </div>
       <div class="analysis-genral" >
         <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"])[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"])[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">代码重复度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
       </div>
       <div class="analysis-genral">
         <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"])[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"])[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
       </div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
     <div><span class="fontGrey3 mr30">质量问题</span>
@@ -46,7 +46,7 @@
       <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= lines_scale(@complexity["msr"][0]["frmt_val"]) %></span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>
   <div class="analysis-block mt10 mb40 flex f14">
     <div class="analysis-genral">
       <p class="fontGrey3">代码行数</p>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 124e3ef4d..5f4288262 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,13 +2,13 @@
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <% if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+  <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
   <%# if User.current.member_of?(@project) %>
       <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
   <%# end %>
-  <% else %>
-      <%= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
-  <% end %>
+  <%# else %>
+      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
+  <%# end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>
diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
deleted file mode 100644
index bf61fd5ac..000000000
--- a/db/migrate/20160624103411_add_name_to_quality_analyses.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddNameToQualityAnalyses < ActiveRecord::Migration
-  def change
-    add_column :quality_analyses, :language, :string
-  end
-end
diff --git a/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb b/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb
new file mode 100644
index 000000000..c69b5c909
--- /dev/null
+++ b/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddSonarNameToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :sonar_name, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ee2da177b..16f39f6a1 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 => 20160624055127) do
+ActiveRecord::Schema.define(:version => 20160627090316) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1844,6 +1844,7 @@ ActiveRecord::Schema.define(:version => 20160624055127) do
     t.string   "path"
     t.string   "branch"
     t.string   "language"
+    t.string   "sonar_name"
   end
 
   create_table "queries", :force => true do |t|

From 0c4f8810c8d5232f3289ab9f06dca17db59cd433 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 27 Jun 2016 21:36:59 +0800
Subject: [PATCH 600/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AAcen?=
 =?UTF-8?q?tos=E8=83=BD=E5=AE=89=E8=A3=85=E6=88=90=E5=8A=9F=E7=9A=84rmagic?=
 =?UTF-8?q?k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Gemfile b/Gemfile
index 334f15853..b482cb6fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://ruby.taobao.org/'
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
-  gem "rmagick", ">= 2.0.0"
+  gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   gem 'certified'
 end
 

From f930bbddad7eb88c1884878dade392e132627342 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 28 Jun 2016 09:45:45 +0800
Subject: [PATCH 601/668] modified create

---
 .../quality_analysis_controller.rb            | 77 +++++++++++--------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 9a5745dc1..bff369eaf 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -14,43 +14,53 @@ class QualityAnalysisController < ApplicationController
   end
 
   def create
-    user_name = User.find(params[:user_id]).try(:login)
-    identifier = params[:identifier]
-    job_name = "#{user_name}:#{identifier}"
-    # Checks if the given job exists in Jenkins.
-    unless @client.job.exists?(job_name)
-      @g = Gitlab.client
-      branch = params[:branch].blank? ? "master" : params[:branch]
-      language = params[:language]
-      path = params[:path]
-      qa = QualityAnalysis.where(:project_id => @project.id).first
-      version = qa.nil? ? 1 : qa.sonar_version + 1
-      properties = "sonar.projectKey=#{user_name}:#{identifier}
+    begin
+      user_name = User.find(params[:user_id]).try(:login)
+      identifier = params[:identifier]
+      # REDO
+      job_name = "#{user_name}:#{identifier}"
+
+      # Checks if the given job exists in Jenkins.
+      unless @client.job.exists?(job_name)
+        @g = Gitlab.client
+        branch = params[:branch].blank? ? "master" : params[:branch]
+        language = params[:language]
+        path = params[:path]
+        qa = QualityAnalysis.where(:project_id => @project.id).first
+        version = qa.nil? ? 1 : qa.sonar_version + 1
+        properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
         sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
-      git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
-      # modify config.yml
-      @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
-      @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
-      @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
-      @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
-      @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
-      # relace gitlab hook
-      @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
-      # build job
-      opts = {'build_start_timeout' => 30, 'cancel_on_build_start_timeout' => true}
-      code = @client.job.build("#{user_name}_#{identifier}", opts)
-      # sucessed will return "201"
-      raise "Unable to build job: #{user_name}_#{identifier}" unless code == '201'
-      if qa.blank? && code == '201'
-        QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
-                               :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
-      else
-        qa.update_attribute(:sonar_version, version)
+        git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+
+        # modify config.yml
+        @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+        @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+        @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+        @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+
+        # return '200' if successed
+        jenkins_job = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+
+        # replace gitlab hook
+        @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+        # build job
+        logger.error("Test#{jenkins_job}")
+
+        # return '201' if successed
+        code = @client.job.build("#{user_name}_#{identifier}")
+        if qa.blank?
+          QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+        else
+          qa.update_attribute(:sonar_version, version)
+        end
       end
+    rescue => e
+      puts e
     end
   end
 
@@ -90,10 +100,11 @@ class QualityAnalysisController < ApplicationController
   def connect_jenkins
     @gitlab_address = Redmine::Configuration['gitlab_address']
     @jenkins_address = Redmine::Configuration['jenkins_address']
+
     # connect jenkins
     @client = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => "temp", :password => '123123')
-  rescue
-    logger.error("failed to connect Jenkins")
+  rescue => e
+    logger.error("failed to connect Jenkins ==> #{e}")
   end
 
 end

From 047903ddfff03680c182b7c62ebfdb413fea4a85 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 10:57:58 +0800
Subject: [PATCH 602/668] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wechats/user_activities.html.erb    | 46 +++++++++----------
 .../wechat/{myclass.html => class.html}       |  0
 public/javascripts/wechat/build/app.min.js    |  8 ++--
 .../controllers/{myclass.js => class.js}      |  2 +-
 public/javascripts/wechat/others/routes.js    |  2 +-
 5 files changed, 30 insertions(+), 28 deletions(-)
 rename public/assets/wechat/{myclass.html => class.html} (100%)
 rename public/javascripts/wechat/controllers/{myclass.js => class.js} (95%)

diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 08221d00d..8fa650ac1 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -28,29 +28,29 @@
 
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
 <!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
-<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
-<script src="/javascripts/wechat/app.js"></script>
-<script src="/javascripts/wechat/others/factory.js"></script>
-<script src="/javascripts/wechat/others/filter.js"></script>
-<script src="/javascripts/wechat/directives/alert.js"></script>
-<script src="/javascripts/wechat/directives/form_validate.js"></script>
-<script src="/javascripts/wechat/directives/input_auto.js"></script>
-<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
-<script src="/javascripts/wechat/controllers/reg.js"></script>
-<script src="/javascripts/wechat/controllers/invite_code.js"></script>
-<script src="/javascripts/wechat/controllers/login.js"></script>
-<script src="/javascripts/wechat/controllers/activity.js"></script>
-<script src="/javascripts/wechat/controllers/new_class.js"></script>
-<script src="/javascripts/wechat/controllers/blog.js"></script>
-<script src="/javascripts/wechat/controllers/course_notice.js"></script>
-<script src="/javascripts/wechat/controllers/discussion.js"></script>
-<script src="/javascripts/wechat/controllers/homework.js"></script>
-<script src="/javascripts/wechat/controllers/issue.js"></script>
-<script src="/javascripts/wechat/controllers/journals.js"></script>
-<script src="/javascripts/wechat/controllers/myclass.js"></script>
-<script src="/javascripts/wechat/controllers/class_list.js"></script>
-<script src="/javascripts/wechat/controllers/myresource.js"></script>
-<script src="/javascripts/wechat/others/routes.js"></script>
+<script src="/javascripts/wechat/build/app.min.js"></script>
+<!--<script src="/javascripts/wechat/app.js"></script>-->
+<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
+<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
+<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/invite_code.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/new_class.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/class.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/class_list.js"></script>-->
+<!--<script src="/javascripts/wechat/controllers/myresource.js"></script>-->
+<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/myclass.html b/public/assets/wechat/class.html
similarity index 100%
rename from public/assets/wechat/myclass.html
rename to public/assets/wechat/class.html
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 52dcd34ca..7e9ade713 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -2,8 +2,9 @@ var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/a
 app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i=function(){var a=n.defer(),i=c();if(i&&i.length>10)a.resolve(i);else{window.g_code||e.code||o.get("code");t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?a.reject(t.data.message):(o.save("token",t.data.token),a.resolve(t.data.token))})["catch"](function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{get_bind:i,token:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var c=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:c,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=c};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:c}}]);
 app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"教辅":""}});
 app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,t,e,o,i,c,n,r,s){e.replaceUrl=function(a){return a},e.alertService=s.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(a){e.page=a,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:a}}).then(function(a){a.data.page>0?e.activities=e.activities.concat(a.data.data):e.activities=a.data.data,n.save("activities",e.activities),e.has_more=a.data.count+10*a.data.page<a.data.all_count,n.save("has_more",e.has_more),n.save("page",a.data.page),console.log(a.data)},function(a){})},e.activities.length<=0?e.loadActData(0):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(a,e,o){n.save("yoffset",window.document.body.scrollTop),t.path("/"+a+"/"+e)},e.addPraise=function(a){r.addCommonPraise(a)},e.decreasePraise=function(a){r.decreaseCommonPraise(a)}}]);
-app.controller("AddClassController",["$scope",function(o){}]);
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
+app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,t,s,o,a,n){var c=e,r=n.id,u=function(){c.teachers.length<=0&&s.get(t.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.teachers=e.data.data}),c.students.length<=0&&s.get(t.apiUrl+"courses/students?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.students=e.data.data})},h=function(){c.resources.length<=0&&s.post(t.apiUrl+"courses/"+r+"/attachments",{token:o.token(),name:""}).then(function(e){c.resources=e.data.data})},i=function(){c.homeworks.length<=0&&s.get(t.apiUrl+"courses/homeworks/"+r+"?token="+o.token()).then(function(e){c.homeworks=e.data.data,console.log(e.data)})},l=function(){c.exercises.length<=0&&s.get(t.apiUrl+"courses/"+r+"/exercises?token="+o.token()).then(function(e){c.exercises=e.data.data,console.log(e.data)})};c.isTeacher=!1,c.currentTab=1,c.tab=function(e){c.currentTab=e,c.searchText="",c.showClassMate=!1,c.showResources=!1,c.showHomework=!1,c.showTestcase=!1,c.isTeacher?1==e?(h(),c.showResources=!0):2==e?(i(),c.showHomework=!0):3==e?(l(),c.showTestcase=!0):4==e&&(u(),c.showClassMate=!0):2==e?(u(),c.showClassMate=!0):1==e&&(h(),c.showResources=!0)},c.course={},c.students=[],c.teachers=[],c.resources=[],c.homeworks=[],c.exercises=[],c.invite=function(){a.path("/invite_code").search({id:r})},s.get(t.apiUrl+"courses/"+r+"?token="+o.token()).then(function(e){console.log(e.data),c.course=e.data.data,d(c.course.current_user_is_teacher),c.tab(1)});var d=function(e){c.isTeacher=e,e?c.menus=["课件","作业","小测验","学生管理"]:c.menus=["课堂资源","我的同学"]}}]);
+app.controller("ClassListController",["$scope","config","auth","$http","$location",function(o,s,t,a,e){var n=o;n.courses=[],a.get(s.apiUrl+"courses?token="+t.token()+"&per_page_count=10&page=1").then(function(o){console.log(o.data),n.courses=o.data.data}),n.goClass=function(o){console.log(o),e.path("/myclass").search({id:o})},n.newClass=function(){e.path("/new_class")},n.goResource=function(){e.path("/myresource")}}]);
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
 app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
@@ -11,10 +12,11 @@ app.controller("InviteCodeController",["$scope","$http","$routeParams","config",
 app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
 app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("出错了",o.data.message):r.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("出错了",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},r.goReg=function(){t.path("/reg")}}]);
-app.controller("MyClassController",["$scope","config","$http","auth","$location","$routeParams",function(t,e,o,a,n,s){var c=t,r=s.id;c.currentTab=1,c.tab=function(t){c.currentTab=t,c.searchText="",console.log(c.currentTab),2==t&&c.students.length<=0&&o.get(e.apiUrl+"courses/students?token="+a.token()+"&course_id="+r).then(function(t){console.log(t.data),c.students=t.data.data})},c.course={},c.students=[],c.teachers=[],c.resources=[],c.invite=function(){n.path("/invite_code").search({id:r})},o.post(e.apiUrl+"courses/"+r+"/attachments",{token:a.token(),name:""}).then(function(t){c.resources=t.data.data}),o.get(e.apiUrl+"courses/"+r+"?token="+a.token()).then(function(t){console.log(t.data),c.course=t.data.data}),c.teachers.length<=0&&o.get(e.apiUrl+"courses/teachers?token="+a.token()+"&course_id="+r).then(function(t){console.log(t.data),c.teachers=t.data.data})}]);
+app.controller("MyResourceController",["$scope","$http","auth","config",function(e,o,t,a){var n=e;n.menus=["课件","作业","测验"],n.resources=[],n.homeworks=[],n.exercise=[],n.tab=function(e){n.currentTab=e,1==e?o.get(a.apiUrl+"resources?token="+t.token()).then(function(e){console.log(e.data),n.resources=e.data.data}):2==e?o.get(a.apiUrl+"resources/homeworks?token="+t.token()).then(function(e){console.log(e.data),n.homeworks=e.data.data}):3==e&&o.get(a.apiUrl+"resources/exercies?token="+t.token()).then(function(e){console.log(e.data),n.exercise=e.data.data})},n.tab(1)}]);
+app.controller("NewClassController",["$scope","$http","auth","config",function(e,o,r,s){var c=e;c.resources=[],c.homeworks=[],c.exercises=[]}]);
 app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
 app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
 app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
-app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,t,r){var l=r.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},i=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",i("activities.html","ActivityController")).when("/issues/:id",i("issue_detail.html","IssueController")).when("/project_discussion/:id",i("project_discussion.html","DiscussionController")).when("/homework/:id",i("homework_detail.html","HomeworkController")).when("/course_notice/:id",i("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",i("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",i("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",i("blog_detail.html","BlogController")).when("/add_class",i("add_class.html","AddClassController")).when("/myclass",i("myclass.html","MyClassController")).when("/invite_code",i("invite_code.html","InviteCodeController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
+app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},s=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",s("activities.html","ActivityController")).when("/issues/:id",s("issue_detail.html","IssueController")).when("/project_discussion/:id",s("project_discussion.html","DiscussionController")).when("/homework/:id",s("homework_detail.html","HomeworkController")).when("/course_notice/:id",s("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",s("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",s("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",s("blog_detail.html","BlogController")).when("/class",s("class.html","ClassController")).when("/new_class",s("new_class.html","NewClassController")).when("/class_list",s("class_list.html","ClassListController")).when("/myresource",s("myresource.html","MyResourceController")).when("/invite_code",s("invite_code.html","InviteCodeController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/myclass.js b/public/javascripts/wechat/controllers/class.js
similarity index 95%
rename from public/javascripts/wechat/controllers/myclass.js
rename to public/javascripts/wechat/controllers/class.js
index 815f6aa54..c2281be88 100644
--- a/public/javascripts/wechat/controllers/myclass.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,4 +1,4 @@
-app.controller('MyClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
 
     var vm = $scope;
     var courseid = $routeParams.id;
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index af274cfd9..80efa71e9 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -30,7 +30,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/course_discussion/:id', makeRoute('course_discussion.html', 'DiscussionController'))
         .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
-        .when('/myclass', makeRoute('myclass.html', 'MyClassController'))
+        .when('/class', makeRoute('class.html', 'ClassController'))
         .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
         .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
         .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))

From e9f280b4aa5c3608d7749d19a97959638d6552e8 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 11:07:15 +0800
Subject: [PATCH 603/668] .

---
 public/javascripts/wechat/build/app.min.js          | 2 +-
 public/javascripts/wechat/controllers/class_list.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 7e9ade713..1fea6f08a 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -4,7 +4,7 @@ app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtm
 app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,t,e,o,i,c,n,r,s){e.replaceUrl=function(a){return a},e.alertService=s.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(a){e.page=a,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:a}}).then(function(a){a.data.page>0?e.activities=e.activities.concat(a.data.data):e.activities=a.data.data,n.save("activities",e.activities),e.has_more=a.data.count+10*a.data.page<a.data.all_count,n.save("has_more",e.has_more),n.save("page",a.data.page),console.log(a.data)},function(a){})},e.activities.length<=0?e.loadActData(0):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(a,e,o){n.save("yoffset",window.document.body.scrollTop),t.path("/"+a+"/"+e)},e.addPraise=function(a){r.addCommonPraise(a)},e.decreasePraise=function(a){r.decreaseCommonPraise(a)}}]);
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
 app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,t,s,o,a,n){var c=e,r=n.id,u=function(){c.teachers.length<=0&&s.get(t.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.teachers=e.data.data}),c.students.length<=0&&s.get(t.apiUrl+"courses/students?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.students=e.data.data})},h=function(){c.resources.length<=0&&s.post(t.apiUrl+"courses/"+r+"/attachments",{token:o.token(),name:""}).then(function(e){c.resources=e.data.data})},i=function(){c.homeworks.length<=0&&s.get(t.apiUrl+"courses/homeworks/"+r+"?token="+o.token()).then(function(e){c.homeworks=e.data.data,console.log(e.data)})},l=function(){c.exercises.length<=0&&s.get(t.apiUrl+"courses/"+r+"/exercises?token="+o.token()).then(function(e){c.exercises=e.data.data,console.log(e.data)})};c.isTeacher=!1,c.currentTab=1,c.tab=function(e){c.currentTab=e,c.searchText="",c.showClassMate=!1,c.showResources=!1,c.showHomework=!1,c.showTestcase=!1,c.isTeacher?1==e?(h(),c.showResources=!0):2==e?(i(),c.showHomework=!0):3==e?(l(),c.showTestcase=!0):4==e&&(u(),c.showClassMate=!0):2==e?(u(),c.showClassMate=!0):1==e&&(h(),c.showResources=!0)},c.course={},c.students=[],c.teachers=[],c.resources=[],c.homeworks=[],c.exercises=[],c.invite=function(){a.path("/invite_code").search({id:r})},s.get(t.apiUrl+"courses/"+r+"?token="+o.token()).then(function(e){console.log(e.data),c.course=e.data.data,d(c.course.current_user_is_teacher),c.tab(1)});var d=function(e){c.isTeacher=e,e?c.menus=["课件","作业","小测验","学生管理"]:c.menus=["课堂资源","我的同学"]}}]);
-app.controller("ClassListController",["$scope","config","auth","$http","$location",function(o,s,t,a,e){var n=o;n.courses=[],a.get(s.apiUrl+"courses?token="+t.token()+"&per_page_count=10&page=1").then(function(o){console.log(o.data),n.courses=o.data.data}),n.goClass=function(o){console.log(o),e.path("/myclass").search({id:o})},n.newClass=function(){e.path("/new_class")},n.goResource=function(){e.path("/myresource")}}]);
+app.controller("ClassListController",["$scope","config","auth","$http","$location",function(o,s,t,a,e){var n=o;n.courses=[],a.get(s.apiUrl+"courses?token="+t.token()+"&per_page_count=10&page=1").then(function(o){console.log(o.data),n.courses=o.data.data}),n.goClass=function(o){console.log(o),e.path("/class").search({id:o})},n.newClass=function(){e.path("/new_class")},n.goResource=function(){e.path("/myresource")}}]);
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
 app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 7c40f57a0..4484ff834 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -16,7 +16,7 @@ app.controller('ClassListController', ['$scope','config','auth','$http','$locati
 
     vm.goClass = function(course_id){
         console.log(course_id);
-        $location.path("/myclass").search({id: course_id});
+        $location.path("/class").search({id: course_id});
     }
 
     vm.newClass = function(){

From 57cdc1d5ec694bf49703e1d4f25cb2e4a7c814d4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 11:30:06 +0800
Subject: [PATCH 604/668] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb      | 4 ++--
 app/views/wechats/user_activities.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 09bcba78c..4e0d42a45 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -3,8 +3,8 @@ class WechatsController < ActionController::Base
   wechat_responder
 
   include ApplicationHelper
-  # ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}/"
-  ROOT_URL = "http://www.trustie.net"
+  ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}"
+  #ROOT_URL = "http://www.trustie.net"
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 8fa650ac1..1e3957ea9 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -2,7 +2,7 @@
 <html ng-app="wechat">
 <head>
   <base href="/">
-  <title>我的动态</title>
+  <title>Trustie平台</title>
   <meta charset='utf-8' />
   <meta name="keywords" content="" />
   <meta name="description" content="" />

From 436de8ce5adccce709e96f2e08c0953445154cb1 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 11:33:54 +0800
Subject: [PATCH 605/668] =?UTF-8?q?=E4=BC=98=E5=85=88=E5=8F=96env=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84wechat=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 4e0d42a45..4a79d6d93 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -3,7 +3,7 @@ class WechatsController < ActionController::Base
   wechat_responder
 
   include ApplicationHelper
-  ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}"
+  ROOT_URL = ENV["wechat_url"]  || "#{Setting.protocol}://#{Setting.host_name}"
   #ROOT_URL = "http://www.trustie.net"
   # default text responder when no other match
   on :text do |request, content|

From dd6b19a8b543234d1f9d2fa879a583bf3d1f4cb7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 28 Jun 2016 14:48:09 +0800
Subject: [PATCH 606/668] some status of sonar

---
 .../quality_analysis_controller.rb            | 66 +++++++++++--------
 app/models/quality_analysis.rb                |  2 +-
 .../quality_analysis/_result_list.html.erb    |  6 +-
 .../repositories/_quality_analysis.html.erb   |  2 +-
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index bff369eaf..7de4bedab 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -17,19 +17,20 @@ class QualityAnalysisController < ApplicationController
     begin
       user_name = User.find(params[:user_id]).try(:login)
       identifier = params[:identifier]
+      rep_id = params[:rep_id]
       # REDO
-      job_name = "#{user_name}:#{identifier}"
+      job_name = "#{user_name}-#{rep_id}"
 
       # Checks if the given job exists in Jenkins.
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
-        branch = params[:branch].blank? ? "master" : params[:branch]
+        branch = params[:branch]
         language = params[:language]
         path = params[:path]
-        qa = QualityAnalysis.where(:project_id => @project.id).first
+        qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
         version = qa.nil? ? 1 : qa.sonar_version + 1
-        properties = "sonar.projectKey=#{user_name}:#{identifier}
-        sonar.projectName=#{user_name}:#{identifier}
+        properties = "sonar.projectKey=#{user_name}:#{rep_id}
+        sonar.projectName=#{user_name}:#{rep_id}
         sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
@@ -43,18 +44,20 @@ class QualityAnalysisController < ApplicationController
         @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
         # return '200' if successed
-        jenkins_job = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+        jenkins_job = @client.job.create("#{job_name}", @doc.to_xml)
 
         # replace gitlab hook
-        @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+        @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
         # build job
-        logger.error("Test#{jenkins_job}")
-
-        # return '201' if successed
-        code = @client.job.build("#{user_name}_#{identifier}")
-        if qa.blank?
+        logger.error("Jenkins status of create ==> #{jenkins_job}")
+        # return '201' if build successed
+        code = @client.job.build("#{job_name}")
+        logger.error("build result ==> #{code}")
+        d = @client.delete("#{job_name}") if jenkins_job == '200' && code != '201'
+        logger.error("delete result ==> #{code}")
+        if qa.blank? && code == '201'
           QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
-                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
         else
           qa.update_attribute(:sonar_version, version)
         end
@@ -62,23 +65,34 @@ class QualityAnalysisController < ApplicationController
     rescue => e
       puts e
     end
+    respond_to do |format|
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => "#{user_name}:#{rep_id}")}
+      format.js
+    end
   end
 
+  # resource_id: login + @repository.id
   def index
-    @sonar_address = Redmine::Configuration['sonar_address']
-    projects_date = open(@sonar_address + "/api/projects/index").read
-    arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
-    if params[:resource_id].nil?
-      @quality_analyses = QualityAnalysis.where("sonar_name in #{arr}")
-    else
-      qa = QualityAnalysis.where(:project_id => @project.id).first
-      @resource_id = qa.author_login+":"+qa.rep_identifier
-      @name_flag = false
-      complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
-      @complexity =JSON.parse(complexity_date).first
-      # issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
-      # @sonar_issues = JSON.parse(issue_date).first
+    begin
+      @resource_id = params[:resource_id]
+      @sonar_address = Redmine::Configuration['sonar_address']
+      # projects_date = open(@sonar_address + "/api/projects/index").read
+      # @arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+      if params[:resource_id].nil?
+        @name_flag = true
+        # @quality_analyses = QualityAnalysis.where("sonar_name in (#{arr.empty? ? '0': arr.join(',')})")
+        @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+      else
+        qa = QualityAnalysis.where(:project_id => @project.id).first
+        complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+        @complexity =JSON.parse(complexity_date).first
+        issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+        @sonar_issues = JSON.parse(issue_date).first
+      end
+    rescue => e
+      puts e
     end
+
   end
 
   # Find project of id params[:project_id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 229be9826..8b8034c65 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,5 +1,5 @@
 class QualityAnalysis < ActiveRecord::Base
-  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language
+  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language, :sonar_name
 
   def user_rep_name
     self.author_login+":"+self.rep_identifier
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 507ded0fe..845049cea 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -6,17 +6,17 @@
   <li class="analysis-result-version fl fontBlue2" >版本</li>
   <li class="analysis-result-loc fl fontBlue2" >分支</li>
   <li class="analysis-result-debt fl fontBlue2" >语言</li>
-  <li class="analysis-result-time fl fontBlue2" >时间</li>
+  <li class="analysis-result-time fl fontBlue2" >lujing</li>
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
-          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
           <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
           <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="时间"><%= format_time(qa.created_at) %></li>
+          <li class="analysis-result-time fl fontBlue2" title="时间"><%= qa.path %></li>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index f9726fb9b..0b3f38ee3 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>

From 383483de269bdf40c739c9b911a257f6101bc39a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 28 Jun 2016 15:13:04 +0800
Subject: [PATCH 607/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=9A=84=E5=B7=A6=E4=BE=A7=E6=A0=8Fbase=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E7=8F=AD=E7=BA=A7=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         |   1 +
 app/controllers/syllabuses_controller.rb      |  37 +++-
 app/controllers/tags_controller.rb            |   8 +
 app/helpers/courses_helper.rb                 |  16 ++
 app/helpers/syllabuses_helper.rb              |   3 +
 app/helpers/tags_helper.rb                    |   2 +
 app/models/syllabus.rb                        |   4 +-
 app/services/courses_service.rb               |   1 +
 app/views/courses/new.html.erb                |  20 ++-
 app/views/layouts/_syllabus_info.html.erb     |  25 +++
 app/views/layouts/_user_courses.html.erb      |   4 +-
 app/views/layouts/base_syllabus.html.erb      | 158 ++++++++++++++++++
 app/views/layouts/new_base.html.erb           |   2 +-
 app/views/layouts/new_base_user.html.erb      |   5 +-
 app/views/syllabuses/new.html.erb             |  27 +++
 app/views/syllabuses/show.html.erb            |   0
 app/views/tags/_syllabus_tag.html.erb         |   5 +
 .../tags/_tag_syllabus_new_name.html.erb      |  28 ++++
 app/views/tags/remove_tag.js.erb              |   3 +
 app/views/tags/tag_save.js.erb                |   4 +
 config/locales/zh.yml                         |   8 +-
 config/routes.rb                              |  12 ++
 .../20160627074232_add_column_to_syllabus.rb  |  12 ++
 db/schema.rb                                  |  26 ++-
 public/images/syllabus.jpg                    | Bin 0 -> 16760 bytes
 public/javascripts/course.js                  |  40 ++++-
 public/javascripts/syllabus.js                |   9 +
 public/stylesheets/courses.css                |   4 +-
 public/stylesheets/syllabus.css               | 155 +++++++++++++++++
 29 files changed, 599 insertions(+), 20 deletions(-)
 create mode 100644 app/views/layouts/_syllabus_info.html.erb
 create mode 100644 app/views/layouts/base_syllabus.html.erb
 create mode 100644 app/views/syllabuses/new.html.erb
 create mode 100644 app/views/syllabuses/show.html.erb
 create mode 100644 app/views/tags/_syllabus_tag.html.erb
 create mode 100644 app/views/tags/_tag_syllabus_new_name.html.erb
 create mode 100644 db/migrate/20160627074232_add_column_to_syllabus.rb
 create mode 100644 public/images/syllabus.jpg
 create mode 100644 public/javascripts/syllabus.js
 create mode 100644 public/stylesheets/syllabus.css

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 7dea90e4b..e81251f63 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -715,6 +715,7 @@ class CoursesController < ApplicationController
       @trackers = Tracker.sorted.all
       @course = Course.new
       @course.safe_attributes = params[:course]
+      @syllabus = Syllabus.where("id = #{params[:syllabus_id].to_i}").first if params[:syllabus_id]
       # month = Time.now.month
       render :layout => 'new_base'
     else
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 69982b99a..5ee3224bd 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -8,8 +8,43 @@ class SyllabusesController < ApplicationController
   end
 
   def show
-    @courses = @syllabus.courses
+    #@courses = @syllabus.courses
+    respond_to do |format|
+      format.js
+      format.html{render :layout => 'base_syllabus'}
+      format.api
+    end
+  end
+
+  def new
+    if User.current.login?
+      @syllabus = Syllabus.new
+      render :layout => 'new_base'
+    else
+      redirect_to signin_url
+    end
+  end
 
+  def create
+    if User.current.user_extensions.identity
+      @syllabus = Syllabus.new
+      @syllabus.title = params[:title]
+      @syllabus.eng_name = params[:eng_name]
+      @syllabus.user_id = User.current.id
+      if @syllabus && @syllabus.save
+        respond_to do |format|
+          flash[:notice] = l(:notice_successful_create)
+          format.html {redirect_to syllabus_path(@syllabus)}
+          format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'syllabuses', :action => 'show', :id => @syllabus.id) }
+        end
+      else
+        respond_to do |format|
+          flash[:notice] = l(:notice_create_failed)
+          format.html { redirect_to new_syllabus_path } #Added by young
+          format.api { render_validation_errors(@syllabus) }
+        end
+      end
+    end
   end
 
   private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 2c390025e..e66f88848 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -13,6 +13,7 @@ class TagsController < ApplicationController
   include ForumsHelper
   include AttachmentsHelper
   include ContestsHelper
+  include SyllabusesHelper
   include ActsAsTaggableOn::TagsHelper
   include TagsHelper
   include FilesHelper
@@ -529,6 +530,8 @@ class TagsController < ApplicationController
         @obj = Course.find_by_id(@obj_id)
       when '10'
         @obj = Attachment.find_by_id(@obj_id)
+      when '11'
+        @obj = Syllabus.find_by_id(@obj_id)
       else
         @obj = nil
     end
@@ -619,6 +622,9 @@ class TagsController < ApplicationController
     when '9' then
       @obj = Course.find_by_id(obj_id)
       @obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags))
+    when '11' then
+      @obj = Syllabus.find_by_id(obj_id)
+      @obj_pages, @syllabuses_results, @results_count = for_pagination(get_syllabuses_by_tag(selected_tags))
     else
       @obj = nil
     end
@@ -684,6 +690,8 @@ class TagsController < ApplicationController
       return 'Course'
     when '10'
       return 'Attachment'
+    when '11'
+      return 'Syllabus'
     else
       render_error :message => e.message
       return 
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 47d343e8f..fd3be1369 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -667,6 +667,22 @@ module CoursesHelper
     is_current_term || is_next_term
   end
 
+  #课程大纲下拉框
+  def syllabus_option
+    type = []
+    option1 = []
+    option1 << "请选择课程"
+    option1 << 0
+    type << option1
+    Syllabus.all.each do |syllabus|
+      option = []
+      option << syllabus.title
+      option << syllabus.id
+      type << option
+    end
+    type
+  end
+
   #获取课程动态
   def get_course_activity courses, activities
     @course_ids=activities.keys()
diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index dac84937b..d5284586e 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -1,2 +1,5 @@
 module SyllabusesHelper
+  def get_syllabuses_by_tag(tag_name)
+    Syllabus.tagged_with(tag_name).order('updated_at desc')
+  end
 end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 8847f4163..54753807d 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -23,6 +23,8 @@ module TagsHelper
       @obj= Course.find_by_id(obj_id)
     when '10'
       @obj = Attachment.find_by_id(obj_id)
+    when '11'
+      @obj = Syllabus.find_by_id(obj_id)
     else
       raise Exception, '[TagsHelper] ===> tag type unknow.'
     end
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index 7d6319955..b1bdfd5aa 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -1,5 +1,7 @@
 class Syllabus < ActiveRecord::Base
+  acts_as_taggable
+
   belongs_to :user
   has_many :courses
-  attr_accessible :description, :title
+  attr_accessible :description, :title, :eng_name, :type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
 end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 60c053997..b7b5e73ac 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -201,6 +201,7 @@ class CoursesService
       #@course.safe_attributes(current_user,params[:course])
       #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
+      @course.syllabus_id = params[:syllabus_id].to_i
       @course.term = params[:term]
       @course.time = params[:time]
       @course.end_term = params[:end_term]
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index ddaf17ae8..d3326480f 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -4,12 +4,22 @@
 <div class="hwork_new">
   <ul>
     <%= labelled_form_for @course do |f| %>
+        <li  class="ml45 mb10">
+          <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
+          <% if @syllabus.nil? %>
+              <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
+          <% else %>
+              <span><%=@syllabus.title %></span>
+              <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
+          <% end %>
+          <!--<input  type="text" name="course[name]" id="new_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('new');">-->
+          <span class="c_red" id="new_syllabus_notice" style="display: none;">请选择课程大纲</span>
+        </li>
+        <div class="cl"></div>
         <li  class="ml45">
-          <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-          <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
           <input  type="text" name="course[name]" id="new_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('new');">
-          <span class="c_red" id="new_course_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
+          <span class="c_red" id="new_course_name_notice" style="display: none;">班级名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
@@ -49,13 +59,13 @@
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="course_is_public" name="course[is_public]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
+          <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
           <label >学生列表公开&nbsp;&nbsp;：</label>
           <input id="course_open_student" name="course[open_student]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后课外用户可见学生列表，否则仅对课内成员可见）</span>
+          <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
new file mode 100644
index 000000000..4e7bc1f7b
--- /dev/null
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -0,0 +1,25 @@
+<div class="pr_info_logo fl mb5">
+  <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
+</div>
+<div class="fl ml15">
+  <p class="homepageImageName mb5"><%=@syllabus.title %></p>
+  <div class="cl"></div>
+</div>
+<div class="cl"></div>
+<div>
+  <div class="mb5">
+    <% if @syllabus.eng_name && !@syllabus.eng_name.empty? %>
+        <span><%= @syllabus.eng_name %></span>
+    <% else%>
+        <span class="fontGrey">课程英文名称</span>
+    <% end %>
+    <% if User.current == @syllabus.user %>
+        <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_eng_name();"%>
+    <% end %>
+  </div>
+</div>
+<div class="pr_info_foot ">
+  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">10</a>）<span>|</span>
+  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">10</a>）<span>|</span>
+  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">100</a>）</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index ff18e68bd..546a5b14b 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -47,7 +47,7 @@
                 <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'fr fb', :title => '发布帖子',:target => '_blank' %>
                 <div class="cl"></div>
               </li>
-              <% if User.current == @user %>
+              <% if User.current == user %>
                   <li class="subNavRow">
                     <% if count == 0 %>
                         <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :course_id => course.id), :method => 'post',:remote => true %>
@@ -84,7 +84,7 @@
 <% end%>
 
 <script type="text/javascript">
-    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).count %>;
+    var coursecount = <%= user.courses.visible.where("is_delete =?", 0).count %>;
     var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
 
     if((coursecount <= courseshowcount)&&(coursecount > 5) ){
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
new file mode 100644
index 000000000..b12337608
--- /dev/null
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -0,0 +1,158 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','new_user','prettify',:media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<% is_current_user = User.current.logged? && User.current == @user%>
+<div class="navContainer">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer mt15">
+        <%=render :partial => 'layouts/syllabus_info' %>
+      </div>
+
+      <div class="homepageLeftMenuContainer">
+        <ul class="syllabus_leftinfo">
+          <a href="javascript:void(0);" class="fr"><img src="../images/signature_edit.png" width="12" height="12" /></a><div class="cl"></div>
+          <li><label >创建教师：</label><span><%=@syllabus.user.show_name %></span></li>
+          <li><label>课程性质：</label>
+            <select class="syllabus_select fl">
+              <option value="公共必修课" selected="selected">公共必修课</option>
+              <option value="学科必修课">学科必修课</option>
+              <option value="专业选修课">专业选修课</option>
+              <option value="实践必修课">实践必修课</option>
+              <option value="实践选修课">实践选修课</option>
+            </select>
+            <div class="cl"></div>
+          </li>
+          <li><label >学分：</label><input class="syllabus_input fl" placeholder="5学分"><div class="cl"></div></li>
+          <li><label>总学时：</label><input class="syllabus_input_min fl" placeholder="50 ">学时 <div class="cl"></div></li>
+          <li><label>理论学时：</label><input class="syllabus_input_min fl" placeholder="10"> 学时<div class="cl"></div></li>
+          <li><label>实践学时：</label><input class="syllabus_input fl" placeholder="5学时"><div class="cl"></div></li>
+          <li><label>适用专业：</label><input class="syllabus_input fl" placeholder="UI设计"><div class="cl"></div></li>
+          <li><label>选修课程：</label><input class="syllabus_input fl" placeholder="工业设计史"><div class="cl"></div></li>
+
+        </ul>
+        <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>
+      </div>
+
+      <div class="homepageLeftMenuContainer">
+        <div class="homepageLeftMenuBlock">
+          <a href="javascript:void(0);" class="homepageMenuText" >班级</a>
+          <div class="courseMenu" id="courseMenu">
+            <ul>
+              <li class="courseMenuIcon fr" style="margin-right:10px;" id="courseMenuIcon">
+                <ul class="topnav_course_menu" id="topnav_course_menu"  >
+                  <li>
+                    <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey"%>
+                  </li>
+                  <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+                  <li>
+                    <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        </div>
+
+        <% courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>">
+          <div id="homepageLeftMenuCourses">
+            <ul>
+              <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current, :page => 0} %>
+              <!--<li class="homepageLeftMenuCoursesLine" ><a href="javascript:void(0);" class="coursesLineGrey hidden">设计学院设计管理班级3(2016夏)</a></li>
+              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
+              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
+              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
+              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
+              <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
+            </ul>
+          </div>
+          <% if !courses.empty? %>
+              <div class="homepageLeftMenuMore" id="user_hide_course">
+                <a href="javascript:void(0);" class="homepageLeftMenuHideIcon" id="hide_show_courseicon" onclick="leftCourseslistChange();"></a>
+              </div>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="project_Label">
+        <h4 class="mb5" >标签:</h4>
+        <div class="tag_h">
+          <%= render :partial => 'tags/syllabus_tag', :locals => {:obj => @syllabus,:object_flag => "11"}%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="fontGrey2 mt10 ml20">访问计数 343 （自2016年5月）</div>
+
+    </div><!--left end -->
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+  <%= render :partial => 'layouts/new_feedback' %>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<script type="text/javascript">
+    $(function(){
+        $('#user_hide_course').hide();
+    });
+
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+    function leftCourseslistChange(){
+        $('#homepageLeftMenuCourses').slideToggle();
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
+
+    }
+</script>
+</body>
+</html>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index e7695f0e7..4922882b9 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -13,7 +13,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org'%>
+  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org', 'syllabus'%>
   <%= javascript_include_tag "course","header",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 8455d5693..9c816af7f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -198,7 +198,10 @@
                           <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
                             <ul class="topnav_course_menu" id="topnav_course_menu">
                               <li>
-                                <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%>
+                                <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :class => "menuGrey"%>
+                              </li>
+                              <li>
+                                <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%>
                               </li>
                               <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
                               <li>
diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb
new file mode 100644
index 000000000..34b02e33a
--- /dev/null
+++ b/app/views/syllabuses/new.html.erb
@@ -0,0 +1,27 @@
+<div class="project_r_h02">
+  <h2 class="project_h2">新建课程</h2>
+</div>
+<div class="hwork_new">
+  <ul>
+    <%= labelled_form_for @syllabus do |f| %>
+        <li class="ml45">
+          <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
+          <input  type="text" name="title" id="new_syllabus_name" class="name_input" maxlength="100" onkeyup="regex_syllabus_name();">
+          <span class="c_red" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
+        </li>
+        <div class="cl"></div>
+        <li class="ml45">
+          <label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
+          <input  type="text" name="eng_name" id="new_syllabus_eng_name" class="name_input" maxlength="100">
+          <!--<span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>-->
+        </li>
+        <div class="cl"></div>
+        <li class=" ml90" >
+          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_syllabus();" >提交</a>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
+          <div class="cl"></div>
+        </li>
+    <% end%>
+  </ul>
+</div><!--talknew end-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/tags/_syllabus_tag.html.erb b/app/views/tags/_syllabus_tag.html.erb
new file mode 100644
index 000000000..4d6fc6b87
--- /dev/null
+++ b/app/views/tags/_syllabus_tag.html.erb
@@ -0,0 +1,5 @@
+<div id="tags">
+  <div id="tags_show">
+    <%= render :partial => "tags/tag_syllabus_new_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/tags/_tag_syllabus_new_name.html.erb b/app/views/tags/_tag_syllabus_new_name.html.erb
new file mode 100644
index 000000000..093e372ac
--- /dev/null
+++ b/app/views/tags/_tag_syllabus_new_name.html.erb
@@ -0,0 +1,28 @@
+<% @tags = obj.reload.tag_list %>
+<% if non_list_all && @tags.size > 0 %>
+
+<% else %>
+    <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
+    <% if @tags.size > 0 %>
+        <% @tags.each do |tag| %>
+            <span class="re_tag f_l " id="tag">
+              <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
+              <span class="del">
+                <%= link_to('x', remove_tag_path(:tag_name => tag,:taggable_id => obj.id, :taggable_type => object_flag), :remote => true, :confirm => l(:text_are_you_sure) ) if obj.user == User.current %>
+              </span>
+            </span>
+        <% end %>
+    <% end %>
+<% end %>
+
+<% if User.current.logged?%>
+    <a href="javascript:void(0)" class="yellowBtn f_l" onclick="$('#add_tag01').slideToggle();"><%= l(:label_add_tag)%></a>
+    <span id="add_tag01" style="display:none; vertical-align: middle;" class="ml10 f_l">
+              <%= form_for "tag_for_save",:remote=>true,:url=>save_tag_path,:update => "tags_show",:complete => '$("#put-tag-form").slideUp();' do |f| %>
+                <%= f.text_field :name ,:id => "tags_name4",:size=>"20",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class =>"isTxt w90 f_l" %>
+          <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+          <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+          <input type="button" class="submit f_l" onclick="$('#tags_name4').parent().submit();" />
+              <% end %>
+            </span>
+<% end%>
\ No newline at end of file
diff --git a/app/views/tags/remove_tag.js.erb b/app/views/tags/remove_tag.js.erb
index 4c4409c1c..b53aef949 100644
--- a/app/views/tags/remove_tag.js.erb
+++ b/app/views/tags/remove_tag.js.erb
@@ -19,6 +19,9 @@ $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
                      :locals => {:obj => @obj,:non_list_all => false, :object_flag => @object_flag}) %>');
+<% elsif @object_flag == '11'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_syllabus_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
 <% else%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index e4f12b558..10b1393d8 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -38,6 +38,10 @@ $('#tags_name2').val("");
     $('#tags_name').val("");
 <% elsif @obj_flag == '10'%>
 //$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
+<% elsif  @obj_flag == '11'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_syllabus_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+$('#tags_name4').val("");
 <% else%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                         :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3dbd2e8ef..41e70639c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -329,7 +329,7 @@ zh:
   permission_manage_subtasks: 管理子任务
   permission_view_journals_for_messages: 查看留言
   permission_view_courses: 查看课程
-  permission_new_course: 新建课程
+  permission_new_course: 新建班级
   permission_configure_course: 配置课程
   permission_close_course: 关闭/重开
   permission_new_assignment: 新建任务
@@ -1265,7 +1265,9 @@ zh:
 
   label_delete_confirm: 确认删除？
   label_tags_bid: 需求名称
-  label_tags_course_name: 课程名称
+  label_tags_syllabus_name: 课程名称
+  label_tags_course_name: 班级名称
+  label_tags_course_eng_name: 英文名称
   label_tags_bid_description: 需求描述
   label_tags_issue_description: 问题描述
   label_tags_all_objects: 所有
@@ -1692,7 +1694,7 @@ zh:
   label_new_join_group: 加入当前分班
   label_new_course_password: 课程密码
   label_new_course_school: 开课学校
-  label_new_course_description: 课程描述
+  label_new_course_description: 班级描述
   label_homework_description: 作业描述
   label_new_join_order: 请输入课程密码
   label_task_submit_form_accessory: 作业最终以附件形式提交
diff --git a/config/routes.rb b/config/routes.rb
index a0ab9b783..7e2998262 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1071,6 +1071,18 @@ RedmineApp::Application.routes.draw do
 
   match 'courses/search'
   match '/contests/search', :via => [:get, :post]
+
+  #课程大纲路由设置
+  resources :syllabuses do
+    member do
+
+    end
+
+    collection do
+
+    end
+  end
+
   # add by nwb
   # 课程路由设置
   resources :courses do
diff --git a/db/migrate/20160627074232_add_column_to_syllabus.rb b/db/migrate/20160627074232_add_column_to_syllabus.rb
new file mode 100644
index 000000000..f907f7a31
--- /dev/null
+++ b/db/migrate/20160627074232_add_column_to_syllabus.rb
@@ -0,0 +1,12 @@
+class AddColumnToSyllabus < ActiveRecord::Migration
+  def change
+    add_column :syllabuses, :eng_name, :string
+    add_column :syllabuses, :type, :integer
+    add_column :syllabuses, :credit, :integer
+    add_column :syllabuses, :hours, :integer
+    add_column :syllabuses, :theory_hours, :integer
+    add_column :syllabuses, :practice_hours, :integer
+    add_column :syllabuses, :applicable_major, :string
+    add_column :syllabuses, :pre_course, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 148a6e21b..5147a5c73 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 => 20160624032138) do
+ActiveRecord::Schema.define(:version => 20160627074232) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1539,6 +1539,18 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+  end
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1853,8 +1865,16 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.string   "title"
     t.text     "description"
     t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+    t.string   "eng_name"
+    t.integer  "type"
+    t.integer  "credit"
+    t.integer  "hours"
+    t.integer  "theory_hours"
+    t.integer  "practice_hours"
+    t.string   "applicable_major"
+    t.string   "pre_course"
   end
 
   add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
diff --git a/public/images/syllabus.jpg b/public/images/syllabus.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3daef5a011ac6e10b3ceec2d28235c03a9febf02
GIT binary patch
literal 16760
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
a0r~!>Y@zI4V$b!56QX)UIU^~YxBms9*~}{d

literal 0
HcmV?d00001

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 8b5e58618..fb272cfd0 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -182,10 +182,22 @@ function regex_course_password(str)
         return false;
     }
 }
+//验证课程大纲
+function regex_syllabus_option(str) {
+    var obj = document.getElementById(str + "_syllabus_id");
+    var syllabus = obj.options[obj.selectedIndex];
+    if(parseInt(syllabus.value) == 0) {
+        $("#"+str+"_syllabus_notice").show();
+        return false;
+    } else{
+        $("#"+str+"_syllabus_notice").hide();
+        return true;
+    }
+}
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
+    if(regex_syllabus_option('new')&&regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
     {
         $("#new_course").submit();
     }
@@ -193,11 +205,35 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit'))
+    if(regex_syllabus_option('edit')&&regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit'))
     {
         $("#edit_course_"+id).submit();
     }
 }
+
+//新建课程大纲
+function submit_new_syllabus()
+{
+    if(regex_syllabus_name())
+    {
+        $("#new_syllabus").submit();
+    }
+}
+
+function regex_syllabus_name() {
+    var name = $.trim($("#new_syllabus_name").val());
+    if(name.length < 2)
+    {
+        $("#new_syllabus_name_notice").show();
+        return false;
+    }
+    else
+    {
+        $("#new_syllabus_name_notice").hide();
+        return true;
+    }
+}
+
 //课程讨论区
 function regexTopicSubject() {
     var name = $("#message_subject").val();
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
new file mode 100644
index 000000000..6483d266d
--- /dev/null
+++ b/public/javascripts/syllabus.js
@@ -0,0 +1,9 @@
+//显示更多的班级
+function show_more_course(url){
+    $.get(
+        url,
+        { page: $("#course_page_num").val() },
+        function (data) {
+        }
+    );
+}
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d0a5e7ab3..9bfc00625 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1426,4 +1426,6 @@ a.pages-big{ width:50px;}
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
+.W600{ width:600px;}
+
+.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
\ No newline at end of file
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
new file mode 100644
index 000000000..cbdd5808f
--- /dev/null
+++ b/public/stylesheets/syllabus.css
@@ -0,0 +1,155 @@
+/****标签(和资源库的tag样式一致)***/
+.project_Label{ width:218px; padding:10px; background:#fff; margin-top:10px;  padding-top:5px; margin-bottom:10px; border:1px solid #dddddd;}
+.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
+a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
+.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
+.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
+.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
+.re_tag a{ color:#0d90c3;}
+.tag_h{ }
+.tag_h span,.tag_h a{ margin-bottom:5px;}
+/*信息*/
+.project_info{ background:#fff; padding:10px 8px; width:222px;  margin-bottom:10px; border:1px solid #dddddd;}
+.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px; margin-top:5px;}
+.pr_info_logo{ border:1px solid  #eaeaea; width:60px; height:60px; padding:1px;}
+.pr_info_logo:hover{ border:1px solid #297fb8; }
+
+/*课程大纲*/
+input.syllabus_input{
+    border:none;
+    width:150px;
+    height:25px;
+    line-height:25px;
+    color:#333;
+}
+input.syllabus_input_min{
+    border:none;
+    width:30px;
+    height:25px;
+    line-height:25px;
+    color:#333;
+}
+.syllabus_select{
+    border:1px solid #ccc;
+    margin-left:5px;
+}
+.syllabus_leftinfo {
+    margin:10px 10px 0 10px;
+    width:220px;
+}
+.syllabus_leftinfo li{
+    line-height:25px;
+}
+.syllabus_leftinfo label{
+    display:block;
+    width:60px;
+    text-align:right;
+    float:left;
+    line-height:25px;
+}
+.syllabusbox{
+    position:relative;
+    width: 718px;
+    color: #4b4b4b;
+    padding:30px 15px;
+    margin-bottom: 10px;
+    background: #fff;
+    border: 1px solid #dddddd;
+}
+.syllabuscon_title{
+    color:#000; text-align:center;
+}
+.syllabuscon_txt p{
+    font-size:14px;
+    line-height:1.9;
+    color:#000;
+}
+.syllabuscon_txt_title{
+    font-weight:bold;
+    margin:10px 0;
+}
+.syllabusbox_tishi{
+    font-size:14px;
+    width:733px;
+    color:#cb7c01;
+    padding:10px 0 0 15px;
+    margin-bottom:10px;
+    background:#fff7d1;
+    border:1px solid #fcd9b4;
+    height:34px;
+}
+a.syllabusbox_a_blue{
+    color:#3b94d6;
+}
+.syllabus_leftinfo p{
+    line-height:25px;
+    width:150px;
+    overflow:hidden;
+    white-space: nowrap;
+    text-overflow:ellipsis;
+}
+.syllabus_info_tishi{
+    font-size:16px;
+    width:400px;
+    margin:100px auto;
+}
+.syllabus_info_tishi a{
+    color:#3b94d6;
+}
+
+/*课程大纲-课程列表*/
+.icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
+.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
+.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block;  }
+.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; }
+.icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
+.icons_sy_cir{background: url(../images/syllabus/icons_syllabus.png) 0px -82px no-repeat; width:15px; height:15px; display:block; position:absolute; left:-8px; top:25px;}
+.icons_sy_arrow{background: url(../images/syllabus/icons_syllabus.png) -31px -81px no-repeat; width:20px; height:20px; display:block; }
+.syllabus_h2_top{  font-size:18px; color:#333; font-weight:normal;  padding:10px 15px;border-bottom:1px solid #e7e7e7; }
+.syllabus_category{ padding:10px 15px; background-color:#f6f6f6; border-bottom:1px solid #e7e7e7;}
+.syllabus_box{ width:750px; border:1px  solid #e7e7e7; background-color:#fff;}
+.syllabus_courses_list{ padding:15px; border-bottom:1px solid #e7e7e7; cursor:pointer;}
+.syllabus_courses_list:hover{ background:#f6fafd;}
+.syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+.sy_p_grey{ margin-left:25px; color:#888; margin-top:5px; font-size:12px;}
+.syllabus_class_box{ padding-left:30px; background:#f6f6f6;}
+.syllabus_class_list{ padding:12px 0 12px 15px; height:44px;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7; position:relative;}
+.syllabus_class_list:hover{ background:#ececec;}
+.syllabus_class_list_more{padding:8px; text-align:center;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7;}
+.syllabus_class_list_more:hover{ background:#ececec;}
+.syllabus_class_list_more a{ color:#ff7e00;}
+.syllabus_class_title{ font-size:14px; color:#333; width:500px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.syllabus_class_w{ width:650px;}
+.dis {display:block;}
+.undis {display:none;}
+
+/*班级列表界面(用的博客列表的样式)*/
+.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
+.bloglistbox{ min-height:690px;}
+.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
+.category{ }
+.list_title{padding:10px 0; border-bottom:1px solid #ddd;}
+.category a,.category span{ float:left; margin-right:5px;}
+.grayTxt{ color:#9093a6;}
+.sortTxt{ color:#000;}
+.sortTxt:hover{ color:#28be6c;}
+a.sortupbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
+a.sortdownbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
+a.sort_no{ background: url(../images/syllabus/icons_syllabus.png) -16px -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
+.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
+a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:708px;}
+a:hover.list-title{ color:#269ac9;}
+.c_red{ font-weight:normal; font-size:12px;}
+.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
+.list-file li{ line-height:1.9;}
+.list-info span{ margin-left:5px;}
+.pages a{ display:block; border:1px solid #d1d1d1; color:#888; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
+.pages a:hover{  background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
+a.pages-big{ width:50px;}
+.pages .active{  background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
+.pages{width:330px; margin:20px auto 10px;}
+a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
+a:hover.course-title{ color:#269ac9;}
+
+/*新建页面*/
+.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
\ No newline at end of file

From cbe34ea0a7991c3cacbad35875056deaed039c13 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 28 Jun 2016 15:57:56 +0800
Subject: [PATCH 608/668] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E6=97=B6=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9006c8a79..661770206 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1096,7 +1096,7 @@ class StudentWorkController < ApplicationController
       all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
     end
     all_students = User.where("id in #{all_student_ids}")
-    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).empty? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
+    student_work_id = @homework.student_work_projects.where("user_id=? and student_work_id is not null",User.current.id).first.nil? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
     @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
     respond_to do |format|

From 4983d5283bd1b930882c09c6984051a4c048ba74 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 28 Jun 2016 16:30:33 +0800
Subject: [PATCH 609/668] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9A=E6=AC=A1=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/search_course_students.js.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index 2ac4eeaab..65179317f 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -8,19 +8,19 @@ $("#all_students_list").empty();
     $("#all_students_list").append(link);
 
     var str = $("#group_member_ids").val();
-    /*var str = "";
+    var choose_str = "";
     var lists = $("#choose_students_list li");
     if(lists.length > 0) {
         for(var i=0; i<lists.length; i++) {
             var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
-            str += id;
+            choose_str += id;
             if (i != lists.length -1) {
-                str += ",";
+                choose_str += ",";
         }
     }
-}*/
+}
     <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
-        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+        if (str.indexOf(<%=user.id.to_s %>) < 0 && choose_str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {
                 var li = "<li id='choose_student_<%=user.id %>'";
                 <% if user.id.to_i != User.current.id.to_i %>

From a08edcca8a6acdb1ab2d026916d52306460ec450 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 28 Jun 2016 17:18:50 +0800
Subject: [PATCH 610/668] quanxian

---
 app/controllers/quality_analysis_controller.rb |  9 +++++----
 app/helpers/repositories_helper.rb             |  5 +++++
 app/views/projects/_development_group.html.erb |  6 ++++++
 .../quality_analysis/_result_list.html.erb     |  2 +-
 app/views/quality_analysis/_show.html.erb      | 18 +++++++++---------
 app/views/quality_analysis/create.js.erb       |  1 +
 .../repositories/_quality_analysis.html.erb    |  2 +-
 app/views/repositories/show.html.erb           |  2 ++
 public/stylesheets/public.css                  |  1 +
 9 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 app/views/quality_analysis/create.js.erb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 7de4bedab..591cef596 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -20,17 +20,19 @@ class QualityAnalysisController < ApplicationController
       rep_id = params[:rep_id]
       # REDO
       job_name = "#{user_name}-#{rep_id}"
+      sonar_name = "#{user_name}:#{rep_id}"
 
       # Checks if the given job exists in Jenkins.
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
+        logger.error("##################################{branch}")
         language = params[:language]
         path = params[:path]
         qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
         version = qa.nil? ? 1 : qa.sonar_version + 1
-        properties = "sonar.projectKey=#{user_name}:#{rep_id}
-        sonar.projectName=#{user_name}:#{rep_id}
+        properties = "sonar.projectKey=#{sonar_name}
+        sonar.projectName=#{sonar_name}
         sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
@@ -66,7 +68,7 @@ class QualityAnalysisController < ApplicationController
       puts e
     end
     respond_to do |format|
-      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => "#{user_name}:#{rep_id}")}
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
       format.js
     end
   end
@@ -83,7 +85,6 @@ class QualityAnalysisController < ApplicationController
         # @quality_analyses = QualityAnalysis.where("sonar_name in (#{arr.empty? ? '0': arr.join(',')})")
         @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
       else
-        qa = QualityAnalysis.where(:project_id => @project.id).first
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first
         issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 3cf781f76..b525c4aed 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -41,6 +41,11 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  def quality_analysis login, rep_id
+    long_rep_id = "#{login}:#{rep_id}"
+    QualityAnalysis.where(:sonar_name => long_rep_id).first
+  end
+
   # 获取文件目录的最新动态
   def get_trees_last_changes(project_id, rev, ent_name)
     g = Gitlab.client
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 2c7d36fb5..6961fcbac 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -55,6 +55,12 @@
         <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
     <% end %>
   </div>
+  <!--quality_analysis-->
+  <% unless QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+        <div class="subNav">
+          <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
+        </div>
+  <% end %>
 <% end %>
 <!-- more -->
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 845049cea..8c80d403f 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -12,7 +12,7 @@
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
-          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2" %></li>
           <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
           <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 864512bdd..4f8c21fe3 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -12,37 +12,37 @@
       <div class="analysis-genral">
         <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
       </div>
       <div class="analysis-genral" >
         <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">复杂度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f8 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f10 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
       </div>
     </div>
     <div class="flex">
       <div class="analysis-genral">
         <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">代码重复度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
       </div>
       <div class="analysis-genral">
         <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
         <p class="fontGrey3">注释率</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
+        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
       </div>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
-    <div><span class="fontGrey3 mr30">质量问题</span>
+    <div><span class="fontGrey3 mr30 fl">质量问题</span>
       <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%= @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 200) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 200) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 200) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
new file mode 100644
index 000000000..f6955106f
--- /dev/null
+++ b/app/views/quality_analysis/create.js.erb
@@ -0,0 +1 @@
+<% %>
\ No newline at end of file
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index 0b3f38ee3..e0240c257 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 5f4288262..6bc01c83c 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -4,7 +4,9 @@
   <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
   <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
   <%# if User.current.member_of?(@project) %>
+  <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
       <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+  <% end %>
   <%# end %>
   <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 743c81014..2ab150405 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -28,6 +28,7 @@ h2{ font-size:18px; }
 h3{ font-size:14px; }
 h4{ font-size:14px; }
 .f8 {font-size:8px;}
+.f10 {font-size:10px;}
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}

From 300ad6840537cc2ea92bac3f183e1951d7b6e5c5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 28 Jun 2016 17:39:58 +0800
Subject: [PATCH 611/668] default path for sonar

---
 .../quality_analysis_controller.rb            |  3 +--
 app/views/repositories/show.html.erb          | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 591cef596..7b0bc5327 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -26,9 +26,8 @@ class QualityAnalysisController < ApplicationController
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
-        logger.error("##################################{branch}")
         language = params[:language]
-        path = params[:path]
+        path = params[:path].nil? ? "./" :params[:path]
         qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
         version = qa.nil? ? 1 : qa.sonar_version + 1
         properties = "sonar.projectKey=#{sonar_name}
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 6bc01c83c..0f179d150 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,16 +1,18 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
-  <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-  <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
-  <%# if User.current.member_of?(@project) %>
-  <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
-      <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
-  <% end %>
-  <%# end %>
-  <%# else %>
+  <% unless @entries.nil? %>
+      <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
+      <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+      <%# if User.current.member_of?(@project) %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
+          <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+      <% end %>
+      <%# end %>
+      <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
-  <%# end %>
+      <%# end %>
+  <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

From 3c425edc3c3fb9bbb737db2d64f51775e23ff2c3 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 17:46:27 +0800
Subject: [PATCH 612/668] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81=E4=BC=9A=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/course.rb b/app/models/course.rb
index a562f91b7..f286a2443 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -470,6 +470,7 @@ class Course < ActiveRecord::Base
     if !code || code.size <5
       code = CODES.sample(5).join
       return generate_invite_code if Course.where(invite_code: code).present?
+      self[:invite_code] = code
       save! && reload
     end
     code

From 222855ea796e9ea30321f18b834775c2ffcd350e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 19:19:59 +0800
Subject: [PATCH 613/668] =?UTF-8?q?=E8=B6=8A=E8=BF=87course=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84validate,=E4=BB=A5=E9=98=B2save=20invitecode=20?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile              | 6 +++++-
 app/models/course.rb | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b482cb6fd..eef93c371 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,11 @@ source 'https://ruby.taobao.org/'
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
-  gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  if RUBY_PLATFORM =~ /darwin/
+    gem "rmagick", "= 2.15.4" ## osx must be this version
+  else
+    gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  end
   gem 'certified'
 end
 
diff --git a/app/models/course.rb b/app/models/course.rb
index f286a2443..0c4acce97 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -470,8 +470,7 @@ class Course < ActiveRecord::Base
     if !code || code.size <5
       code = CODES.sample(5).join
       return generate_invite_code if Course.where(invite_code: code).present?
-      self[:invite_code] = code
-      save! && reload
+      update_attribute(:invite_code, code)
     end
     code
   end

From 0a684227b8d58fa2d6a6b1766dc4a9b22df4e45a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 28 Jun 2016 22:01:44 +0800
Subject: [PATCH 614/668] =?UTF-8?q?=E5=A6=82=E6=9E=9Csonar=E6=B2=A1?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=AE=8C=E6=88=90=E5=88=99=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 7b0bc5327..40e1c81de 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -77,12 +77,12 @@ class QualityAnalysisController < ApplicationController
     begin
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
-      # projects_date = open(@sonar_address + "/api/projects/index").read
-      # @arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
       if params[:resource_id].nil?
         @name_flag = true
-        # @quality_analyses = QualityAnalysis.where("sonar_name in (#{arr.empty? ? '0': arr.join(',')})")
-        @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+        projects_date = open(@sonar_address + "/api/projects/index").read
+        arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+        quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+        @quality_analyses.collect{|qa| arr.include?(qa.sonar_name)}
       else
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first

From c24fdee13464843ca86f393f9737ae1df79a1ddb Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Wed, 29 Jun 2016 08:48:13 +0800
Subject: [PATCH 615/668] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E7=89=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                       |  2 +-
 app/views/my/account.html.erb | 47 +++++++++++------------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index d392c6561..a1ea263f5 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'
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 9cca5da5c..f28ad1ca2 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -15,14 +15,13 @@
           <%= error_messages_for 'user',@user.user_extensions %>
         <% end %>
         <ul class="setting_left">
-          <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;登录名&nbsp;:&nbsp;</li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;邮箱&nbsp;:&nbsp;</li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;职业&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><span style="color:red;">*</span>&nbsp;&nbsp;姓名&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">性别&nbsp;:&nbsp;</li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">单位名称&nbsp;:&nbsp;</li>
           <li>地区&nbsp;:&nbsp;</li>
           <li>邮件通知&nbsp;:&nbsp;</li>
           <!--<li>个人签名&nbsp;:&nbsp;</li>-->
@@ -66,34 +65,18 @@
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
+
           <li nhname="tag" nh_tag_2="true" style="display:none;"><%= text_field_tag :enterprise_name,@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
-            <select class="w70" style="height:28px;margin-left:2px;" id="gender" name="gender"><option value="0">男</option><option value="1">女</option></select>
+            <input type="radio" class="fl "><label class="fl mr10">男</label> <input type="radio" class="fl "><label class="fl ">女</label>
+
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
-            <% if User.current.user_extensions.nil? %>
-              <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"  >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" />
-                <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
-              <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
-            <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
-              <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"   >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
-                <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
-              <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
-            <% elsif User.current.user_extensions.school.nil? %>
-              <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"  >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text"  />
-                <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
-              <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
-            <% else %>
-              <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text" value="<%= User.current.user_extensions.school %>" />
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
-              <span id="hint" style="color: #7f7f7f;display: none" >平台找到了<a id="school_num" href="javascript:void(0)" style="color: red" >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
-              <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text"  style="display: none;width:117px;" value="<%#= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>-->
-            <% end %>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" >
+            <select  class="w210 fl" style='height:28px;'>
+              <option value="">  -- 请选择您所属的高校 --</option>
+            </select>
+            <p class="fl ml10">您输入的名称尚不存在，<a href="#" style="color: #3b94d6;">申请添加</a> </p>
           </li>
 
           <li>
@@ -140,13 +123,13 @@
 
           <li>
             <%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
-            <label>不要发送对我自己提交的修改的通知<%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %></label>
+            <label class="ml10"><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %>不要发送对我自己提交的修改的通知</label>
           </li>
           <!--<li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%#= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>-->
           <li style="height:auto;"><textarea name="description" class="w450 h200" maxlength="255" style="resize:none;"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
           <li style="display:none;"><%= f.select :language, :Chinese => :zh, :English => :en %></li>
           <li class="ml2">
-            <a href="javascript:void(0);" id="my_account_form_link" class="blue_btn fl">确认</a>
+            <a href="javascript:void(0);" id="my_account_form_link" class="blue_btn fl" style="background: #3b94d6; padding: 0 25px;">确定</a>
             <input type="submit" id="my_account_form_btn" style="display:none;"/>
             <!--<a href="javascript:void(0);" class="grey_btn ml10 fl">取消</a>-->
           </li>

From 22b40c082cd71de2873af3136437908a10f8d1af Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 09:10:47 +0800
Subject: [PATCH 616/668] resole some nil problems

---
 .../quality_analysis_controller.rb            |  2 +-
 .../quality_analysis/_hightchars.html.erb     |  6 +-
 app/views/quality_analysis/_show.html.erb     | 94 +++++++++++--------
 app/views/repositories/show.html.erb          |  4 +-
 4 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 7b0bc5327..9ea602659 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -27,7 +27,7 @@ class QualityAnalysisController < ApplicationController
         @g = Gitlab.client
         branch = params[:branch]
         language = params[:language]
-        path = params[:path].nil? ? "./" :params[:path]
+        path = params[:path].blank? ? "./" : params[:path]
         qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
         version = qa.nil? ? 1 : qa.sonar_version + 1
         properties = "sonar.projectKey=#{sonar_name}
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index fb60eaed3..278851ad5 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -209,7 +209,7 @@
                     },
                     series: [{
                         name: '复杂度',
-                        data: [<%= @complexity["msr"][6]["val"] %>]
+                        data: [<%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -329,7 +329,7 @@
                     },
                     series: [{
                         name: '重复率',
-                        data: [<%= @complexity["msr"][7]["val"] %>]
+                        data: [<%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -454,7 +454,7 @@
                     },
                     series: [{
                         name: '质量等级',
-                        data: [<%= @complexity["msr"][5]["val"] %>]
+                        data: [<%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 4f8c21fe3..0a522df52 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -1,5 +1,4 @@
 <%= javascript_include_tag 'highcharts','highcharts-more' %>
-<%= render :partial => "hightchars" %>
 <div class="project_r_h">
   <h2 class="project_h2" style="width:180px;">质量分析</h2>
 </div>
@@ -7,66 +6,85 @@
   <div class="cl"></div>
   <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
-  <div class="analysis-block mt10 mb40 f14">
-    <div class="flex">
-      <div class="analysis-genral">
-        <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-        <p class="fontGrey3">质量等级</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][9]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+<% if @complexity["msr"].count > 3 %>
+    <%= render :partial => "hightchars" %>
+    <div class="analysis-block mt10 mb40 f14">
+      <div class="flex">
+        <div class="analysis-genral">
+          <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+          <p class="fontGrey3">质量等级</p>
+          <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? 0 : @complexity["msr"][9]["frmt_val"] %>
+            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+        </div>
+        <div class="analysis-genral" >
+          <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+          <p class="fontGrey3">复杂度</p>
+          <p class="fontBlue2 pr"><%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][6].nil? ? "" : complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][6].nil? ? 0 : complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
+        </div>
       </div>
-      <div class="analysis-genral" >
-        <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-        <p class="fontGrey3">复杂度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][6]["val"] %><span class="f10 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
+      <div class="flex">
+        <div class="analysis-genral">
+          <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+          <p class="fontGrey3">代码重复度</p>
+          <p class="fontBlue2 pr"><%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["frmt_val"] %>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][7].nil? ? "" : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][7].nil? ? 0 : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
+        </div>
+        <div class="analysis-genral">
+          <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+          <p class="fontGrey3">注释率</p>
+          <p class="fontBlue2 pr"><%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["frmt_val"] %>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][5].nil? ? "" : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][5].nil? ? 0 : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
+        </div>
       </div>
     </div>
-    <div class="flex">
-      <div class="analysis-genral">
-        <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-        <p class="fontGrey3">代码重复度</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][7]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
-      </div>
-      <div class="analysis-genral">
-        <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-        <p class="fontGrey3">注释率</p>
-        <p class="fontBlue2 pr"><%= @complexity["msr"][5]["frmt_val"] %><span class="f10 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
-      </div>
-    </div>
-  </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
+<% end %>
+
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
+    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
+      <span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
     <div><span class="fontGrey3 mr30 fl">质量问题</span>
-      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%= @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
+      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
     <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span>
+        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></span>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][1].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
+        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></span>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][2].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
+        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></span>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][3].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
+        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></span>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][4].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
+      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
+        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>
+  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%=@complexity["msr"][0].nil? ? 0 : lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>
   <div class="analysis-block mt10 mb40 flex f14">
     <div class="analysis-genral">
       <p class="fontGrey3">代码行数</p>
-      <p class="fontBlue2"><%= @complexity["msr"][0]["frmt_val"] %></p>
+      <p class="fontBlue2"><%= @complexity["msr"][0].nil? ? 0 : @complexity["msr"][0]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">文件</p>
-      <p class="fontBlue2"><%= @complexity["msr"][2]["frmt_val"] %></p>
+      <p class="fontBlue2"><%= @complexity["msr"][2].nil? ? 0 : @complexity["msr"][2]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">目录</p>
-      <p class="fontBlue2"><%= @complexity["msr"][3]["frmt_val"] %></p>
+      <p class="fontBlue2"><%= @complexity["msr"][3].nil? ? 0 : @complexity["msr"][3]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">类</p>
-      <p class="fontBlue2"><%= @complexity["msr"][1]["frmt_val"] %></p>
+      <p class="fontBlue2"><%= @complexity["msr"][1].nil? ? 0 : @complexity["msr"][1]["frmt_val"] %></p>
     </div>
     <div class="analysis-genral">
       <p class="fontGrey3">方法</p>
-      <p class="fontBlue2"><%= @complexity["msr"][4]["frmt_val"] %></p>
+      <p class="fontBlue2"><%=@complexity["msr"][4].nil? ? 0 : @complexity["msr"][4]["frmt_val"] %></p>
     </div>
   </div>
   <!--<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>-->
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 0f179d150..92769dbbe 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,9 +5,9 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
+      <%# if quality_analysis(User.current.try(:login), @repository.id).nil? %>
           <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
-      <% end %>
+      <%# end %>
       <%# end %>
       <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>

From c151a619800cd63dc62995b5d71496d92abe67bc Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 29 Jun 2016 09:14:53 +0800
Subject: [PATCH 617/668] =?UTF-8?q?=E6=8A=8A=E5=87=A0=E4=B8=AAgem=E5=8C=85?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=94=BE=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index eef93c371..bb94100a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,12 +9,11 @@ unless RUBY_PLATFORM =~ /w32/
     gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   end
   gem 'certified'
+  gem 'net-ssh', '2.9.1'
+  gem 'jenkins_api_client'
+  gem 'nokogiri'
 end
 
-gem 'net-ssh', '2.9.1'
-gem 'jenkins_api_client'
-gem 'nokogiri'
-
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'

From e887ac5c7c500b91d29522c47483e67316c10eaf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 09:38:30 +0800
Subject: [PATCH 618/668] git data from sonar

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

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index eb20426e3..ceac41399 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -66,10 +66,10 @@ class QualityAnalysisController < ApplicationController
     rescue => e
       puts e
     end
-    respond_to do |format|
-      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
-      format.js
-    end
+    # respond_to do |format|
+    #   format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+    #   format.js
+    # end
   end
 
   # resource_id: login + @repository.id
@@ -81,8 +81,8 @@ class QualityAnalysisController < ApplicationController
         @name_flag = true
         projects_date = open(@sonar_address + "/api/projects/index").read
         arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
-        quality_analyses = QualityAnalysis.where(:project_id => @project.id)
-        @quality_analyses.collect{|qa| arr.include?(qa.sonar_name)}
+        @quality_analyses = QualityAnalysis.where(:project_id => @project.id).select{|qa| arr.include?(qa.sonar_name)}
+
       else
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first

From c8178fc02370d7046ed474dd75cd3b5702a2444e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 09:59:21 +0800
Subject: [PATCH 619/668] allert

---
 app/controllers/quality_analysis_controller.rb    | 15 ++++++++++++++-
 app/views/quality_analysis/create.js.erb          |  2 +-
 app/views/repositories/_quality_analysis.html.erb |  4 ++--
 app/views/repositories/show.html.erb              |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index ceac41399..852277126 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -26,7 +26,7 @@ class QualityAnalysisController < ApplicationController
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
-        language = params[:language]
+        language = swith_language_type(params[:language])
         path = params[:path].blank? ? "./" : params[:path]
         qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
         version = qa.nil? ? 1 : qa.sonar_version + 1
@@ -72,6 +72,19 @@ class QualityAnalysisController < ApplicationController
     # end
   end
 
+  # get language type
+  def swith_language_type language
+    if language = "c#"
+      "cs"
+    elsif language = "python"
+      "py"
+    elsif language = "c"
+      "c++"
+    else
+      language
+    end
+  end
+
   # resource_id: login + @repository.id
   def index
     begin
diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
index f6955106f..4bb632b43 100644
--- a/app/views/quality_analysis/create.js.erb
+++ b/app/views/quality_analysis/create.js.erb
@@ -1 +1 @@
-<% %>
\ No newline at end of file
+alert("dengdai")
\ No newline at end of file
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index e0240c257..b6eb62124 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id, :remote => true), :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
@@ -12,7 +12,7 @@
         </div>
         <div class="mb10">
           <div>
-            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
         <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 92769dbbe..b524e898f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,9 +5,9 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <%# if quality_analysis(User.current.try(:login), @repository.id).nil? %>
-          <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
-      <%# end %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
+        <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+      <% end %>
       <%# end %>
       <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>

From 36944e8cce43be6b5c08917b26ee8ca91057321b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jun 2016 10:06:23 +0800
Subject: [PATCH 620/668] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/quality_analysis/create.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
index 4bb632b43..8f93f86ee 100644
--- a/app/views/quality_analysis/create.js.erb
+++ b/app/views/quality_analysis/create.js.erb
@@ -1 +1 @@
-alert("dengdai")
\ No newline at end of file
+alert("正在分析中…………(大概需要30分钟，请耐心等待)")
\ No newline at end of file

From e0664450364ca5d571942d2c37eeb3ac8d09fa28 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 29 Jun 2016 10:45:56 +0800
Subject: [PATCH 621/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/syllabuses_controller.rb | 28 +++++---
 app/controllers/users_controller.rb      | 10 ++-
 app/helpers/owner_type_helper.rb         |  3 +-
 app/models/attachment.rb                 |  1 +
 app/models/course.rb                     |  3 +-
 app/models/syllabus.rb                   |  9 +++
 app/services/courses_service.rb          |  1 +
 app/views/courses/_copy_course.html.erb  | 18 +++---
 app/views/courses/new.html.erb           |  3 +-
 app/views/courses/settings.html.erb      | 25 ++++----
 app/views/layouts/_project_info.html.erb | 32 ++++-----
 app/views/layouts/_user_courses.html.erb |  4 +-
 app/views/layouts/base_courses.html.erb  |  7 +-
 app/views/layouts/base_syllabus.html.erb | 47 ++++++++------
 app/views/layouts/new_base_user.html.erb |  3 +-
 app/views/syllabuses/edit.html.erb       | 82 ++++++++++++++++++++++++
 app/views/syllabuses/show.html.erb       | 44 +++++++++++++
 app/views/users/user_courses4show.js.erb |  2 +-
 config/locales/courses/zh.yml            |  4 +-
 public/javascripts/syllabus.js           | 22 +++++++
 20 files changed, 262 insertions(+), 86 deletions(-)
 create mode 100644 app/views/syllabuses/edit.html.erb

diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 5ee3224bd..7e4e5cea8 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -1,7 +1,7 @@
 class SyllabusesController < ApplicationController
 
-  before_filter :is_logged, :only => [:index, :show]
-  before_filter :find_syllabus, :only => [:show]
+  before_filter :is_logged, :only => [:index, :show, :edit, :new, :update]
+  before_filter :find_syllabus, :only => [:show, :edit, :update]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -17,12 +17,8 @@ class SyllabusesController < ApplicationController
   end
 
   def new
-    if User.current.login?
-      @syllabus = Syllabus.new
-      render :layout => 'new_base'
-    else
-      redirect_to signin_url
-    end
+    @syllabus = Syllabus.new
+    render :layout => 'new_base'
   end
 
   def create
@@ -47,6 +43,22 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  def edit
+    respond_to do |format|
+      format.html{render :layout => 'base_syllabus'}
+    end
+  end
+
+  def update
+    @syllabus.description = params[:syllabus][:description]
+    @syllabus.save_attachments(params[:attachments])
+    if @syllabus.save
+      redirect_to syllabus_path(@syllabus)
+    else
+      redirect_to syllabus_path(@syllabus)
+    end
+  end
+
   private
   def find_syllabus
     @syllabus = Syllabus.find params[:id]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b7972ff6f..39a2ae5a5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1367,7 +1367,15 @@ class UsersController < ApplicationController
   #显示更多用户课程
   def user_courses4show
     @page = params[:page].to_i + 1
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @type = params[:type]
+    if @type == 'User'
+      @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+      @all_count = @user.courses.visible.where("is_delete =?", 0).count
+    elsif @type == 'Syllabus'
+      @syllabus = Syllabus.where("id = #{params[:syllabus_id]}").first
+      @courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+      @all_count = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).count
+    end
   end
 
   #显示更多用户项目
diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb
index 7119d4f60..01320660c 100644
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@@ -7,5 +7,6 @@ module OwnerTypeHelper
   BID = 6
   JOURNALSFORMESSAGE = 7
   HOMEWORKCOMMON = 8
-  BLOGCOMMENT=9
+  BLOGCOMMENT = 9
+  SYLLABUS = 10
 end
\ No newline at end of file
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index aa4ef8670..88fadd644 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -24,6 +24,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :course, foreign_key: 'container_id', conditions: "attachments.container_type = 'Course'"
   belongs_to :org_subfield, foreign_key: 'container_id', conditions: "attachements.container_type = 'OrgSubfield'"
   belongs_to :organization, foreign_key: 'container_id', conditions: "attachements.container_type = 'Organization'"
+  belongs_to :syllabus, foreign_key: 'container_id', conditions: "attachements.container_type = 'Syllabus'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
diff --git a/app/models/course.rb b/app/models/course.rb
index 195e7cf9f..7420e653f 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -90,7 +90,8 @@ class Course < ActiveRecord::Base
   'description',
   'class_period',
   'open_student',
-  'is_delete'
+  'is_delete',
+  'syllabus_id'
 
   acts_as_customizable
 
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index b1bdfd5aa..e16577ff3 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -1,7 +1,16 @@
 class Syllabus < ActiveRecord::Base
+  include Redmine::SafeAttributes
+  include ApplicationHelper
   acts_as_taggable
+  acts_as_attachable
+  has_many_kindeditor_assets :assets, :dependent => :destroy
 
   belongs_to :user
   has_many :courses
   attr_accessible :description, :title, :eng_name, :type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
+  safe_attributes 'title', 'description', 'eng_name', 'type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
+
+  def delete_kindeditor_assets
+    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::SYLLABUS
+  end
 end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index b7b5e73ac..68d062b65 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -260,6 +260,7 @@ class CoursesService
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
     #course.password = params[:course][:password]
+    course.syllabus_id = params[:syllabus_id].to_i
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index dbe03d67f..3fa0ee9fc 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
 <script type="text/javascript">
     function submit_copy_course() {
-        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
+        if(regex_syllabus_option('new')&&regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
         {
             $("#new_course").submit();
             document.getElementById("submit_copy_course").onclick = "";
@@ -51,13 +51,15 @@
       <!--</span>-->
       <div class="cl"></div>
     </li>
+    <li class="ml45 mb10">
+      <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
+      <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
+      <span class="c_red" id="new_syllabus_notice" style="display: none;">请选择课程大纲</span>
+    </li>
     <li class="ml45">
-
-      <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-      <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
       <input  type="text" name="course[name]" id="new_course_name" class="courses_input grey_border" maxlength="100" onkeyup="regex_course_name('new');" value="<%=@course.name %>">
-      <span class="c_red" id="new_course_name_notice" style="display: none;">课程名称不能为空</span>
+      <span class="c_red" id="new_course_name_notice" style="display: none;">班级名称不能为空</span>
     <div class="cl"></div>
     <li class="ml45">
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
@@ -96,7 +98,7 @@
     <li class=" mb5 ml85">
       <label >公开&nbsp;&nbsp;：</label>
       <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox" value="<%=@course.is_public.to_i %>">
-      <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
+      <span class="c_grey">（选中后班级外用户可见该课程，否则仅对班级内成员可见）</span>
       <div class="cl"></div>
     </li>
     <li class="ml85">
@@ -106,13 +108,13 @@
           <label class="fl">
             <input name="course_content_type[]" type="checkbox" value="0" class="resourceCopy"/>
             作业</label>
-            <span class="c_red ml5 fl mb10 w490">复制到新课中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
+            <span class="c_red ml5 fl mb10 w490">复制到新班级中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
         </li>
         <li class="sendCourseName fl ml5">
           <label class="fl">
             <input name="course_content_type[]" type="checkbox" value="1" class="resourceCopy"/>
             资源</label>
-            <span class="c_red ml5 fl mb10">复制到新课的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
+            <span class="c_red ml5 fl mb10">复制到新班级的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
         </li>
       </ul>
       <!--<ul class="fl" id="copyResource2">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index d3326480f..d8daa5a67 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -4,7 +4,7 @@
 <div class="hwork_new">
   <ul>
     <%= labelled_form_for @course do |f| %>
-        <li  class="ml45 mb10">
+        <li class="ml45 mb10">
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
           <% if @syllabus.nil? %>
               <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
@@ -12,7 +12,6 @@
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
           <% end %>
-          <!--<input  type="text" name="course[name]" id="new_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('new');">-->
           <span class="c_red" id="new_syllabus_notice" style="display: none;">请选择课程大纲</span>
         </li>
         <div class="cl"></div>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 3afa8387a..b4ed33d62 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -25,16 +25,19 @@
   <div class="hwork_dis" id="tbc_01" style="padding-top: 10px;">
     <ul>
       <%= labelled_form_for @course do |f| %>
-          <li  class="ml45 mb10">
+          <li class="ml45 mb10">
             <%= render :partial => "avatar/new_avatar_form", :locals => {source: @course} %>
             <div class="cl"></div>
           </li>
-          <li  class="ml45">
-            <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-            <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
+          <li class="ml45 mb10">
+            <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
+            <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input"}  %>
+            <span class="c_red" id="edit_syllabus_notice" style="display: none;">请选择课程大纲</span>
+          </li>
+          <li class="ml45">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
             <input  type="text" name="course[name]" id="edit_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('edit');" value="<%= @course.name%>">
-            <span class="c_red" id="edit_course_name_notice" style="display: none;">课程名称不能为空</span>
+            <span class="c_red" id="edit_course_name_notice" style="display: none;">班级名称不能为空</span>
             <input type="password" style="top: -100000px;position: fixed;">
           </li>
           <div class="cl"></div>
@@ -73,19 +76,19 @@
           <li class=" mb5 ml80">
             <label >公开&nbsp;&nbsp;：</label>
             <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox">
-            <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
+            <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生列表公开&nbsp;&nbsp;：</label>
             <input <%= @course.open_student == 1 ? 'checked' : ''%> id="course_open_student" name="course[open_student]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（选中后课外用户可见学生列表，否则仅对课内成员可见）</span>
+            <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生上传资源&nbsp;&nbsp;：</label>
             <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（选中后允许学生上传课程资源，否则不允许）</span>
+            <span class="c_grey">（选中后允许学生上传班级资源，否则不允许）</span>
             <div class="cl"></div>
           </li>
           <li class=" ml90" >
@@ -96,11 +99,11 @@
       <% end %>
     </ul>
     <% if @course.is_delete == 1 %>
-        <div class="mt30"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
+        <div class="mt30"><%=link_to "恢复该班级", renew_course_path(@course) %></div>
     <% else %>
         <div class="mt30">
-          <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
-          <span>（友情提示：删除该课程后如果您想恢复该课程，请联系系统管理员！）</span>
+          <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该班级", course_path(@course), :method => :delete, :confirm=>"确认要删除该班级吗？"  %>
+          <span>（友情提示：删除该班级后如果您想恢复该班级，请联系系统管理员！）</span>
         </div>
     <% end %>
 
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index c04c2effb..e7efba1c7 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -8,36 +8,26 @@
   <% end %>
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
-<div class="pr_info_id fl mb5 f14">ID:<%= @course.id %><%= @course.is_public == 0 ? "（私有）" : "（公开）" %>
+<div class="pr_info_id fl f14">
+  <%= @course.name %></br>
+  <% if @course.syllabus%>
+      <a class="pr_info_name fb c_dark fl" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
+        <%=@course.syllabus.title %>
+      </a>
+  <% end %>
   <% if is_excellent_course(@course) %>
     <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
   <% end %>
 </div>
-<div class="pr_info_id fl f14">
+<div class="pr_info_id fl f14" style="margin-top: 0px;">
   <% unless is_teacher %>
     <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
   <% end %>
 </div>
 <div class="cl"></div>
-<div >
-<a class="pr_info_name fl c_dark fb" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
 <div>
-  <a class="pr_info_name c_dark fb fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
-    <%= @course.name %>
-  </a>
-  <span id="course_outline_bar">
-      <% if User.current && @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
-          <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
-       <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0 %>
-          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-        <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0 %>
-          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-        <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0 %>
-          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-        <%else %>
-        <%end %>
-  </span>
-</div>
+  <span class="f14">邀请码：</span>
+  <span class="f14 fontBlue2"><%=@course.generate_invite_code %></span>
 </div>
 <div class="cl"></div>
 <div class="pr_info_foot ">
@@ -52,7 +42,7 @@
     <ul>
       <li class="homepagePostSettingIcon">
         <ul class="homepagePostSettiongText boxShadow">
-          <li><%= link_to "课程配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
+          <li><%= link_to "班级配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
           <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %></li>
           <li><%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "postOptionLink" %></li>
         </ul>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 546a5b14b..6c290968c 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -79,12 +79,12 @@
 <% if courses.size == 5%>
     <li class="homepageLeftMenuMore" id="user_show_more_course">
       <input type="hidden" value="<%= page%>" id="course_page_num">
-      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%= user_courses4show_user_path(user.id)%>');"></a>
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%= type=='User' ? user_courses4show_user_path(user.id,:type=>type) : user_courses4show_user_path(user.id,:type=>type,:syllabus=>@syllabus.id)%>');"></a>
     </li>
 <% end%>
 
 <script type="text/javascript">
-    var coursecount = <%= user.courses.visible.where("is_delete =?", 0).count %>;
+    var coursecount = <%= all_count %>;
     var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
 
     if((coursecount <= courseshowcount)&&(coursecount > 5) ){
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 62ccb3a86..4b618bef1 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,12 +57,7 @@
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
         <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
-      <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
-          <div class="info_box mb10">
-            <p class="f14">邀请码</p>
-            <p class="f14 fontBlue2"><%=@course.generate_invite_code %></p>
-          </div>
-      <% end %>
+
       <div class="info_box">
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index b12337608..5f1f9f126 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','new_user','prettify',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','new_user','prettify','share',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify'%>
+  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
@@ -30,7 +30,7 @@
 </head>
 
 <body onload="prettyPrint();">
-<% is_current_user = User.current.logged? && User.current == @user%>
+<% is_current_user = User.current.logged?%>
 <div class="navContainer">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
@@ -74,28 +74,33 @@
       <div class="homepageLeftMenuContainer">
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText" >班级</a>
-          <div class="courseMenu" id="courseMenu">
-            <ul>
-              <li class="courseMenuIcon fr" style="margin-right:10px;" id="courseMenuIcon">
-                <ul class="topnav_course_menu" id="topnav_course_menu"  >
-                  <li>
-                    <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey"%>
-                  </li>
-                  <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
-                  <li>
-                    <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
+          <% if is_current_user%>
+              <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+                  <div class="courseMenu" id="courseMenu">
+                    <ul>
+                      <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
+                        <ul class="topnav_course_menu" id="topnav_course_menu">
+                          <li>
+                            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey"%>
+                          </li>
+                          <li>
+                            <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                          </li>
+                        </ul>
+                      </li>
+                    </ul>
+                  </div>
+              <% else%>
+                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入班级"%>
+              <% end%>
+          <% end%>
         </div>
-
         <% courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% all_count = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).count%>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>">
-          <div id="homepageLeftMenuCourses">
+          <div class = "leftCoursesList" id="homepageLeftMenuCourses">
             <ul>
-              <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current, :page => 0} %>
+              <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current,:all_count => all_count,:type =>'Syllabus',:page => 0} %>
               <!--<li class="homepageLeftMenuCoursesLine" ><a href="javascript:void(0);" class="coursesLineGrey hidden">设计学院设计管理班级3(2016夏)</a></li>
               <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
               <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 9c816af7f..74401a282 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -230,10 +230,11 @@
            end
         %>
         <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% all_count = @user.courses.visible.where("is_delete =?", 0).count%>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" >
           <div class = "leftCoursesList" id="homepageLeftMenuCourses">
               <ul>
-                <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
+                <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user,:all_count => all_count,:type =>'User',:page => 0} %>
               </ul>
           </div>
           <% if !courses.empty? %>
diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
new file mode 100644
index 000000000..f4c0f75e4
--- /dev/null
+++ b/app/views/syllabuses/edit.html.erb
@@ -0,0 +1,82 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
+<div class="RightBanner" >
+  <p >课程信息</p>
+</div>
+<div class="HomeWork">
+  <p class="f16 mb10">课程信息</p>
+  <div class="HomeWorkCon">
+    <!--<div class="">
+      <textarea class="InputBox W700 h400" >
+        <h2 class="syllabuscon_title">《设计管理》课程大纲</h2>
+        <div class="syllabuscon_txt">
+          <p class="syllabuscon_txt_title">一 . 课程目的</p>
+          <p >1.  综合各门专业基础课程知识，运用前修课程获得的技术技能进行项目策划、设计、实施、运作方法研究；<br/>
+            2.  初步学会运用现代科学的设计理念；实施规范；系统管理观念运作；<br/>
+            3.  确立现代设计管理意识及培育实施务实思想。
+          </p>
+          <p class="syllabuscon_txt_title">二 . 主要目标</p>
+          <p >1.  培养学生具备设计管理的理念；<br/>
+            2.  培养学生了解和掌握项目策划、设计、实事、运作方法；<br/>
+            3.  培养学生运用现代科学的设计理念；实施规范；系统管理观念。确立现代设计管理意识及培育实施务实思想。
+          </p>
+          <p class="syllabuscon_txt_title">三 . 详细内容与学时安排</p>
+          <p >1.  详细内容<br/>
+            第一章 概论<br/>
+            (1)  设计管理基本概念<br/>
+            (2)  设计管理构成内容<br/>
+            (3)  设计管理社会意义理论<br/>
+            第二章 设计管理的文化内涵<br/>
+            (1)  人类文化与设计文化<br/>
+            (2)  设计文化与文化设计基本概念<br/>
+            2.  安排学时<br/>
+            第一章     理论学时：6               实践学时：2                上级学时：0<br/>
+            第二章     理论学时：6               实践学时：2                上级学时：0<br/>
+          </p>
+          <p class="syllabuscon_txt_title">四 . 讲授方法</p>
+          <p >1.  理论讲授；<br/>
+            2.  案例分析；<br/>
+            3.  作业项目；<br/>
+          </p>
+        </div>
+
+      </textarea>
+    </div>-->
+    <%= labelled_form_for @syllabus, :url =>syllabus_path(@syllabus),
+                          :html => {:nhname=>'form',:multipart => true, :id => 'syllabus-form'} do |f| %>
+        <div>
+          <div id="syllabus_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :description, :editor_id => 'syllabus_description_editor',
+                           :owner_id => @syllabus.nil? ? 0: @syllabus.id,
+                           :owner_type => OwnerTypeHelper::SYLLABUS,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'syllabus_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }
+          %>
+          <div class="cl"></div>
+          <p id="description_notice_span"></p>
+        </div>
+    <% end %>
+
+    <div class="mt5">
+      <div class="fl" id="syllabus_attachments">
+        <%= render :partial => 'attachments/form_course', :locals => {:container => @syllabus, :isReply => false} %>
+      </div>
+    </div>
+    <div class="mt5">
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_syllabus();">发送</a>
+      <span class="fr mr10 mt3">或</span>
+      <a href="javascript:void(0);" class="fr mr10 mt3" onclick="window.location.href = '<%=syllabus_path(@syllabus)%>';">取消</a>
+    </div>
+    <div class="cl"></div>
+
+  </div>
+</div><!--HomeWork end-->
\ No newline at end of file
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index e69de29bb..57030c5d0 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -0,0 +1,44 @@
+<div class="RightBanner" >
+<p >课程信息</p>
+</div>
+<div class="<%=@syllabus.description.nil? ? 'HomeWork' : 'syllabusbox'%>">
+  <% if @syllabus.description.nil?%>
+      <% if User.current == @syllabus.user %>
+          <p class="syllabus_info_tishi">您建立的课程尚未填写课程大纲，请完善您的<%=link_to '课程大纲', edit_syllabus_path(@syllabus) %>！</p>
+      <% else %>
+          <p class="syllabus_info_tishi"><%=@syllabus.user.show_name %>老师尚未完成课程大纲的编写，敬请期待。</p>
+      <% end %>
+  <% else %>
+      <div class="syllabuscon">
+        <%=@syllabus.description %>
+        <div class="mt10" style="font-weight:normal;">
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
+        </div>
+      </div>
+      <div class="homepagePostSetting" style="margin:10px;">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><%=link_to '编辑', edit_syllabus_path(@syllabus),:class=>'postOptionLink' %></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div class="cl"></div>
+  <% end %>
+
+<div class="homepagePostReply">
+  <div class="homepagePostReplyBanner">
+    <div class="homepagePostReplyBannerCount"><a href="javascript:void(0);" class="mr5">回复（2）</a>▪<a href="javascript:void(0);" class="ml5"> 赞（10）</a></div>
+  </div>
+  <div class="homepagePostReplyContainer">
+    <div class="homepagePostReplyPortrait mr15"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="33" height="33" alt="用户头像" /></a></div>
+    <div class="homepagePostReplyInputContainer">
+      <input class="homepagePostReplyInput fl mr15" placeholder="请输入回复">
+      <a href="javascript:void(0);" class="homepagePostReplyEmotion mt5"></a> <a href="javascript:void(0);" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a> </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+</div><!--回复框 用正式版样式-->
+</div><!--HomeWork end-->
diff --git a/app/views/users/user_courses4show.js.erb b/app/views/users/user_courses4show.js.erb
index 12696e232..fddbcf032 100644
--- a/app/views/users/user_courses4show.js.erb
+++ b/app/views/users/user_courses4show.js.erb
@@ -1 +1 @@
-$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_courses',:locals => {:courses => @courses,:user => @user, :page => @page} )%>");
+$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_courses',:locals => {:courses => @courses,:user => @user,:type=>@type,:page => @page, :all_count => @all_count} )%>");
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index c3d4b0d58..c16e735a7 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -10,8 +10,8 @@ zh:
   #
   #  课程公共标签
   #
-  label_course_join_student: 加入课程
-  label_course_exit_student: 退出课程
+  label_course_join_student: 加入班级
+  label_course_exit_student: 退出班级
   label_course_new: 新建课程
   label_course_name: 课程名称
 
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index 6483d266d..50e779ce1 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -7,3 +7,25 @@ function show_more_course(url){
         }
     );
 }
+
+function regex_sylla_description() {
+    syllabus_description_editor.sync();
+    var name = syllabus_description_editor.html();
+    if (name.length == 0) {
+        $("#description_notice_span").text("描述不能为空");
+        $("#description_notice_span").css('color', '#ff0000');
+        $("#description_notice_span").focus();
+        return false;
+    }
+    else {
+        $("#description_notice_span").text("填写正确");
+        $("#description_notice_span").css('color', '#008000');
+        return true;
+    }
+}
+
+function submit_syllabus() {
+    if (regex_sylla_description()) {
+        $("#syllabus-form").submit();
+    }
+}
\ No newline at end of file

From 3390a2d05f1ec08075a5c0ddc5171b15a072c4dd Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 11:10:19 +0800
Subject: [PATCH 622/668] 500

---
 app/controllers/quality_analysis_controller.rb    | 8 ++++----
 app/views/quality_analysis/_hightchars.html.erb   | 2 +-
 app/views/quality_analysis/create.js.erb          | 1 -
 app/views/repositories/_quality_analysis.html.erb | 2 +-
 app/views/repositories/show.html.erb              | 2 +-
 config/routes.rb                                  | 1 +
 6 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 app/views/quality_analysis/create.js.erb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 852277126..a9b93269a 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -67,18 +67,18 @@ class QualityAnalysisController < ApplicationController
       puts e
     end
     # respond_to do |format|
-    #   format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+    #   #format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
     #   format.js
     # end
   end
 
   # get language type
   def swith_language_type language
-    if language = "c#"
+    if language == "c#"
       "cs"
-    elsif language = "python"
+    elsif language == "python"
       "py"
-    elsif language = "c"
+    elsif language == "c"
       "c++"
     else
       language
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index 278851ad5..9e6cdf5aa 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -94,7 +94,7 @@
                     },
                     series: [{
                         name: '代码质量',
-                        data: [<%= @complexity["msr"][9]["val"] %>]
+                        data: [<%= @complexity["msr"][9].nil? ? 0 : @complexity["msr"][9]["val"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
deleted file mode 100644
index 8f93f86ee..000000000
--- a/app/views/quality_analysis/create.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert("正在分析中…………(大概需要30分钟，请耐心等待)")
\ No newline at end of file
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index b6eb62124..17af1b477 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id, :remote => true), :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index b524e898f..112f3c4e5 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -6,7 +6,7 @@
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
       <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
-        <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+        <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
       <%# end %>
       <%# else %>
diff --git a/config/routes.rb b/config/routes.rb
index 52629604c..2a6204bbf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -928,6 +928,7 @@ RedmineApp::Application.routes.draw do
       }
 
   get 'projects/:id/repository/statistics', :to => 'repositories#stats'
+  get 'projects/:id/repository/quality_analysis', :to => 'repositories#quality_analysis'
 
   get 'projects/:id/repository/graph', :to => 'repositories#graph'
 

From 1225a33ceced3ad27d21bb59b574e95e79cce7c1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jun 2016 11:21:46 +0800
Subject: [PATCH 623/668] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/quality_analysis/_result_list.html.erb  | 2 +-
 app/views/repositories/_quality_analysis.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 8c80d403f..6124812c8 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -6,7 +6,7 @@
   <li class="analysis-result-version fl fontBlue2" >版本</li>
   <li class="analysis-result-loc fl fontBlue2" >分支</li>
   <li class="analysis-result-debt fl fontBlue2" >语言</li>
-  <li class="analysis-result-time fl fontBlue2" >lujing</li>
+  <li class="analysis-result-time fl fontBlue2" >路径</li>
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index b6eb62124..34d70100b 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -3,7 +3,7 @@
   <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id, :remote => true), :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
-          <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
+          <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录，不填写则扫描根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
         </div>
         <div class="mb10">
           <div>

From 77387778d8afc87339dc8419a9b39f8f66d9668c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 14:08:30 +0800
Subject: [PATCH 624/668] some css

---
 app/helpers/quality_analysis_helper.rb    | 2 +-
 app/views/quality_analysis/_show.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index d2948e02b..2a7d350e7 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -3,7 +3,7 @@ module QualityAnalysisHelper
 
   def sqale_rating_status val
     arr = []
-    if val > 0 && val < 5
+    if val < 5
       arr << "很好"
       arr << "b_green2"
     elsif  val. > 5  && val < 10
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 0a522df52..b1588edeb 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -13,8 +13,8 @@
         <div class="analysis-genral">
           <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">质量等级</p>
-          <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? 0 : @complexity["msr"][9]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+          <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? "A" : @complexity["msr"][9]["frmt_val"] %>
+            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "henhao" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
         </div>
         <div class="analysis-genral" >
           <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
@@ -41,7 +41,7 @@
 <% end %>
 
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
-    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
+    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "henhao" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
       <span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>

From b731b05a5a2b188643f2cbfa0efcd3793386dab5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jun 2016 14:12:24 +0800
Subject: [PATCH 625/668] =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index b1588edeb..e55e65bcd 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -14,7 +14,7 @@
           <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">质量等级</p>
           <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? "A" : @complexity["msr"][9]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "henhao" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
         </div>
         <div class="analysis-genral" >
           <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
@@ -41,7 +41,7 @@
 <% end %>
 
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
-    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "henhao" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
+    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
       <span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>

From daf14178cdd9db9b9c4082526e8ca258f72c63be Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jun 2016 14:20:02 +0800
Subject: [PATCH 626/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 112f3c4e5..067056983 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,7 +5,7 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
       <%# end %>

From f7e872cb6c0869a84f47f3eb6e3889f5fb58aef4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jun 2016 15:20:14 +0800
Subject: [PATCH 627/668] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E4=BA=A4=E8=B4=A8=E9=87=8F=E5=88=86=E6=9E=90?=
 =?UTF-8?q?job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 067056983..425c40cec 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,7 +5,7 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && User.current.member_of?(@project) %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
       <%# end %>

From 590b879f02ed88113e9454f1b88c1333848e6dd7 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 29 Jun 2016 16:54:12 +0800
Subject: [PATCH 628/668] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=B8=8D=E5=9B=BA=E5=AE=9Abug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb                   | 4487 ++++++++++++++++----------------
 public/stylesheets/courses.css |    2 +-
 2 files changed, 2236 insertions(+), 2253 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 148a6e21b..d7882a323 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,2252 +1,2235 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20160624032138) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    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"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "apply_resources", :force => true do |t|
-    t.integer  "status"
-    t.integer  "user_id"
-    t.integer  "attachment_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.text     "content"
-    t.integer  "apply_user_id"
-  end
-
-  create_table "at_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "at_message_id"
-    t.string   "at_message_type"
-    t.boolean  "viewed",          :default => false
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.integer  "sender_id"
-  end
-
-  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
-
-  create_table "attachment_histories", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.string   "filename",                     :default => ""
-    t.string   "disk_filename",                :default => ""
-    t.integer  "filesize",                     :default => 0
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => ""
-    t.integer  "downloads",                    :default => 0
-    t.integer  "author_id"
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "version"
-    t.integer  "attachment_id"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "homepage_id"
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-    t.integer "org_subfield_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "code_tests", :force => true do |t|
-    t.integer  "homework_id"
-    t.integer  "wait_time",       :default => 0
-    t.integer  "language"
-    t.integer  "status"
-    t.integer  "time_used",       :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "student_work_id", :default => 0
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_contributor_scores", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    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",          :default => 0
-    t.integer  "homework_journal_num", :default => 0
-    t.integer  "news_num",             :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    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"
-  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                        :default => 1
-    t.integer  "attachmenttype",                :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",        :limit => 1, :default => 1
-    t.integer  "inherit_members",  :limit => 1, :default => 1
-    t.integer  "open_student",                  :default => 0
-    t.integer  "outline",                       :default => 0
-    t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete",                     :default => 0
-    t.integer  "end_time"
-    t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
-    t.integer  "is_copy",                       :default => 0
-    t.integer  "visits",                        :default => 0
-    t.integer  "syllabus_id"
-    t.string   "invite_code"
-    t.string   "qrcode"
-  end
-
-  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
-  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "editor_of_documents", :force => true do |t|
-    t.integer  "editor_id"
-    t.integer  "org_document_comment_id"
-    t.datetime "created_at"
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "exercise_answers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_choices", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.text     "choice_text"
-    t.integer  "choice_position"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
-    t.integer  "question_type"
-    t.integer  "question_number"
-    t.integer  "exercise_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_score"
-  end
-
-  create_table "exercise_standard_answers", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_id"
-    t.integer  "score"
-    t.datetime "start_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.datetime "end_at"
-    t.integer  "status"
-  end
-
-  create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
-    t.text     "exercise_description"
-    t.integer  "course_id"
-    t.integer  "exercise_status"
-    t.integer  "user_id"
-    t.integer  "time"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-    t.datetime "publish_time"
-    t.datetime "end_time"
-    t.integer  "show_result"
-  end
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
-  end
-
-  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
-  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "forwards", :force => true do |t|
-    t.integer  "from_id"
-    t.string   "from_type"
-    t.integer  "to_id"
-    t.string   "to_type"
-    t.datetime "created_at"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type",     :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "teacher_priority",  :default => 1
-    t.integer  "anonymous_comment", :default => 0
-    t.integer  "quotes",            :default => 0
-    t.integer  "is_open",           :default => 0
-    t.datetime "simi_time"
-  end
-
-  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
-
-  create_table "homework_detail_groups", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "min_num"
-    t.integer  "max_num"
-    t.integer  "base_on_project"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "mail"
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                                 :null => false
-    t.datetime "updated_on",                                 :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-    t.integer  "private",                     :default => 0
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
-  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    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"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
-  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-    t.integer  "reply_id"
-    t.integer  "quotes"
-    t.integer  "status",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",           :limit => 60, :default => "", :null => false
-    t.string   "summary",                       :default => ""
-    t.text     "description"
-    t.integer  "author_id",                     :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",                :default => 0,  :null => false
-    t.integer  "course_id"
-    t.integer  "sticky",                        :default => 0
-    t.integer  "org_subfield_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "org_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "org_act_id"
-    t.string   "org_act_type"
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "org_courses", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "course_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_document_comments", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.integer  "organization_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "org_subfield_id"
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_member_roles", :force => true do |t|
-    t.integer "org_member_id"
-    t.integer "role_id"
-  end
-
-  create_table "org_members", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "sender_id"
-    t.integer  "organization_id"
-    t.string   "message_type"
-    t.integer  "message_id"
-    t.integer  "viewed"
-    t.string   "content"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_projects", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_subfield_messages", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_subfields", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 1
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "creator_id"
-    t.integer  "home_id"
-    t.boolean  "is_public"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    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|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-    t.integer  "board_num",         :default => 0
-    t.integer  "attach_num",        :default => 0
-    t.datetime "commit_time"
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",                   :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",               :default => ""
-    t.boolean  "is_public",              :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",                 :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",        :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",            :default => false, :null => false
-    t.integer  "attachmenttype",         :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",               :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "commits_count",          :default => 0
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "issues_count",           :default => 0
-    t.integer  "attachments_count",      :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
-    t.integer  "visits",                 :default => 0
-    t.integer  "hot",                    :default => 0
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "rep_statics", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "commits_num"
-    t.string   "uname"
-    t.string   "email"
-    t.integer  "add"
-    t.integer  "del"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "changeset"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-    t.string   "pinyin"
-  end
-
-  create_table "secdomains", :force => true do |t|
-    t.integer  "sub_type"
-    t.string   "subname"
-    t.integer  "pid",        :default => 0
-    t.string   "desc"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.integer  "shield_id"
-    t.string   "shield_type"
-    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"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    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"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.integer  "is_leader"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
-  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
-  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
-  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    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"
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  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"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "syllabuses", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_actions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "action_type"
-    t.integer  "action_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
-  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-    t.integer  "gid"
-    t.integer  "visits",                          :default => 0
-    t.integer  "excellent_teacher",               :default => 0
-    t.integer  "excellent_student",               :default => 0
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20160624032138) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    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"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
+  create_table "at_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "at_message_id"
+    t.string   "at_message_type"
+    t.boolean  "viewed",          :default => false
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.integer  "sender_id"
+  end
+
+  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
+
+  create_table "attachment_histories", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.string   "filename",                     :default => ""
+    t.string   "disk_filename",                :default => ""
+    t.integer  "filesize",                     :default => 0
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => ""
+    t.integer  "downloads",                    :default => 0
+    t.integer  "author_id"
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "version"
+    t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type", :limit => 30
+    t.string   "filename",                     :default => "", :null => false
+    t.string   "disk_filename",                :default => "", :null => false
+    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                    :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
+  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
+  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
+
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
+  create_table "auth_sources", :force => true do |t|
+    t.string  "type",              :limit => 30, :default => "",    :null => false
+    t.string  "name",              :limit => 60, :default => "",    :null => false
+    t.string  "host",              :limit => 60
+    t.integer "port"
+    t.string  "account"
+    t.string  "account_password",                :default => ""
+    t.string  "base_dn"
+    t.string  "attr_login",        :limit => 30
+    t.string  "attr_firstname",    :limit => 30
+    t.string  "attr_lastname",     :limit => 30
+    t.string  "attr_mail",         :limit => 30
+    t.boolean "onthefly_register",               :default => false, :null => false
+    t.boolean "tls",                             :default => false, :null => false
+    t.string  "filter"
+    t.integer "timeout"
+  end
+
+  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
+
+  create_table "biding_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "bids", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",                                    :null => false
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.text     "description"
+    t.datetime "created_on",                                :null => false
+    t.datetime "updated_on",                                :null => false
+    t.integer  "commit"
+    t.integer  "reward_type"
+    t.integer  "homework_type"
+    t.integer  "parent_id"
+    t.string   "password"
+    t.integer  "is_evaluation"
+    t.integer  "proportion",                :default => 60
+    t.integer  "comment_status",            :default => 0
+    t.integer  "evaluation_num",            :default => 3
+    t.integer  "open_anonymous_evaluation", :default => 1
+  end
+
+  create_table "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "homepage_id"
+  end
+
+  create_table "boards", :force => true do |t|
+    t.integer "project_id",                      :null => false
+    t.string  "name",            :default => "", :null => false
+    t.string  "description"
+    t.integer "position",        :default => 1
+    t.integer "topics_count",    :default => 0,  :null => false
+    t.integer "messages_count",  :default => 0,  :null => false
+    t.integer "last_message_id"
+    t.integer "parent_id"
+    t.integer "course_id"
+    t.integer "org_subfield_id"
+  end
+
+  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
+  add_index "boards", ["project_id"], :name => "boards_project_id"
+
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "changes", :force => true do |t|
+    t.integer "changeset_id",                               :null => false
+    t.string  "action",        :limit => 1, :default => "", :null => false
+    t.text    "path",                                       :null => false
+    t.text    "from_path"
+    t.string  "from_revision"
+    t.string  "revision"
+    t.string  "branch"
+  end
+
+  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
+
+  create_table "changeset_parents", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "parent_id",    :null => false
+  end
+
+  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
+  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
+
+  create_table "changesets", :force => true do |t|
+    t.integer  "repository_id", :null => false
+    t.string   "revision",      :null => false
+    t.string   "committer"
+    t.datetime "committed_on",  :null => false
+    t.text     "comments"
+    t.date     "commit_date"
+    t.string   "scmid"
+    t.integer  "user_id"
+  end
+
+  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
+  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
+  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
+  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
+  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
+
+  create_table "changesets_issues", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "issue_id",     :null => false
+  end
+
+  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
+
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
+  create_table "code_tests", :force => true do |t|
+    t.integer  "homework_id"
+    t.integer  "wait_time",       :default => 0
+    t.integer  "language"
+    t.integer  "status"
+    t.integer  "time_used",       :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "student_work_id", :default => 0
+  end
+
+  create_table "comments", :force => true do |t|
+    t.string   "commented_type", :limit => 30, :default => "", :null => false
+    t.integer  "commented_id",                 :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.text     "comments"
+    t.datetime "created_on",                                   :null => false
+    t.datetime "updated_on",                                   :null => false
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "contests", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
+
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
+  create_table "course_contributor_scores", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    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",          :default => 0
+    t.integer  "homework_journal_num", :default => 0
+    t.integer  "news_num",             :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    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"
+  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
+
+  create_table "course_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "course_id"
+    t.float    "grade",            :default => 0.0
+    t.integer  "course_ac_para",   :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "courses", :force => true do |t|
+    t.integer  "tea_id"
+    t.string   "name"
+    t.integer  "state"
+    t.string   "code"
+    t.integer  "time"
+    t.string   "extra"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.string   "location"
+    t.string   "term"
+    t.string   "string"
+    t.string   "password"
+    t.string   "setup_time"
+    t.string   "endup_time"
+    t.string   "class_period"
+    t.integer  "school_id"
+    t.text     "description"
+    t.integer  "status",                        :default => 1
+    t.integer  "attachmenttype",                :default => 2
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "is_public",        :limit => 1, :default => 1
+    t.integer  "inherit_members",  :limit => 1, :default => 1
+    t.integer  "open_student",                  :default => 0
+    t.integer  "outline",                       :default => 0
+    t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete",                     :default => 0
+    t.integer  "end_time"
+    t.string   "end_term"
+    t.integer  "is_excellent",                  :default => 0
+    t.integer  "excellent_option",              :default => 0
+    t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
+    t.string   "invite_code"
+    t.string   "qrcode"
+  end
+
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
+  add_index "documents", ["project_id"], :name => "documents_project_id"
+
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
+    t.string   "File"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "editor_of_documents", :force => true do |t|
+    t.integer  "editor_id"
+    t.integer  "org_document_comment_id"
+    t.datetime "created_at"
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "exercise_answers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_choices", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_questions", :force => true do |t|
+    t.text     "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "exercise_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_score"
+  end
+
+  create_table "exercise_standard_answers", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_id"
+    t.integer  "score"
+    t.datetime "start_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.datetime "end_at"
+    t.integer  "status"
+  end
+
+  create_table "exercises", :force => true do |t|
+    t.text     "exercise_name"
+    t.text     "exercise_description"
+    t.integer  "course_id"
+    t.integer  "exercise_status"
+    t.integer  "user_id"
+    t.integer  "time"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.integer  "show_result"
+  end
+
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.text     "description"
+    t.string   "page_type"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
+  end
+
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
+  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
+
+  create_table "forums", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.text     "description"
+    t.integer  "topic_count",  :default => 0
+    t.integer  "memo_count",   :default => 0
+    t.integer  "last_memo_id", :default => 0
+    t.integer  "creator_id",                  :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "sticky"
+    t.integer  "locked"
+  end
+
+  create_table "forwards", :force => true do |t|
+    t.integer  "from_id"
+    t.string   "from_type"
+    t.integer  "to_id"
+    t.string   "to_type"
+    t.datetime "created_at"
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id", :null => false
+    t.integer "user_id",  :null => false
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
+
+  create_table "homework_attaches", :force => true do |t|
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.string   "reward"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "state"
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
+  end
+
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
+  create_table "homework_commons", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.text     "description"
+    t.date     "publish_time"
+    t.date     "end_time"
+    t.integer  "homework_type",     :default => 1
+    t.string   "late_penalty"
+    t.integer  "course_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
+    t.integer  "quotes",            :default => 0
+    t.integer  "is_open",           :default => 0
+    t.datetime "simi_time"
+  end
+
+  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
+
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "mail"
+  end
+
+  create_table "issue_categories", :force => true do |t|
+    t.integer "project_id",                   :default => 0,  :null => false
+    t.string  "name",           :limit => 30, :default => "", :null => false
+    t.integer "assigned_to_id"
+  end
+
+  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
+  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
+
+  create_table "issue_relations", :force => true do |t|
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
+    t.integer "delay"
+  end
+
+  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
+  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
+  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
+
+  create_table "issue_statuses", :force => true do |t|
+    t.string  "name",               :limit => 30, :default => "",    :null => false
+    t.boolean "is_closed",                        :default => false, :null => false
+    t.boolean "is_default",                       :default => false, :null => false
+    t.integer "position",                         :default => 1
+    t.integer "default_done_ratio"
+  end
+
+  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
+  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
+  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
+
+  create_table "issues", :force => true do |t|
+    t.integer  "tracker_id",                              :null => false
+    t.integer  "project_id",                              :null => false
+    t.string   "subject",              :default => "",    :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.integer  "category_id"
+    t.integer  "status_id",                               :null => false
+    t.integer  "assigned_to_id"
+    t.integer  "priority_id",                             :null => false
+    t.integer  "fixed_version_id"
+    t.integer  "author_id",                               :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.date     "start_date"
+    t.integer  "done_ratio",           :default => 0,     :null => false
+    t.float    "estimated_hours"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "is_private",           :default => false, :null => false
+    t.datetime "closed_on"
+    t.integer  "project_issues_index"
+  end
+
+  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
+  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
+  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
+  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
+  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
+  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
+  add_index "issues", ["project_id"], :name => "issues_project_id"
+  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
+  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
+  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
+
+  create_table "join_in_competitions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "competition_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "join_in_contests", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "bid_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "journal_details", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+
+  create_table "journal_replies", :id => false, :force => true do |t|
+    t.integer "journal_id"
+    t.integer "user_id"
+    t.integer "reply_id"
+  end
+
+  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
+  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
+  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
+
+  create_table "journals", :force => true do |t|
+    t.integer  "journalized_id",                 :default => 0,     :null => false
+    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
+    t.integer  "user_id",                        :default => 0,     :null => false
+    t.text     "notes"
+    t.datetime "created_on",                                        :null => false
+    t.boolean  "private_notes",                  :default => false, :null => false
+  end
+
+  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
+  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
+  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
+  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
+
+  create_table "journals_for_messages", :force => true do |t|
+    t.integer  "jour_id"
+    t.string   "jour_type"
+    t.integer  "user_id"
+    t.text     "notes"
+    t.integer  "status"
+    t.integer  "reply_id"
+    t.datetime "created_on",                                 :null => false
+    t.datetime "updated_on",                                 :null => false
+    t.string   "m_parent_id"
+    t.boolean  "is_readed"
+    t.integer  "m_reply_count"
+    t.integer  "m_reply_id"
+    t.integer  "is_comprehensive_evaluation"
+    t.integer  "private",                     :default => 0
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
+  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
+  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
+
+  create_table "messages", :force => true do |t|
+    t.integer  "board_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",       :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "last_reply_id"
+    t.datetime "created_on",                       :null => false
+    t.datetime "updated_on",                       :null => false
+    t.boolean  "locked",        :default => false
+    t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
+    t.integer  "quotes"
+    t.integer  "status",        :default => 0
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",           :limit => 60, :default => "", :null => false
+    t.string   "summary",                       :default => ""
+    t.text     "description"
+    t.integer  "author_id",                     :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",                :default => 0,  :null => false
+    t.integer  "course_id"
+    t.integer  "sticky",                        :default => 0
+    t.integer  "org_subfield_id"
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :null => false
+  end
+
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
+  create_table "org_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "org_act_id"
+    t.string   "org_act_type"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "org_courses", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "course_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_document_comments", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.integer  "organization_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_member_roles", :force => true do |t|
+    t.integer "org_member_id"
+    t.integer "role_id"
+  end
+
+  create_table "org_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "organization_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "sender_id"
+    t.integer  "organization_id"
+    t.string   "message_type"
+    t.integer  "message_id"
+    t.integer  "viewed"
+    t.string   "content"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.boolean  "is_public"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    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|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "poll_answers", :force => true do |t|
+    t.integer  "poll_question_id"
+    t.text     "answer_text"
+    t.integer  "answer_position"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "poll_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "is_necessary"
+    t.integer  "poll_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
+  end
+
+  create_table "poll_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "poll_votes", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
+    t.text     "vote_text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "polls", :force => true do |t|
+    t.string   "polls_name"
+    t.string   "polls_type"
+    t.integer  "polls_group_id"
+    t.integer  "polls_status"
+    t.integer  "user_id"
+    t.datetime "published_at"
+    t.datetime "closed_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
+  end
+
+  create_table "praise_tread_caches", :force => true do |t|
+    t.integer  "object_id",   :null => false
+    t.string   "object_type"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "praise_treads", :force => true do |t|
+    t.integer  "user_id",                  :null => false
+    t.integer  "praise_tread_object_id"
+    t.string   "praise_tread_object_type"
+    t.integer  "praise_or_tread"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "project_infos", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "project_scores", :force => true do |t|
+    t.string   "project_id"
+    t.integer  "score"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "issue_num",         :default => 0
+    t.integer  "issue_journal_num", :default => 0
+    t.integer  "news_num",          :default => 0
+    t.integer  "documents_num",     :default => 0
+    t.integer  "changeset_num",     :default => 0
+    t.integer  "board_message_num", :default => 0
+    t.integer  "board_num",         :default => 0
+    t.integer  "attach_num",        :default => 0
+    t.datetime "commit_time"
+  end
+
+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+    t.integer "project_type"
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
+  end
+
+  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string   "name",                   :default => "",    :null => false
+    t.text     "description"
+    t.string   "homepage",               :default => ""
+    t.boolean  "is_public",              :default => true,  :null => false
+    t.integer  "parent_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "identifier"
+    t.integer  "status",                 :default => 1,     :null => false
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "inherit_members",        :default => false, :null => false
+    t.integer  "project_type"
+    t.boolean  "hidden_repo",            :default => false, :null => false
+    t.integer  "attachmenttype",         :default => 1
+    t.integer  "user_id"
+    t.integer  "dts_test",               :default => 0
+    t.string   "enterprise_name"
+    t.integer  "organization_id"
+    t.integer  "project_new_type"
+    t.integer  "gpid"
+    t.integer  "forked_from_project_id"
+    t.integer  "forked_count"
+    t.integer  "commits_count",          :default => 0
+    t.integer  "publish_resource",       :default => 0
+    t.integer  "issues_count",           :default => 0
+    t.integer  "attachments_count",      :default => 0
+    t.integer  "boards_count",           :default => 0
+    t.integer  "news_count",             :default => 0
+    t.integer  "acts_count",             :default => 0
+    t.integer  "journals_count",         :default => 0
+    t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
+    t.integer  "hot",                    :default => 0
+  end
+
+  add_index "projects", ["lft"], :name => "index_projects_on_lft"
+  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
+
+  create_table "projects_trackers", :id => false, :force => true do |t|
+    t.integer "project_id", :default => 0, :null => false
+    t.integer "tracker_id", :default => 0, :null => false
+  end
+
+  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
+  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
+
+  create_table "queries", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",          :default => "",    :null => false
+    t.text    "filters"
+    t.integer "user_id",       :default => 0,     :null => false
+    t.boolean "is_public",     :default => false, :null => false
+    t.text    "column_names"
+    t.text    "sort_criteria"
+    t.string  "group_by"
+    t.string  "type"
+  end
+
+  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
+  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
+
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "parent_id"
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",                          :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
+    t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
+  end
+
+  create_table "rep_statics", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "commits_num"
+    t.string   "uname"
+    t.string   "email"
+    t.integer  "add"
+    t.integer  "del"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "changeset"
+  end
+
+  create_table "repositories", :force => true do |t|
+    t.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
+    t.string  "type"
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
+    t.text    "extra_info"
+    t.string  "identifier"
+    t.boolean "is_default",                  :default => false
+    t.boolean "hidden",                      :default => false
+  end
+
+  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
+
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
+    t.text    "permissions"
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+  end
+
+  create_table "schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "logo_link"
+    t.string   "pinyin"
+  end
+
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",         :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                                        :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "is_teacher_score",              :default => 0
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string   "name",       :default => "", :null => false
+    t.text     "value"
+    t.datetime "updated_on"
+  end
+
+  add_index "settings", ["name"], :name => "index_settings_on_name"
+
+  create_table "shares", :force => true do |t|
+    t.date     "created_on"
+    t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "description"
+  end
+
+  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "shield_id"
+    t.string   "shield_type"
+    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"
+    t.integer  "app_type_id"
+    t.string   "app_type_name"
+    t.string   "android_min_version_available"
+    t.integer  "user_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "contest_id"
+    t.integer  "softapplication_id"
+    t.integer  "is_public"
+    t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    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"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
+  end
+
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    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"
+
+  create_table "student_works_evaluation_distributions", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "student_works_scores", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.integer  "score"
+    t.text     "comment"
+    t.integer  "reviewer_role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  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"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.text     "description"
+    t.string   "subject"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       :limit => 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "teachers", :force => true do |t|
+    t.string   "tea_name"
+    t.string   "location"
+    t.integer  "couurse_time"
+    t.integer  "course_code"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.string   "extra"
+  end
+
+  create_table "time_entries", :force => true do |t|
+    t.integer  "project_id",  :null => false
+    t.integer  "user_id",     :null => false
+    t.integer  "issue_id"
+    t.float    "hours",       :null => false
+    t.string   "comments"
+    t.integer  "activity_id", :null => false
+    t.date     "spent_on",    :null => false
+    t.integer  "tyear",       :null => false
+    t.integer  "tmonth",      :null => false
+    t.integer  "tweek",       :null => false
+    t.datetime "created_on",  :null => false
+    t.datetime "updated_on",  :null => false
+  end
+
+  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
+  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
+  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
+  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
+  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
+
+  create_table "tokens", :force => true do |t|
+    t.integer  "user_id",                  :default => 0,  :null => false
+    t.string   "action",     :limit => 30, :default => "", :null => false
+    t.string   "value",      :limit => 40, :default => "", :null => false
+    t.datetime "created_on",                               :null => false
+  end
+
+  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
+  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
+
+  create_table "trackers", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.boolean "is_in_chlog",                 :default => false, :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_in_roadmap",               :default => true,  :null => false
+    t.integer "fields_bits",                 :default => 0
+  end
+
+  create_table "user_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "action_type"
+    t.integer  "action_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
+  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
+
+  create_table "user_grades", :force => true do |t|
+    t.integer  "user_id",                     :null => false
+    t.integer  "project_id",                  :null => false
+    t.float    "grade",      :default => 0.0
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
+  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
+  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
+  create_table "user_preferences", :force => true do |t|
+    t.integer "user_id",   :default => 0,     :null => false
+    t.text    "others"
+    t.boolean "hide_mail", :default => false
+    t.string  "time_zone"
+  end
+
+  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
+
+  create_table "user_score_details", :force => true do |t|
+    t.integer  "current_user_id"
+    t.integer  "target_user_id"
+    t.string   "score_type"
+    t.string   "score_action"
+    t.integer  "user_id"
+    t.integer  "old_score"
+    t.integer  "new_score"
+    t.integer  "current_user_level"
+    t.integer  "target_user_level"
+    t.integer  "score_changeable_obj_id"
+    t.string   "score_changeable_obj_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_scores", :force => true do |t|
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.float    "grade",            :default => 0.0
+  end
+
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
+  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+
+  create_table "user_wechats", :force => true do |t|
+    t.integer  "subscribe"
+    t.string   "openid"
+    t.string   "nickname"
+    t.integer  "sex"
+    t.string   "language"
+    t.string   "city"
+    t.string   "province"
+    t.string   "country"
+    t.string   "headimgurl"
+    t.string   "subscribe_time"
+    t.string   "unionid"
+    t.string   "remark"
+    t.integer  "groupid"
+    t.integer  "user_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "login",                           :default => "",    :null => false
+    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
+    t.string   "firstname",         :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                        :default => "",    :null => false
+    t.string   "mail",              :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                           :default => false, :null => false
+    t.integer  "status",                          :default => 1,     :null => false
+    t.datetime "last_login_on"
+    t.string   "language",          :limit => 5,  :default => ""
+    t.integer  "auth_source_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "type"
+    t.string   "identity_url"
+    t.string   "mail_notification",               :default => "",    :null => false
+    t.string   "salt",              :limit => 64
+    t.integer  "gid"
+    t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
+    t.integer  "excellent_student",               :default => 0
+  end
+
+  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "wechat_logs", :force => true do |t|
+    t.string   "openid",       :null => false
+    t.text     "request_raw"
+    t.text     "response_raw"
+    t.text     "session_raw"
+    t.datetime "created_at",   :null => false
+  end
+
+  create_table "wiki_content_versions", :force => true do |t|
+    t.integer  "wiki_content_id",                                       :null => false
+    t.integer  "page_id",                                               :null => false
+    t.integer  "author_id"
+    t.binary   "data",            :limit => 2147483647
+    t.string   "compression",     :limit => 6,          :default => ""
+    t.string   "comments",                              :default => ""
+    t.datetime "updated_on",                                            :null => false
+    t.integer  "version",                                               :null => false
+  end
+
+  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
+  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
+
+  create_table "wiki_contents", :force => true do |t|
+    t.integer  "page_id",                                          :null => false
+    t.integer  "author_id"
+    t.text     "text",       :limit => 2147483647
+    t.string   "comments",                         :default => ""
+    t.datetime "updated_on",                                       :null => false
+    t.integer  "version",                                          :null => false
+  end
+
+  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
+  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
+
+  create_table "wiki_pages", :force => true do |t|
+    t.integer  "wiki_id",                       :null => false
+    t.string   "title",                         :null => false
+    t.datetime "created_on",                    :null => false
+    t.boolean  "protected",  :default => false, :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
+  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
+  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
+
+  create_table "wiki_redirects", :force => true do |t|
+    t.integer  "wiki_id",      :null => false
+    t.string   "title"
+    t.string   "redirects_to"
+    t.datetime "created_on",   :null => false
+  end
+
+  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
+  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
+
+  create_table "wikis", :force => true do |t|
+    t.integer "project_id",                :null => false
+    t.string  "start_page",                :null => false
+    t.integer "status",     :default => 1, :null => false
+  end
+
+  add_index "wikis", ["project_id"], :name => "wikis_project_id"
+
+  create_table "workflows", :force => true do |t|
+    t.integer "tracker_id",                  :default => 0,     :null => false
+    t.integer "old_status_id",               :default => 0,     :null => false
+    t.integer "new_status_id",               :default => 0,     :null => false
+    t.integer "role_id",                     :default => 0,     :null => false
+    t.boolean "assignee",                    :default => false, :null => false
+    t.boolean "author",                      :default => false, :null => false
+    t.string  "type",          :limit => 30
+    t.string  "field_name",    :limit => 30
+    t.string  "rule",          :limit => 30
+  end
+
+  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
+  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
+  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
+  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
+
+  create_table "works_categories", :force => true do |t|
+    t.string   "category"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "zip_packs", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "homework_id"
+    t.string   "file_digest"
+    t.string   "file_path"
+    t.integer  "pack_times",   :default => 1
+    t.integer  "pack_size",    :default => 0
+    t.text     "file_digests"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+end
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index c69f3c0cc..5bde1d088 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1270,7 +1270,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .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;}
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}

From 5c83414828b06b0ec25479a91836d612e668519c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 30 Jun 2016 10:17:53 +0800
Subject: [PATCH 629/668] update

---
 app/controllers/quality_analysis_controller.rb   | 8 ++++++++
 app/views/quality_analysis/_result_list.html.erb | 2 ++
 config/routes.rb                                 | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index a9b93269a..15fdcef61 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -85,6 +85,14 @@ class QualityAnalysisController < ApplicationController
     end
   end
 
+  def edit
+    @quality_analysis = QualityAnalysis.where(:id => params[:id])
+  end
+
+  def update
+    @quality_analysis = QualityAnalysis.where(:id => params[:id])
+  end
+
   # resource_id: login + @repository.id
   def index
     begin
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 6124812c8..b4a40de0d 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -7,6 +7,7 @@
   <li class="analysis-result-loc fl fontBlue2" >分支</li>
   <li class="analysis-result-debt fl fontBlue2" >语言</li>
   <li class="analysis-result-time fl fontBlue2" >路径</li>
+  <li class="analysis-result-time fl fontBlue2" >bianji</li>
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
@@ -17,6 +18,7 @@
           <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
           <li class="analysis-result-time fl fontBlue2" title="时间"><%= qa.path %></li>
+          <li class="analysis-result-time fl fontBlue2" title="时间"><%=link_to "bianji", edit_project__quality_analysis_path(@quality_analysis) %></li>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 5dc509abd..5404e4ecf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -786,7 +786,7 @@ RedmineApp::Application.routes.draw do
       end
     end
 
-    resources :quality_analysis, :only => [:index, :new, :create] do
+    resources :quality_analysis, :only => [:index, :create, :edit, :update] do
       collection do
       end
       member do

From ebb697a49ff7bf6790c7097b7233e5c61e94ed3f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 30 Jun 2016 10:44:11 +0800
Subject: [PATCH 630/668] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E5=9B=9E=E5=A4=8D=E3=80=81=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/praise_tread_controller.rb    |   2 +
 app/controllers/syllabuses_controller.rb      |  67 ++++++++++++-
 app/controllers/users_controller.rb           |  34 +++++--
 app/controllers/words_controller.rb           |  22 +++++
 app/helpers/syllabuses_helper.rb              |  33 +++++++
 app/models/syllabus.rb                        |  13 +++
 app/views/layouts/_syllabus_info.html.erb     |   9 +-
 app/views/layouts/base_syllabus.html.erb      |   7 +-
 app/views/layouts/new_base_user.html.erb      |   2 +-
 .../syllabuses/_syllabus_course_list.html.erb |  72 ++++++++++++++
 app/views/syllabuses/edit.html.erb            |  61 +++---------
 app/views/syllabuses/show.html.erb            |  93 +++++++++++++-----
 .../syllabuses/syllabus_courselist.html.erb   |   1 +
 .../syllabuses/syllabus_courselist.js.erb     |   1 +
 app/views/users/_course_news.html.erb         |   2 +-
 app/views/users/_user_syllabus_list.html.erb  |  75 ++++++++++++++
 app/views/users/user_courselist.html.erb      |   2 +-
 app/views/users/user_courselist.js.erb        |   2 +-
 config/routes.rb                              |   3 +-
 .../20160629084146_add_visits_to_syllabus.rb  |   5 +
 ...160629094716_add_des_status_to_syllabus.rb |   5 +
 db/schema.rb                                  |   8 +-
 public/images/syllabus/icons_syllabus.png     | Bin 0 -> 21845 bytes
 public/stylesheets/syllabus.css               |   8 +-
 24 files changed, 426 insertions(+), 101 deletions(-)
 create mode 100644 app/views/syllabuses/_syllabus_course_list.html.erb
 create mode 100644 app/views/syllabuses/syllabus_courselist.html.erb
 create mode 100644 app/views/syllabuses/syllabus_courselist.js.erb
 create mode 100644 app/views/users/_user_syllabus_list.html.erb
 create mode 100644 db/migrate/20160629084146_add_visits_to_syllabus.rb
 create mode 100644 db/migrate/20160629094716_add_des_status_to_syllabus.rb
 create mode 100644 public/images/syllabus/icons_syllabus.png

diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index b6eb54d2f..9f0fe41c8 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -131,6 +131,8 @@ class PraiseTreadController < ApplicationController
         @obj = Bid.find_by_id(id)
       when 'Contest'
         @obj = Contest.find_by_id(id)
+      when 'Syllabus'
+        @obj = Syllabus.find_by_id(id)
       else
         @obj = nil
     end
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 7e4e5cea8..54d1c7569 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -1,7 +1,11 @@
 class SyllabusesController < ApplicationController
+  include ApplicationHelper
+  helper :attachments
+  include AttachmentsHelper
+  include CoursesHelper
 
-  before_filter :is_logged, :only => [:index, :show, :edit, :new, :update]
-  before_filter :find_syllabus, :only => [:show, :edit, :update]
+  before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -27,6 +31,7 @@ class SyllabusesController < ApplicationController
       @syllabus.title = params[:title]
       @syllabus.eng_name = params[:eng_name]
       @syllabus.user_id = User.current.id
+      @syllabus.description = Message.where("id = 17848").first.nil? ? '' : Message.where("id = 17848").first.content
       if @syllabus && @syllabus.save
         respond_to do |format|
           flash[:notice] = l(:notice_successful_create)
@@ -51,14 +56,72 @@ class SyllabusesController < ApplicationController
 
   def update
     @syllabus.description = params[:syllabus][:description]
+    @syllabus.des_status = 1
     @syllabus.save_attachments(params[:attachments])
     if @syllabus.save
+      if params[:asset_id]
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids,@syllabus.id,OwnerTypeHelper::SYLLABUS
+      end
       redirect_to syllabus_path(@syllabus)
     else
       redirect_to syllabus_path(@syllabus)
     end
   end
 
+  #删除课程大纲的描述
+  def destroy
+    if @syllabus and @syllabus.courses.empty?
+      @syllabus.destroy
+      redirect_to user_path(User.current.id)
+    end
+  end
+
+  #班级列表
+  def syllabus_courselist
+    @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+    #确定 sort_type
+    if @order.to_i == @type.to_i
+      @c_sort = @c_sort.to_i == 1 ? 2 : 1   #1升序 2降序
+    else
+      @c_sort = 2
+    end
+
+    sort_name = "updated_on"
+    sort_type = @c_sort == 1 ? "asc" : "desc"
+
+    @courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
+
+    #根据 作业+资源数排序
+    if @order.to_i == 2
+      @type = 2
+      @courses.each do |course|
+        course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
+        if course[:infocount] < 0
+          course[:infocount] = 0
+        end
+      end
+      @c_sort == 1 ? (@courses = @courses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@courses = @courses.sort{|x,y| y[:infocount] <=> x[:infocount]})
+      @courses = sortby_time_countcommon_nosticky @courses,sort_name
+    else
+      @type = 1
+    end
+
+    #分页
+    @limit = 10
+    @is_remote = true
+    @atta_count = @courses.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @courses = paginateHelper @courses,@limit
+
+    respond_to do |format|
+      format.js
+      format.html{render :layout => 'base_syllabus'}
+    end
+  end
+
   private
   def find_syllabus
     @syllabus = Syllabus.find params[:id]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 39a2ae5a5..43d12cadf 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3184,23 +3184,34 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "updated_on"
+    sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
     # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
+    #@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
+
+    courses = @user.courses.visible.where("is_delete =?", 0)
+    syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    @syllabus = Syllabus.where("id in #{syllabus_ids} or user_id = #{User.current.id}").order("#{sort_name} #{sort_type}")
 
     #根据 作业+资源数排序
     if @order.to_i == 2
       @type = 2
-      @courses.each do |course|
-        course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
-        if course[:infocount] < 0
-          course[:infocount] = 0
+      # @courses.each do |course|
+      #   course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
+      #   if course[:infocount] < 0
+      #     course[:infocount] = 0
+      #   end
+      # end
+      @syllabus.each do |syllabus|
+        syllabus[:infocount] = 0
+        courses = courses.select("syllabus_id = #{syllabus.id}")
+        courses.each do |c|
+          syllabus[:infocount] += (User.current.admin? || User.current.allowed_to?(:as_teacher,c)) ? (c.homework_commons.count + visable_attachemnts_incourse(c).count) : (c.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(c).count)
         end
       end
-      @c_sort == 1 ? (@courses = @courses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@courses = @courses.sort{|x,y| y[:infocount] <=> x[:infocount]})
-      @courses = sortby_time_countcommon_nosticky @courses,sort_name
+      @c_sort == 1 ? (@syllabus = @syllabus.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@syllabus = @syllabus.sort{|x,y| y[:infocount] <=> x[:infocount]})
+      @syllabus = sortby_time_countcommon_nosticky @syllabus,sort_name
     else
       @type = 1
     end
@@ -3208,10 +3219,10 @@ class UsersController < ApplicationController
     #分页
     @limit = 10
     @is_remote = true
-    @atta_count = @courses.count
+    @atta_count = @syllabus.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
-    @courses = paginateHelper @courses,@limit
+    @syllabus = paginateHelper @syllabus,@limit
 
     respond_to do |format|
       format.js
@@ -3276,6 +3287,9 @@ class UsersController < ApplicationController
         when 'News'
           obj = News.where('id = ?', params[:id].to_i).first
           @journals = obj.comments.reorder("created_on desc")
+        when 'Syllabus'
+          obj = Syllabus.where('id = ?', params[:id].to_i).first
+          @journals = obj.comments.reorder("created_on desc")
         when 'JournalsForMessage'
           obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
           journals = []
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 668269a26..188531c37 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -264,6 +264,28 @@ class WordsController < ApplicationController
     end
   end
 
+  #课程大纲的回复
+  def leave_syllabus_message
+    if User.current.logged?
+      @user = User.current
+      @syllabus = Syllabus.find(params[:id]);
+      if params[:comment].size>0 && User.current.logged? && @user
+        feedback = Syllabus.add_syllabus_jour(@user, params[:comment], params[:id])
+        if (feedback.errors.empty?)
+          if params[:asset_id]
+            ids = params[:asset_id].split(',')
+            update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
+          end
+          redirect_to syllabus_path(@syllabus)
+        else
+          flash[:error] = feedback.errors.full_messages[0]
+        end
+      end
+    else
+      render_403
+    end
+  end
+
   #作业的回复
   def leave_homework_message
     if User.current.logged?
diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index d5284586e..af5472ee1 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -2,4 +2,37 @@ module SyllabusesHelper
   def get_syllabuses_by_tag(tag_name)
     Syllabus.tagged_with(tag_name).order('updated_at desc')
   end
+
+  def teacher_count syllabus
+    count = 0
+    courses = syllabus.courses
+    unless courses.empty?
+      courses.each do |c|
+        count += TeacherAndAssistantCount c
+      end
+    end
+    count
+  end
+
+  def student_count syllabus
+    count = 0
+    courses = syllabus.courses
+    unless courses.empty?
+      courses.each do |c|
+        count += studentCount c
+      end
+    end
+    count
+  end
+
+  def file_count syllabus
+    count = 0
+    courses = syllabus.courses
+    unless courses.empty?
+      courses.each do |c|
+        count += visable_attachemnts_incourse(c).count
+      end
+    end
+    count
+  end
 end
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index e16577ff3..2f2ec495f 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -7,10 +7,23 @@ class Syllabus < ActiveRecord::Base
 
   belongs_to :user
   has_many :courses
+  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   attr_accessible :description, :title, :eng_name, :type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
   safe_attributes 'title', 'description', 'eng_name', 'type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
 
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::SYLLABUS
   end
+
+  ###添加回复
+  def self.add_syllabus_jour(user, notes, id , options = {})
+    syllabus = Syllabus.find(id)
+    if options.count == 0
+      jfm = syllabus.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0)
+    else
+      jfm = syllabus.journals_for_messages.build(options)
+    end
+    jfm.save
+    jfm
+  end
 end
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index 4e7bc1f7b..9717f33a7 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -1,3 +1,6 @@
+<% teachers_num = teacher_count @syllabus%>
+<% students_num = student_count @syllabus%>
+<% files_num = file_count @syllabus%>
 <div class="pr_info_logo fl mb5">
   <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
 </div>
@@ -19,7 +22,7 @@
   </div>
 </div>
 <div class="pr_info_foot ">
-  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">10</a>）<span>|</span>
-  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">10</a>）<span>|</span>
-  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank">100</a>）</div>
+  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=teachers_num %></a>）<span>|</span>
+  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=students_num %></a>）<span>|</span>
+  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=files_num %></a>）</div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 5f1f9f126..9e7cd3e1b 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -45,6 +45,7 @@
       <div class="homepagePortraitContainer mt15">
         <%=render :partial => 'layouts/syllabus_info' %>
       </div>
+      <%  update_visiti_count @syllabus %>
 
       <div class="homepageLeftMenuContainer">
         <ul class="syllabus_leftinfo">
@@ -73,7 +74,7 @@
 
       <div class="homepageLeftMenuContainer">
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText" >班级</a>
+          <%=link_to '班级', {:controller => "syllabuses", :action => "syllabus_courselist", :id => @syllabus.id}, :class => 'homepageMenuText' %>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
                   <div class="courseMenu" id="courseMenu">
@@ -81,7 +82,7 @@
                       <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
                         <ul class="topnav_course_menu" id="topnav_course_menu">
                           <li>
-                            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey"%>
+                            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey", :target => '_blank'%>
                           </li>
                           <li>
                             <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
@@ -124,7 +125,7 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="fontGrey2 mt10 ml20">访问计数 343 （自2016年5月）</div>
+      <div class="fontGrey2 mt10 ml20">访问计数 <%=@syllabus.visits %> （自2016年7月）</div>
 
     </div><!--left end -->
     <div class="homepageRight">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 74401a282..73a09f4ce 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'share','new_user', 'user_leftside','prettify','users',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'share','new_user', 'user_leftside','prettify','users','syllabus',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb
new file mode 100644
index 000000000..2667a2baa
--- /dev/null
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@@ -0,0 +1,72 @@
+<div class="listbox" id="course-list">
+  <h2 class="list-h2">班级列表</h2>
+  <div class="list_title">
+    <div class="category2 fl">
+      <span class="grayTxt ">排序：</span>
+      <%= link_to "时间", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i == 1 %>
+          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <%= link_to "人气", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i  == 2 %>
+          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+    </div>
+    <p class="fr grayTxt">创建老师：<%=@syllabus.user.show_name %><span class="mr10 "></span>  创建时间：<%=format_date @syllabus.created_at %></p>
+    <div class="cl"></div>
+  </div>
+
+  <div class="bloglistbox">
+    <% if @courses.any? %>
+        <% @courses.each do |course|%>
+            <ul class="list-file">
+              <li>
+                <span class="item_list fl"></span>
+                <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                <% teacher = User.where("id=?",course.tea_id).first%>
+                <span class="fr grayTxt">
+                    <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
+                  </span>
+              </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">
+                      学期:&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 %>
+                <% else %>
+                    <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+                <% end %>
+                <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
+              </li>
+              <div class="cl"></div>
+            </ul>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
+          <div class="cl"></div>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index f4c0f75e4..395fa1c5b 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -7,42 +7,6 @@
 <div class="HomeWork">
   <p class="f16 mb10">课程信息</p>
   <div class="HomeWorkCon">
-    <!--<div class="">
-      <textarea class="InputBox W700 h400" >
-        <h2 class="syllabuscon_title">《设计管理》课程大纲</h2>
-        <div class="syllabuscon_txt">
-          <p class="syllabuscon_txt_title">一 . 课程目的</p>
-          <p >1.  综合各门专业基础课程知识，运用前修课程获得的技术技能进行项目策划、设计、实施、运作方法研究；<br/>
-            2.  初步学会运用现代科学的设计理念；实施规范；系统管理观念运作；<br/>
-            3.  确立现代设计管理意识及培育实施务实思想。
-          </p>
-          <p class="syllabuscon_txt_title">二 . 主要目标</p>
-          <p >1.  培养学生具备设计管理的理念；<br/>
-            2.  培养学生了解和掌握项目策划、设计、实事、运作方法；<br/>
-            3.  培养学生运用现代科学的设计理念；实施规范；系统管理观念。确立现代设计管理意识及培育实施务实思想。
-          </p>
-          <p class="syllabuscon_txt_title">三 . 详细内容与学时安排</p>
-          <p >1.  详细内容<br/>
-            第一章 概论<br/>
-            (1)  设计管理基本概念<br/>
-            (2)  设计管理构成内容<br/>
-            (3)  设计管理社会意义理论<br/>
-            第二章 设计管理的文化内涵<br/>
-            (1)  人类文化与设计文化<br/>
-            (2)  设计文化与文化设计基本概念<br/>
-            2.  安排学时<br/>
-            第一章     理论学时：6               实践学时：2                上级学时：0<br/>
-            第二章     理论学时：6               实践学时：2                上级学时：0<br/>
-          </p>
-          <p class="syllabuscon_txt_title">四 . 讲授方法</p>
-          <p >1.  理论讲授；<br/>
-            2.  案例分析；<br/>
-            3.  作业项目；<br/>
-          </p>
-        </div>
-
-      </textarea>
-    </div>-->
     <%= labelled_form_for @syllabus, :url =>syllabus_path(@syllabus),
                           :html => {:nhname=>'form',:multipart => true, :id => 'syllabus-form'} do |f| %>
         <div>
@@ -64,19 +28,20 @@
           <div class="cl"></div>
           <p id="description_notice_span"></p>
         </div>
+
+        <div class="mt5">
+          <div class="fl" id="syllabus_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => @syllabus, :isReply => false} %>
+          </div>
+        </div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_syllabus();">发送</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" class="fr mr10 mt3" onclick="window.location.href = '<%=syllabus_path(@syllabus)%>';">取消</a>
+        </div>
+        <div class="cl"></div>
     <% end %>
 
-    <div class="mt5">
-      <div class="fl" id="syllabus_attachments">
-        <%= render :partial => 'attachments/form_course', :locals => {:container => @syllabus, :isReply => false} %>
-      </div>
     </div>
-    <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_syllabus();">发送</a>
-      <span class="fr mr10 mt3">或</span>
-      <a href="javascript:void(0);" class="fr mr10 mt3" onclick="window.location.href = '<%=syllabus_path(@syllabus)%>';">取消</a>
-    </div>
-    <div class="cl"></div>
-
-  </div>
 </div><!--HomeWork end-->
\ No newline at end of file
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index 57030c5d0..243f24115 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -1,42 +1,89 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+<script type="text/javascript">
+    $(function() {
+        sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>");
+    });
+</script>
 <div class="RightBanner" >
 <p >课程信息</p>
 </div>
-<div class="<%=@syllabus.description.nil? ? 'HomeWork' : 'syllabusbox'%>">
-  <% if @syllabus.description.nil?%>
+<% if @syllabus.des_status == 1 && @syllabus.courses.empty? %>
+    <div class="syllabusbox_tishi">
       <% if User.current == @syllabus.user %>
-          <p class="syllabus_info_tishi">您建立的课程尚未填写课程大纲，请完善您的<%=link_to '课程大纲', edit_syllabus_path(@syllabus) %>！</p>
+        <p >您建立的课程还未创建班级，请
+          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。
+        </p>
+      <% elsif User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+          <p >本课程下还未创建班级，请
+            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。
+          </p>
+      <% else %>
+          <p >本课程下还未创建班级，敬请期待。
+          </p>
+      <% end %>
+    </div>
+<% end %>
+<div class="<%=@syllabus.des_status == 0 ? 'HomeWork' : 'syllabusbox'%>">
+  <% if @syllabus.des_status == 0%>
+      <% if User.current == @syllabus.user %>
+          <p class="syllabus_info_tishi">您建立的课程尚未填写课程大纲，请完善您的<%=link_to '课程大纲', edit_syllabus_path(@syllabus), :class => 'syllabusbox_a_blue' %>！</p>
       <% else %>
           <p class="syllabus_info_tishi"><%=@syllabus.user.show_name %>老师尚未完成课程大纲的编写，敬请期待。</p>
       <% end %>
   <% else %>
       <div class="syllabuscon">
-        <%=@syllabus.description %>
+        <%=@syllabus.description.html_safe %>
         <div class="mt10" style="font-weight:normal;">
           <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
         </div>
       </div>
-      <div class="homepagePostSetting" style="margin:10px;">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><%=link_to '编辑', edit_syllabus_path(@syllabus),:class=>'postOptionLink' %></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+      <% if User.current.logged? && User.current == @syllabus.user%>
+          <div class="homepagePostSetting" style="margin:10px;">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%=link_to '编辑', edit_syllabus_path(@syllabus), :class => 'postOptionLink'%></li>
+                  <% if @syllabus.courses.empty? %>
+                    <li><%=link_to '删除', syllabus_path(@syllabus), :class => 'postOptionLink', :method => 'delete', :data => {:confirm => l(:text_are_you_sure)}%></li>
+                  <% end %>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="cl"></div>
+          </div>
+          <div class="cl"></div>
+      <% end %>
   <% end %>
 
-<div class="homepagePostReply">
-  <div class="homepagePostReplyBanner">
-    <div class="homepagePostReplyBannerCount"><a href="javascript:void(0);" class="mr5">回复（2）</a>▪<a href="javascript:void(0);" class="ml5"> 赞（10）</a></div>
-  </div>
-  <div class="homepagePostReplyContainer">
-    <div class="homepagePostReplyPortrait mr15"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="33" height="33" alt="用户头像" /></a></div>
-    <div class="homepagePostReplyInputContainer">
-      <input class="homepagePostReplyInput fl mr15" placeholder="请输入回复">
-      <a href="javascript:void(0);" class="homepagePostReplyEmotion mt5"></a> <a href="javascript:void(0);" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a> </div>
+  <% count=@syllabus.journals_for_messages.count %>
+  <div class="homepagePostReply">
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => @syllabus, :user_activity_id => @syllabus.id} %>
+
+    <% comments = @syllabus.journals_for_messages.reorder("created_on desc").limit(3) %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= @syllabus.id %>">
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+        </div>
+    <% end %>
+  <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @syllabus.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+    <div class="homepagePostReplyInputContainer mb10">
+      <% if User.current.logged? %>
+          <div nhname='new_message_<%= @syllabus.id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_syllabus_message', :id => @syllabus.id},:method => "post") do |f|%>
+                <div nhname='toolbar_container_<%= @syllabus.id%>'></div>
+                <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @syllabus.id%>' name="comment"></textarea>
+                <a id="new_message_submit_btn_<%= @syllabus.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                <div class="cl"></div>
+                <p nhname='contentmsg_<%= @syllabus.id%>'></p>
+            <% end%>
+          </div>
+      <% else %>
+          <%= render :partial => "users/show_unlogged" %>
+      <% end %>
+      <div class="cl"></div>
+    </div>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/syllabuses/syllabus_courselist.html.erb b/app/views/syllabuses/syllabus_courselist.html.erb
new file mode 100644
index 000000000..0b0713738
--- /dev/null
+++ b/app/views/syllabuses/syllabus_courselist.html.erb
@@ -0,0 +1 @@
+<%= render :partial => 'syllabus_course_list'%>
\ No newline at end of file
diff --git a/app/views/syllabuses/syllabus_courselist.js.erb b/app/views/syllabuses/syllabus_courselist.js.erb
new file mode 100644
index 000000000..5433ea2c1
--- /dev/null
+++ b/app/views/syllabuses/syllabus_courselist.js.erb
@@ -0,0 +1 @@
+$("#course-list").replaceWith('<%= escape_javascript( render :partial => 'syllabus_course_list') %>');
\ No newline at end of file
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index efd3770aa..d4af9783e 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -74,7 +74,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <% if User.current.logged? %>
             <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
new file mode 100644
index 000000000..4613e9e18
--- /dev/null
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -0,0 +1,75 @@
+<div class="syllabus_box" id="course-list">
+  <h2 class="syllabus_h2_top"><span class="icon_course fl mt7 mr5"></span>课程列表</h2>
+  <div class="syllabus_category">
+    <span class="grayTxt fl">排序：</span>
+    <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt fl", :remote => true %>
+    <% if @type.to_i == 1 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fl", :remote => true %>
+    <% else %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortdownbtn  sort_no fl", :remote => true %>
+    <% end %>
+    <%= link_to "人气", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt fl", :remote => true %>
+    <% if @type.to_i  == 2 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fl", :remote => true %>
+    <% else %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortdownbtn  sort_no fl", :remote => true %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+
+  <div class="syllabus_courses_box">
+    <% if @syllabus.any? %>
+        <% @syllabus.each do |syllabus|%>
+            <div class="syllabus_courses_list ">
+              <div class="sy_courses_open">
+                <span class="icons_sy_open fl mr5"></span>
+                <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
+              </div>
+              <%=link_to '管理课程', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr' %>
+              <p class="fl sy_p_grey">更新时间：2016-05-05<span class="mr10"></span>创建老师：豆蔻</p>
+              <div class="cl"></div>
+            </div>
+
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
+          <div class="cl"></div>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
+    $(".sy_courses_open").toggle(function(){
+        //$(this).hide();
+        $(this).parent().next().hide();
+        $(this).addClass("sy_courses_close").removeClass("sy_courses_open");
+        //$(this).parent().next().show();
+    },function(){
+        $(this).parent().next().show();
+        $(this).addClass("sy_courses_open").removeClass("sy_courses_close");
+    });
+    $(".sy_courses_close").toggle(function(){
+        //$(this).hide();
+        $(this).parent().next().show();
+        $(this).addClass("sy_courses_open").removeClass("sy_courses_close");
+        //$(this).parent().next().show();
+    },function(){
+        $(this).parent().next().hide();
+        $(this).addClass("sy_courses_close").removeClass("sy_courses_open");
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/users/user_courselist.html.erb b/app/views/users/user_courselist.html.erb
index de0f647e2..148cc1703 100644
--- a/app/views/users/user_courselist.html.erb
+++ b/app/views/users/user_courselist.html.erb
@@ -1 +1 @@
-<%= render :partial => 'users/user_course_list'%>
+<%= render :partial => 'users/user_syllabus_list'%>
diff --git a/app/views/users/user_courselist.js.erb b/app/views/users/user_courselist.js.erb
index 98c92be02..f6a69c288 100644
--- a/app/views/users/user_courselist.js.erb
+++ b/app/views/users/user_courselist.js.erb
@@ -1 +1 @@
-$("#course-list").replaceWith('<%= escape_javascript( render :partial => 'users/user_course_list') %>');
\ No newline at end of file
+$("#course-list").replaceWith('<%= escape_javascript( render :partial => 'users/user_syllabus_list') %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7e2998262..673bb2c69 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1075,7 +1075,7 @@ RedmineApp::Application.routes.draw do
   #课程大纲路由设置
   resources :syllabuses do
     member do
-
+      match 'syllabus_courselist', :to => 'syllabuses#syllabus_courselist', :via => :get, :as => 'syllabus_courselist'
     end
 
     collection do
@@ -1201,6 +1201,7 @@ RedmineApp::Application.routes.draw do
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
   post 'words/:id/leave_user_message', :to => 'words#leave_user_message', :as => "leave_user_message"
+  post 'words/:id/leave_syllabus_message', :to => 'words#leave_syllabus_message', :as => "leave_syllabus_message"
   post 'words/:id/leave_homework_message', :to => 'words#leave_homework_message', :as => "leave_homework_message"
   post 'words/:id/reply_to_homework', :to => 'words#reply_to_homework', :as => "reply_to_homework"
 
diff --git a/db/migrate/20160629084146_add_visits_to_syllabus.rb b/db/migrate/20160629084146_add_visits_to_syllabus.rb
new file mode 100644
index 000000000..7dc997e00
--- /dev/null
+++ b/db/migrate/20160629084146_add_visits_to_syllabus.rb
@@ -0,0 +1,5 @@
+class AddVisitsToSyllabus < ActiveRecord::Migration
+  def change
+    add_column :syllabuses, :visits, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20160629094716_add_des_status_to_syllabus.rb b/db/migrate/20160629094716_add_des_status_to_syllabus.rb
new file mode 100644
index 000000000..aa91bdd3c
--- /dev/null
+++ b/db/migrate/20160629094716_add_des_status_to_syllabus.rb
@@ -0,0 +1,5 @@
+class AddDesStatusToSyllabus < ActiveRecord::Migration
+  def change
+    add_column :syllabuses, :des_status, :integer, :default => 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5147a5c73..2502a941b 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 => 20160627074232) do
+ActiveRecord::Schema.define(:version => 20160629094716) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1865,8 +1865,8 @@ ActiveRecord::Schema.define(:version => 20160627074232) do
     t.string   "title"
     t.text     "description"
     t.integer  "user_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
     t.string   "eng_name"
     t.integer  "type"
     t.integer  "credit"
@@ -1875,6 +1875,8 @@ ActiveRecord::Schema.define(:version => 20160627074232) do
     t.integer  "practice_hours"
     t.string   "applicable_major"
     t.string   "pre_course"
+    t.integer  "visits",           :default => 0
+    t.integer  "des_status",       :default => 0
   end
 
   add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
diff --git a/public/images/syllabus/icons_syllabus.png b/public/images/syllabus/icons_syllabus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f6c4987cc280922e84f6cc32ed3750b0af87e52
GIT binary patch
literal 21845
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
FzW^EbD|7$=

literal 0
HcmV?d00001

diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index cbdd5808f..d73bbc8bf 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -79,7 +79,7 @@ input.syllabus_input_min{
     height:34px;
 }
 a.syllabusbox_a_blue{
-    color:#3b94d6;
+    color:#3b94d6 !important;
 }
 .syllabus_leftinfo p{
     line-height:25px;
@@ -110,7 +110,7 @@ a.syllabusbox_a_blue{
 .syllabus_box{ width:750px; border:1px  solid #e7e7e7; background-color:#fff;}
 .syllabus_courses_list{ padding:15px; border-bottom:1px solid #e7e7e7; cursor:pointer;}
 .syllabus_courses_list:hover{ background:#f6fafd;}
-.syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+a.syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
 .sy_p_grey{ margin-left:25px; color:#888; margin-top:5px; font-size:12px;}
 .syllabus_class_box{ padding-left:30px; background:#f6f6f6;}
 .syllabus_class_list{ padding:12px 0 12px 15px; height:44px;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7; position:relative;}
@@ -127,9 +127,9 @@ a.syllabusbox_a_blue{
 .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
 .bloglistbox{ min-height:690px;}
 .list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
-.category{ }
+.category2{ }
 .list_title{padding:10px 0; border-bottom:1px solid #ddd;}
-.category a,.category span{ float:left; margin-right:5px;}
+.category2 a,.category2 span{ float:left; margin-right:5px;}
 .grayTxt{ color:#9093a6;}
 .sortTxt{ color:#000;}
 .sortTxt:hover{ color:#28be6c;}

From ac4218bfb0cea2642f7b18e9a0b9dae3e7f83d72 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 30 Jun 2016 15:36:46 +0800
Subject: [PATCH 631/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb          | 11 +--
 app/helpers/courses_helper.rb                |  9 ++
 app/views/layouts/base_courses.html.erb      |  7 +-
 app/views/users/_user_syllabus_list.html.erb | 88 ++++++++++++++------
 public/javascripts/application.js            | 19 +++++
 public/stylesheets/syllabus.css              |  2 +-
 6 files changed, 99 insertions(+), 37 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 43d12cadf..68e7f5590 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3190,8 +3190,8 @@ class UsersController < ApplicationController
     # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
     #@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
 
-    courses = @user.courses.visible.where("is_delete =?", 0)
-    syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    @courses = @user.courses.visible.where("is_delete =?", 0)
+    syllabus_ids = @courses.empty? ? '(-1)' : "(" + @courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
     @syllabus = Syllabus.where("id in #{syllabus_ids} or user_id = #{User.current.id}").order("#{sort_name} #{sort_type}")
 
     #根据 作业+资源数排序
@@ -3204,11 +3204,12 @@ class UsersController < ApplicationController
       #   end
       # end
       @syllabus.each do |syllabus|
-        syllabus[:infocount] = 0
-        courses = courses.select("syllabus_id = #{syllabus.id}")
+        count = 0
+        courses = @courses.select("syllabus_id = #{syllabus.id}")
         courses.each do |c|
-          syllabus[:infocount] += (User.current.admin? || User.current.allowed_to?(:as_teacher,c)) ? (c.homework_commons.count + visable_attachemnts_incourse(c).count) : (c.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(c).count)
+          count += (User.current.admin? || User.current.allowed_to?(:as_teacher,c)) ? (c.homework_commons.count + visable_attachemnts_incourse(c).count) : (c.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(c).count)
         end
+        syllabus[:infocount] = count
       end
       @c_sort == 1 ? (@syllabus = @syllabus.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@syllabus = @syllabus.sort{|x,y| y[:infocount] <=> x[:infocount]})
       @syllabus = sortby_time_countcommon_nosticky @syllabus,sort_name
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index fd3be1369..dd3abe3a8 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -789,6 +789,15 @@ module CoursesHelper
     result
   end
 
+  def visable_course_homework course
+    if User.current.admin? || User.current.allowed_to?(:as_teacher,course)
+      homework_num = course.homework_commons.count
+    else
+      homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count
+    end
+    homework_num
+  end
+
   def zh_course_role role
     if role == "TeachingAsistant"
       result = l(:label_TA)
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4b618bef1..8f4f443c0 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,11 +1,8 @@
 <%# course_model %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
-<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
-    <% homework_num = @course.homework_commons.count %>
-<% else %>
-    <% homework_num = @course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
-<% end %>
+<% homework_num = visable_course_homework @course %>
+
 <!DOCTYPE html>
 <html lang="en" xmlns="http://www.w3.org/1999/html">
 <head>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 4613e9e18..dbf7e301a 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -19,17 +19,53 @@
 
   <div class="syllabus_courses_box">
     <% if @syllabus.any? %>
-        <% @syllabus.each do |syllabus|%>
-            <div class="syllabus_courses_list ">
-              <div class="sy_courses_open">
-                <span class="icons_sy_open fl mr5"></span>
+        <% @syllabus.each_with_index do |syllabus, index|%>
+            <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
+            <div class="syllabus_courses_list">
+              <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
+                <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
-              <%=link_to '管理课程', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr' %>
-              <p class="fl sy_p_grey">更新时间：2016-05-05<span class="mr10"></span>创建老师：豆蔻</p>
+              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+              <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
+                <span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
+                <span class="mr10"></span>班级：<%=courses.count %>
+              </p>
               <div class="cl"></div>
             </div>
 
+            <div class="syllabus_class_box <%=index == 0 ? '' : 'none' %>">
+              <ul id="syllabus_course_ul_<%=syllabus.id %>">
+                <% unless courses.nil? %>
+                    <% courses.each_with_index do |course, i| %>
+                        <li class="syllabus_class_list <%=i > 2 ? 'none' : '' %>">
+                          <a href="<%=course_path(course.id) %>" target="_blank">
+                              <span class="icons_sy_cir "></span>
+                              <div class="fl">
+                                <div class="syllabus_class_w ">
+                                  <p class="syllabus_class_title fl"><%=course.name %></p>
+                                  <span class="fr sy_p_grey">主讲老师：<%=course.teacher.show_name %></span>
+                                  <div class="cl"></div>
+                                </div>
+                                <div class="">
+                                  <p class="fl grayTxt ">更新：<%=course.time %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
+                                  <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
+                                  <div class="cl"></div>
+                                </div>
+                              </div>
+                              <span class="icons_sy_arrow fl mt19 ml10" ></span>
+                              <div class="cl"></div>
+                          </a>
+                        </li>
+                    <% end %>
+                    <% if courses.count > 3 %>
+                        <li class="syllabus_class_list_more" id="syllabus_class_list_more_<%=syllabus.id %>">
+                          <a href="javascript:void(0);" id="expand_list_<%=syllabus.id %>" data-init="0" onclick="expand_course_list(<%=syllabus.id %>,'#syllabus_course_ul_<%=syllabus.id %> li','#expand_list_<%=syllabus.id %>',<%=courses.count %>)">共<%=courses.count %>个课程，点击全部展开</a>
+                        </li>
+                    <% end %>
+                <% end %>
+              </ul>
+            </div><!--syllabus_class_box end-->
         <% end %>
         <div>
           <ul class="wlist" id="pages" >
@@ -50,26 +86,26 @@
         var rightHeight = $(".homepageRight").height();
         if (rightHeight < leftHeight) {
             var diffHeight = leftHeight - rightHeight;
-            var tmpHeight = $(".listbox").height() + diffHeight;
-            $(".listbox").css("height", tmpHeight);
+            var tmpHeight = $(".syllabus_box").height() + diffHeight;
+            $(".syllabus_box").css("height", tmpHeight);
         }
-    });
-    $(".sy_courses_open").toggle(function(){
-        //$(this).hide();
-        $(this).parent().next().hide();
-        $(this).addClass("sy_courses_close").removeClass("sy_courses_open");
-        //$(this).parent().next().show();
-    },function(){
-        $(this).parent().next().show();
-        $(this).addClass("sy_courses_open").removeClass("sy_courses_close");
-    });
-    $(".sy_courses_close").toggle(function(){
-        //$(this).hide();
-        $(this).parent().next().show();
-        $(this).addClass("sy_courses_open").removeClass("sy_courses_close");
-        //$(this).parent().next().show();
-    },function(){
-        $(this).parent().next().hide();
-        $(this).addClass("sy_courses_close").removeClass("sy_courses_open");
+        $(".sy_courses_open").toggle(function(){
+            //$(this).hide();
+            $(this).parent().next().hide();
+            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+            //$(this).parent().next().show();
+        },function(){
+            $(this).parent().next().show();
+            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+        });
+        $(".sy_courses_close").toggle(function(){
+            //$(this).hide();
+            $(this).parent().next().show();
+            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+            //$(this).parent().next().show();
+        },function(){
+            $(this).parent().next().hide();
+            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+        });
     });
 </script>
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a04df39ac..142b0be42 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1556,3 +1556,22 @@ function edit_file_description(url,id){
     );
 }
 
+//展开课程大纲列表中的班级
+function expand_course_list(id, target, btnid, count) {
+    var target = $(target);
+    var btn = $(btnid);
+    if(btn.data('init')=='0'){
+        btn.data('init',1);
+        btn.html('点击收起');
+        target.show();
+    }else{
+        btn.data('init',0);
+        btn.html('共'+count+ '个课程，点击全部展开');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+        btn.parent().show();
+    }
+}
+
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index d73bbc8bf..83f6cefbc 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -110,7 +110,7 @@ a.syllabusbox_a_blue{
 .syllabus_box{ width:750px; border:1px  solid #e7e7e7; background-color:#fff;}
 .syllabus_courses_list{ padding:15px; border-bottom:1px solid #e7e7e7; cursor:pointer;}
 .syllabus_courses_list:hover{ background:#f6fafd;}
-a.syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+.syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
 .sy_p_grey{ margin-left:25px; color:#888; margin-top:5px; font-size:12px;}
 .syllabus_class_box{ padding-left:30px; background:#f6f6f6;}
 .syllabus_class_list{ padding:12px 0 12px 15px; height:44px;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7; position:relative;}

From 397c4cc2a5944625f453b57217537eaf0b5dd08e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 30 Jun 2016 16:08:36 +0800
Subject: [PATCH 632/668] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B92.?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B93.=E9=97=AE=E9=A2=98=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=A4=84=E5=A2=9E=E5=8A=A0=E7=9B=B4=E6=8E=A5=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5QQ=E7=BE=A4=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb         |   3 +-
 app/controllers/my_controller.rb              |   6 +-
 app/controllers/school_controller.rb          |  51 +++
 app/models/apply_add_schools.rb               |   3 +
 app/views/layouts/_new_feedback.html.erb      |   6 +-
 app/views/mailer/register.html.erb            |   4 +
 app/views/my/_apply_add_school.html.erb       | 337 ++++++++++++++++++
 app/views/my/account.html.erb                 | 106 +++++-
 config/routes.rb                              |   3 +-
 ...160629030320_add_school_type_to_schools.rb |   5 +
 ...20160629081520_create_apply_add_schools.rb |  15 +
 db/schema.rb                                  |  53 +--
 public/images/icons_ziliao.png                | Bin 0 -> 20180 bytes
 public/stylesheets/new_user.css               |  97 ++++-
 public/stylesheets/users.css                  |   2 +-
 spec/factories/apply_add_schools.rb           |  12 +
 spec/models/apply_add_schools_spec.rb         |   5 +
 17 files changed, 660 insertions(+), 48 deletions(-)
 create mode 100644 app/models/apply_add_schools.rb
 create mode 100644 app/views/my/_apply_add_school.html.erb
 create mode 100644 db/migrate/20160629030320_add_school_type_to_schools.rb
 create mode 100644 db/migrate/20160629081520_create_apply_add_schools.rb
 create mode 100644 public/images/icons_ziliao.png
 create mode 100644 spec/factories/apply_add_schools.rb
 create mode 100644 spec/models/apply_add_schools_spec.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 8bf40d472..62b076754 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -243,7 +243,8 @@ class AccountController < ApplicationController
     user = User.find(params[:user]) if params[:user]
     token = Token.new(:user => user, :action => "register")
     if token.save
-      Mailer.run.register(token)
+      # Mailer.run.register(token)
+      Mailer.register(token).deliver
     else
       yield if block_given?
       status = 0
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 0883b3799..32c605516 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -127,12 +127,14 @@ class MyController < ApplicationController
         end
 
         @user.safe_attributes = params[:user]
+        @user.lastname = params[:lastname]
+        @user.firstname = ""
         @user.pref.attributes = params[:pref]
         @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
         #@user.login = params[:login]
         unless @user.user_extensions.nil?
           if @user.user_extensions.identity == 2
-            @user.firstname = params[:enterprise_name]
+            # @user.firstname = params[:enterprise_name]
           end
         end
 
@@ -144,7 +146,7 @@ class MyController < ApplicationController
         # end
         @se.school_id = params[:occupation]
 
-        @se.gender = params[:gender]
+        @se.gender = params[:sex]
         @se.location = params[:province] if params[:province]
         @se.location_city = params[:city] if params[:city]
         @se.identity = params[:identity].to_i if params[:identity]
diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index e0aff6254..44f4378fe 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -150,4 +150,55 @@ class SchoolController < ApplicationController
       format.js
     end
   end
+
+  #申请高校(单位) name:名称 province:省 city:市 address:地址 remarks:备注
+  def apply_add_school
+
+    data = {result:0,name:params[:name],school_id:0}
+    #0 成功 1参数错误 2名称已存在
+    data[:result] = 0
+
+    #检验参数
+    if params[:name] == "" || params[:province] == "" || params[:city] == "" || params[:address] == ""
+      data[:result] = 1
+    else
+      school_id = School.find_by_sql("select id from schools where name='#{params[:name]}'").first
+      if school_id
+        data[:result] = 2
+      else
+        school = School.new
+        school.name = params[:name].strip
+        school.pinyin = Pinyin.t(params[:name].strip, splitter: '')
+        school.save
+
+        #status  0未处理 1通过 2拒绝
+        applyschool = ApplyAddSchools.new
+        applyschool.school_id = school.id
+        applyschool.name = school.name
+        applyschool.province = params[:province]
+        applyschool.city = params[:city]
+        applyschool.address = params[:address]
+        applyschool.remarks = params[:remarks]
+        applyschool.save
+
+        data[:school_id] = school.id
+      end
+    end
+    render :json =>data
+  end
+
+  def search_repeat_schoolname
+    status = 0
+    name = params[:name]
+
+    if name
+      school_id = School.find_by_sql("select id from schools where name='#{name}'").first
+
+      if school_id
+        status = 1
+      end
+    end
+
+    render :json =>status
+  end
 end
diff --git a/app/models/apply_add_schools.rb b/app/models/apply_add_schools.rb
new file mode 100644
index 000000000..2082c0012
--- /dev/null
+++ b/app/models/apply_add_schools.rb
@@ -0,0 +1,3 @@
+class ApplyAddSchools < ActiveRecord::Base
+  attr_accessible :address, :city, :name, :province, :remarks, :school_id, :status
+end
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index ffec82bce..e2e935f57 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -16,7 +16,7 @@
               <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
               <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
               <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();">
+              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="f_submit();">
                 <%= l(:label_submit)%>
               </a>
           <% end %>
@@ -25,7 +25,9 @@
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
             <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
-           <p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center">QQ群号：173184401</p>
+           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
+           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
         </div>
       </div>
       <div class="side_bottom"></div>
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 282deca90..5b4e8262b 100644
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -1,2 +1,6 @@
 <p><%= l(:mail_body_register) %><br />
 <%= link_to h(@url), @url %></p>
+<p>如果点击链接无效请复制该链接到浏览器中打开</p>
+<br>
+<p>感谢您的使用！</p>
+<p>Trustie团队</p><p></p>
diff --git a/app/views/my/_apply_add_school.html.erb b/app/views/my/_apply_add_school.html.erb
new file mode 100644
index 000000000..1449fa1f1
--- /dev/null
+++ b/app/views/my/_apply_add_school.html.erb
@@ -0,0 +1,337 @@
+<h2 class="winbox_h2">添加新的高校（单位）</h2>
+<div class="cl"></div>
+<ul class="winbox_edit_new">
+<li>
+  <label class="fl"><span class="c_red mr5">*</span>名称：</label>
+  <input id = "schoolname" type="text" class="winbox_input fl" onBlur = 'ifNameRepeat()' onFocus = '$("#schoolrepeatnotice").text("");$("#schoolrepeatnotice").attr("value",1);$("#schoolrepeatnotice").hide(); '/>
+  <span class="ml2" id="schoolrepeatnotice" style="color:red;" display="none"></span>
+</li>
+<li>
+  <label class="fl">&nbsp;&nbsp;</label>
+  <span class="fl">例如：</span><span class="icons_right fl mt5 "></span><span class="fl">国防科学技术大学</span>
+  <span class="icons_error fl mt5 ml10"></span><span class="fl">国防科大计算机1班</span>
+</li>
+<li>
+  <label class="fl"><span class="c_red mr5">*</span>地区：</label>
+    <select onchange="showcity(this.value, document.getElementById('schoolCity'));" name="province" id="schollProvince" class="winbox_select fl" style="height:28px;margin-left:2px;">
+      <option value="">--请选择省份--</option>
+      <option value="北京">北京</option>
+      <option value="上海">上海</option>
+      <option value="广东">广东</option>
+      <option value="江苏">江苏</option>
+      <option value="浙江">浙江</option>
+      <option value="重庆">重庆</option>
+      <option value="安徽">安徽</option>
+      <option value="福建">福建</option>
+      <option value="甘肃">甘肃</option>
+      <option value="广西">广西</option>
+      <option value="贵州">贵州</option>
+      <option value="海南">海南</option>
+      <option value="河北">河北</option>
+      <option value="黑龙江">黑龙江</option>
+      <option value="河南">河南</option>
+      <option value="湖北">湖北</option>
+      <option value="湖南">湖南</option>
+      <option value="江西">江西</option>
+      <option value="吉林">吉林</option>
+      <option value="辽宁">辽宁</option>
+      <option value="内蒙古">内蒙古</option>
+      <option value="宁夏">宁夏</option>
+      <option value="青海">青海</option>
+      <option value="山东">山东</option>
+      <option value="山西">山西</option>
+      <option value="陕西">陕西</option>
+      <option value="四川">四川</option>
+      <option value="天津">天津</option>
+      <option value="新疆">新疆</option>
+      <option value="西藏">西藏</option>
+      <option value="云南">云南</option>
+      <option value="香港">香港特别行政区</option>
+      <option value="澳门">澳门特别行政区</option>
+      <option value="台湾">台湾</option>
+      <option value="海外">海外</option>
+    </select>
+    <select name="city" id="schoolCity" class="winbox_select fl ml5" style="height:28px;"></select>
+    <span class="ml2" id="provincenotice" style="color:red;" display="none"></span>
+</li>
+<li>
+  <label class="fl"><span class="c_red mr5">*</span>详细地址：</label><input id="address" type="text" class="winbox_input fl" />
+  <span class="ml2" id="addressnotice" style="color:red;" display="none"></span>
+</li>
+<li><label class="fl">说明：</label><textarea id = "remarks" class="winbox_textarea fl" placeholder="如果您有特别需要说明的内容请填入"></textarea></li>
+<div class="cl"></div>
+<li><label class="fl">&nbsp;&nbsp;</label><button class="fl winbox_btn_blue mt10" onclick = "commit_add_school();">确定</button></li>
+</ul>
+
+<script type="text/javascript">
+    function commit_add_school(){
+        var name,province,city,address,remarks;
+
+        name = $("#schoolname").val();
+        province = $("#schollProvince").val();
+        address = $("#address").val();
+
+        if(name == ""){
+            $("#schoolname").focus();
+            return;
+        }
+        if($("#schoolrepeatnotice").attr("value") == "1"){
+            return;
+        }
+        if(province == ""){
+            $("#provincenotice").text("请选择");
+            $("#provincenotice").show();
+            return;
+        }
+        city = $("#schoolCity").val();
+        if(city == ""){
+            return;
+        }
+
+        if(address == ""){
+            $("#address").focus();
+            return;
+        }
+
+        remarks = $("#remarks").val();
+
+        $.ajax({
+                url: '/school/apply_add_school',
+                type: 'get',
+                data: {name:name,province:province,city:city,address:address,remarks:remarks},
+                success: function(data){
+                    if(data.result == 0){
+                        $("input[name='province']").val(data.name);
+                        $("input[name='occupation']").val(data.school_id);
+
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>添加成功！您可以继续使用了。</div></br><div style='width:550px;text-align:center'>后续我们将对您的高校（单位）进行审核，如有问题我们再联系您。</div></br><div style='width:67px; margin:0 auto; text-align:center'></div>";
+                        pop_up_box(htmlvalue,500,30,50);
+                    }
+                    else if (data.result == 1){
+                    }
+                    else if (data.result == 2){
+                        $("#schoolrepeatnotice").text("名称已存在");
+                        $("#schoolrepeatnotice").show();
+                        $("#schoolrepeatnotice").attr("value",1);
+                        $("#schoolrepeatnotice").attr("style","color:red");
+                    }
+                    return;
+                }
+        });
+    }
+
+    function showcity(province, cityField) {
+        $("#provincenotice").hide();
+        switch (province) {
+            case "北京" :
+                var cityOptions = new Array(
+                        "东城", "西城", "朝阳", "丰台", "石景山", "海淀", "门头沟",
+                        "房山", "通州", "顺义", "昌平", "大兴", "平谷", "怀柔", "密云", "延庆");
+                break;
+            case "上海" :
+                var cityOptions = new Array(
+                        "崇明", "黄浦", "卢湾", "徐汇", "长宁", "静安", "普陀", "闸北", "虹口", "杨浦", "闵行",
+                        "宝山", "嘉定", "浦东", "金山", "松江", "青浦", "南汇", "奉贤");
+                break;
+            case "广东" :
+                var cityOptions = new Array(
+                        "广州", "深圳", "珠海", "东莞", "中山", "佛山", "惠州", "河源", "潮州", "江门", "揭阳", "茂名",
+                        "梅州", "清远", "汕头", "汕尾", "韶关", "顺德", "阳江", "云浮", "湛江", "肇庆");
+                break;
+            case "江苏" :
+                var cityOptions = new Array(
+                        "南京", "常熟", "常州", "海门", "淮安", "江都", "江阴", "昆山", "连云港", "南通",
+                        "启东", "沭阳", "宿迁", "苏州", "太仓", "泰州", "同里", "无锡", "徐州", "盐城",
+                        "扬州", "宜兴", "仪征", "张家港", "镇江", "周庄");
+                break;
+            case "重庆" :
+                var cityOptions = new Array(
+                        "万州", "涪陵", "渝中", "大渡口", "江北", "沙坪坝", "九龙坡", "南岸", "北碚", "万盛",
+                        "双挢", "渝北", "巴南", "黔江", "长寿", "綦江", "潼南", "铜梁", "大足", "荣昌", "壁山",
+                        "梁平", "城口", "丰都", "垫江", "武隆", "忠县", "开县", "云阳", "奉节", "巫山", "巫溪",
+                        "石柱", "秀山", "酉阳", "彭水", "江津", "合川", "永川", "南川");
+                break;
+            case "安徽" :
+                var cityOptions = new Array(
+                        "合肥", "安庆", "蚌埠", "亳州", "巢湖", "滁州", "阜阳", "贵池", "淮北", "淮化", "淮南",
+                        "黄山", "九华山", "六安", "马鞍山", "宿州", "铜陵", "屯溪", "芜湖", "宣城");
+                break;
+            case "福建" :
+                var cityOptions = new Array(
+                        "福州", "厦门", "泉州", "漳州", "龙岩", "南平", "宁德", "莆田", "三明");
+                break;
+            case "甘肃" :
+                var cityOptions = new Array(
+                        "兰州", "白银", "定西", "敦煌", "甘南", "金昌", "酒泉", "临夏", "平凉", "天水",
+                        "武都", "武威", "西峰", "张掖");
+                break;
+            case "广西" :
+                var cityOptions = new Array(
+                        "南宁", "百色", "北海", "桂林", "防城港", "贵港", "河池", "贺州", "柳州", "钦州", "梧州", "玉林");
+                break;
+            case "贵州" :
+                var cityOptions = new Array(
+                        "贵阳", "安顺", "毕节", "都匀", "凯里", "六盘水", "铜仁", "兴义", "玉屏", "遵义");
+                break;
+            case "海南" :
+                var cityOptions = new Array(
+                        "海口", "儋县", "陵水", "琼海", "三亚", "通什", "万宁");
+                break;
+            case "河北" :
+                var cityOptions = new Array(
+                        "石家庄", "保定", "北戴河", "沧州", "承德", "丰润", "邯郸", "衡水", "廊坊", "南戴河", "秦皇岛",
+                        "唐山", "新城", "邢台", "张家口");
+                break;
+            case "黑龙江" :
+                var cityOptions = new Array(
+                        "哈尔滨", "北安", "大庆", "大兴安岭", "鹤岗", "黑河", "佳木斯", "鸡西", "牡丹江", "齐齐哈尔",
+                        "七台河", "双鸭山", "绥化", "伊春");
+                break;
+            case "河南" :
+                var cityOptions = new Array(
+                        "郑州", "安阳", "鹤壁", "潢川", "焦作", "济源", "开封", "漯河", "洛阳", "南阳", "平顶山",
+                        "濮阳", "三门峡", "商丘", "新乡", "信阳", "许昌", "周口", "驻马店");
+                break;
+            case "香港" :
+                var cityOptions = new Array(
+                        "香港", "九龙", "新界");
+                break;
+            case "湖北" :
+                var cityOptions = new Array(
+                        "武汉", "恩施", "鄂州", "黄冈", "黄石", "荆门", "荆州", "潜江", "十堰", "随州", "武穴",
+                        "仙桃", "咸宁", "襄阳", "襄樊", "孝感", "宜昌");
+                break;
+            case "湖南" :
+                var cityOptions = new Array(
+                        "长沙", "常德", "郴州", "衡阳", "怀化", "吉首", "娄底", "邵阳", "湘潭", "益阳", "岳阳",
+                        "永州", "张家界", "株洲");
+                break;
+            case "江西" :
+                var cityOptions = new Array(
+                        "南昌", "抚州", "赣州", "吉安", "景德镇", "井冈山", "九江", "庐山", "萍乡",
+                        "上饶", "新余", "宜春", "鹰潭");
+                break;
+            case "吉林" :
+                var cityOptions = new Array(
+                        "长春", "吉林", "白城", "白山", "珲春", "辽源", "梅河", "四平", "松原", "通化", "延吉");
+                break;
+            case "辽宁" :
+                var cityOptions = new Array(
+                        "沈阳", "鞍山", "本溪", "朝阳", "大连", "丹东", "抚顺", "阜新", "葫芦岛", "锦州",
+                        "辽阳", "盘锦", "铁岭", "营口");
+                break;
+            case "澳门" :
+                var cityOptions = new Array("澳门");
+                break;
+            case "内蒙古" :
+                var cityOptions = new Array(
+                        "呼和浩特", "阿拉善盟", "包头", "赤峰", "东胜", "海拉尔", "集宁", "临河", "通辽", "乌海",
+                        "乌兰浩特", "锡林浩特");
+                break;
+            case "宁夏" :
+                var cityOptions = new Array(
+                        "银川", "固源", "石嘴山", "吴忠");
+                break;
+            case "青海" :
+                var cityOptions = new Array(
+                        "西宁", "德令哈", "格尔木", "共和", "海东", "海晏", "玛沁", "同仁", "玉树");
+                break;
+            case "山东" :
+                var cityOptions = new Array(
+                        "济南", "滨州", "兖州", "德州", "东营", "菏泽", "济宁", "莱芜", "聊城", "临沂",
+                        "蓬莱", "青岛", "曲阜", "日照", "泰安", "潍坊", "威海", "烟台", "枣庄", "淄博");
+                break;
+            case "山西" :
+                var cityOptions = new Array(
+                        "太原", "长治", "大同", "候马", "晋城", "离石", "临汾", "宁武", "朔州", "忻州",
+                        "阳泉", "榆次", "运城");
+                break;
+            case "陕西" :
+                var cityOptions = new Array(
+                        "西安", "安康", "宝鸡", "汉中", "渭南", "商州", "绥德", "铜川", "咸阳", "延安", "榆林");
+                break;
+            case "四川" :
+                var cityOptions = new Array(
+                        "成都", "巴中", "达川", "德阳", "都江堰", "峨眉山", "涪陵", "广安", "广元", "九寨沟",
+                        "康定", "乐山", "泸州", "马尔康", "绵阳", "眉山", "南充", "内江", "攀枝花", "遂宁",
+                        "汶川", "西昌", "雅安", "宜宾", "自贡", "资阳");
+                break;
+            case "台湾" :
+                var cityOptions = new Array(
+                        "台北", "基隆", "台南", "台中", "高雄", "屏东", "南投", "云林", "新竹", "彰化", "苗栗",
+                        "嘉义", "花莲", "桃园", "宜兰", "台东", "金门", "马祖", "澎湖");
+                break;
+            case "天津" :
+                var cityOptions = new Array(
+                        "天津", "和平", "东丽", "河东", "西青", "河西", "津南", "南开", "北辰", "河北", "武清", "红挢",
+                        "塘沽", "汉沽", "大港", "宁河", "静海", "宝坻", "蓟县");
+                break;
+            case "新疆" :
+                var cityOptions = new Array(
+                        "乌鲁木齐", "阿克苏", "阿勒泰", "阿图什", "博乐", "昌吉", "东山", "哈密", "和田", "喀什",
+                        "克拉玛依", "库车", "库尔勒", "奎屯", "石河子", "塔城", "吐鲁番", "伊宁");
+                break;
+            case "西藏" :
+                var cityOptions = new Array(
+                        "拉萨", "阿里", "昌都", "林芝", "那曲", "日喀则", "山南");
+                break;
+            case "云南" :
+                var cityOptions = new Array(
+                        "昆明", "大理", "保山", "楚雄", "大理", "东川", "个旧", "景洪", "开远", "临沧", "丽江",
+                        "六库", "潞西", "曲靖", "思茅", "文山", "西双版纳", "玉溪", "中甸", "昭通");
+                break;
+            case "浙江" :
+                var cityOptions = new Array(
+                        "杭州", "安吉", "慈溪", "定海", "奉化", "海盐", "黄岩", "湖州", "嘉兴", "金华", "临安",
+                        "临海", "丽水", "宁波", "瓯海", "平湖", "千岛湖", "衢州", "江山", "瑞安", "绍兴", "嵊州",
+                        "台州", "温岭", "温州", "余姚", "舟山");
+                break;
+            case "海外" :
+                var cityOptions = new Array(
+                        "美国", "日本", "英国", "法国", "德国", "其他");
+                break;
+            default:
+                var cityOptions = new Array("");
+                break;
+        }
+
+        cityField.options.length = 0;
+        for (var i = 0; i < cityOptions.length; i++) {
+            cityField.options[i] = new Option(cityOptions[i], cityOptions[i]);
+            /*
+             if (cityField.options[i].value==city)
+             {
+             //alert("here put City ok!");
+             document.oblogform["city"].selectedIndex = i;
+             }*/
+        }
+    }
+
+    function ifNameRepeat(){
+
+        //名称不能为空也不能重复
+        if($("#schoolname").val() == ""){
+            return;
+        }
+
+        $.ajax({
+            url: '/school/search_repeat_schoolname',
+            type: 'get',
+            data: {name:$("#schoolname").val()},
+            success: function(data){
+                if (data == 1){
+                    $("#schoolrepeatnotice").text("名称已存在");
+                    $("#schoolrepeatnotice").show();
+                    $("#schoolrepeatnotice").attr("value",1);
+                    $("#schoolrepeatnotice").attr("style","color:red");
+                }
+                else{
+                    $("#schoolrepeatnotice").text("可用");
+                    $("#schoolrepeatnotice").show();
+                    $("#schoolrepeatnotice").attr("value",0);
+                    $("#schoolrepeatnotice").attr("style","color:green");
+                }
+            }
+        });
+    }
+</script>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index f28ad1ca2..589541c39 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -20,8 +20,8 @@
           <li><span style="color:red;">*</span>&nbsp;&nbsp;职业&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><span style="color:red;">*</span>&nbsp;&nbsp;姓名&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">性别&nbsp;:&nbsp;</li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">单位名称&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><span style="color:red;">*</span>&nbsp;&nbsp;性别&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;" ><span style="color:red;">*</span>&nbsp;&nbsp;单位名称&nbsp;:&nbsp;</li>
           <li>地区&nbsp;:&nbsp;</li>
           <li>邮件通知&nbsp;:&nbsp;</li>
           <!--<li>个人签名&nbsp;:&nbsp;</li>-->
@@ -64,19 +64,51 @@
             <span id="identity_hint" style="display: none"></span>
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
 
-          <li nhname="tag" nh_tag_2="true" style="display:none;"><%= text_field_tag :enterprise_name,@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
-            <input type="radio" class="fl "><label class="fl mr10">男</label> <input type="radio" class="fl "><label class="fl ">女</label>
-
+            <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
+                <input type="radio" id="sex" value="0" name="sex"  class="fl "><label class="fl mr10">男</label> <input type="radio" id="sex" value="1" name="sex" checked="checked"  class="fl "><label class="fl ">女</label>
+            <% else %>
+                <input type="radio" id="sex" value="0" name="sex" checked="checked" class="fl "><label class="fl mr10">男</label> <input type="radio" id="sex" value="1" name="sex" class="fl "><label class="fl ">女</label>
+            <% end %>
+            <select style = "display: none;" class="w70" style="height:28px;margin-left:2px;" id="gender" name="gender"><option value="0">男</option><option value="1">女</option></select>
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" >
-            <select  class="w210 fl" style='height:28px;'>
-              <option value="">  -- 请选择您所属的高校 --</option>
-            </select>
-            <p class="fl ml10">您输入的名称尚不存在，<a href="#" style="color: #3b94d6;">申请添加</a> </p>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
+            <% if User.current.user_extensions.nil? %>
+                <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
+                <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
+                <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
+                <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <% elsif User.current.user_extensions.school.nil? %>
+                <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" placeholder="     --请选择您所属的单位--" />
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
+                <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <% else %>
+                <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" value="<%= User.current.user_extensions.school %>" />
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
+                <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text"  style="display: none;width:117px;" value="<%#= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>-->
+            <% end %>
           </li>
 
           <li>
@@ -412,6 +444,7 @@
       $("*[nh_required='1']",$(this)).attr("required",true);
       $(this).show()
     });
+    $("#identity_hint").hide();
   }
   function init_identity_and_title(pField, identity, cField, title, language) {
     for (var i = 0; i < pField.options.length; i++) {
@@ -516,6 +549,14 @@
      $("input[name='occupation']").val(data);
      $("#search_school_result_list").hide();
       $("#hint").hide();
+      $("#errortip").hide();
+
+  }
+
+  function apply_add_school(){
+      var htmlvalue = "<%= escape_javascript( render :partial => 'my/apply_add_school' )%>";
+      pop_up_box(htmlvalue,580,20,48);
+
   }
   function add_school(name){
       $.ajax({
@@ -602,16 +643,19 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
                           $("#hint").show();
+                          $("#errortip").hide();
                       }else{
                           $("#hint").hide();
+                          $("#errortip").hide();
                       }
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
                       $("#hint").show();
+                      $("#errortip").show();
                   }
               }
           });
@@ -621,6 +665,7 @@
           {
               $("#search_school_result_list").hide();
               $("#hint").hide();
+              $("#errortip").hide();
           }
       });
       $("input[name='province']").on('focus', function (e) {
@@ -648,16 +693,19 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
                           $("#hint").show();
+                          $("#errortip").hide();
                       }else{
                           $("#hint").hide();
+                          $("#errortip").hide();
                       }
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
                       $("#hint").show();
+                      $("#errortip").show();
                   }
               }
           });
@@ -685,19 +733,41 @@
     <% if( !@act.nil? && @act == 'password') %>
     $("#users_tb_2").click();
     <% end %>
-    $('#my_account_form_link').click(function(e){
+
+    $('#my_account_form_link').on("click",(function(e){
+    //$('#my_account_form_link').click(function(e){
         if($("#userIdentity").val() == -1 ) {
             $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
             e.stopImmediatePropagation();
             return;
         }
         if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
-            $("#hint").html('<span style="color:red">学校必须是从下拉列表中选择的,不能手动修改</span>').show();
+            $("#hint").html('<span style="color:red">单位名称必须是从下拉列表中选择的,不能手动修改</span>').show();
+            e.stopImmediatePropagation();
+            return;
+        }
+
+        //姓名不能为空
+        if( $("#lastname").val() == '' ){
+            $("#lastname").focus();
+            e.stopImmediatePropagation();
+            return;
+        }
+
+        if( $("input[name='province']").val().trim() == '' ){  //学校名字必须填写
+            $("#hint").html('<span style="color:red">高校（单位）名称不能为空</span>').show();
             e.stopImmediatePropagation();
             return;
         }
+
+        if($("#no").is(":visible")  == true && $("#no").val() == ""){
+            $("#no").focus();
+            e.stopImmediatePropagation();
+            return;
+        }
+
       $('#my_account_form_btn').click();
-    });
+    }));
     $('#my_password_form_link').click(function(){
       $('#my_password_form_btn').click();
     });
diff --git a/config/routes.rb b/config/routes.rb
index 14ee3f0b8..d56f75ced 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -213,7 +213,8 @@ RedmineApp::Application.routes.draw do
 
   resources :school, :except => [:show] do
     collection do
-
+      get 'apply_add_school'
+      get 'search_repeat_schoolname'
     end
 
     member do
diff --git a/db/migrate/20160629030320_add_school_type_to_schools.rb b/db/migrate/20160629030320_add_school_type_to_schools.rb
new file mode 100644
index 000000000..ad23ae555
--- /dev/null
+++ b/db/migrate/20160629030320_add_school_type_to_schools.rb
@@ -0,0 +1,5 @@
+class AddSchoolTypeToSchools < ActiveRecord::Migration
+  def change
+    add_column :schools, :school_type, :integer, :default => false
+  end
+end
diff --git a/db/migrate/20160629081520_create_apply_add_schools.rb b/db/migrate/20160629081520_create_apply_add_schools.rb
new file mode 100644
index 000000000..3d47f55a1
--- /dev/null
+++ b/db/migrate/20160629081520_create_apply_add_schools.rb
@@ -0,0 +1,15 @@
+class CreateApplyAddSchools < ActiveRecord::Migration
+  def change
+    create_table :apply_add_schools do |t|
+      t.string :name
+      t.string :province
+      t.string :city
+      t.string :address
+      t.string :remarks
+      t.integer :school_id
+      t.integer :status, :default => false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 148a6e21b..615a9001e 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 => 20160624032138) do
+ActiveRecord::Schema.define(:version => 20160629081520) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -57,6 +57,18 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer "user_id",    :null => false
   end
 
+  create_table "apply_add_schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.string   "city"
+    t.string   "address"
+    t.string   "remarks"
+    t.integer  "school_id"
+    t.integer  "status",     :default => 0
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
   create_table "apply_homeworks", :force => true do |t|
     t.integer  "status"
     t.integer  "user_id"
@@ -1125,23 +1137,6 @@ ActiveRecord::Schema.define(:version => 20160624032138) 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"
@@ -1539,6 +1534,18 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+  end
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1637,10 +1644,11 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
   create_table "schools", :force => true do |t|
     t.string   "name"
     t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
     t.string   "logo_link"
     t.string   "pinyin"
+    t.integer  "school_type", :default => 0
   end
 
   create_table "secdomains", :force => true do |t|
@@ -1765,6 +1773,7 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer  "status",          :default => 9
     t.text     "results"
     t.text     "src"
+    t.integer  "uwait_time",      :default => 0
   end
 
   create_table "student_works", :force => true do |t|
@@ -1783,8 +1792,8 @@ ActiveRecord::Schema.define(:version => 20160624032138) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
-    t.integer  "simi_id"
-    t.integer  "simi_value"
+    t.integer  "simi_id",                                       :default => 0
+    t.integer  "simi_value",                                    :default => 0
     t.float    "work_score"
   end
 
diff --git a/public/images/icons_ziliao.png b/public/images/icons_ziliao.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc72e7361419bdefbc5a26b37d2cafee3e921e6c
GIT binary patch
literal 20180
zcmeI4c{J2-^!VSXY*|7nOU8&6#tg<bA#0XwAxjct%rFciGu8?vglyT@WJx4aibPbh
zWQ!tuWli>MiRw36HJ?6nKIi<t-+#Vm-sjBB`#$%%_r9OkbD#TuX3lv}h@rkF3lk3$
z001o7TIxom&uyfa9>W&WyRu-U2kC>+Rm*|^0L+~0FB%{@bteEY>0#B>3=JLdL_EO(
z?+VgZQv<oW;W1bo8UVa{(u_ULW0rR)y<SGMnW}cp7AN4&0brp5hI)33O!mtF@&Y@D
z^3%YJOr~7hx20+wt2y7nq?LAYFk@ety-MiC<6*~6$W06M<=#E(Gcz@{`f9aeEOl(H
z#k-Zwe;bEL^k}9dAa4|?fans4G|;MPsPw1ZuJvXUh<&v2vHj+!05D7E?d40nb!d&I
z2oKN#t{vigIO^Vh4JbDhF#|x+z#A~f7&A?j5l}B~QqKj{?*wic-?3u?VgUf>eMS`w
z<g);i3))JXfv&umK5n2ZlP`|}2&Vy(_G#{+Rek{296M(uMqB+D$S6<-i*Kqfr17`7
zC#gy6U%46Zh%k?0Q?>#8lT^i;0FWFlpthT{nGU2&mjP?9dXs1E8d#=915`K0H76Wt
zm*Ogmd(PweVfM|S;NW9iu_}^#KRbqT7@V4rBE+dRMyK1d6##fv+8%w8I}|lGI{bDN
zGlrX4c$)deX%-Jw5}bSerQ#CpCV*YPb*9I9WTcbMwT|YNdzDk3CD3CEIJ{o5lIms5
zIL`FkXC=&AZcTZ2`c=bv1%5szX67kj+pCqZp)jSdQg88Z!hDxV+AqC6v%slj<)oX{
zSplC<AzeHQjUvVxH>pavERP9&sSEV`9I?M`5MF#jY<uXOc}STdSg+3ezEQNgU_;y>
z$GD&5oIw0%#u!f)pdiSgTK^vX-9}us?=%f<7^``^2cYab54ps{91XDB!zI0!0U)Mo
zB~n?G253&m9s+=hcRNp9kLA{_WdH#6jB^KWsnBnI#8ptun)-;pqMDl)xkX)h>z--_
zcGWGz{(MYVcgCyiGO0#%ZMu7ljwfSV@>}+jM-p-@V{bT4oSSgv-eR*e{qfF<AjVB9
z^$eUyLBz#vwh>+676$I5h)rOm7W}e*Hfa1J*HQ4(dbe!aJXObND=nc95H~LQ@Ds|P
zqI&B=lA&v%6`B&U=WZXRdr9lAeE+%tPiSohp^XS<v+|G6bZX-%*{$e*FEh98$UAo;
za5gjo<=-a3in-K{JaH*l!zRR>N2G2CYQ$XHG*TMHZ!YVxowqt2Im57rHq4)MlHue9
z_Q$yMQBj)ay5?%vg(rndILaB!7y~XyJl+eAxo%J*?8C8A<7JB|jxs-7ATlkuTQFVt
z<X%=z>lm#)tPPik^_c{Pqa?MNwVkwjwIJEX*-Gu~*i>DSi74lWfnkQ*{so|f=+Y>*
zD1*zZ4Nrzkxe!k;4(c*y?lH=a<<OBv9~#+|b45}$DI@=Ab6)yOhWv|&E625+Gdv8T
z#=&`<aQ9^4=9C?3joFZ_j_1i(d+f3Ubeveu*dMT4BjI^MyVE=R@v-rM1<$Q4K`a4v
zTDJRkIqf>VD|ct<E@+bOwaqUQlIl%huOxYs>=W4%@yE;$EFCzrJ^C3(93sv%&Npr>
z-{ctK*r5*Zd}fmy$JlP1G(CIm@Uc6FLwSrZciia6<3IKwPo}WN$kQm&u=S{Q)<f&h
z=RcuXZU+S(&Ir=VGC`Hr?g|&&Q7eg_Ggs|&Go_mlb4t{+wY<GDsq3+MmDdA$TGv>O
zkdG<AL}SuMPc_r9))v2+mG4f~X%TE;X*ms{gB*escRJq0-1NOE+vC&ou*Y`FZEDBV
zM9+-7YnpPJSlS}O8L{lnST0k3v^=o9*S+<<(hJmt_c-I?vqjeN{x;1;=Y_0A?)NjD
zGi?I0FgSxu)GnNa9BQ^H3iZw@5nI+ad*SW%ZH*4)(KQZPZQ5CT%S5Jw?T4hjxRo#k
zcs|<#_yD@kNdak#mF&%~$$mQgaDQ{GQ!=K!t>gu<si|J9ub``-VKPF#Bh@J#`LMg9
zcP%_HM<eyAPMAzsU3^dcna0iWdhyEziKa@X-lmJDuL`s~PfUnSICq-i40+8`wx%Fb
z8t+}dnR2tnBgOeO*C1Eq{`UQg#x6Y)lWUVqlgX1?rsS89OTtUeORfA(d>s6p2Z;yI
zxDnl(JaDcR6WMR!Px5N=o{XE>^V(k}q|HlnUpo@j$dTZYz-{cD8=C8K#iucDglD?E
z{qBp!tds{SeK)(EU-maCK0SM5RZl#Hx54U(;*83|?6UdbsivW{+?3qM^HF2alO886
zPOet&Hn@{2lHLh(uJ5g}d{fzY+6JMdi2l?vPN!6>M0>^OO7O#L55cb$9}4+)`X>3(
zucfaZ{M7h4@?+Io?+-iX^f%kkJfaz)sXWJX?hc(3oxrA~O*!<^o5MFh*aF?Ev|V*8
zBa4NATMWLM`vdO^N~+IZEV*s_GlsP7$9X@&nnZMWcW#RaYGruM?u);+qC4JnkKy7Q
zP29yY0qm|M?v=A#`wvLwi@!fwVoW?mTo&sr7`9louZ)<B%)4~|V6WpnHxK&)N1PE3
zHJMW8UzT5X&MWw%##{mik#i5@RLF2mSB+xG5P^0Kmn@Y!oNN+LL=}$oW!~o=9dBt&
z_f)Wuwum|-7nsPAaQo0m07%sky3=4J*F}$?^TUOdKm(13nc<m7i%ZLN6fTdZnZ_;2
z^&dQ|_Q@g0;IMnG6r+KWsCV?P%lC!m^-R?}2MSudPjy4&V^d>Ovy51<@g<_KV5R#?
z4KSjjF)YL0qt4HGV}hS84-2gj=6ko}0(IN6N{k8(S$F6{uZwzF?zHqO)2h@u{!;2S
z=F9sPA?EWt&QwO-GAz4wr>o4%V(tyNO5?!}p)g}^PjLw=qjEbh>}>nlMu*1R@t+L`
z&5e$IaP;o`5MdP1o|B^{dfp5kmlxa6=u)_F{61<sGS2SUjAKHFrK#Tm?l|iL*MjSX
zA8#El8yz&$x9&Kz=<VFoGoVxYY-&PlB74H6VA-OoNT<?KrQ><fEXz&ax$qHQYiFGS
z;#D8V#favT=4Z`x(n#qk%cgq;y&ta1WG(rm`B^oZe!h95^kKJ1PiIxX=jnOY0RHU<
z2WDa?EAEPVnK@NzoLzKjpFZCo$z#h~UN!35U#974@H9R0bk1q|C5@R0M<O2AS5#GX
zo6*@wCVaOR!gVCYAK#NQmF#)f_4onS$0{R__P)M$=Jb%^yQ?iv`kpkuPVy^VWSG$M
z7HvmVxfejPoHG=!R?fV;l$FMRl3(*-=~v$wi6NAGophvGdPdql#krN?^D#rYcDd<k
z`iB%>CiQtQ>#ij^Ssk^iv{!3QKg3O()-APOZkQh!i?o`pa9sc|+x7~V9=WMlsHo}d
z`uVL^ktKctz1%ourcg*+(3?2eHuJ*olVf!U;nl}i;#OC@D`#pac}rbH`uWO)%NIX-
zEKPBHGEM9DS@}eI6|Ft&`TU;#6We>gk}t*RYUei}ZK`crpIETXurdaxe~JD2BKU2)
zW|L-z&|#tQ$TR@~UKXCp4|XjvZ*y<wa<)G6HT~*6LAWvY`t#uGkyi7yu36@lu-2+V
z@4R`pnHzaUh&rJ<fr=Jy#kp&1H(Pqo&XmoRzpkqkNZPli{Kas-?Gvgl_qoBc(%6|V
zYtZEj^Q*$`SEK*{v4S-*Cz|W&B2ai|aiksI7A@}O>`K~(0)WCHFIObW2~7mqqV2IR
zir|?CRbUX-P7!P-tq0R{RYN;qwS3&r#y<KcC?6-3ydC(E5|e@#g5<y%O+<pcoN+D$
zgqI@tn_mR!e7zY827T*7bW#MXtOo>{>luR7@NQ_3w73ie1(T5l$;yjMNXyE?WyL^}
zFbQcWObRLmgGfpt;4lPS67=H$D>0GI6x{4E2qX2wKf;kDMX&>r=!$?sJv}|eJ*C9)
zZuU?Kd3kv#OcE+72_f}>5WHQ8NH2&BLFl`apMKQQ1e6=rm59Z=fY$vYZSn3zMKE|h
z(68gixSU;o1#%($U`L_|^+LKrCB$LSe=*Y2qip8v{8vi?QNx3DB|k>?*MI~QZ&x(b
z2u;AdyP?n;9%vV$(BCe?_2>79zq|XT{?}31p?+Dqy1U`N0k%Uy(Kxg-DJFqrC-K)Y
z5V4rwlk>+A);0ec4()~g7qfNEce8J)@O_39Nco3Qb3-GEcsCO~9;fs@%YJ`*B7J#U
z&nnP9Gpvgp-jlFj0ZMN2d%k~rL#rc+XeE-R3<M?vk(4u$kVe2{5pX$Cm>dEI+u-DT
zPck2Rq};bd5|RJK%O8Eo{ow7e81Mh&<#*3Nedy^Sv|R{9qzekIt*%5GyEqnWhp<K2
z+QFoxq#!U13<Hsth1)`GVQ3^oLQ+arPF4agVQY*0HpoBC|KVC4k8)qn1Cs0S3*Qcp
zBDw#SRtSuY9YzL*L_?%d7&Jse0xbhUN=V8;FtQkoBvKA-CnXR68EAvEe*`jcBkhe{
zkhl$f*2iK;3I?;4giFavNkVL8;BpY8JX{_kFN2YV*vi?$Wu&E1k|^Y_vHZo&KSF6?
z38ZZD-jHRaT>DmejM1n5Z2hUgVZT)nSEL&Oy}mFN!9Q2#uafhtqO99|Ti^&JYQ6R-
zq1MwEZKnYJqxJV?{j&UFhW+Ps{x<~Q{ckY;_ZXfIXctQ9|J~KMUjOcdfX5I$k#1-e
zds2q{mzDY5>z`)i?iHZxwHk;0Uzi92(&PVc8vfg=`adxZzq1(SfON4(+bKbRCh*UO
z|2A{q=kw2%^|K)Sb0sSLt}H(*feNXztuI)@pBeFO!Kxzd|7=~q>>v5_vwR@sY;9$w
zFmQ;BgcKYikAfp1wkV7(#7<sTT2@+G5{|*x{ypiwxBeMJ0s7yraKk{<@Ho7i9^MYE
zB(>4{ck^$M8>~n_3mSg^RZxjwq^Szh)=-m?ke4Cdti&ZYy4lcggC9E-0)uyRMiP~<
z&PaPS)YZja0s6afL(lcQHG)(&NlO^{tz413|D%n(zxjIk!?}O!FDnTn9Z-q&_aCMk
z)#RoYlub9P$xVM-9&^DGl_Y;eBWvDZwZ5f5eB*3P+Wn%HNJArUBJXX8^+My!)v=_T
z9$~$BOUVAPAy@p>(BikD>>q|36h92VC)b8O>bFGx-b&g5lQ!SbU%T&r<oK^!#{cBW
z?-Bh^dL{Ek4MGNlvPi{6nGczkii->gWs!=DG9NN66&D#0$|4mPWj<tDDlRf0ltn5o
z%6!PQR9s|0D2r5Fl=+Zpskq31P!_4UDDxrHQgM+1p)68yQRYLYrQ#w3LRqBZqRfX(
zOT|S7gtAD*MVSwomWqoE2xXCqi!vWFEfp6T5XvGI7iB(VS}HCwAe2QaF3Nn!v{YPV
zKq!k;T$K5cX{or#fKV2xxG3`>(^7Gf0ii5XaZ%<&rlsN{143D(;-bulOiRT@286Om
z#YLG9nU;!+3<zbBii<KIGA$Js84$`M6&GbbWLhdNG9Z*iiny45KhKJGAw9(ENqSn9
z6IOvDJ?RQUX&LDOfR8W$_y+*M%2(3oH~_fA0N}k1=^@!f0N}=7wtjjT02tP^)m2Qq
zdL|Q`FPU`gs`DG`J1FHj;9>8%lxAf*(AJ!B@iz0t<m36KVFesEXG21+cI-?j3Ac8v
z!X0;Vdd#iPDb}+oq>x=SR^;Y(!NK@a@Xbbl|1kg6$F~n2d?0ma-ot)$;04<qF}yD<
zZ+vh1u*g_CVH)~%tZz)-VE5Hn+jgTN1l{K&U6rUnCIRf*lynOK-tvCi)q`xs1@3!|
z-!Bg>a+f`>*|R66a2VQ)cuAjPIs^}Rwpk9yI|pMgK2`r9%XWm&>t*Lo?_x0QSl{Jf
zSh=#=obO~W%A)dIrLTkOh3ds(<i}nNE|>W-_FWh_zOYL${d0%Ge$hx;tq<PxGtTb~
zgFWv`KG;#=QlE{SR#l&m)b4+HX`uL2w$anO-FL4)d2oFE%$<NU14l2UDiv#;U2x%L
ziPIRrM=My}1Q=@VmAJ{6;C!sl*gB-=voEjp+56WSx>sLm&P}MKwhUf#(lxZxPrg|_
zvPo8DY0`&FIUg0Ae5{)OUbCl6@8P%=Lu)<<@dLXa!k822UV7SR08bbLD({3w;rp|z
z$G0fYe+->@m3K5_9C&Bav1n6!ey7>>Q#==qzk)d;IR$ptbn?9tFp*)CUQ`6i6JNO{
zstJ@_F9(@(jt$OTUGm7Rt%YUlYcFyYhT`^bE8deia_)(S=d|S)!Cje&_ZzE_3R^_|
z^gC)RUw-}Myyh`|TT|6PDIhlVL%@i@4#7Kk`F*}+<uT_NYy!9p>(%<VUQbi;apbhG
zyR5Z8)Ts-`uCnH!x0m1|Z?3=@EM(AohabEnDU)^5G3P3W!pWKh`itsWH9_=8%jw{Z
zAzTX@>|qHr8B^V?d=YCMjEQ_jcCVIL7vBn)k*2f^WINIzxc`**T&`r4Y-XnWluUfl
zc=cG72u+9j_1wz{y2>LT>#mqxAJVi`$G3`I@DJLh2#3hk(205)Syl=7X(K<R+=yLc
z6It0kxn+3E@YgMERp`P;Vu?3u33EB!s)+2^d>P_$)T?o}(|iNsHV2<CPocR|t6$Uw
zN0xYM9%5#(Z`sz!g1kYS6XEzQd_O!6G8)ly`bqLj8CpyKzBqQX$CoM>+Pa;g=@B#Y
zvGhcpzLR~dbo)1TS7=M7h;SGf52dySybv&WwUS#%f09O*l-+Q}3XidFy`o4i{j&GZ
z&hKQU%fU@D#;G!7M-AWP3n<>Fe<MDa#}A_~nzBke8{cGs`8<suuugar>*R9`BHkZ@
zwv6$&-F%ePnYCH_toP=2#m9A(mR2D+9KRv7wNAe@Ep&#hW6Oc!xbpWyM;0F$$@8^0
zueHa)%edJW;@BanR}Z?uHkC9$!B$5O=qSE3dU6{ghPE=!Vv@^A2t-FpJ$aBg`eAP#
zQ7^Y|W>j~L(7y7Lqx+z*q{-l1l$reKrx}#*n{BbTX#yYD3igYMoj#wJz5=B3%Ga7p
z>g4s-8IJM|VHC3Wx@C3TZEw}9wQ6E3(LeCf07tKneSTs|j)l`d{jCrm&$#-0($4ZQ
zlee_;jRl>X-L#nM7OvKK2QAE-Bn;Fve?fOWtIdkjqis=Fx&qj>Nz>mma!}P|kl520
zp6~k5CWb5E3}RM>n{y0sIB@?8b|8?`KZ`H4B6zel(@9_1W{2)t1W3G@KVFKibV}ez
z#E{I^59!;MSk^+A=cHm>(n8L(Jc{;=<^*!Mj2Jk^xjLrDW6N}wk6aPzN@|dMoRk{!
z7G8fpc$~*8m~>Sw8V|ylDlCZO>fIXtXiN3FJ57x6V5{=B{f*(zz8J1l7O_0#yp|)@
zr_UDec|ox<<>S~>h{G4YWTNf?c3SaT&9a8m!MpM+=A|>Nd-9d<-@rKKq%OaI6%b7X
z$2@lBaX7cN#fW)7Je&Pp^5H_mHw!k0l%!?P`VDaw@vts;HrxOe>E7wPzG@YI8sq0h
zG&l|BWZbNvR1w5{4wTj?k*+Nfe=E`K9{5b_%V3#!9(0UFfi=@qYFtDA@dsXnuU@U1
z9n<B<tm`5miZRnH+b7Ss$K@g&LT4go)d=zK$GjZxt)}Lj)#+vs#J?QmjpDuQmB~tX
zgDG#=NHm(Ed)!1?l~ub)c9LOJd3Ix2A**%LLH##awB=Mt<RQkSEBrOnmHuZ>ZMr&9
z-@`QAbokQhG~=q}@xuHk2_W$|Ig=~%&<Gdrx-5Prjl82FjmGC)y;Zuqy1BYdE|n<;
zmH8b-e5{F?;76m2fKlQ4o~DGoCk=33y(80MLq(~f&(ks{2kAh27(&wYBzE(IPFrSK
zEQO7obTxfdu^BXv%9`LvDJ|EbC&a$g)pX$L3Ty=SMNHAQk6bJ95P3N3FZxA)4AI-v
zNmoCdyQ<m~a`KXmUa{JlQDoQbkwn>fNxOlj!9FRr07Ea)Tw70m7PNl4BVANyG)!3d
zE=YJ^p!+J{zB$#^1Br)nKb91o=YV!j-3j9lxi<7dr(v?cG@C*GRpbj}L^t=9zFV8o
zy%|o|#{|?AznY)I^``dSLO)hyE-gyMEzhz0mkgbHo_4}fBcR`&vFek^vwPdhgAxJ0
z)h8n7`|bByo*akW3d-tuYQuTFSR<{>(W&3JFa7dF=Iu6K(3>UeX{<BvTi2~LT9uLv
zfqf(W&3c=9dfAO^xtY2GX;pP-r<^kGV{Z%Hb;B;~mwpSjTY`UR@S3xsS<RzI(z;HL
z$jU8!;Oz=jJvE(2zjsI^j_0Yl>x3_mceihcexi`!EfuYxB>`dC9l5KeMaG^!QROcJ
zh+i>6_lxD!=)YK9NWvPiN{O9ErvaH!I)&kduRoSA&srpu=0^_|3xd1%=$$)|zZD8Z
z<3fjukq7#eR39>N6e~$B$7n#yT<)(xzFyXN+SkCcPzAqtYCf!|tw>=+S}Ix}x^E)+
z)~ouxnjymUFFXh@e8$du7rpbX8m~G%J|fl<dHBli-n%#Yd+zTY=FTZoq=7$SzNa^!
zds#c;GLs|n^SKAIp}HPnrX2O-+qdhg#ySgS*XW4wxK)0>aoO*6CEV|m?!IL`{9RW>
z5MQ|QliD?JtL}3Tr$(GQ7sCBMF#0${d|>r)IxZ((zLpxUq618t1U#ea{ZrQe9z<J1
LU%gP(=KTKyxMU-W

literal 0
HcmV?d00001

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 7fad9854f..b931dff6b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1802,4 +1802,99 @@ input.new_loggin_input{
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
+.W600{ width:600px;}
+
+/* 个人资料修改弹框 */
+.winbox{
+    background-color: #fff;
+    padding: 20px;
+    width:480px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.winbox_h2{
+    font-size: 14px;
+    font-weight: normal;
+    color: #333;
+    border-bottom: 1px solid #ccc;
+    height: 28px;
+}
+.winbox_edit_new{
+    /*width: 425px;*/
+    margin: 28px 0;
+}
+.winbox_edit_new li{
+    height: 45px;
+    line-height: 30px;
+    font-size: 14px;
+}
+.winbox_edit_new label{
+    width: 80px;
+    text-align: right;
+    display: block;
+}
+.winbox_input{
+    width: 330px;
+    height: 28px;
+    border: 1px solid #ccc;
+    padding: 0 5px;
+    color: #888;
+}
+.winbox_select{
+    height: 28px;
+    border: 1px solid #ccc;
+    color: #888;
+}
+.winbox_textarea{
+    width: 330px;
+    height: 50px;
+    border: 1px solid #ccc;
+    padding: 5px;
+    color: #888;
+}
+.winbox_btn_blue{
+    padding: 5px 25px;
+    color: #fff;
+    text-align: center;
+    background-color: #3b94d6;
+    border: none;
+}
+.winbox_btn_blue:hover{
+    background-color: #2e83c2;
+}
+.icons_warning{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 2px no-repeat;
+}
+.icons_right{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -25px no-repeat;
+}
+.icons_error{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -52px no-repeat;
+}
+a.winbox_btn_close{
+    color: #3b94d6;
+    font-size: 18px;
+    font-weight: bold;
+}
+.winbox_p{
+    font-size: 14px;
+    text-align: center;
+
+
+}
\ No newline at end of file
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index eaefb8d1b..ad6fefad9 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -86,7 +86,7 @@ a.select_btn_select{ background:#64bddb; color:#fff;}
 .users_ctt{ font-size:14px; color:#666;  margin-top:10px;}
 .setting_left{ width:115px; text-align:right; float:left;}
 .setting_left li{ height:28px;line-height:28px;}
-.setting_right{width:500px; text-align:left; float:left; margin-left:8px;}
+.setting_right{width:600px; text-align:left; float:left; margin-left:8px;}
 .setting_right li{ height:28px;line-height:28px;}
 .users_ctt ul li{ margin-bottom:10px;}
 .users_ctt input,.users_ctt select,.users_ctt textarea{ border:1px solid #CCC;}
diff --git a/spec/factories/apply_add_schools.rb b/spec/factories/apply_add_schools.rb
new file mode 100644
index 000000000..a2994d28b
--- /dev/null
+++ b/spec/factories/apply_add_schools.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :apply_add_school, :class => 'ApplyAddSchools' do
+    name "MyString"
+province "MyString"
+city "MyString"
+address "MyString"
+remarks "MyString"
+school_id 1
+status 1
+  end
+
+end
diff --git a/spec/models/apply_add_schools_spec.rb b/spec/models/apply_add_schools_spec.rb
new file mode 100644
index 000000000..de1b7c05a
--- /dev/null
+++ b/spec/models/apply_add_schools_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ApplyAddSchools, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 10f52f110f09ab439cc6894b531cf2da0a320e9c Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 30 Jun 2016 16:12:25 +0800
Subject: [PATCH 633/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E9=85=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb |   23 +-
 db/schema.rb                                 | 4514 +++++++++---------
 public/stylesheets/syllabus.css              |    3 +-
 3 files changed, 2271 insertions(+), 2269 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index dbf7e301a..153e11592 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -26,7 +26,6 @@
                 <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
-              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
                 <span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
                 <span class="mr10"></span>班级：<%=courses.count %>
@@ -66,6 +65,9 @@
                 <% end %>
               </ul>
             </div><!--syllabus_class_box end-->
+
+
+            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
         <% end %>
         <div>
           <ul class="wlist" id="pages" >
@@ -89,23 +91,22 @@
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
             $(".syllabus_box").css("height", tmpHeight);
         }
-        $(".sy_courses_open").toggle(function(){
-            //$(this).hide();
-            $(this).parent().next().hide();
-            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+        $(".syllabus_courses_list").toggle(function(){
+            $(this).next().hide();
+            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
             //$(this).parent().next().show();
         },function(){
-            $(this).parent().next().show();
-            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+            $(this).next().show();
+            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
         });
         $(".sy_courses_close").toggle(function(){
             //$(this).hide();
-            $(this).parent().next().show();
-            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+            $(this).next().show();
+            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
             //$(this).parent().next().show();
         },function(){
-            $(this).parent().next().hide();
-            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+            $(this).next().hide();
+            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
         });
     });
 </script>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index bf9d24b3e..9204e13e9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,2257 +1,2257 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20160629094716) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    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"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "apply_resources", :force => true do |t|
-    t.integer  "status"
-    t.integer  "user_id"
-    t.integer  "attachment_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.text     "content"
-    t.integer  "apply_user_id"
-  end
-
-  create_table "at_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "at_message_id"
-    t.string   "at_message_type"
-    t.boolean  "viewed",          :default => false
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.integer  "sender_id"
-  end
-
-  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
-
-  create_table "attachment_histories", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.string   "filename",                     :default => ""
-    t.string   "disk_filename",                :default => ""
-    t.integer  "filesize",                     :default => 0
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => ""
-    t.integer  "downloads",                    :default => 0
-    t.integer  "author_id"
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "version"
-    t.integer  "attachment_id"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "homepage_id"
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-    t.integer "org_subfield_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "code_tests", :force => true do |t|
-    t.integer  "homework_id"
-    t.integer  "wait_time",       :default => 0
-    t.integer  "language"
-    t.integer  "status"
-    t.integer  "time_used",       :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "student_work_id", :default => 0
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_contributor_scores", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    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",          :default => 0
-    t.integer  "homework_journal_num", :default => 0
-    t.integer  "news_num",             :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    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"
-  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                        :default => 1
-    t.integer  "attachmenttype",                :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",        :limit => 1, :default => 1
-    t.integer  "inherit_members",  :limit => 1, :default => 1
-    t.integer  "open_student",                  :default => 0
-    t.integer  "outline",                       :default => 0
-    t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete",                     :default => 0
-    t.integer  "end_time"
-    t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
-    t.integer  "is_copy",                       :default => 0
-    t.integer  "visits",                        :default => 0
-    t.integer  "syllabus_id"
-    t.string   "invite_code"
-    t.string   "qrcode"
-  end
-
-  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
-  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "editor_of_documents", :force => true do |t|
-    t.integer  "editor_id"
-    t.integer  "org_document_comment_id"
-    t.datetime "created_at"
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "exercise_answers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_choices", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.text     "choice_text"
-    t.integer  "choice_position"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
-    t.integer  "question_type"
-    t.integer  "question_number"
-    t.integer  "exercise_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_score"
-  end
-
-  create_table "exercise_standard_answers", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_id"
-    t.integer  "score"
-    t.datetime "start_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.datetime "end_at"
-    t.integer  "status"
-  end
-
-  create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
-    t.text     "exercise_description"
-    t.integer  "course_id"
-    t.integer  "exercise_status"
-    t.integer  "user_id"
-    t.integer  "time"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-    t.datetime "publish_time"
-    t.datetime "end_time"
-    t.integer  "show_result"
-  end
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
-  end
-
-  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
-  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "forwards", :force => true do |t|
-    t.integer  "from_id"
-    t.string   "from_type"
-    t.integer  "to_id"
-    t.string   "to_type"
-    t.datetime "created_at"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type",     :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "teacher_priority",  :default => 1
-    t.integer  "anonymous_comment", :default => 0
-    t.integer  "quotes",            :default => 0
-    t.integer  "is_open",           :default => 0
-    t.datetime "simi_time"
-  end
-
-  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
-
-  create_table "homework_detail_groups", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "min_num"
-    t.integer  "max_num"
-    t.integer  "base_on_project"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "mail"
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                                 :null => false
-    t.datetime "updated_on",                                 :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-    t.integer  "private",                     :default => 0
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
-  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
-  end
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
-  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-    t.integer  "reply_id"
-    t.integer  "quotes"
-    t.integer  "status",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",           :limit => 60, :default => "", :null => false
-    t.string   "summary",                       :default => ""
-    t.text     "description"
-    t.integer  "author_id",                     :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",                :default => 0,  :null => false
-    t.integer  "course_id"
-    t.integer  "sticky",                        :default => 0
-    t.integer  "org_subfield_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "org_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "org_act_id"
-    t.string   "org_act_type"
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "org_courses", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "course_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_document_comments", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.integer  "organization_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "org_subfield_id"
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_member_roles", :force => true do |t|
-    t.integer "org_member_id"
-    t.integer "role_id"
-  end
-
-  create_table "org_members", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "sender_id"
-    t.integer  "organization_id"
-    t.string   "message_type"
-    t.integer  "message_id"
-    t.integer  "viewed"
-    t.string   "content"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_projects", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_subfield_messages", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_subfields", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 1
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "creator_id"
-    t.integer  "home_id"
-    t.boolean  "is_public"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    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|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-    t.integer  "board_num",         :default => 0
-    t.integer  "attach_num",        :default => 0
-    t.datetime "commit_time"
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",                   :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",               :default => ""
-    t.boolean  "is_public",              :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",                 :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",        :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",            :default => false, :null => false
-    t.integer  "attachmenttype",         :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",               :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "commits_count",          :default => 0
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "issues_count",           :default => 0
-    t.integer  "attachments_count",      :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
-    t.integer  "visits",                 :default => 0
-    t.integer  "hot",                    :default => 0
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "quality_analyses", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "author_login"
-    t.string   "rep_identifier"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sonar_version",  :default => 0
-    t.string   "path"
-    t.string   "branch"
-    t.string   "language"
-  end
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "rep_statics", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "commits_num"
-    t.string   "uname"
-    t.string   "email"
-    t.integer  "add"
-    t.integer  "del"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "changeset"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-    t.string   "pinyin"
-  end
-
-  create_table "secdomains", :force => true do |t|
-    t.integer  "sub_type"
-    t.string   "subname"
-    t.integer  "pid",        :default => 0
-    t.string   "desc"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.integer  "shield_id"
-    t.string   "shield_type"
-    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"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    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"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.integer  "is_leader"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
-  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
-  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
-  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    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"
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  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"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "syllabuses", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.string   "eng_name"
-    t.integer  "type"
-    t.integer  "credit"
-    t.integer  "hours"
-    t.integer  "theory_hours"
-    t.integer  "practice_hours"
-    t.string   "applicable_major"
-    t.string   "pre_course"
-    t.integer  "visits",           :default => 0
-    t.integer  "des_status",       :default => 0
-  end
-
-  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_actions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "action_type"
-    t.integer  "action_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
-  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-    t.integer  "gid"
-    t.integer  "visits",                          :default => 0
-    t.integer  "excellent_teacher",               :default => 0
-    t.integer  "excellent_student",               :default => 0
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20160629094716) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    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"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
+  create_table "at_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "at_message_id"
+    t.string   "at_message_type"
+    t.boolean  "viewed",          :default => false
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.integer  "sender_id"
+  end
+
+  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
+
+  create_table "attachment_histories", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.string   "filename",                     :default => ""
+    t.string   "disk_filename",                :default => ""
+    t.integer  "filesize",                     :default => 0
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => ""
+    t.integer  "downloads",                    :default => 0
+    t.integer  "author_id"
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "version"
+    t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type", :limit => 30
+    t.string   "filename",                     :default => "", :null => false
+    t.string   "disk_filename",                :default => "", :null => false
+    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                    :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
+  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
+  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
+
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
+  create_table "auth_sources", :force => true do |t|
+    t.string  "type",              :limit => 30, :default => "",    :null => false
+    t.string  "name",              :limit => 60, :default => "",    :null => false
+    t.string  "host",              :limit => 60
+    t.integer "port"
+    t.string  "account"
+    t.string  "account_password",                :default => ""
+    t.string  "base_dn"
+    t.string  "attr_login",        :limit => 30
+    t.string  "attr_firstname",    :limit => 30
+    t.string  "attr_lastname",     :limit => 30
+    t.string  "attr_mail",         :limit => 30
+    t.boolean "onthefly_register",               :default => false, :null => false
+    t.boolean "tls",                             :default => false, :null => false
+    t.string  "filter"
+    t.integer "timeout"
+  end
+
+  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
+
+  create_table "biding_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "bids", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",                                    :null => false
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.text     "description"
+    t.datetime "created_on",                                :null => false
+    t.datetime "updated_on",                                :null => false
+    t.integer  "commit"
+    t.integer  "reward_type"
+    t.integer  "homework_type"
+    t.integer  "parent_id"
+    t.string   "password"
+    t.integer  "is_evaluation"
+    t.integer  "proportion",                :default => 60
+    t.integer  "comment_status",            :default => 0
+    t.integer  "evaluation_num",            :default => 3
+    t.integer  "open_anonymous_evaluation", :default => 1
+  end
+
+  create_table "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "homepage_id"
+  end
+
+  create_table "boards", :force => true do |t|
+    t.integer "project_id",                      :null => false
+    t.string  "name",            :default => "", :null => false
+    t.string  "description"
+    t.integer "position",        :default => 1
+    t.integer "topics_count",    :default => 0,  :null => false
+    t.integer "messages_count",  :default => 0,  :null => false
+    t.integer "last_message_id"
+    t.integer "parent_id"
+    t.integer "course_id"
+    t.integer "org_subfield_id"
+  end
+
+  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
+  add_index "boards", ["project_id"], :name => "boards_project_id"
+
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "changes", :force => true do |t|
+    t.integer "changeset_id",                               :null => false
+    t.string  "action",        :limit => 1, :default => "", :null => false
+    t.text    "path",                                       :null => false
+    t.text    "from_path"
+    t.string  "from_revision"
+    t.string  "revision"
+    t.string  "branch"
+  end
+
+  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
+
+  create_table "changeset_parents", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "parent_id",    :null => false
+  end
+
+  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
+  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
+
+  create_table "changesets", :force => true do |t|
+    t.integer  "repository_id", :null => false
+    t.string   "revision",      :null => false
+    t.string   "committer"
+    t.datetime "committed_on",  :null => false
+    t.text     "comments"
+    t.date     "commit_date"
+    t.string   "scmid"
+    t.integer  "user_id"
+  end
+
+  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
+  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
+  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
+  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
+  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
+
+  create_table "changesets_issues", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "issue_id",     :null => false
+  end
+
+  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
+
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
+  create_table "code_tests", :force => true do |t|
+    t.integer  "homework_id"
+    t.integer  "wait_time",       :default => 0
+    t.integer  "language"
+    t.integer  "status"
+    t.integer  "time_used",       :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "student_work_id", :default => 0
+  end
+
+  create_table "comments", :force => true do |t|
+    t.string   "commented_type", :limit => 30, :default => "", :null => false
+    t.integer  "commented_id",                 :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.text     "comments"
+    t.datetime "created_on",                                   :null => false
+    t.datetime "updated_on",                                   :null => false
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "contests", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
+
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
+  create_table "course_contributor_scores", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    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",          :default => 0
+    t.integer  "homework_journal_num", :default => 0
+    t.integer  "news_num",             :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    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"
+  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
+
+  create_table "course_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "course_id"
+    t.float    "grade",            :default => 0.0
+    t.integer  "course_ac_para",   :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "courses", :force => true do |t|
+    t.integer  "tea_id"
+    t.string   "name"
+    t.integer  "state"
+    t.string   "code"
+    t.integer  "time"
+    t.string   "extra"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.string   "location"
+    t.string   "term"
+    t.string   "string"
+    t.string   "password"
+    t.string   "setup_time"
+    t.string   "endup_time"
+    t.string   "class_period"
+    t.integer  "school_id"
+    t.text     "description"
+    t.integer  "status",                        :default => 1
+    t.integer  "attachmenttype",                :default => 2
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "is_public",        :limit => 1, :default => 1
+    t.integer  "inherit_members",  :limit => 1, :default => 1
+    t.integer  "open_student",                  :default => 0
+    t.integer  "outline",                       :default => 0
+    t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete",                     :default => 0
+    t.integer  "end_time"
+    t.string   "end_term"
+    t.integer  "is_excellent",                  :default => 0
+    t.integer  "excellent_option",              :default => 0
+    t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
+    t.string   "invite_code"
+    t.string   "qrcode"
+  end
+
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
+  add_index "documents", ["project_id"], :name => "documents_project_id"
+
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
+    t.string   "File"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "editor_of_documents", :force => true do |t|
+    t.integer  "editor_id"
+    t.integer  "org_document_comment_id"
+    t.datetime "created_at"
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "exercise_answers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_choices", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_questions", :force => true do |t|
+    t.text     "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "exercise_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_score"
+  end
+
+  create_table "exercise_standard_answers", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_id"
+    t.integer  "score"
+    t.datetime "start_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.datetime "end_at"
+    t.integer  "status"
+  end
+
+  create_table "exercises", :force => true do |t|
+    t.text     "exercise_name"
+    t.text     "exercise_description"
+    t.integer  "course_id"
+    t.integer  "exercise_status"
+    t.integer  "user_id"
+    t.integer  "time"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.integer  "show_result"
+  end
+
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.text     "description"
+    t.string   "page_type"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
+  end
+
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
+  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
+
+  create_table "forums", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.text     "description"
+    t.integer  "topic_count",  :default => 0
+    t.integer  "memo_count",   :default => 0
+    t.integer  "last_memo_id", :default => 0
+    t.integer  "creator_id",                  :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "sticky"
+    t.integer  "locked"
+  end
+
+  create_table "forwards", :force => true do |t|
+    t.integer  "from_id"
+    t.string   "from_type"
+    t.integer  "to_id"
+    t.string   "to_type"
+    t.datetime "created_at"
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id", :null => false
+    t.integer "user_id",  :null => false
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
+
+  create_table "homework_attaches", :force => true do |t|
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.string   "reward"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "state"
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
+  end
+
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
+  create_table "homework_commons", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.text     "description"
+    t.date     "publish_time"
+    t.date     "end_time"
+    t.integer  "homework_type",     :default => 1
+    t.string   "late_penalty"
+    t.integer  "course_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
+    t.integer  "quotes",            :default => 0
+    t.integer  "is_open",           :default => 0
+    t.datetime "simi_time"
+  end
+
+  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
+
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "mail"
+  end
+
+  create_table "issue_categories", :force => true do |t|
+    t.integer "project_id",                   :default => 0,  :null => false
+    t.string  "name",           :limit => 30, :default => "", :null => false
+    t.integer "assigned_to_id"
+  end
+
+  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
+  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
+
+  create_table "issue_relations", :force => true do |t|
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
+    t.integer "delay"
+  end
+
+  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
+  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
+  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
+
+  create_table "issue_statuses", :force => true do |t|
+    t.string  "name",               :limit => 30, :default => "",    :null => false
+    t.boolean "is_closed",                        :default => false, :null => false
+    t.boolean "is_default",                       :default => false, :null => false
+    t.integer "position",                         :default => 1
+    t.integer "default_done_ratio"
+  end
+
+  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
+  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
+  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
+
+  create_table "issues", :force => true do |t|
+    t.integer  "tracker_id",                              :null => false
+    t.integer  "project_id",                              :null => false
+    t.string   "subject",              :default => "",    :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.integer  "category_id"
+    t.integer  "status_id",                               :null => false
+    t.integer  "assigned_to_id"
+    t.integer  "priority_id",                             :null => false
+    t.integer  "fixed_version_id"
+    t.integer  "author_id",                               :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.date     "start_date"
+    t.integer  "done_ratio",           :default => 0,     :null => false
+    t.float    "estimated_hours"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "is_private",           :default => false, :null => false
+    t.datetime "closed_on"
+    t.integer  "project_issues_index"
+  end
+
+  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
+  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
+  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
+  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
+  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
+  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
+  add_index "issues", ["project_id"], :name => "issues_project_id"
+  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
+  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
+  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
+
+  create_table "join_in_competitions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "competition_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "join_in_contests", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "bid_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "journal_details", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+
+  create_table "journal_replies", :id => false, :force => true do |t|
+    t.integer "journal_id"
+    t.integer "user_id"
+    t.integer "reply_id"
+  end
+
+  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
+  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
+  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
+
+  create_table "journals", :force => true do |t|
+    t.integer  "journalized_id",                 :default => 0,     :null => false
+    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
+    t.integer  "user_id",                        :default => 0,     :null => false
+    t.text     "notes"
+    t.datetime "created_on",                                        :null => false
+    t.boolean  "private_notes",                  :default => false, :null => false
+  end
+
+  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
+  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
+  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
+  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
+
+  create_table "journals_for_messages", :force => true do |t|
+    t.integer  "jour_id"
+    t.string   "jour_type"
+    t.integer  "user_id"
+    t.text     "notes"
+    t.integer  "status"
+    t.integer  "reply_id"
+    t.datetime "created_on",                                 :null => false
+    t.datetime "updated_on",                                 :null => false
+    t.string   "m_parent_id"
+    t.boolean  "is_readed"
+    t.integer  "m_reply_count"
+    t.integer  "m_reply_id"
+    t.integer  "is_comprehensive_evaluation"
+    t.integer  "private",                     :default => 0
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
+  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
+  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
+
+  create_table "messages", :force => true do |t|
+    t.integer  "board_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",       :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "last_reply_id"
+    t.datetime "created_on",                       :null => false
+    t.datetime "updated_on",                       :null => false
+    t.boolean  "locked",        :default => false
+    t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
+    t.integer  "quotes"
+    t.integer  "status",        :default => 0
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",           :limit => 60, :default => "", :null => false
+    t.string   "summary",                       :default => ""
+    t.text     "description"
+    t.integer  "author_id",                     :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",                :default => 0,  :null => false
+    t.integer  "course_id"
+    t.integer  "sticky",                        :default => 0
+    t.integer  "org_subfield_id"
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :null => false
+  end
+
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
+  create_table "org_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "org_act_id"
+    t.string   "org_act_type"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "org_courses", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "course_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_document_comments", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.integer  "organization_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_member_roles", :force => true do |t|
+    t.integer "org_member_id"
+    t.integer "role_id"
+  end
+
+  create_table "org_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "organization_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "sender_id"
+    t.integer  "organization_id"
+    t.string   "message_type"
+    t.integer  "message_id"
+    t.integer  "viewed"
+    t.string   "content"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.boolean  "is_public"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    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|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "poll_answers", :force => true do |t|
+    t.integer  "poll_question_id"
+    t.text     "answer_text"
+    t.integer  "answer_position"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "poll_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "is_necessary"
+    t.integer  "poll_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
+  end
+
+  create_table "poll_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "poll_votes", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
+    t.text     "vote_text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "polls", :force => true do |t|
+    t.string   "polls_name"
+    t.string   "polls_type"
+    t.integer  "polls_group_id"
+    t.integer  "polls_status"
+    t.integer  "user_id"
+    t.datetime "published_at"
+    t.datetime "closed_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
+  end
+
+  create_table "praise_tread_caches", :force => true do |t|
+    t.integer  "object_id",   :null => false
+    t.string   "object_type"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "praise_treads", :force => true do |t|
+    t.integer  "user_id",                  :null => false
+    t.integer  "praise_tread_object_id"
+    t.string   "praise_tread_object_type"
+    t.integer  "praise_or_tread"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "project_infos", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "project_scores", :force => true do |t|
+    t.string   "project_id"
+    t.integer  "score"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "issue_num",         :default => 0
+    t.integer  "issue_journal_num", :default => 0
+    t.integer  "news_num",          :default => 0
+    t.integer  "documents_num",     :default => 0
+    t.integer  "changeset_num",     :default => 0
+    t.integer  "board_message_num", :default => 0
+    t.integer  "board_num",         :default => 0
+    t.integer  "attach_num",        :default => 0
+    t.datetime "commit_time"
+  end
+
+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+    t.integer "project_type"
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
+  end
+
+  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string   "name",                   :default => "",    :null => false
+    t.text     "description"
+    t.string   "homepage",               :default => ""
+    t.boolean  "is_public",              :default => true,  :null => false
+    t.integer  "parent_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "identifier"
+    t.integer  "status",                 :default => 1,     :null => false
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "inherit_members",        :default => false, :null => false
+    t.integer  "project_type"
+    t.boolean  "hidden_repo",            :default => false, :null => false
+    t.integer  "attachmenttype",         :default => 1
+    t.integer  "user_id"
+    t.integer  "dts_test",               :default => 0
+    t.string   "enterprise_name"
+    t.integer  "organization_id"
+    t.integer  "project_new_type"
+    t.integer  "gpid"
+    t.integer  "forked_from_project_id"
+    t.integer  "forked_count"
+    t.integer  "commits_count",          :default => 0
+    t.integer  "publish_resource",       :default => 0
+    t.integer  "issues_count",           :default => 0
+    t.integer  "attachments_count",      :default => 0
+    t.integer  "boards_count",           :default => 0
+    t.integer  "news_count",             :default => 0
+    t.integer  "acts_count",             :default => 0
+    t.integer  "journals_count",         :default => 0
+    t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
+    t.integer  "hot",                    :default => 0
+  end
+
+  add_index "projects", ["lft"], :name => "index_projects_on_lft"
+  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
+
+  create_table "projects_trackers", :id => false, :force => true do |t|
+    t.integer "project_id", :default => 0, :null => false
+    t.integer "tracker_id", :default => 0, :null => false
+  end
+
+  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
+  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
+
+  create_table "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+  end
+
+  create_table "queries", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",          :default => "",    :null => false
+    t.text    "filters"
+    t.integer "user_id",       :default => 0,     :null => false
+    t.boolean "is_public",     :default => false, :null => false
+    t.text    "column_names"
+    t.text    "sort_criteria"
+    t.string  "group_by"
+    t.string  "type"
+  end
+
+  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
+  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
+
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "parent_id"
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",                          :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
+    t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
+  end
+
+  create_table "rep_statics", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "commits_num"
+    t.string   "uname"
+    t.string   "email"
+    t.integer  "add"
+    t.integer  "del"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "changeset"
+  end
+
+  create_table "repositories", :force => true do |t|
+    t.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
+    t.string  "type"
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
+    t.text    "extra_info"
+    t.string  "identifier"
+    t.boolean "is_default",                  :default => false
+    t.boolean "hidden",                      :default => false
+  end
+
+  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
+
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
+    t.text    "permissions"
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+  end
+
+  create_table "schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "logo_link"
+    t.string   "pinyin"
+  end
+
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",         :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                                        :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "is_teacher_score",              :default => 0
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string   "name",       :default => "", :null => false
+    t.text     "value"
+    t.datetime "updated_on"
+  end
+
+  add_index "settings", ["name"], :name => "index_settings_on_name"
+
+  create_table "shares", :force => true do |t|
+    t.date     "created_on"
+    t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "description"
+  end
+
+  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "shield_id"
+    t.string   "shield_type"
+    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"
+    t.integer  "app_type_id"
+    t.string   "app_type_name"
+    t.string   "android_min_version_available"
+    t.integer  "user_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "contest_id"
+    t.integer  "softapplication_id"
+    t.integer  "is_public"
+    t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    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"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
+  end
+
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    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"
+
+  create_table "student_works_evaluation_distributions", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "student_works_scores", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.integer  "score"
+    t.text     "comment"
+    t.integer  "reviewer_role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  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"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.string   "eng_name"
+    t.integer  "type"
+    t.integer  "credit"
+    t.integer  "hours"
+    t.integer  "theory_hours"
+    t.integer  "practice_hours"
+    t.string   "applicable_major"
+    t.string   "pre_course"
+    t.integer  "visits",           :default => 0
+    t.integer  "des_status",       :default => 0
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.text     "description"
+    t.string   "subject"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       :limit => 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "teachers", :force => true do |t|
+    t.string   "tea_name"
+    t.string   "location"
+    t.integer  "couurse_time"
+    t.integer  "course_code"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.string   "extra"
+  end
+
+  create_table "time_entries", :force => true do |t|
+    t.integer  "project_id",  :null => false
+    t.integer  "user_id",     :null => false
+    t.integer  "issue_id"
+    t.float    "hours",       :null => false
+    t.string   "comments"
+    t.integer  "activity_id", :null => false
+    t.date     "spent_on",    :null => false
+    t.integer  "tyear",       :null => false
+    t.integer  "tmonth",      :null => false
+    t.integer  "tweek",       :null => false
+    t.datetime "created_on",  :null => false
+    t.datetime "updated_on",  :null => false
+  end
+
+  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
+  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
+  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
+  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
+  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
+
+  create_table "tokens", :force => true do |t|
+    t.integer  "user_id",                  :default => 0,  :null => false
+    t.string   "action",     :limit => 30, :default => "", :null => false
+    t.string   "value",      :limit => 40, :default => "", :null => false
+    t.datetime "created_on",                               :null => false
+  end
+
+  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
+  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
+
+  create_table "trackers", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.boolean "is_in_chlog",                 :default => false, :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_in_roadmap",               :default => true,  :null => false
+    t.integer "fields_bits",                 :default => 0
+  end
+
+  create_table "user_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "action_type"
+    t.integer  "action_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
+  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
+
+  create_table "user_grades", :force => true do |t|
+    t.integer  "user_id",                     :null => false
+    t.integer  "project_id",                  :null => false
+    t.float    "grade",      :default => 0.0
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
+  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
+  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
+  create_table "user_preferences", :force => true do |t|
+    t.integer "user_id",   :default => 0,     :null => false
+    t.text    "others"
+    t.boolean "hide_mail", :default => false
+    t.string  "time_zone"
+  end
+
+  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
+
+  create_table "user_score_details", :force => true do |t|
+    t.integer  "current_user_id"
+    t.integer  "target_user_id"
+    t.string   "score_type"
+    t.string   "score_action"
+    t.integer  "user_id"
+    t.integer  "old_score"
+    t.integer  "new_score"
+    t.integer  "current_user_level"
+    t.integer  "target_user_level"
+    t.integer  "score_changeable_obj_id"
+    t.string   "score_changeable_obj_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_scores", :force => true do |t|
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.float    "grade",            :default => 0.0
+  end
+
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
+  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+
+  create_table "user_wechats", :force => true do |t|
+    t.integer  "subscribe"
+    t.string   "openid"
+    t.string   "nickname"
+    t.integer  "sex"
+    t.string   "language"
+    t.string   "city"
+    t.string   "province"
+    t.string   "country"
+    t.string   "headimgurl"
+    t.string   "subscribe_time"
+    t.string   "unionid"
+    t.string   "remark"
+    t.integer  "groupid"
+    t.integer  "user_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "login",                           :default => "",    :null => false
+    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
+    t.string   "firstname",         :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                        :default => "",    :null => false
+    t.string   "mail",              :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                           :default => false, :null => false
+    t.integer  "status",                          :default => 1,     :null => false
+    t.datetime "last_login_on"
+    t.string   "language",          :limit => 5,  :default => ""
+    t.integer  "auth_source_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "type"
+    t.string   "identity_url"
+    t.string   "mail_notification",               :default => "",    :null => false
+    t.string   "salt",              :limit => 64
+    t.integer  "gid"
+    t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
+    t.integer  "excellent_student",               :default => 0
+  end
+
+  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "wechat_logs", :force => true do |t|
+    t.string   "openid",       :null => false
+    t.text     "request_raw"
+    t.text     "response_raw"
+    t.text     "session_raw"
+    t.datetime "created_at",   :null => false
+  end
+
+  create_table "wiki_content_versions", :force => true do |t|
+    t.integer  "wiki_content_id",                                       :null => false
+    t.integer  "page_id",                                               :null => false
+    t.integer  "author_id"
+    t.binary   "data",            :limit => 2147483647
+    t.string   "compression",     :limit => 6,          :default => ""
+    t.string   "comments",                              :default => ""
+    t.datetime "updated_on",                                            :null => false
+    t.integer  "version",                                               :null => false
+  end
+
+  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
+  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
+
+  create_table "wiki_contents", :force => true do |t|
+    t.integer  "page_id",                                          :null => false
+    t.integer  "author_id"
+    t.text     "text",       :limit => 2147483647
+    t.string   "comments",                         :default => ""
+    t.datetime "updated_on",                                       :null => false
+    t.integer  "version",                                          :null => false
+  end
+
+  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
+  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
+
+  create_table "wiki_pages", :force => true do |t|
+    t.integer  "wiki_id",                       :null => false
+    t.string   "title",                         :null => false
+    t.datetime "created_on",                    :null => false
+    t.boolean  "protected",  :default => false, :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
+  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
+  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
+
+  create_table "wiki_redirects", :force => true do |t|
+    t.integer  "wiki_id",      :null => false
+    t.string   "title"
+    t.string   "redirects_to"
+    t.datetime "created_on",   :null => false
+  end
+
+  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
+  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
+
+  create_table "wikis", :force => true do |t|
+    t.integer "project_id",                :null => false
+    t.string  "start_page",                :null => false
+    t.integer "status",     :default => 1, :null => false
+  end
+
+  add_index "wikis", ["project_id"], :name => "wikis_project_id"
+
+  create_table "workflows", :force => true do |t|
+    t.integer "tracker_id",                  :default => 0,     :null => false
+    t.integer "old_status_id",               :default => 0,     :null => false
+    t.integer "new_status_id",               :default => 0,     :null => false
+    t.integer "role_id",                     :default => 0,     :null => false
+    t.boolean "assignee",                    :default => false, :null => false
+    t.boolean "author",                      :default => false, :null => false
+    t.string  "type",          :limit => 30
+    t.string  "field_name",    :limit => 30
+    t.string  "rule",          :limit => 30
+  end
+
+  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
+  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
+  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
+  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
+
+  create_table "works_categories", :force => true do |t|
+    t.string   "category"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "zip_packs", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "homework_id"
+    t.string   "file_digest"
+    t.string   "file_path"
+    t.integer  "pack_times",   :default => 1
+    t.integer  "pack_size",    :default => 0
+    t.text     "file_digests"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+end
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 83f6cefbc..88c8cebbf 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -101,7 +101,8 @@ a.syllabusbox_a_blue{
 .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
 .icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
 .icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block;  }
-.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; }
+.syllabus_courses_box {position:relative;}
+.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
 .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
 .icons_sy_cir{background: url(../images/syllabus/icons_syllabus.png) 0px -82px no-repeat; width:15px; height:15px; display:block; position:absolute; left:-8px; top:25px;}
 .icons_sy_arrow{background: url(../images/syllabus/icons_syllabus.png) -31px -81px no-repeat; width:20px; height:20px; display:block; }

From 5cc40408eea01dd53701b67ea9f80b2a4c48c811 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 30 Jun 2016 16:30:02 +0800
Subject: [PATCH 634/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E5=8D=95=E5=80=8D?=
 =?UTF-8?q?=E8=A1=8C=E8=B7=9D=E6=98=BE=E7=A4=BA=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/my/zh.yml        | 2 +-
 config/locales/zh.yml           | 2 +-
 public/stylesheets/courses.css  | 3 ++-
 public/stylesheets/new_user.css | 1 +
 public/stylesheets/project.css  | 1 +
 public/stylesheets/public.css   | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 25a949df4..39c7c3167 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -28,7 +28,7 @@ zh:
   label_account_identity_choose: --请选择身份--
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
   label_account_identity_studentID: 请输入学号
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3dbd2e8ef..c80a39891 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1665,7 +1665,7 @@ zh:
   #add by men
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
 
   label_teaching_course: 我执教的课程
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d0a5e7ab3..a94e61d1d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,6 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -1426,4 +1427,4 @@ a.pages-big{ width:50px;}
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
+.W600{ width:600px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b931dff6b..a65edc490 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,6 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index bde560613..354c0f1ac 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -969,6 +969,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     color: #484848;
     overflow: hidden;
 }
+.homepagePostIntro p{line-height: 1;}
 .homepagePostReply {
     width: 710px;
     margin: 10px auto 0px;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 500923519..bf7d288a7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -632,6 +632,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}

From 24f1375a4e2bc0d1a08d7a360a8048861654dbbf Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 30 Jun 2016 17:36:33 +0800
Subject: [PATCH 635/668] modified job

---
 app/views/quality_analysis/_edit.html.erb | 23 +++++++++++++++++++++++
 app/views/quality_analysis/edit.js.erb    |  0
 2 files changed, 23 insertions(+)
 create mode 100644 app/views/quality_analysis/_edit.html.erb
 create mode 100644 app/views/quality_analysis/edit.js.erb

diff --git a/app/views/quality_analysis/_edit.html.erb b/app/views/quality_analysis/_edit.html.erb
new file mode 100644
index 000000000..d5cd49d0c
--- /dev/null
+++ b/app/views/quality_analysis/_edit.html.erb
@@ -0,0 +1,23 @@
+<div class="f16 fb fontBlue mb10">代码质量分析</div>
+<div>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
+      <div class="ui form">
+        <div class="mb10" style="margin-right:13px;">
+          <textarea  id="path_description" name="path" rows="8" style="height: 87px; resize:vertical;" class="analysis-option-box"><%= @quality_analysis.path %></textarea>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+        <div class="cl"></div>
+      </div>
+  <% end %>
+</div>
diff --git a/app/views/quality_analysis/edit.js.erb b/app/views/quality_analysis/edit.js.erb
new file mode 100644
index 000000000..e69de29bb

From a8bd91754d348ac6e5c2770fe3574d85e03482a5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 09:27:46 +0800
Subject: [PATCH 636/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=9A=E5=AE=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=87=8C=E9=9D=A2=E5=86=85=E5=AE=B9=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E5=A4=9A=E7=A9=BA=E6=A0=BC=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 7d8aaed86..b1cd86484 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -91,9 +91,10 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @article.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
-        <%= @article.content.html_safe%>
-      </div>
+      <!--<div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @article.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >-->
+        <!--<%#= @article.content.html_safe%>-->
+      <!--</div>-->
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>@article.id, :content=>@article.content} %>
       <div class="cl"></div>
       <div class=" fl" style="width: 600px">
         <%#= link_to_attachments_course @topic, :author => false %>
@@ -192,12 +193,12 @@
 </div>
 <script type="text/javascript">
   $(function(){
-      var postContent = $("#message_description_<%= @article.id %>").html();
-      postContent = postContent.replace(/&nbsp;/g," ");
-      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-      $("#message_description_<%= @article.id %>").html(postContent);
-      autoUrl('message_description_<%= @article.id %>');
+//      var postContent = $("#message_description_<%#= @article.id %>").html();
+//      postContent = postContent.replace(/&nbsp;/g," ");
+//      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+//      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+//      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+//      $("#message_description_<%#= @article.id %>").html(postContent);
+//      autoUrl('message_description_<%#= @article.id %>');
   });
 </script>

From db1ad932c61409bdc2327bbb4a60c86cec457784 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 09:31:05 +0800
Subject: [PATCH 637/668] Function : update jenkins job

---
 .../quality_analysis_controller.rb            |  62 ++-
 app/views/quality_analysis/_edit.html.erb     |   8 +-
 .../quality_analysis/_result_list.html.erb    |  19 +-
 app/views/quality_analysis/edit.js.erb        |   8 +
 config/routes.rb                              |   3 +-
 db/schema.rb                                  | 402 +-----------------
 6 files changed, 86 insertions(+), 416 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 15fdcef61..1f5695605 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -1,7 +1,8 @@
 class QualityAnalysisController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :find_quality_analysis, :only => [:edit, :update_jenkins_job]
   before_filter :authorize
-  before_filter :connect_jenkins, :only => [:create]
+  before_filter :connect_jenkins, :only => [:create, :edit, :update_jenkins_job]
   layout "base_projects"
   include ApplicationHelper
   require 'jenkins_api_client'
@@ -54,7 +55,7 @@ class QualityAnalysisController < ApplicationController
         # return '201' if build successed
         code = @client.job.build("#{job_name}")
         logger.error("build result ==> #{code}")
-        d = @client.delete("#{job_name}") if jenkins_job == '200' && code != '201'
+        d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
         logger.error("delete result ==> #{code}")
         if qa.blank? && code == '201'
           QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
@@ -86,11 +87,54 @@ class QualityAnalysisController < ApplicationController
   end
 
   def edit
-    @quality_analysis = QualityAnalysis.where(:id => params[:id])
+    @g = Gitlab.client
+    gitlab_branches = @g.branches(@project.gpid)
+    @branch_names = gitlab_branches.map{|b| b.name}
+    @gitlab_default_branch = @g.project(@project.gpid).default_branch
   end
 
-  def update
-    @quality_analysis = QualityAnalysis.where(:id => params[:id])
+  def update_jenkins_job
+    begin
+      rep_id = Repository.where(:project_id => @project.id).first.try(:id)
+      logger.error("#############################===>666")
+      sonar_name = @quality_analysis.sonar_name
+      job_name = "#{@quality_analysis.author_login}-#{rep_id}"
+      version = @quality_analysis.sonar_version
+      path = params[:path].blank? ? "./" : params[:path]
+      language = swith_language_type(params[:language])
+      branch = params[:branch]
+      identifier = @quality_analysis.rep_identifier
+      properties = "sonar.projectKey=#{sonar_name}
+        sonar.projectName=#{sonar_name}
+        sonar.projectVersion=#{version}
+        sonar.sources=#{path}
+        sonar.language=#{language.downcase}
+        sonar.sourceEncoding=utf-8"
+      git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+
+      # modify config.yml
+      @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+      @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+      @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+      @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+
+      # return '200' if successed
+      jenkins_job = @client.job.update("#{job_name}", @doc.to_xml)
+      logger.error("Failed to update job: ==> #{jenkins_job}") unless jenkins_job == '200'
+      if jenkins_job == '200'
+        logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
+        @quality_analysis.path = path
+        @quality_analysis.language = language
+        @quality_analysis.branch = branch
+        @quality_analysis.save
+      end
+    rescue Exception => e
+      logger.error("Update jenkins job: #{e}")
+    end
+    respond_to do |format|
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id)}
+      format.js
+    end
   end
 
   # resource_id: login + @repository.id
@@ -123,6 +167,14 @@ class QualityAnalysisController < ApplicationController
     render_404
   end
 
+  def find_quality_analysis
+    begin
+      @quality_analysis = QualityAnalysis.find(params[:id])
+    rescue
+      render_404
+    end
+  end
+
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action], global = false)
     unless @project.archived? && @project.gpid.nil?
diff --git a/app/views/quality_analysis/_edit.html.erb b/app/views/quality_analysis/_edit.html.erb
index d5cd49d0c..f508ee5de 100644
--- a/app/views/quality_analysis/_edit.html.erb
+++ b/app/views/quality_analysis/_edit.html.erb
@@ -1,21 +1,21 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'update_jenkins_job', :project_id => @project.id), :id => 'quality_analyses_edit_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" style="height: 87px; resize:vertical;" class="analysis-option-box"><%= @quality_analysis.path %></textarea>
         </div>
         <div class="mb10">
           <div>
-            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @quality_analysis.branch), :value => 77, :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
         <div class="mb10">
           <div>
-            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"], "#{@quality_analysis.language}"), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
-        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_edit_form').submit();hideModal()">提交</a></div>
         <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index b4a40de0d..c47d51f1f 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -3,22 +3,21 @@
 </div>
 <ul class="analysis-result-list">
   <li class="analysis-result-name fl fontBlue2" >名称</li>
-  <li class="analysis-result-version fl fontBlue2" >版本</li>
-  <li class="analysis-result-loc fl fontBlue2" >分支</li>
-  <li class="analysis-result-debt fl fontBlue2" >语言</li>
-  <li class="analysis-result-time fl fontBlue2" >路径</li>
-  <li class="analysis-result-time fl fontBlue2" >bianji</li>
+  <li class="analysis-result-version fl fontBlue2" >分支</li>
+  <li class="analysis-result-loc fl fontBlue2" >语言</li>
+  <li class="analysis-result-debt fl fontBlue2" >路径</li>
+  <li class="analysis-result-time fl fontBlue2" >编辑</li>
+  <!--<li class="analysis-result-time fl fontBlue2" >bianji</li>-->
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
           <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2" %></li>
-          <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
-          <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
-          <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="时间"><%= qa.path %></li>
-          <li class="analysis-result-time fl fontBlue2" title="时间"><%=link_to "bianji", edit_project__quality_analysis_path(@quality_analysis) %></li>
+          <li class="analysis-result-version fl fontBlue2" title="分支名"><%= qa.branch %></li>
+          <li class="analysis-result-loc fl fontBlue2" title="语言"><%= qa.language %></li>
+          <li class="analysis-result-debt fl fontBlue2" title="时间"><%= qa.path %></li>
+          <li class="analysis-result-time fl fontBlue2" title="编辑"><%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true %></li>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/app/views/quality_analysis/edit.js.erb b/app/views/quality_analysis/edit.js.erb
index e69de29bb..4277ae28e 100644
--- a/app/views/quality_analysis/edit.js.erb
+++ b/app/views/quality_analysis/edit.js.erb
@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'quality_analysis/edit', :locals => {}) %>');
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 5404e4ecf..075aff6e1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -790,7 +790,8 @@ RedmineApp::Application.routes.draw do
       collection do
       end
       member do
-
+        match 'update_jenkins_job'
+        match 'edit'
       end
     end
     # resources :files, :only => [:index, :new, :create] do
diff --git a/db/schema.rb b/db/schema.rb
index 16f39f6a1..3258f89c1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
-  create_table "application_settings", :force => true do |t|
-    t.integer  "default_projects_limit"
-    t.boolean  "signup_enabled"
-    t.boolean  "signin_enabled"
-    t.boolean  "gravatar_enabled"
-    t.text     "sign_in_text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "home_page_url"
-    t.integer  "default_branch_protection",    :default => 2
-    t.boolean  "twitter_sharing_enabled",      :default => true
-    t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",        :default => true
-    t.integer  "max_attachment_size",          :default => 10,    :null => false
-    t.integer  "default_project_visibility"
-    t.integer  "default_snippet_visibility"
-    t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",      :default => true
-    t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",         :default => 10080, :null => false
-  end
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -178,20 +156,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.string  "typeName", :limit => 50
   end
 
-  create_table "audit_events", :force => true do |t|
-    t.integer  "author_id",   :null => false
-    t.string   "type",        :null => false
-    t.integer  "entity_id",   :null => false
-    t.string   "entity_type", :null => false
-    t.text     "details"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
-  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
-  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
-
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -289,17 +253,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
-  create_table "broadcast_messages", :force => true do |t|
-    t.text     "message",    :null => false
-    t.datetime "starts_at"
-    t.datetime "ends_at"
-    t.integer  "alert_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "color"
-    t.string   "font"
-  end
-
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -598,8 +551,11 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
     t.integer  "syllabus_id"
+    t.string   "invite_code"
+    t.string   "qrcode"
   end
 
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
   add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
 
   create_table "custom_fields", :force => true do |t|
@@ -663,15 +619,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "deploy_keys_projects", :force => true do |t|
-    t.integer  "deploy_key_id", :null => false
-    t.integer  "project_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
-
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -721,16 +668,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "created_at"
   end
 
-  create_table "emails", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.string   "email",      :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
-  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
-
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -753,25 +690,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
-  create_table "events", :force => true do |t|
-    t.string   "target_type"
-    t.integer  "target_id"
-    t.string   "title"
-    t.text     "data"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "action"
-    t.integer  "author_id"
-  end
-
-  add_index "events", ["action"], :name => "index_events_on_action"
-  add_index "events", ["author_id"], :name => "index_events_on_author_id"
-  add_index "events", ["created_at"], :name => "index_events_on_created_at"
-  add_index "events", ["project_id"], :name => "index_events_on_project_id"
-  add_index "events", ["target_id"], :name => "index_events_on_target_id"
-  add_index "events", ["target_type"], :name => "index_events_on_target_type"
-
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -874,15 +792,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
-  create_table "forked_project_links", :force => true do |t|
-    t.integer  "forked_to_project_id",   :null => false
-    t.integer  "forked_from_project_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
-
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -1012,17 +921,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "identities", :force => true do |t|
-    t.string   "extern_uid"
-    t.string   "provider"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
-  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
-
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1166,20 +1064,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "private",                     :default => 0
   end
 
-  create_table "keys", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "key"
-    t.string   "title"
-    t.string   "type"
-    t.string   "fingerprint"
-    t.boolean  "public",      :default => false, :null => false
-  end
-
-  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
-  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
-
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1191,27 +1075,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "owner_type", :default => 0
   end
 
-  create_table "label_links", :force => true do |t|
-    t.integer  "label_id"
-    t.integer  "target_id"
-    t.string   "target_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
-  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
-
-  create_table "labels", :force => true do |t|
-    t.string   "title"
-    t.string   "color"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
-
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1262,47 +1125,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "viewed_count",  :default => 0
   end
 
-  create_table "merge_request_diffs", :force => true do |t|
-    t.string   "state"
-    t.text     "st_commits",       :limit => 2147483647
-    t.text     "st_diffs",         :limit => 2147483647
-    t.integer  "merge_request_id",                       :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
-
-  create_table "merge_requests", :force => true do |t|
-    t.string   "target_branch",                    :null => false
-    t.string   "source_branch",                    :null => false
-    t.integer  "source_project_id",                :null => false
-    t.integer  "author_id"
-    t.integer  "assignee_id"
-    t.string   "title"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "milestone_id"
-    t.string   "state"
-    t.string   "merge_status"
-    t.integer  "target_project_id",                :null => false
-    t.integer  "iid"
-    t.text     "description"
-    t.integer  "position",          :default => 0
-    t.datetime "locked_at"
-  end
-
-  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
-  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
-  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
-  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
-  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
-  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
-  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
-  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
-  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
-  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
-
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1337,39 +1159,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
-  create_table "milestones", :force => true do |t|
-    t.string   "title",       :null => false
-    t.integer  "project_id",  :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.integer  "iid"
-  end
-
-  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
-  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
-  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
-  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
-
-  create_table "namespaces", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.string   "path",                        :null => false
-    t.integer  "owner_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type"
-    t.string   "description", :default => "", :null => false
-    t.string   "avatar"
-  end
-
-  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
-  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
-  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
-  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
-  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
-
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1395,31 +1184,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "notes", :force => true do |t|
-    t.text     "note"
-    t.string   "noteable_type"
-    t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "project_id"
-    t.string   "attachment"
-    t.string   "line_code"
-    t.string   "commit_id"
-    t.integer  "noteable_id"
-    t.boolean  "system",                              :default => false, :null => false
-    t.text     "st_diff",       :limit => 2147483647
-  end
-
-  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
-  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
-  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
-  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
-  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
-  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
-  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
-  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
-  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
-
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1429,49 +1193,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.text     "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
-
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
-
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.string   "uid",                          :null => false
-    t.string   "secret",                       :null => false
-    t.text     "redirect_uri",                 :null => false
-    t.string   "scopes",       :default => "", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
-
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1629,23 +1350,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "allow_teacher",        :default => 0
   end
 
-  create_table "permissions", :force => true do |t|
-    t.string  "controller",   :limit => 30, :default => "",    :null => false
-    t.string  "action",       :limit => 30, :default => "",    :null => false
-    t.string  "description",  :limit => 60, :default => "",    :null => false
-    t.boolean "is_public",                  :default => false, :null => false
-    t.integer "sort",                       :default => 0,     :null => false
-    t.boolean "mail_option",                :default => false, :null => false
-    t.boolean "mail_enabled",               :default => false, :null => false
-  end
-
-  create_table "permissions_roles", :id => false, :force => true do |t|
-    t.integer "permission_id", :default => 0, :null => false
-    t.integer "role_id",       :default => 0, :null => false
-  end
-
-  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
-
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1728,11 +1432,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "project_import_data", :force => true do |t|
-    t.integer "project_id"
-    t.text    "data"
-  end
-
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1823,24 +1522,13 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
-  create_table "protected_branches", :force => true do |t|
-    t.integer  "project_id",                             :null => false
-    t.string   "name",                                   :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "developers_can_push", :default => false, :null => false
-  end
-
-  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
-
   create_table "quality_analyses", :force => true do |t|
     t.integer  "project_id"
     t.string   "author_login"
     t.string   "rep_identifier"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.float    "version",        :default => 0.0
-    t.integer  "sonar_version",  :default => 1
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
     t.string   "path"
     t.string   "branch"
     t.string   "language"
@@ -1981,25 +1669,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
-  create_table "services", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",                :default => false, :null => false
-    t.text     "properties"
-    t.boolean  "template",              :default => false
-    t.boolean  "push_events",           :default => true
-    t.boolean  "issues_events",         :default => true
-    t.boolean  "merge_requests_events", :default => true
-    t.boolean  "tag_push_events",       :default => true
-    t.boolean  "note_events",           :default => true,  :null => false
-  end
-
-  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
-  add_index "services", ["project_id"], :name => "index_services_on_project_id"
-
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -2038,26 +1707,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",     :null => false
   end
 
-  create_table "snippets", :force => true do |t|
-    t.string   "title"
-    t.text     "content",          :limit => 2147483647
-    t.integer  "author_id",                                             :null => false
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "file_name"
-    t.datetime "expires_at"
-    t.string   "type"
-    t.integer  "visibility_level",                       :default => 0, :null => false
-  end
-
-  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
-  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
-  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
-  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
-  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
-  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2196,17 +1845,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",      :null => false
   end
 
-  create_table "subscriptions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "subscribable_id"
-    t.string   "subscribable_type"
-    t.boolean  "subscribed"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
-
   create_table "syllabuses", :force => true do |t|
     t.string   "title"
     t.text     "description"
@@ -2457,17 +2095,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
-  create_table "users_star_projects", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
-  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
-  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
-
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2519,23 +2146,6 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "web_hooks", :force => true do |t|
-    t.string   "url"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",                  :default => "ProjectHook"
-    t.integer  "service_id"
-    t.boolean  "push_events",           :default => true,          :null => false
-    t.boolean  "issues_events",         :default => false,         :null => false
-    t.boolean  "merge_requests_events", :default => false,         :null => false
-    t.boolean  "tag_push_events",       :default => false
-    t.boolean  "note_events",           :default => false,         :null => false
-  end
-
-  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
-  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
-
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"

From 2c1e0f534c7e0a5653f4fd081e1290720b8da76a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 11:11:53 +0800
Subject: [PATCH 638/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/syllabuses_controller.rb      | 26 ++++-
 app/controllers/users_controller.rb           |  4 +-
 app/helpers/syllabuses_helper.rb              | 34 +++++++
 app/helpers/users_helper.rb                   |  8 +-
 app/models/syllabus.rb                        | 21 ++++-
 app/views/admin/course_resource_list.html.erb |  2 +-
 app/views/boards/_course_show.html.erb        |  2 +-
 app/views/courses/_copy_course.html.erb       |  2 +-
 .../courses/_course_activity_users.html.erb   |  8 +-
 app/views/courses/_course_heroes.html.erb     |  4 +-
 .../courses/_join_private_course.html.erb     | 10 +-
 .../courses/_show_member_act_score.html.erb   |  4 +-
 app/views/courses/new.html.erb                |  2 +-
 app/views/courses/show.html.erb               |  2 +-
 app/views/files/_import_files.html.erb        | 16 ++--
 app/views/files/_show_quote_resource.html.erb |  2 +-
 app/views/layouts/_logined_header.html.erb    |  2 +-
 app/views/layouts/_project_info.html.erb      |  6 +-
 .../layouts/_show_messages_list.html.erb      | 24 ++---
 .../layouts/_syllabus_base_info.html.erb      | 58 ++++++++++++
 .../layouts/_syllabus_edit_info.html.erb      | 27 ++++++
 app/views/layouts/_syllabus_eng_name.html.erb |  8 ++
 app/views/layouts/_syllabus_info.html.erb     | 18 ++--
 app/views/layouts/_unlogin_header.html.erb    |  2 +-
 app/views/layouts/_user_courses.html.erb      |  8 +-
 app/views/layouts/base_syllabus.html.erb      | 34 +------
 app/views/layouts/base_users_new.html.erb     |  2 +-
 app/views/layouts/new_base_user.html.erb      |  4 +-
 app/views/news/_course_news.html.erb          |  2 +-
 .../organizations/_org_course_create.html.erb |  2 +-
 .../_org_course_homework.html.erb             |  2 +-
 .../_org_course_message.html.erb              |  2 +-
 .../organizations/_org_course_news.html.erb   |  2 +-
 .../syllabuses/edit_syllabus_eng_name.js.erb  |  3 +
 app/views/syllabuses/new.html.erb             |  6 +-
 app/views/syllabuses/show.html.erb            |  4 +-
 app/views/syllabuses/update_base_info.js.erb  |  2 +
 app/views/test/courselist.html.erb            |  2 +-
 app/views/users/_course_attachment.html.erb   |  2 +-
 app/views/users/_course_create.html.erb       |  2 +-
 app/views/users/_course_form.html.erb         |  4 +-
 app/views/users/_course_homework.html.erb     |  2 +-
 .../users/_course_journalsformessage.html.erb |  2 +-
 app/views/users/_course_message.html.erb      |  2 +-
 app/views/users/_course_news.html.erb         |  2 +-
 .../users/_selector_for_messages.html.erb     |  6 +-
 app/views/users/_user_message_course.html.erb | 94 +++++++++----------
 .../users/_user_resource_type_filter.html.erb |  2 +-
 app/views/users/_user_syllabus_list.html.erb  |  4 +-
 app/views/users/show.html.erb                 |  2 +-
 .../welcome/_search_all_results.html.erb      |  2 +-
 .../welcome/_search_course_results.html.erb   |  6 +-
 app/views/welcome/search.html.erb             |  2 +-
 config/locales/courses/en.yml                 |  2 +-
 config/locales/courses/zh.yml                 |  6 +-
 config/locales/zh.yml                         | 26 ++---
 config/routes.rb                              |  2 +
 .../20160630112733_rename_syllabus_column.rb  |  8 ++
 db/schema.rb                                  | 21 ++++-
 public/assets/wechat/course_discussion.html   |  2 +-
 public/assets/wechat/course_notice.html       |  2 +-
 public/javascripts/application.js             | 11 ---
 public/javascripts/course.js                  | 18 ++--
 public/javascripts/syllabus.js                | 80 ++++++++++++++++
 64 files changed, 465 insertions(+), 214 deletions(-)
 create mode 100644 app/views/layouts/_syllabus_base_info.html.erb
 create mode 100644 app/views/layouts/_syllabus_edit_info.html.erb
 create mode 100644 app/views/layouts/_syllabus_eng_name.html.erb
 create mode 100644 app/views/syllabuses/edit_syllabus_eng_name.js.erb
 create mode 100644 app/views/syllabuses/update_base_info.js.erb
 create mode 100644 db/migrate/20160630112733_rename_syllabus_column.rb

diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 54d1c7569..b1d7bf32d 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class SyllabusesController < ApplicationController
   include ApplicationHelper
   helper :attachments
@@ -5,7 +6,7 @@ class SyllabusesController < ApplicationController
   include CoursesHelper
 
   before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy]
-  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :update_base_info]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -71,7 +72,7 @@ class SyllabusesController < ApplicationController
 
   #删除课程大纲的描述
   def destroy
-    if @syllabus and @syllabus.courses.empty?
+    if @syllabus && @syllabus.courses.empty?
       @syllabus.destroy
       redirect_to user_path(User.current.id)
     end
@@ -122,6 +123,27 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  #修改英文名称
+  def edit_syllabus_eng_name
+    if @syllabus
+      @syllabus.update_column("eng_name",params[:eng_name])
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #编辑属性
+  def update_base_info
+    if @syllabus
+      @syllabus.update_attributes(:credit => params[:credit], :hours => params[:hours], :theory_hours => params[:theory_hours], :practice_hours => params[:practice_hours], :applicable_major => params[:applicable_major], :pre_course => params[:pre_course])
+      @syllabus.update_attributes(:syllabus_type => params[:syllabus_type])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
   def find_syllabus
     @syllabus = Syllabus.find params[:id]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 68e7f5590..411f47f1e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1372,7 +1372,7 @@ class UsersController < ApplicationController
       @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
       @all_count = @user.courses.visible.where("is_delete =?", 0).count
     elsif @type == 'Syllabus'
-      @syllabus = Syllabus.where("id = #{params[:syllabus_id]}").first
+      @syllabus = Syllabus.where("id = #{params[:syllabus]}").first
       @courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
       @all_count = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).count
     end
@@ -3205,7 +3205,7 @@ class UsersController < ApplicationController
       # end
       @syllabus.each do |syllabus|
         count = 0
-        courses = @courses.select("syllabus_id = #{syllabus.id}")
+        courses = @courses.where("syllabus_id = #{syllabus.id}")
         courses.each do |c|
           count += (User.current.admin? || User.current.allowed_to?(:as_teacher,c)) ? (c.homework_commons.count + visable_attachemnts_incourse(c).count) : (c.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(c).count)
         end
diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index af5472ee1..00331e0dc 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 module SyllabusesHelper
   def get_syllabuses_by_tag(tag_name)
     Syllabus.tagged_with(tag_name).order('updated_at desc')
@@ -35,4 +36,37 @@ module SyllabusesHelper
     end
     count
   end
+
+  #课程性质下拉框
+  def syllabus_type
+    type = []
+    option1 = []
+    option2 = []
+    option3 = []
+    option4 = []
+    option5 = []
+    option6 = []
+
+    option1 << "请选择"
+    option1 << 1
+    option2 << "公共必修课"
+    option2 << 2
+    option3 << "学科必修课"
+    option3 << 3
+    option4 << "专业选修课"
+    option4 << 4
+    option5 << "实践必修课"
+    option5 << 5
+    option6 << "实践选修课"
+    option6 << 6
+
+    type << option1
+    type << option2
+    type << option3
+    type << option4
+    type << option5
+    type << option6
+
+    type
+  end
 end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 4a6dbc6b6..f312d2275 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -32,7 +32,7 @@ module UsersHelper
   def get_resource_type type
     case type
       when 'Course'
-        '课程资源'
+        '班级资源'
       when 'Project'
         '项目资源'
       when 'Issue'
@@ -122,11 +122,11 @@ module UsersHelper
       when 'homework'
         '作业消息'
       when 'course_message'
-        '课程讨论'
+        '班级讨论'
       when 'course_news'
-        '课程通知'
+        '班级通知'
       when 'poll'
-        '课程问卷'
+        '班级问卷'
       when 'issue'
         '项目任务'
       when 'forge_message'
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index 2f2ec495f..5e368f341 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Syllabus < ActiveRecord::Base
   include Redmine::SafeAttributes
   include ApplicationHelper
@@ -8,13 +9,29 @@ class Syllabus < ActiveRecord::Base
   belongs_to :user
   has_many :courses
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
-  attr_accessible :description, :title, :eng_name, :type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
-  safe_attributes 'title', 'description', 'eng_name', 'type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
+  attr_accessible :description, :title, :eng_name, :syllabus_type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
+  safe_attributes 'title', 'description', 'eng_name', 'syllabus_type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
 
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::SYLLABUS
   end
 
+  def syllabus_type_str
+    case self.syllabus_type
+      when 1
+        type = "公共必修课"
+      when 2
+        type = "学科必修课"
+      when 3
+        type = "专业选修课"
+      when 4
+        type = "实践必修课"
+      when 5
+        type = "实践选修课"
+    end
+    type
+  end
+
   ###添加回复
   def self.add_syllabus_jour(user, notes, id , options = {})
     syllabus = Syllabus.find(id)
diff --git a/app/views/admin/course_resource_list.html.erb b/app/views/admin/course_resource_list.html.erb
index 2e83a96aa..4786bbe89 100644
--- a/app/views/admin/course_resource_list.html.erb
+++ b/app/views/admin/course_resource_list.html.erb
@@ -39,7 +39,7 @@
             <%=  number_to_human_size(resource.filesize)%>
           </td>
           <td style=" text-align: center;">
-            课程资源
+            班级资源
           </td>
           <td style=" text-align: center;">
             <%= format_date(resource.created_on)%>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index d33b75f82..46191b5d3 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -22,7 +22,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      课程问答区
+      班级问答区
     </div>
   </div>
   <div nhname="topic_form">
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3fa0ee9fc..c1c4d1c2f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -98,7 +98,7 @@
     <li class=" mb5 ml85">
       <label >公开&nbsp;&nbsp;：</label>
       <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox" value="<%=@course.is_public.to_i %>">
-      <span class="c_grey">（选中后班级外用户可见该课程，否则仅对班级内成员可见）</span>
+      <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
       <div class="cl"></div>
     </li>
     <li class="ml85">
diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index 93e0e7b77..3b19de355 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -2,9 +2,9 @@
     <ul class="rankList">
       <h4>
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "课程活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => '' %>
+            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => '' %>
         <% else %>
-            课程活跃度
+            班级活跃度
         <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
       </h4>
@@ -17,7 +17,7 @@
           问答回复：回复数 x 1 <br/>
           作业留言：留言数 x 1 <br/>
           通知留言：留言数 x 1 <br/>
-          课程留言：留言数 x 1  <br/>
+          班级留言：留言数 x 1  <br/>
           总得分为以上得分之和</div>
       </div>
       <% contributor_course_scor(course.id).each do |contributor_score| %>
@@ -47,7 +47,7 @@
                     通知留言数 x 1 = <%= contributor_score.news_reply_num.to_i %> x 1 = <%= contributor_score.news_reply_num.to_i %></br>
                     <%# end %>
                     <%# unless  contributor_score.journal_num.to_i == 0 %>
-                    课程留言数  x 1 = <%= contributor_score.journal_num.to_i %> x 1 = <%= contributor_score.journal_num.to_i %></br>
+                    班级留言数  x 1 = <%= contributor_score.journal_num.to_i %> x 1 = <%= contributor_score.journal_num.to_i %></br>
                     <%# end %>
                     <%# unless  contributor_score.homework_journal_num.to_i == 0 %>
                     <%# end %>
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index 9542f87a9..ea05eea53 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -3,9 +3,9 @@
     <ul class="rankList">
       <h4>
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "课程英雄榜", course_member_path(course, :role => 2), :class => '' %>
+            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => '' %>
         <% else %>
-            <span>课程英雄榜</span>
+            <span>班级英雄榜</span>
         <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
       <div  style="cursor:pointer;" class="numIntro undis">
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 96c9a2b7d..ec5d18c7e 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>快速进入课程通道</title>
+  <title>快速进入班级通道</title>
   <style>
       #popbox{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
       #popbox div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
@@ -49,8 +49,8 @@
 <div id="popbox">
   <div class="C"  >
     <div class="C_top">
-      <h2>快速加入课程通道</h2>
-      <p>只要持有课程邀请码，就可以快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
+      <h2>快速加入班级通道</h2>
+      <p>只要持有班级邀请码，就可以快速加入所在班级。班级页面搜索不到的私有班级只能从此通道进入哦！</p>
     </div>
     <div class="C_form">
       <%= form_tag({:controller => 'courses',
@@ -62,11 +62,11 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 90px; display: inline-block;">课程邀请码：</span>
+              <span class="tips" style="width: 90px; display: inline-block;">班级邀请码：</span>
               <input class="width190" style="margin-left: 0px;" name="invite_code" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
-            <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
+            <li class="mB5">班级邀请码是所在班级页面中显示的邀请码</li>
             <li style="margin-top: 15px;">
               <span style="margin-right: 5px;"><span style="margin-right:43px;">身</span><span>份</span>：</span>
               <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
diff --git a/app/views/courses/_show_member_act_score.html.erb b/app/views/courses/_show_member_act_score.html.erb
index cec17f0b8..8a113c31e 100644
--- a/app/views/courses/_show_member_act_score.html.erb
+++ b/app/views/courses/_show_member_act_score.html.erb
@@ -15,7 +15,7 @@
         问答回帖数 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 %>
@@ -30,7 +30,7 @@
         问答回帖数 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>
+        班级留言数  x 1 = <%= act_score.journal_num.to_i %> x 1 = <%= act_score.journal_num.to_i %></br>
         总得分：<%=total_score %>
       </div>
   <% end %>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index d8daa5a67..1ceaa06f5 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -70,7 +70,7 @@
         <li class=" mb5 ml30">
           <label >学生上传资源&nbsp;&nbsp;：</label>
           <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" />
-          <span class="c_grey">（选中后允许学生上传课程资源，否则不允许）</span>
+          <span class="c_grey">（选中后允许学生上传班级资源，否则不允许）</span>
           <div class="cl"></div>
         </li>
         <li class=" ml90" >
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index eaea6c553..b9d97e18a 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -9,7 +9,7 @@
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRight mt0 ml10">
 <div class="homepageRightBanner">
-  <div class="NewsBannerName">课程动态</div>
+  <div class="NewsBannerName">班级动态</div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
       <ul class="homepagePostType">
diff --git a/app/views/files/_import_files.html.erb b/app/views/files/_import_files.html.erb
index 36fa96a0b..6a3c4ed74 100644
--- a/app/views/files/_import_files.html.erb
+++ b/app/views/files/_import_files.html.erb
@@ -17,7 +17,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -50,7 +50,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -61,7 +61,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -72,7 +72,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -83,7 +83,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -94,7 +94,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -105,7 +105,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
@@ -116,7 +116,7 @@
           <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
           <span>123456.jpg</span></label>
       </li>
-      <li class="subjectType fl">课程资源</li>
+      <li class="subjectType fl">班级资源</li>
       <li class="subjectCount fl">123.0KB</li>
       <li class="subjectPublisher fl">尹刚</li>
       <li class="fl subjectDate">2016-01-21</li>
diff --git a/app/views/files/_show_quote_resource.html.erb b/app/views/files/_show_quote_resource.html.erb
index 02009e462..a3c8abef2 100644
--- a/app/views/files/_show_quote_resource.html.erb
+++ b/app/views/files/_show_quote_resource.html.erb
@@ -1,6 +1,6 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>将此课件引入我的课程资源库</h2>
+    <h2>将此课件引入我的班级资源库</h2>
     <% if error == '403' %>
       <div class="upload_box">
         <div style="color: red;">您没有权限引用此资源</div>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index d8adece15..a45475371 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -48,7 +48,7 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户、资源以及帖子"/>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子"/>
       <input type="hidden" name="search_type" id="type" value="all"/>
       <input type="text" style="display: none;"/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index e7efba1c7..651d8d1e4 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -9,9 +9,11 @@
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
 <div class="pr_info_id fl f14">
-  <%= @course.name %></br>
+  <span class="hidden fl" style="max-width: 90px;" title="<%= @course.name %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 1 ? '(私有)' :  '公开' %></span>
+  </br>
+  <div class="cl"></div>
   <% if @course.syllabus%>
-      <a class="pr_info_name fb c_dark fl" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
+      <a class="pr_info_name fb c_dark fl hidden" style="max-width: 120px;" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
         <%=@course.syllabus.title %>
       </a>
   <% end %>
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index a4df961d3..54f9b7ba3 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -12,7 +12,7 @@
       <% elsif ma.course_message_type == "Comment" %>
           <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
-          <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程作业：作业标题：<%= ma.course_message.name%></a></li>
+          <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了班级作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了班级作业：作业标题：<%= ma.course_message.name%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了</a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
@@ -52,12 +52,12 @@
       <% elsif ma.course_message_type == "Message" %>
           <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
           <% href = 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) %>
-          <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%></a></li>
+          <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%></a></li>
       <% elsif ma.course_message_type == "StudentWorksScore" %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
       <% elsif ma.course_message_type == "JournalsForMessage" %>
           <% if ma.course_message.jour_type == 'Course' %>
-              <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
+              <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在班级中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在班级中留言了：<%= ma.course_message.notes.html_safe%></a></li>
           <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
               <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
           <% else %>
@@ -70,21 +70,21 @@
       <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
           <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
       <% elsif ma.course_message_type == "Course" %>
-          <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
+          <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了班级：班级名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了班级：班级名称：<%=ma.course_message.name %></a></li>
       <% elsif ma.course_message_type == "JoinCourseRequest" %>
-          <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
-          <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
+          <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
+          <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的班级成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的班级成员申请：<%=content %></a></li>
       <% elsif ma.course_message_type == "CourseRequestDealResult" %>
-          <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
-          <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
+          <% content = ma.status == 1 ? '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+          <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 班级申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>班级申请进度反馈：<%=content %></a></li>
       <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
-          <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
+          <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了班级：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了班级：<%=ma.course.name %></a></li>
       <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
-          <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
+          <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的班级成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的班级成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
       <% elsif ma.course_message_type == "RemoveFromCourse" %>
-          <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
+          <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了班级：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了班级：<%=ma.course.name %></a></li>
       <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
-          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
+          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了班级测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了班级测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
       <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
           <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
       <% end %>
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
new file mode 100644
index 000000000..f545df2d4
--- /dev/null
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -0,0 +1,58 @@
+<ul class="syllabus_leftinfo" id="all_syllabus_attr">
+  <% if User.current.logged? && (User.current == syllabus.user || User.current.admin?) %>
+      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :class => 'fr', :onclick => "show_edit_base_info();"%>
+  <% end %>
+  <div class="cl"></div>
+  <li><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
+  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 %>
+      <li><label>课程性质：</label><%=syllabus.syllabus_type_str %></li>
+  <% end %>
+  <% unless syllabus.credit.nil? || syllabus.credit == '' %>
+      <li><label>学分：</label><%=syllabus.credit %></li>
+  <% end %>
+  <% unless syllabus.hours.nil? || syllabus.hours == '' %>
+      <li><label>总学时：</label><%=syllabus.hours %></li>
+  <% end %>
+  <% unless syllabus.theory_hours.nil? || syllabus.theory_hours == '' %>
+      <li><label>理论学时：</label><%=syllabus.theory_hours %></li>
+  <% end %>
+  <% unless syllabus.practice_hours.nil? || syllabus.practice_hours == '' %>
+      <li><label>实践学时：</label><%=syllabus.practice_hours %></li>
+  <% end %>
+  <% unless syllabus.applicable_major.nil? || syllabus.applicable_major == '' %>
+      <li><label>适用专业：</label><%=syllabus.applicable_major %></li>
+  <% end %>
+  <% unless syllabus.pre_course.nil? || syllabus.pre_course == '' %>
+      <li><label>先修课程：</label><%=syllabus.pre_course %></li>
+  <% end %>
+
+  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == '' %>
+      <li class="none none_attr"><label>课程性质：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.credit.nil? || syllabus.credit == '' %>
+      <li class="none none_attr"><label>学分：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.hours.nil? || syllabus.hours == '' %>
+      <li class="none none_attr"><label>总学时：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.theory_hours.nil? || syllabus.theory_hours == '' %>
+      <li class="none none_attr"><label>理论学时：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.practice_hours.nil? || syllabus.practice_hours == '' %>
+      <li class="none none_attr"><label>实践学时：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.applicable_major.nil? || syllabus.applicable_major == '' %>
+      <li class="none none_attr"><label>适用专业：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+  <% if syllabus.pre_course.nil? || syllabus.pre_course == '' %>
+      <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
+  <% end %>
+</ul>
+<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?) %>
+    <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
+<% end %>
+<script>
+    function show_edit_base_info() {
+        $("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_edit_info.html.erb b/app/views/layouts/_syllabus_edit_info.html.erb
new file mode 100644
index 000000000..4c24fccb9
--- /dev/null
+++ b/app/views/layouts/_syllabus_edit_info.html.erb
@@ -0,0 +1,27 @@
+<ul class="syllabus_leftinfo" id="all_syllabus_attr">
+  <%= form_for('syllabus',:url => update_base_info_syllabus_path(syllabus.id),:remote => true) do |f|%>
+      <a href="javascript:void(0);" onclick="update_syllabus_info();" id="submit_edit_info" class="fr">保存</a>
+      <!--<a href="javascript:void(0);" onclick="reset_syllabus_info();" id="submit_reset_info" class="fr mr10">取消</a>-->
+      <div class="cl"></div>
+      <li><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
+      <li><label>课程性质：</label>
+        <%= select_tag :syllabus_type,options_for_select(syllabus_type,syllabus.syllabus_type), {:id=>"syllabus_type_input", :class=>"syllabus_select"}  %>
+      <div class="cl"></div>
+      </li>
+      <li><label >学分：</label>
+        <input id="syllabus_credit_input" class="syllabus_input_min fl" name="credit" placeholder="5" value="<%=syllabus.credit %>"> 学分
+        <span class="none c_red ml5" id="syllabus_credit_notice">请输入正整数</span><div class="cl"></div>
+      </li>
+      <li><label>总学时：</label><input id="syllabus_hours_input" class="syllabus_input_min fl" name="hours" placeholder="50" value="<%=syllabus.hours %>"> 学时
+        <span class="none c_red ml5" id="syllabus_hours_notice">请输入正整数</span><div class="cl"></div>
+      </li>
+      <li><label>理论学时：</label><input id="syllabus_theory_hours_input" class="syllabus_input_min fl" name="theory_hours" placeholder="10" value="<%=syllabus.theory_hours %>"> 学时
+        <span class="none c_red ml5" id="syllabus_theory_hours_notice">请输入正整数</span><div class="cl"></div>
+      </li>
+      <li><label>实践学时：</label><input id="syllabus_practice_hours_input" class="syllabus_input_min fl" name="practice_hours" placeholder="5" value="<%=syllabus.practice_hours %>"> 学时
+        <span class="none c_red ml5" id="syllabus_practice_hours_notice">请输入正整数</span><div class="cl"></div>
+      </li>
+      <li><label>适用专业：</label><input id="syllabus_applicable_major_input" class="syllabus_input fl" name="applicable_major" placeholder="UI设计" value="<%=syllabus.applicable_major %>"><div class="cl"></div></li>
+      <li><label>选修课程：</label><input id="syllabus_pre_course_input" class="syllabus_input fl" name="pre_course" placeholder="工业设计史" value="<%=syllabus.pre_course %>"><div class="cl"></div></li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_eng_name.html.erb b/app/views/layouts/_syllabus_eng_name.html.erb
new file mode 100644
index 000000000..6b9b6f3c7
--- /dev/null
+++ b/app/views/layouts/_syllabus_eng_name.html.erb
@@ -0,0 +1,8 @@
+<% if syllabus.eng_name && !syllabus.eng_name.empty? %>
+    <span><%= syllabus.eng_name %></span>
+<% else%>
+    <span class="fontGrey">课程英文名称</span>
+<% end %>
+<% if User.current == syllabus.user %>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_eng_name();"%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index 9717f33a7..d8e18e37a 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -10,19 +10,13 @@
 </div>
 <div class="cl"></div>
 <div>
-  <div class="mb5">
-    <% if @syllabus.eng_name && !@syllabus.eng_name.empty? %>
-        <span><%= @syllabus.eng_name %></span>
-    <% else%>
-        <span class="fontGrey">课程英文名称</span>
-    <% end %>
-    <% if User.current == @syllabus.user %>
-        <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_eng_name();"%>
-    <% end %>
+  <div class="mb5" id="syllabus_eng_name_show">
+    <%= render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus}%>
   </div>
+  <textarea class="homepageSignatureTextarea none" placeholder="请编辑英文名称" id="syllabus_eng_name_edit" onblur="edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');"><%= @syllabus.eng_name %></textarea>
 </div>
 <div class="pr_info_foot ">
-  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=teachers_num %></a>）<span>|</span>
-  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=students_num %></a>）<span>|</span>
-  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default"><%=files_num %></a>）</div>
+  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的教师数"><%=teachers_num %></a>）<span>|</span>
+  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的学生数"><%=students_num %></a>）<span>|</span>
+  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的资源数"><%=files_num %></a>）</div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 0675c8a4a..689c1268a 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -52,7 +52,7 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
         <input type="hidden" name="search_type" id="type" value="all"/>
         <input type="text" style="display: none;"/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 6c290968c..6388b94d0 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -47,6 +47,12 @@
                 <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'fr fb', :title => '发布帖子',:target => '_blank' %>
                 <div class="cl"></div>
               </li>
+              <% if type=='User' && !course.syllabus.nil? %>
+                  <li class="subNavRow">
+                    <%= link_to "所属课程",syllabus_path(course.syllabus_id), :class => 'fl w48',:target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+              <% end %>
               <% if User.current == user %>
                   <li class="subNavRow">
                     <% if count == 0 %>
@@ -76,7 +82,7 @@
     </li>
 <% end %>
 
-<% if courses.size == 5%>
+<% if all_count > (page.to_i+1) * 5%>
     <li class="homepageLeftMenuMore" id="user_show_more_course">
       <input type="hidden" value="<%= page%>" id="course_page_num">
       <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%= type=='User' ? user_courses4show_user_path(user.id,:type=>type) : user_courses4show_user_path(user.id,:type=>type,:syllabus=>@syllabus.id)%>');"></a>
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 9e7cd3e1b..2eb51d229 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -47,29 +47,8 @@
       </div>
       <%  update_visiti_count @syllabus %>
 
-      <div class="homepageLeftMenuContainer">
-        <ul class="syllabus_leftinfo">
-          <a href="javascript:void(0);" class="fr"><img src="../images/signature_edit.png" width="12" height="12" /></a><div class="cl"></div>
-          <li><label >创建教师：</label><span><%=@syllabus.user.show_name %></span></li>
-          <li><label>课程性质：</label>
-            <select class="syllabus_select fl">
-              <option value="公共必修课" selected="selected">公共必修课</option>
-              <option value="学科必修课">学科必修课</option>
-              <option value="专业选修课">专业选修课</option>
-              <option value="实践必修课">实践必修课</option>
-              <option value="实践选修课">实践选修课</option>
-            </select>
-            <div class="cl"></div>
-          </li>
-          <li><label >学分：</label><input class="syllabus_input fl" placeholder="5学分"><div class="cl"></div></li>
-          <li><label>总学时：</label><input class="syllabus_input_min fl" placeholder="50 ">学时 <div class="cl"></div></li>
-          <li><label>理论学时：</label><input class="syllabus_input_min fl" placeholder="10"> 学时<div class="cl"></div></li>
-          <li><label>实践学时：</label><input class="syllabus_input fl" placeholder="5学时"><div class="cl"></div></li>
-          <li><label>适用专业：</label><input class="syllabus_input fl" placeholder="UI设计"><div class="cl"></div></li>
-          <li><label>选修课程：</label><input class="syllabus_input fl" placeholder="工业设计史"><div class="cl"></div></li>
-
-        </ul>
-        <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>
+      <div class="homepageLeftMenuContainer" id="syllabus_base_info">
+        <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
       </div>
 
       <div class="homepageLeftMenuContainer">
@@ -102,12 +81,6 @@
           <div class = "leftCoursesList" id="homepageLeftMenuCourses">
             <ul>
               <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current,:all_count => all_count,:type =>'Syllabus',:page => 0} %>
-              <!--<li class="homepageLeftMenuCoursesLine" ><a href="javascript:void(0);" class="coursesLineGrey hidden">设计学院设计管理班级3(2016夏)</a></li>
-              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
-              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
-              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
-              <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey hidden">工程学院设计管理班级1(2015夏)</a></li>
-              <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
             </ul>
           </div>
           <% if !courses.empty? %>
@@ -159,6 +132,9 @@
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
 
     }
+    function show_edit_base_info() {
+        $("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
+    }
 </script>
 </body>
 </html>
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 6a16940fc..92a99b3b6 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -203,7 +203,7 @@
             <% end %>
           <% end %>
           <% if (get_join_course_count(@user) != 0) %>
-              <li>加入课程&nbsp;:</li>
+              <li>加入班级&nbsp;:</li>
           <% end %>
           <% if @user.user_extensions.identity == 1 %>
             <li>参加匿评&nbsp;:</li>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 73a09f4ce..776de074b 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -205,14 +205,14 @@
                               </li>
                               <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
                               <li>
-                                <%= link_to "加入课程",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
                               </li>
                             </ul>
                           </li>
                         </ul>
                       </div>
                   <% else%>
-                      <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入课程"%>
+                      <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入班级"%>
                   <% end%>
               <% end%>
             </div>
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 245ee4104..94d0d9d23 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -21,7 +21,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      课程通知
+      班级通知
     </div>
   </div>
   <% if @course && User.current.allowed_to?(:manage_news, @course) %>
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index 97bc0e353..86a9a8199 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:teacher).try(:realname), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.name.to_s+" | 课程", course_url_in_org(activity.id), :class => "newsBlue ml15" %>
+        <%= link_to activity.name.to_s+" | 班级", course_url_in_org(activity.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word" >
         <%= link_to activity.name, course_url_in_org(activity.id), :class => "postGrey" %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index e33787a09..8d8f591c4 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -12,7 +12,7 @@
         <% else %>
             <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_url_in_org(activity.course.id), :class => "newsBlue ml15"%>
+        <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_url_in_org(activity.course.id), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :class => "postGrey"%>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 80125a03e..40f18772d 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_url_in_org(activity.course.id), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 班级问答区", course_boards_url_in_org(activity.course.id), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 24870b470..6b2146cb1 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -11,7 +11,7 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_url_in_org(activity.course.id), :class => "newsBlue ml15" %>
+        <%= link_to activity.course.name.to_s+" | 班级通知", course_news_index_url_in_org(activity.course.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_url_in_org(activity.id), :class => "postGrey" %>
diff --git a/app/views/syllabuses/edit_syllabus_eng_name.js.erb b/app/views/syllabuses/edit_syllabus_eng_name.js.erb
new file mode 100644
index 000000000..8a4c1efa8
--- /dev/null
+++ b/app/views/syllabuses/edit_syllabus_eng_name.js.erb
@@ -0,0 +1,3 @@
+$("#syllabus_eng_name_show").html("<%= escape_javascript render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus} %>");
+$("#syllabus_eng_name_show").show();
+$("#syllabus_eng_name_edit").hide();
\ No newline at end of file
diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb
index 34b02e33a..6f38d5f07 100644
--- a/app/views/syllabuses/new.html.erb
+++ b/app/views/syllabuses/new.html.erb
@@ -5,14 +5,14 @@
   <ul>
     <%= labelled_form_for @syllabus do |f| %>
         <li class="ml45">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="title" id="new_syllabus_name" class="name_input" maxlength="100" onkeyup="regex_syllabus_name();">
+          <label><span class="c_red">*</span>&nbsp;课程名称&nbsp;&nbsp;：</label>
+          <input  type="text" name="title" id="new_syllabus_name" class="name_input" placeholder="例如：设计管理" maxlength="100" onkeyup="regex_syllabus_name();">
           <span class="c_red" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li class="ml45">
           <label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="eng_name" id="new_syllabus_eng_name" class="name_input" maxlength="100">
+          <input  type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Management of design" class="name_input" maxlength="100">
           <!--<span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>-->
         </li>
         <div class="cl"></div>
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index 243f24115..989d31984 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -54,7 +54,9 @@
           </div>
           <div class="cl"></div>
       <% end %>
-  <% end %>
+      <div class="fr fontGrey2">更新时间：<%=format_time @syllabus.updated_at %><div></div></div>
+      <div class="cl"></div>
+<% end %>
 
   <% count=@syllabus.journals_for_messages.count %>
   <div class="homepagePostReply">
diff --git a/app/views/syllabuses/update_base_info.js.erb b/app/views/syllabuses/update_base_info.js.erb
new file mode 100644
index 000000000..5fceec213
--- /dev/null
+++ b/app/views/syllabuses/update_base_info.js.erb
@@ -0,0 +1,2 @@
+$("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
+$("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus}) %>");
diff --git a/app/views/test/courselist.html.erb b/app/views/test/courselist.html.erb
index 3f9f22489..b5222b664 100644
--- a/app/views/test/courselist.html.erb
+++ b/app/views/test/courselist.html.erb
@@ -4,7 +4,7 @@
 
 <div class="page-header">
 	<div class="jumbotron">
-		<h1>课程作业列表</h1>
+		<h1>班级作业列表</h1>
 		<p class="lead">测试页面提供</p>
 	</div>
 	<% @courses.each do |course| %>
diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb
index 4c0856b14..4b854f44b 100644
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
+        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word" >
         <%= link_to activity.filename, course_files_path(activity.course), :class => "postGrey" %>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb
index 83c703905..2bce467be 100644
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.name.to_s+" | 课程", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word" >
         <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index dc277805c..1aa0a5f7d 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -23,7 +23,7 @@
         <td class="td_w70 ">
           <a href="<%= user_path(item.teacher) %>" title="<%= item.teacher.show_name %>"><%= item.teacher.show_name %></a>
         </td>
-        <td class="td_w60 ">课程作业：</td>
+        <td class="td_w60 ">班级作业：</td>
         <td class="td_w110 "><a href="<%=url_for(:controller => 'homework_common', :action => 'index',:course=>item.id, :host=>Setting.host_course)%>"><%= item.homework_commons.count %></a></td>
       </tr>
       <tr>
@@ -45,7 +45,7 @@
   <% elsif User.current.member_of_course? item %>
     <a href="<%=url_for(:controller => 'homework_common', :action => 'index',:course=>item.id, :host=>Setting.host_course)%>" target="_blank" class="blue_n_btn fr mt20">提交作品</a>
   <% elsif User.current.logged?%>
-    <%= link_to "加入课程",try_join_path(:object_id => item.id), :class => "blue_n_btn fr mt20", :remote => "true",:id => "try_join_course_link"%>
+    <%= link_to "加入班级",try_join_path(:object_id => item.id), :class => "blue_n_btn fr mt20", :remote => "true",:id => "try_join_course_link"%>
   <% end %>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index ee12c04dd..cf8e782e6 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -9,7 +9,7 @@
       <div class="homepagePostTo break_word">
         <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
          TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
+        <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 83519b1b1..64ba9f6df 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -9,7 +9,7 @@
         <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
          TO
         <% course=Course.find(activity.jour_id) %>
-        <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
+        <%= link_to course.name.to_s+" | 班级留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
       <!--<div class="homepagePostTitle break_word list_style upload_img">
         <%# if activity.parent %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 135013a62..d4db3df1f 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -8,7 +8,7 @@
       <div class="homepagePostTo break_word">
         <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 班级问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index d4af9783e..18f16b068 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -8,7 +8,7 @@
       <div class="homepagePostTo break_word">
          <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
          TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
+        <%= link_to activity.course.name.to_s+" | 班级通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
index 66f9ec7a3..3727e4a1d 100644
--- a/app/views/users/_selector_for_messages.html.erb
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -7,9 +7,9 @@
           <ul class="homepagePostTypeHomework fl">
             <li class="f14"><strong>课程消息</strong></li>
             <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "homepagePostTypeAssignment postTypeGrey" %></li>
-            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "homepagePostTypeForum postTypeGrey"  %></li>
-            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "homepagePostTypeNotice postTypeGrey"  %></li>
-            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "homepagePostTypeQuiz postTypeGrey"  %></a></li>
+            <li><%= link_to "班级讨论",user_message_path(User.current, :type => 'course_message'), :class => "homepagePostTypeForum postTypeGrey"  %></li>
+            <li><%= link_to "班级通知",user_message_path(User.current, :type => 'course_news'), :class => "homepagePostTypeNotice postTypeGrey"  %></li>
+            <li><%= link_to "班级问卷", user_message_path(User.current, :type => 'poll'), :class => "homepagePostTypeQuiz postTypeGrey"  %></a></li>
           </ul>
         </li>
 
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 3e83b0f7a..fc66711d3 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -43,7 +43,7 @@
         <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), :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>
+            <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? %>
@@ -65,7 +65,7 @@
                   <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
                 </p>
                 <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>
+                  <li>班级名称：<%= ma.course_message.course.name %>
                     (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
                   <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
                   <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
@@ -81,7 +81,7 @@
             <% else %>
                 <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
                 <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>
+                  <li>班级名称：<%= ma.course_message.course.name %>
                     (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
                   <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
                   <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
@@ -117,7 +117,7 @@
                   <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
                 </p>
                 <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
                   <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
                   <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
                   <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
@@ -154,7 +154,7 @@
               <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
             </p>
             <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
               <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
               <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
@@ -185,7 +185,7 @@
               该作业已经关闭了匿评。作业信息如下：
             </p>
             <ul class="ul_grey">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>作业标题：<%= ma.course_message.name %></li>
             </ul>
             <p></p>
@@ -221,7 +221,7 @@
 
             </p>
             <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
               <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
               <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
             </ul>
@@ -292,7 +292,7 @@
           <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" %>">
-            <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
+            <%= 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),
@@ -359,7 +359,7 @@
                     <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
                   </p>
                   <ul class="ul_normal_color">
-                    <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                    <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
                     <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
                     <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
                     <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
@@ -384,7 +384,7 @@
                     <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" %>">在班级中留言了：</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),
@@ -450,7 +450,7 @@
                 <ul class="ul_normal_color">
                   <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
                   <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
-                  <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                  <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
                   <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
                 </ul>
               </div>
@@ -479,7 +479,7 @@
               <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
             </p>
             <ul class="ul_grey">
-              <li>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
               <li>作业标题：<%= ma.course_message.homework_common.name %></li>
               <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
               <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
@@ -541,29 +541,29 @@
           </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
+            <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.name, course_path(ma.course_message),
+            <%= link_to "班级名称：" + ma.course_message.name, course_path(ma.course_message),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a></li>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：
+              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个班级，详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.name %></p>
+            <p>班级名称：<%= ma.course_message.name %></p>
             <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
-            <p>课程ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
-            <p>课程密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
+            <p>班级ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
+            <p>班级密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
             <p>学时总数：<%= ma.course_message.class_period %></p>
             <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
-            <p>您可以点击左上角的“配置”按钮，修改课程基本信息，添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员，让他们输入ID及密码加入课程。</p>
+            <p>您可以点击左上角的“配置”按钮，修改班级基本信息，添加及删除班级成员。您也可以把邀请码告诉学生和其他成员，让他们输入邀请码加入班级。</p>
             <% if ma.course_message.is_public %>
-              <p>您的课程是公开的，所有人都能访问您的课程。若不想设置为公开，您可以在配置中设置。</p>
+              <p>您的班级是公开的，所有人都能访问您的班级。若不想设置为公开，您可以在配置中设置。</p>
             <% else %>
-              <p>您的课程是私有的，非课程成员不能访问您的课程。如果想设置为公开，您可以在配置中设置。</p>
+              <p>您的班级是私有的，非班级成员不能访问您的班级。如果想设置为公开，您可以在配置中设置。</p>
             <% end %>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -580,13 +580,13 @@
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
-              课程申请进度反馈：</span>
+              班级申请进度反馈：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to  ma.status == 1 ?
-                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
+                    '您申请成为班级"'+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)),
+                    '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -595,10 +595,10 @@
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入课程<%= Course.find(ma.course_id).name%>。
+              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入班级<%= Course.find(ma.course_id).name%>。
             </p>
-            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
-            <div class="fl">课程描述：</div>
+            <p>申请班级：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">班级描述：</div>
             <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
             <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
           </div>
@@ -614,7 +614,7 @@
           </li>
           <li class="homepageNewsPubType fl">
             <%=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>
+            <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"}", :target => '_blank' %>
@@ -625,14 +625,14 @@
           <div style="display: none" class="message_title_red system_message_style">
             <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
                 <% teacher = User.find(ma.course_message_id) %>
-                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了课程，详情如下：</p>
-                <p>课程名称：<%= ma.course.name %></p>
+                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了班级，详情如下：</p>
+                <p>班级名称：<%= ma.course.name %></p>
                 <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>课程ID：<%= ma.course.id %></p>
+                <p>班级ID：<%= ma.course.id %></p>
                 <p>课时总数：<%= ma.course.class_period %></p>
             <% else %>
                 <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
                 </p>
             <% end %>
           </div>
@@ -648,7 +648,7 @@
           </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
+            <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"}", :target => '_blank' %>
@@ -658,15 +658,15 @@
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-                <p>您增加了新的课程成员，详情如下：</p>
+                <p>您增加了新的班级成员，详情如下：</p>
                 <p>成员：<%= 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) +")" %></p>
-                <p>课程名称：<%= ma.course.name %></p>
+                <p>班级名称：<%= ma.course.name %></p>
                 <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>课程ID：<%= ma.course.id %></p>
+                <p>班级ID：<%= ma.course.id %></p>
                 <p>课时总数：<%= ma.course.class_period %></p>
             <% else %>
                 <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
                 </p>
             <% end %>
           </div>
@@ -682,7 +682,7 @@
           </li>
           <li class="homepageNewsPubType fl">
             <%=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>
+            <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"}", :target => '_blank' %>
@@ -692,8 +692,8 @@
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
-                <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了课程，详情如下：</p>
-                <p>课程名称：<%= ma.course.name %></p>
+                <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了班级，详情如下：</p>
+                <p>班级名称：<%= ma.course.name %></p>
                 <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
                 <% if !ma.content.nil? %>
                     <p>担任角色：<%= ma.content %></p>
@@ -701,7 +701,7 @@
                 <p>学时总数：<%= ma.course.class_period %></p>
             <% else %>
                 <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
                 </p>
             <% end %>
           </div>
@@ -715,7 +715,7 @@
           <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", :target => '_blank' %></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"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
@@ -725,10 +725,10 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了课程测验 ，测验详情如下：
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了班级测验 ，测验详情如下：
             </p>
             <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>测验标题：<%= ma.course_message.exercise_name %></li>
               <!--<li>测验描述：<%#= ma.course_message.exercise_description %></li>-->
               <!--<li>测验状态：<%#= ma.course_message.exercise_status == 1 ? '未发布':'已发布'%></li>-->
@@ -763,15 +763,15 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的课程测验截止时间快到了，测验详情如下：
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的班级测验截止时间快到了，测验详情如下：
             </p>
 
             <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>测验标题：<%= ma.course_message.exercise_name %></li>
               <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
               <li>答题时长：<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %></li>
-              <p>请及时完成课程测验，辛苦啦！</p>
+              <p>请及时完成班级测验，辛苦啦！</p>
             </ul>
           </div>
           <li class="homepageHomeworkContentWarn fl">截止时间快到啦 </li>
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
index d2aa29eed..633e52472 100644
--- a/app/views/users/_user_resource_type_filter.html.erb
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -5,7 +5,7 @@
         <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 1, :search => @switch_search) %>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
       </li>
       <li>
-        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 2, :search => @switch_search) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 2, :search => @switch_search) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">班级资源 </a>
         <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
       </li>
       <li>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index dbf7e301a..333bdbc0f 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -26,7 +26,7 @@
                 <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
-              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target => '_blank', :title => '查看课程' %>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
                 <span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
                 <span class="mr10"></span>班级：<%=courses.count %>
@@ -48,7 +48,7 @@
                                   <div class="cl"></div>
                                 </div>
                                 <div class="">
-                                  <p class="fl grayTxt ">更新：<%=course.time %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
+                                  <p class="fl grayTxt ">更新：<%=format_date(Time.at(course.time)) %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
                                   <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
                                   <div class="cl"></div>
                                 </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 5470d2bf3..ce7b2dad0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -17,7 +17,7 @@
                   <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
                   <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
                   <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                  <li><%= link_to "课程留言", {:controller => "users", :action => "show", :type => "course_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                  <li><%= link_to "班级留言", {:controller => "users", :action => "show", :type => "course_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
                     <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
                   <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
               <% end %>
diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index a714f53d2..4f434757f 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -33,7 +33,7 @@
                 <ul class="fl">
                   <li class="f16 mb5">
                     <a href="<%= course_path(item.id)%>" class="fontGrey3 fl"><%= item.try(:highlight).try(:name) ? item.highlight.name[0].html_safe : item.name  %></a>
-                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">课程</span></div>
+                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">班级</span></div>
                     <div class="cl"></div>
                   </li>
                   <li class="fontGrey3 mb5"><%= item.try(:highlight).try(:description) ? item.highlight.description[0].html_safe : item.description %></li>
diff --git a/app/views/welcome/_search_course_results.html.erb b/app/views/welcome/_search_course_results.html.erb
index e51452ada..322a47de5 100644
--- a/app/views/welcome/_search_course_results.html.erb
+++ b/app/views/welcome/_search_course_results.html.erb
@@ -2,16 +2,16 @@
     <% courses.each do |course|%>
         <ul class="searchContent">
           <li class="fl">
-            <%= link_to image_tag(url_to_avatar(Course.find(course.id)), :width => "75", :height => "75",:class=>'searchCourseImage'), course_path(course.id), :alt => "课程图片" %>
+            <%= link_to image_tag(url_to_avatar(Course.find(course.id)), :width => "75", :height => "75",:class=>'searchCourseImage'), course_path(course.id), :alt => "班级图片" %>
           </li>
           <li class="fl searchContentDes">
             <ul class="fl">
               <li class="f16 mb5">
                 <a href="<%= course_path(course.id)%>" class="fontGrey3 fl"><%= course.try(:highlight).try(:name) ? course.highlight.name[0].html_safe : course.name  %></a>
-                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">课程</span></div>
+                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">班级</span></div>
                 <div class="cl"></div>
               </li>
-              <li class="fontGrey3 mb5"><%= course.try(:highlight).try(:description) ? course.highlight.description[0].html_safe : (course.description.present? ? course.description : '暂时没有该课程描述') %></li>
+              <li class="fontGrey3 mb5"><%= course.try(:highlight).try(:description) ? course.highlight.description[0].html_safe : (course.description.present? ? course.description : '暂时没有该班级描述') %></li>
               <li class="f12 fontGrey2">
                 <span class="mr30">教师：<%= User.find(course.tea_id).realname %></span>
                 <span class="mr30">授课时间：<%= course.time.to_s + course.term%></span>
diff --git a/app/views/welcome/search.html.erb b/app/views/welcome/search.html.erb
index ca26ba8c3..15491c1c0 100644
--- a/app/views/welcome/search.html.erb
+++ b/app/views/welcome/search.html.erb
@@ -79,7 +79,7 @@
         <ul id="searchBanner">
           <li id="searchBaner_1" class="searchBannerActive" onclick="HoverLi(1);on_click_search(1);"><a href="javascript:void(0);" id="searchType_1" class="fontGrey3 f14">全部<span style="font-weight:normal;"><font id="searchNum_1" class="c_red">(<%= @total_count%>)</font></span></a></li>
           <li id="searchBaner_2" onclick="HoverLi(2);on_click_search(2);"><a href="javascript:void(0);" id="searchType_2" class="fontGrey2 f14">用户<span class="numRed" style="font-weight:normal;"><font id="searchNum_2" class="numRed">(<%= @users_count%>)</font></span></a></li>
-          <li id="searchBaner_3" onclick="HoverLi(3);on_click_search(3);"><a href="javascript:void(0);" id="searchType_3" class="fontGrey2 f14">课程<span style="font-weight:normal;"><font id="searchNum_3" class="numRed">(<%=@course_count%>)</font></span></a></li>
+          <li id="searchBaner_3" onclick="HoverLi(3);on_click_search(3);"><a href="javascript:void(0);" id="searchType_3" class="fontGrey2 f14">班级<span style="font-weight:normal;"><font id="searchNum_3" class="numRed">(<%=@course_count%>)</font></span></a></li>
           <li id="searchBaner_4" onclick="HoverLi(4);on_click_search(4);"><a href="javascript:void(0);" id="searchType_4" class="fontGrey2 f14">资源<span class="numRed" style="font-weight:normal;"><font id="searchNum_4" class="numRed">(<%= @attach_count%>)</font></span></a></li>
           <li id="searchBaner_5" onclick="HoverLi(5);on_click_search(5);"><a href="javascript:void(0);" id="searchType_5" class="fontGrey2 f14">项目<span class="numRed" style="font-weight:normal;"><font id="searchNum_5" class="numRed">(<%= @project_count%>)</font></span></a></li>
           <li id="searchBaner_6" onclick="HoverLi(6);on_click_search(6);"><a href="javascript:void(0);" id="searchType_6" class="fontGrey2 f14">帖子<span class="numRed" style="font-weight:normal;"><font id="searchNum_6" class="numRed">(<%= @memo_count%>)</font></span></a></li>
diff --git a/config/locales/courses/en.yml b/config/locales/courses/en.yml
index 20d9d112c..cc8ac2c0d 100644
--- a/config/locales/courses/en.yml
+++ b/config/locales/courses/en.yml
@@ -13,7 +13,7 @@ en:
   
   
   label_homework: Task
-  label_course_news: 课程通知  
+  label_course_news: 班级通知
   label_main_teacher: 主讲教师
   label_course_term: 开始学期
 
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index c16e735a7..1aa1ea666 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -16,8 +16,8 @@ zh:
   label_course_name: 课程名称
 
   label_homework: 作业
-  label_course_news: 课程通知
-  label_course_mail_news_reply: 课程通知回复
+  label_course_news: 班级通知
+  label_course_mail_news_reply: 班级通知回复
   label_main_teacher: 主讲教师
   label_course_term: 开始学期
   label_isuue_mail_status: 更新了issue状态！
@@ -27,7 +27,7 @@ zh:
   # 资源库 (课程、项目按类型分)
   label_course_file: 资源库 
   label_upload_files: 上传资源
-  label_apply_join_course: 申请加入课程
+  label_apply_join_course: 申请加入班级
   label_apply_for_homework: 申请引用作业
   #
   #  课程托管平台主页
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 41e70639c..996def8c0 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -354,12 +354,12 @@ zh:
   permission_as_student: 作为学生
   permission_paret_in_homework: 加入作业
   permission_view_homework_attaches: 查看作品附件
-  permission_view_course_journals_for_messages: 查看课程留言
-  view_course_journals_for_messages: 课程留言
+  permission_view_course_journals_for_messages: 查看班级留言
+  view_course_journals_for_messages: 班级留言
   label_send_course_journals_for_messages: 发布了留言
   label_send_course_messages: 发布了讨论
   permission_select_course_modules: 选择课程模块
-  permission_view_course_files: 查看课程资源
+  permission_view_course_files: 查看班级资源
   permission_add_course: 新建课程
   permission_edit_course: 编辑课程
   permission_select_contest_modules: 选择竞赛模块
@@ -485,7 +485,7 @@ zh:
   label_new_course: 课程列表
   label_course_all: 课程列表
   label_excellent_courses_list: 精品课程列表
-  label_course_resource_list: 课程资源列表
+  label_course_resource_list: 班级资源列表
   label_project_resource_list: 項目资源列表
   label_teacher_all: 所有教师
   label_requirement_enterprise_list: 众包列表
@@ -1538,7 +1538,7 @@ zh:
   label_my_brief_introduction: 今天的心情如何？留下你的脚印吧~
   label_time: 年度
 
-  label_main_term: 课程学期
+  label_main_term: 班级学期
   label_teacher_work_unit: 教师单位
   label_course_time: 课程年度
   label_i_new_activity: 有了新活动在
@@ -1719,7 +1719,7 @@ zh:
   label_assign_homework: 中布置了作业
   label_noawards: 未评奖
 
-  label_course_modify_settings: 配置课程
+  label_course_modify_settings: 配置班级
   label_homework_prompt: 贴心小提示：
   label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以
   label_create_homework: 布置了作业：
@@ -1734,13 +1734,13 @@ zh:
   label_search_by_student_id: 按学号过滤
   label_institution_name: 单位名称
   label_duration_time: 授课时间
-  label_course_brief_introduction: 课程简介
+  label_course_brief_introduction: 班级简介
   field_teacher_name: 教 师
 
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
-  label_borad_course: 课程问答区
+  label_borad_course: 班级问答区
   label_borad_org_subfield: 资源栏目讨论区
   view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功
@@ -1850,7 +1850,7 @@ zh:
   label_contest_notification: 竞赛通知
   label_company_name: 组织名
 
-  label_coursefile_sharingarea: 课程资源共享区
+  label_coursefile_sharingarea: 班级资源共享区
 
 
   label_x_activity:
@@ -1919,7 +1919,7 @@ zh:
   label_attendingcontestwork_adaptive_system: 系统支持
   label_attendingcontestwork_download: 作品下载
   label_course_attendingcontestwork_download: 课件下载
-  label_course_mail_files: 课程资源
+  label_course_mail_files: 班级资源
   label_attendingcontestwork_developers: 开发人员
   label_attendingcontestwork_average_scores: 平均评分
   label_attendingcontestwork_release_time: 发布时间
@@ -1939,7 +1939,7 @@ zh:
   label_notification: 通知公告
   label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！
   label_course_adcolick: 请点击：
-  label_coursejoin_tip: 提示：加入课程才有权限查看或提交作业，“加入”按钮见课程图标右侧！
+  label_coursejoin_tip: 提示：加入班级才有权限查看或提交作业，“加入”按钮见班级图标右侧！
 
   # ajax异步验证
   modal_valid_passing: 可以使用
@@ -2047,7 +2047,7 @@ zh:
   label_recently_updated_homework: 最近更新了作业
   label_recently_updated_message: 最近更新了留言
   label_recently_updated_courseware: 最近更新了课件
-  label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
+  label_no_courses: 您没有参与任何班级，请搜索班级、加入班级，或者创建班级吧！
   label_commit_failed: 提交失败
   label_recently: 最近被
   label_creat: 创建
@@ -2124,7 +2124,7 @@ zh:
 
   # 课程推荐
   label_homework_commont: 作业
-  label_homework_recommendation: 课程推荐
+  label_homework_recommendation: 班级推荐
 
   #资源
   label_resource_name: 资源名称
diff --git a/config/routes.rb b/config/routes.rb
index 673bb2c69..a491726f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1076,6 +1076,8 @@ RedmineApp::Application.routes.draw do
   resources :syllabuses do
     member do
       match 'syllabus_courselist', :to => 'syllabuses#syllabus_courselist', :via => :get, :as => 'syllabus_courselist'
+      get 'edit_syllabus_eng_name'
+      post 'update_base_info'
     end
 
     collection do
diff --git a/db/migrate/20160630112733_rename_syllabus_column.rb b/db/migrate/20160630112733_rename_syllabus_column.rb
new file mode 100644
index 000000000..a461672dd
--- /dev/null
+++ b/db/migrate/20160630112733_rename_syllabus_column.rb
@@ -0,0 +1,8 @@
+class RenameSyllabusColumn < ActiveRecord::Migration
+  def up
+    rename_column :syllabuses, :type, :syllabus_type
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bf9d24b3e..d4fe1b785 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 => 20160629094716) do
+ActiveRecord::Schema.define(:version => 20160630112733) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1125,6 +1125,23 @@ ActiveRecord::Schema.define(:version => 20160629094716) 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"
@@ -1851,7 +1868,7 @@ ActiveRecord::Schema.define(:version => 20160629094716) do
     t.datetime "created_at",                      :null => false
     t.datetime "updated_at",                      :null => false
     t.string   "eng_name"
-    t.integer  "type"
+    t.integer  "syllabus_type"
     t.integer  "credit"
     t.integer  "hours"
     t.integer  "theory_hours"
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index cc188f978..4b578366d 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -13,7 +13,7 @@
                         </tr>
                         <tr>
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
+                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;班级问答区</td>
                     </tr></table>
                     <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                     <div class="cl"></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index e3346ea93..f30105d40 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -12,7 +12,7 @@
                 </tr>
                     <tr>
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
+                        <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;班级通知</td>
                     </tr></table>
                 <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
                 <div class="cl"></div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 142b0be42..c67efb191 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1545,17 +1545,6 @@ function show_edit_file_description(id) {
     $("#file_description_edit_"+id).focus();
 }
 
-//编辑资源描述之后提交
-function edit_file_description(url,id){
-    $.get(
-        url,
-        {id: id ,description: $("#file_description_edit_"+id).val() },
-        function (data) {
-
-        }
-    );
-}
-
 //展开课程大纲列表中的班级
 function expand_course_list(id, target, btnid, count) {
     var target = $(target);
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index fb272cfd0..8215f3aa1 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -184,13 +184,17 @@ function regex_course_password(str)
 }
 //验证课程大纲
 function regex_syllabus_option(str) {
-    var obj = document.getElementById(str + "_syllabus_id");
-    var syllabus = obj.options[obj.selectedIndex];
-    if(parseInt(syllabus.value) == 0) {
-        $("#"+str+"_syllabus_notice").show();
-        return false;
-    } else{
-        $("#"+str+"_syllabus_notice").hide();
+    if(document.getElementById(str + "_syllabus_id")) {
+        var obj = document.getElementById(str + "_syllabus_id");
+        var syllabus = obj.options[obj.selectedIndex];
+        if(parseInt(syllabus.value) == 0) {
+            $("#"+str+"_syllabus_notice").show();
+            return false;
+        } else{
+            $("#"+str+"_syllabus_notice").hide();
+            return true;
+        }
+    } else {
         return true;
     }
 }
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index 50e779ce1..f65ddf11b 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -28,4 +28,84 @@ function submit_syllabus() {
     if (regex_sylla_description()) {
         $("#syllabus-form").submit();
     }
+}
+
+//编辑英文名称
+function show_edit_eng_name() {
+    $("#syllabus_eng_name_show").hide();
+    $("#syllabus_eng_name_edit").show();
+    $("#syllabus_eng_name_edit").focus();
+}
+
+//编辑英文名称之后提交
+function edit_syllabus_eng_name(url){
+    $.get(
+        url,
+        { eng_name: $("#syllabus_eng_name_edit").val() },
+        function (data) {
+
+        }
+    );
+}
+
+//编辑资源描述之后提交
+function edit_file_description(url,id){
+    $.get(
+        url,
+        {id: id ,description: $("#file_description_edit_"+id).val() },
+        function (data) {
+
+        }
+    );
+}
+
+//展开所有属性
+function toggle_all_syllabus_attr(){
+    var btn = $("#show_all_syllabus_attr");
+    var target = $("#all_syllabus_attr li");
+    var none = $("#all_syllabus_attr li.none_attr");
+    if(btn.data('init')=='0'){
+        btn.data('init',1);
+        btn.removeClass('homepageLeftMenuMoreIcon');
+        btn.addClass('homepageLeftMenuHideIcon');
+        target.show();
+    }else{
+        btn.data('init',0);
+        btn.addClass('homepageLeftMenuMoreIcon');
+        btn.removeClass('homepageLeftMenuHideIcon');
+        none.hide();
+    }
+}
+
+function update_syllabus_info(){
+    if(regex_syllabus_credit('credit') && regex_syllabus_credit('hours') && regex_syllabus_credit('theory_hours') && regex_syllabus_credit('practice_hours')) {
+        $("#submit_edit_info").parent().submit();
+    }
+}
+
+function regex_syllabus_credit(str){
+    var num = $.trim($("#syllabus_"+str+"_input").val());
+    var regex = /^\d*$/;
+    if(num.length > 0)
+    {
+        if (regex.test(num)) {
+            if(parseInt(num) > 0)
+            {
+                $("#syllabus_"+str+"_notice").hide();
+                return true;
+            } else
+            {
+                $("#syllabus_"+str+"_notice").show();
+                $("#syllabus_"+str+"_input").focus();
+                return false;
+            }
+        } else {
+            $("#syllabus_"+str+"_notice").show();
+            $("#syllabus_"+str+"_input").focus();
+            return false;
+        }
+    } else {
+        return true;
+    }
+
 }
\ No newline at end of file

From 3b7679b25431277b2086d24a3e686dc467756693 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 11:29:03 +0800
Subject: [PATCH 639/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 1cf3347c7..e967383f6 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -17,15 +17,17 @@
     <div class="cl"></div>
   </div>
 
-  <div class="syllabus_courses_box">
+
     <% if @syllabus.any? %>
         <% @syllabus.each_with_index do |syllabus, index|%>
+          <div class="syllabus_courses_box">
             <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
                 <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
+              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target => '_blank', :title => '查看课程' %>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
                 <span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
                 <span class="mr10"></span>班级：<%=courses.count %>
@@ -65,10 +67,8 @@
                 <% end %>
               </ul>
             </div><!--syllabus_class_box end-->
-
-
-            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
-        <% end %>
+          </div>
+      <% end %>
         <div>
           <ul class="wlist" id="pages" >
             <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
@@ -78,7 +78,6 @@
     <% else %>
         <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-  </div>
 </div>
 
 <script type="text/javascript">
@@ -91,22 +90,23 @@
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
             $(".syllabus_box").css("height", tmpHeight);
         }
-        $(".syllabus_courses_list").toggle(function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+        $(".sy_courses_open").toggle(function(){
+            //$(this).hide();
+            $(this).parent().next().hide();
+            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
             //$(this).parent().next().show();
         },function(){
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+            $(this).parent().next().show();
+            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
         });
         $(".sy_courses_close").toggle(function(){
             //$(this).hide();
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+            $(this).parent().next().show();
+            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
             //$(this).parent().next().show();
         },function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+            $(this).parent().next().hide();
+            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
         });
     });
 </script>
\ No newline at end of file

From b2aee9b1b80b5eddf71552edf99101f96b02d2ce Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 13:52:22 +0800
Subject: [PATCH 640/668] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index b1d7bf32d..a1c3f7665 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -32,7 +32,7 @@ class SyllabusesController < ApplicationController
       @syllabus.title = params[:title]
       @syllabus.eng_name = params[:eng_name]
       @syllabus.user_id = User.current.id
-      @syllabus.description = Message.where("id = 17848").first.nil? ? '' : Message.where("id = 17848").first.content
+      @syllabus.description = Message.where("id = 19412").first.nil? ? '' : Message.where("id = 19412").first.content
       if @syllabus && @syllabus.save
         respond_to do |format|
           flash[:notice] = l(:notice_successful_create)

From 7633761bbed8b1a43dd30e5d4228263408e520e6 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 1 Jul 2016 13:54:00 +0800
Subject: [PATCH 641/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb | 41 +++++++++++---------
 app/views/users/user_newfeedback.html.erb    |  2 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 153e11592..a9854566e 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -17,9 +17,9 @@
     <div class="cl"></div>
   </div>
 
-  <div class="syllabus_courses_box">
     <% if @syllabus.any? %>
         <% @syllabus.each_with_index do |syllabus, index|%>
+          <div class="syllabus_courses_box">
             <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
@@ -68,6 +68,7 @@
 
 
             <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+          </div>
         <% end %>
         <div>
           <ul class="wlist" id="pages" >
@@ -78,7 +79,6 @@
     <% else %>
         <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-  </div>
 </div>
 
 <script type="text/javascript">
@@ -91,22 +91,27 @@
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
             $(".syllabus_box").css("height", tmpHeight);
         }
-        $(".syllabus_courses_list").toggle(function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-        });
-        $(".sy_courses_close").toggle(function(){
-            //$(this).hide();
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+
+        $(".syllabus_courses_list").each(function(){
+            var syStaust = $(this).children(":first-child");
+
+            if (syStaust.hasClass("sy_courses_open")){
+                $(this).toggle(function(){
+                    $(this).next().hide();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                },function(){
+                    $(this).next().show();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                });
+            }else{
+                $(this).toggle(function(){
+                    $(this).next().show();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                },function(){
+                    $(this).next().hide();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                });
+            }
         });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 24f625e03..ddf686b6a 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -19,7 +19,7 @@
         <%= form_for('new_form',:url =>  leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
             <%=render :partial => "jour_form", :locals => {:f => f} %>
             <input id="private_flag" name="private" type="hidden" value="0"/>
-            <a href="javascript:void(0);" class="blue_n_btn fr" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
+            <a href="javascript:void(0);" class="blue_n_btn fr mt5" id="submit_feedback_user" >留言</a>
             <a href="javascript:void(0);" class="greyBtn2 postReplySubmit mt5 mr15" id="private_submit_feedback_user">私信</a>
         <% end %>
       </div>

From afe16cc99c2ae25f1d40d05ab72dcd69332f7ae1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 14:13:40 +0800
Subject: [PATCH 642/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84js=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index a9854566e..3cc7bf61c 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -67,7 +67,7 @@
             </div><!--syllabus_class_box end-->
 
 
-            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target =>'_blank', :title => '查看课程' %>
           </div>
         <% end %>
         <div>
@@ -89,7 +89,7 @@
         if (rightHeight < leftHeight) {
             var diffHeight = leftHeight - rightHeight;
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
-            $(".syllabus_box").css("height", tmpHeight);
+            $(".syllabus_box").css("minHeight", tmpHeight);
         }
 
         $(".syllabus_courses_list").each(function(){

From 5f1fd2239bdb695b350f796cc87c8ec80309c4ed Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 1 Jul 2016 14:20:48 +0800
Subject: [PATCH 643/668] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 4531 +++++++++++++++++++++++++-------------------------
 1 file changed, 2257 insertions(+), 2274 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 77d891740..f297f7fb1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,2274 +1,2257 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20160630112733) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    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"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "apply_resources", :force => true do |t|
-    t.integer  "status"
-    t.integer  "user_id"
-    t.integer  "attachment_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.text     "content"
-    t.integer  "apply_user_id"
-  end
-
-  create_table "at_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "at_message_id"
-    t.string   "at_message_type"
-    t.boolean  "viewed",          :default => false
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.integer  "sender_id"
-  end
-
-  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
-
-  create_table "attachment_histories", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.string   "filename",                     :default => ""
-    t.string   "disk_filename",                :default => ""
-    t.integer  "filesize",                     :default => 0
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => ""
-    t.integer  "downloads",                    :default => 0
-    t.integer  "author_id"
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "version"
-    t.integer  "attachment_id"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "homepage_id"
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-    t.integer "org_subfield_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "code_tests", :force => true do |t|
-    t.integer  "homework_id"
-    t.integer  "wait_time",       :default => 0
-    t.integer  "language"
-    t.integer  "status"
-    t.integer  "time_used",       :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "student_work_id", :default => 0
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_contributor_scores", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    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",          :default => 0
-    t.integer  "homework_journal_num", :default => 0
-    t.integer  "news_num",             :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    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"
-  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                        :default => 1
-    t.integer  "attachmenttype",                :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",        :limit => 1, :default => 1
-    t.integer  "inherit_members",  :limit => 1, :default => 1
-    t.integer  "open_student",                  :default => 0
-    t.integer  "outline",                       :default => 0
-    t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete",                     :default => 0
-    t.integer  "end_time"
-    t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
-    t.integer  "is_copy",                       :default => 0
-    t.integer  "visits",                        :default => 0
-    t.integer  "syllabus_id"
-    t.string   "invite_code"
-    t.string   "qrcode"
-  end
-
-  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
-  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "editor_of_documents", :force => true do |t|
-    t.integer  "editor_id"
-    t.integer  "org_document_comment_id"
-    t.datetime "created_at"
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "exercise_answers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_choices", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.text     "choice_text"
-    t.integer  "choice_position"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
-    t.integer  "question_type"
-    t.integer  "question_number"
-    t.integer  "exercise_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_score"
-  end
-
-  create_table "exercise_standard_answers", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_id"
-    t.integer  "score"
-    t.datetime "start_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.datetime "end_at"
-    t.integer  "status"
-  end
-
-  create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
-    t.text     "exercise_description"
-    t.integer  "course_id"
-    t.integer  "exercise_status"
-    t.integer  "user_id"
-    t.integer  "time"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-    t.datetime "publish_time"
-    t.datetime "end_time"
-    t.integer  "show_result"
-  end
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
-  end
-
-  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
-  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "forwards", :force => true do |t|
-    t.integer  "from_id"
-    t.string   "from_type"
-    t.integer  "to_id"
-    t.string   "to_type"
-    t.datetime "created_at"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type",     :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "teacher_priority",  :default => 1
-    t.integer  "anonymous_comment", :default => 0
-    t.integer  "quotes",            :default => 0
-    t.integer  "is_open",           :default => 0
-    t.datetime "simi_time"
-  end
-
-  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
-
-  create_table "homework_detail_groups", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "min_num"
-    t.integer  "max_num"
-    t.integer  "base_on_project"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "mail"
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                                 :null => false
-    t.datetime "updated_on",                                 :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-    t.integer  "private",                     :default => 0
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
-  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    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"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
-  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-    t.integer  "reply_id"
-    t.integer  "quotes"
-    t.integer  "status",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",           :limit => 60, :default => "", :null => false
-    t.string   "summary",                       :default => ""
-    t.text     "description"
-    t.integer  "author_id",                     :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",                :default => 0,  :null => false
-    t.integer  "course_id"
-    t.integer  "sticky",                        :default => 0
-    t.integer  "org_subfield_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "org_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "org_act_id"
-    t.string   "org_act_type"
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "org_courses", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "course_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_document_comments", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.integer  "organization_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "org_subfield_id"
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_member_roles", :force => true do |t|
-    t.integer "org_member_id"
-    t.integer "role_id"
-  end
-
-  create_table "org_members", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "sender_id"
-    t.integer  "organization_id"
-    t.string   "message_type"
-    t.integer  "message_id"
-    t.integer  "viewed"
-    t.string   "content"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_projects", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_subfield_messages", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_subfields", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 1
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "creator_id"
-    t.integer  "home_id"
-    t.boolean  "is_public"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    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|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-    t.integer  "board_num",         :default => 0
-    t.integer  "attach_num",        :default => 0
-    t.datetime "commit_time"
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",                   :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",               :default => ""
-    t.boolean  "is_public",              :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",                 :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",        :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",            :default => false, :null => false
-    t.integer  "attachmenttype",         :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",               :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "commits_count",          :default => 0
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "issues_count",           :default => 0
-    t.integer  "attachments_count",      :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
-    t.integer  "visits",                 :default => 0
-    t.integer  "hot",                    :default => 0
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "quality_analyses", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "author_login"
-    t.string   "rep_identifier"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sonar_version",  :default => 0
-    t.string   "path"
-    t.string   "branch"
-    t.string   "language"
-  end
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "rep_statics", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "commits_num"
-    t.string   "uname"
-    t.string   "email"
-    t.integer  "add"
-    t.integer  "del"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "changeset"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-    t.string   "pinyin"
-  end
-
-  create_table "secdomains", :force => true do |t|
-    t.integer  "sub_type"
-    t.string   "subname"
-    t.integer  "pid",        :default => 0
-    t.string   "desc"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.integer  "shield_id"
-    t.string   "shield_type"
-    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"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    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"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.integer  "is_leader"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
-  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
-  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
-  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    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"
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  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"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "syllabuses", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.string   "eng_name"
-    t.integer  "syllabus_type"
-    t.integer  "credit"
-    t.integer  "hours"
-    t.integer  "theory_hours"
-    t.integer  "practice_hours"
-    t.string   "applicable_major"
-    t.string   "pre_course"
-    t.integer  "visits",           :default => 0
-    t.integer  "des_status",       :default => 0
-  end
-
-  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_actions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "action_type"
-    t.integer  "action_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
-  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-    t.integer  "gid"
-    t.integer  "visits",                          :default => 0
-    t.integer  "excellent_teacher",               :default => 0
-    t.integer  "excellent_student",               :default => 0
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20160630112733) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    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"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
+  create_table "at_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "at_message_id"
+    t.string   "at_message_type"
+    t.boolean  "viewed",          :default => false
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.integer  "sender_id"
+  end
+
+  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
+
+  create_table "attachment_histories", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.string   "filename",                     :default => ""
+    t.string   "disk_filename",                :default => ""
+    t.integer  "filesize",                     :default => 0
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => ""
+    t.integer  "downloads",                    :default => 0
+    t.integer  "author_id"
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "version"
+    t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type", :limit => 30
+    t.string   "filename",                     :default => "", :null => false
+    t.string   "disk_filename",                :default => "", :null => false
+    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                    :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  end
+
+  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
+  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
+  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
+
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
+  create_table "auth_sources", :force => true do |t|
+    t.string  "type",              :limit => 30, :default => "",    :null => false
+    t.string  "name",              :limit => 60, :default => "",    :null => false
+    t.string  "host",              :limit => 60
+    t.integer "port"
+    t.string  "account"
+    t.string  "account_password",                :default => ""
+    t.string  "base_dn"
+    t.string  "attr_login",        :limit => 30
+    t.string  "attr_firstname",    :limit => 30
+    t.string  "attr_lastname",     :limit => 30
+    t.string  "attr_mail",         :limit => 30
+    t.boolean "onthefly_register",               :default => false, :null => false
+    t.boolean "tls",                             :default => false, :null => false
+    t.string  "filter"
+    t.integer "timeout"
+  end
+
+  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
+
+  create_table "biding_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "bids", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",                                    :null => false
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.text     "description"
+    t.datetime "created_on",                                :null => false
+    t.datetime "updated_on",                                :null => false
+    t.integer  "commit"
+    t.integer  "reward_type"
+    t.integer  "homework_type"
+    t.integer  "parent_id"
+    t.string   "password"
+    t.integer  "is_evaluation"
+    t.integer  "proportion",                :default => 60
+    t.integer  "comment_status",            :default => 0
+    t.integer  "evaluation_num",            :default => 3
+    t.integer  "open_anonymous_evaluation", :default => 1
+  end
+
+  create_table "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "homepage_id"
+  end
+
+  create_table "boards", :force => true do |t|
+    t.integer "project_id",                      :null => false
+    t.string  "name",            :default => "", :null => false
+    t.string  "description"
+    t.integer "position",        :default => 1
+    t.integer "topics_count",    :default => 0,  :null => false
+    t.integer "messages_count",  :default => 0,  :null => false
+    t.integer "last_message_id"
+    t.integer "parent_id"
+    t.integer "course_id"
+    t.integer "org_subfield_id"
+  end
+
+  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
+  add_index "boards", ["project_id"], :name => "boards_project_id"
+
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "changes", :force => true do |t|
+    t.integer "changeset_id",                               :null => false
+    t.string  "action",        :limit => 1, :default => "", :null => false
+    t.text    "path",                                       :null => false
+    t.text    "from_path"
+    t.string  "from_revision"
+    t.string  "revision"
+    t.string  "branch"
+  end
+
+  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
+
+  create_table "changeset_parents", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "parent_id",    :null => false
+  end
+
+  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
+  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
+
+  create_table "changesets", :force => true do |t|
+    t.integer  "repository_id", :null => false
+    t.string   "revision",      :null => false
+    t.string   "committer"
+    t.datetime "committed_on",  :null => false
+    t.text     "comments"
+    t.date     "commit_date"
+    t.string   "scmid"
+    t.integer  "user_id"
+  end
+
+  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
+  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
+  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
+  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
+  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
+
+  create_table "changesets_issues", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "issue_id",     :null => false
+  end
+
+  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
+
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
+  create_table "code_tests", :force => true do |t|
+    t.integer  "homework_id"
+    t.integer  "wait_time",       :default => 0
+    t.integer  "language"
+    t.integer  "status"
+    t.integer  "time_used",       :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "student_work_id", :default => 0
+  end
+
+  create_table "comments", :force => true do |t|
+    t.string   "commented_type", :limit => 30, :default => "", :null => false
+    t.integer  "commented_id",                 :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.text     "comments"
+    t.datetime "created_on",                                   :null => false
+    t.datetime "updated_on",                                   :null => false
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "contests", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
+
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
+  create_table "course_contributor_scores", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    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",          :default => 0
+    t.integer  "homework_journal_num", :default => 0
+    t.integer  "news_num",             :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    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"
+  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
+
+  create_table "course_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "course_id"
+    t.float    "grade",            :default => 0.0
+    t.integer  "course_ac_para",   :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "courses", :force => true do |t|
+    t.integer  "tea_id"
+    t.string   "name"
+    t.integer  "state"
+    t.string   "code"
+    t.integer  "time"
+    t.string   "extra"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.string   "location"
+    t.string   "term"
+    t.string   "string"
+    t.string   "password"
+    t.string   "setup_time"
+    t.string   "endup_time"
+    t.string   "class_period"
+    t.integer  "school_id"
+    t.text     "description"
+    t.integer  "status",                        :default => 1
+    t.integer  "attachmenttype",                :default => 2
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "is_public",        :limit => 1, :default => 1
+    t.integer  "inherit_members",  :limit => 1, :default => 1
+    t.integer  "open_student",                  :default => 0
+    t.integer  "outline",                       :default => 0
+    t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete",                     :default => 0
+    t.integer  "end_time"
+    t.string   "end_term"
+    t.integer  "is_excellent",                  :default => 0
+    t.integer  "excellent_option",              :default => 0
+    t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
+    t.string   "invite_code"
+    t.string   "qrcode"
+  end
+
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
+  add_index "documents", ["project_id"], :name => "documents_project_id"
+
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
+    t.string   "File"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "editor_of_documents", :force => true do |t|
+    t.integer  "editor_id"
+    t.integer  "org_document_comment_id"
+    t.datetime "created_at"
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "exercise_answers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_choices", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_questions", :force => true do |t|
+    t.text     "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "exercise_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_score"
+  end
+
+  create_table "exercise_standard_answers", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_id"
+    t.integer  "score"
+    t.datetime "start_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.datetime "end_at"
+    t.integer  "status"
+  end
+
+  create_table "exercises", :force => true do |t|
+    t.text     "exercise_name"
+    t.text     "exercise_description"
+    t.integer  "course_id"
+    t.integer  "exercise_status"
+    t.integer  "user_id"
+    t.integer  "time"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.integer  "show_result"
+  end
+
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.text     "description"
+    t.string   "page_type"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
+  end
+
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
+  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
+
+  create_table "forums", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.text     "description"
+    t.integer  "topic_count",  :default => 0
+    t.integer  "memo_count",   :default => 0
+    t.integer  "last_memo_id", :default => 0
+    t.integer  "creator_id",                  :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "sticky"
+    t.integer  "locked"
+  end
+
+  create_table "forwards", :force => true do |t|
+    t.integer  "from_id"
+    t.string   "from_type"
+    t.integer  "to_id"
+    t.string   "to_type"
+    t.datetime "created_at"
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id", :null => false
+    t.integer "user_id",  :null => false
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
+
+  create_table "homework_attaches", :force => true do |t|
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.string   "reward"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "state"
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
+  end
+
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
+  create_table "homework_commons", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.text     "description"
+    t.date     "publish_time"
+    t.date     "end_time"
+    t.integer  "homework_type",     :default => 1
+    t.string   "late_penalty"
+    t.integer  "course_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
+    t.integer  "quotes",            :default => 0
+    t.integer  "is_open",           :default => 0
+    t.datetime "simi_time"
+  end
+
+  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
+
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "mail"
+  end
+
+  create_table "issue_categories", :force => true do |t|
+    t.integer "project_id",                   :default => 0,  :null => false
+    t.string  "name",           :limit => 30, :default => "", :null => false
+    t.integer "assigned_to_id"
+  end
+
+  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
+  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
+
+  create_table "issue_relations", :force => true do |t|
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
+    t.integer "delay"
+  end
+
+  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
+  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
+  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
+
+  create_table "issue_statuses", :force => true do |t|
+    t.string  "name",               :limit => 30, :default => "",    :null => false
+    t.boolean "is_closed",                        :default => false, :null => false
+    t.boolean "is_default",                       :default => false, :null => false
+    t.integer "position",                         :default => 1
+    t.integer "default_done_ratio"
+  end
+
+  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
+  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
+  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
+
+  create_table "issues", :force => true do |t|
+    t.integer  "tracker_id",                              :null => false
+    t.integer  "project_id",                              :null => false
+    t.string   "subject",              :default => "",    :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.integer  "category_id"
+    t.integer  "status_id",                               :null => false
+    t.integer  "assigned_to_id"
+    t.integer  "priority_id",                             :null => false
+    t.integer  "fixed_version_id"
+    t.integer  "author_id",                               :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.date     "start_date"
+    t.integer  "done_ratio",           :default => 0,     :null => false
+    t.float    "estimated_hours"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "is_private",           :default => false, :null => false
+    t.datetime "closed_on"
+    t.integer  "project_issues_index"
+  end
+
+  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
+  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
+  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
+  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
+  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
+  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
+  add_index "issues", ["project_id"], :name => "issues_project_id"
+  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
+  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
+  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
+
+  create_table "join_in_competitions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "competition_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "join_in_contests", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "bid_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "journal_details", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+
+  create_table "journal_replies", :id => false, :force => true do |t|
+    t.integer "journal_id"
+    t.integer "user_id"
+    t.integer "reply_id"
+  end
+
+  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
+  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
+  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
+
+  create_table "journals", :force => true do |t|
+    t.integer  "journalized_id",                 :default => 0,     :null => false
+    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
+    t.integer  "user_id",                        :default => 0,     :null => false
+    t.text     "notes"
+    t.datetime "created_on",                                        :null => false
+    t.boolean  "private_notes",                  :default => false, :null => false
+  end
+
+  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
+  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
+  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
+  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
+
+  create_table "journals_for_messages", :force => true do |t|
+    t.integer  "jour_id"
+    t.string   "jour_type"
+    t.integer  "user_id"
+    t.text     "notes"
+    t.integer  "status"
+    t.integer  "reply_id"
+    t.datetime "created_on",                                 :null => false
+    t.datetime "updated_on",                                 :null => false
+    t.string   "m_parent_id"
+    t.boolean  "is_readed"
+    t.integer  "m_reply_count"
+    t.integer  "m_reply_id"
+    t.integer  "is_comprehensive_evaluation"
+    t.integer  "private",                     :default => 0
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
+  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
+  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
+
+  create_table "messages", :force => true do |t|
+    t.integer  "board_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",       :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "last_reply_id"
+    t.datetime "created_on",                       :null => false
+    t.datetime "updated_on",                       :null => false
+    t.boolean  "locked",        :default => false
+    t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
+    t.integer  "quotes"
+    t.integer  "status",        :default => 0
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",           :limit => 60, :default => "", :null => false
+    t.string   "summary",                       :default => ""
+    t.text     "description"
+    t.integer  "author_id",                     :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",                :default => 0,  :null => false
+    t.integer  "course_id"
+    t.integer  "sticky",                        :default => 0
+    t.integer  "org_subfield_id"
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :null => false
+  end
+
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
+  create_table "org_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "org_act_id"
+    t.string   "org_act_type"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "org_courses", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "course_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_document_comments", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.integer  "organization_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_member_roles", :force => true do |t|
+    t.integer "org_member_id"
+    t.integer "role_id"
+  end
+
+  create_table "org_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "organization_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "sender_id"
+    t.integer  "organization_id"
+    t.string   "message_type"
+    t.integer  "message_id"
+    t.integer  "viewed"
+    t.string   "content"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.boolean  "is_public"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    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|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "poll_answers", :force => true do |t|
+    t.integer  "poll_question_id"
+    t.text     "answer_text"
+    t.integer  "answer_position"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "poll_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "is_necessary"
+    t.integer  "poll_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
+  end
+
+  create_table "poll_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "poll_votes", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
+    t.text     "vote_text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "polls", :force => true do |t|
+    t.string   "polls_name"
+    t.string   "polls_type"
+    t.integer  "polls_group_id"
+    t.integer  "polls_status"
+    t.integer  "user_id"
+    t.datetime "published_at"
+    t.datetime "closed_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
+  end
+
+  create_table "praise_tread_caches", :force => true do |t|
+    t.integer  "object_id",   :null => false
+    t.string   "object_type"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "praise_treads", :force => true do |t|
+    t.integer  "user_id",                  :null => false
+    t.integer  "praise_tread_object_id"
+    t.string   "praise_tread_object_type"
+    t.integer  "praise_or_tread"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "project_infos", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "project_scores", :force => true do |t|
+    t.string   "project_id"
+    t.integer  "score"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "issue_num",         :default => 0
+    t.integer  "issue_journal_num", :default => 0
+    t.integer  "news_num",          :default => 0
+    t.integer  "documents_num",     :default => 0
+    t.integer  "changeset_num",     :default => 0
+    t.integer  "board_message_num", :default => 0
+    t.integer  "board_num",         :default => 0
+    t.integer  "attach_num",        :default => 0
+    t.datetime "commit_time"
+  end
+
+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+    t.integer "project_type"
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
+  end
+
+  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string   "name",                   :default => "",    :null => false
+    t.text     "description"
+    t.string   "homepage",               :default => ""
+    t.boolean  "is_public",              :default => true,  :null => false
+    t.integer  "parent_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "identifier"
+    t.integer  "status",                 :default => 1,     :null => false
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "inherit_members",        :default => false, :null => false
+    t.integer  "project_type"
+    t.boolean  "hidden_repo",            :default => false, :null => false
+    t.integer  "attachmenttype",         :default => 1
+    t.integer  "user_id"
+    t.integer  "dts_test",               :default => 0
+    t.string   "enterprise_name"
+    t.integer  "organization_id"
+    t.integer  "project_new_type"
+    t.integer  "gpid"
+    t.integer  "forked_from_project_id"
+    t.integer  "forked_count"
+    t.integer  "commits_count",          :default => 0
+    t.integer  "publish_resource",       :default => 0
+    t.integer  "issues_count",           :default => 0
+    t.integer  "attachments_count",      :default => 0
+    t.integer  "boards_count",           :default => 0
+    t.integer  "news_count",             :default => 0
+    t.integer  "acts_count",             :default => 0
+    t.integer  "journals_count",         :default => 0
+    t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
+    t.integer  "hot",                    :default => 0
+  end
+
+  add_index "projects", ["lft"], :name => "index_projects_on_lft"
+  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
+
+  create_table "projects_trackers", :id => false, :force => true do |t|
+    t.integer "project_id", :default => 0, :null => false
+    t.integer "tracker_id", :default => 0, :null => false
+  end
+
+  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
+  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
+
+  create_table "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+  end
+
+  create_table "queries", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",          :default => "",    :null => false
+    t.text    "filters"
+    t.integer "user_id",       :default => 0,     :null => false
+    t.boolean "is_public",     :default => false, :null => false
+    t.text    "column_names"
+    t.text    "sort_criteria"
+    t.string  "group_by"
+    t.string  "type"
+  end
+
+  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
+  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
+
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "parent_id"
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",                          :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
+    t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
+  end
+
+  create_table "rep_statics", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "commits_num"
+    t.string   "uname"
+    t.string   "email"
+    t.integer  "add"
+    t.integer  "del"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "changeset"
+  end
+
+  create_table "repositories", :force => true do |t|
+    t.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
+    t.string  "type"
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
+    t.text    "extra_info"
+    t.string  "identifier"
+    t.boolean "is_default",                  :default => false
+    t.boolean "hidden",                      :default => false
+  end
+
+  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
+
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
+    t.text    "permissions"
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+  end
+
+  create_table "schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "logo_link"
+    t.string   "pinyin"
+  end
+
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",         :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                                        :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "is_teacher_score",              :default => 0
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string   "name",       :default => "", :null => false
+    t.text     "value"
+    t.datetime "updated_on"
+  end
+
+  add_index "settings", ["name"], :name => "index_settings_on_name"
+
+  create_table "shares", :force => true do |t|
+    t.date     "created_on"
+    t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "description"
+  end
+
+  create_table "shield_activities", :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 "shield_wechat_messages", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "shield_id"
+    t.string   "shield_type"
+    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"
+    t.integer  "app_type_id"
+    t.string   "app_type_name"
+    t.string   "android_min_version_available"
+    t.integer  "user_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "contest_id"
+    t.integer  "softapplication_id"
+    t.integer  "is_public"
+    t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    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"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
+  end
+
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    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"
+
+  create_table "student_works_evaluation_distributions", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "student_works_scores", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.integer  "score"
+    t.text     "comment"
+    t.integer  "reviewer_role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  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"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.string   "eng_name"
+    t.integer  "syllabus_type"
+    t.integer  "credit"
+    t.integer  "hours"
+    t.integer  "theory_hours"
+    t.integer  "practice_hours"
+    t.string   "applicable_major"
+    t.string   "pre_course"
+    t.integer  "visits",           :default => 0
+    t.integer  "des_status",       :default => 0
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.text     "description"
+    t.string   "subject"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       :limit => 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "teachers", :force => true do |t|
+    t.string   "tea_name"
+    t.string   "location"
+    t.integer  "couurse_time"
+    t.integer  "course_code"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.string   "extra"
+  end
+
+  create_table "time_entries", :force => true do |t|
+    t.integer  "project_id",  :null => false
+    t.integer  "user_id",     :null => false
+    t.integer  "issue_id"
+    t.float    "hours",       :null => false
+    t.string   "comments"
+    t.integer  "activity_id", :null => false
+    t.date     "spent_on",    :null => false
+    t.integer  "tyear",       :null => false
+    t.integer  "tmonth",      :null => false
+    t.integer  "tweek",       :null => false
+    t.datetime "created_on",  :null => false
+    t.datetime "updated_on",  :null => false
+  end
+
+  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
+  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
+  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
+  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
+  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
+
+  create_table "tokens", :force => true do |t|
+    t.integer  "user_id",                  :default => 0,  :null => false
+    t.string   "action",     :limit => 30, :default => "", :null => false
+    t.string   "value",      :limit => 40, :default => "", :null => false
+    t.datetime "created_on",                               :null => false
+  end
+
+  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
+  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
+
+  create_table "trackers", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.boolean "is_in_chlog",                 :default => false, :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_in_roadmap",               :default => true,  :null => false
+    t.integer "fields_bits",                 :default => 0
+  end
+
+  create_table "user_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "action_type"
+    t.integer  "action_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
+  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
+
+  create_table "user_grades", :force => true do |t|
+    t.integer  "user_id",                     :null => false
+    t.integer  "project_id",                  :null => false
+    t.float    "grade",      :default => 0.0
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
+  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
+  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
+  create_table "user_preferences", :force => true do |t|
+    t.integer "user_id",   :default => 0,     :null => false
+    t.text    "others"
+    t.boolean "hide_mail", :default => false
+    t.string  "time_zone"
+  end
+
+  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
+
+  create_table "user_score_details", :force => true do |t|
+    t.integer  "current_user_id"
+    t.integer  "target_user_id"
+    t.string   "score_type"
+    t.string   "score_action"
+    t.integer  "user_id"
+    t.integer  "old_score"
+    t.integer  "new_score"
+    t.integer  "current_user_level"
+    t.integer  "target_user_level"
+    t.integer  "score_changeable_obj_id"
+    t.string   "score_changeable_obj_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_scores", :force => true do |t|
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.float    "grade",            :default => 0.0
+  end
+
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
+  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+
+  create_table "user_wechats", :force => true do |t|
+    t.integer  "subscribe"
+    t.string   "openid"
+    t.string   "nickname"
+    t.integer  "sex"
+    t.string   "language"
+    t.string   "city"
+    t.string   "province"
+    t.string   "country"
+    t.string   "headimgurl"
+    t.string   "subscribe_time"
+    t.string   "unionid"
+    t.string   "remark"
+    t.integer  "groupid"
+    t.integer  "user_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "login",                           :default => "",    :null => false
+    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
+    t.string   "firstname",         :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                        :default => "",    :null => false
+    t.string   "mail",              :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                           :default => false, :null => false
+    t.integer  "status",                          :default => 1,     :null => false
+    t.datetime "last_login_on"
+    t.string   "language",          :limit => 5,  :default => ""
+    t.integer  "auth_source_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "type"
+    t.string   "identity_url"
+    t.string   "mail_notification",               :default => "",    :null => false
+    t.string   "salt",              :limit => 64
+    t.integer  "gid"
+    t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
+    t.integer  "excellent_student",               :default => 0
+  end
+
+  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "wechat_logs", :force => true do |t|
+    t.string   "openid",       :null => false
+    t.text     "request_raw"
+    t.text     "response_raw"
+    t.text     "session_raw"
+    t.datetime "created_at",   :null => false
+  end
+
+  create_table "wiki_content_versions", :force => true do |t|
+    t.integer  "wiki_content_id",                                       :null => false
+    t.integer  "page_id",                                               :null => false
+    t.integer  "author_id"
+    t.binary   "data",            :limit => 2147483647
+    t.string   "compression",     :limit => 6,          :default => ""
+    t.string   "comments",                              :default => ""
+    t.datetime "updated_on",                                            :null => false
+    t.integer  "version",                                               :null => false
+  end
+
+  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
+  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
+
+  create_table "wiki_contents", :force => true do |t|
+    t.integer  "page_id",                                          :null => false
+    t.integer  "author_id"
+    t.text     "text",       :limit => 2147483647
+    t.string   "comments",                         :default => ""
+    t.datetime "updated_on",                                       :null => false
+    t.integer  "version",                                          :null => false
+  end
+
+  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
+  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
+
+  create_table "wiki_pages", :force => true do |t|
+    t.integer  "wiki_id",                       :null => false
+    t.string   "title",                         :null => false
+    t.datetime "created_on",                    :null => false
+    t.boolean  "protected",  :default => false, :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
+  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
+  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
+
+  create_table "wiki_redirects", :force => true do |t|
+    t.integer  "wiki_id",      :null => false
+    t.string   "title"
+    t.string   "redirects_to"
+    t.datetime "created_on",   :null => false
+  end
+
+  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
+  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
+
+  create_table "wikis", :force => true do |t|
+    t.integer "project_id",                :null => false
+    t.string  "start_page",                :null => false
+    t.integer "status",     :default => 1, :null => false
+  end
+
+  add_index "wikis", ["project_id"], :name => "wikis_project_id"
+
+  create_table "workflows", :force => true do |t|
+    t.integer "tracker_id",                  :default => 0,     :null => false
+    t.integer "old_status_id",               :default => 0,     :null => false
+    t.integer "new_status_id",               :default => 0,     :null => false
+    t.integer "role_id",                     :default => 0,     :null => false
+    t.boolean "assignee",                    :default => false, :null => false
+    t.boolean "author",                      :default => false, :null => false
+    t.string  "type",          :limit => 30
+    t.string  "field_name",    :limit => 30
+    t.string  "rule",          :limit => 30
+  end
+
+  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
+  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
+  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
+  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
+
+  create_table "works_categories", :force => true do |t|
+    t.string   "category"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "zip_packs", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "homework_id"
+    t.string   "file_digest"
+    t.string   "file_path"
+    t.integer  "pack_times",   :default => 1
+    t.integer  "pack_size",    :default => 0
+    t.text     "file_digests"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+end

From 1fbb65b9064297e9a4ce0ea4170262f23f47c30f Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 14:39:40 +0800
Subject: [PATCH 644/668] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=93=E6=9E=9Caja?=
 =?UTF-8?q?x=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality_analysis_controller.rb            | 49 ++++++++++++++-----
 .../quality_analysis/_result_list.html.erb    |  4 ++
 app/views/quality_analysis/_show.html.erb     |  2 +-
 app/views/quality_analysis/create.js.erb      | 11 +++++
 app/views/quality_analysis/index.html.erb     |  6 ++-
 .../repositories/_quality_analysis.html.erb   |  4 +-
 app/views/repositories/show.html.erb          |  4 +-
 7 files changed, 62 insertions(+), 18 deletions(-)
 create mode 100644 app/views/quality_analysis/create.js.erb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 1f5695605..75499c985 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -5,6 +5,7 @@ class QualityAnalysisController < ApplicationController
   before_filter :connect_jenkins, :only => [:create, :edit, :update_jenkins_job]
   layout "base_projects"
   include ApplicationHelper
+  include QualityAnalysisHelper
   require 'jenkins_api_client'
   require 'nokogiri'
   require 'json'
@@ -14,12 +15,14 @@ class QualityAnalysisController < ApplicationController
 
   end
 
+  # params 说明：{identifier：版本库名}
   def create
     begin
       user_name = User.find(params[:user_id]).try(:login)
       identifier = params[:identifier]
       rep_id = params[:rep_id]
-      # REDO
+
+      # job_name and sonar_name 前者为job名字，后者为jenkins配置名
       job_name = "#{user_name}-#{rep_id}"
       sonar_name = "#{user_name}:#{rep_id}"
 
@@ -39,22 +42,40 @@ class QualityAnalysisController < ApplicationController
         sonar.sourceEncoding=utf-8"
         git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
 
-        # modify config.yml
+        # 替换配置文件
         @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
         @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
         @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
         @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
-        # return '200' if successed
+        # jenkins job创建
         jenkins_job = @client.job.create("#{job_name}", @doc.to_xml)
+        logger.info("Jenkins status of create ==> #{jenkins_job}")
 
-        # replace gitlab hook
+        # 将地址作为hook值添加到gitlab
         @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
-        # build job
-        logger.error("Jenkins status of create ==> #{jenkins_job}")
-        # return '201' if build successed
+        # job创建完成后自动运行job,如果运行成功则返回‘200’
         code = @client.job.build("#{job_name}")
         logger.error("build result ==> #{code}")
+
+        # 判断调用sonar分析是否成功
+        # 等待启动时间处理, 最长时间为30分钟
+        for i in 0..60 do
+          sleep(60)
+          @current_build_status = @client.job.get_current_build_status("#{job_name}")
+          if (@current_build_status != "not_run" || @current_build_status != "running")
+            break
+            if i == 60
+              @build_console_result = false
+              break
+            end
+          end
+        end
+
+        @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+        logger.info("@current_build_status is ==> #{@current_build_status}")
+        logger.info("@console_build is ==> #{@console_build}")
+
         d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
         logger.error("delete result ==> #{code}")
         if qa.blank? && code == '201'
@@ -67,10 +88,10 @@ class QualityAnalysisController < ApplicationController
     rescue => e
       puts e
     end
-    # respond_to do |format|
-    #   #format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
-    #   format.js
-    # end
+    respond_to do |format|
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+      # format.js{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+    end
   end
 
   # get language type
@@ -93,6 +114,7 @@ class QualityAnalysisController < ApplicationController
     @gitlab_default_branch = @g.project(@project.gpid).default_branch
   end
 
+  # 更新Jenkins job，主要包括相关配置文件参数的更新，Trustie平台数据的更新
   def update_jenkins_job
     begin
       rep_id = Repository.where(:project_id => @project.id).first.try(:id)
@@ -118,9 +140,12 @@ class QualityAnalysisController < ApplicationController
       @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
       @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
-      # return '200' if successed
+      # update成功则返回 ‘200’
       jenkins_job = @client.job.update("#{job_name}", @doc.to_xml)
+      get_current_build_status = @client.job.get_current_build_status("Hjqreturn-1280")
       logger.error("Failed to update job: ==> #{jenkins_job}") unless jenkins_job == '200'
+
+      # 数据更新到Trustie数据库
       if jenkins_job == '200'
         logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
         @quality_analysis.path = path
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index c47d51f1f..51d91c04f 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -1,3 +1,7 @@
+<script type="text/javascript">
+    //        $("#ajax-indicator span").text("载入中...");
+    $("#ajax-indicator").show();
+</script>
 <div class="project_r_h">
   <h2 class="project_h2">分析结果</h2>
 </div>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index e55e65bcd..ca8ee225f 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -9,7 +9,7 @@
 <% if @complexity["msr"].count > 3 %>
     <%= render :partial => "hightchars" %>
     <div class="analysis-block mt10 mb40 f14">
-      <div class="flex">
+      <div class="flex mb10">
         <div class="analysis-genral">
           <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">质量等级</p>
diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
new file mode 100644
index 000000000..abe8c4a6e
--- /dev/null
+++ b/app/views/quality_analysis/create.js.erb
@@ -0,0 +1,11 @@
+$("#ajax-indicator").hide();
+<% if @current_build_status == "success" %>
+    <%= escape_javascript( render :partial => 'quality_analysis/show', :locals => {:branch => branch}) %>
+<% elsif @current_build_status == "failure" %>
+    <%=h @console_build.html_safe %>
+<% elsif @current_build_status == "not_run" %>
+    alert('任务启动失败');
+<% else %>
+    alert('你已经创建类一个同名job');
+<% end %>
+
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 9b06e6483..ead8aae48 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,6 +1,10 @@
 <% if @name_flag %>
     <%= render :partial => "result_list" %>
 <% else %>
-    <%= render "show" %>
+    <% if @build_console_result %>
+        运行结果超时
+    <% else %>
+        <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
+    <% end %>
 <% end %>
 
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index d583f54c6..0053849a3 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录，不填写则扫描根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
@@ -15,7 +15,7 @@
             <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
-        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-indicator').text('正在分析中…………(大概需要30分钟，请耐心等待)').show();$('#quality_analyses_form').submit();hideModal()">提交</a></div>
         <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 067056983..0a9b49470 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,9 +5,9 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) %>
+      <%# if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
-      <% end %>
+      <%# end %>
       <%# end %>
       <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>

From 21be94cbe14684327e98f932d6163710cf32b6b6 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 15:05:01 +0800
Subject: [PATCH 645/668] add some links

---
 app/views/quality_analysis/_show.html.erb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index ca8ee225f..1a7869fd0 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -43,25 +43,26 @@
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
     <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
-      <span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
+      <span class="fontGrey2"><a class="linkBlue2" target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
     <div><span class="fontGrey3 mr30 fl">质量问题</span>
-      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
+      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">&nbsp;问题分类如下：</span></div>
     <div class="ml90 mt15">
       <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][1].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][2].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][3].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
-        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][4].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
-        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></a>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%=@complexity["msr"][0].nil? ? 0 : lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>

From 25b5d74a423d661d2d3b8093e9be512ecc8e1dbe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 15:25:30 +0800
Subject: [PATCH 646/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb       | 9 ---------
 app/views/courses/new.html.erb            | 2 +-
 app/views/layouts/_project_info.html.erb  | 4 ++--
 app/views/layouts/_syllabus_info.html.erb | 2 +-
 app/views/syllabuses/show.html.erb        | 4 ++--
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 411f47f1e..1fbee6fbb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3187,9 +3187,6 @@ class UsersController < ApplicationController
     sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
-    #@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
-
     @courses = @user.courses.visible.where("is_delete =?", 0)
     syllabus_ids = @courses.empty? ? '(-1)' : "(" + @courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
     @syllabus = Syllabus.where("id in #{syllabus_ids} or user_id = #{User.current.id}").order("#{sort_name} #{sort_type}")
@@ -3197,12 +3194,6 @@ class UsersController < ApplicationController
     #根据 作业+资源数排序
     if @order.to_i == 2
       @type = 2
-      # @courses.each do |course|
-      #   course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
-      #   if course[:infocount] < 0
-      #     course[:infocount] = 0
-      #   end
-      # end
       @syllabus.each do |syllabus|
         count = 0
         courses = @courses.where("syllabus_id = #{syllabus.id}")
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 1ceaa06f5..7e054e7c8 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -12,7 +12,7 @@
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
           <% end %>
-          <span class="c_red" id="new_syllabus_notice" style="display: none;">请选择课程大纲</span>
+          <span class="c_red" id="new_syllabus_notice" style="display: none;">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(), :class => 'ml5 green_btn_share c_white'%></span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index 651d8d1e4..1c0a2ac08 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -9,11 +9,11 @@
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
 <div class="pr_info_id fl f14">
-  <span class="hidden fl" style="max-width: 90px;" title="<%= @course.name %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 1 ? '(私有)' :  '公开' %></span>
+  <span class="hidden fl" style="max-width: 80px;" title="<%= @course.name %><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %></span>
   </br>
   <div class="cl"></div>
   <% if @course.syllabus%>
-      <a class="pr_info_name fb c_dark fl hidden" style="max-width: 120px;" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
+      <a class="pr_info_name fb c_dark fl hidden" title="<%=@course.syllabus.title %>" style="max-width: 120px;" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
         <%=@course.syllabus.title %>
       </a>
   <% end %>
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index d8e18e37a..61aa011c3 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -5,7 +5,7 @@
   <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
 </div>
 <div class="fl ml15">
-  <p class="homepageImageName mb5"><%=@syllabus.title %></p>
+  <p class="homepageImageName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
   <div class="cl"></div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index 989d31984..e64343d90 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -13,11 +13,11 @@
     <div class="syllabusbox_tishi">
       <% if User.current == @syllabus.user %>
         <p >您建立的课程还未创建班级，请
-          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。
+          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>
         </p>
       <% elsif User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
           <p >本课程下还未创建班级，请
-            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。
+            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>
           </p>
       <% else %>
           <p >本课程下还未创建班级，敬请期待。

From 7178c50b1d0207ce286769874a1c24dd9fab9ee1 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 15:37:39 +0800
Subject: [PATCH 647/668] branch's total commits

---
 app/controllers/repositories_controller.rb |  7 +------
 app/helpers/application_helper.rb          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 7c3acb2cc..d0904ddf5 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -360,11 +360,6 @@ update
   end
 
   def show
-    # sonar_address = Redmine::Configuration['sonar_address']
-    # projects_date = open(sonar_address + "/api/projects/index").read
-    # arr = JSON.parse(projects_date).map {|m| m["nm"]}
-    # arr.map
-
     ## TODO: the below will move to filter, done.
     if !User.current.member_of?(@project) && @project.hidden_repo
       render_403
@@ -379,7 +374,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       g_project = g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : g_project.commit_count
+      @changesets_all_count = @project.gpid.nil? ? 0 : commit_count(@project, @rev)
       @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
       # 访问该页面的是会后则刷新
       if @project.project_score.nil?
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ee2e2d74a..1d1322d98 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -803,22 +803,22 @@ module ApplicationHelper
   end
 
   # 获取Gitlab版本库提交总数
-  def commit_count(project)
+  def commit_count(project, branch)
     g = Gitlab.client
     #add by hx
-    if g.commits(project.gpid , :page=>200).count > 0
+    if g.commits(project.gpid, :ref_name => @rev , :page=>200).count > 0
       count = 4020
-    elsif g.commits(project.gpid , :page=>25).count==0
+    elsif g.commits(project.gpid , :page=>25, :ref_name => branch).count==0
       count = count_commits(project.gpid , 0 , 25)
-    elsif g.commits(project.gpid , :page=>50).count ==0
+    elsif g.commits(project.gpid , :page=>50, :ref_name => branch).count ==0
       count = count_commits(project.gpid , 25 , 50)+ 25 * 20
-    elsif g.commits(project.gpid , :page=>75).count ==0
+    elsif g.commits(project.gpid , :page=>75, :ref_name => branch).count ==0
       count = count_commits(project.gpid , 50 , 75)+ 50 * 20
-    elsif g.commits(project.gpid , :page=>100).count== 0
+    elsif g.commits(project.gpid , :page=>100, :ref_name => branch).count== 0
       count = count_commits(project.gpid , 75 , 100) + 75 * 20
-    elsif g.commits(project.gpid , :page=>125).count==0
+    elsif g.commits(project.gpid , :page=>125, :ref_name => branch).count==0
       count = count_commits(project.gpid , 100 , 125) + 100 * 20
-    elsif g.commits(project.gpid , :page=>150).count==0
+    elsif g.commits(project.gpid , :page=>150, :ref_name => branch).count==0
       count = count_commits(project.gpid , 125 , 150) + 125 * 20
     else
       count = count_commits(project.gpid , 150 ,200) + 150 * 20
@@ -832,7 +832,7 @@ module ApplicationHelper
       if $g.commits(project_id,:page => page).count == 0
         break
       else
-        count = count + $g.commits(project_id,:page => page).count
+        count = count + $g.commits(project_id,  :ref_name => @rev, :page => page).count
       end
     end
     return count

From 8db5852a61b05c1bc90fb2fccf5a79e23b7db0f1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 15:49:25 +0800
Subject: [PATCH 648/668] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=82=AE=E7=AE=B1=EF=BC=8C?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=82=AE=E7=AE=B1=E7=95=8C=E9=9D=A2=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=A4=AA=E9=95=BF=E4=B8=8D=E8=83=BD=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb         |  7 ++--
 app/views/account/email_activation.html.erb   | 34 +++++++++++--------
 .../projects/invite_members_by_mail.html.erb  |  2 +-
 config/routes.rb                              |  2 +-
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 62b076754..8187055be 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -239,17 +239,18 @@ class AccountController < ApplicationController
 
   end
   def resendmail
-    status = 1
+    result = {:status=>1, :email=>""}
     user = User.find(params[:user]) if params[:user]
+    result[:email] = user.mail
     token = Token.new(:user => user, :action => "register")
     if token.save
       # Mailer.run.register(token)
       Mailer.register(token).deliver
     else
       yield if block_given?
-      status = 0
+      result[:status] = 0
     end
-    render :json => status
+    render :json => result
   end
 
   def email_activation
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index d625e7fc9..9655efcf4 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -23,9 +23,15 @@
               url,
               {user: id },
               function (data) {
-                  console.log("1111111111");
-                  console.log(data);
-                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱，请及时登录邮箱进行验证。</p>");
+                  //邮箱@之前用a**b格式显示
+                  var mail = data.email;
+                  var pos = mail.indexOf("@");
+                  var restr = mail.substring(1,pos-1);
+                  if( mail.split("@")[0].length > 2 ){
+                      mail = mail.replace(restr,"***");
+                  }
+
+                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱("+mail+")，请及时登录邮箱进行验证。</p>");
               }
       );
   }
@@ -37,16 +43,16 @@
           pop_up_box(htmlvalue,580,30,50);
           return;
       }
-      $.get(
-              url,
-              {user:user,text:$(".email_prompt_mes").val() },
-              function (data) {
-                  console.log("2222222");
-                  console.log(data);
-                  var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
-                  pop_up_box(htmlvalue,580,30,50);
-                  $(".email_prompt_mes").val("");
-              }
-      );
+
+      $.ajax({
+          url: url,
+          data: {user: user, text: $(".email_prompt_mes").val() },
+          type: "POST",
+          success: function (data) {
+              var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
+              pop_up_box(htmlvalue, 580, 30, 45);
+              $(".email_prompt_mes").val("");
+          }
+      });
   }
 </script>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index bced1e936..d0f46611e 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -48,7 +48,7 @@
         var last_name = $.trim($('#last_name').val());
         if(last_name.length > 30)
         {
-            $("#valid_email").text("用户姓氏过长,最长为30个字符");
+            $("#valid_email").text("用户姓名过长,最长为30个字符");
             return false;
         }
         else
diff --git a/config/routes.rb b/config/routes.rb
index d56f75ced..0741b2a10 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -496,7 +496,7 @@ RedmineApp::Application.routes.draw do
   match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
 
   #激活邮箱反馈问题
-  match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message',  :via => :get, :as => "leave_email_activation_message"
+  match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message',  :via => :post, :as => "leave_email_activation_message"
 
   # boards
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'

From 89e42ac77668ffaaa0beceeaba8e5b365b248ce9 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 16:10:48 +0800
Subject: [PATCH 649/668] =?UTF-8?q?=E5=B0=86=E5=A7=93=E6=B0=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/my/zh.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 39c7c3167..85ba156ef 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -37,7 +37,7 @@ zh:
   field_firstname: 名字或组织名
   firstname_empty: 名字不能为空
   field_firstname_eg: '(例：张三丰，请填写[三丰])'
-  field_lastname: 姓氏
+  field_lastname: 姓名
   lastname_empty: 姓氏不能为空
   enterprise_empty: 企业名不能为空
   field_lastname_eg: '(例：张三丰，请填写[张])'

From 0ff8f0a77414cd0e08ee814020537e0fd90690cf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 16:25:52 +0800
Subject: [PATCH 650/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E5=92=8C=E8=AF=BE=E7=A8=8B=E5=A4=A7?=
 =?UTF-8?q?=E7=BA=B2=E6=8F=8F=E8=BF=B0=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/syllabuses_controller.rb      | 25 ++++++++++++++++---
 app/views/layouts/_user_courses.html.erb      |  2 +-
 .../syllabuses/_delete_syllabus.html.erb      | 17 +++++++++++++
 app/views/syllabuses/delete_syllabus.js.erb   |  2 ++
 app/views/syllabuses/show.html.erb            |  4 +--
 app/views/users/_user_syllabus_list.html.erb  | 16 ++++++++++--
 config/routes.rb                              |  2 ++
 public/javascripts/application.js             | 11 ++++++++
 public/javascripts/syllabus.js                | 11 --------
 9 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 app/views/syllabuses/_delete_syllabus.html.erb
 create mode 100644 app/views/syllabuses/delete_syllabus.js.erb

diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index b1d7bf32d..8ff88823d 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -5,8 +5,8 @@ class SyllabusesController < ApplicationController
   include AttachmentsHelper
   include CoursesHelper
 
-  before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy]
-  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :update_base_info]
+  before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy, :delete_syllabus]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :update_base_info, :delete_syllabus, :delete_des]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -32,7 +32,7 @@ class SyllabusesController < ApplicationController
       @syllabus.title = params[:title]
       @syllabus.eng_name = params[:eng_name]
       @syllabus.user_id = User.current.id
-      @syllabus.description = Message.where("id = 17848").first.nil? ? '' : Message.where("id = 17848").first.content
+      @syllabus.description = Message.where("id = 19412").first.nil? ? '' : Message.where("id = 19412").first.content
       if @syllabus && @syllabus.save
         respond_to do |format|
           flash[:notice] = l(:notice_successful_create)
@@ -55,6 +55,12 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  def delete_syllabus
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def update
     @syllabus.description = params[:syllabus][:description]
     @syllabus.des_status = 1
@@ -71,10 +77,21 @@ class SyllabusesController < ApplicationController
   end
 
   #删除课程大纲的描述
+  def delete_des
+    if @syllabus
+      @syllabus.description = Message.where("id = 19412").first.nil? ? '' : Message.where("id = 19412").first.content
+      @syllabus.des_status = 0
+      @syllabus.attachments.destroy_all
+      if @syllabus.save
+        redirect_to syllabus_path(@syllabus)
+      end
+    end
+  end
+
   def destroy
     if @syllabus && @syllabus.courses.empty?
       @syllabus.destroy
-      redirect_to user_path(User.current.id)
+      redirect_to user_courselist_user_path(User.current.id)
     end
   end
 
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 6388b94d0..31f06689d 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -2,7 +2,7 @@
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
       <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                  :id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                  :id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
       <% wechat_count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
 
diff --git a/app/views/syllabuses/_delete_syllabus.html.erb b/app/views/syllabuses/_delete_syllabus.html.erb
new file mode 100644
index 000000000..fbc0a0995
--- /dev/null
+++ b/app/views/syllabuses/_delete_syllabus.html.erb
@@ -0,0 +1,17 @@
+<br>
+<div style='width:470px;text-align:center;font-family: "微软雅黑","宋体"' class="f14">
+  <% if @syllabus.courses.empty? %>
+    确认删除该课程吗？
+  <% else %>
+    该课程下已经存在班级，不能删除。
+  <% end %>
+</div>
+</br>
+<div style='width:164px; margin:0 auto; text-align:center; font-family: "微软雅黑","宋体"'>
+  <% if @syllabus.courses.empty? %>
+      <%=link_to '确认', syllabus_path(@syllabus), :class => 'Blue-btn fl', :method => 'delete'%>
+      <a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a>
+  <% else %>
+      <a href='javascript:void(0);' class='Blue-btn' style="margin-left: 50px;" onclick='hideModal()'>关闭</a>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/syllabuses/delete_syllabus.js.erb b/app/views/syllabuses/delete_syllabus.js.erb
new file mode 100644
index 000000000..e764aa80b
--- /dev/null
+++ b/app/views/syllabuses/delete_syllabus.js.erb
@@ -0,0 +1,2 @@
+var htmlvalue = "<%=escape_javascript(render :partial => 'delete_syllabus') %>";
+pop_up_box(htmlvalue,500,30,50);
\ No newline at end of file
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index e64343d90..e3e6436b4 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -45,9 +45,7 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li><%=link_to '编辑', edit_syllabus_path(@syllabus), :class => 'postOptionLink'%></li>
-                  <% if @syllabus.courses.empty? %>
-                    <li><%=link_to '删除', syllabus_path(@syllabus), :class => 'postOptionLink', :method => 'delete', :data => {:confirm => l(:text_are_you_sure)}%></li>
-                  <% end %>
+                  <li><%=link_to '删除', delete_des_syllabus_path(@syllabus), :class => 'postOptionLink', :confirm => l(:text_are_you_sure)%></li>
                 </ul>
               </li>
             </ul>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 3cc7bf61c..143b21681 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -66,8 +66,20 @@
               </ul>
             </div><!--syllabus_class_box end-->
 
-
-            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target =>'_blank', :title => '查看课程' %>
+            <div class="homepagePostSetting">
+              <ul>
+                <li class="icons_sy_setting">
+                  <ul class="homepagePostSettiongText">
+                    <li>
+                      <%=link_to '查看课程', syllabus_path(syllabus.id), :class => 'postOptionLink',:target =>'_blank', :title => '查看课程' %>
+                    </li>
+                    <% if User.current == syllabus.user %>
+                        <li><%=link_to '删除', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%></li>
+                    <% end %>
+                  </ul>
+                </li>
+              </ul>
+            </div>
           </div>
         <% end %>
         <div>
diff --git a/config/routes.rb b/config/routes.rb
index a491726f2..215267cb8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1078,6 +1078,8 @@ RedmineApp::Application.routes.draw do
       match 'syllabus_courselist', :to => 'syllabuses#syllabus_courselist', :via => :get, :as => 'syllabus_courselist'
       get 'edit_syllabus_eng_name'
       post 'update_base_info'
+      get 'delete_syllabus'
+      get 'delete_des'
     end
 
     collection do
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index c67efb191..142b0be42 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1545,6 +1545,17 @@ function show_edit_file_description(id) {
     $("#file_description_edit_"+id).focus();
 }
 
+//编辑资源描述之后提交
+function edit_file_description(url,id){
+    $.get(
+        url,
+        {id: id ,description: $("#file_description_edit_"+id).val() },
+        function (data) {
+
+        }
+    );
+}
+
 //展开课程大纲列表中的班级
 function expand_course_list(id, target, btnid, count) {
     var target = $(target);
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index f65ddf11b..1b2a18a41 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -48,17 +48,6 @@ function edit_syllabus_eng_name(url){
     );
 }
 
-//编辑资源描述之后提交
-function edit_file_description(url,id){
-    $.get(
-        url,
-        {id: id ,description: $("#file_description_edit_"+id).val() },
-        function (data) {
-
-        }
-    );
-}
-
 //展开所有属性
 function toggle_all_syllabus_attr(){
     var btn = $("#show_all_syllabus_attr");

From 6867a88a94a2540ca99a5e2ac35b843e76661408 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 16:41:13 +0800
Subject: [PATCH 651/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb   | 2 +-
 app/views/courses/new.html.erb            | 4 ++--
 app/views/courses/settings.html.erb       | 4 ++--
 app/views/layouts/_syllabus_info.html.erb | 2 +-
 app/views/syllabuses/edit.html.erb        | 2 +-
 public/stylesheets/syllabus.css           | 4 +++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index c1c4d1c2f..139fa81f1 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -98,7 +98,7 @@
     <li class=" mb5 ml85">
       <label >公开&nbsp;&nbsp;：</label>
       <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox" value="<%=@course.is_public.to_i %>">
-      <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+      <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
       <div class="cl"></div>
     </li>
     <li class="ml85">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 7e054e7c8..7a14fd572 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -58,13 +58,13 @@
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="course_is_public" name="course[is_public]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+          <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
           <label >学生列表公开&nbsp;&nbsp;：</label>
           <input id="course_open_student" name="course[open_student]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
+          <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index b4ed33d62..cee69fd75 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -76,13 +76,13 @@
           <li class=" mb5 ml80">
             <label >公开&nbsp;&nbsp;：</label>
             <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox">
-            <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+            <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生列表公开&nbsp;&nbsp;：</label>
             <input <%= @course.open_student == 1 ? 'checked' : ''%> id="course_open_student" name="course[open_student]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
+            <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index 61aa011c3..b67cb4c4d 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -5,7 +5,7 @@
   <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
 </div>
 <div class="fl ml15">
-  <p class="homepageImageName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
+  <p class="homepageSyllabusName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
   <div class="cl"></div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index 395fa1c5b..a23bf9cb8 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -5,7 +5,7 @@
   <p >课程信息</p>
 </div>
 <div class="HomeWork">
-  <p class="f16 mb10">课程信息</p>
+  <p class="f16 mb10"><%=@syllabus.title %>课程大纲</p>
   <div class="HomeWorkCon">
     <%= labelled_form_for @syllabus, :url =>syllabus_path(@syllabus),
                           :html => {:nhname=>'form',:multipart => true, :id => 'syllabus-form'} do |f| %>
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 88c8cebbf..bc4fef274 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -153,4 +153,6 @@ a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap
 a:hover.course-title{ color:#269ac9;}
 
 /*新建页面*/
-.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
\ No newline at end of file
+.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
+
+.homepageSyllabusName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:120px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}

From afbf62fd646e3d12bf543d7251ca1b0d84702f7c Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 1 Jul 2016 17:02:52 +0800
Subject: [PATCH 652/668] =?UTF-8?q?=E5=BD=93=E8=AF=BE=E7=A8=8B=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA0=E6=97=B6=EF=BC=8C=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb | 35 +++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 3cc7bf61c..b5bd7d481 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -94,23 +94,26 @@
 
         $(".syllabus_courses_list").each(function(){
             var syStaust = $(this).children(":first-child");
+            var classNum = $(this).next().children().children("li").size();
 
-            if (syStaust.hasClass("sy_courses_open")){
-                $(this).toggle(function(){
-                    $(this).next().hide();
-                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
-                },function(){
-                    $(this).next().show();
-                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-                });
-            }else{
-                $(this).toggle(function(){
-                    $(this).next().show();
-                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-                },function(){
-                    $(this).next().hide();
-                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
-                });
+            if(classNum>0){
+                if (syStaust.hasClass("sy_courses_open")){
+                    $(this).toggle(function(){
+                        $(this).next().hide();
+                        $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                    },function(){
+                        $(this).next().show();
+                        $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                    });
+                }else{
+                    $(this).toggle(function(){
+                        $(this).next().show();
+                        $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                    },function(){
+                        $(this).next().hide();
+                        $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                    });
+                }
             }
         });
     });

From 1edc63721f31a467b0d616780294ca6a3fb1ca02 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 17:03:05 +0800
Subject: [PATCH 653/668] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8F=AD=E7=BA=A7=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 3cc7bf61c..dd9aae5d0 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -20,7 +20,7 @@
     <% if @syllabus.any? %>
         <% @syllabus.each_with_index do |syllabus, index|%>
           <div class="syllabus_courses_box">
-            <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
+            <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
                 <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
@@ -47,7 +47,7 @@
                                   <div class="cl"></div>
                                 </div>
                                 <div class="">
-                                  <p class="fl grayTxt ">更新：<%=course.time %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
+                                  <p class="fl grayTxt ">更新：<%=format_date Time.at(course.updatetime) %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
                                   <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
                                   <div class="cl"></div>
                                 </div>

From 5a1090c0e178407a930b2dbc11473b23ca1c6a3f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 17:27:34 +0800
Subject: [PATCH 654/668] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/new.html.erb                 | 2 +-
 app/views/courses/settings.html.erb            | 4 ++--
 app/views/layouts/_project_info.html.erb       | 8 +++++---
 app/views/layouts/_syllabus_base_info.html.erb | 2 +-
 app/views/layouts/base_tags.html.erb           | 2 +-
 config/locales/commons/zh.yml                  | 2 +-
 public/stylesheets/syllabus.css                | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 7a14fd572..9012daaab 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -12,7 +12,7 @@
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
           <% end %>
-          <span class="c_red" id="new_syllabus_notice" style="display: none;">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(), :class => 'ml5 green_btn_share c_white'%></span>
+          <span class="c_red" id="new_syllabus_notice" style="display: none;">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index cee69fd75..903d01f8a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -31,8 +31,8 @@
           </li>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input"}  %>
-            <span class="c_red" id="edit_syllabus_notice" style="display: none;">请选择课程大纲</span>
+            <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:280px'}  %>
+            <span class="c_red" id="edit_syllabus_notice" style="display: none;">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
           </li>
           <li class="ml45">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index 1c0a2ac08..85f02310d 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -9,14 +9,16 @@
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
 <div class="pr_info_id fl f14">
-  <span class="hidden fl" style="max-width: 80px;" title="<%= @course.name %><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %></span>
-  </br>
-  <div class="cl"></div>
   <% if @course.syllabus%>
       <a class="pr_info_name fb c_dark fl hidden" title="<%=@course.syllabus.title %>" style="max-width: 120px;" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
         <%=@course.syllabus.title %>
       </a>
   <% end %>
+  <div class="cl"></div>
+
+  <span class="hidden fl" style="max-width: 80px;" title="<%= @course.name %><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %></span>
+  </br>
+  <div class="cl"></div>
   <% if is_excellent_course(@course) %>
     <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
   <% end %>
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index f545df2d4..cf4926d82 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -48,7 +48,7 @@
       <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
   <% end %>
 </ul>
-<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?) %>
+<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
     <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
 <% end %>
 <script>
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 08ebb02d7..cfbf6cec9 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -12,7 +12,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify','public', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_include_tag 'prettify' %>
 <%= javascript_heads %>
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 70236d9ba..49d5f4d03 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -188,7 +188,7 @@ zh:
 
 
   text_are_you_sure: 您确定要删除吗？        #js 提示
-  text_are_you_sure_out: 你确定要退出该课程吗？
+  text_are_you_sure_out: 你确定要退出该班级吗？
   text_are_you_sure_out_group: 你确定要退出该分班吗？
   text_are_you_sure_all: 您确定要删除所有文件吗
 
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index bc4fef274..6218f52e0 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -4,7 +4,7 @@
 a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
 .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
+.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
 .re_tag a{ color:#0d90c3;}
 .tag_h{ }
 .tag_h span,.tag_h a{ margin-bottom:5px;}

From 547d5409bb8c260708b4b7b19438c8196901b197 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 17:43:38 +0800
Subject: [PATCH 655/668] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=97=E6=A0=B7=E6=94=B9=E4=B8=BA=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb                      | 2 +-
 app/views/organizations/_join_course_menu.html.erb       | 6 +++---
 app/views/organizations/_org_custom_left2.html.erb       | 2 +-
 app/views/organizations/_org_left_subfield_list.html.erb | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index cb06bd688..48b5f068b 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -23,7 +23,7 @@ module OrganizationsHelper
       when 'activity' then
         return '动态'
       when 'course' then
-        return '课程'
+        return '班级'
       when 'project' then
         return '项目'
     end
diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb
index b15dce2c6..9ca522e97 100644
--- a/app/views/organizations/_join_course_menu.html.erb
+++ b/app/views/organizations/_join_course_menu.html.erb
@@ -24,12 +24,12 @@
 <body>
 <!--<div class="resourceSharePopup">-->
   <div>
-    <div class="relateText">请选择关联到组织的课程</div>
-    <div class="c_red">您的私有课程不能被关联到组织</div>
+    <div class="relateText">请选择关联到组织的班级</div>
+    <div class="c_red">您的私有班级不能被关联到组织</div>
   </div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %>
-      <input type="text" name="courses" placeholder="搜索您已加入的课程的名称" class="searchCourse" />
+      <input type="text" name="courses" placeholder="搜索您已加入的班级的名称" class="searchCourse" />
       <div id="search_courses_result_list" class="mb8 maxHeight100" style="overflow:auto;"></div>
       <div class="courseSendSubmit">
         <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 2c389766f..feedf2a44 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -2,7 +2,7 @@
 <% if is_default_field?(field) %>
     <% case field.name %>
     <% when 'course' %>
-        <h2 class="por_h2_index clear">课程动态</h2>
+        <h2 class="por_h2_index clear">班级动态</h2>
         <% if @course_acts.blank? %>
             <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index ddc504640..9d043fbb5 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -63,9 +63,9 @@
         <% when 'course' %>
             <div style="display:<%= field.hide == 0 ? 'block':'none' %>;" id="org_subfield_<%= field.id %>">
               <div class="homepageLeftMenuBlock">
-                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">班级</a>
                 <% if User.current.logged? and User.current.admin_of_org?(organization) %>
-                    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+                    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联班级"%>
                 <% end %>
               </div>
               <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">

From 8b87c141cc2a9db518b665400e9e1cc1228486a6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 17:47:35 +0800
Subject: [PATCH 656/668] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb      | 2 +-
 app/views/courses/new.html.erb               | 2 +-
 app/views/projects/_new_join.html.erb        | 4 ++--
 app/views/users/_user_syllabus_list.html.erb | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 139fa81f1..cc7f2fb53 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -78,7 +78,7 @@
       <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
       <%= select_tag :end_time,options_for_select(course_time_option(@new_course.end_time),@new_course.end_time), {:id=>"new_end_time"}  %>
       <%= select_tag :end_term,options_for_select(course_term_option,@new_course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
-      <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
+      <span class="mr15 c_red">仅针对跨越多个学期的班级，否则与开始学期保持一致。</span>
     </li>
     <div class="cl"></div>
     <!--<li class="ml45 mb10">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 9012daaab..f8db461a6 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -38,7 +38,7 @@
           <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
           <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"new_end_time"}  %>
           <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
-          <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
+          <span class="mr15 c_red">仅针对跨越多个学期的班级，否则与开始学期保持一致。</span>
         </li>
         <div class="cl"></div>
         <!--<li class="ml45 mb10">
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index c823f5ed0..1708d0a33 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -30,8 +30,8 @@
                  :remote => true,
                  :method => :post,
                  :id => 'new_join_course') do %>
-        <label>请输入课程密码:</label>
-        <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%>
+        <label>请输入班级邀请码:</label>
+        <%= text_field_tag 'invite_code', nil, :style=>'width:300px;'%>
         <div class="ni_btn">
           <a href="javascript:" class="tijiao" onclick="$('#new_join_course').submit();" >
             确&nbsp;&nbsp;定
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index a24dd9d7c..7a44a6ec0 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -23,7 +23,7 @@
             <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
-                <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
+                <span class="<%=index == 0 && !courses.empty? ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>

From 25e77497e7a4af6f50f7fa05175e4eb419abbb12 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 17:50:08 +0800
Subject: [PATCH 657/668] consloe pring

---
 app/controllers/quality_analysis_controller.rb      | 11 ++++++++---
 app/views/quality_analysis/_console_output.html.erb |  8 ++++++++
 app/views/quality_analysis/create.html.erb          |  9 +++++++++
 app/views/quality_analysis/index.html.erb           | 10 +++++++---
 app/views/repositories/show.html.erb                |  4 ++--
 config/routes.rb                                    |  1 +
 6 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 app/views/quality_analysis/_console_output.html.erb
 create mode 100644 app/views/quality_analysis/create.html.erb

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 75499c985..2c55f780c 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -2,7 +2,7 @@ class QualityAnalysisController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :find_quality_analysis, :only => [:edit, :update_jenkins_job]
   before_filter :authorize
-  before_filter :connect_jenkins, :only => [:create, :edit, :update_jenkins_job]
+  before_filter :connect_jenkins, :only => [:create, :edit, :update_jenkins_job, :index]
   layout "base_projects"
   include ApplicationHelper
   include QualityAnalysisHelper
@@ -78,7 +78,7 @@ class QualityAnalysisController < ApplicationController
 
         d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
         logger.error("delete result ==> #{code}")
-        if qa.blank? && code == '201'
+        if qa.blank? && @current_build_status == "success"
           QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
                                  :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
         else
@@ -89,7 +89,7 @@ class QualityAnalysisController < ApplicationController
       puts e
     end
     respond_to do |format|
-      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
       # format.js{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
     end
   end
@@ -167,6 +167,7 @@ class QualityAnalysisController < ApplicationController
     begin
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
+      @jenkins_address = Redmine::Configuration['jenkins_address']
       if params[:resource_id].nil?
         @name_flag = true
         projects_date = open(@sonar_address + "/api/projects/index").read
@@ -174,6 +175,10 @@ class QualityAnalysisController < ApplicationController
         @quality_analyses = QualityAnalysis.where(:project_id => @project.id).select{|qa| arr.include?(qa.sonar_name)}
 
       else
+        if params[:current_build_status] == "failure"
+          job_name = params[:job_name]
+          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+        end
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first
         issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
diff --git a/app/views/quality_analysis/_console_output.html.erb b/app/views/quality_analysis/_console_output.html.erb
new file mode 100644
index 000000000..45115b9fe
--- /dev/null
+++ b/app/views/quality_analysis/_console_output.html.erb
@@ -0,0 +1,8 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+<div class="project_r_h">
+  <h2 class="project_h2" style="width:180px;">质量分析</h2>
+</div>
+<p>
+ <%= h @console_build.to_json.html_safe %>
+</p>
+
diff --git a/app/views/quality_analysis/create.html.erb b/app/views/quality_analysis/create.html.erb
new file mode 100644
index 000000000..e7c81f662
--- /dev/null
+++ b/app/views/quality_analysis/create.html.erb
@@ -0,0 +1,9 @@
+<% if @current_build_status == "success" %>
+    <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
+<% else %>
+    <% if @build_console_result %>
+        运行结果超时
+    <% else %>
+        <%= render :partial => "console_output" %>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index ead8aae48..19b5c5eea 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,10 +1,14 @@
 <% if @name_flag %>
     <%= render :partial => "result_list" %>
 <% else %>
-    <% if @build_console_result %>
-        运行结果超时
-    <% else %>
+    <% if params[:current_build_status].nil? || params[:current_build_status] == "success" %>
         <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
+    <% else %>
+        <% if params[:build_console_result] %>
+            运行结果超时
+        <% else %>
+            <%= render :partial => "console_output" %>
+        <% end %>
     <% end %>
 <% end %>
 
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 0a9b49470..8164a103f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,9 +5,9 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <%# if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) && @project.is_public? %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
-      <%# end %>
+      <% end %>
       <%# end %>
       <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
diff --git a/config/routes.rb b/config/routes.rb
index 075aff6e1..dd6df94ed 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -792,6 +792,7 @@ RedmineApp::Application.routes.draw do
       member do
         match 'update_jenkins_job'
         match 'edit'
+        match 'create'
       end
     end
     # resources :files, :only => [:index, :new, :create] do

From 0e2e1b09b54ad5804ac87d532ef7b2b205cb6c13 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 17:51:01 +0800
Subject: [PATCH 658/668] =?UTF-8?q?title=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ee2e2d74a..cb8b06a8f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1079,6 +1079,8 @@ module ApplicationHelper
         title << @organization.name
       elsif @user
         title << @user.try(:realname)
+      elsif @syllabus
+        title << @syllabus.title
       else
         title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
       end

From 28c20c966ed4c70aebede52db2d8a416761da375 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 1 Jul 2016 19:28:55 +0800
Subject: [PATCH 659/668] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_show_users.html.erb | 2 +-
 app/views/tags/index.html.erb       | 2 +-
 public/stylesheets/courses.css      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb
index d8b172ba9..ab6570a2a 100644
--- a/app/views/tags/_show_users.html.erb
+++ b/app/views/tags/_show_users.html.erb
@@ -2,7 +2,7 @@
 	<% if users_results.try(:size).to_i > 0 %>
 	<hr />
 	<% users_results.each do |user| %>
-	<p class="font_description2">
+	<p class="font_description2" style="padding: 10px 5px">
 		<strong><%= l(:label_tags_user_name) %><%= link_to ("#{user.name}"),
 		:controller => "users",:action => "show",:id => user.id%></strong>
 		<br />
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 947366eeb..038768a41 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -16,7 +16,7 @@
 <% content_for :content do %>
 <div>
 	<h3><strong><%= l(:label_tags_search_result) %></strong></h3>
-	<div align="right">
+	<div class="mb5">
 		<%= l(:label_tags_numbers) %>：
 		<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
 		<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d6026537e..1df2a2ece 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1428,4 +1428,5 @@ a.pages-big{ width:50px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
 
-.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input option {max-width:260px;}

From 8cc4b7a87864bf67046d7438ac41c086d4c85c13 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 20:00:23 +0800
Subject: [PATCH 660/668] public questions

---
 app/controllers/projects_controller.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8664a1372..54ab3b2c3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -653,12 +653,14 @@ class ProjectsController < ApplicationController
   def update
     @project.safe_attributes = params[:project]
     @project.organization_id = params[:organization_id]
-    params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
-    params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0
+    params[:project][:is_public] == "on" ? @project.is_public = 1 : @project.is_public = 0
+    params[:project][:hidden_repo] == "on" ? @project.hidden_repo = 1 : @project.hidden_repo = 0
     # 更新公开私有时同步gitlab公开私有
-    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? true : false)
+    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? 1 : 0)
+      logger.info("########################=>#{params[:project][:is_public]}")
       g = Gitlab.client
-      params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
+      params[:project][:is_public] == "on" ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
+      logger.info("88888888888888888888888=>#{params[:project][:is_public] == "on"}")
     end
     # end
     if validate_parent_id && @project.save

From 1bfb2918f077f8801d13134f1a3236b6ff7a545d Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 20:06:12 +0800
Subject: [PATCH 661/668] =?UTF-8?q?KE=E9=97=B4=E8=B7=9D=E6=94=B9=E5=9B=9E?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=A4=A7=E7=BA=B2=E9=99=84=E4=BB=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E6=A0=87=E9=A2=98=E4=B8=8E=E7=BD=AE=E9=A1=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb   |  2 +-
 app/views/attachments/_form_course.html.erb | 12 ++++++------
 public/stylesheets/courses.css              |  3 +--
 public/stylesheets/new_user.css             |  1 -
 public/stylesheets/project.css              |  1 -
 public/stylesheets/public.css               |  3 +--
 public/stylesheets/syllabus.css             |  2 +-
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 960bc61e6..a6b5f09cf 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -612,7 +612,7 @@ class AttachmentsController < ApplicationController
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
+      unless @attachment.container_type == 'Syllabus' || @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 6d921903d..1d51e951a 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -2,31 +2,31 @@
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="sub_btn">
+    <p id="attachments_<%= i+1 %>" class="sub_btn">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% else %>
   <% container.attachments.each_with_index do |attachment, i| %>
-     <span id="attachments_p<%= i %>" class="attachment">
+     <p id="attachments_<%= i+1 %>" class="attachment">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
        <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
        <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
        <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
 
        <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% end %>
 <% end %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 96c9947b1..178e9bb5d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,7 +152,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -1429,4 +1428,4 @@ a.pages-big{ width:50px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
 
-.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a65edc490..b931dff6b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,7 +683,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .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;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 354c0f1ac..bde560613 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -969,7 +969,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     color: #484848;
     overflow: hidden;
 }
-.homepagePostIntro p{line-height: 1;}
 .homepagePostReply {
     width: 710px;
     margin: 10px auto 0px;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 7cfb7f9e0..c86e0f42d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -633,7 +633,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -1184,4 +1183,4 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 .reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
 
 /*20160622代码分析弹窗*/
-.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 6218f52e0..2abbffda7 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -138,7 +138,7 @@ a.sortupbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 3px no-rep
 a.sortdownbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
 a.sort_no{ background: url(../images/syllabus/icons_syllabus.png) -16px -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
 .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
-a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:708px;}
+a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block;}
 a:hover.list-title{ color:#269ac9;}
 .c_red{ font-weight:normal; font-size:12px;}
 .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}

From 134aa55e04807356886a4acfd262a8aa4e9c1e93 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 20:16:06 +0800
Subject: [PATCH 662/668] authoriod

---
 app/views/quality_analysis/_result_list.html.erb | 8 +++++++-
 app/views/repositories/show.html.erb             | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 51d91c04f..b0b8abafe 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -21,7 +21,13 @@
           <li class="analysis-result-version fl fontBlue2" title="分支名"><%= qa.branch %></li>
           <li class="analysis-result-loc fl fontBlue2" title="语言"><%= qa.language %></li>
           <li class="analysis-result-debt fl fontBlue2" title="时间"><%= qa.path %></li>
-          <li class="analysis-result-time fl fontBlue2" title="编辑"><%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true %></li>
+            <% if User.current.try(:login) == qa.author_login %>
+              <li class="analysis-result-time fl" title="编辑">
+                <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %>
+              </li>
+            <% else %>
+              <li class="analysis-result-time fl" style="color: #888" title="编辑">编辑</li>
+            <% end %>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 8164a103f..05f25822b 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,7 +5,7 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
       <%# if User.current.member_of?(@project) %>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && is_project_manager?(User.current.id, @project.id) && @project.is_public? %>
+      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && User.current.member_of?(@project) && @project.is_public? %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
       <%# end %>

From 61b5a100eb7b95d74861f11e6bd79e7c33bbe0d6 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 20:25:58 +0800
Subject: [PATCH 663/668] delete log messages

---
 app/controllers/projects_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 54ab3b2c3..cb86f1165 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -657,10 +657,8 @@ class ProjectsController < ApplicationController
     params[:project][:hidden_repo] == "on" ? @project.hidden_repo = 1 : @project.hidden_repo = 0
     # 更新公开私有时同步gitlab公开私有
     if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? 1 : 0)
-      logger.info("########################=>#{params[:project][:is_public]}")
       g = Gitlab.client
       params[:project][:is_public] == "on" ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
-      logger.info("88888888888888888888888=>#{params[:project][:is_public] == "on"}")
     end
     # end
     if validate_parent_id && @project.save

From 70e26927cba70f4f81cf2091ad4fbd035f51ee5e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 20:38:33 +0800
Subject: [PATCH 664/668] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=97=E6=A0=B7=E6=94=B9=E4=B8=BA=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 12 ++++++------
 app/views/courses/join.js.erb   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index f6bf59af0..f59beb7e5 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -324,15 +324,15 @@ class CoursesService
     define_error [
         0, '加入成功',
         1, '密码错误',
-        2, '课程已过期 请联系课程管理员重启课程。',
-        3, '您已经加入了课程',
-        4, '您加入的课程不存在',
+        2, '班级已过期 请联系班级管理员重启班级。',
+        3, '您已经加入了班级',
+        4, '您加入的班级不存在',
         5, '您还未登录',
         6, '申请成功，请等待审核完毕',
         7, '您已经发送过申请了，请耐心等待',
-        8, '您已经是该课程的教师了',
-        9, '您已经是该课程的教辅了',
-        10, '您已经是该课程的管理员了',
+        8, '您已经是该班级的教师了',
+        9, '您已经是该班级的教辅了',
+        10, '您已经是该班级的管理员了',
         '未知错误，请稍后再试'
     ]
   end
diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb
index 04a77f87b..ac8b717d1 100644
--- a/app/views/courses/join.js.erb
+++ b/app/views/courses/join.js.erb
@@ -10,12 +10,12 @@ window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/co
 <% elsif @state == 1 %>
 alert("密码错误");
 <% elsif @state == 2 %>
-alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
+alert("班级已过期\n请联系班级管理员重启班级。(在配置班级处)");
 <% elsif @state == 3 %>
-alert("您已经加入了课程");
+alert("您已经加入了班级");
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 4 %>
-alert("您加入的课程不存在");
+alert("您加入的班级不存在");
 <% elsif @state == 5 %>
 alert("您还未登录");
 <% elsif @state == 6 %>
@@ -25,15 +25,15 @@ hidden_join_course_form();
   alert("您已经发送过申请了，请耐心等待");
 hidden_join_course_form();
 <% elsif @state == 8%>
-alert("您已经是该课程的教师了");
+alert("您已经是该班级的教师了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 9%>
-alert("您已经是该课程的教辅了");
+alert("您已经是该班级的教辅了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 10%>
-alert("您已经是该课程的管理员了");
+alert("您已经是该班级的管理员了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% else %>

From 6ac7d322b9715130e420935e215ddf5e8724ae97 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Jul 2016 21:31:50 +0800
Subject: [PATCH 665/668] some added

---
 app/controllers/quality_analysis_controller.rb      | 3 ++-
 app/views/quality_analysis/_console_output.html.erb | 6 +++---
 app/views/quality_analysis/index.html.erb           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 2c55f780c..bec66aeff 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -165,6 +165,7 @@ class QualityAnalysisController < ApplicationController
   # resource_id: login + @repository.id
   def index
     begin
+      @branch = params[:branch]
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
       @jenkins_address = Redmine::Configuration['jenkins_address']
@@ -177,7 +178,7 @@ class QualityAnalysisController < ApplicationController
       else
         if params[:current_build_status] == "failure"
           job_name = params[:job_name]
-          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
         end
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first
diff --git a/app/views/quality_analysis/_console_output.html.erb b/app/views/quality_analysis/_console_output.html.erb
index 45115b9fe..372f7ec8d 100644
--- a/app/views/quality_analysis/_console_output.html.erb
+++ b/app/views/quality_analysis/_console_output.html.erb
@@ -2,7 +2,7 @@
 <div class="project_r_h">
   <h2 class="project_h2" style="width:180px;">质量分析</h2>
 </div>
-<p>
- <%= h @console_build.to_json.html_safe %>
-</p>
+<div>
+ <%=h @console_build %>
+</div>
 
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 19b5c5eea..7925f6120 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -2,7 +2,7 @@
     <%= render :partial => "result_list" %>
 <% else %>
     <% if params[:current_build_status].nil? || params[:current_build_status] == "success" %>
-        <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
+        <%= render :partial => "show", :locals => {:branch => @branch} %>
     <% else %>
         <% if params[:build_console_result] %>
             运行结果超时

From 447e624f3640ad870e695661628c78836a49fa11 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 21:38:37 +0800
Subject: [PATCH 666/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/syllabuses_helper.rb                    | 12 ++++++------
 app/views/courses/private_or_public.js.erb          |  4 ++--
 app/views/layouts/_syllabus_base_info.html.erb      |  6 +++---
 app/views/syllabuses/_syllabus_course_list.html.erb |  2 +-
 app/views/users/_user_course_list.html.erb          |  2 +-
 app/views/users/_user_syllabus_list.html.erb        |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index 00331e0dc..7e815950b 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -48,17 +48,17 @@ module SyllabusesHelper
     option6 = []
 
     option1 << "请选择"
-    option1 << 1
+    option1 << 0
     option2 << "公共必修课"
-    option2 << 2
+    option2 << 1
     option3 << "学科必修课"
-    option3 << 3
+    option3 << 2
     option4 << "专业选修课"
-    option4 << 4
+    option4 << 3
     option5 << "实践必修课"
-    option5 << 5
+    option5 << 4
     option6 << "实践选修课"
-    option6 << 6
+    option6 << 5
 
     type << option1
     type << option2
diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb
index 4e512a6a0..82180c452 100644
--- a/app/views/courses/private_or_public.js.erb
+++ b/app/views/courses/private_or_public.js.erb
@@ -9,9 +9,9 @@
     }
 <% else %>
     <% if @course.is_public? %>
-        $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","公开班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% else %>
-        $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","私有班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% end %>
     $("#set_course_public_<%= @course.id %>").replaceWith('<%= escape_javascript(link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => "courses", :action => "private_or_public", :id => @course,:user_page => true},
                                 :id => "set_course_public_#{@course.id.to_s}",:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗") %>');
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index cf4926d82..ae6da2ac3 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -4,7 +4,7 @@
   <% end %>
   <div class="cl"></div>
   <li><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
-  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 %>
+  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li><label>课程性质：</label><%=syllabus.syllabus_type_str %></li>
   <% end %>
   <% unless syllabus.credit.nil? || syllabus.credit == '' %>
@@ -26,7 +26,7 @@
       <li><label>先修课程：</label><%=syllabus.pre_course %></li>
   <% end %>
 
-  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == '' %>
+  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li class="none none_attr"><label>课程性质：</label><span class="fontGrey3">空</span></li>
   <% end %>
   <% if syllabus.credit.nil? || syllabus.credit == '' %>
@@ -48,7 +48,7 @@
       <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
   <% end %>
 </ul>
-<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
+<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
     <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
 <% end %>
 <script>
diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb
index 2667a2baa..fb85f76ea 100644
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@@ -23,7 +23,7 @@
               <li>
                 <span class="item_list fl"></span>
                 <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index ea8f3fc40..9013c41f4 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -20,7 +20,7 @@
               <li>
                 <span class="item_list fl"></span>
                 <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 7567f92cd..8e33696d6 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -74,7 +74,7 @@
                       <%=link_to '查看课程', syllabus_path(syllabus.id), :class => 'postOptionLink',:target =>'_blank', :title => '查看课程' %>
                     </li>
                     <% if User.current == syllabus.user %>
-                        <li><%=link_to '删除', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%></li>
+                        <li><%=link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%></li>
                     <% end %>
                   </ul>
                 </li>

From cc649ae64b775c9056436c4421a5ecb527eb8270 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 4 Jul 2016 14:14:51 +0800
Subject: [PATCH 667/668] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb        |  80 +++++++------
 app/controllers/users_controller.rb           |  16 ++-
 app/helpers/application_helper.rb             |   4 +-
 app/views/messages/_course_show.html.erb      |  33 ++++--
 app/views/messages/_project_show.html.erb     | 110 +++++++++---------
 app/views/messages/_reply_message.html.erb    |   9 +-
 app/views/messages/destroy.js.erb             |   8 ++
 app/views/messages/quote.js.erb               |  14 +--
 .../users/_comment_reply_detail.html.erb      |   6 +-
 app/views/users/_course_message.html.erb      |  20 ++--
 app/views/users/_message_contents.html.erb    |  23 ++++
 app/views/users/_message_replies.html.erb     |  61 ++++++++++
 .../users/_message_reply_banner.html.erb      |  18 +++
 app/views/users/_project_message.html.erb     |  18 ++-
 app/views/users/_reply_to.html.erb            |  18 ++-
 app/views/users/all_journals.js.erb           |   2 +
 app/views/users/show_all_replies.js.erb       |   2 +
 public/javascripts/application.js             |  35 ++++++
 public/stylesheets/courses.css                |   4 +-
 public/stylesheets/public.css                 |  46 +++++++-
 20 files changed, 382 insertions(+), 145 deletions(-)
 create mode 100644 app/views/messages/destroy.js.erb
 create mode 100644 app/views/users/_message_contents.html.erb
 create mode 100644 app/views/users/_message_replies.html.erb
 create mode 100644 app/views/users/_message_reply_banner.html.erb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8ef399d10..f5ad89832 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -44,7 +44,8 @@ class MessagesController < ApplicationController
       offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
       page = 1 + offset / REPLIES_PER_PAGE
     end
-    @reply_count = @topic.children.count
+    all_comments = []
+    @reply_count = get_all_children(all_comments, @topic).count
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
       messages_replies =  @topic.children.
@@ -137,26 +138,32 @@ class MessagesController < ApplicationController
 
   # Reply to a topic
   def reply
-    if params[:reply][:content] == ""
-      if params[:is_board]
-        if @project
-          (redirect_to project_boards_path(@project), :notice => l(:label_reply_empty);return)
-        elsif @course
-          (redirect_to course_boards_path(@course), :notice => l(:label_reply_empty);return)
-        end
-      else
-        (redirect_to board_message_url(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
-      end
+    if params[:parent_id]
+      parent = Message.find params[:parent_id]
+      @reply = Message.new
+      @reply.author = User.current
+      @reply.board = parent.board
+      @reply.content = params[:content]
+      @reply.subject = "RE: #{parent.subject}"
+      @reply.reply_id = params[:reply_id]
+      # @reply.reply_id = params[:id]
+      parent.children << @reply
+      @topic = params[:activity_id].nil? ? parent : Message.find(params[:activity_id].to_i)
+      @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+      @is_course = params[:is_course] if params[:is_course]
+      @is_board = params[:is_board] if params[:is_board]
+    else
+      @quote = params[:quote][:quote]
+      @reply = Message.new
+      @reply.author = User.current
+      @reply.board = @board
+      @reply.safe_attributes = params[:reply]
+      @reply.content = @quote + @reply.content
+      @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+      @topic.children << @reply
+      # @reply.reply_id = params[:id]
     end
-    @quote = params[:quote][:quote]
-    @reply = Message.new
-    @reply.author = User.current
-    @reply.board = @board
-    @reply.safe_attributes = params[:reply]
-    @reply.content = @quote + @reply.content
-    @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
-    # @reply.reply_id = params[:id]
-    @topic.children << @reply
+
     update_course_activity(@topic.class,@topic.id)
     update_user_activity(@topic.class,@topic.id)
     update_forge_activity(@topic.class,@topic.id)
@@ -182,14 +189,10 @@ class MessagesController < ApplicationController
       respond_to do |format|
         format.js
       end
-    elsif params[:is_board]
-      if @project
-        redirect_to project_boards_path(@project)
-      elsif @course
-        redirect_to course_boards_path(@course)
-      end
+      return
     else
-      redirect_to board_message_url(@board, @topic, :r => @reply)
+      redirect_to board_message_url(@board, @topic)
+      return
     end
 
   end
@@ -251,6 +254,17 @@ class MessagesController < ApplicationController
 
   # Delete a messages
   def destroy
+    if params[:user_activity_id]
+      @message.destroy
+      @topic = Message.find(params[:activity_id].to_i)
+      @user_activity_id = params[:user_activity_id]
+      @is_course = params[:is_course]
+      @is_board = params[:is_board]
+      respond_to do |format|
+        format.js
+      end
+      return
+    end
     if @project
       (render_403; return false) unless @message.destroyable_by?(User.current)
     elsif @course
@@ -299,12 +313,12 @@ class MessagesController < ApplicationController
   end
 
   def quote
-    @subject = @message.subject
-    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
-
-    @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
-    @temp = Message.new
-    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
+    # @subject = @message.subject
+    # @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+    #
+    # @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
+    # @temp = Message.new
+    # @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 69a38610e..fe42e6919 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -90,6 +90,8 @@ class UsersController < ApplicationController
     case params[:type]
       when 'JournalsForMessage'
         @comment = JournalsForMessage.find params[:comment].to_i
+      when 'Message'
+        @comment = Message.find params[:comment].to_i
     end
   end
 
@@ -111,6 +113,13 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @type = 'JournalsForMessage'
+      when 'Message'
+        @reply = Message.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @is_course = params[:is_course]
+        @is_board = params[:is_board]
+        @type = 'Message'
     end
     respond_to do |format|
       format.js
@@ -3281,7 +3290,12 @@ class UsersController < ApplicationController
           @journals = obj.children.reorder("created_at desc")
         when 'Message'
           obj = Message.where('id = ?', params[:id].to_i).first
-          @journals = obj.children.reorder("created_on desc")
+          @type = 'Message'
+          @is_course = params[:is_course]
+          @is_board = params[:is_board]
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
+          comments = []
+          @journals = get_all_children(comments, obj)
         when 'News'
           obj = News.where('id = ?', params[:id].to_i).first
           @journals = obj.comments.reorder("created_on desc")
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cb8b06a8f..1d79d45ce 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3138,9 +3138,9 @@ def get_reply_parents_no_root parents_rely, comment
   parents_rely
 end
 
-#获取留言的所有子节点
+#获取所有子节点
 def get_all_children result, jour
-  if jour.kind_of? JournalsForMessage
+  if (jour.kind_of? JournalsForMessage) || (jour.kind_of? Message)
     jour.children.each do |jour_child|
       result << jour_child
       get_all_children result, jour_child
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 560925070..232be1f35 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -95,9 +95,10 @@
         </span>
       </div>
     </div>
-    <% unless @replies.empty? %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, @topic) %>
     <div class="" id="reply_div_<%=  @topic.id %>">
-      <% @replies.each_with_index  do |reply,i| %>
+      <% comments.each_with_index  do |reply,i| %>
           <script type="text/javascript">
               $(function(){
                   showNormalImage('reply_message_description_<%= reply.id %>');
@@ -110,32 +111,41 @@
             </div>
             <div class="homepagePostReplyDes">
               <div class="homepagePostReplyPublisher">
-                <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
+                <%= time_from_now(reply.created_on) %>
               </div>
+              <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+            <% end %>
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
-              <div style="margin-top: -7px; margin-bottom: 5px">
-                <%= format_time(reply.created_on) %>
-                <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                  <span id="reply_praise_count_<%=reply.id %>">
-                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                  </span>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                <span id="reply_praise_count_<%= reply.id %>">
+                  <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
+                </span>
+                <span style="position: relative" class="fr mr20">
                   <%= link_to(
                               l(:button_reply),
                               {:action => 'quote', :id => reply},
                               :remote => true,
                               :method => 'get',
-                              :class => 'fr newsBlue mr10',
                               :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                  <span id="reply_iconup_<%= reply.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                </span>
                   <%= link_to(
                               l(:button_delete),
                               {:action => 'destroy', :id => reply},
                               :method => :post,
-                              :class => 'fr newsGrey mr10',
+                              :class => 'fr mr20',
                               :data => {:confirm => l(:text_are_you_sure)},
                               :title => l(:button_delete)
                       ) if reply.course_destroyable_by?(User.current) %>
+                </span>
+
+                  <div class="cl"></div>
                 </div>
               </div>
               <p id="reply_message_<%= reply.id%>"></p>
@@ -145,7 +155,6 @@
       <% end %>
     </div>
 
-  <% end %>
     <div class="cl"></div>
     <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
         <div class="talkWrapMsg" nhname="about_talk_reply">
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 43b0798aa..164e4c326 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -156,61 +156,65 @@
         </span>
         </div>
       </div>
-      <% unless @replies.empty? %>
-          <div class="" id="reply_div_<%=  @topic.id %>">
-            <% @replies.each_with_index  do |reply,i| %>
-                <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();">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <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 %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                    </div>
-                    <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
-                      <%= reply.content.html_safe%>
-                    </div>
-                    <div style="margin-top: -7px; margin-bottom: 5px">
-                      <%= format_time(reply.created_on) %>
-                      <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                        <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                        </span>
-                        <%= link_to(
-                                    l(:button_reply),
-                                    {:action => 'quote', :id => reply},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :class => 'fr newsBlue mr10',
-                                    :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
-                        <%= link_to(
-                                    l(:button_delete),
-                                    {:action => 'destroy', :id => reply},
-                                    :method => :post,
-                                    :class => 'fr newsGrey mr10',
-                                    :data => {:confirm => l(:text_are_you_sure)},
-                                    :title => l(:button_delete)
-                            ) if reply.destroyable_by?(User.current) %>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= reply.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
+      <% all_comments = []%>
+      <% comments = get_all_children(all_comments, @topic) %>
+      <div class="" id="reply_div_<%=  @topic.id %>">
+        <% comments.each_with_index  do |reply,i| %>
+            <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();">
+              <div class="homepagePostReplyPortrait">
+                <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+              </div>
+              <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyPublisher">
+                  <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
+                  <%= time_from_now(reply.created_on) %>
                 </div>
-            <% end %>
-          </div>
+                <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
+                    <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+                <% end %>
+                <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                  <%= reply.content.html_safe%>
+                </div>
+                <div class="orig_reply mb10 mt-10">
+                  <div class="reply">
+                <span class="reply-right">
+                <span id="reply_praise_count_<%= reply.id %>">
+                  <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
+                </span>
+                <span style="position: relative" class="fr mr20">
+                  <%= link_to(
+                              l(:button_reply),
+                              {:action => 'quote', :id => reply},
+                              :remote => true,
+                              :method => 'get',
+                              :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                  <span id="reply_iconup_<%= reply.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                </span>
+                  <%= link_to(
+                              l(:button_delete),
+                              {:action => 'destroy', :id => reply},
+                              :method => :post,
+                              :class => 'fr mr20',
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :title => l(:button_delete)
+                      ) if reply.course_destroyable_by?(User.current) %>
+                </span>
 
-      <% end %>
+                    <div class="cl"></div>
+                  </div>
+                </div>
+                <p id="reply_message_<%= reply.id%>"></p>
+              </div>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+      </div>
       <div class="cl"></div>
       <% if !@topic.locked? && authorize_for('messages', 'reply') %>
           <div class="talkWrapMsg" nhname="about_talk_reply">
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index d4d9d77a0..923734001 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -4,11 +4,12 @@
   <div class="ReplyToMessageInputContainer mb10">
     <% if User.current.logged? %>
         <div nhname='new_message_<%= reply.id%>'>
-          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-              <input type="hidden" name="quote[quote]" id="quote_quote">
-              <input type="hidden" name="reply[subject]" id="reply_subject">
+          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :method => "post", :id => 'new_form' do |f| %>
+              <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
+              <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author.id %>
+              <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@topic.id %>
               <div nhname='toolbar_container_<%= reply.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
               <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= reply.id%>'></p>
diff --git a/app/views/messages/destroy.js.erb b/app/views/messages/destroy.js.erb
new file mode 100644
index 000000000..109df3a0e
--- /dev/null
+++ b/app/views/messages/destroy.js.erb
@@ -0,0 +1,8 @@
+<%if @project%>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>");
+<%elsif @course%>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>");
+<% elsif @org_subfield %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+<%end%>
+sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index 89f953bb9..9bd723157 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,16 +1,8 @@
-/*$('#message_subject').val("<%#= raw escape_javascript(@subject) %>");
-$('#message_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
-//$('#message_content').val("<#%= raw escape_javascript(@content) %>");
-$('#quote_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
-
-showAndScrollTo("reply", "message_content");
-$('#message_content').scrollTop = $('#message_content').scrollHeight - $('#message_content').clientHeight;
-$("img").removeAttr("align");*/
 if($("#reply_message_<%= @message.id%>").length > 0) {
-    $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message,:temp =>@temp,:subject =>@subject}) %>");
+    $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message}) %>");
     $(function(){
-        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
-        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
+        /*$('#reply_subject').val("<%#= raw escape_javascript(@subject) %>");
+        $('#quote_quote').val("<%#= raw escape_javascript(@temp.content.html_safe) %>");*/
         sd_create_editor_from_data(<%= @message.id%>,null,"100%", "<%=@message.class.to_s%>");
     });
 }else if($("#reply_to_message_<%= @message.id%>").length >0) {
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index 4ced798d0..266a0b32b 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,9 +1,9 @@
 <div class="orig_user fl">
-<%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
 <div class="orig_right fl">
-  <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "content-username" %>
+  <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-  <div class="orig_content "><%= comment.notes.html_safe %></div>
+  <div class="orig_content "><%= comment.content_detail.html_safe %></div>
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index d4db3df1f..70a7e6c7d 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -78,20 +78,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
+  <% all_comments = []%>
+  <% count=get_all_children(all_comments, activity).count %>
+  <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
+  <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= render :partial => 'users/message_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
-    <% activity= activity.parent ? activity.parent : activity%>
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
-    <%  if count > 0 %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb
new file mode 100644
index 000000000..eab125006
--- /dev/null
+++ b/app/views/users/_message_contents.html.erb
@@ -0,0 +1,23 @@
+<% parents_rely = [] %>
+<% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+<% length = parents_rely.length %>
+<div id="comment_reply_<%=comment.id %>">
+  <% if length <= 3 %>
+      <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+  <% else %>
+      <div class="orig_cont clearfix">
+        <div class="orig_cont clearfix">
+          <div>
+            <%=render :partial => 'users/journal_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, :type => comment.class),:remote=>true %>
+        </div>
+        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
new file mode 100644
index 000000000..c6f9d91b0
--- /dev/null
+++ b/app/views/users/_message_replies.html.erb
@@ -0,0 +1,61 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+            <%= time_from_now(comment.created_on) %>
+          </div>
+          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+            <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+          <% end %>
+          <% if !comment.content_detail.blank? %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <%= comment.content_detail.html_safe %>
+              </div>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <% if comment.course_destroyable_by?(User.current) %>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board),
+                                  :method => :post,
+                                  :remote => true,
+                                  :class => 'fr mr20',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    <% end %>
+                </span>
+                  <div class="cl"></div>
+                </div>
+              </div>
+              <p id="reply_message_<%= comment.id%>"></p>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_message_reply_banner.html.erb b/app/views/users/_message_reply_banner.html.erb
new file mode 100644
index 000000000..0c8cda379
--- /dev/null
+++ b/app/views/users/_message_reply_banner.html.erb
@@ -0,0 +1,18 @@
+<div class="homepagePostReplyBanner">
+  <div class="homepagePostReplyBannerCount">
+    <span>回复</span>
+    <span  class="reply_iconup" > ︿</span>
+    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
+  </div>
+  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+  <%if count>3 %>
+      <div class="homepagePostReplyBannerMore">
+        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_message_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=is_course %>,<%=is_board %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 1abc36a31..d1bb99296 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -77,20 +77,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count = 0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
+  <% all_comments = []%>
+  <% count=get_all_children(all_comments, activity).count %>
+  <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
+  <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= render :partial => 'users/message_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
-    <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 621b56fbd..8a2909ad4 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -16,7 +16,7 @@
                   <p nhname='contentmsg_<%= reply.id%>'></p>
               <% end%>
           <% elsif @type == 'JournalsForMessage' %>
-              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
+              <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
                   <%= hidden_field_tag 'reference_id', params[:reference_id], :value => reply.id %>
                   <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => reply.user.id %>
                   <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => reply.id %>
@@ -28,6 +28,22 @@
                   <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
                   <div class="cl"></div>
               <% end%>
+          <% elsif @type == 'Message' %>
+              <%= form_for('new_form',:url => {:controller => 'messages', :action => 'reply', :id => reply.id, :board_id => reply.board.id}, :method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'is_course', params[:is_course], :value => @is_course %>
+                  <%= hidden_field_tag 'is_board', params[:is_board], :value => @is_board %>
+                  <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
+                  <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author.id %>
+                  <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <!--<input type="hidden" name="quote[quote]" id="quote_quote">
+                                    <input type="hidden" name="reply[subject]" id="reply_subject">-->
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>'></p>
+              <% end%>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index 6d227e93b..d03e13742 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -2,6 +2,8 @@
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
 <% elsif params[:type] == 'JournalsForMessage' %>
 $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
+<% elsif params[:type] == 'Message' %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id =>params[:id].to_i,:is_course => @is_course, :is_board => @is_board}) %>');
 <% else %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
 <% end %>
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index 5f5ea6c3f..ae8803653 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,6 +1,8 @@
 <% unless @comment.parent.nil? %>
     <% if params[:type] == 'JournalsForMessage' && (@comment.jour_type == 'Principal' || @comment.jour_type == 'Course') %>
         $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% elsif @comment.class.to_s == 'Message' %>
+        $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
     <% else %>
         $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
     <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 016526512..91467cca4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1374,6 +1374,41 @@ function expand_journal_reply(container, btnid, id, type, div_id, allow_delete)
     }
 }
 
+function expand_message_reply(container, btnid, id, type, div_id, is_course, is_board) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id,
+                is_course: is_course,
+                is_board: is_board
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
 function expand_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
     var target = $(container);
     var btn = $(btnid);
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 96c9947b1..9f7aeeafc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -190,7 +190,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
-.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
@@ -1429,4 +1429,4 @@ a.pages-big{ width:50px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
 
-.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 7cfb7f9e0..154cda201 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -666,7 +666,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyPortrait {float:left; width:45px;}
 .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 {font-size:12px; color:#484848; margin:3px 5px 12px 5px;}
 .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;}
@@ -1184,4 +1184,46 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 .reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
 
 /*20160622代码分析弹窗*/
-.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+
+/* 二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}

From 0dd7ef4460b794fcd66f74f554a5e892e4015c5a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 4 Jul 2016 14:45:50 +0800
Subject: [PATCH 668/668] =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=95=B0=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb        | 4 +++-
 app/views/users/_course_boardlist.html.erb  | 8 ++------
 app/views/users/_project_boardlist.html.erb | 8 ++------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 9a72bb4df..ceb63d7b0 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -125,7 +125,9 @@ class BoardsController < ApplicationController
     if @order.to_i == 2
       @type = 2
       @topics.each do |topic|
-        topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+        all_comments = []
+        count=get_all_children(all_comments, topic).count
+        topic[:infocount] = get_praise_num(topic) + count
         if topic[:infocount] < 0
           topic[:infocount] = 0
         end
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 5cb2c27a7..bdff80d33 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -46,12 +46,8 @@
                       发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                   </span>
                   <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
-                  <% count=0 %>
-                  <% if activity.parent %>
-                      <% count=activity.parent.children.count%>
-                  <% else %>
-                      <% count=activity.children.count%>
-                  <% end %>
+                  <% all_comments = []%>
+                  <% count=get_all_children(all_comments, activity).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>
                 </div>
                 <div class="cl"></div>
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index fe7bc03f2..3ba0244d9 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -46,12 +46,8 @@
                       发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                   </span>
                   <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
-                  <% count=0 %>
-                  <% if activity.parent %>
-                      <% count=activity.parent.children.count%>
-                  <% else %>
-                      <% count=activity.children.count%>
-                  <% end %>
+                  <% all_comments = []%>
+                  <% count=get_all_children(all_comments, activity).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>
                 </div>
                 <div class="cl"></div>