From 2042555813b7231b546ab5df0bf7609c416d7b89 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 14:55:10 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8C=BF=E8=AF=84=E4=B9=8B=E5=90=8E=E6=8C=89?=
 =?UTF-8?q?=E5=A6=9E=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/bids/_alert_anonyoms.html.erb b/app/views/bids/_alert_anonyoms.html.erb
index 6205b2b6c..e4e9076a5 100644
--- a/app/views/bids/_alert_anonyoms.html.erb
+++ b/app/views/bids/_alert_anonyoms.html.erb
@@ -3,7 +3,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>开启匿评功能</title>
   <style>
-      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      body{ font-size:12px; font-family:"微软雅黑","宋体"; background:#fff; font-style:normal;}
       div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
       div,img,tr,td,textarea{ border:0;}
       table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -19,7 +19,7 @@
       .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
       .ni_con p{ color:#808181; }
       .ni_con a:hover{ text-decoration:none;}
-      .ni_btn{ width:190px; margin:15px auto; }
+      .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
       a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
       a:hover.tijiao{ background:#0f99a9;}
       .c_blue{ color:#0195bd;}

From adf75d2e8aef5f6d6b3ca82f397a234e642da926 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 15:00:20 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_homework_show.html.erb   | 2 +-
 app/views/bids/stop_anonymous_comment.js.erb | 2 +-
 app/views/layouts/base_homework.html.erb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 107ee5bba..870bd692b 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -83,7 +83,7 @@
                           <% when 1 %>
                             <%= link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
                           <% when 2 %>
-                            匿评结束
+                            <a href="#" style="background:#8e8e8e;">匿评结束</a>
                           <% end %>
                       </span>
                       <%end%>
diff --git a/app/views/bids/stop_anonymous_comment.js.erb b/app/views/bids/stop_anonymous_comment.js.erb
index 0769944ac..82847a8f5 100644
--- a/app/views/bids/stop_anonymous_comment.js.erb
+++ b/app/views/bids/stop_anonymous_comment.js.erb
@@ -1,2 +1,2 @@
 alert('关闭成功');
-$("#<%= @bid.id %>_anonymous_comment").html('匿评结束');
+$("#<%= @bid.id %>_anonymous_comment").html('<a href="#" style="background:#8e8e8e;">匿评结束</a>');
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index c3028c8f1..9e615eaec 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -126,7 +126,7 @@
                                       <% when 1 %>
                                         <%= link_to '关闭匿评', alert_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_stop_anonymous_comment", remote: true %>
                                       <% when 2 %>
-                                        匿评结束
+                                        <a href="#" style="background:#8e8e8e;">匿评结束</a>
                                       <% end %>
                                  </span>
                                <%end%>

From f1aca94a30b6b4c63714de769564f99103b37413 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 15:03:34 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=80=81=E5=B8=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=97=B6=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings/_members.html.erb | 51 +++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index e73e9cf7b..c76f1c48e 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -20,8 +20,10 @@
         <% members.each do |member| %>
             <% next if member.new_record? %>
             <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-              <td class="<%= member.principal.class.name.downcase %>" style="text-align: center"><%= link_to_user member.principal %></td>
-              <td class="roles" style="text-align: center">
+              <td class="<%= member.principal.class.name.downcase %>">
+                <%= link_to_user member.principal %>
+              </td>
+              <td class="roles">
                 <span id="member-<%= member.id %>-roles">
                   <%= h member.roles.sort.collect(&:to_s).join(', ') %>
                 </span>
@@ -31,9 +33,14 @@
                     ) do |f| %>
                     <p>
                       <% roles.each do |role| %>
-                          <label><%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
-                                                      :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> <%= h role %></label><br/>
-                      <% end %></p>
+                          <label>
+                            <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
+                                                      :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
+                            <%= h role %>
+                          </label>
+                          <br/>
+                      <% end %>
+                    </p>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change), :class => "small" %>
                       <%= link_to_function l(:button_cancel),
@@ -43,7 +50,9 @@
               </td>
               <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
               <% if member.roles.first.to_s == "Manager" %>
-                  <td class="buttons"></td>
+                  <td class="buttons">
+
+                  </td>
               <% else %>
                   <td class="buttons">
                     <%= link_to_function l(:button_edit),
@@ -61,7 +70,9 @@
         </tbody>
       </table>
   <% else %>
-      <p class="nodata"><%= l(:label_no_data) %></p>
+      <p class="nodata">
+        <%= l(:label_no_data) %>
+      </p>
   <% end %>
 </div>
 
@@ -69,9 +80,14 @@
   <% if roles.any? %>
       <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
           <fieldset>
-            <legend><%= l(:label_member_new) %></legend>
+            <legend>
+              <%= l(:label_member_new) %>
+            </legend>
 
-            <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+            <p>
+              <%= label_tag "principal_search", l(:label_principal_search) %>
+              <%= text_field_tag 'principal_search', nil %>
+            </p>
             <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js') }')" %>
 
             <div id="principals_for_new_member">
@@ -83,13 +99,22 @@
               <% roles.each do |role| %>
 
                   <% if role.id == 10 %> <!-- 默认学生角色  -->
-                    <label><%= radio_button_tag 'membership[role_ids][]', role.id, true %> <%= h role %></label>
+                    <label>
+                      <%= radio_button_tag 'membership[role_ids][]', role.id, true %>
+                      <%= h role %>
+                    </label>
                   <% else %>
-                    <label><%= radio_button_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                    <label>
+                      <%= radio_button_tag 'membership[role_ids][]', role.id %>
+                      <%= h role %>
+                    </label>
                   <% end %>
-              <% end %></p>
+              <% end %>
+            </p>
 
-            <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+            <p>
+              <%= submit_tag l(:button_add), :id => 'member-add-submit' %>
+            </p>
           </fieldset>
       <% end %>
   <% end %>

From edd68baa85de4e0b4d82f7ce1d41927cbebbbb6f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 15:56:23 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=B2=A1=E6=9C=89=E9=99=84=E4=BB=B6=E6=97=B6=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E8=83=BD=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=A9=BA=E5=8C=85=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/zipdown_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index d7f9fa0ac..6cbe0dd95 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -21,7 +21,13 @@ class ZipdownController < ApplicationController
   def assort
     if params[:obj_class] == "Bid"
       bid = Bid.find params[:obj_id]
-      zipfile = zip_bid bid
+      file_count = 0
+      bid.homeworks.map { |homework| file_count += homework.attachments.count}
+      if file_count > 0
+        zipfile = zip_bid bid
+      else
+        render file: 'public/no_file_found.html'
+      end
     else
       logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!"
     end

From 66e2edef0a9c46dd474d50a8baa86e802369e591 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 16:06:07 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=B9=8B=E5=90=8E=E5=AD=A6=E7=94=9F=E5=8F=AF?=
 =?UTF-8?q?=E5=9C=A8=E4=BD=9C=E4=B8=9A=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=8C=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index c40004d02..a8736592c 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -35,7 +35,7 @@
             </span>
           </li>
           <li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作业，请创建作业！</li>
-          <% if @bid.comment_status == 0 ||  @bid.comment_status == 1%>
+          <% if @bid.comment_status == 0 ||  @bid.open_anonymous_evaluation == 0%>
               <!-- 老师布置的作业在创建和开启匿评这段时间才允许创建作品 -->
               <li class="wping">
                 <%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>

From 88764f1a4bbbf9952a8e2f3b56c832857a750932 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 16:35:37 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E6=97=B6=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8#1574?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb |  2 +-
 app/views/homework_attach/_jour.html.erb      |  2 +-
 app/views/homework_attach/addjours.js.erb     | 18 ++++------
 app/views/homework_attach/destroy_jour.js.erb | 35 ++++++++-----------
 4 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 0286fcad6..a9adc9ec6 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -433,8 +433,8 @@ class HomeworkAttachController < ApplicationController
 
   #删除留言
   def destroy_jour
-
     @homework = HomeworkAttach.find(params[:jour_id])
+    @course=@homework.bid.courses.first
     @journal_destroyed = JournalsForMessage.find(params[:object_id])
     @is_comprehensive_evaluation = @journal_destroyed.is_comprehensive_evaluation
     @journal_destroyed.destroy
diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index 0aa0165a6..d6a1f7fc4 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -22,7 +22,7 @@
           <span style="float:left">
             <%= l(:label_work_rating) %>：
           </span>
-          <%= render :partial => 'show_score', locals: {:stars => get_homework_score(jour.user,@homework ) }  %>
+          <%= render :partial => 'homework_attach/show_score', locals: {:stars => get_homework_score(jour.user,@homework ) }  %>
         <% end %>
       </span>
       <div class="cl"></div>
diff --git a/app/views/homework_attach/addjours.js.erb b/app/views/homework_attach/addjours.js.erb
index 1e34bdc3e..9badfc109 100644
--- a/app/views/homework_attach/addjours.js.erb
+++ b/app/views/homework_attach/addjours.js.erb
@@ -1,23 +1,19 @@
 //教师评论
 <% if @add_jour.is_comprehensive_evaluation == 1 %>
-    //$('#comprehensive_evaluation').html('<#%= escape_javascript(render(:partial => 'comprehensive_evaluation',
-    //:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
   HoverLi(4);
-  $('#jour_count_4').html('<%= @comprehensive_evaluation.count %>')
-  $('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>')
+  $('#jour_count_4').html('<%= @comprehensive_evaluation.count %>');
+  $('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>');
 //匿评
 <% elsif @add_jour.is_comprehensive_evaluation == 2  %>
-//    $('#message').html('<#%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>');
-//    $('#pre_show').html('<#%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
-  $('#add_jour').html('<%= escape_javascript(render(:partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation})) %>')
+  $('#add_jour').html('<%= escape_javascript(render(:partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation})) %>');
   HoverLi(5);
-  $('#jour_count_5').html('<%= @anonymous_comments.count %>')
-  $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>')
+  $('#jour_count_5').html('<%= @anonymous_comments.count %>');
+  $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>');
 //留言
 <% else %>
   HoverLi(3);
-  $('#jour_count_3').html('<%= @jours.count %>')
-  $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>')
+  $('#jour_count_3').html('<%= @jours.count %>');
+  $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>');
 <% end %>
 $('#new_form_user_message').val("");
 $('#new_form_reference_user_id').val("");
\ No newline at end of file
diff --git a/app/views/homework_attach/destroy_jour.js.erb b/app/views/homework_attach/destroy_jour.js.erb
index b2a8044ba..e1ec15ddc 100644
--- a/app/views/homework_attach/destroy_jour.js.erb
+++ b/app/views/homework_attach/destroy_jour.js.erb
@@ -1,24 +1,19 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
 <% else %>
-//教师评论
-<% if @is_comprehensive_evaluation == 1 %>
-//$('#comprehensive_evaluation').html('<#%= escape_javascript(render(:partial => 'comprehensive_evaluation',
-//:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
-HoverLi(4);
-$('#jour_count_4').html('<%= @comprehensive_evaluation.count %>')
-$('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>')
-//匿评
-<% elsif @is_comprehensive_evaluation == 2  %>
-//    $('#message').html('<#%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>');
-//    $('#pre_show').html('<#%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
-HoverLi(5);
-$('#jour_count_5').html('<%= @anonymous_comments.count %>')
-$('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>')
-//留言
-<% else %>
-HoverLi(3);
-$('#jour_count_3').html('<%= @jours.count %>')
-$('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>')
-<% end %>
+    <% if @is_comprehensive_evaluation == 1 %>
+        HoverLi(4);
+        $('#jour_count_4').html('<%= @comprehensive_evaluation.count %>');
+        $('#tbc_04').html('<%= escape_javascript(render(:partial => "homework_attach/jour",:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>');
+    //匿评
+    <% elsif @is_comprehensive_evaluation == 2  %>
+        HoverLi(5);
+        $('#jour_count_5').html('<%= @anonymous_comments.count %>');
+        $('#tbc_05').html('<%= escape_javascript(render(:partial => "homework_attach/jour",:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>');
+    //留言
+    <% else %>
+        HoverLi(3);
+        $('#jour_count_3').html('<%= @jours.count %>');
+        $('#tbc_03').html('<%= escape_javascript(render(:partial => "homework_attach/jour",:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>');
+    <% end %>
 <% end %>

From 175ac86217fad06e51ec1bcee6920d8493469691 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 16:51:27 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B-?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=EF=BC=9A=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=20#1566?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 7b7bd359c..d2c94b094 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -12,8 +12,9 @@
 		<% id = 'project_respond_form_'+ reply.id.to_s %>
           <%= link_to reply.user.name, user_path(reply.user) %>
           回复
-          <% if show_name %>
-            <%= link_to reply.at_user.name,user_path(reply.at_user) %>
+          <% parent_jour = JournalsForMessage.find reply.m_reply_id %>
+          <% if show_name && parent_jour %>
+            <%= link_to parent_jour.user.name,user_path(parent_jour.user) %>
           <% else %>
             <%= l(:label_anonymous) %>
           <% end %>

From 760203ebc7cedb41e5cf3a0277c80b6e453880e3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 16:59:56 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=86=85=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=94=B9=E4=B8=BA=E5=AE=9E=E5=90=8D=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/_jour.html.erb      |  2 +-
 app/views/words/_journal_reply.html.erb       |  3 ++-
 app/views/words/_journal_reply_items.html.erb | 13 +++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index d6a1f7fc4..055e1a015 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -46,7 +46,7 @@
     </div>
     <div style="clear: both;"></div>
     <div>
-      <%= render :partial => "words/journal_reply", :locals => {:journal => jour,:show_name=> show_name } %>
+      <%= render :partial => "words/journal_reply", :locals => {:journal => jour,:show_name=> show_name, :show_real_name => true } %>
     </div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb
index 39321394c..2f823ebf6 100644
--- a/app/views/words/_journal_reply.html.erb
+++ b/app/views/words/_journal_reply.html.erb
@@ -1,7 +1,8 @@
 
 <% id = "journal_reply_ul_" + journal.id.to_s%>
+<% show_real_name ||= false%>
 <div id = '<%= id %>' >
   <% fetch_user_leaveWord_reply(journal).each do |reply|%>
-      <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply,:show_name=> show_name} %>
+      <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply,:show_name=> show_name, :show_real_name => show_real_name} %>
   <% end %>
 </div>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index d2c94b094..ebca999a6 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -1,3 +1,4 @@
