Author: kmorin Date: 2012-11-09 10:37:09 +0100 (Fri, 09 Nov 2012) New Revision: 3742 Url: http://chorem.org/repositories/revision/pollen/3742 Log: resolves #85 : [Comment] Permettre l'ajout de liens dans les commentaires Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/vote.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<div> +<div class="comment"> <s:if test="isDeleteCommentAllowed(#comment)"> <span class="cmd"> <s:a href="#" @@ -35,11 +35,11 @@ </span> </s:if> <span class="name"><s:property value='%{#comment.author}'/></span> : - <span class="date"> - <s:property value='#comment.postDate'/> - </span> + <span class="date"> + <s:property value='#comment.postDate'/> + </span> <p> - <s:property value='#comment.text'/> + <s:property value='#comment.text' escapeHtml="false"/> </p> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,6 +23,7 @@ <%@page 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"%> <title><s:property value="%{poll.title}"/></title> @@ -396,9 +397,17 @@ validate="true"> <s:textfield key="commentAuthor" required="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> - <s:textarea key="commentText" required="true" value='' - label="%{getText('pollen.common.commentText')}"/> - + <sjr:ckeditor + key="commentText" + required="true" + value="" + rows="3" + cols="54" + width="500" + label="%{getText('pollen.common.commentText')}" + toolbar="Basic" + editorLocal="fr" + /> <div class="cleanBoth"> <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" align="center"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:37:09 UTC (rev 3742) @@ -153,6 +153,12 @@ margin: auto; } +#commentZone .comment ul { + list-style-type: disc; + margin: 13px 0; + padding: 0 0 0 40px; +} + #commentZone textarea { width: 500px; height: 100px;