From 45589a024ab83735eaf7b2b4228e96711cdc4575 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 22 Sep 2015 14:33:52 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 15eebc15e..b1020d938 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -463,7 +463,7 @@ module UsersHelper
   def get_issue_des_update(journal)
     no_html = "message"
     arr = details_to_strings(journal.details, no_html)
-    unless journal.notes.empty?
+    unless journal.notes.blank?
       arr << "留言内容：" + journal.notes
     end
     str = ''

From 8935d12602ea17b5249191bdad2ed93c6c8c0dee Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 09:27:03 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index d536b6ed7..0a5b1a2e4 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -118,39 +118,34 @@
                 <% 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="homepageNewsPubTypeHomework 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 ? "homepageNewsTypeNotReadHomework fl":"homepageNewsTypeHomework fl" %>">发布了作业于课程：<%= ma.course_message.course.name %></span>
+                      <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>
-                      <li class="homepageNewsContent fl" style="width:315px;"><a href="javascript:void(0);" class="newsGrey">
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                         <%= 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))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
                         <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                            <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
+                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
                             <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
                             <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
                             <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
                             <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
                             <p>
-                              请同学们抓紧时间提交自己的作品，谢谢！
+                              请抓紧时间提交自己的作品，谢谢！
                             </p>
                         <% else %>
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
+                            <p>
+                              <%= User.current.lastname + User.current.firstname %>老师您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：
+                            </p>
                             <p><strong>课程：</strong><%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
                             <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
                             <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
                             <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
                             <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>

From 6e9d276d87bd1cd06665a9a6db1575e7d2dda504 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 09:30:48 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E8=80=81=E5=B8=88=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=94=B9=E6=88=90=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 220a37a2b..51214597b 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -143,7 +143,7 @@
                               <%= User.current.lastname + User.current.firstname %>老师您好！
                               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：
                             </p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
                             <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
                             <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>

From 72d1d12cef2a458a5ae7a7d83ec3578ac8ea70c7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 09:40:30 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84tips=E7=9A=84=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=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/user_messages.html.erb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 51214597b..e35fabcfa 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -129,12 +129,12 @@
                       <div  style="display: none" class="message_title_red system_message_style">
                         <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
                             <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
+                            <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+                            <p>作业标题：<%= ma.course_message.name %></p>
+                            <p>作业提交截止日期：<%= ma.course_message.end_time %></p>
+                            <p>匿评自动关闭日期：<%= ma.course_message.homework_detail_manual.evaluation_end %></p>
+                            <p迟交扣分：<%= ma.course_message.late_penalty %>分</p>
                             <p>
                               请抓紧时间提交自己的作品，谢谢！
                             </p>
@@ -143,14 +143,14 @@
                               <%= User.current.lastname + User.current.firstname %>老师您好！
                               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：
                             </p>
-                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
+                            <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                            <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
+                            <p>作业标题：<%= ma.course_message.name %></p>
+                            <p>作业提交截止日期：<%= ma.course_message.end_time %></p>
+                            <p>匿评自动开始日期：<%= ma.course_message.homework_detail_manual.evaluation_start %></p>
+                            <p>匿评自动关闭日期：<%= ma.course_message.homework_detail_manual.evaluation_end %></p>
+                            <p>迟交扣分：<%= ma.course_message.late_penalty %>分</p>
+                            <p>缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
                             <p>
                               您可以修改作业内容、评分规则、匿评过程等，谢谢！
                             </p>

From 9d25f58ee49c7257bfe2510d24a3a44bc8ae738f Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 10:13:34 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AFtips=E7=9A=84=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E5=8F=8A=E6=A0=87=E9=A2=98=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e35fabcfa..3138b7c25 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -128,29 +128,29 @@
                                     :onmouseout => "message_titile_hide($(this))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
                         <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                            <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
+                            <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
                             <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p>作业标题：<%= ma.course_message.name %></p>
-                            <p>作业提交截止日期：<%= ma.course_message.end_time %></p>
-                            <p>匿评自动关闭日期：<%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p迟交扣分：<%= ma.course_message.late_penalty %>分</p>
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                             <p>
                               请抓紧时间提交自己的作品，谢谢！
                             </p>
                         <% else %>
                             <p>
                               <%= User.current.lastname + User.current.firstname %>老师您好！
-                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
                             </p>
                             <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p>作业标题：<%= ma.course_message.name %></p>
-                            <p>作业提交截止日期：<%= ma.course_message.end_time %></p>
-                            <p>匿评自动开始日期：<%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                            <p>匿评自动关闭日期：<%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p>迟交扣分：<%= ma.course_message.late_penalty %>分</p>
-                            <p>缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
+                            <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %></span></p>
+                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点<span></p>
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
                             <p>
                               您可以修改作业内容、评分规则、匿评过程等，谢谢！
                             </p>

From 892aa166ee8d94de5b71df2f43d99339b201c6a1 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 10:16:27 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=B8=BA24=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 3138b7c25..32b932162 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -146,7 +146,7 @@
                             <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
                             <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
-                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %></span></p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %></span>&nbsp;&nbsp;24点</p>
                             <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
                             <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点<span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>

