From 05739931f3a1fcdfe46ef1a07ca3fc2e5afcb436 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 14:34:32 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 6 +++---
 app/views/users/user_homeworks.js.erb        | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index fc6e723f2..076383607 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -52,6 +52,6 @@
       </div>
     </div><!----HomeWork end-->
 <% end%>
-
-<input type="hidden" value="<%= page%>" />
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
\ No newline at end of file
+<% if homework_commons.count == 10%>
+    <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+<% end%>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb
index a2e778a21..b6703dd43 100644
--- a/app/views/users/user_homeworks.js.erb
+++ b/app/views/users/user_homeworks.js.erb
@@ -1,4 +1,2 @@
 $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>");
-<% if @homework_commons.count < 10%>
-    $(window).off("scroll", scrollHandler);
-<% end%>
+

From 9df301b4ccf554425c3befbefebe1c5ecd52f374 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 14:37:58 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 18125eaa9..906787070 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -60,7 +60,6 @@
         <% end %>
     <% end %>
 <% end %>
-<input type="hidden" value="<%= page%>"/>
 
 <% if user_activities.count == 10%>
     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>

From c8eb7804df2ca4ed59d3c3b401d0896e47dd3098 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 16:12:33 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E5=8F=91=E9=80=81=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84js=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb |  5 ++-
 public/javascripts/new_user.js               | 39 +++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 4a38e630b..7be8811a4 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -15,9 +15,12 @@
     <div class="calendar_div fl">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly"  >
       <%= calendar_for('homework_end_time')%>
+
     </div>
   </div>
   <div class="cl"></div>
+  <p id="homework_end_time_span" class="c_red mt5"></p>
+  <div class="cl"></div>
   <div id="homework_editor" style="display: none">
     <div class="mt10">
       <% if edit_mode %>
@@ -31,9 +34,9 @@
 
 
     <div class="mt10">
-      <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
       <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox  w720",:value => "请选择发布作业的课程"} %>
     </div>
+    <p id="homework_course_id_span" class="c_red mt5"></p>
     <div class="cl"></div>
 
     <div id="homework_attachments">
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index b5678e8b2..3607c3f09 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -62,8 +62,15 @@ function submit_homework(id)
     {
         $("#homework_name").focus();
     }
-    else
+    else if(!regex_homework_end_time())
     {
+        $("#homework_end_time").focus();
+    }
+    else if(!regex_course_id())
+    {
+        $("#course_id").focus();
+    }
+    else{
         homework_description_editor.sync();
         $("#"+id).submit();
     }
@@ -85,6 +92,36 @@ function regex_homework_name()
         return true;
     }
 }
