From 2d481619284ec1e72dbebdc7982f3f44d5d61858 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 22 Sep 2015 15:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=BD=9C=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   | 17 ++--
 .../_evaluation_un_title.html.erb             | 46 ++++++----
 .../student_work/_evaluation_un_work.html.erb | 45 +++++-----
 .../student_work/_evaluation_work.html.erb    | 85 +++++++++++--------
 app/views/student_work/index.html.erb         | 25 +++---
 public/stylesheets/courses.css                | 40 ++++++---
 public/stylesheets/public.css                 |  9 +-
 7 files changed, 165 insertions(+), 102 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index bb1919472..cfd9632c2 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,8 +1,15 @@
-<ul class="hworkUl b_grey">
-  <li class="hworkList380 width625">
-    <span class="c_dark f14 fb fl ml10">作品信息</span>
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 width505">
+    <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
+    <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+    <span class="HomeworkStuTitle f14 fb fl">学号</span>
   </li>
-  <li class="hworkList80 mr10" >
-    <span class="c_dark f14 fb fl ml10">我的评分</span>
+
+  <li class="hworkList130 hworkH30 fb ml10">
+    时间
+  </li>
+
+  <li class="hworkList50 hworkH30 fb mr10 ml10">
+    我的评分
   </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 8ca855e9b..119976bbb 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,37 +1,51 @@
-<ul class="hworkUl b_grey">
-  <li class="hworkList380 <%= @homework.homework_type == 2 ? '' : 'width455'%>">
-    <span class="c_dark f14 fb fl ml10">作品信息</span>
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr70 ml70' : 'mr95 ml100'%>">作品名称</span>
+    <span class="c_dark f14 fb fl mr50">姓名</span>
+    <span class="c_dark f14 fb fl">学号</span>
   </li>
-  <li class="hworkList80" >
-    <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
+
+  <li class="hworkList130 hworkH30">
+    <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50"%>
+    <% if @show_all && @order == "created_at"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30" >
+    <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
     <% if @show_all && @order == "teacher_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
     <% end%>
   </li>
-  <li class="hworkList80">
-    <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
     <% if @show_all && @order == "teaching_asistant_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
     <% end%>
   </li>
+
   <% if @homework.homework_type == 2%>
-      <li class="hworkList80">
-        <%= link_to "系统评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
+      <li class="hworkList50 hworkH30">
+        <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
         <% if @show_all && @order == "system_score"%>
-            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
         <% end%>
       </li>
   <% end%>
-  <li class="hworkList50">
+
+  <li class="hworkList50 hworkH30">
     <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
     <% if @show_all && @order == "student_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
     <% end%>
   </li>
-  <li class="hworkList50">
+
+  <li class="hworkList50 hworkH30">
     <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
     <% if @show_all && @order == "score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10"%>
     <% end%>
   </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index d3bac240d..bc9fe2e00 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,46 +1,48 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <li class="hworkList380 <%= @homework.homework_type == 2 ? '' : 'width455'%>">
+  <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
     <ul>
-      <li class="hworkName mt12">
+      <li class="hworkPortrait mt15 mr10">
+        <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
+      </li>
+      <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
         <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-        <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
+        <div>
+          <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+        </div>
       </li>
-      <div class="cl"></div>
       <li>
-        <ul class="mt12">
-          <li class="hworkDetail mr15">
-            姓名：<%= student_work.user.show_name%>
+        <ul class="mt10 fl">
+          <li class="hworkStName mr10 mt16" title="姓名">
+            <%= student_work.user.show_name%>
           </li>
-          <li class="hworkDetail mr15">
-            学号：
+          <li class="hworkStID mt16" title="学号">
             <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
           </li>
-          <li class="hworkDate">
-            时间：
-            <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
-                <span class="c_red">迟交</span>
-            <% else%>
-                <%= format_time student_work.created_at%>
-            <% end %>
-          </li>
         </ul>
       </li>
     </ul>
   </li>
-  <li class="hworkList80 <%= score_color student_work.teacher_score%>">
+  <li class="hworkList130 c_grey">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
+  </li>
+  <li class="hworkList50 <%= score_color student_work.teacher_score%>">
     <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
   </li>
-  <li class="hworkList80 <%= score_color student_work.teaching_asistant_score%>">
+  <li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
     <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
   </li>
 
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
-      <li class="hworkList80 <%= score_color student_work.system_score%>">
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
         <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
       </li>
   <% end%>
+
   <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
     <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
@@ -73,4 +75,5 @@
         </div>
     <% end%>
   </li>
