Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

app/views/users/_course_homework.html.erb

@@ -123,7 +123,7 @@
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
       <div class="mt10">
         <% projects = activity.student_work_projects.where("is_leader = 1") %>
-        <div class="fl mr5 fontGrey3">
+        <div class="mb10 mr5 fontGrey3">
           已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
         </div>
         <% projects.each do |pro| %>
@@ -134,15 +134,18 @@
                         $("#relatePInfo_<%=project.id %>").css("display","block");
                     }).mouseout(function(){
                         $("#relatePInfo_<%=project.id %>").css("display","none");
-                    })
+                    });
                 });
             </script>
-            <div class="mr20 mb10 fl">
+
+          <div class="mr20 mb10 fl w80" style="text-align: center;">
             <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
                 <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
             <% else %>
                 <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
             <% end %>
+            <p><span class="captainName">TimTang</span><span style="vertical-align: top;">(组长)</span></p>
+            <p>2个月前</p>
             <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
               项目名称：<%=project.name %><br />
               创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

public/stylesheets/new_user.css

@@ -119,6 +119,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .w50 {width:50px;}
 .w60{ width:60px;}
 .w70{ width:70px;}
+.w80{ width:80px;}
 .w90{ width:90px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
@@ -1381,6 +1382,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
+.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+
 /* @功能 定义 */
 span.at {color:#269ac9;}