From d20368aa38d06c2841ee67192c4cc20309b9ea78 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 9 Oct 2015 14:33:26 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E5=B0=86=E6=B6=88=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=94=B1=E4=B8=80=E8=A1=8C=E5=88=86=E8=87=B3=E4=B8=A4?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 84d5ec1bf..813c13509 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -2,30 +2,38 @@
   <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="newsType">
-        <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-        <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "加入项目", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-        <%# 课程相关消息 %>
-        <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-        <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
-        <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
-        <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
-        <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-        <%# 系统贴吧 %>
-        <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-        <%# 系统消息 %>
-        <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
+      <ul class="homepagePostType">
+        <li>
+          <ul class="homepagePostTypeHomework fl">
+            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
+            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
+
+            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+            <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
+            <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
+            <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
+            <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
+          </ul>
+        </li>
+
+        <li>
+          <ul class="homepagePostTypeProject fl">
+            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+            <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
+            <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
+            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
+            <%# 系统贴吧 %>
+            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+            <%# 系统消息 %>
+
+          </ul>
+        </li>
       </ul>
     </li>
   </ul>

From 77581d46ebd8c0a98c29ba4cf4455cac4c830aed Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 9 Oct 2015 15:50:40 +0800
Subject: [PATCH 02/18] =?UTF-8?q?1.=E5=B0=86=E6=89=80=E6=9C=89=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=B6=88=E6=81=AF=E9=83=BD=E5=88=97=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=9B=202.=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E7=AB=AF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    | 44 ++++++++++----------------
 app/views/users/user_messages.html.erb | 14 +++-----
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7e44174fe..045f2b4e7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -125,45 +125,33 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      # when 'system_messages'
-      #   @message_alls = SystemMessage.order("created_at desc").all
-      when 'apply'
-        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
+
+      #课程相关消息
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-      when 'forge_message'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
         @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
-      #@user_course_messages_count = @user_course_messages.count
-      # when 'forge_news'
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'course_news_reply'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      # when 'forge_news_reply'
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'poll'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'works_reviewers'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'works_reply'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
+      when 'poll'
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+
+      #项目相关消息
       when 'issue'
         @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc")
-      # when 'issue_update' # 缺陷状态更新、留言
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
+      when 'forge_message'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+      when 'forge_news'
+        @message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user).order("created_at desc")
+      when 'apply'
+        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
+
+      #贴吧消息
       when 'forum'
         @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
+
+      #用户留言
       when 'user_feedback'
         @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
       else
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 813c13509..25900e737 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -12,26 +12,20 @@
             <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
             <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-            <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
-            <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
-            <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
-            <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
+            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
           </ul>
         </li>
 
         <li>
           <ul class="homepagePostTypeProject fl">
             <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-            <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
-            <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
+            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+
             <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
             <%# 系统贴吧 %>
             <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-            <%# 系统消息 %>
-
           </ul>
         </li>
       </ul>
@@ -40,7 +34,7 @@
 </div>
 <div class="resources mt10" id="users_setting">
   <div>
-    <% if @message_alls.count >0 || @user_system_messages.count >0 %>
+    <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
               有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读

From 6ad1ee36e2f0b878c9eddc5739589e7aeb72179c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 9 Oct 2015 15:56:14 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E5=B0=86=E2=80=9C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E2=80=9D=E7=AE=80=E5=8C=96=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E5=88=97=E8=A1=A8=E4=B8=80=E8=87=B4?=
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 25900e737..958d5cf53 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -19,7 +19,7 @@
         <li>
           <ul class="homepagePostTypeProject fl">
             <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
 

From 94bffb54582ed262a83b963692dc1366adbc293f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 11:37:58 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=A4=B4=E5=83=8F=20?=
 =?UTF-8?q?=EF=BC=8C=20=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87=20=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87=EF=BC=8C=E9=83=BD=E8=A6=81?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=9F=9F=E5=90=8D=E3=80=82=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=AD=E5=87=BA=E7=8E=B0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controllers/kindeditor/assets_controller.rb         | 2 +-
 lib/rails_kindeditor/lib/rails_kindeditor/helper.rb         | 6 ++++--
 public/assets/kindeditor/kindeditor.js                      | 6 +++++-
 public/assets/kindeditor/plugins/emoticons/emoticons.js     | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
