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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-11-11 18:41:36 +08:00
parent 3aec93e5e4 5104340b78
commit a2b0717aaa
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -1203,7 +1203,7 @@ class UsersController < ApplicationController
#引入资源列表根据关键词过滤
def user_ref_resource_searc
def user_ref_resource_search
@resource_id = params[:mul_id]
@resource_type = params[:mul_type]
@order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"

2
app/views/issues/show.html.erb
View File

@ -61,7 +61,7 @@
<li class="clear">
<span class="pro_new_conbox_leftspan fl">指派给</span>
<span class="pro_new_conbox_rightspan fl ml10">
<a href="<%= @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to_id) %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
<a href="<%= @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to) %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
</li>
<% end %>
<% unless @issue.disabled_core_fields.include?('fixed_version_id') %>

3
app/views/projects/settings/_new_versions_form.html.erb
View File

@ -23,7 +23,8 @@
</li>
<div class="cl mb10"></div>
</ul>
<a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a><a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
<a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a>
<a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
</div>
<% end %>
<script>

11
app/views/projects/show.html.erb
View File

@ -1,11 +1,13 @@
<!--新版项目头部结束-->
<div class="pro_new_info mb10 break_word">
<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" >
<div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
<div id="project_description_code" >
<% if @project.description.blank? %>
<p class="break_word"><%= @project.name %></p>
<p class="break_word" style="padding-top:5px"><%= @project.name %></p>
<% else %>
<p class="break_word"><%=h @project.description.html_safe %></p>
<p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
<% end %>
</div>
</div>
<input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
@ -35,3 +37,6 @@
<%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
</div>
<script>
autoUrl('project_description_code');
</script>

2
app/views/versions/show.html.erb
View File

@ -70,7 +70,7 @@
<td>#<%= issue.id %></td>
<td><a href="<%= issue_path(issue) %>" class="new_roadmap_info_title" title="<%= issue.subject %>" target="_blank"><%= issue.subject %></a> </td>
<td> <%= issue.tracker %> </td>
<td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to_id) %>" class="new_roadmap_info_name" target="_blank">
<td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" class="new_roadmap_info_name" target="_blank">
<%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %></a>
</td>
<td><%= format_time issue.updated_on %></td>

2
public/stylesheets/css/project.css
View File

@ -887,7 +887,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
/*项目简介*/
.pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;}
.pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
.pro_new_info p{ padding-bottom:2px; padding-left: 5px; color: #666; padding-right: 5px}
.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}
.pro_new_info_weight{ font-size: 16px; font-weight: bold;}
/* 新版项目配置*/
.pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}