diff --git a/app/api/mobile/apis/auth.rb b/app/api/mobile/apis/auth.rb
index fbec9a3b0..9e4cb1bc6 100644
--- a/app/api/mobile/apis/auth.rb
+++ b/app/api/mobile/apis/auth.rb
@@ -26,7 +26,7 @@ module Mobile
             present :data, {token: key.access_token, user: api_user}, using: Entities::Auth
             present :status, 0
           else
-            raise 'Unauthorized.'
+            raise "无效的用户名或密码"
           end
         end
 
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index 4c91738c1..520f73384 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -58,6 +58,7 @@ module Mobile
       end
       course_expose :current_user_is_member
       course_expose :current_user_is_teacher
+      course_expose :work_unit
     end
   end
 end
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index be97fdb6e..21b3cc531 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -1035,11 +1035,12 @@ class BidsController < ApplicationController
   def alert_anonymous_comment
     @bid = Bid.find params[:id]
     @course = @bid.courses.first
+    @cur_size = 0
+    @totle_size = 0
     if @bid.comment_status == 0
       @totle_size = searchStudent(@course).size
       @cur_size = @bid.homeworks.size
     elsif @bid.comment_status == 1
-      @totle_size = 0
       @bid.homeworks.map { |homework| @totle_size += homework.homework_evaluations.count}
       @cur_size = 0
       @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.is_teacher_score = 0").count}
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 57ad9d4ce..d226000c0 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -27,7 +27,7 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @comment.safe_attributes = params[:comment]
+    @project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
     @comment.author = User.current
     if @news.comments << @comment
       if params[:asset_id]
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c58ebf851..436418430 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -192,16 +192,7 @@ class MessagesController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
     @temp = Message.new
-    #@temp.content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}> "
-    @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    @content_html = textilizable(@content)
-    @temp.content = @content_html
-    #@content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/> &nbsp; "
-    #@content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n") + "</blockquote>\n\n<br/>"
-    #@content = "<blockquote>" << @content
-    #@temp = Message.new
-    #@temp.content = @content
-
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c94108dc1..f36e4b397 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -303,7 +303,7 @@ module ApplicationHelper
     onclick = "$('##{id}').slideToggle(); "
     onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
     onclick << "return false;"
-    link_to(name, "#", :onclick => onclick,:class => options[:class])
+    link_to(name, "javascript:void(0)", :onclick => onclick,:class => options[:class])
   end
 
   def image_to_function(name, function, html_options = {})
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 7c1f14104..de72cab7c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -161,10 +161,15 @@ class CoursesService
   #显示课程
   def show_course(params,current_user)
     course = Course.find(params[:id])
+    if course.school
+      work_unit = course.school.name
+    else
+      work_unit = get_user_work_unit course.teacher
+    end
     unless (course.is_public == 1 ||  current_user.member_of_course?(course) || current_user.admin?)
       raise '403'
     end