+//验证截止时间
+function regex_homework_end_time()
+{
+    var name = $.trim($("#homework_end_time").val());
+    if(name=="")
+    {
+        $("#homework_end_time_span").text("截止时间不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_end_time_span").text("");
+        return true;
+    }
+}
+
+//验证发送到课程
+function regex_course_id(){
+    var course_id = $("#course_id").val();
+    if(course_id == -1)
+    {
+        $("#homework_course_id_span").text("发布课程不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_course_id_span").text("");
+        return true;
+    }
+}
 
 //老师导入作业时查询作业
 function search_homework_by_name(url){

From e360ea0bc746b09fc81c52bf60a727bd7c3bed5e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 16:34:03 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=BA50px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 906787070..77a494985 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -9,10 +9,11 @@
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
     .ke-inline-block{display: none;}
+    .ke-container{height: 50px !important;}
 </style>
 <% user_activities.each do |user_activity|
   if user_activities %>
-        <script>
+        <script>3
             function expand_reply(container,btnid){
                 var target = $(container);
                 var btn = $(btnid);
@@ -31,6 +32,7 @@
 
             $(function() {
                 init_KindEditor_data(<%= user_activity.id%>);
+//                $("iframe").css("height","50px");
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>

From 4259540f5366b604c2b7d9bffdb6215e39f30a98 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Wed, 2 Sep 2015 17:03:01 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css  | 11 ++++-------
 public/stylesheets/new_user.css |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index cd352e44d..5cd0b6418 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -484,10 +484,7 @@ blockquote img{max-width: 100%;}
 
 blockquote {
     /* font-style: italic; */
-    border-left: 1px solid #e0e0e0;
-    border-right: 1px solid #e0e0e0;
-    border-top: 1px solid #e0e0e0;
-    border-bottom: 1px solid #e0e0e0;
+    border:1px solid #d4d4d4;
     padding-left: 0.6em;
     padding-top: 0.6em;
     padding-right: 0.6em;
@@ -645,10 +642,10 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .hwork_code02{ width:60px; text-align:center;  }
 .hwork_tit_e{ width:420px; float:left; }
 .hwork_tit_e a{ width:405px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_num{ width:95px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_num{ width:90px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .mr18{ margin-right:18px;}
 a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-.hwork_name{ display:block;width:85px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name{ display:block;width:80px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .absence_penalty{ display:block;width:45px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .border_ce {border: 1px solid #e4e4e4;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
@@ -770,4 +767,4 @@ a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflo
 .ProResultUl span { display:block; float:left;}
 .ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
 .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
-.mb50{margin-bottom: 50px;}
+.mb50{margin-bottom: 50px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0a6ed8d79..e05be1c6a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -865,7 +865,7 @@ a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat;
 a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;}
 .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
 /*20150820编程作业 LB*/
-.W320{ width:320px;}
+.W320{ width:320px; max-width: 320px; min-width: 320px;}
 .icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
 a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
@@ -938,10 +938,7 @@ div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 
 blockquote {
     /* font-style: italic; */
-    border-left: 1px solid #e0e0e0;
-    border-right: 1px solid #e0e0e0;
-    border-top: 1px solid #e0e0e0;
-    border-bottom: 1px solid #e0e0e0;
+    border:1px solid #d4d4d4;
     padding-left: 0.6em;
     padding-top: 0.6em;
     padding-right: 0.6em;

From 45c54dabad7112efbe48b8f959ce40e06aa3d45f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 17:04:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/new.html.erb    | 19 ++++++++++---------
 app/views/users/_user_activities.html.erb |  5 ++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
index f5fb595e1..6fc0fff0e 100644
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@@ -1,16 +1,17 @@
-<% content_for :header_tags do %>
-  <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-  <%= javascript_include_tag 'homework','baiduTemplate' %>
-<% end %>
-
+<%= 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/new_homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <%= 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/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 77a494985..f1529ffb8 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -9,11 +9,11 @@
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
     .ke-inline-block{display: none;}
-    .ke-container{height: 50px !important;}
+    .ke-container{height: 40px !important;}
 </style>
 <% user_activities.each do |user_activity|
   if user_activities %>
-        <script>3
+        <script>
             function expand_reply(container,btnid){
                 var target = $(container);
                 var btn = $(btnid);
@@ -32,7 +32,6 @@
 
             $(function() {
                 init_KindEditor_data(<%= user_activity.id%>);
-//                $("iframe").css("height","50px");
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>

From 1fff00bab072ebdd73f39d964ab84ac5513944ee Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Wed, 2 Sep 2015 17:41:19 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8?=
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/assets/kindeditor/kindeditor.js    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index f622ad20c..a68aa7575 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -61,7 +61,7 @@
       <%if count > 2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              点击展开更多回复(<%= count.to_s%>)
+              展开更多
             </a>
           </div>
       <% end %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 7edc19681..b01bdb791 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -35,7 +35,7 @@
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              点击展开更多回复(<%= count.to_s%>)
+              展开更多
             </a>
           </div>
       <% end %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index a7a98a396..02a229d23 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -72,7 +72,7 @@
       <% if count > 2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              点击展开更多回复(<%= count.to_s %>)
+              展开更多
             </a>
           </div>
       <% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index ebf3d0ad2..7a6060433 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -49,7 +49,7 @@
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 98dfc470b..26cd088c4 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -3536,8 +3536,8 @@ function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
 		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
 		'<head><meta charset="utf-8" /><title></title>',
 		'<style>',
-		'html {margin:2px;padding:2px;}',
-		'body {margin:2px;padding:5px;}',
+		'html {margin:3px 5px;padding:0px;}',
+		'body {margin:0px;padding:0px;}',
 		'body, td {font:14px/1.5 "sans serif",tahoma,verdana,helvetica;}',
 		'body, p, div {word-wrap: break-word;}',
 		'p {margin:0 0;}',

From 6fdd3a8e86486b31d3f407adfc7e1559ae3945f7 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 2 Sep 2015 18:01:51 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_KindEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index fc02146bb..46aadb503 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -1,6 +1,6 @@
 function init_editor(params){
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
+        resizeType : 1,minWidth:"1px",width:"100%",minHeight:"25px",
         items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});