diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 1a0b9ca0d..3591a0168 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -119,7 +119,7 @@ module JournalsHelper
     content << textAreailizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
-    content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")
+    content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
   end
 
   def link_to_in_place_notes_editor(text, field_id, url, options={})
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 93969f71b..63876084d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -127,7 +127,7 @@
                                     :onmouseover =>"message_titile_show($(this),event)",
                                     :onmouseout => "message_titile_hide($(this))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
-                        <% if User.current.allowed_to?(:as_teacher,ma.course_message) %>
+                        <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
                             <p>
                               <%= User.current.lastname + User.current.firstname %>老师您好！
                               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
@@ -175,47 +175,22 @@
                               <%= User.current.lastname + User.current.firstname %>同学您好！
                               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
                             </p>
-
                             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-
                             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-
                             <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
-
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</span></p>
-
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-
-                            <p>
-                              请同学们抓紧时间提交自己的作品，谢谢！
-                            </p>
+                            <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
                         <% else %>
-                            <p><%= User.current.lastname + User.current.firstname %>老师您好！
-                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
-                              老师发布的作业截止日期快到了：</p>
-
-                            <p>课程名称：<%= ma.course_message.course.name %>
-                              (<%= ma.course_message.course.term %>)</p>
-
+                            <p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
+                            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-
                             <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</span></p>
-
-                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>
-                              @nbsp;@nbsp;24点</span></p>
-
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</span></p>
-
+                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-
-                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span>
-                            </p>
-
-                            <p>
-                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                            </p>
+                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
+                            <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
                         <% end %>
                       </div>
                       <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
@@ -240,14 +215,13 @@
                         </li>
                         <div style="display: none" class="message_title_red system_message_style">
                           <p>
-                            <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>
-                            您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：
+                            <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>您好！
+                            <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：
                           </p>
                           <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                           <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-
                           <p>
-                            匿评开启：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
+                            截止日期：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
                           </p>
                         </div>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -267,14 +241,11 @@
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
                             <p>
-                              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
+                              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
                             </p>
                             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                           </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
@@ -296,13 +267,12 @@
                                       :onmouseout => "message_titile_hide($(this))" %>
                         </li>
                         <div style="display: none" class="message_title_red system_message_style">
-                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败，作业详情如下：</p>
-                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                          <% unless ma.course_message.description.blank? %>
-                              <div class="fl"><strong>作业内容：</strong></div>
-                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                          <% end %>
+                          <p>
+                            <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
+                            <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败，作业详情如下：
+                          </p>
+                          <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                          <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                         </div>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                       </ul>
@@ -386,13 +356,8 @@
                                         :onmouseout => "message_titile_hide($(this))" %></a></li>
                             <div  style="display: none" class="message_title_red system_message_style" >
                               <%= ma.content.html_safe %>
-                              <p><strong>课程：</strong><%= ma.course.name %>
-                                (<%= ma.course.term %>)</p>
-                              <p><strong>作业标题：</strong><%=ma.course_message.student_work.homework_common.name %></p>
-                              <% unless ma.course_message.student_work.homework_common.description.blank? %>
-                                  <div class="fl"><strong>作业内容：</strong></div>
-                                  <div class="ml60"><%= ma.course_message.student_work.homework_common.description.html_safe %></div>
-                              <% end %>
+                              <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                              <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
                             </div>
                         <% end %>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -437,16 +402,12 @@
                                         :onmouseout => "message_titile_hide($(this))" %></a>
                           </li>
                           <div style="display: none" class="message_title_red system_message_style">
-                            <div class="fl"><strong>回复内容：</strong></div>
+                            <div class="fl">回复内容：</div>
                             <div class="ml60"><%= ma.course_message.notes  %></div>
-                            <div class="fl"><strong>您的作品评论：</strong></div>
-                            <div class="ml80"><%= ma.course_message.jour.comment  %></div>
-                            <p><strong>课程：</strong><%= ma.course.name %>(<%= ma.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%=ma.course_message.jour.student_work.homework_common.name %></p>
-                            <% unless ma.course_message.jour.student_work.homework_common.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.jour.student_work.homework_common.description.html_safe %></div>
-                            <% end %>
+                            <div class="fl">您的评论：</div>
+                            <div class="ml60"><%= ma.course_message.jour.comment  %></div>
+                            <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                            <p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
                           </div>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index ad3ad02fe..f1b6e1814 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -184,6 +184,14 @@ $(function(){
     $("#BluePopupBox").on('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
+        var inputs = document.getElementsByName("program[input][]");
+        var outputs = document.getElementsByName("program[output][]");
+        if (inputs.length == outputs.length) {
+            for (var i=0; i<inputs.length; i++) {
+                autoTextarea2(inputs[i], outputs[i]);
+                autoTextarea2(outputs[i], inputs[i]);
+            }
+        }
 
     });
     $("#BluePopupBox").on('click', 'a.icon_remove', function(){
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 4fd8d99d2..abf0bd628 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -139,7 +139,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
-a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
+a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
 .homepagePostReplyPortrait {float:left; width:33px;}
 .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
@@ -980,6 +980,4 @@ a:hover.c_grey{ color:#333;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}
-a.postOptionLink{float: right;color: #64bdd9;display: block;padding: 1px 5px;border: 1px solid #64bdd9;width: initial;}
-a:hover.postOptionLink {color: #fff;background: #64bdd9;}
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index b2001e465..2806a1dbe 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -168,6 +168,7 @@ a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px s
 a:hover.problem_pic{border:1px solid #64bdd9;}
 .issues_icon{ background:url(../images/public_icon.png) 0 -342px no-repeat; width:16px; height:21px;}
 .problem_txt{ width:600px; margin-left:10px; color:#777777;  }
+.problem_txt img {max-width:100%;}
 .pro_txt_w{width:610px;}
 a.problem_name{ color:#ff5722;max-width: 80px;
     overflow: hidden;
@@ -220,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;}
+.talk_info img {max-width:100%;}
 a.talk_edit{ color:#426e9a; margin-right:5px;}
 a:hover.talk_edit{ color:#ff5722;}
 .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
@@ -876,4 +878,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 
 /*version*/
 .time_tracter{color: #64BDD9;padding:  5px;}
+.wiki {width: 510px;}
+.wiki img {max-width:100%;}