summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-23 01:52:35 (EST)
committer Winston Prakash2011-12-01 20:47:04 (EST)
commitb66ff7ee90f6deac1696dc8103a21f7055b99715 (patch)
treeee3cd024d2b64c6539970db645e8dc43690d341c
parent358769d6f1c22d538322fd9f621b4973c0364baa (diff)
downloadorg.eclipse.hudson.core-b66ff7ee90f6deac1696dc8103a21f7055b99715.zip
org.eclipse.hudson.core-b66ff7ee90f6deac1696dc8103a21f7055b99715.tar.gz
org.eclipse.hudson.core-b66ff7ee90f6deac1696dc8103a21f7055b99715.tar.bz2
Implement cascading support for hetero-list.jelly. Add css style for div.modified
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/resources/lib/form/hetero-list.jelly15
-rw-r--r--hudson-war/src/main/webapp/css/style.css5
2 files changed, 14 insertions, 6 deletions
diff --git a/hudson-core/src/main/resources/lib/form/hetero-list.jelly b/hudson-core/src/main/resources/lib/form/hetero-list.jelly
index 94bb4e4..c6251e0 100644
--- a/hudson-core/src/main/resources/lib/form/hetero-list.jelly
+++ b/hudson-core/src/main/resources/lib/form/hetero-list.jelly
@@ -1,6 +1,6 @@
<!-- **************************************************************************
#
-# Copyright (c) 2004-2010 Oracle Corporation.
+# Copyright (c) 2004-2011 Oracle Corporation.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Kohsuke Kawaguchi
+# Kohsuke Kawaguchi, Nikita Levyankov
#
#
#************************************************************************** -->
@@ -44,6 +44,9 @@
For each item, add a caption from descriptor.getDisplayName().
This also activates drag&amp;drop (where the header is a grip), and help text support.
</st:attribute>
+ <st:attribute name="isPropertyOverridden">
+ if present and true - value is overridden
+ </st:attribute>
</st:documentation>
<d:taglib uri="local">
<d:tag name="body">
@@ -58,7 +61,7 @@
</td>
<j:if test="${help!=null}">
<td>
- <a href="#" class="help-button" helpURL="${rootURL}${help}"><img src="${imagesURL}/16x16/help.png" alt="[help]"/></a>
+ <a href="#" class="help-button" helpURL="${rootURL}${help}"><img src="${imagesURL}/16x16/help.gif" alt="[help]"/></a>
</td>
</j:if>
</tr>
@@ -81,9 +84,11 @@
<input type="hidden" name="kind" value="${descriptor.class.name}" />
</d:tag>
</d:taglib>
-
+ <j:if test="${attrs.isPropertyOverridden==null}">
+ <j:set target="${attrs}" property="isPropertyOverridden" value="false"/>
+ </j:if>
<j:set var="targetType" value="${attrs.targetType?:it.class}"/>
- <div class="hetero-list-container${hasHeader?' with-drag-drop':''}">
+ <div class="hetero-list-container${hasHeader?' with-drag-drop':''}${attrs.isPropertyOverridden? ' modified' :''}">
<!-- display existing items -->
<j:forEach var="i" items="${attrs.items}">
<j:set var="descriptor" value="${i.descriptor}" />
diff --git a/hudson-war/src/main/webapp/css/style.css b/hudson-war/src/main/webapp/css/style.css
index 6446519..a382b92 100644
--- a/hudson-war/src/main/webapp/css/style.css
+++ b/hudson-war/src/main/webapp/css/style.css
@@ -1002,8 +1002,11 @@ div.deleteSlaveDialog h4 {
}
/* ======================== "Cascading project" ==========================*/
/* --- Optional Block, Entry Block --- */
+td.modified,
+div.modified,
tr.optional-block-start > td.modified,
-tr.modified > td.setting-name, tr.modified > td.setting-main, tr.modified > td.setting-leftspace, td.modified {
+tr.modified > td.setting-name,
+tr.modified > td.setting-main, tr.modified > td.setting-leftspace {
background-color: #FFE8C9;
}