From 9be7e633ae4c83912e059c3e3e5f1bb0c6cdfc26 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 21 Sep 2015 16:20:29 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb      |  2 +-
 app/views/users/_course_news.html.erb         |  2 +-
 app/views/users/_project_issue.html.erb       |  2 +-
 app/views/users/_project_message.html.erb     |  2 +-
 app/views/users/_user_activities.html.erb     |  2 +-
 .../javascripts/init_activity_KindEditor.js   | 33 +++++++++++--------
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 703882bd1..702e2d6b4 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -99,7 +99,7 @@
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mt3 mb10">
+      <div class="homepagePostReplyInputContainer  mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index ef01022ce..64080136f 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -70,7 +70,7 @@
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mt3 mb10">
+      <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 29bed1499..ce7b6a884 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -115,7 +115,7 @@
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mt3 mb10">
+      <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 2cce8f83a..2b64ceb9d 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -84,7 +84,7 @@
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mt3 mb10">
+      <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 225304185..ea9c572d9 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -36,7 +36,7 @@
             }
 
             $(function() {
-                init_activity_KindEditor_data(<%= user_activity.id%>,"","87%");
+                init_activity_KindEditor_data(<%= user_activity.id%>,null,"87%");
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 1e51067ef..bea7dc1e7 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -6,42 +6,49 @@ function init_editor(params){
 
     var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"95%",
-        height:"30px",// == undefined ? "30px":paramsHeight+"px",
-        minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
+        height:"33px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
         items:['emoticons'],
         afterChange:function(){//按键事件
 
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + paramsHeight , paramsHeight));
         },
         afterBlur:function(){
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             if(this.edit.html()=="") {
-                this.edit.html('<span id="hint" style="color: #808080">我要回复</span>');
+                this.edit.html('<span id="hint" style="color: #999999; font-size: 12px">我要回复</span>');
             }
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
-            //this.resize("95%", null);
+            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
+                params.submit_btn.hide();
+                this.resize("95%", null);
+            }else if(edit.html().val().trim() != ""){
+                params.submit_btn.show();
+            }
+
             //params.submit_btn.css("display","none");
         },
         afterFocus: function(){
             var edit = this.edit;
             var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
                 edit.html('');
             }
+            params.submit_btn.show();
             params.contentmsg.hide();
             // params.toolbar_container.show();
             $('#reply_image_' + id).removeClass('imageFuzzy');
             //edit.iframe.width(paramsWidth);
             this.resize(paramsWidth, null);
-            params.submit_btn.show();
+            //params.submit_btn.show();
         },
 
         afterCreate:function(){
-            params.submit_btn.css("display","none");
+            params.submit_btn.hide();
             var toolbar = $("div[class='ke-toolbar']",params.div_form);
             toolbar.css('width',24);
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
@@ -52,12 +59,10 @@ function init_editor(params){
             edit.iframe[0].scroll = 'no';
             body.style.overflowY = 'hidden';
             //reset height
-            var edit = this.edit;
-            var body = edit.doc.body;
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
-            edit.html('<span id="hint" style="color: #808080">我要回复</span>');
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
+            edit.html('<span id="hint" style="color: #999999; font-size: 12px">我要回复</span>');
+            this.resize(null,Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight));// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
 
         }
@@ -74,7 +79,7 @@ function nh_check_field(params){
         if(params.content.html()!=params.textarea.html() || params.issubmit==true){
             params.textarea.html(params.content.html());
             params.content.sync();
-            if(params.content.isEmpty() || /^\&\w*\;\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\&\w*\;[\u4e00-\u9fa5]*\&\w*\;\/\w*\&\w*\;$/.test(params.textarea.html())){
+            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
             }else{
@@ -152,5 +157,5 @@ function init_activity_KindEditor_data(id){
         });
     });
 
-    $(".ke-edit").css("height","25px");
+    $(".ke-edit").css("height","33px");
 }
\ No newline at end of file

From facd12640a16eaee73d4575f0445e1dfe935bc92 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 21 Sep 2015 16:54:23 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E4=B8=BA0=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E5=9B=9E=E5=A4=8D(0)=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 15 ++++++++-------
 app/views/users/_course_news.html.erb     |  5 +++--
 app/views/users/_project_issue.html.erb   |  6 +++---
 app/views/users/_project_message.html.erb | 15 ++++++++-------
 public/stylesheets/new_user.css           |  1 +
 public/stylesheets/public.css             |  1 +
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 702e2d6b4..250f385e5 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -45,15 +45,16 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% count=0 %>
+  <% if activity.parent %>
+      <% count=activity.parent.children.count%>
+  <% else %>
+      <% count=activity.children.count%>
+  <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <% count=0 %>
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <% if activity.parent %>
-            <% count=activity.parent.children.count%>
-       <% else %>
-            <% count=activity.children.count%>
-        <% end %>
         <%= count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 64080136f..456a3a7bd 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -24,9 +24,10 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <% count=activity.comments.count %>
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
         回复（<%= count %>）
       </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index ce7b6a884..8ea8804d5 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -63,10 +63,10 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% count = activity.journals.count %>
   <div class="homepagePostReply">
-
-    <div class="homepagePostReplyBanner">
-      <% count = activity.journals.count %>
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复（<%= count %>）</div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <% if count > 2 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 2b64ceb9d..7d810c065 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -36,15 +36,16 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% count = 0 %>
+  <% if activity.parent %>
+      <% count=activity.parent.children.count%>
+  <% else %>
+      <% count=activity.children.count%>
+  <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <% count = 0 %>
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <% if activity.parent %>
-            <% count=activity.parent.children.count%>
-        <% else %>
-            <% count=activity.children.count%>
-        <% end %>
         <%=count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 144589d5b..99260b458 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -568,6 +568,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
