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

app/views/boards/_course_show.html.erb

@@ -16,7 +16,7 @@
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10" id="about_newtalk" >
+  <div class="talk_new ml15 mb10" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;" >
     <ul>
       <%= render :partial => 'course_new' %>
     </ul>

app/views/boards/_project_show.html.erb

@@ -60,7 +60,8 @@
 
                <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
                  <%= topic.content %>
-               </p>     <p>
+               </p>
+              <p>
                 <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />

app/views/layouts/base_courses.html.erb

@@ -133,7 +133,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "+#{l(:label_message_new)}", course_boards_path(@course, :flag => true), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>