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

app/views/courses/_new_member_list.html.erb

@@ -54,11 +54,11 @@
             </a>
             <ul>
               <li>
-                <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
+                <%= link_to("#{l(:label_bidding_user_studentname)}：<span class='hidden st_info_block'>#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
               </li>
               <br/>
               <% unless member.user.user_extensions.student_id == ''%>
-                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
+                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span class='hidden st_info_block'>#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
               <% end%>
             </ul>
             <% unless @course.course_groups.empty? %>

app/views/layouts/_syllabus_teacher_list.html.erb

@@ -1,21 +1,21 @@
-<h3 class="sy_right_title">教师团队
+<h3 class="sy_right_title">教师团队
-  <a href="javascript:void(0);" class="sy_cmore fr mr10 none" >增加教师</a>
+  <a href="javascript:void(0);" class="sy_cmore fr mr10 none" >增加教师</a>
-  <div class="cl"></div>
+  <div class="cl"></div>
-</h3>
+</h3>
-<ul class="sy_teachers_list">
+<ul class="sy_teachers_list">
-  <% teacher = syllabus.user %>
+  <% teacher = syllabus.user %>
-  <%# teachers.each do |teacher| %>
+  <%# teachers.each do |teacher| %>
-      <li >
+      <li >
-        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %>
+        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %>
-        <div class="sy_teachers_txt fl">
+        <div class="sy_teachers_txt fl">
-          <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name", :target => "_blank" %>
+          <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name hidden", :target => "_blank", :title => teacher.show_name %>
-          <span class="sy_teachers_span">
+          <span class="sy_teachers_span">
-            <% if teacher.user_extensions && teacher.user_extensions.identity %>
+            <% if teacher.user_extensions && teacher.user_extensions.identity %>
-                <%= get_user_roll teacher %>
+                <%= get_user_roll teacher %>
-            <% end%>
+            <% end%>
-          </span>
+          </span>
-        </div>
+        </div>
-        <div class="cl"></div>
+        <div class="cl"></div>
-      </li>
+      </li>
-  <%# end %>
+  <%# end %>
 </ul>

public/stylesheets/css/public.css

@@ -751,6 +751,7 @@ a:hover.st_add{ color:#ff8e15;}
 .classbox_on{ border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
 .classbox_on a{ color:#716cad;}
 .st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;}
+.st_info_block {width:150px; display:inline-block; vertical-align:bottom;}
 
 /* 创建作品 homework,项目配置 */
 .hwork_new{  color:#4c4c4c;}