Index: main/core/src/main/java/hudson/Functions.java =================================================================== --- main/core/src/main/java/hudson/Functions.java (revision 13799) +++ main/core/src/main/java/hudson/Functions.java (working copy) @@ -35,6 +35,9 @@ import hudson.util.Iterators; import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.apache.commons.jelly.JellyContext; +import org.apache.commons.jelly.JellyTagException; +import org.apache.commons.jelly.Script; +import org.apache.commons.jelly.XMLOutput; import org.apache.commons.jexl.parser.ASTSizeFunction; import org.apache.commons.jexl.util.Introspector; import org.kohsuke.stapler.Ancestor; @@ -872,6 +875,17 @@ } /** + * Evaluate a Jelly script and return output as a String. + * + * @since 1.267 + */ + public static String runScript(Script script) throws JellyTagException { + StringWriter out = new StringWriter(); + script.run(getCurrentJellyContext(), XMLOutput.createXMLOutput(out)); + return out.toString(); + } + + /** * Returns a sub-list if the given list is bigger than the specified 'maxSize' */ public static List subList(List base, int maxSize) { Index: main/core/src/main/resources/lib/hudson/projectView.jelly =================================================================== --- main/core/src/main/resources/lib/hudson/projectView.jelly (revision 13799) +++ main/core/src/main/resources/lib/hudson/projectView.jelly (working copy) @@ -40,47 +40,9 @@ - - - - healthReport - this.className='healthReport hover';return true; - - this.className='healthReport';return true; - - ${buildHealth.score}% - - - -
- - - - - - - - - - - - - - - - - -
W${%Description}%
- - ${rpt.localizableDescription}${rpt.score}
-
-
-
- + ${job.displayName} @@ -139,4 +101,4 @@ - \ No newline at end of file + Index: main/core/src/main/resources/lib/hudson/buildHealth.jelly =================================================================== --- main/core/src/main/resources/lib/hudson/buildHealth.jelly (revision 0) +++ main/core/src/main/resources/lib/hudson/buildHealth.jelly (revision 0) @@ -0,0 +1,47 @@ + + + + + + ${buildHealth.score} + healthReport + this.className='healthReport hover';return true; + + this.className='healthReport';return true; + + ${buildHealth.score}% + + + +
+ + + + + + + + + + + + + + + + + +
W${%Description}%
+ + ${rpt.localizableDescription}${rpt.score}
+
+
+ + Property changes on: main/core/src/main/resources/lib/hudson/buildHealth.jelly ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: main/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly =================================================================== --- main/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly (revision 13799) +++ main/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly (working copy) @@ -1,7 +1,10 @@ - + + + + + @@ -58,4 +61,4 @@ - \ No newline at end of file + Index: main/war/resources/css/style.css =================================================================== --- main/war/resources/css/style.css (revision 13799) +++ main/war/resources/css/style.css (working copy) @@ -459,31 +459,38 @@ /* ============================ health report hover ========================== */ -a.healthReport { +.healthReport a { text-decoration: none; } -div.healthReport div.healthReportDetails { +.healthReport div.healthReportDetails { display: none; } -div.healthReport:hover, div.healthReport.hover { /* fix IE6 bug with :hover */ +.healthReport:hover, .healthReport.hover { /* fix IE6 bug with :hover */ background: transparent; } -div.healthReport:hover div.healthReportDetails, div.healthReport.hover div.healthReportDetails { +.healthReport:hover div.healthReportDetails, .healthReport.hover div.healthReportDetails { display: block; position: absolute; background-color: #ffe; border: 1px solid #bbb; margin-left: 32px; /* move it across a bit */ + z-index: 26; } -div.healthReport div.healthReportDetails table { +.healthReport div.healthReportDetails table { border-collapse: collapse; width: 450px; /* fix IE bug with width */ } +/* ========================= build history ========================= */ +#buildHistory .healthReport { + display: inline; + margin-right: 1em; +} + /* ========================= editable combobox style ========================= */ .comboBoxList { border: 1px solid #000;