From 689fd26c12dfe60b3fce6990fdc64626871069c9 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Wed, 29 Sep 2010 08:13:54 +0000
Subject: [PATCH] Apply the comment viewlet template and styles to the new
 title-less comments. This might require integrators to apply their custom
 templates and styles.

svn path=/plone.app.discussion/trunk/; revision=40433
---
 CHANGES.txt                                   |   4 +
 plone/app/discussion/browser/comments.pt      | 127 +++++++++---------
 .../browser/stylesheets/discussion.css        |  47 ++++---
 3 files changed, 96 insertions(+), 82 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2a097c6..17529fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0b8 (unreleased)
 ------------------
 
+- Apply the comment viewlet template and styles to the new title-less comments.
+  This might require integrators to apply their custom templates and styles.
+  [timo]
+
 - Remove title field from the comment form and replace it with an auto-generated
   title ("John Doe on Welcome to Plone").
   [timo]
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 688b3ca..6225842 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -46,84 +46,83 @@
                          <img src="defaultUser.gif"
                               alt=""
                               border="0"
-                              width="75"
+                              height="32"
                               tal:attributes="src portrait_url;
                                               alt reply/Creator" />
                     </a>
                     <img src="defaultUser.gif"
                          alt=""
                          border="0"
-                         width="75"
+                         height="32"
                          tal:condition="not: has_author_link"
                          tal:attributes="src portrait_url;
                                          alt reply/Creator" />
                 </div>
-
-                <h3 class="commentTitle"
-                    tal:content="reply/Title" />
-
+                     
                 <div class="documentByLine" i18n:domain="plone.app.discussion">
-                        <tal:posted i18n:translate="label_comment_by">Posted by</tal:posted>
-                        <tal:name>
-                            <a href=""
-                               tal:condition="has_author_link"
-                               tal:content="reply/Creator"
-                               tal:attributes="href author_home_url">
-                                Poster Name
-                            </a>
-                            <span tal:condition="not: has_author_link"
-                                  tal:replace="reply/Creator" />
-                        </tal:name>
-                        <tal:name condition="python:reply.Creator() in ('Anonymous User', '', None)"
-                                  tal:content="reply/author_name">Anonymous User</tal:name>
-                        <tal:at i18n:translate="label_commented_at">at</tal:at>
-                    <span tal:replace="python:view.format_time(reply.modification_date)">8/23/2001 12:40:44 PM</span>
+                    <tal:name>
+                        <a href=""
+                           tal:condition="has_author_link"
+                           tal:content="reply/Creator"
+                           tal:attributes="href author_home_url">
+                            Poster Name
+                        </a>
+                        <span tal:condition="not: has_author_link"
+                              tal:replace="reply/Creator" />
+                        <span tal:condition="not: reply/Creator">Anonymous</span>
+                    </tal:name>
+                    <tal:posted i18n:translate="label_says">says:</tal:posted>
+                    <div class="commentDate" 
+                         tal:content="python:view.format_time(reply.modification_date)">
+                         8/23/2001 12:40:44 PM
+                    </div>
                 </div>
-
-                <div class="commentBody"
-                     tal:content="structure python:view.cook(reply.getText())" />
-
-                <div class="commentActions">
-                    <button class="context reply-to-comment-button hide allowMultiSubmit"
-                            tal:condition="python:isDiscussionAllowed and (isAnon and isAnonymousDiscussionAllowed or userHasReplyPermission)"
-                            i18n:translate="label_reply">
-                        Reply
-                    </button>
-
-                    <form name="delete"
-                          action=""
-                          method="post"
-                          style="display: inline;"
-                          tal:condition="canManage"
-                          tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">
-                        <input name="form.button.DeleteComment"
-                               class="destructive"
-                               type="submit"
-                               value="Delete"
-                               i18n:attributes="value label_delete;"
-                               />
-                    </form>
-
-                    <!-- Workflow actions (e.g. 'publish') -->
-                    <form name=""
-                          action=""
-                          method="get"
-                          style="display: inline;"
-                          tal:condition="canManage"
-                          tal:repeat="action reply_dict/actions|nothing"
-                          tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment;
-                                          name action/id">
-                        <input type="hidden" name="workflow_action" tal:attributes="value action/id" />
-                        <input name="form.button.PublishComment"
-                               class="context"
-                               type="submit"
-                               tal:attributes="value action/title"
-                               i18n:attributes="value"
-                               />
-                    </form>
+                
+                <div class="commentBody">
+                
+                    <span tal:replace="structure python:view.cook(reply.getText())" />
+                
+                    <div class="commentActions">
+                        <form name="delete"
+                              action=""
+                              method="post"
+                              style="display: inline;"
+                              tal:condition="canManage"
+                              tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">
+                            <input name="form.button.DeleteComment"
+                                   class="destructive"
+                                   type="submit"
+                                   value="Delete"
+                                   i18n:attributes="value label_delete;"
+                                   />
+                        </form>
+    
+                        <!-- Workflow actions (e.g. 'publish') -->
+                        <form name=""
+                              action=""
+                              method="get"
+                              style="display: inline;"
+                              tal:condition="canManage"
+                              tal:repeat="action reply_dict/actions|nothing"
+                              tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment;
+                                              name action/id">
+                            <input type="hidden" name="workflow_action" tal:attributes="value action/id" />
+                            <input name="form.button.PublishComment"
+                                   class="context"
+                                   type="submit"
+                                   tal:attributes="value action/title"
+                                   i18n:attributes="value"
+                                   />
+                        </form>
+                    </div>
+                     
 
                 </div>
-
+                <button class="context reply-to-comment-button hide allowMultiSubmit"
+                        tal:condition="python:isDiscussionAllowed and (isAnon and isAnonymousDiscussionAllowed or userHasReplyPermission)"
+                        i18n:translate="label_reply">
+                    Reply
+                </button>
             </div>
 
         </tal:getreplies>
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css
index 459cdfa..2b6f079 100644
--- a/plone/app/discussion/browser/stylesheets/discussion.css
+++ b/plone/app/discussion/browser/stylesheets/discussion.css
@@ -17,13 +17,12 @@
 }
 
 .comment {
-    min-height: 100px;
 }
 
 .commentImage {
-    width: 90px;
     float: left;
-    margin-right: -90px;
+    width: 2.5em;
+    height: 3.5em;
 }
 
 .commentImage a:link {
@@ -32,24 +31,36 @@
 }
 
 .commentImage img {
-    margin-right: 1em;
+
+}
+
+.commentDate {
+    display: block;
+    font-size: 85%;
+    line-height: 1.5em;
+    padding-top: 0.5em;
+    color: #76797C;
 }
 
 .commentBody {
+    clear: both;
     margin: 1em 0;
+    overflow: auto;
 }
 
-.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;
+.commentBody p {
+    float: left;
+ }
+
+.discussion .documentByLine {
+    float: left;
+    margin-left: 0;
 }
 
+.commentActions {
+    float: right;
+    text-align: right;
+}
 
 /* Reply Form
    -------------------------------------------------------------------------- */
@@ -60,10 +71,10 @@
 }
 
 .reply .text-widget {
-	/* Make sure the input fields are always below the label. This sometimes
-	 * break when the reply form is copied from the main comment form. 
-	 */
-	display: block;
+    /* Make sure the input fields are always below the label. This sometimes
+     * break when the reply form is copied from the main comment form. 
+     */
+    display: block;
 }
 
 .reply-to-comment-button {
@@ -94,7 +105,7 @@
 
 .comment-publish-button {
     float: left;
-	margin-right: 0.5em;
+    margin-right: 0.5em;
 }
 
 .comment-delete-button {