Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

app/views/messages/_course_show.html.erb

@@ -65,7 +65,7 @@
     <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) %>
+  <%#= watcher_link(@topic, User.current) %>
 
   <%= link_to(
               l(:button_edit),

app/views/messages/_form_course.html.erb

@@ -9,7 +9,7 @@
   <% else %>
       <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
   <% end %>
-  <span id="subject_span" class="ml55"></span>
+  <p id="subject_span" class="ml55"></p>
 </li>
 <li class="ml60 mb5">
   <% unless replying %>
@@ -30,7 +30,7 @@
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
   <div class="cl"></div>
-  <span id="message_content_span"  class="ml55"></span>
+  <p id="message_content_span"  class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/news/_course_form.html.erb

@@ -1,12 +1,12 @@
 <li  class="ml45">
     <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
     <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 %>">
-    <span id="title_notice_span" class="ml55"></span>
+    <p id="title_notice_span" class="ml55"></p>
   </li>
   <li class="ml45">
     <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
     <textarea id="news_description" name="news[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl" onkeyup="regexDescription();" maxlength="6000"><%= is_new ? '' : @news.description %></textarea>
-    <span id="description_notice_span" class="ml55"></span>
+    <p id="description_notice_span" class="ml55"></p>
   </li>
   <div class="cl"></div>
   <li class="ml45">

app/views/news/_course_show.html.erb

@@ -76,7 +76,7 @@
   <%= 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) %>
+    <%#= watcher_link(@news, User.current) %>
     <%= link_to(l(:button_edit),
                 edit_news_path(@news),
                 :class => 'talk_edit fr',