-</ul>
\ No newline at end of file
+</ul>
+
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index f8b9addbd..63cb7ea99 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,51 +1,62 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <ul class="hworkListRow" id="student_work_<%= student_work.id%>">
   <% is_my_work = student_work.user == User.current%>
-  <li class="hworkList380 width620">
+  <li class="hworkList340 width525">
     <ul>
-      <li class="hworkName mt12 m_width620">
-        <% if is_my_work%>
+      <% 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 width285">
             <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-            <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
-        <% else%>
-            <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
-        <% end%>
-      </li>
-      <div class="cl"></div>
-      <li>
-        <ul class="mt12">
-          <li class="hworkDetail mr15">
-            姓名：
-            <% if is_my_work%>
-                <%= student_work.user.show_name%>
-            <% else%>
-                匿名
-            <% end%>
+            <div>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
           </li>
-          <li class="hworkDetail mr15">
-            学号：
-            <% if is_my_work%>
-              <span>
+          <li>
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                <%= student_work.user.show_name%>
+              </li>
+              <li class="hworkStID mt16" title="学号">
                 <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-              </span>
-            <% else%>
-              --
-            <% end%>
+              </li>
+            </ul>
           </li>
-          <li class="hworkDate">
-            时间：
-            <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
-                <span class="c_red">迟交</span>
-            <% else%>
-                <%= format_time student_work.created_at%>
-            <% end %>
+      <% else%>
+          <li class="hworkPortrait mt15 mr10">
+            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
           </li>
-        </ul>
-      </li>
+          <li class="hworkName mt15 mr15 width285">
+            <div>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
+          </li>
+          <li>
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                匿名
+              </li>
+              <li class="hworkStID mt16" title="学号">
+                --
+              </li>
+            </ul>
+          </li>
+      <% end%>
+
     </ul>
   </li>
+  <li class="hworkList130 c_grey">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
+  </li>
+
+  <!-- 成绩 -->
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList80 <%= 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">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
-</ul>
\ No newline at end of file
+</ul>
+
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 5398b7084..5698a0c70 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -82,22 +82,27 @@
       <% end%>
       <div class="cl"></div>
     </div>
+
     <div class="hworkListContainer">
       <div class="ctt2">
         <div class="dis" id="tbc_01">
-          <div class="codeList">
-            <span class="fl mt3">
-              <%= link_to "所有作品<font class='f12 c_red'>[共#{@stundet_works.count}份]</font>".html_safe,student_work_index_path(:homework => @homework.id),:class => "fl f14"%>
+          <div class="fl" style="border-bottom:1px solid #eaeaea; padding-bottom:10px; width:720px;">
+            <span class="c_dark f14 fb fl mr30">
+              作品
+              <font class="f12 c_red">
+                （<%= @stundet_works.count%>）
+              </font>
             </span>
             <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
-                <div class="resourcesSearchloadBox fr">
-                  <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="searchResource" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
-                  <a class="homepageSearchIcon" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
+                <div class="hworkSearchBox">
+                  <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
+                  <a class="hworkSearchIcon" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
                 </div>
+                <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
             <% end%>
-            <div class="cl"></div>
           </div>
-          <!---code_list end--->
+          <div class="cl"></div>
+
           <div class="fl">
             <% if @is_evaluation && !@stundet_works.empty?%>
                 <%= render :partial => "evaluation_title"%>
@@ -105,8 +110,8 @@
                 <%= render :partial => "evaluation_un_title"%>
             <% end%>
           </div>
-          <!---hwork_ul end--->
           <div class="cl"></div>
+
           <% @stundet_works.each do |student_work|%>
               <% if @is_evaluation%>
                   <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%>
@@ -114,13 +119,13 @@
                   <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
               <% end%>
               <div class="cl"></div>
-              <!---hwork_ul end--->
               <div id="about_hwork_<%= student_work.id%>"></div>
               <div class="cl"></div>
           <% end%>
         </div>
       </div>
     </div>
+
     <div class="cl"></div>
   </div>
 </div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 7c1e590db..5d837fda5 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -31,8 +31,8 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 
 /*右侧内容新*/
 .ctt2{clear:both; }
