From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 18 Jun 2016 06:50:59 +0000 (+0000)
Subject: Merged r15543.
X-Git-Tag: 3.3.0~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b4840719495bd17a508f3eadf93af4053e7dd5a;p=redmine.git

Merged r15543.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15544 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 007f0fab2..3e384530c 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -23,15 +23,11 @@
     <%= textilizable @project.description %>
   </div>
   <% end %>
-  <% if @project.homepage.present? || @subprojects.any? || @project.visible_custom_field_values.any?(&:present?) %>
+  <% if @project.homepage.present? || @project.visible_custom_field_values.any?(&:present?) %>
   <ul>
   <% unless @project.homepage.blank? %>
     <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to_if uri_with_safe_scheme?(@project.homepage), @project.homepage, @project.homepage %></li>
   <% end %>
-  <% if @subprojects.any? %>
-    <li><span class="label"><%=l(:label_subproject_plural)%>:</span>
-      <%= @subprojects.collect{|p| link_to p, project_path(p)}.join(", ").html_safe %></li>
-  <% end %>
   <% render_custom_field_values(@project) do |custom_field, formatted| %>
     <li><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
   <% end %>
@@ -95,6 +91,14 @@
     <p><%= link_to l(:label_news_view_all), project_news_index_path(@project) %></p>
   </div>
   <% end %>
+
+  <% if @subprojects.any? %>
+  <div class="projects box">
+    <h3><%=l(:label_subproject_plural)%></h3>
+    <%= @subprojects.collect{|p| link_to p, project_path(p)}.join(", ").html_safe %>
+  </div>
+  <% end %>
+
   <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>