Author: bpoussin Date: 2011-04-20 15:36:20 +0200 (Wed, 20 Apr 2011) New Revision: 248 Url: http://chorem.org/repositories/revision/bow/248 Log: suppression des tabulations et reformatage Modified: trunk/bow-ui/src/main/webapp/jsp/search.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:25:07 UTC (rev 247) +++ trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:36:20 UTC (rev 248) @@ -31,71 +31,71 @@ BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); if (bookmarkActions != null) { - %> +%> - <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - - <s:set var="searchLine" value="%{#request.bookmarkActions.getSearchLine()}" /> - <s:set var="fullText" value="%{#request.bookmarkActions.getFullTextLine()}" /> - - <head> - <title><s:text name="bow.search.title" /></title> - <s:url var="css" value="/css/bookmark.css" /> - <link href="${css}" rel="stylesheet" type="text/css" /> - <s:head /> - </head> - <body> - <div class="menu clearfix"> - <h2><s:text name="bow.search.title" /></h2> - <s:form action="order"> - <p> - <label for="type"><s:text name="bow.search.orderby" /></label> - <select id="type" name="type"> - <option value="ascName"><s:text name="bow.search.ascname" /></option> - <option value="descName"><s:text name="bow.search.descname" /></option> - <option value="ascClick"><s:text name="bow.search.ascclick" /></option> - <option value="descClick"><s:text name="bow.search.descclick" /></option> - <option value="ascDate"><s:text name="bow.search.ascdate" /></option> - <option value="descDate"><s:text name="bow.search.descdate" /></option> - </select> - <s:submit key="bow.search.submit" name="submit" /> - <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> - <s:if test="%{#bookmarksToDelete > 0}"> - <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> - </s:url> - <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> - </s:if> - <s:hidden name="searchLine" value="%{#searchLine}" /> - <s:hidden name="fullTextLine" value="%{#fullText}" /> - </p> - </s:form> - </div> - <div class="content"> - <% - List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); - - if (!bookmarkList.isEmpty()) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (BowBookmark bookmark : bookmarkList) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <jsp:include page="inc/bookmark.jsp" flush="true"> - <jsp:param name="searchLine" value="%{#searchLine}" /> - <jsp:param name="fullTextLine" value="%{#fullText}" /> - </jsp:include> - <% - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> - </body> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + + <s:set var="searchLine" value="%{#request.bookmarkActions.getSearchLine()}" /> + <s:set var="fullText" value="%{#request.bookmarkActions.getFullTextLine()}" /> + + <head> + <title><s:text name="bow.search.title" /></title> + <s:url var="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div class="menu clearfix"> + <h2><s:text name="bow.search.title" /></h2> + <s:form action="order"> + <p> + <label for="type"><s:text name="bow.search.orderby" /></label> + <select id="type" name="type"> + <option value="ascName"><s:text name="bow.search.ascname" /></option> + <option value="descName"><s:text name="bow.search.descname" /></option> + <option value="ascClick"><s:text name="bow.search.ascclick" /></option> + <option value="descClick"><s:text name="bow.search.descclick" /></option> + <option value="ascDate"><s:text name="bow.search.ascdate" /></option> + <option value="descDate"><s:text name="bow.search.descdate" /></option> + </select> + <s:submit key="bow.search.submit" name="submit" /> + <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> + <s:if test="%{#bookmarksToDelete > 0}"> + <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> + </s:url> + <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> + </s:if> + <s:hidden name="searchLine" value="%{#searchLine}" /> + <s:hidden name="fullTextLine" value="%{#fullText}" /> + </p> + </s:form> + </div> + <div class="content"> + <% + List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); + + if (!bookmarkList.isEmpty()) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (BowBookmark bookmark : bookmarkList) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <jsp:include page="inc/bookmark.jsp" flush="true"> + <jsp:param name="searchLine" value="%{#searchLine}" /> + <jsp:param name="fullTextLine" value="%{#fullText}" /> + </jsp:include> + <% + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% + } %> + </div> + </body> </html> <% } %>