From 5f3c8d928d521d103fba458ef2f5995f12df76df Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 16 Oct 2015 14:51:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 14 +++++++--
 db/schema.rb                          | 43 +++++++++++----------------
 public/stylesheets/courses.css        | 13 ++++----
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index d0f4f82b7..e28cdb1e2 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -35,11 +35,19 @@
     <div class="hworkListBanner">
       <div id="menu_r" class="fl">
         <ul class="menu_r">
-          <li><a href="javascript:void(0);" class="parent">作业批次</a>
+          <li>
+            <a href="javascript:void(0);" class="parent">
+              <% @homework_commons.each_with_index do |homework_common,index |%>
+                <% if homework_common.id == @homework.id %>
+                <%="作业 #{@homework_commons.count - index}"  %>
+                <% end %>
+              <% end%>
+            </a>
             <ul>
               <% @homework_commons.each_with_index do |homework_common,index |%>
-                  <li>
-                    <%= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
+                  <li class="pr10">
+                    <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id)%>
+                    <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>
             </ul>
diff --git a/db/schema.rb b/db/schema.rb
index 9a798ae7f..4a0d2312a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -497,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -782,16 +785,6 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6ecb76a70..fc4a890d2 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -83,7 +83,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .mr95{margin-right: 95px;}
 .ml100{margin-left: 100px;}
 .mt16{margin-top: 16px;}
-
+.pr10{padding-right: 10px;}
 /*课程右侧动态 new_user.css*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
 .homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;}
@@ -694,9 +694,9 @@ div#menu_r ul {float: left;}
 div#menu_r ul.menu_r { background: #269ac9; padding:0 10px; height:40px; }
 div#menu_r li {position: relative; z-index: 9; margin: 0; display: block; float: left; }
 div#menu_r li:hover>ul { left: -2px;}
-div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; }
-div#menu_r ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-div#menu_r ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
+div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+div#menu_r ul  a.parent  {background: url(../images/item.png) -30px -30px no-repeat;  width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+div#menu_r ul  a.parent:hover  {background: url(../images/item.png) -30px -60px no-repeat;}
 div#menu_r ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
 div#menu_r ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
 /* menu::level1 */
@@ -705,12 +705,13 @@ div#menu_r a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
 div#menu_r li.last { background: none; }
 /* menu::level2 */
 div#menu_r ul ul li { background: none; }
-div#menu_r ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #269ac9; margin-top:1px;}
+div#menu_r ul ul { position: absolute;top: 38px; left: -999em; min-width: 90px; max-width: 360px; padding: 5px 0 0 0; background:#fff;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top:1px;}
 div#menu_r ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#269ac9;}
 div#menu_r ul ul a:hover { background:#297fb8; color:#fff;}
 div#menu_r ul ul li.last { margin-left:15px; }
 div#menu_r ul ul li {width: 100%;}
 
+.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 /* 20150414*/
 a.wzan_img{background:url(../images/new_project/public_icon.png) 0px -457px no-repeat;  display:block; height:31px; width:30px; color:#fff; }
 a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px no-repeat;}
@@ -1069,4 +1070,4 @@ a.postRouteLink {font-weight:bold; color:#484848;}
 a.postRouteLink:hover {text-decoration:underline;}
 
 .ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
-.ReplyToMessageInputContainer {width:582px; float:left;}
+.ReplyToMessageInputContainer {width:582px; float:left;}

From 07ff8d2eb745708e7b7cf3c0cef13076ecddafad Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 16 Oct 2015 15:23:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=80=81=E5=B8=88=EF=BC=8C=E9=9D=9E?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=88=90=E5=91=98=20=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E6=98=BE=E7=A4=BA=20--=20=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=88=E4=BD=9C=E5=93=81=E6=95=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb         |  2 ++
 app/views/users/_course_homework.html.erb | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b18d0c706..d21eb48a9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2366,6 +2366,8 @@ module ApplicationHelper
           end
         end
       end
+    else
+      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
     end
 
   end
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 31502c081..2d3bc68de 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -24,12 +24,10 @@
           <span class="grey_btn_cir ml10">匿评已结束</span>
       <% end%>
       <div class="homepagePostSubmitContainer">
-        <% if User.current.member_of_course?(activity.course) %>
-            <div class="homepagePostSubmit">
-              <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
-              <%= user_for_homework_common activity,is_teacher %>
-            </div>
-        <% end %>
+        <div class="homepagePostSubmit">
+          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+          <%= user_for_homework_common activity,is_teacher %>
+        </div>
 
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">

From 178752ba8f308726a573a1ec4cd43f037e087d6d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 16 Oct 2015 15:42:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=86=E2=80=9C=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E2=80=9D=E6=94=B9=E6=88=90=E2=80=9C=E6=8F=90=E4=BA=A4=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d21eb48a9..ce11bded8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2351,7 +2351,7 @@ module ApplicationHelper
   def user_for_homework_common homework,is_teacher
     if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
-        link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+        link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         if work.nil?
@@ -2367,7 +2367,7 @@ module ApplicationHelper
         end
       end
     else
-      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
     end
 
   end

From 26eda763fe235e9048ff2a5f5bedd1051e76e6bb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 16 Oct 2015 16:31:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B8=96=E5=AD=90=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A8=E6=80=81=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb | 28 ++++++++++++------------
 app/views/users/_course_message.html.erb |  5 ++++-
 public/stylesheets/courses.css           |  1 +
 public/stylesheets/new_user.css          |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 82f94ebfc..79142c441 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -147,19 +147,19 @@
 
   <% end %>
     <div class="cl"></div>
-    <div class="talkWrapMsg" nhname="about_talk_reply">
-      <em class="talkWrapArrow"></em>
-      <div class="cl"></div>
-      <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
-        <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
-              <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
-                  <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5"  %>
-                <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fr c_white mt10" ,:style=>"margin-left: 50px;"%>
-              <% end %>
-        <% end %>
-        <div class="cl"></div>
-      </div>
-    </div>
+    <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
+            <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index b153d7ea7..d9574dc0b 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -23,6 +23,9 @@
       <% if activity.sticky == 1%>
             <span class="sticky_btn_cir ml10">置顶</span>
       <% end%>
+      <% if activity.locked%>
+          <span class="locked_btn_cir ml10 fl" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+      <% end%>
       <div class="cl"></div>
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
@@ -56,7 +59,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': 'none' %>"></div>
     <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
         <%= count %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index fc4a890d2..8e41df7af 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -172,6 +172,7 @@ a.f_grey:hover {color:#000000;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
 .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 1301f648b..872d8df6d 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -297,6 +297,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
 .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 /* commonpic */
 .pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; }