diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b524be0bb..cba3a98e0 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -93,7 +93,11 @@ class MessagesController < ApplicationController
         end
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
-        redirect_to board_message_url(@board, @message)
+        if params[:is_board]
+          redirect_to project_boards_path(@project)
+        else
+          redirect_to board_message_url(@board, @message)
+        end
       else
         layout_file = @project ? 'base_projects' : 'base_courses'
         render :action => 'new', :layout => layout_file
diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
new file mode 100644
index 000000000..b5526e5de
--- /dev/null
+++ b/app/views/boards/_project_new_topic.html.erb
@@ -0,0 +1,9 @@
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+    <p class="talk_top"><%= l(:project_module_boards_post) %></p>
+    <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
+    <li>
+      <%= link_to l(:button_cancel), project_boards_path(@project), :class => 'grey_btn fr ml10' %>
+      <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <div class="cl"></div>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 166f8a552..5ee353c68 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -1,11 +1,15 @@
+
 <div class="project_r_h">
-  <h2 class="project_h2">
+  <h2 class="project_h2 fl">
     <% if User.current.language == "zh"%>
         <%= h @board.name %>
     <% else %>
         <%= l(:project_module_boards) %>
     <% end %>
+
   </h2>
+  <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <div class="cl"></div>
 </div>
 
 <!--display the board-->
@@ -16,34 +20,37 @@
     </div>
 <% end %>
 
-<!-- 内容显示部分 -->
-<div class="talk_top">
-        	<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
-<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
-        		<span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
-                    		         :class => 'problem_new_btn fl c_dorange',
-                    		         :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
-  				<% end %>
-            <div class="cl"></div>
-            </div>
+<!-- 发布新帖部分 -->
+<div class="cl"></div>
+<div class=" talklist_box" >
+  <div class="talk_new ml15 mb10" id="about_newtalk" >
+    <ul>
+      <%= render :partial => 'project_new_topic' %>
+    </ul>
+  </div><!--talknew end-->、
+
           <!-- 帖子内容显示      -->
+
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
-          <div class="problem_main">
-            <%= link_to image_tag(url_to_avatar(topic.author), :width=>"32",:height=>"32"), user_path(topic.author),:class => 'problem_pic talk_pic fl' %>
-      		<div class="talk_txt fl">
-      			<%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %>
+          <div class="talkmain_box" style="border:none; margin-bottom:0;">
+            <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
+            <div class="talkmain_txt fl mt5">
+              <% author = topic.author.to_s + "：" %>
+              <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+              <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
                 	<% if topic.sticky? %>
                 		<a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
                 	<% end %>
 
+
               <br/>
-               <%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %>
-                	&nbsp;&nbsp;&nbsp;&nbsp;<%= format_time topic.created_on %>
+
+              <p class="mt5  mb5">
+                <%= topic.content %><a href="javascript:void(0)" class="c_dblue">&nbsp;[展开]</a> </p>
               <br/>
 
-              <p class="problem_tit fl fb" style="word-break:break-all;" >
-                <%= topic.content %></p>
+              <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>na
             </div>
             <%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :class => "talk_btn fr c_white" %>
 
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index c9a8645de..f293fd350 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,4 +1,53 @@
+<script type="text/javascript">
+    //头部导航
+    var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
+    function buildsubmenus(){
+        for (var i=0; i<menuids.length; i++){
+            var ultags=document.getElementById(menuids[i]).getElementsByTagName("ul")
+            for (var t=0; t<ultags.length; t++){
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
+                ultags[t].parentNode.onmouseover=function(){
+                    this.getElementsByTagName("ul")[0].style.display="block"
+                }
+                ultags[t].parentNode.onmouseout=function(){
+                    this.getElementsByTagName("ul")[0].style.display="none"
+                }
+            }
+        }
+    }
 
