diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 7c6594006..410648c15 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -1,12 +1,3 @@
-
<% if User.current.language == "zh"%>
@@ -16,20 +7,6 @@
<% end %>
-
- <% if User.current.logged? %>
- <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
-
<%= l(:project_module_boards_post) %>
- <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
-
- <%= l(:button_submit)%>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'grey_btn ml10 fl' %>
-
- <% end %>
-
-
- <% end %>
-
<% if !User.current.logged? %>
diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb
index 9055b9a1b..6550ed874 100644
--- a/app/views/layouts/_base_development_group.html.erb
+++ b/app/views/layouts/_base_development_group.html.erb
@@ -23,7 +23,7 @@
(<%= @project.boards.first.topics.count %>)
<% end %>
<% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
<% end %>
<% end%>
diff --git a/app/views/layouts/_base_friend_group.html.erb b/app/views/layouts/_base_friend_group.html.erb
index 71d375501..16ccc09e5 100644
--- a/app/views/layouts/_base_friend_group.html.erb
+++ b/app/views/layouts/_base_friend_group.html.erb
@@ -12,7 +12,7 @@
(<%= @project.boards.first.topics.count %>)
<% end %>
<% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
<% end %>
<% end%>
diff --git a/app/views/layouts/_base_research_team.html.erb b/app/views/layouts/_base_research_team.html.erb
index 3f942bc40..17bf65b15 100644
--- a/app/views/layouts/_base_research_team.html.erb
+++ b/app/views/layouts/_base_research_team.html.erb
@@ -23,7 +23,7 @@
(<%= @project.boards.first.topics.count %>)
<% end %>
<% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
<% end %>
<% end%>
diff --git a/app/views/messages/_project_new_topic.html.erb b/app/views/messages/_project_new_topic.html.erb
new file mode 100644
index 000000000..a8a8644c3
--- /dev/null
+++ b/app/views/messages/_project_new_topic.html.erb
@@ -0,0 +1,28 @@
+
+
+ <% if User.current.language == "zh"%>
+ <%= h @board.name %>
+ <% else %>
+ <%= l(:project_module_boards) %>
+ <% end %>
+
+
+
+<% if User.current.logged? %>
+ <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
+
<%= l(:project_module_boards_post) %>
+ <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
+
+ <%= l(:button_submit)%>
+ <%= link_to l(:button_cancel), project_boards_path(@project), :class => 'grey_btn ml10 fl' %>
+
+ <% end %>
+
+
+<% else %>
+
+ <%= l(:label_user_login_project_board) %>
+ <%= link_to l(:label_user_login_new), signin_path, :class => "c_blue ml5" %>
+
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index ec95b0df0..09a714850 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,16 +1,5 @@
<% if @project %>
-
- <%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %>
- »
- <%= l(:label_message_new) %>
-
- <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
- <%= render :partial => 'form', :locals => {:f => f,:is_new => true} %>
- <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
- <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%>
- <% end %>
-
-
+ <%= render :partial => 'project_new_topic' %>
<% elsif @course %>
<%= render :partial => 'course_new' %>
<% end %>
\ No newline at end of file
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 795a56dd4..c2c4ab784 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -306,4 +306,13 @@ $(document).ready(function () {
$("pre").addClass("break_word");
}
- });
\ No newline at end of file
+ });
+
+//论坛提交
+function submitProjectBoard()
+{
+ if(regexSubject()&®exContent())
+ {
+ $("#message-form").submit();
+ }
+}
\ No newline at end of file