Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
sw 2014-05-29 11:49:56 +08:00
commit 86cb496f3f
2 changed files with 5 additions and 3 deletions

View File

@ -107,10 +107,12 @@ end %>
<% if false # !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
<hr />
<div id="issue_tree">
<div class="contextual">
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
</div>
<p><strong><%=l(:label_subtask_plural)%></strong></p>
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
</div>

View File

@ -968,7 +968,7 @@ hr
p
{
font-size: 13px;
position:relative;/*gcm*/
/*position:relative;/*gcm*/
}
/*end*/
div.issue