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

Conflicts:
	app/views/layouts/base_projects.html.erb

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), :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,15 +47,15 @@
     </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 %>
+    <%else %>
       <div style="font-size: 14px;margin:10px;">
 	    <%= l(:label_user_login_tips) %>
 	    <%= link_to l(:label_user_login_new), signin_path %>

config/locales/en.yml

@@ -27,7 +27,7 @@ en:
   notice_account_deleted: "Your account has been permanently deleted."
   notice_user_successful_create: "User %{id} created."
 
-  error_attachment_empty:  "error in add file"
+  error_attachment_empty: "error in add file"
   error_class_period_only_num: "class period can only digital"
   error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
   error_scm_not_found: "The entry or revision was not found in the repository."
@@ -1420,7 +1420,7 @@ en:
 
   label_new_join: Join
   label_new_join_order: Please input the course order.
-  label_homeworks_form_new_description: Release a task,the submit form of the task may be accessory or project,setting in the task form.
+  label_homeworks_form_new_description: Release a task, the submit form of the task may be accessory or project, setting in the task form.
   label_course_settings: Setting
   field_homework_type: Submit form
   label_task_submit_form_accessory: Submitted as accessory
@@ -1465,8 +1465,8 @@ en:
   label_activity_time: publish date
 
   label_your_course: your course
-  label_have_message :  have a new message
-  :lable_not_receive_mail: Click here don't receive email form site！
+  label_have_message: have a new message
+  lable_not_receive_mail: Click here don't receive email form site！
 #added by linchun as competition#
 
   label_current_hot_contest: Latest Hot Competition
@@ -1656,8 +1656,8 @@ en:
   label_add_tag: Add Tag
 
   #api
-   label_recently_updated_notification: Recently updated notification
-   label_recently_updated_homework: Recently updated the homework
-   label_recently_updated_message: Recently updated the message
-   label_recently_updated_courseware: Recently updated the courseware
-   label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course!
+  label_recently_updated_notification: Recently updated notification
+  label_recently_updated_homework: Recently updated the homework
+  label_recently_updated_message: Recently updated the message
+  label_recently_updated_courseware: Recently updated the courseware
+  label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course!

lib/redmine/plugin.rb

@@ -77,7 +77,7 @@ module Redmine #:nodoc:
       # Adds plugin locales if any
       # YAML translation files should be found under <plugin>/config/locales/
       ::I18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', '*.yml'))
-      ::I18n.load_path += Dir.glob(File.join(Rails.root, 'config', 'locales', '**','*.yml'))
+      ::I18n.load_path += Dir.glob(File.join(Rails.root, 'config', 'locales', '**', '*.yml'))
       # Prepends the app/views directory of the plugin to the view path
       view_path = File.join(p.directory, 'app', 'views')
       if File.directory?(view_path)