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

issue详情页面在 user动态、project动态中修改

This commit is contained in:
huang 2016-01-21 17:29:46 +08:00
parent e2fc88e3d1
commit 448a412abf
2 changed files with 49 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
app/views/users/_project_issue_detail.html.erb
View File

@ -36,98 +36,76 @@
<ul class="fl">
<li>
<p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
<p class="proInfoP"><span>新增</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a></p>
<select class="w80 undis issueEdit">
<option value="1" selected="selected">新增</option>
<option value="2">正在解决</option>
<option value="3">已解决</option>
<option value="4">反馈</option>
<option value="5">关闭</option>
</select>
<p class="proInfoP"><span><%= activity.status.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a></p>
<%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
{ :include_blank => false,:selected=>@status_id ? @status_id : 0
},
{:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit"}
)
%>
</li>
<div class="cl"></div>
<li>
<p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
<span class="pro_info_p"><a href="https://user.trustie.net/users/6062/user_activities" class="linkBlue hidden" style="max-width:50px; display:inline-block;">lizanle</a> <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
<select class="w80 undis issueEdit">
<option value="8523">&lt;&lt; 我 &gt;&gt;</option>
<option value="6521">a411763600</option>
<option value="195">alan</option>
<option value="34">baiyu</option>
<option value="3622">bill</option>
<option value="4007">binling</option>
<option value="8686">cxt</option>
<option value="6571">gt19910510</option>
<option value="3135">guange</option>
<option value="12">Hjqreturn</option>
<option value="5">jacknudt</option>
<option value="6533">joneszhou</option>
<option value="6">linchun</option>
<option value="6062">lizanle</option>
<option value="8693">ouyangxuhua</option>
<option value="3050">suntao</option>
<option value="1305">sw</option>
<option value="8523">TimTang</option>
<option value="6066">whimlex</option>
<option value="8288">wk6abc</option>
<option value="8221">yutao</option>
<option value="1303">z9hang</option>
<option value="8190">zhanghongyan</option>
</select>
<span class="pro_info_p">
<%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:50px; display:inline-block;" %>
<a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
<%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
{ :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
},
{:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"w70 undis issueEdit"}
)
%>
</li>
<div class="cl"></div>
</ul>
<ul class="fl">
<li>
<p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
<span class="proInfoP" style="width:70px;"><span>立刻</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
<select class="w70 undis issueEdit">
<option value="1">低</option>
<option value="2" selected="selected">正常</option>
<option value="3">高</option>
<option value="4">紧急</option>
<option value="5">立刻</option>
</select>
<span class="proInfoP" style="width:70px;"><span><%= activity.priority.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
<%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
{ :include_blank => false,:selected=>@priority_id ? @priority_id : 0
},
{:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w70 undis issueEdit"}
)
%>
</li>
<div class="cl"></div>
<li>
<p class="label03">&nbsp;完成度&nbsp;&nbsp;:&nbsp;</p>
<span class="proInfoP" style="width:70px;"><span>0%</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
<select class="w70 undis issueEdit">
<option value="0" selected="selected">0 %</option>
<option value="10">10 %</option>
<option value="20">20 %</option>
<option value="30">30 %</option>
<option value="40">40 %</option>
<option value="50">50 %</option>
<option value="60">60 %</option>
<option value="70">70 %</option>
<option value="80">80 %</option>
<option value="90">90 %</option>
<option value="100">100 %</option>
</select>
<span class="proInfoP" style="width:70px;"><span><%= activity.done_ratio %>%</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
<%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
{ :include_blank => false,:selected=>@priority_id ? @priority_id : 0
},
{:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w70 undis issueEdit"}
)
%>
<%#= select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
{:required => @issue.required_attribute?('done_ratio'), :no_label => true},
:onchange => "PrecentChange(this.value)",
:class => "w150" %>
</li>
<div class="cl"></div>
</ul>
<ul class="fl ">
<li>
<p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
<p class="proInfoP" style="width:100px;"><span>2015-12-11</span></p>
<p class="proInfoP" style="width:100px;"><span><%= format_date(activity.start_date) %></span></p>
</li>
<div class="cl"></div>
<li>
<p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
<span class="proInfoP" style="width:100px;">0.00 小时</span> </li>
<span class="proInfoP" style="width:100px;"><%= l_hours(activity.estimated_hours) %></span> </li>
<div class="cl"></div>
</ul>
<ul class="fl ml20">
<li>
<p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
<span class="proInfoP" style="width:120px;"><span>--</span></span> </li>
<span class="proInfoP" style="width:120px;"><span><%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %></span></span> </li>
<div class="cl"></div>
<li>
<p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
<span class="pro_info_p" style="width:120px;"><a href="/versions/153" class="linkBlue hidden" style="max-width:90px; display:inline-block;">20151211周五上线版本</a> </span> </li>
<span class="proInfoP" style="width:120px;"><%= (activity.fixed_version ? link_to_version(activity.fixed_version) : "--") %> </span> </li>
<div class="cl"></div>
</ul>
<!--pro_info_box end-->

11
public/stylesheets/new_user.css
View File

@ -1422,3 +1422,14 @@ span.at a{color:#269ac9;text-decoration: none;}
.orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
.relatePWrap{max-height: 210px;overflow:hidden;}
/*20160115问题跟踪*/
.proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
.proInfoBox2 ul li{ height:24px; position:relative;}
.pic_edit2{display:inline-block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;}
.pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
.w70{ width:70px;}
.w80{ width:80px;}
.label03{ width:70px; text-align:right; display:block; float:left;}
.pro_info_p{color:#0781b4 !important; float:left; width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
.proInfoP{color:#000000 !important; float:left; width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }