From 6b2fb87b2c5af506444f2c035165ad0e6c0630c7 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 18 Dec 2014 09:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0=E4=BD=9C=E4=B8=9A=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?=
 =?UTF-8?q?om>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_member_list.html.erb | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index 25d32716f..2800c78ea 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -29,8 +29,13 @@
     <div class="cl"></div>
     <div class="st_box">
       <ul class="st_box_top">
-        <li class="ml358"><a href="#" >作业积分</a><a href="#" class="st_down"></a></li>
-        <li class="ml50"><a href="#" >加入时间</a></li>
+        <% if @subPage_title == l(:label_student_list) %>
+            <li class="ml358"><a href="#" >作业积分</a><a href="#" class="st_down"></a></li>
+            <li class="ml50"><a href="#" >加入时间</a></li>
+        <% else %>
+            <li class="ml50" style="margin-left: 470px"><a href="#" >加入时间</a></li>
+        <% end %>
+
       </ul>
 	    <% members.each do |member| %>
 
@@ -52,7 +57,7 @@
       <% end %>
 		<!--teacher's code disapeared  moified by huang-->
 
-      <% if @canShowCode %>
+      <% if @canShowCode  %>
            <li>
                <%= l(:label_bidding_user_studentcode) %> :
                <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
@@ -60,16 +65,21 @@
            <%#= content_tag "li", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :style=> "color:#1c9ec7;" %>
       <% end %>
      </ul>
-
+          <% if @subPage_title == l(:label_student_list) %>
           <%= link_to member.student_homework_score[1].to_s, {
                                                             :action => 'show_member_score',
                                                             :member_id => member.id,
                                                             :remote => true},
                                                               :class => 'ml258 c_red', :style => "color:red;" %>
 
+          <% unless member.created_on.nil?  %>
+             <%= content_tag "span", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "ml65 c_grey" %>
+          <% end %>
+          <% else %>
                 <% unless member.created_on.nil?  %>
-        <%= content_tag "span", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "ml65 c_grey" %>
-    <% end %>
+                    <%= content_tag "span", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "ml65 c_grey", :style=>"margin-left:195px" %>
+                <% end %>
+          <% end %>
 
 		
 		<%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>