Author: bpoussin Date: 2011-04-16 18:49:55 +0200 (Sat, 16 Apr 2011) New Revision: 241 Url: http://chorem.org/repositories/revision/bow/241 Log: Evolution #278: Twice the same bookmark la description se presente bien (conversion \n -> <br/>) Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-16 16:36:48 UTC (rev 240) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-16 16:49:55 UTC (rev 241) @@ -29,6 +29,16 @@ xmlns:jsp="http://java.sun.com/JSP/Page"> <s:if test="%{#request.bookmark != null}"> + <% + BowBookmark bookmark = (BowBookmark)request.getAttribute("bookmark"); + String bookmarkDescription = bookmark.getDescription(); + if (bookmarkDescription == null) { + bookmarkDescription = ""; + } else { + bookmarkDescription = bookmarkDescription.replaceAll("\n", "<br/>"); + } + %> + <s:set var="searchLine" value="%{#request.searchLine}" /> <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> @@ -84,7 +94,7 @@ </s:url> <s:a title="%{#bookmarkLink}" href="%{redirectTo}" onclick="window.open(this.href); return false;"> - <s:property value="%{#bookmarkDescription}" /> + <%=bookmarkDescription%> </s:a> </p> <p class="tags">