Author: vbriand Date: 2011-01-13 11:58:47 +0100 (Thu, 13 Jan 2011) New Revision: 169 Url: http://chorem.org/repositories/revision/bow/169 Log: The bookmark modification now works on the search page too Modified: trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-13 10:58:47 UTC (rev 169) @@ -1,6 +1,7 @@ bow.action.locale.english=English bow.action.locale.french=French bow.bookmark.badFileFormat= +bow.bookmarks.noBookmarks= bow.config.alias.url.description= bow.config.application.version.description= bow.config.bow.addressFrom.description= Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-13 10:58:47 UTC (rev 169) @@ -1,6 +1,7 @@ bow.action.locale.english=Anglais bow.action.locale.french=Fran\u00E7ais bow.bookmark.badFileFormat= +bow.bookmarks.noBookmarks= bow.config.alias.url.description= bow.config.application.version.description= bow.config.bow.addressFrom.description= Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/webapp/jsp/home.jsp 2011-01-13 10:58:47 UTC (rev 169) @@ -75,7 +75,7 @@ } } else { %> - <p class="nobookmarks"><s:text name="bow.home.noBookmarks" /></p> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> <% } %> </div> @@ -101,7 +101,7 @@ } } else { %> - <p class="nobookmarks"><s:text name="bow.home.noBookmarks" /></p> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> <% } %> </div> <jsp:include page="inc/rightMenu.jsp" /> Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-13 10:58:47 UTC (rev 169) @@ -35,84 +35,84 @@ SimpleDateFormat sdf = (SimpleDateFormat) request.getAttribute("sdf"); String url = (String) request.getAttribute("bowUrl"); String aliasUrl = BowConfig.getInstance().getServletAliasUrl(); -String search = ""; -String searchLine = request.getParameter("searchLine"); -if (searchLine != null) { - search += "&searchLine=" + searchLine; -} -String fullTextLine = request.getParameter("fullTextLine"); -if (fullTextLine != null) { - search += "&fullTextLine=" + fullTextLine; -} url = "toto"; //TODO: à changer if (url != null && bookmark != null && sdf != null && bookmarkActions != null) { String formBookmarkId = (String) request.getAttribute("formBookmarkId"); String link = bookmark.getLink(); link = link.replace("'", "\\'"); -%> -<div class="bookmark"> - <div class="bookmarkhead"> - <a class="alias" href="<%=aliasUrl + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" onclick="window.open(this.href); return false;"> - <%=bookmark.getAlias()%> - </a> - <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> - <s:url id="editBookmark" action="modifyBookmark"> - <s:param name="bookmarkId"><%=bookmark.getWikittyId()%><%=search%></s:param> - </s:url> - <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#request.bookmark.getDescription()}', '%{#request.bookmark.getAlias()}', '%{#request.bookmark.getTags()}', '%{#request.bookmark.getLink()}', '%{editBookmark}', '%{#request.bookmark.getWikittyId()}');"></s:a> - <s:url id="removeBookmark" action="removeBookmark"> - <s:param name="bookmarkId"><%=bookmark.getWikittyId()%><%=search%></s:param> - </s:url> - <s:a cssClass="supprim" href="%{removeBookmark}"></s:a> - </div> - <div class="bookmarkcontenu"> - <div class="screenshot"></div> - <div class="click"><%=bookmark.getClick()%></div> - <div class="description"> - <h3>Description :</h3> - <p> - <s:url id="addClick" action="addClick"> - <s:param name="bookmarkId"><%=bookmark.getWikittyId()%></s:param> - </s:url> - <s:a title="" href="%{addClick}" onclick="window.open(this.href); return false;"><%=bookmark.getDescription()%></s:a> - <!-- <%=bookmark.getLink()%>--> - </p> - <p class="tags"> - <strong>Tags :</strong> - <% - Set<String> tagList = bookmark.getTags(); - - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { - %> - <s:url id="deleteTag" action="deleteTag"> - <s:param name="bookmarkId"><%=bookmark.getWikittyId()%></s:param> - <s:param name="deleteTag"><%=tag%><%=search%></s:param> - </s:url> - <% - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { - %> - <s:a cssStyle="text-decoration: none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - <% - } else { - %> - <!-- <%=bookmark.getWikittyId()%> --> - <s:a name="" cssStyle="display:none; text-decoration: none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - <% } %> - <s:url id="search" action="search"> - <s:param name="searchLine"><%=tag%></s:param> - </s:url> - <s:a href="%{search}" cssStyle="text-decoration: none"><%=tag%></s:a> - <% - } - } - %> - </p> - </div> - </div> -</div> -<% } %> + %> + <s:set var="searchLine" value="%{#request.searchLine}" /> + <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> + + <div class="bookmark"> + <div class="bookmarkhead"> + <a class="alias" href="<%=aliasUrl + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" onclick="window.open(this.href); return false;"> + <%=bookmark.getAlias()%> + </a> + <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> + <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> + <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#request.bookmark.getDescription()}', '%{#request.bookmark.getAlias()}', '%{#request.bookmark.getTags()}', '%{#request.bookmark.getLink()}', '%{editBookmark}', '%{#request.bookmark.getWikittyId()}');"></s:a> + <s:url id="removeBookmark" action="removeBookmark" escapeAmp="false"> + <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="supprim" href="%{removeBookmark}"></s:a> + </div> + <div class="bookmarkcontenu"> + <div class="screenshot"></div> + <div class="click"><%=bookmark.getClick()%></div> + <div class="description"> + <h3>Description :</h3> + <p> + <s:url id="addClick" action="addClick"> + <s:param name="bookmarkId"><%=bookmark.getWikittyId()%></s:param> + </s:url> + <s:a title="" href="%{addClick}" onclick="window.open(this.href); return false;"><%=bookmark.getDescription()%></s:a> + <!-- <%=bookmark.getLink()%>--> + </p> + <p class="tags"> + <strong>Tags :</strong> + <% + Set<String> tagList = bookmark.getTags(); + + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + %> + <s:url id="deleteTag" action="deleteTag"> + <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <s:param name="deleteTag"><%=tag%></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <% + if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { + %> + <s:a cssStyle="text-decoration: none;" href="%{deleteTag}"> + <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> + </s:a> + <% + } else { + %> + <!-- <%=bookmark.getWikittyId()%> --> + <s:a name="" cssStyle="display:none; text-decoration: none;" href="%{deleteTag}"> + <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> + </s:a> + <% } %> + <s:url id="search" action="search"> + <s:param name="searchLine"><%=tag%></s:param> + </s:url> + <s:a href="%{search}" cssStyle="text-decoration: none"><%=tag%></s:a> + <% + } + } + %> + </p> + </div> + </div> + </div> + <% } %> Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-13 10:58:47 UTC (rev 169) @@ -101,8 +101,8 @@ <h2><s:text name="bow.rightMenu.extensions" /></h2> <ul class="droite"> <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" alt="Chromium" class="extensionIcon" />Extension pour Chromium</a></li> - <li><strong><s:text name="bow.rightMenu.token.permanent" /></strong> <%=permanentToken%></li> - <li><strong><s:text name="bow.rightMenu.token.temporary" /></strong> <%=temporaryToken%></li> + <li><strong><s:text name="bow.rightMenu.token.permanent" /></strong><%=permanentToken%></li> + <li><strong><s:text name="bow.rightMenu.token.temporary" /></strong><%=temporaryToken%></li> </ul> </div> <div id="add" class="clearfix"> Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-01-13 09:19:30 UTC (rev 168) +++ trunk/src/main/webapp/jsp/search.jsp 2011-01-13 10:58:47 UTC (rev 169) @@ -33,12 +33,12 @@ <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); -//Preference preference = (Preference) session.getAttribute("preference"); -String searchLine = bookmarkActions.getSearchLine(); -String fullText = bookmarkActions.getFullTextLine(); if (tokenActions != null && bookmarkActions != null) { %> + <s:set var="searchLine" value="%{#request.bookmarkActions.getSearchLine()}" /> + <s:set var="fullText" value="%{#request.bookmarkActions.getFullTextLine()}" /> + <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" @@ -54,27 +54,28 @@ <div class="menu clearfix"> <h2><s:text name="bow.search.title" /></h2> <s:url id="order" action="order" escapeAmp="false"> - <s:param name="searchLine"><%=searchLine%></s:param> - <s:param name="fullTextLine"><%=fullText%></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> </s:url> <s:form action="%{order}"> <p> - <label for="type">Order By :</label> + <label for="type"><s:text name="bow.search.orderby" /></label> <select id="type" name="type"> - <option value="ascName">Asc Name</option> - <option value="descName">Desc Name</option> - <option value="ascClick">Asc Click</option> - <option value="descClick">Desc Click</option> - <option value="ascDate">Asc Date</option> - <option value="descDate">Desc Date</option> + <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" /> - <s:if test="%{#request.bookmarkActions.getBookmarks().size() > 0}"> + <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> + <s:if test="%{#bookmarksToDelete > 0}"> <s:url id="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> - <s:param name="searchLine"><%=searchLine%></s:param> - <s:param name="fullTextLine"><%=fullText%></s:param> + <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}', %{#request.bookmarkActions.getBookmarks().size()}); return(false);"></s:a> + <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> </s:if> </p> </s:form> @@ -90,16 +91,17 @@ 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:param name="searchLine" value="%{#searchLine}" /> + <jsp:param name="fullTextLine" value="%{#fullText}" /> </jsp:include> <% } } else { %> - <p class="nobookmarks">No Bookmarks</p> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> <% } %> </div> + <jsp:include page="inc/rightMenu.jsp" /> </body> </html> <% } %>