Skip to content

Commit

Permalink
JENKINS-7824: use spaces rather than tabs in jelly files modified to add
Browse files Browse the repository at this point in the history 
assigned by details
  • Loading branch information
@ninian
ninian committed Aug 24, 2014
1 parent 69dd1a8 commit 45c067c
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
36 changes: 18 additions & 18 deletions src/main/resources/hudson/plugins/claim/AbstractClaimBuildAction/summary.jelly
View file
Expand Up @@ -22,14 +22,14 @@
<j:choose>
<j:when test="${it.hasClaimDate()}">
<j:choose>
<j:when test="${it.isSelfAssigned()}">
${%you.claimed.on(it.noun)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:when>
<j:otherwise>
${%you.assigned.on(it.noun, it.assignedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:otherwise>
<j:when test="${it.isSelfAssigned()}">
${%you.claimed.on(it.noun)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:when>
<j:otherwise>
${%you.assigned.on(it.noun, it.assignedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:otherwise>
</j:choose>
</j:when>
<j:otherwise>
Expand All @@ -49,16 +49,16 @@
<p>
<j:choose>
<j:when test="${it.hasClaimDate()}">
<j:choose>
<j:when test="${it.isSelfAssigned()}">
${%one.claimed.on(it.noun,it.claimedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:when>
<j:otherwise>
${%one.assigned.on(it.noun, it.claimedByName,it.assignedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:otherwise>
</j:choose>
<j:choose>
<j:when test="${it.isSelfAssigned()}">
${%one.claimed.on(it.noun,it.claimedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:when>
<j:otherwise>
${%one.assigned.on(it.noun, it.claimedByName,it.assignedByName)}
<i:formatDate value="${it.claimDate}" type="both" dateStyle="medium" timeStyle="medium"/>${%.}
</j:otherwise>
</j:choose>
</j:when>
<j:otherwise>
${%one.claimed(it.noun,it.claimedByName)}
Expand Down
44 changes: 22 additions & 22 deletions src/main/resources/hudson/plugins/claim/ClaimColumn/column.jelly
View file
Expand Up @@ -28,30 +28,30 @@ THE SOFTWARE.
<j:choose>
<j:when test="${action.claim.reason != null}">
<j:choose>
<j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
<img width="16" height="16"
title="${%climed.reason(action.combinationName,action.claim.claimedBy,action.claim.reason)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:when>
<j:otherwise>
<img width="16" height="16"
title="${%assigned.reason(action.claim.claimedBy,action.claim.assignedBy,action.claim.reason)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:otherwise>
</j:choose>
<j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
<img width="16" height="16"
title="${%climed.reason(action.combinationName,action.claim.claimedBy,action.claim.reason)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:when>
<j:otherwise>
<img width="16" height="16"
title="${%assigned.reason(action.claim.claimedBy,action.claim.assignedBy,action.claim.reason)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:otherwise>
</j:choose>
</j:when>
<j:otherwise>
<j:choose>
<j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
<img width="16" height="16"
title="${%climed(action.combinationName,action.claim.claimedBy)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:when>
<j:otherwise>
<img width="16" height="16"
title="${%climed(action.claim.claimedBy,action.claim.assignedBy)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:otherwise>
<j:choose>
<j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
<img width="16" height="16"
title="${%climed(action.combinationName,action.claim.claimedBy)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:when>
<j:otherwise>
<img width="16" height="16"
title="${%climed(action.claim.claimedBy,action.claim.assignedBy)}"
src="${imagesURL}/16x16/lock.gif"/>
</j:otherwise>
</j:choose>
</j:otherwise>
</j:choose>
Expand Down

0 comments on commit 45c067c

Please sign in to comment.