index 0e1177563..d7d5948d4 100644
--- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
+++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
@@ -13,7 +13,7 @@ class Kindeditor::AssetsController < ApplicationController
           logger.warn '========= Warning: the owner_id is 0, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
           @asset.asset_type = @dir
           if @asset.save
-            render :text => ({:error => 0, :url => @asset.asset.url,:asset_id => @asset.id}.to_json)
+            render :text => ({:error => 0, :url => "http://"+Setting.host_name + "/" + @asset.asset.url,:asset_id => @asset.id}.to_json)
           else
             show_error(@asset.errors.full_messages)
           end
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index f30ee2236..eef2eb576 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -9,7 +9,8 @@ module RailsKindeditor
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                             :autoHeightMode=>true,
-                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                            emotionsBasePath: 'http://' + Setting.host_name
                                                             )))
     end
     
@@ -21,7 +22,8 @@ module RailsKindeditor
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                  :autoHeightMode=>true,
-                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                                                emotionsBasePath: 'http://' + Setting.host_name
                                                                                 )))
     end
     
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 448585376..da7434d9b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -243,6 +243,7 @@ K.options = {
 	shadowMode : true,
 	loadStyleMode : true,
 	basePath : K.basePath,
+    emotionsBasePath: 'http://forge.trustie.net', //TODO
 	themesPath : K.basePath + 'themes/',
 	langPath : K.basePath + 'lang/',
 	pluginsPath : K.basePath + 'plugins/',
@@ -5459,6 +5460,7 @@ function _editor(options) {
 _instances = [];
 function _create(expr, options) {
 	options = options || {};
+    options.emotionsBasePath = _undef(options.emotionsBasePath,'http://forge.trustie.net') // TODO
 	options.basePath = _undef(options.basePath, K.basePath);
 	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
 	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
@@ -5623,7 +5625,9 @@ _plugin('core', function(K) {
         url:K.addParam('/kindeditor/upload', 'dir=image'),
         afterUpload : function(data) {
             if (data.error === 0) {
-                var url = K.formatUrl(data.url, 'absolute');
+
+               var url = data.url//K.formatUrl(data.url, 'absolute');
+               // console.log(url)
                 self.exec('insertimage', url, 'image','','','1','');
 				//self.exec('insertimage', url, 'image','','','1','left');
                 //self.insertHtml('<img src="'+url+'"/>');
diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
index b9dfec431..7884f53fb 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -9,7 +9,8 @@
 
 KindEditor.plugin('emoticons', function(K) {
 	var self = this, name = 'emoticons',
-		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+
+		path = self.emotionsBasePath + (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {

From a0f0ecf86dc4b92fd20e0e8ba27cd507459bd584 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 10 Oct 2015 11:43:41 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7e44174fe..c82cbf79e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -121,7 +121,7 @@ class UsersController < ApplicationController
         messages = MessageAll.where("user_id =?", @user).order("created_at desc")
         messages.each do |message_all|
           # 在点击或者刷新消息列表后未读的消息存放在数组
-          if message_all.message.viewed == 0
+          if message_all.message_type != "SystemMessage" && message_all.message.viewed == 0
             @message_alls << message_all.message
           end
         end

From e5c64fc43a941878340bf03dd0072503788d375f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 10 Oct 2015 11:49:25 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=A4=E6=96=AD?=
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 958d5cf53..d0f7bb9bb 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -34,7 +34,7 @@
 </div>
 <div class="resources mt10" id="users_setting">
   <div>
-    <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %>
+    <% if (!@message_alls.nil? && @message_alls.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
               有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读

From c365f32a17f597db753f39be539bd7df5ffc7ce7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 14:00:12 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=9C=89=E4=BA=9B=E9=82=AE=E4=BB=B6=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailer/send_for_user_activities.html.erb  | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 3f761fbd4..23cbe6176 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -224,13 +224,15 @@
                   <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
-                  <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
-                      <%= link_to truncate(issues_journal.issue.subject.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <% else %>
-                      <%= link_to truncate(issues_journal.notes.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <% end %>
+                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue,  :token => @token.value),
+                              :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;",
+                              :onmouseover =>"message_titile_show($(this),event)",
+                              :onmouseout => "message_titile_hide($(this))"
+                %>
+                  <div  style="display: none">
+                    <div class="fl"><strong>更新内容：</strong></div>
+                    <div class="ml60"><%=  issues_journal.notes.html_safe  %></div>
+                  </div>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.created_on) %></span>
                 </li>
             <% end %>
@@ -290,9 +292,9 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_wiki_mail_notification) %></span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value),
+                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value),
                               :class => 'wmail_info',
-                              :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                              :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                    <% end %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(wikicontent.updated_on) %></span>
                 </li>
@@ -520,3 +522,15 @@
 </div>
 </div>
 
+<script>
+    function message_titile_show(obj,e)
+    {
+        obj.next("div").show();
+        obj.next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide(obj)
+    {
+        obj.next("div").hide();
+    }
+</script>
+

From a9456ca82f4083304a63540b462a6ccdb34cc419 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 14:14:36 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E8=AE=A9=E9=A1=B9=E7=9B=AE=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E7=9A=84=E5=86=85=E5=AE=B9=E4=BB=A5html=E5=BD=A2?=
 =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 23cbe6176..3c462be08 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -407,9 +407,9 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                  <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value),
+                  <%= link_to project_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value),
                               :class => 'wmail_info',
-                              :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                              :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_journal_message.created_on) %></span>
                 </li>

From 3957ca5dc25240992a9e16d2439d1490e6d05bd8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 14:30:23 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=A9=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E4=BB=A5html?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 3c462be08..ae5604099 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -439,9 +439,9 @@
                           :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
               <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_show_your_message) %></span>
 
-              <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value),
+              <%= link_to user_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe,feedback_url(@user,:token => @token.value),
                           :class => 'wmail_info',
-                          :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                          :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
               %>
               <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(user_journal_message.created_on) %></span></li>
 

From 3955075d03d469382dc17757f5ba497bc140c7fe Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 15:00:49 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E8=A1=8C=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 672dfda64..23a0774c3 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -9,7 +9,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a>
           </li>

From d80dffb31c0cf57453b06018aa9bd78710f8ddd3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 15:12:04 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=87=8C=E6=89=8D=E7=94=A8=E5=88=B0=E4=BA=86tag=20=E4=BA=91?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index bdf581baa..4889e538d 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -1,7 +1,9 @@
+<% if course %>
 <span class="files_tag_icon" >
           <a  title="双击可编辑"
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','','<%= @q%>','<%= course.id%>');"
               >全部</a></span>
+<% end %>
 <% unless tag_list.nil?%>
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>

From 3d993304e31b1d0573c534c96444b9dc654ccc01 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 15:27:13 +0800
Subject: [PATCH 12/18] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?bug;=202.=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=8D=95=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 10 +++++-----
 app/views/users/user_messages.html.erb        |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index fee28f761..07066f6dc 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -99,17 +99,17 @@
                 </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.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>课程名称：<%= 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_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.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>
                 <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
                 <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index d0f7bb9bb..6f583f76d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -2,9 +2,9 @@
   <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType">
+      <ul class="homepagePostType" style="width:125px; left:-125px;">
         <li>
-          <ul class="homepagePostTypeHomework fl">
+          <ul class="homepagePostTypeHomework fl" style="width:70px;">
             <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
             <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
             <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
@@ -17,7 +17,7 @@
         </li>
 
         <li>
-          <ul class="homepagePostTypeProject fl">
+          <ul class="homepagePostTypeProject fl" style="width:55px;">
             <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>

From 491e4d12c655131a4bdf0c04ee147271e6e92005 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 16:03:31 +0800
Subject: [PATCH 13/18] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=A0=87=E9=A2=98=202.=E5=B0=86?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E6=94=BE=E5=9C=A8=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=B1=80=E9=83=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E4=BE=BFUser=5Fmessages=E9=A1=B5=E9=9D=A2=E5=92=8CUse?=
 =?UTF-8?q?r=5Fsystem=5Fmessages=E9=83=BD=E8=B0=83=E7=94=A8=E5=AE=83?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BB=A3=E7=A0=81=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/users_helper.rb                   |  6 ++++
 .../users/_selector_for_messages.html.erb     | 34 ++++++++++++++++++
 app/views/users/user_messages.html.erb        | 35 +------------------
 app/views/users/user_system_messages.html.erb | 33 +----------------
 4 files changed, 42 insertions(+), 66 deletions(-)
 create mode 100644 app/views/users/_selector_for_messages.html.erb

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index f6b083b4d..2935d018a 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -68,8 +68,14 @@ module UsersHelper
         '课程讨论'
       when 'course_news'
         '课程通知'
+      when 'poll'
+        '课程问卷'
       when 'issue'
         '项目任务'
+      when 'forge_message'
+        '项目讨论'
+      when 'forge_news'
+        '项目新闻'
       when 'forum'
         '贴吧帖子'
       when 'user_feedback'
diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
new file mode 100644
index 000000000..b0f867e18
--- /dev/null
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -0,0 +1,34 @@
+<div class="homepageRightBanner">
+  <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="homepagePostType" style="width:125px; left:-125px;">
+        <li>
+          <ul class="homepagePostTypeHomework fl" style="width:70px;">
+            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
+            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
+
+            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
+          </ul>
+        </li>
+
+        <li>
+          <ul class="homepagePostTypeProject fl" style="width:55px;">
+            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+
+            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
+            <%# 系统贴吧 %>
+            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+          </ul>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 6f583f76d..f83e5617c 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,37 +1,4 @@
-<div class="homepageRightBanner">
-  <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
-  <ul class="resourcesSelect">
-    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType" style="width:125px; left:-125px;">
-        <li>
-          <ul class="homepagePostTypeHomework fl" style="width:70px;">
-            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
-
-            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
-          </ul>
-        </li>
-
-        <li>
-          <ul class="homepagePostTypeProject fl" style="width:55px;">
-            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-
-            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-            <%# 系统贴吧 %>
-            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-          </ul>
-        </li>
-      </ul>
-    </li>
-  </ul>
-</div>
+<%= render :partial => 'users/selector_for_messages'%>
 <div class="resources mt10" id="users_setting">
   <div>
     <% if (!@message_alls.nil? && @message_alls.count >0) %>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 899cd7a8f..64b0dff0c 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -1,35 +1,4 @@
-<div class="homepageRightBanner">
-  <div class="NewsBannerName">系统消息</div>
-  <ul class="resourcesSelect">
-    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="newsType">
-        <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-        <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-        <%# 课程相关消息 %>
-        <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-        <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
-        <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
-        <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-        <%# 系统贴吧 %>
-        <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-        <%# 系统消息 %>
-        <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
-      </ul>
-    </li>
-  </ul>
-</div>
+<%= render :partial => 'users/selector_for_messages'%>
 
 <% @sytem_messages.each do |system_message| %>
     <div class="resources mt10">

From 8133ba33c700b1f05ec3a06adb5a62cbb22fac8b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 16:18:03 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E5=B0=86=E6=B6=88=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=BA=EF=BC=9A=E8=AF=BE=E7=A8=8B=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=B6=88=E6=81=AF=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_selector_for_messages.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
index b0f867e18..0bffdca2b 100644
--- a/app/views/users/_selector_for_messages.html.erb
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -2,13 +2,14 @@
   <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType" style="width:125px; left:-125px;">
+      <ul class="homepagePostType" style="width:130px; left:-130px;">
         <li>
           <ul class="homepagePostTypeHomework fl" style="width:70px;">
             <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
             <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
             <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
 
+            <li class=""><strong>课程消息</strong></li>
             <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
             <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
@@ -17,12 +18,14 @@
         </li>
 
         <li>
-          <ul class="homepagePostTypeProject fl" style="width:55px;">
+          <ul class="homepagePostTypeProject fl" style="width:60px;">
+            <li class=""><strong>项目消息</strong></li>
             <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
             <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
 
+            <li class=""><strong>其他</strong></li>
             <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
             <%# 系统贴吧 %>
             <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>

From e9055dd11343e713e45486455d66e882dc28c32f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 10:34:30 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=95=E5=85=A5=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=8C=E5=88=86=E9=A1=B5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=96=87=E5=AD=97=E8=A2=AB=E9=81=AE?=
 =?UTF-8?q?=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 929cea75b..855f30071 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -54,7 +54,7 @@
     <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
   </div>
   <div >
-    <ul class="wlist" id="resource_ref_pages" style="margin-top: 5px;">
+    <ul class="wlist" id="resource_ref_pages" style="margin-top: 5px;margin-right: 20px">
       <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
     </ul>
   </div>

From 590a2480ba38a06c01c8d97b812314cc8eeb3509 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 10:49:07 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E8=A6=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index 4889e538d..41ae5f335 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -1,6 +1,6 @@
-<% if course %>
+<% if course && tag_list.empty? == false%>
 <span class="files_tag_icon" >
-          <a  title="双击可编辑"
+          <a  title=""
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','','<%= @q%>','<%= course.id%>');"
               >全部</a></span>
 <% end %>

From 155dff7e27a7d8039d45f85ea899db953b4d3799 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 12 Oct 2015 15:08:01 +0800
Subject: [PATCH 17/18] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |   2 +-
 .../users/_selector_for_messages.html.erb     |  48 ++++++++++--------
 public/images/homepage_icon.png               | Bin 11972 -> 16534 bytes
 public/stylesheets/new_user.css               |   9 ++++
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 055c59f06..c4a46abc1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -121,7 +121,7 @@ class UsersController < ApplicationController
         messages = MessageAll.where("user_id =?", @user).order("created_at desc")
         messages.each do |message_all|
           # 在点击或者刷新消息列表后未读的消息存放在数组
-          if message_all.message_type != "SystemMessage" && message_all.message.viewed == 0
+          if message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0
             @message_alls << message_all.message
           end
         end
diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
index 0bffdca2b..e7884fc60 100644
--- a/app/views/users/_selector_for_messages.html.erb
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -2,35 +2,39 @@
   <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType" style="width:130px; left:-130px;">
+      <ul class="homepagePostType">
         <li>
-          <ul class="homepagePostTypeHomework fl" style="width:70px;">
-            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
-
-            <li class=""><strong>课程消息</strong></li>
-            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
+          <ul class="homepagePostTypeHomework fl">
+            <li class="f14"><strong>课程消息</strong></li>
+            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "homepagePostTypeAssignment postTypeGrey" %></li>
+            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "homepagePostTypeForum postTypeGrey"  %></li>
+            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "homepagePostTypeNotice postTypeGrey"  %></li>
+            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "homepagePostTypeQuiz postTypeGrey"  %></a></li>
           </ul>
         </li>
 
         <li>
-          <ul class="homepagePostTypeProject fl" style="width:60px;">
-            <li class=""><strong>项目消息</strong></li>
-            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-
-            <li class=""><strong>其他</strong></li>
-            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-            <%# 系统贴吧 %>
-            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+          <ul class="homepagePostTypeProject fl">
+            <li class="f14"><strong>项目消息</strong></li>
+            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "homepageTypePTask postTypeGrey"  %></li>
+            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "homepagePostTypeForum postTypeGrey"  %></li>
+            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "homepageTypePNews postTypeGrey" %></li>
+            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "homepageTypeUApply postTypeGrey" %></li>
           </ul>
         </li>
+
+        <div class="cl"></div>
+        <li>
+          <ul class="homepagePostTypeMore">
+            <li class="f14"><strong>更多</strong></li>
+            <li class="fl w100"><%= link_to "全部",user_message_path(User.current), :class => "resourcesTypeAll postTypeGrey" %></li>
+            <li class="fl"><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "homepageTypeUnread postTypeGrey" %></li>
+            <li class="fl w100"><%= link_to "系统消息", user_system_messages_path(User.current), :class => "homepageTypeSystem postTypeGrey" %></li>
+            <li class="fl"><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "homepageTypePost postTypeGrey"  %></li>
+            <li class="fl w100"><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "homepageTypeUMessage postTypeGrey"  %></li>
+          </ul>
+        </li>
+
       </ul>
     </li>
   </ul>
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index a8548b1bc219a42a8f0372e1680f374ab0f00267..9f2212ff0e3121e121e2412d4e1c2810fa1f739f 100644
GIT binary patch
literal 16534
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
H#sU8ie?5Zc

literal 11972
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
BrYrye

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5b187fa2d..d87794ad7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -624,6 +624,15 @@ a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px
 a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;}
 a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277px no-repeat; padding-left:23px;}
 a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -185px -308px no-repeat; padding-left:23px;}
+.homepagePostTypeMore {width:180px; border-top:1px dashed #dddddd; margin-top:5px;}
+.w100 {width:100px;}
+a.homepageTypeUnread {background:url(../images/homepage_icon.png) -6px -579px no-repeat; padding-left:23px;}
+a.homepageTypePTask {background:url(../images/homepage_icon.png) -176px -523px no-repeat; padding-left:23px;}
+a.homepageTypeSystem {background:url(../images/homepage_icon.png) -88px -552px no-repeat; padding-left:23px;}
+a.homepageTypePNews {background:url(../images/homepage_icon.png) -5px -553px no-repeat; padding-left:23px;}
+a.homepageTypePost {background:url(../images/homepage_icon.png) -178px -553px no-repeat; padding-left:23px;}
+a.homepageTypeUMessage {background:url(../images/homepage_icon.png) -4px -519px no-repeat; padding-left:23px;}
+a.homepageTypeUApply {background:url(../images/homepage_icon.png) -91px -582px no-repeat; padding-left:23px;}
 a.postTypeGrey {color:#888888;}
 a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:710px; margin:0px auto; position:relative;}

From c85e1401f04a52792d3a94c9689b37e319dafd96 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 15:51:47 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E9=A1=B5=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 19 ++++++++++++--
 .../_homework_ref_resources_list.html.erb     | 25 +++++++++++++++++++
 app/views/users/_show_user_resource.html.erb  |  2 +-
 app/views/users/user_homeworks.html.erb       | 14 +++++++++++
 app/views/users/user_import_resource.js.erb   |  2 +-
 .../users/user_ref_resource_search.js.erb     |  2 +-
 app/views/users/user_resource_type.js.erb     |  2 +-
 config/routes.rb                              |  1 +
 8 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 app/views/users/_homework_ref_resources_list.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 055c59f06..5252e5884 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -522,6 +522,7 @@ class UsersController < ApplicationController
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
     @attachments = paginateHelper @attachments,7
     respond_to do |format|
@@ -555,6 +556,7 @@ class UsersController < ApplicationController
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
     @attachments = paginateHelper @attachments,7
     respond_to do |format|
@@ -586,6 +588,7 @@ class UsersController < ApplicationController
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
     @attachments = paginateHelper @attachments,7
     respond_to do |format|
@@ -596,8 +599,8 @@ class UsersController < ApplicationController
   #将资源批量引入
   def import_resources_to_homework
     @attachments = []
-    unless  params[:checkbox1].nil? || params[:checkbox1].blank?
-      params[:checkbox1].each do  |id|
+    unless  session[:seleted_resource_ids].nil? || session[:seleted_resource_ids].blank?
+      session[:seleted_resource_ids].each do  |id|
         atta = Attachment.find(id)
         att_copy = atta.copy
         att_copy.container_id = nil
@@ -608,11 +611,23 @@ class UsersController < ApplicationController
         @attachments << att_copy
       end
     end
+    session[:seleted_resource_ids] = [] #保存后清空
     respond_to do |format|
       format.js
     end
   end
 
+  # ajax 用session保存选择的资源id
+  def store_selected_resource
+    session[:seleted_resource_ids] = [] if session[:seleted_resource_ids].nil?
+    if params[:save] == 'y'
+     session[:seleted_resource_ids] <<  params[:res_id]
+    else
+      session[:seleted_resource_ids].delete( params[:res_id])
+    end
+    render :nothing => true
+  end
+
 
   include CoursesHelper
   def user_courses
diff --git a/app/views/users/_homework_ref_resources_list.html.erb b/app/views/users/_homework_ref_resources_list.html.erb
new file mode 100644
index 000000000..356e412e7
--- /dev/null
+++ b/app/views/users/_homework_ref_resources_list.html.erb
@@ -0,0 +1,25 @@
+
+<% if attachments.nil? || attachments.empty? %>
+    <!--<p class="nodata">-->
+    <!--<%#= l(:label_no_data) %>-->
+    <!--</p>-->
+<% else %>
+    <% attachments.each do |attach| %>
+        <ul class="resourcesList">
+          <li class="resourcesListCheckbox fl">
+            <input name="checkbox1[]" type="checkbox" onclick="store_seleted_resource($(this));" <%=seleted_resources.include?(attach.id.to_s) ? 'checked':''  %> value="<%= attach.id%>" class="resourcesCheckbox" />
+          </li>
+          <li class="resourcesListName fl">
+            <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
+            <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
+                        :title => attach.filename,:class=>'resourcesBlack'%>
+          </li>
+          <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li style="display: none"><%= attach.author_id %></li>
+          <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
+          <li style="display: none"><%= attach.id %></li>
+        </ul>
+    <% end %>
+<% end %>
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 855f30071..6d985687c 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -51,7 +51,7 @@
   <%= form_tag(import_resources_to_homework_user_path(user),:method => 'post',:remote=>'true') do %>
     <input type="hidden" name="homework_id" value="<%= homework_id%>"/>
   <div style="height: 300px" id="user_ref_resources">
-    <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+    <%= render :partial => 'homework_ref_resources_list' ,:locals=>{ :attachments => @attachments,:seleted_resources=>seleted_resources} %>
   </div>
   <div >
     <ul class="wlist" id="resource_ref_pages" style="margin-top: 5px;margin-right: 20px">
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 7b212101c..4ae0e8341 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -7,6 +7,20 @@
       homework_description_editor.html("");
       $("#homework_editor").toggle();
   }
+
+  // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+  function store_seleted_resource(dom){
+      console.log(dom.attr('checked'))
+      if(dom.attr('checked') == 'checked' ){
+          $.get(
+                  '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+          )
+      }else {
+          $.get(
+                          '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+          )
+      }
+  }
 </script>
 <div class="homepageRightBanner mb10">
   <div class="NewsBannerName">作业</div>
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index 0e35acd95..87324669e 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>');
 showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/user_ref_resource_search.js.erb b/app/views/users/user_ref_resource_search.js.erb
index 52f54bee4..8651768a5 100644
--- a/app/views/users/user_ref_resource_search.js.erb
+++ b/app/views/users/user_ref_resource_search.js.erb
@@ -1,2 +1,2 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
 $("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource_type.js.erb b/app/views/users/user_resource_type.js.erb
index 52f54bee4..8651768a5 100644
--- a/app/views/users/user_resource_type.js.erb
+++ b/app/views/users/user_resource_type.js.erb
@@ -1,2 +1,2 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
 $("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d6c36212a..2e02cd3d2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -386,6 +386,7 @@ RedmineApp::Application.routes.draw do
       get 'user_resource_type'
       get 'user_ref_resource_search'
       post 'import_resources_to_homework'
+      get 'store_selected_resource'
       # end
     end
   end