Author: tchemit Date: 2012-11-06 21:33:48 +0100 (Tue, 06 Nov 2012) New Revision: 3739 Url: http://chorem.org/repositories/revision/pollen/3739 Log: refs #846: Use nice text rich editor for description in forms Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -181,6 +181,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> </dependency> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:33:48 UTC (rev 3739) @@ -23,6 +23,7 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjr" uri="/struts-jquery-richtext-tags"%> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> @@ -119,8 +120,12 @@ <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true" size="80"/> - <s:textarea key="poll.description" rows="3" cols="54" - label="%{getText('pollen.common.description')}"/> + + <sjr:ckeditor key="poll.description" rows="10" cols="80" width="800" + label="%{getText('pollen.common.description')}" /> + + <%--s:textarea key="poll.description" rows="3" cols="54" + label="%{getText('pollen.common.description')}"/--%> <s:hidden key="poll.pollId" label=""/> </fieldset> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -312,6 +312,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> <version>${struts2Version}</version>