jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	app/views/layouts/base_projects.html.erb
This commit is contained in:
huang 2015-03-11 11:19:38 +08:00
parent 085302e0f7 d177f1ae89
commit b10cb7836c
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/boards_controller.rb
View File

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

2
app/views/boards/_project_show.html.erb
View File

@ -7,7 +7,7 @@
} }
} }
</script> </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? %> <% if User.current.logged? %>
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= l(:label_message_new) %></h2> <h2 class="project_h2"><%= l(:label_message_new) %></h2>

2
app/views/layouts/base_projects.html.erb
View File

@ -148,7 +148,7 @@
<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %> <%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
<span class="subnav_num">(<%= @project.boards.first.topics.count %>)</span> <span class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
<% if User.current.logged? && User.current.member_of?(@project) %> <% 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 %> <% end %>
</div> </div>
<div class="subNav"> <div class="subNav">

4
app/views/words/_new.html.erb
View File

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

2
config/locales/en.yml
View File

@ -1466,7 +1466,7 @@ en:
label_your_course: your course label_your_course: your course
label_have_message: have a new message 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# #added by linchun as competition#
label_current_hot_contest: Latest Hot Competition label_current_hot_contest: Latest Hot Competition