Author: sletellier Date: 2011-04-21 17:29:13 +0200 (Thu, 21 Apr 2011) New Revision: 253 Url: http://chorem.org/repositories/revision/bow/253 Log: - Set default size for textarea in css - Allow to modify bookmark without javascript Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 15:29:13 UTC (rev 253) @@ -34,8 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 15:29:13 UTC (rev 253) @@ -0,0 +1,55 @@ +package org.chorem.bow.action; + +import org.apache.commons.lang.StringUtils; +import org.chorem.bow.Bookmark; +import org.chorem.bow.BowBookmark; +import org.chorem.bow.BowBookmarkImpl; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Load a bookmark to display it on modification page + * + * @author sletellier + */ +public class EditBookmarkAction extends BowBaseAction { + + protected String id; + protected BowBookmark bookmark; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public BowBookmark getBookmark() { + if (bookmark == null) { + bookmark = new BowBookmarkImpl(); + } + return bookmark; + } + + @Override + public String execute() throws Exception { + if (id == null) { + return SUCCESS; + } + try { + WikittyProxy proxy = getBowProxy(); + Criteria criteria = Search.query() + .eq(Element.ELT_ID, id).criteria(); + bookmark = proxy.findByCriteria(BowBookmark.class, criteria); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } + return SUCCESS; + } +} Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 15:29:13 UTC (rev 253) @@ -262,7 +262,7 @@ <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> - <action name="editBookmark"> + <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> <interceptor-ref name="loginStack"/> <result>/jsp/editBookmark.jsp</result> </action> Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 15:29:13 UTC (rev 253) @@ -58,6 +58,11 @@ padding:2px; } +textarea{ + height:100px; + width:200px; +} + #wrap{ clear:both; float:left; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -46,13 +46,11 @@ <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" /><br /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" value="%{bookmark.link}" /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" value="%{bookmark.description}" /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" value="%{bookmark.privateAlias}" /><br /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" value="%{bookmark.publicAlias}" /><br /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> <s:submit key="popup.addurl.submit" name="submit" /> </s:form> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -107,9 +107,11 @@ <!-- <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> --> - <s:a cssClass="edit" href="http://linuxfr.org" - onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '<%=StringEscapeUtils.escapeJavaScript(bookmark.getDescription())%>', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> - + <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(bookmark.getDescription())}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>