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

app/views/student_work/_evaluation_title.html.erb

@@ -1,6 +1,6 @@
 <ul class="hworkUl">
-  <li class="hworkList340 hworkH30 width505">
-    <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
+  <li class="hworkList340 hworkH30 w455">
+    <span class="HomeworkNameTitle f14 fb fl w235">作品名称</span>
     <% if @homework.homework_type != 3 %>
         <span class="HomeworkStuTitle f14 fb fl">姓名</span>
         <span class="HomeworkStuTitle f14 fb fl">学号</span>
@@ -14,12 +14,12 @@
   </li>
 
   <% if @homework.homework_type == 2%>
-      <li class="hworkList50 hworkH30">
+      <li class="hworkList50 hworkH30 fb">
         系统
       </li>
   <% end%>
 
-  <li class="hworkList50 hworkH30 fb mr10 ml10">
+  <li class="hworkList50 hworkH30 fb mr10 ml10" style="float: right;">
     我的评分
   </li>
 </ul>

app/views/student_work/_evaluation_work.html.erb

@@ -6,16 +6,16 @@
     <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
     <% is_my_work = pro && pro.student_work_id == student_work.id%>
   <% end %>
-  <li class="hworkList340 width525">
+  <li class="hworkList340 w465">
     <ul>
       <% if is_my_work%>
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
             <div>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -40,9 +40,9 @@
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <div>
-              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -83,7 +83,7 @@
   <% end%>
 
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10" style="float:right; ">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
   <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>

public/stylesheets/public.css

@@ -135,12 +135,16 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w100{width: 100px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
+.w230{width:230px !important;}
+.w235{ width:235px !important;}
 .w280{ width:280px;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}
 .w350 {width:350px;}
 .w362 {width:362px;}
 .w430{ width:470px;}
+.w455{width:455px !important;}
+.w465{width:465px !important;}
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}