Author: sletellier Date: 2011-05-16 15:52:58 +0200 (Mon, 16 May 2011) New Revision: 287 Url: http://chorem.org/repositories/revision/bow/287 Log: #276 Confirmation on bookmark deletion Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-05-16 13:52:58 UTC (rev 287) @@ -37,20 +37,31 @@ } -function deleteConfirmation(goTo, bookmarksNb, importDate) { +function deleteBookmarkConfirmation(goTo, bookmarkName) { + deleteConfirmation(goTo, bookmarkName, 0, undefined); +} + +function deleteImportConfirmation(goTo, bookmarksNb, importDate) { + deleteConfirmation(goTo, undefined, bookmarksNb, importDate); +} + +function deleteConfirmation(goTo, bookmarkName, bookmarksNb, importDate) { +// TODO sletellier 20110516 : use i18n to translate this ! + var confMsg = "Do you really want to delete "; if (bookmarksNb > 1) { confMsg += "these " + bookmarksNb + " bookmarks"; } else { - confMsg += "this bookmark"; + confMsg += "bookmark '" + bookmarkName + "'"; } if (importDate !== undefined) - confMsg += " imported the " + importDate + "?"; + confMsg += " imported the " + importDate + " ?"; else - confMsg += "?"; + confMsg += " ?"; if (confirm(confMsg)) { window.location = goTo; } + return false; } Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-05-16 13:52:58 UTC (rev 287) @@ -105,7 +105,8 @@ <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> + <s:a cssClass="supprim" href="%{removeBookmark}" + onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmarkAlias}');"></s:a> </div> <div class="bookmarkcontenu"> <div class="screenshot"></div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:52:58 UTC (rev 287) @@ -188,8 +188,8 @@ </s:url> <s:set name="date" value="%{key}"/> <s:set name="count" value="%{value}"/> - <a class="deleteImportButton" href="" - onclick="deleteConfirmation('${deleteImport}','${count}','<%=date%>'); return(false);"></a> + <a class="deleteImportButton" href="%{deleteImport}" + onclick="return deleteConfirmation('${deleteImport}','${count}','<%=date%>');"></a> </div> </s:iterator> </s:if>