From c445e933bf829f4d7e34b0e65dbd7931336d1989 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 10:18:43 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 32b932162..916493561 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -146,7 +146,7 @@
                             <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
                             <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
-                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %></span>&nbsp;&nbsp;24点</p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                             <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
                             <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点<span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>

From 7e3ae446f5299a682baf12446019d6c95bc3652d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 25 Sep 2015 10:35:04 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource.html.erb      | 1058 +++++++++----------
 public/images/homepage_icon.png             |  Bin 13042 -> 13692 bytes
 public/stylesheets/courses.css              |    2 +-
 public/stylesheets/images/homepage_icon.png |  Bin 6829 -> 13692 bytes
 public/stylesheets/new_user.css             |    3 +-
 5 files changed, 532 insertions(+), 531 deletions(-)

diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 096d6e8f5..f6bb3c8cb 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -1,529 +1,529 @@
-
-<%= javascript_include_tag 'bootstrap'%>
-<%= stylesheet_link_tag 'project' %>
-<%= stylesheet_link_tag 'leftside' %>
-<%= javascript_include_tag 'attachments'%>
-<!--<script type="text/css">-->
-<!--html,body{ overflow-y:scroll;}-->
-<!--html,body{ overflow:scroll; min-height:101%;}-->
-<!--html{ overflow:-moz-scrollbars-vertical;}-->
-<!--</script>-->
-<script>
-    function remote_get_resources(user_id,type){
-
-    }
-    function remote_search(){
-        $("#resource_search_form").submit();
-    }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","46%");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-
-    function closeModal()
-    {
-        hideModal($(".uploadBoxContainer"));
-    }
-    function closePopUp(){
-        hideModal($(".boxContainer"));
-    }
-
-    function check_files(){
-        return $("#attachments_fields").children().length == 0;
-    }
-
-    function submit_files(){
-        $("#upload_form").submit();
-    }
-</script>
-<div class="homepageRightBanner">
-    <div class="NewsBannerName">资源库</div>
-    <ul class="resourcesSelect">
-      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="resourcesType">
-          <li>
-            <%= link_to '全部' ,user_resource_user_path(:id=>@user.id,:type=>1),:remote=>true,:method => 'get',:class=>'resourcesTypeAll resourcesGrey' %>
-          </li>
-          <li>
-            <%= link_to '课程资源' ,user_resource_user_path(:id=>@user.id,:type=>2),:remote=>true,:method => 'get',:class=>'homepagePostTypeAssignment postTypeGrey' %>
-          </li>
-          <li>
-            <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
-          </li>
-          <li>
-            <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
-          </li>
-          <li>
-            <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-
-<div class="resources mt10" id="users_setting">
-  <div class="resourcesSearchBanner mt10">
-    <div class="resourcesUploadBox">
-      <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
-    <div id="search_div">
-      <%= render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} %>
-    </div>
-    <div style="
-    float: left;
-            margin-top: 7px;
-            font-size: 14px;
-            margin-left: 15px;
-    "><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count%></span>个资源</span></div>
-  </div>
-  <div class="resourcesListBanner">
-    <ul class="resourcesListTab">
-      <li class="resourcesListCheckbox fl"> </li>
-      <li class="resourcesListName fl">资源名称</li>
-      <li class="resourcesListSize fl">大小</li>
-      <li class="resourcesListType fl">类别</li>
-      <li class="resourcesListUploader fl">上传者</li>
-      <li class="resourcesListTime fl">上传时间</li>
-    </ul>
-  </div>
-  <form id="resources_list_form">
-    <div id="resources_list">
-
-      <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
-
-    </div>
-    <div class="resourcesListOption">
-      <div class="resourcesCheckAll">
-        <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
-      </div>
-      <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
-      <a href="javascript:void(0);" class="replyGrey1" onclick="batch_delete();">删除</a>
-      <div class="resourcesSelectSend">
-        <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
-        <div class="resourcesSelectSendButton" onclick="batch_send();">
-          <a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
-        </div>
-      </div>
-    </div>
-  </form>
-  <div class="cl"></div>
-  <div>
-    <ul class="wlist" id="pages" style="margin-top: 5px;">
-      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-    </ul>
-  </div>
-</div>
-
-<div class="cl"></div>
-<!--<div id="upload_box" style="display: none">-->
-<!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
-<!--</div>-->
-<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
-  <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send();" data-remote="true" onfocus="this.blur()" >发送</a></li>
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
-</ul>
-
-<script>
-    var pageX = 0;
-    var pageY = 0;
-    //当前选中的行
-    var line;
-    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
-    var last_line;
-    //资源名称
-    var res_name;
-    //资源名称的链接
-    var res_link;
-    var id; //资源id
-    var sendType;  //发送到课程 1  发送到项目 2
-    var lastSendType;  //保存上次发送的发送类型
-    $("#resources_list").mousedown(function(e) {
-        //如果是右键的话
-        if (3 == e.which) {
-            document.oncontextmenu = function() {return false;}
-            pageX = e.clientX;
-            pageY = e.clientY;
-            $("#contextMenu").hide();
-            $("#contextMenu").attr("style","display: block; position: fixed; top:"
-                    + pageY
-                    + "px; left:"
-                    + pageX
-                    + "px; width: 80px;");
-            $("#contextMenu").show();
-            //当前光标所在的对象
-
-            var ele = document.elementFromPoint(pageX,pageY);
-            //转换为jquery对象
-            line = $(ele).parent();
-            //如果上一条存在被选中，那么将上一条的背景色改为白色
-            if(last_line != null){
-                last_line.children().css("background-color", 'white');
-                restore();
-                last_line == null;
-            }
-            //如果当前的tag是li，那么还要li的父级元素
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-            //将当前的元素的所有子元素的背景色改为蓝色
-            line.children().css("background-color", '#e1e1e1');
-            //将当前元素赋给 上一个对象 保存起来。
-            last_line = line;
-        }
-    });
-    //元素包含关系计算
-    var contains  = function(root, el) {
-        if (root.compareDocumentPosition)
-            return root === el || !!(root.compareDocumentPosition(el) & 16);
-        if (root.contains && el.nodeType === 1){
-            return root.contains(el) && root !== el;
-        }
-        while ((el = el.parentNode))
-            if (el === root) return true;
-        return false;
-    }
-    $(document.body).click(function(e) {
-        //在列表上的任何单击事件都要恢复原来的样子
-        //隐藏右键菜单
-        //e.preventDefault();
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        //如果当前行为空，那么要将当前行的拿到
-        var ele;
-        if(line == null){
-            ele = document.elementFromPoint(e.clientX, e.clientY);
-            line = $(ele).parent();
-            //如果是在li上点击事件，那么要获得父组件
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-
-        }
-        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($("#resources_list").get(0),line.get(0))){
-            line.children().css("background-color", 'white');
-        }
-
-        //当前行恢复编辑状态到链接状态
-        if(ele && ele.nodeName != 'INPUT') {
-            restore();
-        }
-        line = null;
-    });
-    //只要有一个选中了就是true
-    function checkboxSelected(){
-        selected = false;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == true){
-                selected = true;
-            }
-        });
-        return selected;
-    }
-    //只有全选才是true
-    function checkboxAllSelected(){
-        allSelected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == undefined){
-                allSelected = false;
-            }
-        });
-        return allSelected;
-    }
-    //只有全部不选才是true
-    function checkboxAllDeselected(){
-        allDeselected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                allDeselected = false;
-            }
-        });
-        return allDeselected;
-    }
-    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
-    function checkAllBox(checkbox){
-        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
-        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
-            $("#checkboxAll").attr('checked',true);
-        }else{
-            $("#checkboxAll").attr('checked',false);
-        }
-        $("#res_count").html(getCheckBoxSeletedCount());
-
-    }
-    //获取当前checkbox选中的数目
-    function getCheckBoxSeletedCount(){
-        var i = 0;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                i ++;
-            }
-        });
-        return i;
-    }
-    //全选反选
-    function all_select(){
-
-        if($("#checkboxAll").attr('checked')){
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',true);
-            });
-            $("#res_count").html(getCheckBoxSeletedCount());
-        }else{
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',false);
-            });
-            $("#res_count").html(0);
-        }
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(@user)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
-            });
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(@user)%>'+"?resource_id="+id
-        });
-    }
-
-    function rename(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().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();
-            line.children().eq(1).html('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
-                    '<input name="res_name" id="res_name" ' +
-                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
-                    'value="'+res_name+
-                    '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
-                    '<% end %>');
-            $("#res_name").focus();
-            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
-        }else{
-            alert('您无法修改此资源！')
-        }
-    }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.post(
-                            '<%=rename_resource_user_path(@user) %>',
-                                    "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
-                            function (data){
-                                if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                    last_line.children().eq(1).html(res_link);
-                                    last_line.children().eq(1).children().attr('title',name);
-                                    last_line.children().eq(1).children().attr('href',data);
-                                    last_line.children().eq(1).children().html(name.length > 17? name.substring(0,17)+'...' : name);
-                                }else{
-                                    last_line.children().eq(1).html(res_link);
-                                    res_link = null; //如果修改失败，恢复之后将res_link置空
-                                }
-                            },
-                            'text'
-                    );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(@user)%>' + '?resource_id=' + id + '&type=' + $('#type').val()
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
-
-    //id 发送的id
-    //发送的id数组
-    function chooseSendType(res_id,res_ids){
-
-        sendType = $(".resourcesSendType").val();
-        if (sendType === lastSendType) {
-            return;
-        } else if (lastSendType != null) { //不是第一次点击的时候
-            if(res_ids == "") {//如果是单个发送
-                if (sendType === '1') {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
-                    });
-                } else {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
-                    });
-                }
-            }else{//如果是多个发送
-                if (sendType === '1'){
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
-                    });
-                }else{
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
-                    });
-                }
-            }
-        }
-
-        lastSendType = sendType;
-    }
-    //  var iWidth = document.documentElement.clientWidth;
-    //  var iHeight = document.documentElement.clientHeight;
-    //  var moveX = 0;
-    //  var moveY = 0;
-    //  var moveTop = 0;
-    //  var moveLeft = 0;
-    //  var moveable = false;
-    //  var docMouseMoveEvent = document.onmousemove;
-    //  var docMouseUpEvent = document.onmouseup;
-    //  $("#upload_box").mousedown(function() {
-    //      var evt = getEvent();
-    //      moveable = true;
-    //      moveX = evt.clientX;
-    //      moveY = evt.clientY;
-    //
-    //      moveTop = parseInt($("#upload_box").css('top'));
-    //      moveLeft = parseInt($("#upload_box").css('left'));
-    //
-    //      $(document).mousemove( function() {
-    //          if (moveable) {
-    //              var evt = getEvent();
-    //              var x = moveLeft + evt.clientX - moveX;
-    //              var y = moveTop + evt.clientY - moveY;
-    //              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
-    //                  $("#upload_box").css('left',  x + "px");
-    //                  $("#upload_box").css('top', y + "px");
-    //                  console.log( moveX)
-    //                  console.log( moveY)
-    //              }
-    //          }
-    //      });
-    //      $(document).mouseup (function () {
-    //          if (moveable) {
-    //              document.onmousemove = docMouseMoveEvent;
-    //              document.onmouseup = docMouseUpEvent;
-    //              moveable = false;
-    //              moveX = 0;
-    //              moveY = 0;
-    //              moveTop = 0;
-    //              moveLeft = 0;
-    //          }
-    //      });
-    //  });
-    //
-    //  // 获得事件Event对象，用于兼容IE和FireFox
-    //  function getEvent() {
-    //      return window.event || arguments.callee.caller.arguments[0];
-    //  }
-
-</script>
-
+
+<%= javascript_include_tag 'bootstrap'%>
+<%= stylesheet_link_tag 'project' %>
+<%= stylesheet_link_tag 'leftside' %>
+<%= javascript_include_tag 'attachments'%>
+<!--<script type="text/css">-->
+<!--html,body{ overflow-y:scroll;}-->
+<!--html,body{ overflow:scroll; min-height:101%;}-->
+<!--html{ overflow:-moz-scrollbars-vertical;}-->
+<!--</script>-->
+<script>
+    function remote_get_resources(user_id,type){
+
+    }
+    function remote_search(){
+        $("#resource_search_form").submit();
+    }
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","46%");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+
+    function closeModal()
+    {
+        hideModal($(".uploadBoxContainer"));
+    }
+    function closePopUp(){
+        hideModal($(".boxContainer"));
+    }
+
+    function check_files(){
+        return $("#attachments_fields").children().length == 0;
+    }
+
+    function submit_files(){
+        $("#upload_form").submit();
+    }
+</script>
+<div class="homepageRightBanner">
+    <div class="NewsBannerName">资源库</div>
+    <ul class="resourcesSelect">
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="resourcesType">
+          <li>
+            <%= link_to '全部' ,user_resource_user_path(:id=>@user.id,:type=>1),:remote=>true,:method => 'get',:class=>'resourcesTypeAll resourcesGrey' %>
+          </li>
+          <li>
+            <%= link_to '课程资源' ,user_resource_user_path(:id=>@user.id,:type=>2),:remote=>true,:method => 'get',:class=>'homepagePostTypeAssignment postTypeGrey' %>
+          </li>
+          <li>
+            <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
+          </li>
+          <li>
+            <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeUser resourcesGrey' %>
+          </li>
+          <li>
+            <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+
+<div class="resources mt10" id="users_setting">
+  <div class="resourcesSearchBanner mt10">
+    <div class="resourcesUploadBox">
+      <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+    <div id="search_div">
+      <%= render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} %>
+    </div>
+    <div style="
+    float: left;
+            margin-top: 7px;
+            font-size: 14px;
+            margin-left: 15px;
+    "><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count%></span>个资源</span></div>
+  </div>
+  <div class="resourcesListBanner">
+    <ul class="resourcesListTab">
+      <li class="resourcesListCheckbox fl"> </li>
+      <li class="resourcesListName fl">资源名称</li>
+      <li class="resourcesListSize fl">大小</li>
+      <li class="resourcesListType fl">类别</li>
+      <li class="resourcesListUploader fl">上传者</li>
+      <li class="resourcesListTime fl">上传时间</li>
+    </ul>
+  </div>
+  <form id="resources_list_form">
+    <div id="resources_list">
+
+      <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+
+    </div>
+    <div class="resourcesListOption">
+      <div class="resourcesCheckAll">
+        <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
+      </div>
+      <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
+      <a href="javascript:void(0);" class="replyGrey1" onclick="batch_delete();">删除</a>
+      <div class="resourcesSelectSend">
+        <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
+        <div class="resourcesSelectSendButton" onclick="batch_send();">
+          <a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
+        </div>
+      </div>
+    </div>
+  </form>
+  <div class="cl"></div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 5px;">
+      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+    </ul>
+  </div>
+</div>
+
+<div class="cl"></div>
+<!--<div id="upload_box" style="display: none">-->
+<!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
+<!--</div>-->
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
+  <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send();" data-remote="true" onfocus="this.blur()" >发送</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
+</ul>
+
+<script>
+    var pageX = 0;
+    var pageY = 0;
+    //当前选中的行
+    var line;
+    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+    var last_line;
+    //资源名称
+    var res_name;
+    //资源名称的链接
+    var res_link;
+    var id; //资源id
+    var sendType;  //发送到课程 1  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            document.oncontextmenu = function() {return false;}
+            pageX = e.clientX;
+            pageY = e.clientY;
+            $("#contextMenu").hide();
+            $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                    + pageY
+                    + "px; left:"
+                    + pageX
+                    + "px; width: 80px;");
+            $("#contextMenu").show();
+            //当前光标所在的对象
+
+            var ele = document.elementFromPoint(pageX,pageY);
+            //转换为jquery对象
+            line = $(ele).parent();
+            //如果上一条存在被选中，那么将上一条的背景色改为白色
+            if(last_line != null){
+                last_line.children().css("background-color", 'white');
+                restore();
+                last_line == null;
+            }
+            //如果当前的tag是li，那么还要li的父级元素
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+            //将当前的元素的所有子元素的背景色改为蓝色
+            line.children().css("background-color", '#e1e1e1');
+            //将当前元素赋给 上一个对象 保存起来。
+            last_line = line;
+        }
+    });
+    //元素包含关系计算
+    var contains  = function(root, el) {
+        if (root.compareDocumentPosition)
+            return root === el || !!(root.compareDocumentPosition(el) & 16);
+        if (root.contains && el.nodeType === 1){
+            return root.contains(el) && root !== el;
+        }
+        while ((el = el.parentNode))
+            if (el === root) return true;
+        return false;
+    }
+    $(document.body).click(function(e) {
+        //在列表上的任何单击事件都要恢复原来的样子
+        //隐藏右键菜单
+        //e.preventDefault();
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+
+        }
+        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
+        if( contains($("#resources_list").get(0),line.get(0))){
+            line.children().css("background-color", 'white');
+        }
+
+        //当前行恢复编辑状态到链接状态
+        if(ele && ele.nodeName != 'INPUT') {
+            restore();
+        }
+        line = null;
+    });
+    //只要有一个选中了就是true
+    function checkboxSelected(){
+        selected = false;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == true){
+                selected = true;
+            }
+        });
+        return selected;
+    }
+    //只有全选才是true
+    function checkboxAllSelected(){
+        allSelected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == undefined){
+                allSelected = false;
+            }
+        });
+        return allSelected;
+    }
+    //只有全部不选才是true
+    function checkboxAllDeselected(){
+        allDeselected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                allDeselected = false;
+            }
+        });
+        return allDeselected;
+    }
+    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+    function checkAllBox(checkbox){
+        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+            $("#checkboxAll").attr('checked',true);
+        }else{
+            $("#checkboxAll").attr('checked',false);
+        }
+        $("#res_count").html(getCheckBoxSeletedCount());
+
+    }
+    //获取当前checkbox选中的数目
+    function getCheckBoxSeletedCount(){
+        var i = 0;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                i ++;
+            }
+        });
+        return i;
+    }
+    //全选反选
+    function all_select(){
+
+        if($("#checkboxAll").attr('checked')){
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',true);
+            });
+            $("#res_count").html(getCheckBoxSeletedCount());
+        }else{
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',false);
+            });
+            $("#res_count").html(0);
+        }
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(@user)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+            });
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(@user)%>'+"?resource_id="+id
+        });
+    }
+
+    function rename(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().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();
+            line.children().eq(1).html('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
+                    '<input name="res_name" id="res_name" ' +
+                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                    'value="'+res_name+
+                    '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
+                    '<% end %>');
+            $("#res_name").focus();
+            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+        }else{
+            alert('您无法修改此资源！')
+        }
+    }
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.post(
+                            '<%=rename_resource_user_path(@user) %>',
+                                    "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
+                            function (data){
+                                if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                    last_line.children().eq(1).html(res_link);
+                                    last_line.children().eq(1).children().attr('title',name);
+                                    last_line.children().eq(1).children().attr('href',data);
+                                    last_line.children().eq(1).children().html(name.length > 17? name.substring(0,17)+'...' : name);
+                                }else{
+                                    last_line.children().eq(1).html(res_link);
+                                    res_link = null; //如果修改失败，恢复之后将res_link置空
+                                }
+                            },
+                            'text'
+                    );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(@user)%>' + '?resource_id=' + id + '&type=' + $('#type').val()
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
+
+    //id 发送的id
+    //发送的id数组
+    function chooseSendType(res_id,res_ids){
+
+        sendType = $(".resourcesSendType").val();
+        if (sendType === lastSendType) {
+            return;
+        } else if (lastSendType != null) { //不是第一次点击的时候
+            if(res_ids == "") {//如果是单个发送
+                if (sendType === '1') {
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+                    });
+                } else {
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+                    });
+                }
+            }else{//如果是多个发送
+                if (sendType === '1'){
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+                    });
+                }else{
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+                    });
+                }
+            }
+        }
+
+        lastSendType = sendType;
+    }
+    //  var iWidth = document.documentElement.clientWidth;
+    //  var iHeight = document.documentElement.clientHeight;
+    //  var moveX = 0;
+    //  var moveY = 0;
+    //  var moveTop = 0;
+    //  var moveLeft = 0;
+    //  var moveable = false;
+    //  var docMouseMoveEvent = document.onmousemove;
+    //  var docMouseUpEvent = document.onmouseup;
+    //  $("#upload_box").mousedown(function() {
+    //      var evt = getEvent();
+    //      moveable = true;
+    //      moveX = evt.clientX;
+    //      moveY = evt.clientY;
+    //
+    //      moveTop = parseInt($("#upload_box").css('top'));
+    //      moveLeft = parseInt($("#upload_box").css('left'));
+    //
+    //      $(document).mousemove( function() {
+    //          if (moveable) {
+    //              var evt = getEvent();
+    //              var x = moveLeft + evt.clientX - moveX;
+    //              var y = moveTop + evt.clientY - moveY;
+    //              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
+    //                  $("#upload_box").css('left',  x + "px");
+    //                  $("#upload_box").css('top', y + "px");
+    //                  console.log( moveX)
+    //                  console.log( moveY)
+    //              }
+    //          }
+    //      });
+    //      $(document).mouseup (function () {
+    //          if (moveable) {
+    //              document.onmousemove = docMouseMoveEvent;
+    //              document.onmouseup = docMouseUpEvent;
+    //              moveable = false;
+    //              moveX = 0;
+    //              moveY = 0;
+    //              moveTop = 0;
+    //              moveLeft = 0;
+    //          }
+    //      });
+    //  });
+    //
+    //  // 获得事件Event对象，用于兼容IE和FireFox
+    //  function getEvent() {
+    //      return window.event || arguments.callee.caller.arguments[0];
+    //  }
+
+</script>
+
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index 46f96a36ff00506b63eebe34ff99fd55c34b18e9..28a7eb44ac30cdb96c19ed5f92bd15ec555dddd9 100644
GIT binary patch
delta 10495
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

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

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 754112b52..dd21e8472 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -41,7 +41,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; padding-bottom:5px;}
+.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle;}
 .hworkH30 {height:30px !important; line-height:30px !important;}
 .hworkListRow {height:65px; border-bottom:1px solid #eaeaea; line-height:65px; vertical-align:middle;}
 .hworkListRow:hover {background-color:#f6f6f7;}
diff --git a/public/stylesheets/images/homepage_icon.png b/public/stylesheets/images/homepage_icon.png
index bb32783b57537f105cc7a29fa61203a8545bd4ae..28a7eb44ac30cdb96c19ed5f92bd15ec555dddd9 100644
GIT binary patch
literal 13692
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
Oq$sQQs#eA#?0*3B`yN{W

literal 6829
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%0D8ow*KQG~_orhW`
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
IyM6Ef06h47%K!iX

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e049e029..28fb1e80e 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -373,6 +373,7 @@ a.sendButtonBlue:hover {color:#ffffff;}
 }
 a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
 a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
+a.resourcesTypeUser {background:url(images/homepage_icon.png) -180px -453px no-repeat; padding-left:23px;}
 .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
 /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
@@ -527,7 +528,7 @@ a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
 a.newsRed {color:red;}
-a.newsRed:hovor {color:#888888;}
+a.newsRed:hover {color:#888888;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.replyGrey1 {color:#888888;}

From 061d41e50ab6181f82de0dbdeffab958ac992637 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 10:35:43 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=20?=
 =?UTF-8?q?=E5=92=8C=20=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=80=9A=E7=94=A8=EF=BC=8C=E9=9C=80=E8=A6=81=E5=AF=B9?=
 =?UTF-8?q?js=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/index.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 489c0357d..eb2597127 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -223,6 +223,7 @@
                 });
 
     }
+    <%= if @course %>
     var tagNameHtml; //当前双击的链接的父节点的html
     var tagName;  //标签的值
     var parentCssBorder; //当前双击的链接的父节点
@@ -271,6 +272,7 @@
                }
            }
    });
+   <%end %>
 
 </script>
 

From 80bf8d83f322d724087acc71c02460763ef6e5fe Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 10:38:26 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=92=8C=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=20js=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index eb2597127..34f7452a7 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -223,7 +223,7 @@
                 });
 
     }
-    <%= if @course %>
+    <% if @course %>
     var tagNameHtml; //当前双击的链接的父节点的html
     var tagName;  //标签的值
     var parentCssBorder; //当前双击的链接的父节点

From e8a7448a7c37089abc6d82688123e17e991894b4 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 25 Sep 2015 10:43:19 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=B5=84=E6=BA=90=E5=9B=BE=E6=A0=87=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

---
 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 28fb1e80e..89a380d68 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -373,7 +373,7 @@ a.sendButtonBlue:hover {color:#ffffff;}
 }
 a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
 a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
-a.resourcesTypeUser {background:url(images/homepage_icon.png) -180px -453px no-repeat; padding-left:23px;}
+a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-repeat; padding-left:23px;}
 .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
 /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/

From 3e857ba48f492b34d0eb9dd5ac0ce13f58c9af07 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 11:04:46 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=EF=BC=9A=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E5=BF=AB=E5=88=B0?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BB=99=E5=87=BA=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E3=80=82=E4=BF=AE=E6=94=B9=E6=8F=90=E9=86=92=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=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/user_messages.html.erb | 111 +++++++++++++------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 916493561..c4382a145 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -148,7 +148,7 @@
                             <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
                             <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                             <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点<span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                             <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
                             <p>
@@ -163,59 +163,62 @@
                     <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>
-                      <% if ma.viewed == 0 %>
-                          <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"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                                <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                                <p><strong>课程：</strong><%= ma.course_message.course.name %>
-                                  (<%= ma.course_message.course.term %>)</p>
-                                <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                                <% unless ma.course_message.description.blank? %>
-                                    <div class="fl"><strong>作业内容：</strong></div>
-                                    <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                                <% end %>
-                                <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p>
-                                  请同学们抓紧时间提交自己的作品，谢谢！
-                                </p>
-                            <% else %>
-                                <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                                <p><strong>课程：</strong><%= ma.course_message.course.name %>
-                                  (<%= ma.course_message.course.term %>)</p>
-                                <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                                <% unless ma.course_message.description.blank? %>
-                                    <div class="fl"><strong>作业内容：</strong></div>
-                                    <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                                <% end %>
-                                <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                                <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
-                                <p>
-                                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                                </p>
-                            <% end %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
-                      <% else %>
-                          <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))"%>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                      <% end %>
+                      <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"}",
+                                    :onmouseover => "message_titile_show($(this),event)",
+                                    :onmouseout => "message_titile_hide($(this))" %>
+                      </li>
+                      <div style="display: none" class="message_title_red system_message_style">
+                        <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
+                            <p>
+                              <%= User.current.lastname + User.current.firstname %>同学您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
+                            </p>
+
+                            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
+
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                              @nbsp;@nbsp;24点</span></p>
+
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+
+                            <p>
+                              请同学们抓紧时间提交自己的作品，谢谢！
+                            </p>
+                        <% else %>
+                            <p><%= User.current.lastname + User.current.firstname %>您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
+                              老师发布的作业截止日期快到了：</p>
+
+                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
+                              (<%= ma.course_message.course.term %>)</p>
+
+                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+
+                            <p><strong>提交截止：</strong><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评开始：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评关闭：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+
+                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分
+                            </p>
+
+                            <p>
+                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                            </p>
+                        <% end %>
+                      </div>
+                      <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>

From e4e1a0818e17efafd45ff6b81ff10ed8c6fd8f42 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 11:17:31 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=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/memos/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 81758ff97..4cafce30d 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -56,7 +56,7 @@
     <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
   </span>
       <div class="cl"></div>
-      <div class="fl fontGrey3" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;">
+      <div class="fl fontGrey3" class="memo-content">
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>

From 123a6c862d66537719e05257a69478a6838cede3 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 11:22:35 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=AF=84=E9=98=85=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 6ee5f729a..a209e6b9c 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -368,7 +368,7 @@
                         </li>
                       <li class="homepageNewsPubType fl">
                         <% if ma.course_message.reviewer_role == 3 %>
-                            匿名用户
+                            <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" %>

From 4d1bc9016137f8d97c7ff877e706aa9725608607 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 11:40:57 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E9=98=85=E4=BD=9C=E5=93=81=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
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 f183add69..02f908f50 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -548,7 +548,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .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 {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
 .homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
 .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}

From 44c097dbaff50089ef4a9bfdd9f5fae0794ee4c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Sep 2015 11:45:57 +0800
Subject: [PATCH 16/21] =?UTF-8?q?1=E3=80=81issue=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=202=E3=80=81=E8=A7=A3=E5=86=B3issue=E5=9B=9E=E5=A4=8D=E5=90=AB?=
 =?UTF-8?q?=E6=9C=89html=E9=97=AE=E9=A2=98=203=E3=80=81=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E4=B8=AD=E5=90=AB=E6=9C=89?=
 =?UTF-8?q?html=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/journals_controller.rb | 2 +-
 app/views/issues/_action_menu.html.erb | 2 +-
 app/views/issues/_edit.html.erb        | 3 ++-
 app/views/issues/_history.html.erb     | 4 ++--
 app/views/issues/show.html.erb         | 2 +-
 app/views/journals/new.js.erb          | 2 +-
 app/views/projects/show.html.erb       | 4 ++--
 public/javascripts/project.js          | 4 +++-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 769e62209..a38bd4096 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -73,7 +73,7 @@ class JournalsController < ApplicationController
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
     @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n"
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n"
-    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content << "</blockquote>"
+    @content = "<blockquote style='padding-left:0px;margin-left:0px;'>" << @content << "</blockquote>\n\n<br/>"
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404
diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index 2643c93e7..ae2a848e0 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -3,4 +3,4 @@
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 <%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index c6b805d0a..f6b41f36d 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
@@ -19,7 +20,7 @@
     </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
     <fieldset><legend>回复</legend>
-    <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb
index 68e991594..8befaf37e 100644
--- a/app/views/issues/_history.html.erb
+++ b/app/views/issues/_history.html.erb
@@ -12,9 +12,9 @@
             <p>
               <% if journal.details.any? %>
                 <% details_to_strings(journal.details).each do |string| %>
-                  <p><%= string %></p>
+                  <p><%= string.html_safe %></p>
                 <% end %>
-            <% end %>
+              <% end %>
             </p>
           </div>
           <!--编辑、引用、回复按钮-->
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 67867e2c6..0eb779a23 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -64,7 +64,7 @@
       </div>
       <p style="padding-top: 5px"></p>
       <%#--引用时不能修改，剥离出引用内容--%>
-      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
+      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();issue_journal_kind_reply.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
       </a>
   <% end %>
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index b24b5ffb6..9c5d87079 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -1,4 +1,4 @@
-$('#issue_notes').val("<%= raw escape_javascript(@content) %>");
+issue_journal_kind_reply.html("<%= raw escape_javascript(@content) %>");
 <%
   # when quoting a private journal, check the private checkbox
   if @journal && @journal.private_notes?
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 971794699..22317dc91 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -34,7 +34,7 @@
                                  :id => act.id},
                                  :class => "problem_tit fl fb " %>
                 </a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
+                <p class="mt5 break_word"><%= act.description.html_safe %><br />
                   <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
                 </p>
               </div>
@@ -51,7 +51,7 @@
                   <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
                               {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
                 </a><br />
-                <p class="mt5 break_word"><%= textilizable act,:notes %><br />
+                <p class="mt5 break_word"><%=  act.notes.html_safe %><br />
                   <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
               </div>
               <div class="cl"></div>
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 491b5bb92..10561fe01 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -370,7 +370,9 @@ $(document).ready(function () {
     }
 
     function quote_issue_journal(){
-        document.getElementById("#issue_notes").focus();
+        alert("test");
+        issue_journal_kind_reply.focus();
+        issue_journal_kind_reply.cmd.range.setStart(issue_journal_kind_reply.cmd.range.startOffset)
     }
 
     /*缺陷完成度决定缺陷状态*/

From 3fe5adcaf853b1d36f167ba0df5724f4b23f19f3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 11:49:57 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9tag?=
 =?UTF-8?q?=20=E4=BC=9A=20=E5=92=8C=E8=BE=B9=E6=A1=86=E6=9C=89=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 2f1c8e591..f1928f6da 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -614,7 +614,8 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;}
 .newwork_btn a:hover{ background:#329cbd;}
 .files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */
-a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
+/*padding:1px 10px 修改原因，padding会导致内部输入框和外边框有边距*/
+a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 1px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
 /* 20150423作业评分*/

From b265b20753e58a3fbcf0b600a741027c0ab758b3 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 12:01:21 +0800
Subject: [PATCH 18/21] =?UTF-8?q?1.=E6=B6=88=E6=81=AF=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=BA=86=E9=A1=B9=E7=9B=AE=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=BB=E9=A2=98=EF=BC=9B=202.?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=BA=86=E6=B6=88=E6=81=AF=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E7=9A=84tips=E4=B8=AD=EF=BC=8C=E2=80=9C=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E5=9B=9E=E5=A4=8D=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E2=80=9D=EF=BC=8C=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 7a34609ad..550089627 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -576,16 +576,16 @@
                           </div>
                       <% else %>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
+                            <%= 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"}",
                                         :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><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                            <p><strong>帖子主题：</strong><%= ma.forge_message.subject %></p>
                             <% unless ma.forge_message.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.forge_message.content.html_safe %></div>
+                                <div class="fl"><strong>评论内容：</strong></div>
+                                <div class="ml60"><%= ma.forge_message.content.html_safe %></div>
                             <% end %>
                           </div>
                       <% end %>

From 7ef48f3fa3dd43bf134a91e0158b31c0040fff0f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 12:31:52 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?=
 =?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/files/_tag_yun.html.erb | 2 +-
 public/stylesheets/courses.css    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index b2c7ab79f..03c5c0ac4 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a>
+        <span class="files_tag_icon">    <a href="javascript:void(0);"  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index f1928f6da..143329d78 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -615,7 +615,8 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .newwork_btn a:hover{ background:#329cbd;}
 .files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */
 /*padding:1px 10px 修改原因，padding会导致内部输入框和外边框有边距*/
-a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 1px; float:left; margin-right:10px;margin-bottom:10px; }
+a.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
+span.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
 /* 20150423作业评分*/

From 1935a9caaace95511c8c386846843c1cebf5d138 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 14:38:41 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 02f908f50..57541e149 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -550,9 +550,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .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;}
 .homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
-.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;}
 .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
-.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:245px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
@@ -1062,7 +1062,7 @@ img.ui-datepicker-trigger {
     margin: 7px;
 }
 /*消息*/
-.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
+.homepageNewsTypeNotRead {padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
 .homepageNewsTypeNotReadHomework {width:170px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;overflow:hidden; height:49px; word-break:break-all; word-wrap:break-word;text-overflow:ellipsis;}
 .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
 .calendar_div{border: 1px solid #d9d9d9;}

From befd8d66f6963b68233e83fc2b2c359d6a7918ef Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 15:05:32 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb | 2 +-
 app/views/forums/edit.html.erb       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index be6543be2..14c2f3a11 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -296,7 +296,7 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
     render :text => forum_name_exist
   end
 
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 24130e727..ef1fbc12b 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -43,13 +43,10 @@
     function check_forum_name(){
         check_pass = true;
         name = $("textarea[name='forum[name]']").val().trim();
-        if(name == '<%= @forum.name%>'){
-            return;
-        }
         if( name != ""){
             $.get(
                     '<%= check_forum_name_forums_path %>',
-                    {"forum_name":name},
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
                     function(data){
 
                         if( data == 'true'){