-    {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
+    {:course => course,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
   end
 
   #创建课程
@@ -373,6 +378,16 @@ class CoursesService
       unless latest_bid.nil?
         latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
       end
+
+      # Time 2015-04-07 14:58:30
+      # Author lizanle
+      # Description 添加课程创建动态
+      if(User.find_by_id(CourseInfos.find_by_course_id(course.id).try(:user_id)))
+        create_user_name = User.find_by_id(CourseInfos.find_by_course_id(course.id).user_id).realname
+        latest_course_dynamics << {:type => 5,:time => course.created_at,:message =>l(:label_recently,:locale => get_user_language(current_user)) << create_user_name << l(:label_creat,:locale => get_user_language(current_user))}
+      end
+
+
       #每个作业中的最新留言
       messages = []
       course.homeworks.each do |bid|
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 80aa34d45..8f86029d9 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -192,7 +192,7 @@ class UsersService
         #raise @current_user.errors.full_message
         #return @current_user
     else
-      raise 'wrong password'
+      raise l(:notice_account_wrong_password,:locale => 'zh')
     end
     @current_user
   end
diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb
index 505fc88a8..129bcec5e 100644
--- a/app/views/bids/_new_homework_form.html.erb
+++ b/app/views/bids/_new_homework_form.html.erb
@@ -11,7 +11,7 @@
       <input  type="text" name="bid[name]" id="bid_name" class="hwork_input" maxlength="<%= Bid::NAME_LENGTH_LIMIT%>" onkeyup="regex_bid_name();" value="<%= bid.name%>" >
       <p id="bid_name_span" class="c_red" style="padding-left: 55px;"></p>
     </li>
-    <li class="ml45">
+    <li class="ml45 mb10">
       <label class="fl" >&nbsp;&nbsp;<%= l(:field_quote)%>&nbsp;&nbsp;：</label>
       <!--<textarea  name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl"></textarea>-->
       <% if edit_mode %>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index c27546e85..ed2c20448 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,13 +1,7 @@
-<script type="text/javascript">
-    function submitCoursesBoard()
-    {
-        if(regexSubject()&&regexContent()){$("#message-form").submit();}
-    }
-</script>
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
       <h3>
-        <%= link_to h(@board.name), course_board_path(@course, @board) %> &#187;
+        <%= link_to h(@board.name), course_board_path(@course, @board) %>
         <%= l(:label_message_new) %>
       </h3>
       <div class="add_frame_header" >
@@ -16,9 +10,8 @@
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => false, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form_course', :locals => {:f => f} %>
           <p>
-            <!--<input type="button" onclick="submitCoursesBoard();" class = "ButtonColor m3p10 h30" value="<%#= l(:button_submit)%>">-->
-           <a href="#" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'ButtonColor m3p10'  %>
+           <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
+            <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => '$("#add-message").hide(); return false;' ,:class => 'ButtonColor m3p10'  %>
           </p>
       <% end %>
       <div id="preview" class="wiki"></div>
@@ -39,7 +32,11 @@
     </div>
 <% end %>
 <div class="talk_top ml15">
-  <p class="fl"><%= l(:label_totle) %><span><%= @topic_count %></span><%= l(:label_course_momes_count) %></p>
+  <p class="fl">
+    <%= l(:label_totle) %>
+    <span><%= @topic_count %></span>
+    <%= l(:label_course_momes_count) %>
+  </p>
   <%= link_to l(:label_message_new),
               new_board_message_path(@board),
               :class => 'problem_new_btn fl c_dorange' if User.current.logged? %>
@@ -52,7 +49,7 @@
           <div class="talk_txt fl">
             <%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s,:class => "problem_tit fl fb c_dblue" %>
             <% if topic.sticky? %>
-              <a href="#" class="talk_up fl c_red">置顶</a>
+              <a href="javascript:void(0)" class="talk_up fr c_red">置顶</a>
             <% end %>
             <br/>
             <p>由<%= link_to topic.author,user_path(topic.author),:class => "problem_name" %>添加于<%= format_time(topic.created_on) %></p>
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index e79dac59b..ef1d25bd4 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -12,11 +12,13 @@
   <% else %>
         <%= form_for('new_form', :method => :post,
                      :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= f.kindeditor 'course_message',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
-                            :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-            <a href="#" class="grey_btn fr ml10">取&nbsp;&nbsp;消</a>
-            <a href="#"  onclick='leave_message_editor.sync();$("#leave_message_form").submit();' class="blue_btn fr"> <%= l(:button_leave_meassge)%></a>
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <%= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
+                 :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
+            <a href="javascript:void(0)" class="grey_btn fr ml10 mt10">取&nbsp;&nbsp;消</a>
+            <a href="javascript:void(0)"  onclick='leave_message_editor.sync();$("#leave_message_form").submit();' class="blue_btn fr mt10">
+              <%= l(:button_leave_meassge)%>
+            </a>
         <% end %>
   <% end %>
 </div>
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 01990602d..a302d0981 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -16,7 +16,7 @@
                   </span>
                   <div class="cl"></div>
                   <p>
-                    <%= textilizable journal.notes%>
+                    <%= journal.notes.html_safe %>
                   </p>
                 </div>
                 <div class="ping_disfoot">
@@ -35,11 +35,6 @@
                     <% end %>
                 </div>
                   <div class="cl"></div>
-                <!--<span class="font_lighter" style="float: right">
-                  <#%= l(:label_bids_published) %>&nbsp;
-                  <#%= time_tag(journal.created_on).html_safe %>&nbsp;
-                  <#%= l(:label_bids_published_ago) %>
-                </span>-->
                 <% ids = 'project_respond_form_'+ journal.id.to_s%>
                 <% if reply_allow %>
                     <div id='<%= ids %>' class="respond-form">
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index 0a8458a22..c45259efd 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -9,42 +9,4 @@
            :locals => { :contest => @contest, :journals => @jour, :state => false}
 %>
 
-<% html_title(l(:label_user_response)) -%>
-<script>
-var W3CDOM = document.createElement && document.getElementsByTagName;
-
-//window.onload = setMaxLength;
-
-function setMaxLength() {
-    if (!W3CDOM) return;
-    var textareas = document.getElementsByTagName('textarea');
-    for (var i=0;i<textareas.length;i++) {
-    	var textarea = textareas[i];
-    	setMaxLengthItem(textareas[i]);
-    }
-}
-function setMaxLengthItem(textarea){
-	if (textarea.getAttribute('maxlength')) {
-    var counter = document.createElement('span');
-    counter.className = 'counter';
-		var counterClone = counter.cloneNode(true);
-		counterClone.innerHTML = '<span>0</span>/'+textarea.getAttribute('maxlength');
-		textarea.parentNode.insertBefore(counterClone,textarea.nextSibling);
-		textarea.relatedElement = counterClone.getElementsByTagName('span')[0];
-		textarea.onkeyup = textarea.onchange = checkMaxLength;
-		textarea.onkeyup();
-	}
-}
-
-function checkMaxLength() {
-    var maxLength = this.getAttribute('maxlength');
-    var currentLength = this.value.length;
-    if (currentLength > maxLength)
-        this.relatedElement.className = 'toomuch';
-    else
-        this.relatedElement.className = '';	
-    this.relatedElement.firstChild.nodeValue = currentLength;
-}
-
-</script>
 <% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index 98440abab..cbb5d6fc1 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -32,7 +32,7 @@
         </script>
         <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
           <div id="bid_description_<%= bid.id%>_content">
-            <%= textAreailizable bid, :description %>
+            <%= bid.description.html_safe %>
           </div>
         </div>
         <div class="news_foot c_red" id="bid_show_more_des_button<%= bid.id%>" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;display: none;">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 68a326fb2..0ea51d5f4 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -1,16 +1,3 @@
-<script src="/jquery.min.js"></script>
-<script type="text/javascript" src="/javascripts/iPass.packed.js"></script>
-<script type="text/javascript">
-    $(document).ready(function(){
-        // to enable iPass plugin
-        $("input[type=password]").iPass();
-
-        // for the demo
-        $("#psw_btn").click(function() {
-            alert("密码: "+$("#course_course_password").val());
-        })
-    });
-</script>
 <div class="project_r_h02">
   <h2 class="project_h2"><%= l(:permission_new_course)%></h2>
 </div>
@@ -37,8 +24,9 @@
       <div class="cl"></div>
       <li class="ml45 mb10">
         <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-        <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" >
-        <a id="psw_btn" class="">显示明码</a>
+        <input type="text" style="display: none;">
+        <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02">
+        <a id="psw_btn" href="javascript:void(0)">显示明码</a>
         <div class="cl"></div>
         <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
       </li>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 569ae302b..acc6c12a5 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -39,7 +39,8 @@
           <div class="cl"></div>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="text" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>">
+            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>">
+            <a id="psw_btn" href="javascript:void(0)">显示明码</a>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
           </li>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 698bf3cea..79cb267b4 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -16,7 +16,7 @@
                 <span class="fl"> <%= l(:label_new_activity) %>：</span>
                 <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:class => "problem_tit c_dblue fl fb"%>
                 <br />
-                <p class="mt5 break_word"><%= e.event_description %>
+                <p class="mt5 break_word"><%= e.event_description.html_safe %>
                   <br />
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index bb7b18a4a..27a8e67f4 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -149,7 +149,7 @@
 
                         <tr>
                           <td class="font_lighter_sidebar" colspan="2" style="padding-left: 8px;" title="<%= @bid.description %>">
-                            <%= textilizable truncate(@bid.description, length: 200, omission: '...') %>
+                            <%= @bid.description.html_safe %>
                           </td>
                         </tr>
 
diff --git a/app/views/memos/quote.js.erb b/app/views/memos/quote.js.erb
index d2e8c1d17..b3d860916 100644
--- a/app/views/memos/quote.js.erb
+++ b/app/views/memos/quote.js.erb
@@ -1,4 +1,4 @@
 //ckeditor.setData("<%= raw escape_javascript(@content) %>");
-$('#message_quote').html("<%= raw escape_javascript(@temp.content) %>");
+$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 $('#quote').val("<%= raw escape_javascript(@content) %>");
 showAndScrollTo("new_memo", "cke_editor01");
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index d47157e61..c99c41fb9 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -1,47 +1,22 @@
-<script type="text/javascript">
-//   var flag = false;
-//   jQuery(document).ready(function($) {
-//        transpotUrl('#content');
-//    });
-//    function submit_message_replay()
-//    {
-//        regexContent();//onkeyup传给kindeditor用不上了，所以只能放在这里
-//        if(flag)
-//        {
-//            message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
-//            $("#message_form").submit();
-//        }
-//    }
-//    function regexContent()
-//    {
-//        var content = message_content_editor.html();//$.trim($("#message_content").val());
-//        if(content.length ==0)
-//        {
-//            $("#message_content_span").text("<%= l(:label_reply_empty) %>");
-//            $("#message_content_span").css('color','#ff0000');
-//            flag =  false;
-//        }
-//        else
-//        {
-//            $("#message_content_span").text("<%= l(:label_field_correct) %>");
-//            $("#message_content_span").css('color','#008000');
-//            flag = true;
-//        }
-//    }
-</script>
 <div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_board) %></h2>
+  <h2 class="project_h2">
+    <%= l(:label_board) %>
+  </h2>
 </div>
 <div class="problem_main">
-  <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %></div>
+  <div class="ping_dispic">
+    <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+  </div>
   <div class="talk_txt fl">
-    <p class="problem_tit fl fb" ><%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %></p>
+    <p class="problem_tit fl fb" >
+      <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+    </p>
     <br/>
-    <p>由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %> 添加于<%= format_time(@topic.created_on) %></p>
+    <p>
+      由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %>
+      添加于<%= format_time(@topic.created_on) %>
+    </p>
   </div>
-  <!-- <a class="talk_edit fr">删除</a><a class="talk_edit fr">编辑</a><a class="talk_edit fr">置顶</a> -->
-  <%#= watcher_link(@topic, User.current) %>
-
   <%= link_to(
               l(:button_edit),
               {:action => 'edit', :id => @topic},
@@ -55,12 +30,12 @@
               :class => 'talk_edit fr'
       ) if @message.course_destroyable_by?(User.current) %>
   <div class="cl"></div>
-  <div class="talk_info mb10"><%= textAreailizable(@topic, :content) %></div>
+  <div class="talk_info mb10"><%= @topic.content.html_safe %></div>
   <div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div>
   <!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
   <div class="cl"></div>
   <% if User.current.logged? %>
-      <%= toggle_link l(:button_reply), "reply", :focus => 'message_content',:class => 'talk_edit fr' %>
+      <%= toggle_link l(:button_reply), "reply", :focus => 'message_subject',:class => 'talk_edit fr' %>
   <% else %>
       <%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %>
   <% end %>
@@ -118,11 +93,11 @@
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
           <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-          <%= link_to l(:button_submit),"#",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
+          <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
       <% end %>
-      <div id="preview" class="wiki"></div>
     </div>
 <% end %>
+<div class="cl"></div>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index dc350bcb3..f4f8126fe 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -27,7 +27,10 @@
 </li>
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+  <label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%= l(:field_description) %>&nbsp;&nbsp;：
+  </label>
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
   <% if replying %>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 01465188c..cbc985c2b 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -167,7 +167,7 @@
             <tr>
               <td class="comments">
                 <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
-                  <%= textilizable message,:content,:attachments => message.attachments %>
+                  <%= textAreailizable message,:content,:attachments => message.attachments %>
                 </div>
                 <%= link_to_attachments message, :author => false %>
               </td>
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index f8ec37d75..157e20764 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,7 +1,7 @@
 $('#message_subject').val("<%= raw escape_javascript(@subject) %>");
-$('#message_quote').html("<%= raw escape_javascript(@temp.content) %>");
+$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 //$('#message_content').val("<#%= raw escape_javascript(@content) %>");
-$('#quote_quote').html("<%= raw escape_javascript(@content) %>");
+$('#quote_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 
 showAndScrollTo("reply", "message_content");
 $('#message_content').scrollTop = $('#message_content').scrollHeight - $('#message_content').clientHeight;
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 5c0fc8274..b8b3e36a4 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -4,7 +4,7 @@
     <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
     <p id="title_notice_span" class="ml55"></p>
   </li>
-  <li class="ml45">
+  <li class="ml45 mb10">
     <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index c6940ce10..750f7e465 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -2,42 +2,23 @@
    btn_tips = l(:label_news_notice)
    label_tips = l(:label_course_news)
 %>
-
-
-
 <div class="project_r_h">
   <h2 class="project_h2"><%= label_tips %></h2>
 </div>
 <div class="talk_top">
-  <p class="fl"><%= l(:label_total_news) %><span><%= @news_count %></span><%= l(:label_course_news_count) %></p>
+  <p class="fl">
+    <%= l(:label_total_news) %>
+    <span><%= @news_count %></span>
+    <%= l(:label_course_news_count) %>
+  </p>
   <% if @course && User.current.allowed_to?(:manage_news, @course) %>
-      <%= link_to(btn_tips,new_course_news_path(@course),
-          :class => 'problem_new_btn fl c_dorange')%>
+      <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
       <div class="cl"></div>
 
   <% end %>
   <div class="cl"></div>
 </div>
 
-
-<!-- <%# if @course && User.current.allowed_to?(:manage_news, @course) %>
-    <%#= link_to(btn_tips, new_course_news_path(@course),
-                :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
-
-    <div id="add-news" class="add_frame" style="display:none;">
-      <%#= labelled_form_for @news, :url => course_news_index_path(@course),
-                            :html => {:id => 'news-form', :multipart => true} do |f| %>
-          <%#= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
-          <%#= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
-          <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
-
-          <%#= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
-      <%# end if @course %>
-      <div id="preview" class="wiki"></div>
-    </div>
-<%# end %>-->
-
 <div>
   <% if @newss.empty? %>
       <p class="nodata">
@@ -49,10 +30,20 @@
             <%= 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">
               <%= 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) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
+              <span class="fl">
+                <%= l(:label_release_news) %>：
+              </span>
+              <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+              <br />
               <div class="cl mb5"></div>
-              <p  id="news_description_<%= news.id %>" class="news_description mt5"><%= textAreailizable news.description %><br /> <%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></p>
-              <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
+              <p  id="news_description_<%= news.id %>" class="news_description mt5">
+                <%= news.description.html_safe %>
+              </p>
+              <div class="news_foot c_red"  style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
+                <%= l(:button_more)%>...
+                <span class="g-arr-down"></span>
+              </div>
+              <span class="fl"><%= l(:label_end_time)%>：<%= format_time(news.created_on)%></span>
             </div>
             <div class="cl"></div>
           </div><!--problem_main end-->
@@ -62,41 +53,11 @@
 </div>
 <!--end-->
 
-    <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
-
-  <%# other_formats_links do |f| %>
-      <%#= f.link_to 'Atom', :url => {:course_id => @course, :key => User.current.rss_key} %>
-  <%# end %>
-
-  <% content_for :header_tags do %>
-      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-  <% html_title(l(:label_course_news)) -%>
-</div>
-
-<script type='text/javascript'>
-    $(document).ready(function ($) {
-        $('.content-text-list').each(function () {
-            $(this).find('.delete_icon').hide();
-            $(this).mouseenter(function (event) {
-                $(this).find('.delete_icon').show();
-            });
-            $(this).mouseleave(function (event) {
-                $(this).find('.delete_icon').hide();
-            });
-        });
-    });
-    $(function(){
-        $('.news_description').each(function () {
-            if($(this).height() >= 38)
-            {
-                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
-            }
-          }
-        )
-    });
-</script>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+<% html_title(l(:label_course_news)) -%>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 3334f7c6a..f7c5145f0 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -1,63 +1,7 @@
-<script type="text/javascript">
-    function regexTitle()
-    {
-        var name = $("#news_title").val();
-        if(name.length ==0)
-        {
-            $("#title_notice_span").text("标题不能为空");
-            $("#title_notice_span").css('color','#ff0000');
-            $("#title_notice_span").focus();
-            return false;
-        }
-        else if(name.length <= 60)
-        {
-            $("#title_notice_span").text("填写正确");
-            $("#title_notice_span").css('color','#008000');
-            return true;
-        }
-        else
-        {
-            $("#title_notice_span").text("标题超过60个字符");
-            $("#title_notice_span").css('color','#ff0000');
-            $("#title_notice_span").focus();
-            return false;
-        }
-    }
-
-    function regexDescription()
-    {
-        var name = $("#news_description").val();
-        if(name.length ==0)
-        {
-            $("#description_notice_span").text("描述不能为空");
-            $("#description_notice_span").css('color','#ff0000');
-            $("#description_notice_span").focus();
-            return false;
-        }
-        else
-        {
-            $("#description_notice_span").text("填写正确");
-            $("#description_notice_span").css('color','#008000');
-            return true;
-        }
-    }
-
-    function submitNews()
-    {
-        news_description_editor.sync();
-        if(regexTitle() && regexDescription())
-        {
-            $("#news-form").submit();
-        }
-    }
-    function submitComment()
-    {
-        comment_editor.sync();
-        $("#add_comment_form").submit();
-    }
+<script>
     function clearMessage()
     {
-        $("#comment_comments").val("");
+        $("#news_comment").html("<%= escape_javascript(hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none') %><%= escape_javascript(kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字")%>");
     }
 </script>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
@@ -77,8 +21,9 @@
 <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">
-    <h4 class="r_txt_tit mb5">  <%=h @news.title %></h4>
-    <%#= watcher_link(@news, User.current) %>
+    <h4 class="r_txt_tit mb5">
+      <%=h @news.title %>
+    </h4>
     <%= link_to(l(:button_edit),
                 edit_news_path(@news),
                 :class => 'talk_edit fr',
@@ -86,7 +31,11 @@
                 :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %>
     <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
     <div class="cl"></div>
-    <div class="mb5"><%= textAreailizable(@news, :description) %><br /> <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %></div>
+    <div class="mb5">
+      <%= @news.description.html_safe %>
+      <br />
+      <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %>
+    </div>
     <%= link_to_attachments_course @news %>
     <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
   </div>
@@ -97,14 +46,17 @@
       <div class="msg_box">
         <h4><%= l(:label_comment_add) %></h4>
         <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
-          <div class="box" >
+          <div class="box"  id="news_comment">
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
             <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
           </div>
-          <p>
-            <a href="#" class="grey_btn fr ml10" onclick="clearMessage();"><%= l(:label_cancel_with_space) %></a>
-            <a href="#" class="blue_btn fr" onclick="submitComment();"><%= l(:label_comment_with_space) %></a>
-
+          <p class="mt10">
+            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="clearMessage();">
+              <%= l(:label_cancel_with_space) %>
+            </a>
+            <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+              <%= l(:label_comment_with_space) %>
+            </a>
           </p>
       <% end %>
       </div>
@@ -117,12 +69,16 @@
         <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author)%></div>
         <div class="ping_discon">
           <div class="ping_distop">
-            <%= 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) %></span>
+            <%= 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) %>
+            </span>
             <div class="cl"></div>
