Fix story 1140047. Comment text wraps around commenter image.

svn path=/plone.app.discussion/trunk/; revision=29457
This commit is contained in:
Timo Stollenwerk 2009-08-28 21:21:54 +00:00
parent a69f2baf01
commit 9aaf24e247
2 changed files with 56 additions and 40 deletions

View File

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

View File

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