Author: sletellier Date: 2011-04-26 15:38:57 +0200 (Tue, 26 Apr 2011) New Revision: 264 Url: http://chorem.org/repositories/revision/bow/264 Log: - Forward to bookmark edition when create public alias without javascript 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-26 13:17:07 UTC (rev 263) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:38:57 UTC (rev 264) @@ -67,6 +67,9 @@ <s:property value="%{#wikittyId}" /> </s:a> --%> + <s:url var="editBookmark" action="editBookmark"> + <s:param name="id" value="%{#wikittyId}"/> + </s:url> <s:if test="%{!#publicAliasUrl.empty}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> @@ -77,7 +80,7 @@ <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="alias">irock</s:param> </s:url> - <s:a cssClass="addAlias" onclick="return openPublicAliasForm('%{#wikittyId}')"> + <s:a cssClass="addAlias" href="%{editBookmark}" onclick="return openPublicAliasForm('%{#wikittyId}')"> <img style="border:none;" src="img/add.png" alt="Set alias" title="Set alias" /> </s:a> </s:else> @@ -94,9 +97,6 @@ <!-- <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> --> - <s:url var="editBookmark" action="editBookmark"> - <s:param name="id" value="%{#wikittyId}"/> - </s:url> <s:a cssClass="edit" href="%{editBookmark}" onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(#request.bookmark.description)}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a>