+.topBorder {border-top: 1px solid #e4e4e4;}
 div.minHeight48{min-height: 48px;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;}
 .homepagePostReplyBannerTime{width:85px; display:inline-block;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4f44a8b60..43e77a36d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -604,6 +604,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
+.topBorder {border-top: 1px solid #e4e4e4;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;}
 .homepagePostReplyBannerTime{width:85px; display:inline-block;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}

From 8883093b965e3a429e42ee16a5ad8557f6cc0ad8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 21 Sep 2015 17:05:51 +0800
Subject: [PATCH 03/25] =?UTF-8?q?"=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC"?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css   | 4 +---
 public/stylesheets/public.css     | 4 ++--
 public/stylesheets/public_new.css | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 99260b458..46ef4a760 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -688,9 +688,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;}
 .AgreementTxt{text-indent:2em; margin-bottom:15px;}
-.AgreementImg{ margin:0px auto; width:619px;}
-.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
-.AgreementImg{margin: 0px auto; width: 820px;}
+.AgreementImg{ margin:0px auto;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 43e77a36d..34bb71898 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -943,5 +943,5 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 
 .AgreementBox{margin: 20px 0; color: #666666; font-size: 14px; line-height: 1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
-.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
-.AgreementImg{margin: 0px auto; width: 820px;}
+.AgreementTxt{text-indent:2em; margin-bottom:15px;}
+.AgreementImg{ margin:0px auto;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 7cd0a461c..2d39e75ea 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -794,4 +794,4 @@ div.flash.warning, .conflict {
 .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
 .AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
-.AgreementImg{margin: 0px auto; width: 820px;}
\ No newline at end of file
+.AgreementImg{margin: 0px auto;}
\ No newline at end of file

From 7a62b7f13d28f175ba05f9aeb5a9bc4b1e3d764d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 21 Sep 2015 17:11:45 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=97=B6=E9=97=B4=E5=92=8C=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=EF=BC=8C=E5=B9=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=85=B6=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?js=E7=9A=84=E6=8E=A7=E5=88=B6=E3=80=82=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=80=BC=E5=BE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  4 ++
 app/controllers/users_controller.rb           |  4 +-
 app/views/student_work/new.html.erb           |  2 +-
 app/views/users/_user_homework_form.html.erb  |  8 +++
 app/views/users/user_homeworks.html.erb       |  1 +
 db/schema.rb                                  | 33 ++++++------
 public/javascripts/new_user.js                | 54 ++++++++++++++++---
 7 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 9d5768948..41d302829 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -150,6 +150,10 @@ class HomeworkCommonController < ApplicationController
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
 
+      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
+      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
+
       @homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@homework)
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0783d1805..76643a099 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -468,8 +468,8 @@ class UsersController < ApplicationController
         homework_detail_manual = HomeworkDetailManual.new
         homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
         homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? homework.end_time + 7 : params[:evaluation_start]
+        homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
         homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
         homework_detail_manual.absence_penalty = 5
         homework.homework_detail_manual = homework_detail_manual
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index f9b242443..c7f1d45c4 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -7,7 +7,7 @@
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().css("top","30%").css("left","40%");
+        $('#ajax-modal').parent().css("top","65%").css("left","60%");
         $('#ajax-modal').parent().addClass("anonymos_work");
     });
   <% end%>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 6e07e7122..b19125ec6 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -21,6 +21,14 @@
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
     </div>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>"  >
+      <%= calendar_for('evaluation_start_time')%>
+    </div>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>"  >
+      <%= calendar_for('evaluation_end_time')%>
+    </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index f375496d1..a169be166 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -21,6 +21,7 @@
     <!-- 老师身份才可以发布作业 -->
     <div class="HomeWork mb10">
       <% homework = HomeworkCommon.new %>
+      <% homework.homework_detail_manual = HomeworkDetailManual.new%>
       <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
           <div id="HomeWorkCon">
             <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
diff --git a/db/schema.rb b/db/schema.rb
index 1c6760345..1f40c93b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -497,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150918134804) 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|
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index e5f5e8b4c..95d85e48c 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -56,18 +56,20 @@ function show_more_project(url){
 }
 
 //老师提交 新建/修改 作业
-function submit_homework(id)
-{
-    if(!regex_homework_name())
-    {
+function submit_homework(id){
+    if(!regex_homework_name()){
         $("#homework_name").focus();
     }
-    else if(!regex_homework_end_time())
-    {
+    else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
-    else if(!regex_course_id())
-    {
+    else if(!regex_evaluation_start()){
+        $("#evaluation_start_time").focus()
+    }
+    else if(!regex_evaluation_end()){
+        $("#evaluation_end_time").focus()
+    }
+    else if(!regex_course_id()){
         $("#course_id").focus();
     }
     else{
@@ -134,6 +136,42 @@ function search_homework_by_name(url){
     );
 }
 
+//验证匿评开启时间：大于截止时间,或者为空
+function regex_evaluation_start(){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    if(evaluation_start == ""){
+        return true;
+    }
+    var end_time = new Date($.trim($("#homework_end_time").val()));
+    var evaluation_start_time = new Date(evaluation_start);
+    if(evaluation_start_time > end_time){
+        return true;
+    }else{
+        $("#homework_end_time_span").text("开启匿评日期必须大于截止日期");
+        return false;
+    }
+}
+
+//验证匿评结束时间：大于匿评开启时间,或者为空。当匿评开启时间为空时，匿评结束时间必须为空
+function regex_evaluation_end(){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    var evaluation_end = $.trim($("#evaluation_end_time").val());
+    if(evaluation_end == ""){
+        return true;
+    }else if(evaluation_start == ""){
+        $("#homework_end_time_span").text("开启匿评日期为空时，关闭匿评日期必须为空");
+        return false;
+    }
+    var evaluation_start_time = new Date(evaluation_start);
+    var evaluation_end_time = new Date(evaluation_end);
+    if(evaluation_end_time > evaluation_start_time){
+        return true;
+    }else{
+        $("#homework_end_time_span").text("关闭匿评日期必须大于开启匿评日期");
+        return false;
+    }
+}
+
 //提交新建作品
 function new_student_work()
 {

From 83e2a4b5bd5b8c26a7e048906083b50d7154e40e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 22 Sep 2015 09:47:39 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=97=AE=E5=8D=B7=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_head.html.erb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 06e162f0d..8eebae5a2 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -22,3 +22,21 @@
       <div class="cl"></div>
     </div><!--编辑头部 end-->
 <% end%>
+<script type="text/javascript">
+  $(function(){
+      if($('#polls_description_div').html().trim() == '') {
+          $('#polls_description_div').html("<p style='color:#999999'>问卷描述</p>");
+      }
+  });
+
+  $('#polls_description_div').focus(function(){
+      //alert($('#polls_description_div').html().trim());
+      if(/^\s*<\w*\s*\w*\=\"\w*\:\s*\#\d*\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test($('#polls_description_div').html().trim())) {
+          $('#polls_description_div').html('');
+      }
+  }).blur(function(){
+      if($('#polls_description_div').html().trim() == '') {
+          $('#polls_description_div').html("<p style='color:#999999'>问卷描述</p>");
+      }
+  });
+</script>

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 06/25] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E5=88=97=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 | 47 +++++-----
 .../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, 166 insertions(+), 103 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">
-        <% 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"%>
+      <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%>
+        <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%>
+            <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>
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
                 <%= student_work.user.show_name%>
-            <% else%>
-                匿名
-            <% end%>
-          </li>
-          <li class="hworkDetail mr15">
-            学号：
-            <% if is_my_work%>
-              <span>
+              </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;}

From 90536efa1e177035401d33a620be642fcacfec00 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 22 Sep 2015 15:52:08 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E5=AD=A6=E5=8F=B7=E9=82=AE=E7=AE=B1=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=EF=BC=8C=E5=90=84=E7=A7=8D=E6=8E=92=E5=BA=8F=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAjs=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    |  1 +
 .../_evaluation_un_title.html.erb             | 24 +++++------
 .../student_work/_student_work_list.html.erb  | 36 ++++++++++++++++
 app/views/student_work/index.html.erb         | 41 ++-----------------
 app/views/student_work/index.js.erb           |  2 +
 public/javascripts/course.js                  | 25 +++++++----
 6 files changed, 72 insertions(+), 57 deletions(-)
 create mode 100644 app/views/student_work/_student_work_list.html.erb
 create mode 100644 app/views/student_work/index.js.erb

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 251fd80c4..53f9adcba 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -99,6 +99,7 @@ class StudentWorkController < ApplicationController
     @score = @b_sort == "desc" ? "asc" : "desc"
 
     respond_to do |format|
+      format.js
       format.html
       format.xls {
         send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 119976bbb..14079668e 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -6,46 +6,46 @@
   </li>
 
   <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"%>
+    <%= 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" ,:remote => true%>
     <% 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"%>
+        <%= 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",:remote => true%>
     <% 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"%>
+    <%= 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" ,:remote => true%>
     <% 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'} mt10"%>
+        <%= 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" ,:remote => true%>
     <% end%>
   </li>
 
   <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"%>
+    <%= 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",:remote => true%>
     <% 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'} mt10"%>
+        <%= 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",:remote => true%>
     <% end%>
   </li>
 
   <% if @homework.homework_type == 2%>
       <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"%>
+        <%= 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",:remote => true%>
         <% 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'} mt10"%>
+            <%= 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",:remote => true%>
         <% end%>
       </li>
   <% end%>
 
   <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"%>
+    <%= 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",:remote => true%>
     <% 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'} mt10"%>
+        <%= 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",:remote => true%>
     <% end%>
   </li>
 
   <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"%>
+    <%= 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",:remote => true%>
     <% 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'} mt10"%>
+        <%= 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",:remote => true%>
     <% end%>
   </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
new file mode 100644
index 000000000..0046393a4
--- /dev/null
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -0,0 +1,36 @@
+<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="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>
+<div class="cl"></div>
+
+<div class="fl">
+  <% if @is_evaluation && !@stundet_works.empty?%>
+      <%= render :partial => "evaluation_title"%>
+  <% else%>
+      <%= render :partial => "evaluation_un_title"%>
+  <% end%>
+</div>
+<div class="cl"></div>
+
+<% @stundet_works.each do |student_work|%>
+    <% if @is_evaluation%>
+        <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%>
+    <% else%>
+        <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
+    <% end%>
+    <div class="cl"></div>
+    <div id="about_hwork_<%= student_work.id%>"></div>
+    <div class="cl"></div>
+<% end%>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 5698a0c70..454f0ad57 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -56,7 +56,7 @@
                 <a href="javascript:void(0);" class="resourcesIcon"></a>
                 <ul class="hworkMenu">
                   <li>
-                    <%= link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey'%>
+                    <%= link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => "export_student_work"%>
                   </li>
                   <li>
                     <% if @homework.student_works.empty?%>
@@ -85,43 +85,8 @@
 
     <div class="hworkListContainer">
       <div class="ctt2">
-        <div class="dis" id="tbc_01">
-          <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="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>
-          <div class="cl"></div>
-
-          <div class="fl">
-            <% if @is_evaluation && !@stundet_works.empty?%>
-                <%= render :partial => "evaluation_title"%>
-            <% else%>
-                <%= render :partial => "evaluation_un_title"%>
-            <% end%>
-          </div>
-          <div class="cl"></div>
-
-          <% @stundet_works.each do |student_work|%>
-              <% if @is_evaluation%>
-                  <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%>
-              <% else%>
-                  <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
-              <% end%>
-              <div class="cl"></div>
-              <div id="about_hwork_<%= student_work.id%>"></div>
-              <div class="cl"></div>
-          <% end%>
+        <div class="dis" id="homework_student_work_list">
+          <%= render :partial => "student_work/student_work_list"%>
         </div>
       </div>
     </div>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
new file mode 100644
index 000000000..e46be3164
--- /dev/null
+++ b/app/views/student_work/index.js.erb
@@ -0,0 +1,2 @@
+$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
+$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 4f091560d..f81952125 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -940,17 +940,28 @@ function SearchByName(url,event)
 {
     var keycode = (event.keyCode ? event.keyCode : event.which);
     if(keycode == '13'){
-        location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val();
+        $.get(
+            url,
+            {
+                name : $("#course_student_name").val(),
+                group : $("#late_penalty").val()
+            },
+            function (data) {
+            }
+        );
     }
 }
 function SearchByName_1(url)
 {
-    if($("#late_penalty").val() == null){
-        location.href = url + "&name=" + $("#course_student_name").val()
-    }
-    else{
-        location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val();
-    }
+    $.get(
+        url,
+        {
+            name : $("#course_student_name").val(),
+            group : $("#late_penalty").val()
+        },
+        function (data) {
+        }
+    );
 }
 
 //新建作业临时弹框

From 660e604045fff4017ee8b1c745ed1345cba6f14a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 22 Sep 2015 15:54:19 +0800
Subject: [PATCH 08/25] =?UTF-8?q?kindeditor=E7=BC=96=E8=BE=91=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E7=AC=A6=E5=8F=B7=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

---
 public/assets/kindeditor/plugins/code/previewcode.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index ce3084a7c..f67f04149 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -38,8 +38,11 @@ pre.prettyprint { padding: 2px;
     border-right: 1px solid #ccc,
 border-top: 1px solid #ccc }
 
-pre li,ul,ol {
-    list-style-type: none;
+pre li,ol li {
+    list-style-type: decimal;
+}
+ul li{
+    list-style-type: disc;
 }
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
@@ -50,7 +53,7 @@ li.L3,
 li.L5,
 li.L6,
 li.L7,
-li.L8 { list-style-type: none }
+li.L8 { list-style-type: decimal }
 /* Alternate shading for lines */
 li.L1,
 li.L3,

From a37f39558d81b9820c79b7c90843b3ce220a59f1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 22 Sep 2015 15:54:50 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=88=97=E8=A1=A8=E7=AC=A6=E5=8F=B7=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb       |   4 +-
 app/views/boards/_project_show.html.erb      |   4 +-
 app/views/courses/show.html.erb              |   2 +-
 app/views/homework_common/index.html.erb     |   2 +-
 app/views/issues/show.html.erb               | 104 ++++++++++---------
 app/views/news/_course_news_list.html.erb    |   2 +-
 app/views/news/_course_show.html.erb         |   4 +-
 app/views/news/_project_news.html.erb        |   2 +-
 app/views/news/_project_show.html.erb        |   2 +-
 app/views/projects/show.html.erb             |   6 +-
 app/views/users/_user_homework_list.html.erb |   2 +-
 db/schema.rb                                 |   8 +-
 public/stylesheets/courses.css               |   4 +-
 public/stylesheets/css.css                   |   3 +-
 public/stylesheets/new_user.css              |   3 +
 public/stylesheets/project.css               |   4 +-
 public/stylesheets/public.css                |   3 +
 17 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index f117acd7f..db174f30e 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -99,7 +99,7 @@
 //                }
               });
             </script>
-            <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+            <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
                 <%= topic.content.html_safe %>
                 <!-- -->
@@ -165,7 +165,7 @@
                           <div class="Msg_txt">
                             <%= link_to User.current.member_of_course?(@board.course) ? "#{message.author.show_name}(#{message.author.login})" : "#{message.author}", user_path(message.author),:class => 'fl c_orange f14 ' %>
                             <br/>
-                            <div class="fl break_word f14">
+                            <div class="fl break_word f14 list_style">
                               <%= textAreailizable message,:content,:attachments => message.attachments %>
                               <!-- -->
                             </div>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index bc69e2666..3cfd4ae72 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -92,7 +92,7 @@
                 </script>
 
               <div class="cl"></div>
-              <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+              <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
                 <div id="contentmessage<%=topic.id %>" class="upload_img">
                   <%= topic.content.html_safe %>
                   <!-- -->
@@ -150,7 +150,7 @@
                             <div class="Msg_txt">
                               <%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %>
                               <br/>
-                              <div class="fl break_word f14">
+                              <div class="fl break_word f14 list_style">
                                 <%= textAreailizable message,:content,:attachments => message.attachments %>
                                 <!-- -->
                               </div>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 6eb722981..eceb29f34 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -7,7 +7,7 @@
       <a class="problem_pic fl">
         <%= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %>
       </a>
-      <div class="problem_txt fl mt5 upload_img">
+      <div class="problem_txt fl mt5 upload_img list_style">
         <%= link_to_user_header(activity.user,false,:class => 'problem_name c_orange fl') %>
         <span class="fl"> &nbsp;</span>
         <span class="fl"> <%= activity.course_act_type == "Course" ? "创建了课程" : l(:label_new_activity) %>：</span>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 2e680d6ea..4bf3d1781 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -37,7 +37,7 @@
             $(function(){if($("#bid_description_<%= homework.id%>_content").height()>360){$("#bid_show_more_des_button<%= homework.id%>").show();}});
         </script>
         <div  id="bid_description_<%= homework.id%>" class="news_description mt5">
-          <div id="bid_description_<%= homework.id%>_content" class="upload_img">
+          <div id="bid_description_<%= homework.id%>_content" class="upload_img list_style">
             <%= homework.description.html_safe %>
           </div>
         </div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 01cbea1c1..41605a826 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
@@ -22,25 +22,25 @@
       <div class="cl"></div>
       <p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
         <%# if @issue.created_on != @issue.updated_on %>
-            添加于 <%= format_time(@issue.created_on).html_safe %>
+        添加于 <%= format_time(@issue.created_on).html_safe %>
         <%# else %>
-         <%#= format_time(@issue.updated_on).html_safe %>
+        <%#= format_time(@issue.updated_on).html_safe %>
         <%# end %>
     </div>
     <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
-    <div class="talk_info mb10" style="word-break:break-all;">
+    <div class="talk_info mb10 list_style" style="word-break:break-all;">
       <% if @issue.description? || @issue.attachments.any? -%>
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
           <% end %>
-          </div>
-          <div class="pro_pic_box mb10">
-            <a href="javascript:void(0)" class="link_img fl">
-              <!--显示附件、图片-->
-              <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
+    </div>
+    <div class="pro_pic_box mb10">
+      <a href="javascript:void(0)" class="link_img fl">
+        <!--显示附件、图片-->
+        <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
       <% end -%>
       <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
       </div><!--pro_pic_box  end-->
@@ -48,51 +48,61 @@
       <!--属性-->
       <div class="pro_info_box mb10">
         <%= issue_fields_rows do |rows| %>
-              <ul class="fl" >
-                <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
-                </li>
-                <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-                <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              </ul>
-              <ul class="fl" >
-                <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
-                </li>
-                <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              </ul>
+            <ul class="fl">
+              <li><p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
 
-              <ul class="fl " >
+                <p class="pro_info_p"><%= @issue.status.name %></p>
+              </li>
+              <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
+                  <li><p class="label03">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+                  </li>
+              <% end %>
+              <div class="cl"></div>
+            </ul>
+            <ul class="fl">
+              <li><p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
+                <span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
+              </li>
+              <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
+                  <li><p class="label03">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
+                  </li>
+              <% end %>
+              <div class="cl"></div>
+            </ul>
+
+            <ul class="fl ">
               <% unless @issue.disabled_core_fields.include?('start_date') %>
-                <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
-                </li>
+                  <li><p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
+
+                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
+                  </li>
               <% end %>
-                <div class="cl"></div>
+              <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-                <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
-                </li>
+                  <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+                  </li>
               <% end %>
-                <div class="cl"></div>
-              </ul>
-              <ul class="fl " >
-                <% unless @issue.disabled_core_fields.include?('due_date') %>
-                <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
-                </li>
+              <div class="cl"></div>
+            </ul>
+            <ul class="fl ">
+              <% unless @issue.disabled_core_fields.include?('due_date') %>
+                  <li><p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %></span>
+                  </li>
               <% end %>
-                <div class="cl"></div>
+              <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
-                </li>
+                  <li><p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+                  </li>
               <% end %>
-                <div class="cl"></div>
-              </ul>
+              <div class="cl"></div>
+            </ul>
             <% end %><!--pro_info_box end-->
         <%#= render_custom_fields_rows(@issue) %>
         <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
@@ -111,7 +121,7 @@
       </div>
       <p style="padding-top: 5px"></p>
 
-<!--引用时不能修改，剥离出引用内容-->
+      <!--引用时不能修改，剥离出引用内容-->
 
       <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb
index da963b3cd..74a70e33d 100644
--- a/app/views/news/_course_news_list.html.erb
+++ b/app/views/news/_course_news_list.html.erb
@@ -7,7 +7,7 @@
     <% newss.each do |news| %>
         <div class="problem_main upload_img">
           <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-          <div class="problem_txt fl mt5">
+          <div class="problem_txt fl mt5 list_style">
             <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
             <span class="fl">
                 <%= l(:label_release_news) %>：
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 9ae951779..2d8dae59d 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -4,7 +4,7 @@
 </div>
 <div class="problem_main">
   <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-  <div class="problem_txt fl mt5">
+  <div class="problem_txt fl mt5 list_style">
     <h4 class="r_txt_tit mb5">
       <%=h @news.title %>
     </h4>
@@ -51,7 +51,7 @@
       <div class="ping_C mb10">
         <div><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "problem_pic fl"%></div>
         <div class="ping_discon">
-          <div class="ping_distop upload_img break_word">
+          <div class="ping_distop upload_img break_word list_style">
             <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
             <span class="c_grey fr">
                 <%= format_time(comment.created_on) %>
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index 0cd26382b..efbb74e46 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -31,7 +31,7 @@
       <% @newss.each do |news| %>
           <div class="problem_main">
             <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-            <div class="problem_txt fl mt5">
+            <div class="problem_txt fl mt5 list_style">
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
               <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
               <%=link_to "<span class = 'pic_mes'>#{news.comments.all.count}</span>".html_safe, news_path(news.id), :class => "pro_mes_w_news" %><br />
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 6e94f0947..463b0f489 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -14,7 +14,7 @@
 
 <div class="problem_main">
       <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-      <div class="problem_txt fl mt5">
+      <div class="problem_txt fl mt5 list_style">
         <h4 class="r_txt_tit mb5">  <%=h @news.title %></h4>
         <%#= watcher_link(@news, User.current) %>
         <%= link_to(l(:button_edit),
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index f1b3d9b7b..971794699 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -24,7 +24,7 @@
         <% if e.forge_act_type == "Issue" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -60,7 +60,7 @@
             <% elsif e.forge_act_type == "Message" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -79,7 +79,7 @@
         <% elsif e.forge_act_type == "News" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 6bc03e33d..cd596e22b 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -41,7 +41,7 @@
               <%= l(:label_end_time)%>：<%= homework_common.end_time%>
             </div>
           </div>
-          <div class="homepagePostIntro upload_img break_word">
+          <div class="homepagePostIntro upload_img break_word list_style">
             <%= homework_common.description.html_safe %>
           </div>
           <div class="mt10">
diff --git a/db/schema.rb b/db/schema.rb
index 1c6760345..767208f9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -476,13 +476,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -916,6 +909,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 7c1e590db..39c0c6eb0 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -262,6 +262,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 
 /* 创建作品 work */
 .Newwork{ width:668px; height:418px;}
@@ -637,7 +639,7 @@ a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px sol
 a:hover.Reply_pic{border:1px solid #64bdd9;}
 .Msg_txt{ float:left; width:540px; margin-left:10px;}
 .Msg_txt p{ }
-.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkWrapMsg > ul > li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
 .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
 .Replybox{ float:left; width:495px; margin-left:5px;}
 .talk_nextpage{ border:none; width:410px; margin:0 auto;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index ebb290597..f6bf63f2c 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -120,7 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop span{ float:left;}
 .ping_distop p{ color:#5f5f5f;min-height: 24px;}
 .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}
-
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
 
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 46ef4a760..1c361c3f9 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1149,3 +1149,6 @@ a:hover.tijiao{ background:#0f99a9;}
 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index bee965a90..875f01ba0 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -328,6 +328,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 
 /*上传资源弹出框样式*/
 .popbox_polls{position:fixed !important;}
@@ -862,7 +864,7 @@ a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px sol
 a:hover.Reply_pic{border:1px solid #64bdd9;}
 .Msg_txt{ float:left; width:540px; margin-left:10px;}
 .Msg_txt p{ }
-.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkWrapMsg > ul > li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
 .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
 .Replybox{ float:left; width:495px; margin-left:5px;}
 .talk_nextpage{ border:none; width:410px; margin:0 auto;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 34bb71898..8ab9a373f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -945,3 +945,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
 .AgreementTxt{text-indent:2em; margin-bottom:15px;}
 .AgreementImg{ margin:0px auto;}
+
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
\ No newline at end of file

From 93804bcfa642e6a61e47b0f1eaff9db14725a4f3 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 22 Sep 2015 16:11:22 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 1c361c3f9..9c075efa7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -688,7 +688,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;}
 .AgreementTxt{text-indent:2em; margin-bottom:15px;}
-.AgreementImg{ margin:0px auto;}
+.AgreementImg{ margin:0px auto; width:619px;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/

From 9d2b58738ebbdc6f8dae9531c92ca3ca6cb203d3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 22 Sep 2015 16:16:55 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E5=88=86=E7=8F=AD=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 59 ++++++++++++++-----
 .../student_work/_student_work_list.html.erb  |  4 +-
 app/views/student_work/index.html.erb         |  2 +-
 app/views/student_work/index.js.erb           |  2 +-
 public/javascripts/course.js                  | 11 +++-
 5 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 53f9adcba..90a0f3ed6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -77,25 +77,56 @@ class StudentWorkController < ApplicationController
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @is_evaluation = @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
-    if @is_teacher   #老师 || 超级管理员 显示所有列表
-      @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-      @show_all = true
-    elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-      @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-    elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-      my_work = @homework.student_works.where(:user_id => User.current.id)
-      @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-    elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-      my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-      if my_work.empty?
-        @stundet_works = []
+
+    course_group = CourseGroup.find_by_id(@group) if @group
+    if course_group
+      group_students = course_group.users
+      if group_students.empty?
+        student_in_group = '(0)'
       else
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
+      end
+      if @is_teacher   #老师 || 超级管理员 显示所有列表
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if my_work.empty?
+          @stundet_works = []
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+          @show_all = true
+        end
+      else
+        @stundet_works = []
       end
     else
-      @stundet_works = []
+      if @is_teacher   #老师 || 超级管理员 显示所有列表
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        @show_all = true
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if my_work.empty?
+          @stundet_works = []
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+          @show_all = true
+        end
+      else
+        @stundet_works = []
+      end
     end
+
     @score = @b_sort == "desc" ? "asc" : "desc"
 
     respond_to do |format|
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 0046393a4..197fecac9 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -8,9 +8,9 @@
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
       <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>
+        <a class="hworkSearchIcon" id="search_in_student_work" 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?  %>
+      <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
   <% end%>
 </div>
 <div class="cl"></div>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 454f0ad57..9c48d310b 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -56,7 +56,7 @@
                 <a href="javascript:void(0);" class="resourcesIcon"></a>
                 <ul class="hworkMenu">
                   <li>
-                    <%= link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => "export_student_work"%>
+                    <%= link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :group => @group, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => "export_student_work"%>
                   </li>
                   <li>
                     <% if @homework.student_works.empty?%>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index e46be3164..73b94260d 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,2 +1,2 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
-$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
\ No newline at end of file
+$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index f81952125..b471ea89e 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -944,7 +944,7 @@ function SearchByName(url,event)
             url,
             {
                 name : $("#course_student_name").val(),
-                group : $("#late_penalty").val()
+                group : $("#student_work_in_group").val()
             },
             function (data) {
             }
@@ -953,17 +953,24 @@ function SearchByName(url,event)
 }
 function SearchByName_1(url)
 {
+    //alert($("#student_work_in_group").val());
     $.get(
         url,
         {
             name : $("#course_student_name").val(),
-            group : $("#late_penalty").val()
+            group : $("#student_work_in_group").val()
         },
         function (data) {
         }
     );
 }
 
+$(function(){
+    $("#student_work_in_group").live("change",function(){
+        $("#search_in_student_work").click();
+    });
+});
+
 //新建作业临时弹框
 function new_homework_alert(){
     alert("您好！课程内直接发布作业的功能正在改进中，请直接点击\n顶部导航栏的“作业”向本课程发送作业。谢谢！如有问\n题，可参见帮助中心。");

From 1e95d5247dc4729b6a42043843e5c311aef0beaf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 22 Sep 2015 16:21:36 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_title.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 14079668e..9a21e109b 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,6 +1,6 @@
 <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 <%= @homework.homework_type == 2 ? 'mr60 ml80' : 'mr95 ml100'%>">作品名称</span>
     <span class="c_dark f14 fb fl mr50">姓名</span>
     <span class="c_dark f14 fb fl">学号</span>
   </li>

From 3e58264a28e895558e8946d1801bc6a29e073d31 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 22 Sep 2015 16:27:27 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=88=97=E8=A1=A8li=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AC=A6=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb | 2 +-
 app/views/users/_course_message.html.erb  | 4 ++--
 app/views/users/_course_news.html.erb     | 4 ++--
 app/views/users/_project_issue.html.erb   | 2 +-
 app/views/users/_project_message.html.erb | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 366473b52..afd2f142b 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -42,7 +42,7 @@
 
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
       <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 250f385e5..bed895ee8 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -24,7 +24,7 @@
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
 
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
@@ -87,7 +87,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word">
+                    <div class="homepagePostReplyContent break_word list_style">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 456a3a7bd..97f0acb69 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -18,7 +18,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
         <%= activity.description.html_safe %>
       </div>
     </div>
@@ -60,7 +60,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 8ea8804d5..e8bac335c 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -33,7 +33,7 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
         <% if activity.description? %>
             <%= textAreailizable activity, :description, :attachments => activity.attachments %>
         <% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 7d810c065..32468f9a0 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -26,7 +26,7 @@
       <div class="homepagePostDate">
         时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
@@ -74,7 +74,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style"><%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

From 50817c3d641c29207ed1c3b565c85dcf82e10767 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 22 Sep 2015 16:52:21 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=97=B6=20=E8=AE=A1=E7=AE=97=E7=B3=BB=E7=BB=9F=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/student_work_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/student_work_test.rb b/app/models/student_work_test.rb
index 1cfb7f8b2..0246ecabf 100644
--- a/app/models/student_work_test.rb
+++ b/app/models/student_work_test.rb
@@ -45,7 +45,7 @@ class StudentWorkTest < ActiveRecord::Base
   private
   def get_success_count
     self.results.inject(0) do |sum, result|
-      sum += (result["status"].to_i == 0 ? 1 : 0)
+      sum += (result["status"] && result["status"].to_i == 0 ? 1 : 0)
     end || 0
   end
 

From 576adfac34834c6d8e6ec55bea039dd16a0dd9a5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 23 Sep 2015 08:56:48 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E4=B8=AD?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0html=E4=BB=A3=E7=A0=81=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_activity_KindEditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index bea7dc1e7..c9d8189c2 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -19,7 +19,7 @@ function init_editor(params){
         afterBlur:function(){
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             if(this.edit.html()=="") {
-                this.edit.html('<span id="hint" style="color: #999999; font-size: 12px">我要回复</span>');
+                this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
             }
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
@@ -61,7 +61,7 @@ function init_editor(params){
             //reset height
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
-            edit.html('<span id="hint" style="color: #999999; font-size: 12px">我要回复</span>');
+            edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
             this.resize(null,Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight));// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
 

From 76afbdec3f4164db4ecb7931ce63c455b91ad2d7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 23 Sep 2015 09:23:31 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E9=9A=90=E8=97=8Fkindeditor=E7=9A=84?=
 =?UTF-8?q?=E2=80=9C=E6=8F=92=E5=85=A5=E4=BB=A3=E7=A0=81=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7/?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 5 ++---
 public/stylesheets/courses.css         | 4 ++--
 public/stylesheets/css.css             | 4 ++--
 public/stylesheets/new_user.css        | 4 ++--
 public/stylesheets/project.css         | 4 ++--
 public/stylesheets/public.css          | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index e8c28f678..b045a27cc 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -264,7 +264,7 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['code', 'emoticons','fontname',
+	items : ['emoticons','fontname',
         'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
 		'formatblock', 'fontsize', '|','indent', 'outdent',
 		 '|','imagedirectupload','table',   'media', 'preview',"more"
@@ -4986,8 +4986,7 @@ KEditor.prototype = {
         htmlList.unshift('<div style="display:block" id="define"/>')
         htmlList.push('</div>')
         var htmlListFull = [];
-        var fullItems =  ['code',
-            'emoticons','fontname',
+        var fullItems =  ['emoticons','fontname',
             'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
             'formatblock', 'fontsize', '|', 'indent', 'outdent',
               '|','imagedirectupload','table',   'media', 'preview', "less",
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 0ea279253..754112b52 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -280,8 +280,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
+.list_style ol li{list-style-type: decimal;margin-left: 20px;}
+.list_style ul li{list-style-type: disc;margin-left: 20px;}
 
 /* 创建作品 work */
 .Newwork{ width:668px; height:418px;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index f6bf63f2c..6114c1b4d 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -120,8 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop span{ float:left;}
 .ping_distop p{ color:#5f5f5f;min-height: 24px;}
 .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
+.list_style ol li{list-style-type: decimal;margin-left: 20px;}
+.list_style ul li{list-style-type: disc;margin-left: 20px;}
 .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
 
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 9c075efa7..5e049e029 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1150,5 +1150,5 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
\ No newline at end of file
+.list_style ol li{list-style-type: decimal;margin-left: 20px;}
+.list_style ul li{list-style-type: disc;margin-left: 20px;}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 875f01ba0..963b4aeb3 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -328,8 +328,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
+.list_style ol li{list-style-type: decimal;margin-left: 20px;}
+.list_style ul li{list-style-type: disc;margin-left: 20px;}
 
 /*上传资源弹出框样式*/
 .popbox_polls{position:fixed !important;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 5d528678a..d8285709f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -951,5 +951,5 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .AgreementTxt{text-indent:2em; margin-bottom:15px;}
 .AgreementImg{ margin:0px auto;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
+.list_style ol li{list-style-type: decimal;margin-left: 20px;}
+.list_style ul li{list-style-type: disc;margin-left: 20px;}

From 3cb125ccbf893197079e508c4551d34a83d350c3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 09:51:30 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8F=96=E6=B6=88=E5=BC=80=E5=90=AF=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E6=97=A5=E6=9C=9F=E5=92=8C=E5=85=B3=E9=97=AD=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E6=97=A5=E6=9C=9F=E7=9A=84=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_homework_detail_manual_form.html.erb     | 110 ----------
 .../_homework_detail_programing_form.html.erb | 193 ------------------
 .../_new_homework_detail_manual_form.html.erb |  74 -------
 app/views/homework_common/new.html.erb        |  17 --
 app/views/homework_common/next_step.html.erb  |  30 ---
 app/views/users/_user_homework_form.html.erb  |   8 -
 6 files changed, 432 deletions(-)
 delete mode 100644 app/views/homework_common/_homework_detail_manual_form.html.erb
 delete mode 100644 app/views/homework_common/_homework_detail_programing_form.html.erb
 delete mode 100644 app/views/homework_common/_new_homework_detail_manual_form.html.erb
 delete mode 100644 app/views/homework_common/new.html.erb
 delete mode 100644 app/views/homework_common/next_step.html.erb

diff --git a/app/views/homework_common/_homework_detail_manual_form.html.erb b/app/views/homework_common/_homework_detail_manual_form.html.erb
deleted file mode 100644
index 59294f82d..000000000
--- a/app/views/homework_common/_homework_detail_manual_form.html.erb
+++ /dev/null
@@ -1,110 +0,0 @@
-<ul class="hwork_new_basic mb10">
-  <li>
-    <label class="label02 mb20">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:field_name)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
-    <p id="homework_name_span" class="c_red ml110"></p>
-  </li>
-  <div class="cl"></div>
-  <li >
-    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-      <% else %>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </li>
-  <div class="cl"></div>
-  <li class="mt10">
-    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
-    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
-  </li>
-  <div class="cl"></div>
-  <li class="fl">
-    <label class="label02">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
-    <div class="cl"></div>
-  </li>
-  <li class="fl ml100" style="display: none;">
-    <label class="label02">&nbsp;发布日期：&nbsp;</label>
-    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
-    <%= calendar_for('homework_publish_time')%>
-    <div class="cl"></div>
-  </li>
-  <div class="cl"></div>
-</ul><!--hwork_new_basic end--->
-<div class="hwork_new_set" >
-  <p class="fl ml20 f14 mb10 c_orange">基本规则设置（总分为100分）</p>
-  <div class="cl"></div>
-    <ul class="ml10">
-      <li>
-        <label class="label02">迟交扣分：&nbsp;</label>
-        <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
-        <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-        <span class="fl mt5">&nbsp;分</span>
-        <div class="cl"></div>
-      </li>
-      <li style="display: none;">
-        <label class="label02" >是否匿评：&nbsp;</label>
-        <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <label class="label02">评分比例：&nbsp;</label>
-        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
-        <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
-        <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
-        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
-        <span class="ml5 fl mt5">×&nbsp;匿评得分</span>
-        <span class="ml5 fl mt5">=&nbsp;学生得分</span>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <label class="label02" >&nbsp;&nbsp;</label>
-        <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
-        <div class="cl"></div>
-      </li>
-    </ul>
-</div><!--hwork_new_set end-->
-
-<div class="hwork_new_set" id="evaluation_setting" >
-  <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
-  <div class="cl"></div>
-  <ul class="ml10">
-    <li style="display: none;">
-      <label class="label02">互评启动时间：&nbsp;</label>
-      <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
-      <%= calendar_for('evaluation_start_time')%>
-      <div class="cl"></div>
-    </li>
-    <li style="display: none;">
-      <label class="label02">互评结束时间：&nbsp;</label>
-      <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
-      <%= calendar_for('evaluation_end_time')%>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <label class="label02">匿评分配数：&nbsp;</label>
-      <input  type="text" name="evaluation_num" id="evaluation_num" class=" hwork_input02 fl"  value="<%= homework.homework_detail_manual.evaluation_num%>" maxlength="2" onkeyup="regex_evaluation_num()">
-      <p class="ml5 fl mt5" id="evaluation_num_notice">每个学生将收到<span class="c_red">&nbsp;3&nbsp;</span>份待匿评作品</p>
-      <div class="cl"></div>
-    </li>
-
-    <li>
-      <label class="label02">缺评扣分：&nbsp;</label>
-      <%= select_tag :absence_penalty,options_for_select(absence_penalty_option,homework.homework_detail_manual.absence_penalty), {:class => "fl mb10 h26 w70"}  %>
-      <span class="fl mt5">&nbsp;分</span>
-      <p class="ml5 fl mt5">学生漏评1个作品将扣<span class="c_red" id="absence_penalty_notice">&nbsp;<%= homework.homework_detail_manual.absence_penalty%>&nbsp;</span>分</p>
-      <div class="cl"></div>
-    </li>
-  </ul> <!-- h1 end--->
-</div><!--hwork_new_set end-->
\ No newline at end of file
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
deleted file mode 100644
index 829905327..000000000
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ /dev/null
@@ -1,193 +0,0 @@
-<ul class="hwork_new_basic">
-  <li >
-    <label class="label02 mb20">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:field_name)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
-    <p id="homework_name_span" class="c_red ml110"></p>
-  </li>
-  <div class="cl"></div>
-  <li >
-    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-      <% else %>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </li>
-  <div class="cl"></div>
-  <li class="mt10">
-    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
-    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
-  </li>
-  <div class="cl"></div>
-  <li class="fl">
-    <label class="label02">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
-    <div class="cl"></div>
-  </li>
-  <li class="fl ml100" style="display: none;">
-    <label class="label02">&nbsp;发布日期：&nbsp;</label>
-    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
-    <%= calendar_for('homework_publish_time')%>
-    <div class="cl"></div>
-  </li>
-
-  <li>
-    <label class="label02">迟交扣分：&nbsp;</label>
-    <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
-    <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-    <span class="fl mt5">&nbsp;分</span>
-    <div class="cl"></div>
-  </li>
-</ul><!--hwork_new_basic end--->
-
-<div class="cl"></div>
-<div class="hwork_new_set">
-  <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
-  <div class="cl"></div>
-  <ul>
-    <li >
-      <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70",:onchange => "homework_language_change($(this));"}  %>
-      <div class="cl"></div>
-    </li>
-
-    <li >
-      <label class="label02">评分比例：&nbsp;</label>
-      <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
-      <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
-      <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
-      <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_programing.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
-      <span class="ml5 fl mt5">×&nbsp;系统评分</span>
-      <span class="ml5 fl mt5">=&nbsp;学生得分</span>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <label class="label02" >&nbsp;&nbsp;</label>
-      <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
-      <div class="cl"></div>
-    </li>
-
-    <li >
-      <label class="label02">&nbsp;标准代码：&nbsp;</label>
-      <textarea  name="standard_code"  class=" w547 h400 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || c_stantard_code_teacher%></textarea>
-      <div class="cl"></div>
-    </li>
-
-    <% if edit_mode %>
-        <% homework.homework_tests.each do |homework_test|%>
-            <div>
-              <li>
-                <label class="label02">&nbsp;测试输入：&nbsp;</label>
-                <input type="text" class="fl h26 w190 mb10" name="input[<%= homework_test.id%>]" value="<%= homework_test.input%>"/>
-              </li>
-              <li >
-                <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-                <input type="text" class="fl h26 w190  mb10" name="output[<%= homework_test.id%>]" value="<%= homework_test.output%>"/>
-              </li>
-              <li>
-                <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-                <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-                <% if homework_test.result && !homework_test.result.to_s.empty?%>
-                    <% if homework_test.result == 0%>
-                        <a class="green_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">正确</a>
-                    <% else%>
-                        <a class="red_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">错误</a>
-                    <% end%>
-                <% else%>
-                    <a class="blue_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
-                <% end%>
-                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  value="<%= homework_test.result%>"/>
-              </li>
-              <div class="cl"></div>
-            </div>
-        <% end%>
-    <% else %>
-        <div>
-          <li>
-            <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w190 mb10" name="input[0]" value="1 2"/>
-          </li>
-          <li >
-            <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w190  mb10" name="output[0]" value="3"/>
-          </li>
-          <li>
-            <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-            <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-            <a class="blue_btn fl ml5 mt programing_test" onclick="programing_test('0')" id="test_send_0">测试</a>
-            <input type="hidden"  id="test_result_0" name="result[0]"  />
-          </li>
-          <div class="cl"></div>
-        </div>
-    <% end %>
-    <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
-    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg && !homework.homework_tests.first.error_msg.empty? ? "block" : "none"%>">
-      <tbody>
-      <tr class="border_t" >
-        <td  class="td_end fb c_red w60 td_board_left">
-          错误信息:
-        </td>
-        <td  class="td_end wl" id="homework_work_test_desc">
-          <% if  homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg %>
-            <%= homework.homework_tests.first.error_msg%>
-          <% end%>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </ul>
-</div>
-
-<script type="text/javascript">
-
-    //点击测试，发送
-    function programing_test(obj) {
-        $.post(
-                '<%= programing_test_homework_common_index_path%>',
-                {
-                    src: $("textarea[name='standard_code']").val(),
-                    input: $("input[name='input[" + obj +"]']").val(),
-                    output: $("input[name='output[" + obj + "]']").val(),
-                    language: $("select[name='language']").val(),
-                    index: obj
-                },
-                function (data) {
-
-                }
-        );
-    }
-
-    function init_programing_test()
-    {
-        $(".programing_test").each(function(){
-            $(this).removeClass("green_btn red_btn").addClass("blue_btn").text("测试");
-            $(this).next("input").val("");
-        });
-    }
-
-    function homework_language_change(obj)
-    {
-        if(obj.val() == "1")
-        {
-//            alert(1);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher%>");
-
-        }
-        else if(obj.val() == "2")
-        {
-//            alert(2);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher_%>");
-
-        }
-    }
-</script>
\ No newline at end of file
diff --git a/app/views/homework_common/_new_homework_detail_manual_form.html.erb b/app/views/homework_common/_new_homework_detail_manual_form.html.erb
deleted file mode 100644
index af5a8bf50..000000000
--- a/app/views/homework_common/_new_homework_detail_manual_form.html.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="homepageRight">
-  <div class="HomeWork">
-    <div class="RightBanner">
-      <div class="NewsBannerName">发布作业</div>
-    </div>
-    <div class="HomeWorkCon">
-        <div class="mt15">
-            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
-        </div>
-        <div class=" mt10">
-            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
-                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
-                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
-                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
-            <div class="cl"></div>
-        </div>
-        <div class="mt10">
-        <% if edit_mode %>
-            <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-        <% else %>
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-        <% end %>
-        </div>
-        <div class="mt10">
-            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
-        </div>
-        <div class="mt5">
-            <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20">上传附件</a>
-            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-            <div class="cl"></div>
-        </div>
-        
-        <div class="mt10">
-            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
-            <div class="DropLine"></div>
-            <div class="cl"></div>
-        </div>
-        <div class="advanced_option" style="display:none;">
-          <div class="mt10">
-              <select class="InputBox W120" required="true">
-                  <option value="语言选择">语言选择</option>
-                  <option value="C语言">C语言</option>
-                  <option value="C++">C++</option>
-                </select>
-          </div>
-          
-          <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-              <div class="cl"></div>
-          </div>
-        </div>
-        <div class="mt10">
-            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
-            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
-            <div class="cl"></div>
-        </div>
-    </div>
-  </div><!----HomeWork end-->
-  
-</div>
-
-<script id="t:test-answer-list" type="text/html">
-  <div class="mt10">
-      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-      <div class="cl"></div>
-  </div>
-</script>
-
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
deleted file mode 100644
index 6fc0fff0e..000000000
--- a/app/views/homework_common/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
-<div class="hwork_new">
-  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-      <%= hidden_field_tag "course",@course.id%>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-  <% end%>
-</div><!--hwork_new end-->
-<div class="cl"></div>
diff --git a/app/views/homework_common/next_step.html.erb b/app/views/homework_common/next_step.html.erb
deleted file mode 100644
index 7ed852fea..000000000
--- a/app/views/homework_common/next_step.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
-<% if @homework_type == "1"%>
-    <div class="hwork_new">
-      <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-          <%= hidden_field_tag "course",@course.id%>
-          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-<% elsif @homework_type == "2"%>
-    <div class="hwork_new">
-      <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-          <%= hidden_field_tag "course",@course.id%>
-          <%= hidden_field_tag "homework_common[homework_type]","2"%>
-          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-    <div class="cl"></div>
-<% end%>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index b19125ec6..6e07e7122 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -21,14 +21,6 @@
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
     </div>
-    <div class="calendar_div fl ml10">
-      <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>"  >
-      <%= calendar_for('evaluation_start_time')%>
-    </div>
-    <div class="calendar_div fl ml10">
-      <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>"  >
-      <%= calendar_for('evaluation_end_time')%>
-    </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>

From b5af66ffc283c223f156c3c182c706db16109d94 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 09:58:31 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84js=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/new_user.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 95d85e48c..fb71d75db 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -63,12 +63,12 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
-    else if(!regex_evaluation_start()){
-        $("#evaluation_start_time").focus()
-    }
-    else if(!regex_evaluation_end()){
-        $("#evaluation_end_time").focus()
-    }
+    //else if(!regex_evaluation_start()){
+    //    $("#evaluation_start_time").focus()
+    //}
+    //else if(!regex_evaluation_end()){
+    //    $("#evaluation_end_time").focus()
+    //}
     else if(!regex_course_id()){
         $("#course_id").focus();
     }

From afb1a8f53f7e83680086718c27cf20bbdcb631a5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 23 Sep 2015 09:59:23 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=8C=89=E9=92=AE=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/users/_course_message.html.erb       | 2 +-
 app/views/users/_course_news.html.erb          | 2 +-
 app/views/users/_project_issue.html.erb        | 2 +-
 app/views/users/_project_message.html.erb      | 2 +-
 public/javascripts/init_activity_KindEditor.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index bed895ee8..fd9ae05e8 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -107,7 +107,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 97f0acb69..99e85fc73 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -77,7 +77,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index e8bac335c..0b86dc3eb 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -121,7 +121,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 32468f9a0..2856d6ed1 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -92,7 +92,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index c9d8189c2..decbbb341 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -48,7 +48,7 @@ function init_editor(params){
         },
 
         afterCreate:function(){
-            params.submit_btn.hide();
+            //params.submit_btn.hide();
             var toolbar = $("div[class='ke-toolbar']",params.div_form);
             toolbar.css('width',24);
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');

From 9d474d65281ba0d37a5f32542a52f06a77f9dc61 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 13:54:36 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_set_evalutation_att.html.erb             | 44 +++++++++++++++++++
 app/views/users/_user_homework_list.html.erb  |  3 ++
 app/views/users/user_homeworks.html.erb       |  9 +++-
 public/stylesheets/new_user.css               | 11 +++--
 4 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 app/views/homework_common/_set_evalutation_att.html.erb

diff --git a/app/views/homework_common/_set_evalutation_att.html.erb b/app/views/homework_common/_set_evalutation_att.html.erb
new file mode 100644
index 000000000..1ad8188ef
--- /dev/null
+++ b/app/views/homework_common/_set_evalutation_att.html.erb
@@ -0,0 +1,44 @@
+<div class="markPopup" id="popbox02">
+  <span class="uploadText">匿评设置</span>
+  <div class="cl"></div>
+
+  <div class="mt15">
+    <span class="f14 fontGrey3 fl mt5">开启匿评</span>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly"/>
+      <%= calendar_for('evaluation_start_time')%>
+    </div>
+  </div>
+
+  <div class="cl"></div>
+
+  <div class="mt15">
+    <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" />
+      <%= calendar_for('evaluation_end_time')%>
+    </div>
+  </div>
+  <div class="cl"></div>
+
+  <div class="mt15">
+    <span class="f14 fontGrey3 mr10 fl mt5">匿评人数</span>
+    <input type="text" name="" placeholder="默认匿评人数为3" class="markInput fl" />
+  </div>
+  <div class="cl"></div>
+
+  <div class="mb20">
+    <span class="f14 fontGrey3 mr10">禁用匿评</span>
+    <input type="checkbox" />
+    <span class="f12 c_red ml10">禁用后将无法进行学生互评</span>
+  </div>
+  <div class="cl"></div>
+
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText">确定</a></div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+    </div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index cd596e22b..61c9ff8a0 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -60,6 +60,9 @@
                       <li>
                         <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                       </li>
+                      <li>
+                        <a href="javascript:void(0)" class="postOptionLink" onclick="set_evaluation_att();">匿评设置</a>
+                      </li>
                       <li>
                         <%= homework_anonymous_comment homework_common %>
                       </li>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index a169be166..b6f4dd7e0 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -8,8 +8,13 @@
       $("#homework_editor").toggle();
   }
 
-  function checkAllBox(doc){
-
+  function set_evaluation_att(){
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+      showModal('ajax-modal', '350px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+      "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+      $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
   }
 </script>
 <div class="homepageRightBanner mb10">
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e049e029..006947928 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -58,6 +58,12 @@ h4{ font-size:14px; color:#3b3b3b;}
 .clearfix{clear:both;zoom:1}
 .break_word{ word-break:break-all; word-wrap: break-word;}
 .white_space{white-space:nowrap;}
+.fontGrey3 {color:#484848;}
+a.linkGrey6 {color:#484848 !important;}
+a.linkGrey6:hover {color:#ffffff !important;}
+.markPopup {width:290px; height:auto;  padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;}
+.markInput {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:140px; color:#3d3c3c;}
+.markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;}
 
 /* Spacing */
 .ml2{ margin-left:2px;}
@@ -527,7 +533,7 @@ a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
 a.newsRed {color:red;}
-a.newsRed:hovor {color:#888888;}
+a.newsRed:hover {color:#888888;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.replyGrey1 {color:#888888;}
@@ -768,9 +774,6 @@ div.modal {
 .ui-widget {
     font-family: Verdana, sans-serif;
     font-size: 1.1em;
-    width: 200px;
-    height: 14px;
-    background: #e2e2e2;
 }
 .ui-dialog .ui-dialog-content {
     position: relative;

From fa13ccfaa8c509b45708caf23357460ca91ed674 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 15:44:48 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 132 ++++--------------
 .../_set_evalutation_att.html.erb             |  83 ++++++-----
 .../set_evaluation_attr.js.erb                |   1 +
 .../start_evaluation_set.js.erb               |   6 +
 app/views/users/_user_homework_list.html.erb  |   2 +-
 app/views/users/user_homeworks.html.erb       |   9 --
 config/routes.rb                              |   2 +
 public/javascripts/new_user.js                |  57 ++++++--
 public/stylesheets/new_user.css               |   3 +-
 9 files changed, 131 insertions(+), 164 deletions(-)
 create mode 100644 app/views/homework_common/set_evaluation_attr.js.erb
 create mode 100644 app/views/homework_common/start_evaluation_set.js.erb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 41d302829..00d814bd3 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -5,9 +5,9 @@ class HomeworkCommonController < ApplicationController
   layout "base_courses"
 
   include StudentWorkHelper
-  before_filter :find_course, :only => [:index,:new,:create,:next_step]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+  before_filter :find_course, :only => [:index,:new,:create]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -23,116 +23,11 @@ class HomeworkCommonController < ApplicationController
   #新建作业，在个人作业列表创建作业
   def new
     render_404
-    # @homework_type = "1"
-    #
-    # @homework = HomeworkCommon.new
-    # @homework.safe_attributes = params[:homework_common]
-    # @homework.late_penalty = 2
-    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-    #
-    # if @homework_type == "1"
-    #   #匿评作业相关属性
-    #   @homework_detail_manual = HomeworkDetailManual.new
-    #   @homework_detail_manual.ta_proportion = 0.6
-    #   @homework_detail_manual.absence_penalty = 2
-    #   @homework_detail_manual.evaluation_num = 3
-    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    #   @homework.homework_detail_manual = @homework_detail_manual
-    # elsif @homework_type == "2"
-    #   #编程作业相关属性
-    #   @homework_detail_programing = HomeworkDetailPrograming.new
-    #   @homework.homework_detail_programing = @homework_detail_programing
-    # end
-    # respond_to do |format|
-    #   format.html
-    # end
   end
 
   #新建作业，在个人作业列表创建作业
   def create
     redirect_to user_homeworks_user_path(User.current.id)
-    # if params[:homework_common]
-    #   homework = HomeworkCommon.new
-    #   homework.name = params[:homework_common][:name]
-    #   homework.description = params[:homework_common][:description]
-    #   homework.end_time = params[:homework_common][:end_time]
-    #   homework.publish_time = params[:homework_common][:publish_time]
-    #   homework.homework_type = params[:homework_common][:homework_type]
-    #   homework.late_penalty = params[:late_penalty]
-    #   homework.user_id = User.current.id
-    #   homework.course_id = @course.id
-    #
-    #   homework.save_attachments(params[:attachments])
-    #   render_attachment_warning_if_needed(homework)
-    #
-    #   if homework.homework_type == 2
-    #     homework_detail_programing = HomeworkDetailPrograming.new
-    #     homework_detail_programing.language = params[:language]
-    #     homework_detail_programing.standard_code = params[:standard_code]
-    #     homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-    #     question = {title:homework.name,content:homework.description}
-    #     question[:input] = []
-    #     question[:output] = []
-    #     if params[:input] && params[:output] && params[:result]
-    #       params[:input].each do |k,v|
-    #         if params[:output].include? k
-    #           homework_test = HomeworkTest.new
-    #           homework_test.input = v
-    #           homework_test.output = params[:output][k]
-    #           homework_test.result = params[:result][k]
-    #           homework_test.error_msg = params[:error_msg]
-    #           homework.homework_tests << homework_test
-    #           question[:input] << homework_test.input
-    #           question[:output] << homework_test.output
-    #         end
-    #       end
-    #     end
-    #
-    #     # uri = URI('http://192.168.80.21:8080/api/questions.json')
-    #     # body = question.to_json
-    #     # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-    #     #   request                 = Net::HTTP::Post.new(uri.path)
-    #     #   request.body            = body
-    #     #   request["Content-Type"] = "application/json"
-    #     #   client.request(request)
-    #     # end
-    #     # result = JSON.parse(res.body)
-    #     # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
-    #
-    #     homework.homework_detail_programing = homework_detail_programing
-    #   else
-    #     #匿评作业相关属性
-    #     homework_detail_manual = HomeworkDetailManual.new
-    #     homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-    #     homework_detail_manual.comment_status = 1
-    #     homework_detail_manual.evaluation_start = params[:evaluation_start]
-    #     homework_detail_manual.evaluation_end = params[:evaluation_end]
-    #     homework_detail_manual.evaluation_num = params[:evaluation_num]
-    #     homework_detail_manual.absence_penalty = params[:absence_penalty]
-    #     homework.homework_detail_manual = homework_detail_manual
-    #   end
-    #
-    #   if homework.save
-    #     homework_detail_programing.save if homework_detail_programing
-    #     homework_detail_manual.save if homework_detail_manual
-    #     respond_to do |format|
-    #       format.html {
-    #         flash[:notice] = l(:notice_successful_create)
-    #         redirect_to homework_common_index_path(:course => @course.id)
-    #       }
-    #     end
-    #     return
-    #   end
-    # end
-    #
-    # respond_to do |format|
-    #   format.html {
-    #     flash[:notice] = l(:notice_failed_create)
-    #     redirect_to new_homework_common_path(:course => @course.id)
-    #   }
-    # end
   end
 
   def edit
@@ -294,6 +189,27 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #启动匿评参数设置
+  def start_evaluation_set
+
+  end
+
+  #设置匿评参数
+  def set_evaluation_attr
+    if @homework_detail_manual
+      unless params[:evaluation_start].to_s == @homework_detail_manual.evaluation_start.to_s
+        @homework_detail_manual.evaluation_start = params[:evaluation_start]
+      end
+
+      unless @homework_detail_manual.evaluation_end.to_s == params[:evaluation_end].to_s
+        @homework_detail_manual.evaluation_end = params[:evaluation_end]
+      end
+
+      @homework_detail_manual.evaluation_num = params[:evaluation_num]
+      @homework_detail_manual.save
+    end
+  end
+
   private
   #获取课程
   def find_course
diff --git a/app/views/homework_common/_set_evalutation_att.html.erb b/app/views/homework_common/_set_evalutation_att.html.erb
index 1ad8188ef..01d9351ee 100644
--- a/app/views/homework_common/_set_evalutation_att.html.erb
+++ b/app/views/homework_common/_set_evalutation_att.html.erb
@@ -1,44 +1,53 @@
 <div class="markPopup" id="popbox02">
-  <span class="uploadText">匿评设置</span>
-  <div class="cl"></div>
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id},:method => "post",:remote => true) do |f|%>
+      <span class="uploadText">匿评设置</span>
+      <div class="cl"></div>
 
-  <div class="mt15">
-    <span class="f14 fontGrey3 fl mt5">开启匿评</span>
-    <div class="calendar_div fl ml10">
-      <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly"/>
-      <%= calendar_for('evaluation_start_time')%>
-    </div>
-  </div>
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">开启匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_start%>"/>
+          <%= calendar_for('evaluation_start_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_start_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
 
-  <div class="cl"></div>
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_end%>"/>
+          <%= calendar_for('evaluation_end_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_end_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
 
-  <div class="mt15">
-    <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
-    <div class="calendar_div fl ml10">
-      <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" />
-      <%= calendar_for('evaluation_end_time')%>
-    </div>
-  </div>
-  <div class="cl"></div>
+      <div class="mt15 mb10">
+        <span class="f14 fontGrey3 mr10 fl mt5">匿评人数</span>
+        <input type="text" name="evaluation_num" id="evaluation_num" placeholder="默认匿评人数为3" maxlength="2" class="markInput fl" value="<%= @homework_detail_manual.evaluation_num%>"/>
+        <div class="cl"></div>
+        <p id="evaluation_num_notice" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
 
-  <div class="mt15">
-    <span class="f14 fontGrey3 mr10 fl mt5">匿评人数</span>
-    <input type="text" name="" placeholder="默认匿评人数为3" class="markInput fl" />
-  </div>
-  <div class="cl"></div>
+      <div class="mb20 none">
+        <span class="f14 fontGrey3 mr10">禁用匿评</span>
+        <input type="checkbox" />
+        <span class="f12 c_red ml10">禁用后将无法进行学生互评</span>
+      </div>
+      <div class="cl"></div>
 
-  <div class="mb20">
-    <span class="f14 fontGrey3 mr10">禁用匿评</span>
-    <input type="checkbox" />
-    <span class="f12 c_red ml10">禁用后将无法进行学生互评</span>
-  </div>
-  <div class="cl"></div>
-
-  <div>
-    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText">确定</a></div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
-    </div>
-  </div>
-  <div class="cl"></div>
+      <div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="submit_set_evaluation_attr('<%= @homework.end_time%>');">确定</a>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+        </div>
+      </div>
+      <div class="cl"></div>
+  <% end%>
 </div>
\ No newline at end of file
diff --git a/app/views/homework_common/set_evaluation_attr.js.erb b/app/views/homework_common/set_evaluation_attr.js.erb
new file mode 100644
index 000000000..d6ab73df5
--- /dev/null
+++ b/app/views/homework_common/set_evaluation_attr.js.erb
@@ -0,0 +1 @@
+clickCanel();
\ No newline at end of file
diff --git a/app/views/homework_common/start_evaluation_set.js.erb b/app/views/homework_common/start_evaluation_set.js.erb
new file mode 100644
index 000000000..9d494f908
--- /dev/null
+++ b/app/views/homework_common/start_evaluation_set.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+showModal('ajax-modal', '350px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 61c9ff8a0..2fc2304d1 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -61,7 +61,7 @@
                         <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                       </li>
                       <li>
-                        <a href="javascript:void(0)" class="postOptionLink" onclick="set_evaluation_att();">匿评设置</a>
+                        <%= link_to "匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true%>
                       </li>
                       <li>
                         <%= homework_anonymous_comment homework_common %>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index b6f4dd7e0..a37709b69 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -7,15 +7,6 @@
       homework_description_editor.html("");
       $("#homework_editor").toggle();
   }
-
-  function set_evaluation_att(){
-      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
-      showModal('ajax-modal', '350px');
-      $('#ajax-modal').siblings().remove();
-      $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-      "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-      $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
-  }
 </script>
 <div class="homepageRightBanner mb10">
   <div class="NewsBannerName">作业</div>
diff --git a/config/routes.rb b/config/routes.rb
index 409a04b20..ba6d161c2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -101,6 +101,8 @@ RedmineApp::Application.routes.draw do
       get 'start_anonymous_comment'
       get 'stop_anonymous_comment'
       get 'alert_anonymous_comment'
+      get 'start_evaluation_set'
+      post 'set_evaluation_attr'
     end
     collection do
       post 'next_step'
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index fb71d75db..86456bd8a 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -136,18 +136,36 @@ function search_homework_by_name(url){
     );
 }
 
+//提交匿评参数设置
+function submit_set_evaluation_attr(end_time){
+    if(!regex_evaluation_start(end_time)){
+        $("#evaluation_start_time").focus();
+    }
+    else if(!regex_evaluation_end()){
+        $("#evaluation_end_time").focus();
+    }
+    else if(!regex_evaluation_num()){
+        $("#evaluation_num").focus();
+    }
+    else{
+        $('#popbox02 form').submit();
+    }
+}
+
 //验证匿评开启时间：大于截止时间,或者为空
-function regex_evaluation_start(){
+function regex_evaluation_start(end_time){
     var evaluation_start = $.trim($("#evaluation_start_time").val());
     if(evaluation_start == ""){
-        return true;
+        $("#homework_evaluation_start_time").text("开启匿评日期不能为空");
+        return false;
     }
-    var end_time = new Date($.trim($("#homework_end_time").val()));
+    var end_time = new Date(end_time);
     var evaluation_start_time = new Date(evaluation_start);
     if(evaluation_start_time > end_time){
+        $("#homework_evaluation_start_time").text("");
         return true;
     }else{
-        $("#homework_end_time_span").text("开启匿评日期必须大于截止日期");
+        $("#homework_evaluation_start_time").text("开启匿评日期必须大于截止日期");
         return false;
     }
 }
@@ -157,17 +175,40 @@ function regex_evaluation_end(){
     var evaluation_start = $.trim($("#evaluation_start_time").val());
     var evaluation_end = $.trim($("#evaluation_end_time").val());
     if(evaluation_end == ""){
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能为空");
         return true;
-    }else if(evaluation_start == ""){
-        $("#homework_end_time_span").text("开启匿评日期为空时，关闭匿评日期必须为空");
-        return false;
     }
     var evaluation_start_time = new Date(evaluation_start);
     var evaluation_end_time = new Date(evaluation_end);
     if(evaluation_end_time > evaluation_start_time){
+        $("#homework_evaluation_end_time").text("");
         return true;
     }else{
-        $("#homework_end_time_span").text("关闭匿评日期必须大于开启匿评日期");
+        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        return false;
+    }
+}
+
+//验证匿评数量
+function regex_evaluation_num(){
+    var evaluation_num = $.trim($("#evaluation_num").val());
+    var regex = /^\d+$/;
+    if(evaluation_num==""){
+        $("#evaluation_num_notice").text("匿评人数不能为空");
+        return false;
+    }
+    else if(regex.test(evaluation_num)){
+        if(evaluation_num > 0){
+            $("#evaluation_num_notice").html("");
+            return true;
+        }
+        else{
+            $("#evaluation_num_notice").text("匿评人数必须为大于0");
+            return false;
+        }
+    }
+    else{
+        $("#evaluation_num_notice").text("匿评人数只能为数字");
         return false;
     }
 }
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 006947928..ed872936e 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -62,7 +62,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 a.linkGrey6 {color:#484848 !important;}
 a.linkGrey6:hover {color:#ffffff !important;}
 .markPopup {width:290px; height:auto;  padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;}
-.markInput {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:140px; color:#3d3c3c;}
+.markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:140px; color:#3d3c3c;}
 .markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;}
 
 /* Spacing */
@@ -109,6 +109,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .mb8 {margin-bottom:8px !important;}
 .mb10{ margin-bottom:10px !important;}
 .mb12 {margin-bottom:12px !important;}
+.mb15{margin-bottom: 15px;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .w20{ width:20px;}

From 7b37f3a9f40782308579b117067394fefec3d61b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 17:25:38 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/homework_evaluation.rake | 54 ++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 lib/tasks/homework_evaluation.rake

diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
new file mode 100644
index 000000000..691493dc8
--- /dev/null
+++ b/lib/tasks/homework_evaluation.rake
@@ -0,0 +1,54 @@
+#coding=utf-8
+
+namespace :homework_evaluation do
+  desc "start evaluation"
+  def get_assigned_homeworks(student_works, n, index)
+    student_works += student_works
+    student_works[index + 1 .. index + n]
+  end
+  #自动开启匿评的任务
+  task :start_evaluation => :environment do
+    homework_detail_manuals = HomeworkDetailManual.where("evaluation_start = '#{Date.today}'")
+    homework_detail_manuals.each do |homework_detail_manual|
+      homework_common = homework_detail_manual.homework_common
+      if homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
+        student_works = homework_common.student_works
+        if student_works && student_works.size >= 2
+          student_works.each_with_index do |work, index|
+            user = work.user
+            n = homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+          homework_detail_manual.update_column('comment_status', 2)
+          # 匿评开启消息邮件通知
+        else
+          #作业数小于2，启动失败
+        end
+      end
+    end
+  end
+
+  #自动关闭匿评的任务
+  task :end_evaluation => :environment do
+    homework_detail_manuals = HomeworkDetailManual.where("evaluation_end = '#{Date.today}'")
+    homework_detail_manuals.each do |homework_detail_manual|
+      homework_common = homework_detail_manual.homework_common
+      if homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
+        #计算缺评扣分
+        work_ids = "(" + homework_common.student_works.map(&:id).join(",") + ")"
+        homework_common.student_works.each do |student_work|
+          absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+          student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manuals.absence_penalty : 0
+          student_work.save
+        end
+        homework_detail_manual.update_column('comment_status', 3)
+        # 匿评关闭消息邮件通知
+      end
+    end
+  end
+end

From d727097ed2b69eb8dda9e78dbcc40012481beb0a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 23 Sep 2015 17:33:06 +0800
Subject: [PATCH 23/25] =?UTF-8?q?1=E3=80=81=E5=B7=B2=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=BB=A3=E7=A0=81=E6=B2=A1=E6=9C=89=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=202=E3=80=81?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E7=BB=93=E6=9D=9F=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                       | 2 +-
 app/views/homework_common/index.html.erb                | 4 ++--
 app/views/homework_common/stop_anonymous_comment.js.erb | 2 +-
 app/views/users/_user_homework_list.html.erb            | 2 +-
 lib/tasks/homework_evaluation.rake                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d7fac9a7d..e100a8fc9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2306,7 +2306,7 @@ module ApplicationHelper
       when 2
         link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
-        link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
+        # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
     else
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 4bf3d1781..8799bcab9 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -25,9 +25,9 @@
           ( <%= link_to homework.student_works.count, student_work_index_path(:homework => homework.id), :class => 'c_red'%> )
         </p>
         <% if @is_teacher%>
-            <%= homework_anonymous_comment(homework)%>
             <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework,:is_in_course => 1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
-            <%= link_to(l(:button_edit),edit_homework_common_path(homework,:is_in_course => 1), :class => "fr mr10 work_edit") %>
+            <%= link_to(l(:button_edit),edit_homework_common_path(homework,:is_in_course => 1), :class => "fr mr10 work_edit ml10") %>
+            <%= homework_anonymous_comment(homework)%>
         <% elsif @is_student%>
             <%= student_anonymous_comment homework %>
             <%= student_new_homework homework %>
diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb
index 3cbac1bf6..4725d5731 100644
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@@ -1,2 +1,2 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<a class="postOptionLink" title="匿评结束" href="javascript:void(0);">匿评结束</a>');
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
 alert('关闭成功');
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 2fc2304d1..89800b768 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -61,7 +61,7 @@
                         <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                       </li>
                       <li>
-                        <%= link_to "匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true%>
+                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
                       </li>
                       <li>
                         <%= homework_anonymous_comment homework_common %>
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 691493dc8..af833448d 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -1,7 +1,7 @@
 #coding=utf-8
 
 namespace :homework_evaluation do
-  desc "start evaluation"
+  desc "start and end evaluation"
   def get_assigned_homeworks(student_works, n, index)
     student_works += student_works
     student_works[index + 1 .. index + n]

From ad6fbf6c9bf6a752f631d8fae6152ee4f9ed6ad7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 24 Sep 2015 09:25:56 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=97=B6=E9=97=B4=E5=88=97=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=B1=95=E5=BC=80=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_un_work.html.erb | 38 ++++++++++---------
 public/javascripts/course.js                  | 11 ++++++
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index bc9fe2e00..ff2420a1a 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -3,27 +3,29 @@
   <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
     <ul>
       <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%>
-        <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>
-      <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%>
-          </li>
-        </ul>
+        <%= link_to(image_tag(url_to_avatar(User.current),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
       </li>
+      <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+        <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%>
+          <div>
+            <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+          </div>
+        </li>
+        <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%>
+            </li>
+          </ul>
+        </li>
+      </div>
     </ul>
   </li>
-  <li class="hworkList130 c_grey">
+  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= 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>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index b471ea89e..07a149adb 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -975,3 +975,14 @@ $(function(){
 function new_homework_alert(){
     alert("您好！课程内直接发布作业的功能正在改进中，请直接点击\n顶部导航栏的“作业”向本课程发送作业。谢谢！如有问\n题，可参见帮助中心。");
 }
+
+function show_student_work(url){
+    $.get(
+        url,
+        {
+
+        },
+        function (data) {
+        }
+    );
+}

From f9f51557ddd72d232a84a4cdb7d1188616256068 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 24 Sep 2015 11:31:07 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb |  67 +++++++++++-----------
 app/views/layouts/_new_feedback.html.erb  |   3 +-
 public/images/sidebar_bg.png              | Bin 9114 -> 9913 bytes
 public/javascripts/feedback.js            |  65 +++++++--------------
 public/stylesheets/new_user.css           |  17 +++---
 public/stylesheets/public.css             |  18 +++---
 6 files changed, 73 insertions(+), 97 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 07f852914..9fe25ce95 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -1,9 +1,9 @@
 <style type="text/css">
     html{ overflow-x:hidden;}
-    .scrollsidebar{ position:fixed;bottom:1px; right:1px; background:none; }
+    .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
     .side_content{width:154px; height:auto; overflow:hidden; float:left; }
     .side_content .side_list {width:154px;overflow:hidden;}
-    .show_btn{ width:0; height:112px; overflow:hidden; float:left;margin-top: 200px; cursor:pointer;}
+    .show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;}
     .show_btn span { display:none;}
     .close_btn{width:24px;height:24px;cursor:pointer;}
     .side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; }
@@ -13,21 +13,21 @@
     .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
     .close_btn span { display:none;}
     .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
-    .msgserver { margin:2px 0px 0px 4px; padding-top: 0px}
-    .msgserver a { padding-left:4px;}
-    .opnionText{ width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;}
-    .opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
-    .opnionButton:hover{background: #0fa9bb; }
-
-/* blue skin as the default skin */
-.side_title {background-position:-195px 0;}
-.side_center {background:url(/images/blue_line.png) repeat-y center;}
-.side_bottom {background-position:-195px -50px;}
- .close_btn {background-position:-44px 0;}
- .close_btn:hover {background-position:-66px 0;}
-.show_btn {background-position:-119px 0;}
- .msgserver a {color:#15bccf; }
- .msgserver a:hover { text-decoration:underline; }
+    .msgserver { margin:10px 0 0px 5px;}
+    .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; }
+    .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
+    a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;}
+    a.opnionButton:hover{background: #297fb8; }
+    /* blue skin as the default skin */
+    .side_title {background-position:-195px 0;}
+    .side_center {background:url(/images/blue_line.png) repeat-y center; }
+    .side_bottom {background-position:-195px -50px;}
+    .close_btn {background-position:-44px 0;}
+    .close_btn:hover {background-position:-66px 0;}
+    .show_btn {background-position:-119px 0;}
+    .msgserver a {color:#269ac9; }
+    .msgserver a:hover { text-decoration:underline; }
+    .closeSidebar {background:url(/images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;}
 </style>
 
 <head>
@@ -39,7 +39,7 @@
 			minStatue : true,
 			skin : 'blue',
 			durationTime : 1000
-        }
+        };
         var options = $.extend(defaults, options);
 
         this.each(function(){
@@ -56,13 +56,13 @@
 			if(options.minStatue == "true"){
 				$(".show_btn").css("float", options.float);
 				sideContent.css('width', 0);
-				show_btn.css('width', 25);
+				show_btn.css('width', 29);
 
 			}
 			//close
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
-            	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
+            	show_btn.stop(true, true).delay(300).animate({ width: '29px'},"fast");
             	cookiesave('minStatue','true','','','');
 			});
 			//show
@@ -83,14 +83,10 @@ $(function(){
 	$("#button1").click(function(){
 		myTips("<%= l(:label_feedback_success) %>","success");
 	});
-
 });
 
 function f_submit()
 {
-//    var subject = $("#memo_subject").val();
-//    var content = $("#memo_content_1").val();
-//    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
     $("#new_memo").submit();
 }
 
@@ -169,15 +165,15 @@ function cookieget(n)
             <div class="side_center">
                 <div class="custom_service">
                   <% get_memo %>
-                   <% if @public_forum %>
-				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-                      <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
-                      <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-                      <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-                      <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
-				  <% end %>
-          <% end %>
+                  <% if @public_forum %>
+                      <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
+                          <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+                          <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
+                          <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
+                          <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
+                          <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
+                      <% end %>
+                  <% end %>
                 </div>
                 <div class="msgserver">
                     <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
@@ -188,6 +184,9 @@ function cookieget(n)
             <div class="side_bottom"></div>
         </div>
     </div>
-    <div class="show_btn"><span><%= l(:label_submit)%></span></div>
+    <div class="show_btn">
+      <%= l(:label_submit)%>
+      <a href="#" class="closeSidebar"></a>
+    </div>
 </div>
 </body>
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index db0a3c3ee..136e49b37 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -30,6 +30,7 @@
     </div>
   </div>
   <div class="show_btn">
-    <span>在线客服</span>
+    <span><%= l(:label_submit)%></span>
+    <a href="javascript:void(0)" class="closeSidebar"></a>
   </div>
 </div>
diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png
index 2704727d7d7984e6fb748b28a35ee9e14cf25d84..9ceea0f9176902560fa21d8eddd17a372d761edd 100644
GIT binary patch
delta 7003
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

delta 6177
zcmYj#cQ~7E*naHQnpIV+4X<?Bt*Y%U)mE!IC?ZBxP%B0V!DCcuQ&iPnZRxUWCsvH2
zHB0Rvq!fvWDoM@n@&10_aeVnB$C2kw@;vu>pVxJs=Y_wSX<FXM4;<^fW^8m1GeMie
z2E5wH>0Ary`tn@ihG@=<W3K1pEG|DjO(?oKf%bSLz7l8z=ewg)Z#huy=b2J-CflAk
zA!|JqHF>l~&jX?ISr%8yFYQGlXnsadp0{`$73ucmg;u`glS7JveB%b;{fCmj_9)y|
z{7U?VHc#m3(U|$Eo52Et!$)ClYgq<jlp|zi@)^g94Le~B8%CIS?R!C?G7(SYAbL{Q
zATQX?b1)%TnBi12hcZ`_)NVm-$6-U?u=PemTy4kh*@Wo1tp&D@^xBRbqvKME{)(`?
zfPI~$KdPq})|3oY$~jqL3=Jx^pXf!5B^rc1UQI3}K!iB3K*Uhw1>y!Vo@ncMW`KQX
zlJjFdgeAzZ&bA1K)XA|5^<P4vzkOXycCj)jo^s*1(U1m?Izf!ImK>{tx7oCCnf(X6
zWH!S}*mPU3TtrJ~%zc;n+qW1iXTg20#&#c9;@B+5(j0Kh;gQ@=O)-y>4*IgutIemr
zFdP0syuuaWSXH>R$43^jDnjQC6K*P6qCeXX3>#_=r2VWz7%C%q$+1>15=^IrB0M5t
zCBg=f0CpyO8Alq%gA}%P^;ulk8gGyeQW`U>$|hYSF=Vo<%7_#9UIVc+y!5`PSy3@U
zBcey^&CW^2CGsUQ%y9D9XnYOtB7|Ne>+^f04k(i?6C(C}#rO0Xq~JI2e(lrJJi^*b
z(yx)(iddP_qpcoZQZX@B=xyDdBu=)ks`qo}@>p>+<3je-$XUeNh!nm@9}2zeOdX{L
zgx7aIMDCZ{POo-0Y@T^9wQDXKv<og4_k9H9j!_*#oB|bVwPb#z9`!|f_my|<tD({X
zLW1(LHi1`WI9o#`>8ZCULz4W3v&@HGUtEmn1Xt4_ie0lrMBpNnd~<=`M>m^ak;CAT
zxXw4;RXh=LHoqL@QCN@#`OX^x&As#F{lYVK^$icNmiPNSa{7|Hd2$s$pr28lhZ@AJ
z1>4<uRn~l5B<Vaa^Q)D|g^~UeVg&%htZF)5e>w4~PylH&<sjCe$)nM>i`Ob!>3E);
zh@L7Rmd?@*x=?-ubG)vpuIcaRdwXv+G}Kv3#g(jSyvvQR-=1S{<QsG)INoYKt_&AM
z)7?oHfth=L#>R@}jK>6w7~Y(Rklau!S4r2&xHsGj5#4~fa>TSdMCUp;1_8y?s0;ul
zhpgHCXBO6Yf$o8$X611nl^DI~8sb61-C4u!EmVn?o<6OsEWu}x8LTKHCp$aO6kJkq
zdzC2|Mogf~26ADw)KN5N`|RZ2=io`^_?=OPCz!vA3#Fk}xz0p5bT(+pVK_8$?L>Yx
z{$kU+2A-Jm$d?va<cB%nG0myyg0#=h<YCT^H_Ak~RT1DsGfAxNX#5E7_7o%S-p)%z
zjdW^`WvCsN&8q(tC52hPBsXwu2c@mA+uA?Tpd0=gcR6ggP1eBQPq~&L9f~iA%f8m>
z)0})*R&E>nZ*k^r&9@Y(otE2S9ohK&=2Lt?BKZBPjVIR20f4c65p@wdFlw-fcSFk{
zARs%IE-Q+{NDe%u?E#XV1a_9(YyP1W>FtSq#ZNhf1V_csVM%Yg`wNR9H>>P-)`=Pv
z3yB`>y-u;l#S&i?^I?_0XJT`Do>S^iTj5uZoLTqur0y94CVVt~Qa7Qtac2v$|4}(A
zP>w!Nt=9#LrzcxPKScjy&XcSGi)ZadHiZWU2sP^0xVlsfQt}H`Rp<jZ&`#5@I|VXr
zuk7fh-8$<O9Q^eKBkUVLxm;#Sk5kl+d{1KGHr)2{)Yf?J^5WYw%dU?YJnp&}T2%gb
zf-1wfWZ|Qd($-Z8Nhs_=odG8eqVK`wU8P)Pd7KKU_i(GMC;u?FM5rbY(jnfEx3K)(
zk*#OHkVN;!pkiu5Q53EC)ek)-m>FQir@N}xwc=Cr9s6go{0(n8(&5*O(P^QLHR7~j
zZrEr)(3`6{M-RDmE3UdECrK4O;RlVhL8NzHNfe5x$+ajL_Oj2?FBo}`ABue(UTiGE
zmJ3V^d+D8g)UT>UJ#CXglJRGIQ5+a;&?PR2EkMs;RIlb6Xq{s4AZ|!6zAZd)YgYL|
zOg&F!&5n4FLfzPVYtLkPISr4U?evWazJ0mmw**H*S2Nd+XyxBtx>G`4jLo+|4dlqS
z^{CAKm3-?Dxo#Cxoh4ZHahd>QxVb^E;waz~JckmR6sNg_-xW~V?|m+Uu&`X196LYC
zxlxhhb)FSntkZAe(&S|!5Mp#!pa}UYz7UR`&kaP*PhQ!PO;d8ciVIh$VX==@s*f)V
zln+b1ZjpQVw@S2-e?1{b!^6a#<x4sBM8w$q35rMKyGMe!x4#;;sneg0VM?~?(Fc~=
z!2Y6&9m<Q(m<ks_9u3zuD{)@s30F%%clKJ%oV4oKx=t_niKx$7FqiYCqVAWcO~qn2
zB#z`$+T=-l3p)8B{Z~6?nan5F6%?=B3?02CUmXJ0`mfdYi=zQF|5>Z;yK0DESx<`O
zXinDyk>C2A5vCGBAd5Z?wIt91+0>OsI6KZS_PizrP4#wpMoEh(9u_-t7cGWth0B!7
zXb6OAB3-KmBIT^#=-oMJQ=XwZ$aCA<L?roU(dN0Hbb#+Evs#WyptMS9w@!=%+4!2f
zw>q<j?UFuM#(xWyO6)V=1G@Gi*{o>eWzD&m`%k>=1(|X(Yis%LfLGIk(C^sjSo}vv
zzgFk$n(UK^8Hyz4@E$pic~3})jkZXC^Ifi>rYepbcu~>>S(gqh<p0fmSghDxhU8a9
zT^zj5k)$;%_}(l;4=GAgl7>%Th{!l`QO<3jcLrvOZlReu@Q@Pl>zO*)_eYr9d~GTv
zQr!f~gQ>~YJ0aHrO$WX8KLtu%v$jdQ92}uxX|ba}xQ>tFnhdW~FUlTLJRF3zQXGy6
z2APnbDV$cAHGgkm(i-h8dC|+q<!QH(rICGh?mLK-Zj(_<D6{HiSFV778IJKsHp{fU
z28~+1{D*7st_-4ByVi3+_;Fn8)R++IRn%$<DF3D<xL9Dr{Z5b_sS;}d9Fkrr{Vn=F
zFXY<`3pf1F9Vd9k+381#I%4qWo73{AOXLKrDB=_Ojl6CQp4dN!6vUdw(tnjxmiTTX
z^v{z<YXa{eFrH95mnIN%c!7(3hEJP&x8z!=@CVyfs2gGZ+Cql8L4Uv&{(Zp<I6`pY
zXI|zX7SOh98r(b6J0ugH%ar}WC*9#bZiBfjFT{GN!`^XM_1hYq5}fs&@v`zmF@5!W
z&vgfD+xDpUM^m+AqHTu{@0|b-s@!>Zv-pN?<C~La)CVQnwdX3-4UK1&VP0Knxi5Q7
zxROuzeMR;ik-C3NNkKzC8YIF|ACLJIX0^bS8(<e=8~)HgC236koA(Z8YQlNgZ-yp7
z?&*C~nvaW-x4uPR;xkF$tDR0;c|=KR&f!ZBmhBF#QR{b-3&bN>bFCR!ZU1__-%D^5
zDkV89ZKe2B!|X1ryhWuYU+;`H#cWPFEB#KJ(P?iJcTLhb9o_0#9dX6u=}^m1j{HoO
zB0zc|b4>ud@Y7CN&nw^}{jZi1bAISLltKm@v1ZNRk9zrTU7j1Lfs3qY@Zh0JuD5*L
z1~UJk#g&yk$G(Cs0+g2y5D?mUMsX1;p5^KXHa!V;54aA#zCq!)wNju+OuYhwR?o90
zxAZG%e4e!IckrqD3+)v6hd`aHEng8c@cAN(QTH3=2fI1<p|bDznt3z`Y3i-BZ$RP`
zlfuuedli$0`d-m`jHrEjjVD3Na=?PB-26m%O=UbNXXkvipFGB5dbgwAry5ZQq;`x_
zjlE<%`oBFKA}yVBd-U{=wP&VI*qFui_o=p2CcAImC=HXu0u+~yTrIv|Pr!fll_+bP
z=^ef+fd2Q2`}p`>o50N<Nio=L^yFtnSMxbvW|c@kWM)nPMcK4UO-r*F{Vr}pX)3RZ
zi}z~k;`)*~V!o{1Q|kRaQmS`IYHsji;E-E94kj?i4XCPn3YUu4XW3y$`U9i=uZnw|
z>c6*Tt!VlC15k%qTs*2a9K%!pO*ac<Du2+m4zQ0bH_GTvjlWA?6DijE@X8dK=D*NM
z;@{AS32q4a4rASz?dqJk7!rEU_tM<v8E|KMgPDRnD72F-*rH9?HKdz7Y<2Ljom>lI
z^xR_W)1OAniXWLpO)aj0%t_Rpo)aj4{V7JO7O1@gw{6cWJo~Yy_A_{e>!wmtR{J4>
z@FL&mFA{OIw-QsA%jL(~;Az?Yt%FeSiRnj*RJ^n;JM6*JQ6+#MC4mx0PFhEtV6Zbz
zFm5xYZ-Q<S?C|ydHL^mEBZC(?n8N#-CC&)uYJ{0uZMe)^(AC(#{sO1$rRb-^o&aZM
z0+scY@;ZeA*4(zSH2#E8(`K`0zww}%92|Q8d>PBVwZ->m!!)YA@I>N;ZEgIY_^D{y
zYLK0}dT+XX&2kd1b_aoaq=^YlD&76Zyz@1)&wtDY{~;#@%k6XXHX_{=RIh<UtP3SM
zKV%kLhos&TPz=TM&DjWZP-lUO5%bg)Pu!05_n;E^{n@u5-$2`RmRaQtQs-&6$lr`d
zW;n3VR0ihZg>5e6pPNPeG&Wb1Oqe+|A+mYYQJx{lm`R_kh#F5>!9@tLT*(Hef5Yxr
zO7!e))H>4_H?^XJn&F-?%ZZUXop}1?k<W=74o|CIc#w{aUNndR#>H3v@rmF5O<BV!
zmHNo8NBa51>&WNqA8Y+}&Qgj{weff?tS(J2ws)j4o+mnbq@+L3mY9;jUdZ3O97Fjh
z6igyYe=$>Iv-M?Po`iUs>D9cG5nM5JFaXWmIkfiJoWQ`MP(}OvRqgt4(;%T+HkAxY
zbrV=ZfdNd_ekb6TZCh^6B_|(gv0PF*9e}+IpKTKKH?4XIFSK`!8M@rwTo$Ygs-A^U
z^%GZitf;hqE?R9(6!lkYL{A*U$x=r$>lsS+t332Cq^(Wd^l|1kKT}MD<Q$VAh?>k=
zHQp4m1`DYG&S@5Mx31foKM_CU&czs4m^r)4=co-Z&}0w!k9nXRctk!rp>qwwL1XtT
zDc_sb8rg-^9j$z~f+imCQT@`Gu7pv!WZ$B^bkg+>x76AGxlB<F_s?|0G%LlpE?<HF
zLfFaolc8GJNUGX)5iD!|AY#s^m+l>ZtwMlBvDSI@IrVu+&m`H8Q3>CV+UOk#f=d9R
zSq&HHXME!8eV}2gV4F#bH@)I-W+4eW*h8|VsLwRoCutg$GBdNbToBjQnHnQW4bw5|
z)|SFd^OI&w^!AT2ZuT5@vQqpAdgEEyNH4?7J?nWLB!|Z1ab8@_&z7z<C$}T^KNU)y
z4OtnAT;pFI{*`(-B-?Y9{+&ip1oDMg;=f*1u%1Kh!&il;2a+h-3(8QKYaPIiQEQ=Q
zMcn$ri5j!&DX1_8NkxW|@ml@O$m;hFtt5GU`<1gDU=m~e#NUh%s%xxk3Vv4G5!PnC
zH@9MwaZh}~WJK48!FoaxDK!cTm%2M&bC=s|>mX0JhE)vP#&7tOfd@C3A-a<h-7o*M
zz}?GxndItA=}r;9B7o<?UKbZOE1VG*J*&lO@x<W~{}|#17@w0t$jY8?@Ho~TzGrN#
zpw}kDov0F<BNzY+_AzLi>DRSHYeX1R5fvrG=e68=vChnwa@_>S1vwJWj%=O64mdjq
z^8!<2GI0(7#|Afi;<4YY!y&1+r1my*;ztNBA|ls>k|XS2L;F0|)uuXh#2T2oC&qWr
z+_jXT&XJS({@vv0>Cjs1Xr3~3lwM|UaH-zf*WY~G$^Qo?`X`{^9y)SdAoRAo$S_xM
zbW>@-n2o)?`a^-+A|e^A**$HPOVnr?BmrW{XYT>rxT6D_q#F-#_v^p$4^TxLR@aF>
zoo|%W(L3vE&dkeT&c}hVP%Z)7E@+W`xUrz{WX$|fU-YP~)^nd?yZK&B<XSBX;H|t%
za-}p(yHsCyNDSUP$Q45WKQO(^;c7SkcUy_^j&l_+iLzalp%TO<o@maz$N^etHW>$X
zx-4Mqy?GJ}T@s_q_E;5_IR@UwT_BRx7@<AIYjPZ4=^hy%onzIy=fm9*hYq<OMV_8S
zJhkmRU8*x{tbzqY+ylTTZbQ7ZD=?p0g7ut{s08Zb;tEXbqB9mZ-imwY-SFGtBAz7M
zkahlFy%}(XKh6NA!u?-TQrUG>CmZ%2NK?&ErTo?0G_CIP8JqrAtSd!5Ygb%`@{MWh
zd#1PYs2Uen@MaM)+T<8xE5_hPX8l;qdUuXpnKRrmX7lR1LgjQ9mq|6s_zaIGhmUQw
zt5Zk6+0~}9UF(q?Rqz<(YnM3vhvHMP6Y@bn`DdtbV`E@Yhtv{qt*o=Svnj^8yPjK>
zLRpVY9K4kUCQW3<s1u!B1JOtoLT+w7BEt?fS9zbKCg`|&3s(O2^mJQiGxpBM|5%Fi
zd|27gz<J+W@W6*kutA|Oxo2g630iMQX5C>l9u&?;^jf+8&E<rmZP!=6U4&KU7QY1O
zrGfVkT?QA0{5tzI1vfTK>6AuL(03b8YHqU^53uUvuG-d+<`sk&sjj_E=63i?J^o|k
za{`Cl-;|9F^<{?TfN}XY_KHZZY<wdw?i9(TmEi0O|2YFbMu7y|!Fy+1TvxlswGW2I
z#-JyJLP32O5fQmvXLkLPzrW}-AW}+DO`I5n<|u%Jk#~G(*ry4NXLW;4iKPC<nkwE8
zy`+^I!U>@?CD`v{0W;ulW9n~UhPf6rOJ_&0Xd~HNFhHtJ_7eR3t*vbfP!b~7<d;(o
z_{J;MKb`53M-}9myfXp$1*zon$~TDnaMAd6S>6@EqJHRU+{bz4CBX4%cgx<i@OqXl
zGzjotSg-(h6Dhx2=XnVntvn14=G&y*$Wi_8wgI^7I5#TaY>BV`$Fe+da5N#vou8oU
zOg}v0pB2Uiy0zP*4RLX;2*pB%-b4}qdivh7L(kDlwMxol$iGRxf6FguqYnVcNCyMs
zJqcL>Is+&{<hyou-YG&DD}=fIn*%|fwyS$b|JFOZqYL8L-E9^SWo&$e{?eRggB-ML
zYdPVuiN2EBRx&;+={}5$ySimj+h9w(+%ehaF>P`Hv3q-lN5|->Wt}y0id_@5Tg#Fz
z_iQL@eI#knHChja_{G<P(;X@Y6zYC+3iu8C1Wt)ubS4>po*a0frdAU#cM;HG`x>>G
zgOsQ&Z8ZU52CE|Hyog9O$ps4k{2`~e2?7uOZyIwwHV5<zQj?*aTU%^(PS~?xRst)=
zq+|Zp!|CHePxK|Be$cLC$BqryXt9ZpUQGO}Vl{gTs;>4CZVysI`u}nQ7k7Xjcy+)t
z7$iw`@*ikUaud`6xXS-<=}0!K=EB8J{f$fHNkhpO9ETubL^iS!Ic72XSKXBM)Bk`a
zhI56oVUDs+m-q5BuanJ)Vnh$3rMBgNi>z>=9?k`b&zFW835+0$9e@N{N2-7@Tydtu
z5;uq@hECazi3@CfkTVgc=m}%vAAV_1KOJHn2go(D{gA$A{=Pv+#)N3>eQcX-Opbaq
zzX^CU>Ys}tnW_{jWFN94ApGo-G7pB+nyczT$8@v6xxv#%K(2SU`>B<mUS4aqb!ZFb
zwk{lkLBV|T6qeP3pyJdtD2eTt=v-up5lZv&kEaJ!H1|x_VYNMA$hBQsBf^FXhIGka
z#}2Bdn{xnXv$t8WQ8&GHJVB}w9}l)TcMo%OJ9wnWTiF?|Do5lOQ=l4hHa`K*+i-BF
zm-g!1+}r_2%~6w?S?iIP(`|mMKmuPw785U>AJXm<3O%j?4_}t9oh+(61%0XiLkaL(
z<Zfcq70TwT;)qn}l(20H*wZs?QHH)mf{VW~yp<GEcoA1#my4kUa)}i5zeufIaTH=4
zD;FC(blw^HwVzG7^TykHxym*05l@l+IZR3%kMYJ2N9|W^g!1~grAw(D)Zo?3t$jAg
Y@z#2ylEy1Z5b$-)#N4>_U&pBb0r7BKlK=n!

diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js
index 1bbab1f45..fb3b35ca7 100644
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@@ -5,7 +5,7 @@
             minStatue : true,
             skin : 'blue',
             durationTime : 1000
-        }
+        };
         var options = $.extend(defaults, options);
 
         this.each(function(){
@@ -13,17 +13,13 @@
             var thisBox = $(this),
                 closeBtn = thisBox.find('.close_btn' ),
                 show_btn = thisBox.find('.show_btn' ),
-                sideContent = thisBox.find('.side_content'),
-                sideList = thisBox.find('.side_list')
-                ;
+                sideContent = thisBox.find('.side_content');
             var defaultTop = thisBox.offset().top;	//????????top
-
             thisBox.css(options.float, 0);
             if(options.minStatue == "true"){
-                $(".show_btn").css("float", options.float);
+                show_btn.css("float", options.float);
                 sideContent.css('width', 0);
                 show_btn.css('width', 25);
-
             }
             //close
             closeBtn.bind("click",function(){
@@ -37,26 +33,12 @@
                 sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
                 cookiesave('minStatue','false','','','');
             });
-
-
-
         });	//end this.each
     };
 })(jQuery);
 
-
-$(function(){
-    $("#button1").click(function(){
-        myTips("<%= l(:label_feedback_success) %>","success");
-    });
-
-});
-
 function f_submit()
 {
-//    var subject = $("#memo_subject").val();
-//    var content = $("#memo_content").val();
-//    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
     $("#new_memo").submit();
 }
 
@@ -68,11 +50,8 @@ function cookiesave(n, v, mins, dn, path)
         if(!mins) mins = 365 * 24 * 60;
         if(!path) path = "/";
         var date = new Date();
-
         date.setTime(date.getTime() + (mins * 60 * 1000));
-
         var expires = "; expires=" + date.toGMTString();
-
         if(dn) dn = "domain=" + dn + "; ";
         document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
 
@@ -86,34 +65,31 @@ function cookieget(n)
         var c = ca[i];
         while (c.charAt(0)==' ') c = c.substring(1,c.length);
         if (c.indexOf(name) == 0){
-            return c.substring(name.length,c.length);}
-
+            return c.substring(name.length,c.length);
+        }
     }
     return false;
 }
 
 
 $(function(){
+    $(".closeSidebar").click(function(){
+        $(".show_btn").css("display","none");
+        $("#scrollsidebar").css("display","none");
+        return false;
+    });
+
     $("#button1").click(function(){
-        myTips("<%= l(:label_feedback_success) %>","success");
+        myTips("反馈成功","success");
     });
-});
 
-
-
-$(document).ready(function () {
-    $(function () {
-        $("#scrollsidebar").fix({
-            float: 'right',	//default.left or right
-            minStatue: cookieget('minStatue'),
-            skin: 'green',	//default.gray or blue
-            durationTime: 600
-        });
+    $("#scrollsidebar").fix({
+        float: 'right',	//default.left or right
+        minStatue: cookieget('minStatue'),
+        skin: 'green',	//default.gray or blue
+        durationTime: 600
     });
-});
 
-
-$(document).ready(function(){
     $("#subject").keydown(function(){
         var curLength=$("#subject").val().length;
         if(curLength>50){
@@ -123,8 +99,7 @@ $(document).ready(function(){
         else{
             $("#textCount").text(50-$("#subject").val().length)
         }
-    })
-    $("#subject").keyup(function(){
+    }).keyup(function(){
         var curLength=$("#subject").val().length;
         if(curLength>50){
             var num=$("#subject").val().substr(0,50);
@@ -133,5 +108,5 @@ $(document).ready(function(){
         else{
             $("#textCount").text(50-$("#subject").val().length)
         }
-    })
-})
\ No newline at end of file
+    });
+});
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index ed872936e..1022d5aa2 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -711,7 +711,7 @@ html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
 .side_content{width:154px; height:auto; overflow:hidden; float:left; }
 .side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;}
+.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;}
 .show_btn span { display:none;}
 .close_btn{width:24px;height:24px;cursor:pointer;}
 .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; }
@@ -721,20 +721,21 @@ html{ overflow-x:hidden;}
 .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
 .close_btn span { display:none;}
 .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
-.msgserver { margin-top:5px;}
-.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }
+.msgserver { margin:10px 0 0px 5px;}
+.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; }
 .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
-a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
-a:hover.opnionButton{background: #0fa9bb; }
+a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;}
+a.opnionButton:hover{background: #297fb8; }
 /* blue skin as the default skin */
 .side_title {background-position:-195px 0;}
 .side_center {background:url(../images/blue_line.png) repeat-y center; }
 .side_bottom {background-position:-195px -50px;}
-a.close_btn {background-position:-44px 0;}
-a:hover.close_btn {background-position:-66px 0;}
+.close_btn {background-position:-44px 0;}
+.close_btn:hover {background-position:-66px 0;}
 .show_btn {background-position:-119px 0;}
-.msgserver a {color:#15bccf; }
+.msgserver a {color:#269ac9; }
 .msgserver a:hover { text-decoration:underline; }
+.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;}
 
 
 /***** Ajax indicator ******/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d8285709f..3031a964e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -714,7 +714,7 @@ html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
 .side_content{width:154px; height:auto; overflow:hidden; float:left; }
 .side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;}
+.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;}
 .show_btn span { display:none;}
 .close_btn{width:24px;height:24px;cursor:pointer;}
 .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; }
@@ -724,21 +724,21 @@ html{ overflow-x:hidden;}
 .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
 .close_btn span { display:none;}
 .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
-.msgserver { margin-top:5px;}
-/*.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }*/
-.msgserver a {  padding-left:4px; height:21px; display:block; }
+.msgserver { margin:10px 0 0px 5px;}
+.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; }
 .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
-a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
-a:hover.opnionButton{background: #0fa9bb; }
+a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;}
+a.opnionButton:hover{background: #297fb8; }
 /* blue skin as the default skin */
 .side_title {background-position:-195px 0;}
 .side_center {background:url(../images/blue_line.png) repeat-y center; }
 .side_bottom {background-position:-195px -50px;}
-a.close_btn {background-position:-44px 0;}
-a:hover.close_btn {background-position:-66px 0;}
+.close_btn {background-position:-44px 0;}
+.close_btn:hover {background-position:-66px 0;}
 .show_btn {background-position:-119px 0;}
-.msgserver a {color:#15bccf; }
+.msgserver a {color:#269ac9; }
 .msgserver a:hover { text-decoration:underline; }
+.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;}
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}