ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix story 1140047. Comment text wraps around commenter image.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
plone/app/discussion/browser/comments.pt
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,41 +87,44 @@
This is the body text of the comment. This is the body text of the comment.
</div> </div>
<button class="context reply-to-comment-button hide allowMultiSubmit" <div class="commentActions">
tal:condition="python:userHasReplyPermission and isDiscussionAllowed or isAnonymousDiscussionAllowed" <button class="context reply-to-comment-button hide allowMultiSubmit"
i18n:translate="label_reply;"> tal:condition="python:userHasReplyPermission and isDiscussionAllowed or isAnonymousDiscussionAllowed"
Reply i18n:translate="label_reply;">
</button> Reply
</button>
<form name="delete" <form name="delete"
action="" action=""
method="post" method="post"
style="display: inline;" style="display: inline;"
tal:condition="view/can_manage" tal:condition="view/can_manage"
tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment"> tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">
<input name="form.button.DeleteComment" <input name="form.button.DeleteComment"
class="destructive" class="destructive"
type="submit" type="submit"
value="Remove" value="Remove"
i18n:attributes="value label_remove;" i18n:attributes="value label_remove;"
/> />
</form> </form>
<!-- Workflow actions (e.g. 'publish') --> <!-- Workflow actions (e.g. 'publish') -->
<form name="" <form name=""
action="" action=""
method="get" method="get"
style="display: inline;" style="display: inline;"
tal:repeat="action reply_dict/actions|nothing" tal:repeat="action reply_dict/actions|nothing"
tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment; tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment;
name action/id"> name action/id">
<input type="hidden" name="workflow_action" tal:attributes="value action/id" /> <input type="hidden" name="workflow_action" tal:attributes="value action/id" />
<input name="form.button.PublishComment" <input name="form.button.PublishComment"
class="context" class="context"
type="submit" type="submit"
tal:attributes="value action/title" tal:attributes="value action/title"
/> />
</form> </form>
</div>
</div> </div>

26
plone/app/discussion/browser/stylesheets/discussion.css
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
---------------------------------------------------------------- */ ---------------------------------------------------------------- */