Merge branch 'szzh' into develop

app/controllers/boards_controller.rb

@@ -30,6 +30,7 @@ class BoardsController < ApplicationController
 
   def index
     #modify by nwb
+    @flag = params[:flag] || false
     if @project
       @boards = @project.boards.includes(:last_message => :author).all
       @boards = [] << @boards[0] if @boards.any?

app/views/boards/_project_show.html.erb

@@ -7,7 +7,7 @@
         }
     }
 </script>
-<div id="add-message" class="add_frame" style="display:none;">
+<div id="add-message" class="add_frame" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
   <% if User.current.logged? %>
       <div class="project_r_h">
         <h2 class="project_h2"><%= l(:label_message_new) %></h2>

app/views/layouts/base_projects.html.erb

@@ -148,7 +148,7 @@
 											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
-											    <%= link_to "+发贴", new_board_message_path(@project.boards.first, true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
+											    <%= link_to "+发贴", project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
 										<div class="subNav">

app/views/words/_new.html.erb

@@ -47,12 +47,12 @@
     </div>
 
     <% if User.current.logged? %>
-          <% if @user.safe_attribute?  'user_message' %>
+          <%# if @user.safe_attribute?  'user_message' %>
       <%= f.text_area 'user_message', :rows => 3, :cols => 65,
                               :placeholder => "#{l(:label_leave_a_message)}",
                               :style => "resize: none;  width: 98%",
                               :class => 'noline'%>
-       <% end %>
+       <%# end %>
       <%= f.text_field :reference_user_id, :style=>"display:none"%>
       <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%>
     <%else %>

config/locales/en.yml

@@ -1466,7 +1466,7 @@ en:
 
   label_your_course: your course
   label_have_message: have a new message
-  :lable_not_receive_mail: Click here don't receive email form site！
+  lable_not_receive_mail: Click here don't receive email form site！
 #added by linchun as competition#
 
   label_current_hot_contest: Latest Hot Competition