| author | akozak | 2011-11-23 08:43:14 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:11 (EST) |
| commit | bafd1fdd228d42c04491b9959334d3d1bfda7382 (patch) (side-by-side diff) | |
| tree | 25eaaaed8c85c9d8e687cdcb807d1bbf6e12beef | |
| parent | 7e269aaa4943f2e655463ca8fa2ea1ba8ea90833 (diff) | |
| download | org.eclipse.hudson.core-bafd1fdd228d42c04491b9959334d3d1bfda7382.zip org.eclipse.hudson.core-bafd1fdd228d42c04491b9959334d3d1bfda7382.tar.gz org.eclipse.hudson.core-bafd1fdd228d42c04491b9959334d3d1bfda7382.tar.bz2 | |
Fixed issue with revert button rendering in IE.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/src/main/resources/lib/form/optionalBlock.jelly | 20 | ||||
| -rw-r--r-- | hudson-core/src/main/resources/lib/form/section.jelly | 7 | ||||
| -rw-r--r-- | hudson-war/src/main/webapp/css/style.css | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/hudson-core/src/main/resources/lib/form/optionalBlock.jelly b/hudson-core/src/main/resources/lib/form/optionalBlock.jelly index 649fd6b..6f0cea6 100644 --- a/hudson-core/src/main/resources/lib/form/optionalBlock.jelly +++ b/hudson-core/src/main/resources/lib/form/optionalBlock.jelly @@ -61,17 +61,17 @@ </j:if> <tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning --> - <td colspan="3" class="${attrs.isPropertyOverridden? 'modified': 'original'}"> - <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)" + <td colspan="3" class="${attrs.isPropertyOverridden? 'modified': 'original'}"> + <j:if test="${attrs.isPropertyOverridden and !empty(attrs.resetUrl)}"> + <div class="optional-reset"> + <a href="#" class="reset-button" resetURL="${resetUrl}"> + <img src="${imagesURL}/16x16/undo.png" alt="Reset ${title}" /> + </a> + </div> + </j:if> + <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)" negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" /> - </td> - <j:if test="${attrs.isPropertyOverridden and !empty(attrs.resetUrl)}"> - <td> - <a href="#" class="reset-button" resetURL="${resetUrl}"> - <img src="${imagesURL}/16x16/undo.png" alt="Reset ${title}" /> - </a> </td> - </j:if> <j:if test="${attrs.help!=null}"> <td> <a href="#" class="help-button" helpURL="${rootURL}${attrs.help}"><img src="${imagesURL}/16x16/help.gif" alt="Help for feature: ${title}" /></a> @@ -84,4 +84,4 @@ <d:invokeBody /> <!-- end marker --> <tr class="${attrs.inline?'':'row-set-end'} optional-block-end" /> -</j:jelly>
\ No newline at end of file +</j:jelly> diff --git a/hudson-core/src/main/resources/lib/form/section.jelly b/hudson-core/src/main/resources/lib/form/section.jelly index b879a14..98aa4fe 100644 --- a/hudson-core/src/main/resources/lib/form/section.jelly +++ b/hudson-core/src/main/resources/lib/form/section.jelly @@ -33,9 +33,6 @@ <f:rowSet name="${attrs.name}"> <j:if test="${attrs.title!=null}"> <f:block> - <div style="font-weight:bold; border-bottom: 1px solid black; margin-bottom:0.2em; margin-top:0.4em"> - ${title} - </div> <j:if test="${!empty(attrs.resetUrl)}"> <div class="section-reset"> <a href="#" class="reset-button" resetURL="${resetUrl}"> @@ -43,8 +40,12 @@ </a> </div> </j:if> + <div style="font-weight:bold; border-bottom: 1px solid black; margin-bottom:0.2em; margin-top:0.4em"> + ${title} + </div> </f:block> </j:if> <d:invokeBody/> </f:rowSet> </j:jelly> + diff --git a/hudson-war/src/main/webapp/css/style.css b/hudson-war/src/main/webapp/css/style.css index 141daa4..c56c499 100644 --- a/hudson-war/src/main/webapp/css/style.css +++ b/hudson-war/src/main/webapp/css/style.css @@ -89,7 +89,7 @@ dt { } #main-panel { - padding: 10px; + padding: 10px 10px 10px 20px; } #side-panel { |