+    if (window.addEventListener)
+        window.addEventListener("load", buildsubmenus, false)
+    else if (window.attachEvent)
+        window.attachEvent("onload", buildsubmenus)
+</script>
+
+<script type="text/javascript">//侧导航
+$(function(){
+    $(".subNav").click(function(){
+        $(this).toggleClass("currentDd").siblings(".subNav").removeClass("currentDd")
+        $(this).toggleClass("currentDt").siblings(".subNav").removeClass("currentDt")
+
+        // 修改数字控制速度， slideUp(500)控制卷起速度
+        $(this).next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+    })
+})
+
+function show_more_msg()
+{
+    $("#course_description").toggleClass("course_description_none");
+}
+function show_more_msg02()
+{
+    $("#news_description").toggleClass("news_description_none");
+}
+
+function show_newtalk()
+{
+    $("#about_newtalk").toggle();
+}
+
+</script>
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d93bc8519..d2bd4c4c0 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -530,6 +530,40 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
+/* 20150505讨论区*/
+.w664{ width:664px;}
+.w140{ width:140px;}
+.talklist_box{  }
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; padding-bottom:20px; margin-bottom:20px;}
+.talkmain_pic{}
+a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.talkmain_pic{border:1px solid #64bdd9;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+a.talkmain_name{ color:#ff5722;}
+a:hover.talkmain_name{ color:#d33503;}
+.talkmain_tit{ color:#0781b4; width:450px; display:block; }
+.talklist_main{   }
+.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+.talkConIpt{ background:#f2f2f2; }
+.talkWrapBox{ width:610px; margin-left:60px; }
+.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
+.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
+.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
+.talkWrapMsg{ background:#f2f2f2; padding:10px;}
+a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Msg_pic{border:1px solid #64bdd9;}
+a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Reply_pic{border:1px solid #64bdd9;}
+.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt p{ }
+.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
+.Replybox{ float:left; width:495px; margin-left:5px;}
+.talk_nextpage{ border:none; width:410px; margin:0 auto;}
+.newtalk { margin-top:8px; margin-right:8px;}
+.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
+#about_newtalk{ display:none;}
+
 
 
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 019ffa57a..a33071f65 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -691,3 +691,37 @@ tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);
 .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
 .icon-file.application-zip { background-image: url(../images/files/zip.png); }
 .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
+
+/* 20150505讨论区*/
+.w664{ width:664px;}
+.w140{ width:140px;}
+.talklist_box{  }
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; padding-bottom:20px; margin-bottom:20px;}
+.talkmain_pic{}
+a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.talkmain_pic{border:1px solid #64bdd9;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+a.talkmain_name{ color:#ff5722;}
+a:hover.talkmain_name{ color:#d33503;}
+.talkmain_tit{ color:#0781b4; width:450px; display:block; }
+.talklist_main{   }
+.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+.talkConIpt{ background:#f2f2f2; }
+.talkWrapBox{ width:610px; margin-left:60px; }
+.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
+.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
+.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
+.talkWrapMsg{ background:#f2f2f2; padding:10px;}
+a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Msg_pic{border:1px solid #64bdd9;}
+a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Reply_pic{border:1px solid #64bdd9;}
+.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt p{ }
+.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
+.Replybox{ float:left; width:495px; margin-left:5px;}
+.talk_nextpage{ border:none; width:410px; margin:0 auto;}
+.newtalk { margin-top:8px; margin-right:8px;}
+.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
+#about_newtalk{ display:none;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4f65a17c1..5006a11e4 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -56,7 +56,6 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
-.ml25{ margin-left:25px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -64,6 +63,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml60{ margin-left:60px;}
 .ml80{ margin-left:80px;}
 .ml90{ margin-left:90px;}
+.ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
 .mr5{ margin-right:5px;}
 .mr10{ margin-right:10px;}
@@ -74,13 +74,13 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
-.mt13{ margin-top:13px;}
-.mt43{ margin-top:43px;}
-.mt40{ margin-top:40px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
-.mb13{ margin-bottom:13px;}
+.mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
+.w20{ width:20px;}
+.w60{ width:60px;}
+.w70{ width:70px;}
 .w90{ width:90px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
@@ -93,8 +93,10 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w350{ width:350px;}
 .w610{ width:610px;}
 .w600{ width:600px;}
+.h22{ height:22px;}
 .h26{ height:26px;}
 .h50{ height:50px;}
+.h70{ height:70px;}
 .h150{ height:150px;}
 
 /* Font & background Color */