From kmorin@users.chorem.org Fri Nov  9 10:37:09 2012
From: kmorin@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3742 - in	trunk/pollen-ui-struts2/src/main/webapp:
 WEB-INF/jsp/poll css
Date: Fri, 09 Nov 2012 10:37:09 +0100
Message-ID: <20121109093709.9B302157D5@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2952515618200376791=="

--===============2952515618200376791==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/displayPollCommen=
t.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/displayPol=
lComment.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComme=
nt.jsp	2012-11-09 09:35:43 UTC (rev 3741)
+++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComme=
nt.jsp	2012-11-09 09:37:09 UTC (rev 3742)
@@ -23,7 +23,7 @@
 <%@page contentType=3D"text/html" pageEncoding=3D"UTF-8" %>
 <%@ taglib prefix=3D"s" uri=3D"/struts-tags" %>
=20
-<div>
+<div class=3D"comment">
   <s:if test=3D"isDeleteCommentAllowed(#comment)">
     <span class=3D"cmd">
       <s:a href=3D"#"
@@ -35,11 +35,11 @@
     </span>
   </s:if>
   <span class=3D"name"><s:property value=3D'%{#comment.author}'/></span> :
-    <span class=3D"date">
-      <s:property value=3D'#comment.postDate'/>
-    </span>
+  <span class=3D"date">
+    <s:property value=3D'#comment.postDate'/>
+  </span>
=20
   <p>
-    <s:property value=3D'#comment.text'/>
+    <s:property value=3D'#comment.text' escapeHtml=3D"false"/>
   </p>
 </div>

Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"text/html" pageEncoding=3D"UTF-8" %>
 <%@ taglib prefix=3D"s" uri=3D"/struts-tags" %>
 <%@ taglib prefix=3D"sj" uri=3D"/struts-jquery-tags" %>
+<%@ taglib prefix=3D"sjr" uri=3D"/struts-jquery-richtext-tags"%>
=20
 <title><s:property value=3D"%{poll.title}"/></title>
=20
@@ -396,9 +397,17 @@
               validate=3D"true">
         <s:textfield key=3D"commentAuthor" required=3D"true" size=3D"78"
                      label=3D"%{getText('pollen.common.commentAuthor')}"/>
-        <s:textarea key=3D"commentText" required=3D"true" value=3D''
-                    label=3D"%{getText('pollen.common.commentText')}"/>
-
+        <sjr:ckeditor
+            key=3D"commentText"
+            required=3D"true"
+            value=3D""
+            rows=3D"3"
+            cols=3D"54"
+            width=3D"500"
+            label=3D"%{getText('pollen.common.commentText')}"
+            toolbar=3D"Basic"
+            editorLocal=3D"fr"
+    />
         <div class=3D"cleanBoth">
           <s:submit action=3D"addComment/%{pollUri}" key=3D"pollen.action.ad=
dComment"
                     align=3D"center"/>

Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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;
 }
=20
+#commentZone .comment ul {
+    list-style-type: disc;
+    margin: 13px 0;
+    padding: 0 0 0 40px;
+}
+
 #commentZone textarea {
     width: 500px;
     height: 100px;


--===============2952515618200376791==--