qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	config/locales/zh.yml
This commit is contained in:
whimlex 2015-03-11 11:55:13 +08:00
parent 0eafbb92d5 49cf6e1319
commit 540ddd4a1b
8 changed files with 10 additions and 8 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?

1
app/controllers/files_controller.rb
View File

@ -21,6 +21,7 @@ class FilesController < ApplicationController
menu_item :files menu_item :files
before_filter :auth_login1, :only => [:index] before_filter :auth_login1, :only => [:index]
before_filter :logged_user_by_apptoken,:only => [:index]
before_filter :find_project_by_project_id#, :except => [:getattachtype] before_filter :find_project_by_project_id#, :except => [:getattachtype]
before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search] before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]

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/forums/create_feedback.js.erb
View File

@ -1,6 +1,6 @@
$(function(){ $(function(){
$("#button1").click(function(){ $("#button1").click(function(){
myTips(<%= l(:label_feedback_success)%>,"success"); myTips(<%= l(:label_forums_feedback_success)%>,"success");
}); });
}) })

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

@ -62,7 +62,7 @@
$.fn.fix = function(options){ $.fn.fix = function(options){
var defaults = { var defaults = {
float : 'right', float : 'right',
minStatue : false, minStatue : true,
skin : 'blue', skin : 'blue',
durationTime : 1000 durationTime : 1000
} }

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, 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 %> <% end %>
</div> </div>
<div class="subNav"> <div class="subNav">

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

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

2
config/locales/en.yml
View File

@ -27,7 +27,7 @@ en:
notice_account_deleted: "Your account has been permanently deleted." notice_account_deleted: "Your account has been permanently deleted."
notice_user_successful_create: "User %{id} created." 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_class_period_only_num: "class period can only digital"
error_can_t_load_default_data: "Default configuration could not be loaded: %{value}" 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." error_scm_not_found: "The entry or revision was not found in the repository."