+<% show_real_name ||= false %>
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
 <div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
@@ -10,11 +11,19 @@
 	</div>
 	<div class="recall_con">
 		<% id = 'project_respond_form_'+ reply.id.to_s %>
-          <%= link_to reply.user.name, user_path(reply.user) %>
+          <% if show_real_name%>
+            <%= link_to reply.user.lastname+reply.user.firstname, user_path(reply.user) %>
+          <% else %>
+            <%= link_to reply.user.name, user_path(reply.user) %>
+          <% end %>
           回复
           <% parent_jour = JournalsForMessage.find reply.m_reply_id %>
           <% if show_name && parent_jour %>
-            <%= link_to parent_jour.user.name,user_path(parent_jour.user) %>
+              <% if show_real_name%>
+                <%= link_to parent_jour.user.lastname+reply.user.firstname, user_path(parent_jour.user) %>
+              <% else %>
+                <%= link_to parent_jour.user.name, user_path(parent_jour.user) %>
+              <% end %>
           <% else %>
             <%= l(:label_anonymous) %>
           <% end %>

From f5306c503a74199b8688d4a321b51638bd1a90ee Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Nov 2014 17:04:09 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=95=99=E8=A8=80=E3=80=81=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index b85b6ae73..b3acd8f83 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -83,7 +83,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png) -2px 0 no-repeat; margin-right:3px;}
 .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;}
 .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
-a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}
+a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;padding-top: 5px;}
 a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;line-height: 1.9;}
 a:hover.ping_sub{ background:#14a8b9;}
 .recall{ border-top:1px solid #CCC; padding:5px 0;}