<% if User.current.logged? %>
<%= l(:label_message_new) %>
diff --git a/app/views/forums/create_feedback.js.erb b/app/views/forums/create_feedback.js.erb
index 626840700..7d9fb6c9e 100644
--- a/app/views/forums/create_feedback.js.erb
+++ b/app/views/forums/create_feedback.js.erb
@@ -1,6 +1,6 @@
$(function(){
$("#button1").click(function(){
- myTips(<%= l(:label_feedback_success)%>,"success");
+ myTips(<%= l(:label_forums_feedback_success)%>,"success");
});
})
\ No newline at end of file
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 3095b05ce..cd1e1f40f 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -62,7 +62,7 @@
$.fn.fix = function(options){
var defaults = {
float : 'right',
- minStatue : false,
+ minStatue : true,
skin : 'blue',
durationTime : 1000
}
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index ee38a89c3..9b4c22b75 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -148,7 +148,7 @@
<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
(<%= @project.boards.first.topics.count %>)
<% 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 %>
diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb
index 4a76856f2..561c6a953 100644
--- a/app/views/words/_new.html.erb
+++ b/app/views/words/_new.html.erb
@@ -47,15 +47,15 @@
<% 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 %>
<%= l(:label_user_login_tips) %>
<%= link_to l(:label_user_login_new), signin_path %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 938b63bcd..4622e2e8a 100644
--- a/config/locales/en.yml
+++ b/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."