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

项目issue功能修改

Browse Source
rep_quality
daiao 9 years ago
parent 42ce066cf6
commit 8fb440c593
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File

9
app/views/issues/_project_issue.html.erb
Unescape View File

@ -40,6 +40,13 @@
周报 周报
<% end %> <% end %>
</li> </li>
<!--li class="c_grey">
<#% if activity.try(:author).try(:realname) == ' ' %>
<%#= link_to activity.try(:author), user_path(activity.author_id), :class => "c_grey" %>
<#% else %>
<%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "c_grey" %>
<%# end %>
</li-->
<li class="c_grey"> <li class="c_grey">
<% unless activity.assigned_to_id.nil? %> <% unless activity.assigned_to_id.nil? %>
<% if activity.try(:assigned_to).try(:realname).empty? %> <% if activity.try(:assigned_to).try(:realname).empty? %>
@ -48,7 +55,7 @@
<%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %> <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %>
<% end %> <% end %>
<% end %></li> <% end %></li>
<li class="c_grey" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li> <li class="c_grey" style="width: 60px; padding-right: 10px" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
<li class="issues_list_min c_grey" ><%= activity.status.name%></li> <li class="issues_list_min c_grey" ><%= activity.status.name%></li>
<li class="<%=(activity.done_ratio == 100 ? 'c_red' : 'c_green') %>"><%= activity.done_ratio %>%</li> <li class="<%=(activity.done_ratio == 100 ? 'c_red' : 'c_green') %>"><%= activity.done_ratio %>%</li>
<li class="issues_list_min"> <li class="issues_list_min">

26
app/views/issues/index.html.erb
Unescape View File

@ -4,7 +4,7 @@
<script> <script>
//issues列表 //issues列表
function g(o){ /*function g(o){
return document.getElementById(o); return document.getElementById(o);
} }
function HoverLi(n){ function HoverLi(n){
@ -15,7 +15,7 @@
} }
g('issues_list_nav_'+n).className='issues_nav_hover'; g('issues_list_nav_'+n).className='issues_nav_hover';
} }*/
$(function(){ $(function(){
$("#RSide").removeAttr("id"); $("#RSide").removeAttr("id");
$("#Container").css("width","1000px"); $("#Container").css("width","1000px");
@ -107,7 +107,7 @@
<input class="hw_search-input" placeholder="请输入问题名称" type="text" id="v_subject" name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()"> <input class="hw_search-input" placeholder="请输入问题名称" type="text" id="v_subject" name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
<a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a> <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
</div> </div>
<a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="HoverLi(1);all_reset_form();">清除</a> <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
<div class="calendar_div fr"> <div class="calendar_div fr">
<input name="issue_create_date_end" nhname="date_val" type="hidden"/> <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
@ -125,19 +125,19 @@
<div class="issues_con_list" style="position: relative;"> <div class="issues_con_list" style="position: relative;">
<ul id="issues_list_nav" > <ul id="issues_list_nav" >
<li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);all_reset_form();"> <li id="issues_list_nav_1" onclick="HoverLi(1);all_reset_form();">
<a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有<span class="issues_nav_tag ml5"><%= @project.project_score.issue_num %></span></a> <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有<span class="issues_nav_tag ml5"><%= @project.project_score.issue_num %></span></a>
</li> </li>
<li id="issues_list_nav_2" onclick="HoverLi(2);"> <!--li id="issues_list_nav_2" onclick="HoverLi(2);">
<a href="javascript:void(0);" onclick="switch_assign_to(<%= User.current.id %>)" id="issues_type_2" >指派给我 <a href="javascript:void(0);" onclick="switch_assign_to(<%#= User.current.id %>)" id="issues_type_2" >指派给我
<span id="issue_assigned_count"><%= render :partial => "issues/issue_filter" %></span> <span id="issue_assigned_count"><%#= render :partial => "issues/issue_filter" %></span>
</a> </a>
</li> </li>
<li id="issues_list_nav_3" onclick="HoverLi(3);"> <li id="issues_list_nav_3" onclick="HoverLi(3);">
<a href="javascript:void(0);" onclick="createByMe(<%= User.current.id %>)" id="issues_type_3" >我的发布 <a href="javascript:void(0);" onclick="createByMe(<%#= User.current.id %>)" id="issues_type_3" >我的发布
<span id="issue_author_count"><%= render :partial => "issues/issue_filter_author" %></span> <span id="issue_author_count"><%#= render :partial => "issues/issue_filter_author" %></span>
</a> </a>
</li> </li-->
<div class="cl"></div> <div class="cl"></div>
@ -151,6 +151,12 @@
{:include_blank => false, :selected => @tracker_id ? @tracker_id : 0}, {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
{:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %> {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
<%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
{ :include_blank => false,:selected=>@author_id ? @author_id : 0},
{:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"fl "}
)
%>
<%= select( :issue, :user_id, principals_options_for_isuue_list(@project), <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
{ :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0 { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
}, },

5
public/stylesheets/css/project.css
Unescape View File

@ -793,9 +793,10 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;} .issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;}
.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} .issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;} .issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;}
.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} .issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/project/arrow.png") no-repeat scroll right center transparent;}
.issues_form_filter select:focus {outline:none; border:none;}
input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } .issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; }
/* 缺陷Tab */ /* 缺陷Tab */
.issues_con_list{border:1px solid #c8c8c8; } .issues_con_list{border:1px solid #c8c8c8; }
#issues_list_nav {border-bottom:1px solid #d0d0d0;} #issues_list_nav {border-bottom:1px solid #d0d0d0;}

Write Preview
Loading…
Cancel
Save