Author: bpoussin Date: 2012-08-22 09:05:43 +0200 (Wed, 22 Aug 2012) New Revision: 247 Url: http://chorem.org/repositories/revision/chorem/247 Log: amelioration des tooltips (on les affiches pas s'ils sont vide) Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-08-22 06:57:42 UTC (rev 246) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-08-22 07:05:43 UTC (rev 247) @@ -41,7 +41,21 @@ <tr> <td><span class="level level${c.level}" level="${c.level}">${c.userObject}</span></td> <c:forEach var="d" items="${data.dates}"> - <td class="currency"><span class="withTooltip" title='<w:display wikitties="${data.getInvoices(d, c.userObject)}" toString="%Invoice.reference|noref$s: %Invoice.amount|0.0$,.2f"/>'><f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/></span></td> + <td class="currency"> + <c:choose> + <c:when test="${data.getInvoices(d, c.userObject).isEmpty()}"> + <span> + <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> + </span> + </c:when> + <c:otherwise> + <span class="withTooltip" + title='<w:display wikitties="${data.getInvoices(d, c.userObject)}" toString="%Invoice.reference|noref$s: %Invoice.amount|0.0$,.2f"/>'> + <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> + </span> + </c:otherwise> + </c:choose> + </td> </c:forEach> </tr> </c:forEach>