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

app/views/issues/show.html.erb

@@ -26,7 +26,7 @@
   <% end %>
 
   <!-- <%= avatar(@issue.author, :size => "50") %> -->
-	
+
 <div class="subject">
 <%= render_issue_subject_with_tree(@issue) %>
 </div> 
@@ -35,7 +35,7 @@
  <span id="praise_tread" style="float: right">
        <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id}%>
   </span>
-	          
+
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
         <% if @issue.created_on != @issue.updated_on %>
@@ -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>

public/themes/redpenny-master/stylesheets/application.css

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