From 07e035f93c8779c0737926c1e00f30e35a3f49d0 Mon Sep 17 00:00:00 2001
From: mindless <mindless@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 12 Sep 2010 22:28:28 +0000
Subject: [PATCH] [HUDSON-7281] move include of yui treeview from layout.jelly
 to MatrixProject/configure-entries.jelly

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34729 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../hudson/matrix/MatrixProject/configure-entries.jelly    | 7 ++++++-
 core/src/main/resources/lib/layout/layout.jelly            | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
index 7cb05cc811..3997c69863 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
@@ -1,7 +1,7 @@
 <!--
 The MIT License
 
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly
+Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -41,6 +41,11 @@ THE SOFTWARE.
   </p:config-trigger>
 
   <f:section title="${%Configuration Matrix}">
+    <!-- Needed for LabelAxis, but including these from LabelAxis/config.jelly is too late -->
+    <l:yui module="treeview" />
+    <link rel="stylesheet" type="text/css"
+          href="${rootURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" />
+
     <f:block>
       <f:hetero-list name="axis" hasHeader="true"
                      descriptors="${descriptor.axisDescriptors}"
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 01366d91b6..b4b51ad409 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -105,10 +105,6 @@ THE SOFTWARE.
     <l:yui module="button" />
     <!--l:yui module="editor" suffix="-beta" /-->
 
-    <!-- TODO: moved here as a temporary fix against HUDSON-7281. Use YUILoader to fix this problem -->
-    <l:yui module="treeview" />
-    <link rel="stylesheet" href="${rootURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" type="text/css" />
-    
     <script src="${resURL}/scripts/hudson-behavior.js" type="text/javascript"></script>
 
     <script>
-- 
GitLab