From f8d7c61065cd81e4feb4cdf7a72528ba3d9b1313 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Sep 2015 11:22:00 +0800
Subject: [PATCH 1/6] =?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=E5=8F=8A?=
 =?UTF-8?q?=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 | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 4d0f3f6bd..6d682048f 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -191,14 +191,14 @@
                               请同学们抓紧时间提交自己的作品，谢谢！
                             </p>
                         <% else %>
-                            <p><%= User.current.lastname + User.current.firstname %>您好！
+                            <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>作业标题：<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>
 
@@ -239,14 +239,15 @@
                                       :onmouseout => "message_titile_hide($(this))" %>
                         </li>
                         <div style="display: none" class="message_title_red system_message_style">
-                          <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.homework_detail_manual.evaluation_end %>
+                          <p>
+                            <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>
+                            您好！<%= 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.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
                           </p>
                         </div>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -265,8 +266,10 @@
                                         :onmouseout => "message_titile_hide($(this))"%>
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
-                            <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>
+                              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
+                            </p>
+                            <p>课程名称：<%= 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>

From 62bf136beaa6577cedf5f0cbac267bf8b60c2d7c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Sep 2015 11:42:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=86=85=E5=AE=B9=20?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8D=A2=E8=A1=8C=EF=BC=8C=E9=82=A3=E4=B9=88?=
 =?UTF-8?q?=E5=B0=B1=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb  | 8 ++++----
 app/views/layouts/base_forums.html.erb | 2 +-
 app/views/memos/show.html.erb          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index 286219356..7934a80fe 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -2,15 +2,15 @@
 <% if forums.any? %>
 	<% forums.each do |forum| %>
           <div class="postRow">
-            <div class="postPortrait"><a href="javascript:void(0);" class="linkGrey2">
+            <div class="postPortrait">
               <%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
             </div>
             <div class="postWrap">
               <div class="postTitle">
-                <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
-                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
+                <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
+                <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
+              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 366291691..ec19b5b97 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -149,7 +149,7 @@
               <!--<div class="homepageEditProfile"><a href="javascript:void(0);" class="homepageEditProfileIcon"></a></div>-->
             </div>
             <div class="fl">
-              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%></div>
+              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
               <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 133a90547..8aeb0120b 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -49,14 +49,14 @@
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a></div>
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
        <span id="praise_tread" style="float: right">
     <%= 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="memo-content" >
+      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>

From 0b5b643a8ebcdc66ecb8253943719d4c74e32f1d Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Sep 2015 11:48:57 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8E=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=B7=9D=E7=A6=BB=E5=A4=AA=E5=A4=A7?=
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 8aeb0120b..ce36656a9 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -60,7 +60,7 @@
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class="mt10 fl">
+      <div class=" fl">
         <% if @memo.attachments.any?%>
             <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>

From 5174e6eeb8ed4f3d37295af7df0315ed73b2ad39 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Sep 2015 12:02:38 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index ce36656a9..1e2f0f25b 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -30,6 +30,14 @@
     $(function() {
         init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
     });
+
+    function del_confirm(){
+        if(confirm('确认删除么?')){
+            $("#del_link").click();
+        }else{
+
+        }
+    }
 </script>
 <div class="postRightContainer">
   <div class="postThemeContainer">
@@ -43,7 +51,8 @@
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
               <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
-              <li><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" class="postOptionLink">删除</a></li>
+              <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
+              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_link" ></a></li>
             </ul>
           </li>
         </ul>

From ab0013d659ecd65bb0902ada879b9f321c70fb2d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Sep 2015 13:29:02 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E5=91=A8=E6=8A=A5=E2=80=9D=E6=97=B6=EF=BC=8C=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E5=BA=94=E4=B8=BA=E2=80=9C=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BA=86=E5=91=A8=E6=8A=A5=E2=80=9D=EF=BC=9B=202.styl?=
 =?UTF-8?q?esheet=5Flink=5Ftag=20=E4=B8=AD=EF=BC=8Cprettify=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8A=A0=E4=B8=8A=E5=BC=95=E5=8F=B7=EF=BC=8C=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 2 +-
 app/views/users/user_messages.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 807fb2caa..9f77b248d 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 6d682048f..93969f71b 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -518,7 +518,7 @@
                       </li>
                       <li class="homepageNewsPubType fl">
                         <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派了问题给你：</span>
+                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
                       </li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                         <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",

From f340941e3ec952c8791f65880c69fb8be689780f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Sep 2015 13:35:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=EF=BC=88=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=98=E5=9C=A8html=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index ec19b5b97..1d2151b75 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -154,10 +154,9 @@
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
-                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
                   <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
                   </a>
                <%end%>