-            <p><%= textAreailizable(comment.comments) %></p>
+            <p><%= comment.comments.html_safe %></p>
             </div>
-            <div class="ping_disfoot"><%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+            <div class="ping_disfoot">
+              <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
           </div>
 
         </div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 17c445ae8..5a95d1bd3 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2014,6 +2014,8 @@ zh:
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
   label_commit_failed: 提交失败
+  label_recently: 最近被
+  label_creat: 创建
   #api end
 
   label_end_time: 截止时间
diff --git a/db/migrate/20150316032155_create_discuss_demos.rb b/db/migrate/20150316032155_create_discuss_demos.rb
deleted file mode 100644
index af7a2a6ed..000000000
--- a/db/migrate/20150316032155_create_discuss_demos.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateDiscussDemos < ActiveRecord::Migration
-  def change
-    create_table :discuss_demos do |t|
-      t.string :title
-      t.text :body
-      t.timestamps
-    end
-  end
-end
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 680899eee..8ecbfef06 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -4917,7 +4917,7 @@ KEditor.prototype = {
 			editDiv = K('.edit', container),
 			statusbar = self.statusbar = K('.statusbar', container);
 		container.removeClass('container')
-			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+			.addClass('ke-container  ke-container-' + self.themeType).css('width', width);
 		if (fullscreenMode) {
 			container.css({
 				position : 'absolute',
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 5758a8412..2b3ee1f18 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -158,7 +158,7 @@ function regexTitle()
     {
         $("#title_notice_span").text("标题不能为空");
         $("#title_notice_span").css('color','#ff0000');
-        $("#title_notice_span").focus();
+        $("#news_title").focus();
         return false;
     }
     else if(name.length <= 60)
@@ -171,7 +171,7 @@ function regexTitle()
     {
         $("#title_notice_span").text("标题超过60个字符");
         $("#title_notice_span").css('color','#ff0000');
-        $("#title_notice_span").focus();
+        $("#news_title").focus();
         return false;
     }
 }
@@ -200,9 +200,8 @@ function regexDescription()
     }
 }
 
-function submitNews(is_new)
+function submitNews()
 {
-    alert(is_new)
     if(regexTitle() && regexDescription())
     {
         news_description_editor.sync();
@@ -215,6 +214,12 @@ function submitFocus(obj)
     $(obj).focus();
 }
 
+function submitComment()
+{
+    comment_editor.sync();
+    $("#add_comment_form").submit();
+}
+
 /////////////////////////////////////////////////课程讨论区
 function course_board_submit_message_replay()
 {
@@ -227,12 +232,12 @@ function course_board_submit_message_replay()
 function MessageReplayVevify() {
     var content = message_content_editor.html();//$.trim($("#message_content").val());
     if (content.length == 0) {
-        $("#message_content_span").text("<%= l(:label_reply_empty) %>");
+        $("#message_content_span").text("回复不能为空");
         $("#message_content_span").css('color', '#ff0000');
         return  false;
     }
     else {
-        $("#message_content_span").text("<%= l(:label_field_correct) %>");
+        $("#message_content_span").text("填写正确");
         $("#message_content_span").css('color', '#008000');
         return true;
     }
@@ -410,4 +415,22 @@ $(document).ready(function () {
 function regexDeadLine()
 {
     ('#ui-datepicker-div').hide;
-}
\ No newline at end of file
+}
+
+//新建、修改课程明码显示
+$(function(){
+    $("#psw_btn").click(function() {
+        alert("密码: "+$("#course_course_password").val());
+    });
+});
+
+//课程通知更多按钮显示
+$(function(){
+    $('.news_description').each(function () {
+            if($(this).height() >= 38)
+            {
+                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
+            }
+        }
+    )
+});
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6053940d6..00d4e445f 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -55,7 +55,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;}
 .problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
 a.problem_name{ color:#ff5722;}
 a:hover.problem_name{ color:#d33503;}
-a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.problem_tit{ color:#0781b4; max-width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a:hover.problem_tit{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 /****翻页***/
@@ -175,7 +175,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .wzan a{ display: block;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
 a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px; height:173px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 /*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }*/
@@ -316,6 +316,7 @@ a:hover.st_img { border:1px solid #1c9ec7; }
 .st_boxlist ul li a span{ color:#1c9ec7;}
 .st_boxlist ul li a:hover span{ color:#ff8e15;}
 .ml50{ margin-left:50px;}
+.ml56{ margin-left:56px !important;}
 .ml358{ margin-left:358px;}
 .ml258{ margin-left:254px;}
 .ml65{ margin-left:65px;}
@@ -450,6 +451,23 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
 }
 
+blockquote {
+    /* font-style: italic; */
+    border-left: 1px solid #e0e0e0;
+    border-right: 1px solid #e0e0e0;
+    border-top: 1px solid #e0e0e0;
+    border-bottom: 1px solid #e0e0e0;
+    padding-left: 0.6em;
+    padding-top: 0.6em;
+    padding-right: 0.6em;
+    padding-bottom: 0.6em;
+    margin-left: 1.4em;
+    margin-right: 0.4em;
+    border-radius: 4px;
+    font-family: "Microsoft YaHei";
+    background: url('../images/requirements/reference.jpg');
+}
+