From d9b23a2dc20d7be8d3bec6ce317ff65688f95c76 Mon Sep 17 00:00:00 2001
From: Seiji Sogabe <s.sogabe@gmail.com>
Date: Wed, 21 Nov 2012 19:07:26 +0900
Subject: [PATCH] FIXED JENKINS-15887 "Disable Project" button breaks Free
 style project pages.

---
 changelog.html                                                | 4 ++++
 .../main/resources/hudson/model/AbstractProject/main.jelly    | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index 6a93d1f857..75b9fca8ee 100644
--- a/changelog.html
+++ b/changelog.html
@@ -83,6 +83,10 @@ Upcoming changes</a>
   <li class=bug>
     Maven2 job fails when using maven-failsafe-plugin
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15865">issue 15865</a>)
+  <li class=bug>
+    "Disable Project" button breaks Free style project pages.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15887">issue 15887</a>)
+    
 
 </ul>
 </div><!--=TRUNK-END=-->
diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
index ceb1829cc9..e60dc3ca64 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/main.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
@@ -25,12 +25,13 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
-  <p:projectActionFloatingBox />
 
   <j:if test="${it.supportsMakeDisabled()}">
     <st:include page="makeDisabled.jelly" />
   </j:if>
 
+  <p:projectActionFloatingBox />
+  
   <table style="margin-top: 1em; margin-left:1em;">
 
     <j:forEach var="act" items="${it.prominentActions}">
-- 
GitLab