Fix story 1140047. Comment text wraps around commenter image.

svn path=/plone.app.discussion/trunk/; revision=29457

plone/app/discussion/browser/comments.pt

@@ -23,6 +23,7 @@
     </div>
 
     <div class="discussion"
+         tal:attributes="class python: showCommenterImage and 'discussion showCommenterImage' or 'discussion';"
          tal:condition="python:replies or (userHasReplyPermission and isDiscussionAllowed) or (isAnon and not userHasReplyPermission and isDiscussionAllowed)">
         <tal:getreplies repeat="reply_dict replies">
 
@@ -86,6 +87,7 @@
                      This is the body text of the comment.
                 </div>
 
+                <div class="commentActions">
                     <button class="context reply-to-comment-button hide allowMultiSubmit"
                             tal:condition="python:userHasReplyPermission and isDiscussionAllowed or isAnonymousDiscussionAllowed"
                             i18n:translate="label_reply;">
@@ -124,6 +126,8 @@
 
                 </div>
 
+            </div>
+
         </tal:getreplies>
     </div>
 

plone/app/discussion/browser/stylesheets/discussion.css

@@ -4,6 +4,7 @@
     display: none;
 }
 
+
 /* Comments Viewlet
    ---------------------------------------------------------------- */
 
@@ -15,19 +16,29 @@
 .commentImage {
 	width: 90px;
 	float: left;
-	background: #EEF3F5; /* Todo: Only a temporary solution !!! */
+	margin-right: -90px;
 }
 
 .commentImage img {
 	   margin-right: 1em;
 }
 
-.comment h3,
-.comment .documentByLine,
-.comment .commentBody {
-
+.commentBody {
+	margin: 1em 0;
 }
 
+.showCommenterImage h3,
+.showCommenterImage .documentByLine,
+.showCommenterImage .commentBody,
+.showCommenterImage .commentActions,
+.showCommenterImage .reply {
+	/* The showCommenterImage CSS class is only set if showing the
+	 * commenters image is enabled.
+	 */
+    margin-left: 90px;
+}
+
+
 /* Reply Form
    ---------------------------------------------------------------- */
 
@@ -37,8 +48,8 @@
 }
 
 .reply-to-comment-button {
-   /* Hide the reply-to-comment button and show it only if Javascript is enabled.
-    * Since the reply functions rely on jQuery.
+   /* Hide the reply-to-comment button and show it only if Javascript
+    * is enabled. Since the reply functions rely on jQuery.
     */
 	display: none;
 }
@@ -50,6 +61,7 @@
 	display: none;
 }
 
+
 /* Moderation View
    ---------------------------------------------------------------- */