-.hworkListBanner {width:720px; height:40px; background:#eaeaea; margin-bottom:10px; margin-left:5px;}
-.hworkListContainer {float:left; clear:both; width:720px; margin-left:5px;}
+.hworkListBanner {width:720px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.hworkListContainer {float:left; clear:both; width:720px;}
 .showHwork{ border:2px solid #269ac9; width:696px; padding:10px; color:#666666; padding-bottom:0px; }
 .showHworkP{ width:630px; float:left;}
 .showHwork ul li {margin-bottom: 5px;}
@@ -41,17 +41,21 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:50px; border-bottom:1px solid #eaeaea; line-height:50px; vertical-align:middle;}
+.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; padding-bottom:5px;}
+.hworkH30 {height:30px !important; line-height:30px !important;}
 .hworkListRow {height:65px; border-bottom:1px solid #eaeaea; line-height:65px; vertical-align:middle;}
-.hworkListRow:hover {background-color:#f6f6f7; cursor:pointer;}
+.hworkListRow:hover {background-color:#f6f6f7;}
 .hworkUl li{ float:left;}
 .hworkListRow li{ float:left;}
-.hworkList380 {width:375px; text-align:left; height:50px; line-height:50px;padding-left:5px;}
+.hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;}
 .hworkList80 {width:80px; text-align:center;}
 .hworkList50 {width:50px; text-align:center;}
+.hworkList130 {width:130px; text-align:center;}
 .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px;  width:714px; margin-bottom:10px; }
-.hworkName {max-width:380px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:16px; line-height:16px;}
-.hworkDetail {max-width:100px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;}
+.hworkName {width:115px; float:left; line-height:18px;}
+.hworkName div{max-height: 40px;overflow: hidden;}
+.hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
+.hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;}
 .hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2;}
 a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;}
@@ -60,11 +64,25 @@ a.hworkSetting {background:url(../images/homepage_icon2.png) -10px -450px no-rep
 .infoNi{ width:100px; padding:5px;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px;}
 .problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;}
 .rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;}
-.width620{width: 620px;}
-.width625{width: 625px;}
-.width455{width: 455px;}
-.m_width620{max-width: 620px;}
+.hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;}
+.hworkSearchInput {border:none; outline:none; background-color:#ffffff; width:145px; height:25px; padding-left:10px; display:block; float:left;}
+.hworkSearchIcon {width:30px; height:25px; background:url(../images/nav_icon.png) -8px -1px no-repeat; float:left;}
+a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-repeat;}
+.classSplit {border:1px solid #e7e7e7; height:27px; line-height:27px; display:inline-block; margin-left:10px; padding-left:5px; cursor:pointer; outline:none; width:95px; max-width:95px;}
+.classList {width:45px; border:1px solid #e7e7e7; float:left; position:absolute; background-color:#ffffff; left:-1px;}
+.hworkPortrait {float:left; width:40px;}
+.HomeworkNameTitle{width: 285px;text-align: center;margin-left: 50px;}
+.HomeworkStuTitle{width: 80px;text-align: center;}
+.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: center;height: 40px;}
+.width385{width: 385px;}
+.width505{width: 505px;}
+.width165{width: 165px;}
 .width180{width: 180px;}
+.width525{width: 525px;}
+.width285{width: 285px;}
+.mr95{margin-right: 95px;}
+.ml100{margin-left: 100px;}
+.mt16{margin-top: 16px;}
 
 
 /*邮件邀请*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4f44a8b60..09ae08f3f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -91,8 +91,10 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mr45{margin-right: 45px;}
 .mr50{margin-right: 50px;}
 .mr55{margin-right: 55px;}
+.mr60 {margin-right:60px;}
 .mr70{margin-right: 70px;}
 .mw15{margin:0 15px;}
+.mr90 {margin-right:90px;}
 .mw20{ margin: 0 20px;}
 .mt1{margin-top: 1px;}
 .mt-4 {margin-top:-4px;}
@@ -102,9 +104,10 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px !important;}
 .mt30{ margin-top: 30px;}
-.mt12 { margin-top:12px;}
+.mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
+.ml70{margin-left: 70px;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
 .mb8 {margin-bottom:8px;}
@@ -213,6 +216,8 @@ a.linkGrey5 {color:#484848;}
 a.linkGrey5:hover {color:#3498db;}
 a.linkGrey6 {color:#484848 !important;}
 a.linkGrey6:hover {color:#ffffff !important;}
+a.linkGrey7 {color:#888888;}
+a.linkGrey7:hover {color:#269ac9;}
 a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
@@ -293,7 +298,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 #Container{ width:1000px; margin:0 auto; }
 
 /*头部导航*/
-#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; }
+#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; position: relative;}
 .logo{ margin:5px 10px; }
 #TopNav{}
 #TopNav ul li{ margin-top:8px;}