Timo Stollenwerk
commit
362dc4f5d5
@ -4,6 +4,10 @@ Changelog
|
||||
2.2.1 (unreleased)
|
||||
------------------
|
||||
|
||||
- Remove inline styles, fixes #12399
|
||||
[maartenkling]
|
||||
- add fallback border color for i8, fixes #11324
|
||||
[maartenkling]
|
||||
- Replace discussionitem_icon.gif with png version.
|
||||
[timo]
|
||||
- Fix catalog updates for IObjectMovedEvent
|
||||
|
||||
@ -14,8 +14,7 @@
|
||||
<div class="reply"
|
||||
tal:condition="python:isAnon and not isAnonymousDiscussionAllowed">
|
||||
<form tal:attributes="action view/login_action">
|
||||
<input class="standalone"
|
||||
style="margin-bottom: 1.25em;"
|
||||
<input class="standalone loginbutton"
|
||||
type="submit"
|
||||
value="Log in to add comments"
|
||||
i18n:attributes="value label_login_to_add_comments;"
|
||||
@ -31,12 +30,12 @@
|
||||
<div class="comment"
|
||||
tal:define="reply reply_dict/comment;
|
||||
depth reply_dict/depth|python:0;
|
||||
depth python: depth > 10 and '10' or depth;
|
||||
author_home_url python:view.get_commenter_home_url(username=reply.author_username);
|
||||
has_author_link python:author_home_url and not isAnon;
|
||||
portrait_url python:view.get_commenter_portrait(reply.author_username);
|
||||
review_state python:wtool.getInfoFor(reply, 'review_state', 'none');"
|
||||
tal:attributes="class python:'comment replyTreeLevel'+str(depth)+' state-'+str(review_state);
|
||||
style string:margin-left: ${depth}em;
|
||||
id string:${reply/getId}"
|
||||
tal:condition="python:canReview or review_state == 'published'">
|
||||
|
||||
@ -87,7 +86,7 @@
|
||||
<form name="delete"
|
||||
action=""
|
||||
method="post"
|
||||
style="display: inline;"
|
||||
class="commentactionsform"
|
||||
tal:condition="canReview"
|
||||
tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">
|
||||
<input name="form.button.DeleteComment"
|
||||
@ -102,7 +101,7 @@
|
||||
<form name=""
|
||||
action=""
|
||||
method="get"
|
||||
style="display: inline;"
|
||||
class="commentactionsform"
|
||||
tal:condition="canReview"
|
||||
tal:repeat="action reply_dict/actions|nothing"
|
||||
tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment;
|
||||
@ -140,8 +139,7 @@
|
||||
<div class="reply"
|
||||
tal:condition="python:has_replies and (isAnon and not isAnonymousDiscussionAllowed)">
|
||||
<form tal:attributes="action view/login_action">
|
||||
<input class="standalone"
|
||||
style="margin-bottom: 1.25em;"
|
||||
<input class="standalone loginbutton"
|
||||
type="submit"
|
||||
value="Log in to add comments"
|
||||
i18n:attributes="value label_login_to_add_comments;"
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
|
||||
<div metal:use-macro="here/batch_macros/macros/navigation" />
|
||||
|
||||
<table id="review-comments" class="listing" style="width: 100%">
|
||||
<table id="review-comments" class="listing">
|
||||
<thead>
|
||||
<tr>
|
||||
<th id="bulkactions" class="nosort" colspan="7">
|
||||
@ -87,7 +87,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tal:block repeat="item batch">
|
||||
<tr style="vertical-align: top" class="commentrow"
|
||||
<tr class="commentrow"
|
||||
tal:define="even repeat/item/even"
|
||||
tal:attributes="class python: even and 'odd' or 'even'">
|
||||
<td class="notDraggable">
|
||||
|
||||
@ -46,6 +46,7 @@
|
||||
clear: both;
|
||||
margin: 1em 0;
|
||||
overflow: auto;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.commentBody p {
|
||||
@ -55,7 +56,7 @@
|
||||
.discussion .documentByLine {
|
||||
float: left;
|
||||
margin-left: 0;
|
||||
margin-bottom: 0.5em;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.commentActions {
|
||||
@ -67,6 +68,47 @@
|
||||
color: #666666;
|
||||
font-size: 85%;
|
||||
}
|
||||
.loginbutton {
|
||||
margin-bottom: 1.25em;
|
||||
}
|
||||
.commentactionsform {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.replyTreeLevel0 {
|
||||
margin-left: 0em;
|
||||
}
|
||||
.replyTreeLevel1 {
|
||||
margin-left: 1em;
|
||||
}
|
||||
.replyTreeLevel2 {
|
||||
margin-left: 2em;
|
||||
}
|
||||
.replyTreeLevel3 {
|
||||
margin-left: 3em;
|
||||
}
|
||||
.replyTreeLevel4 {
|
||||
margin-left: 4em;
|
||||
}
|
||||
.replyTreeLevel5 {
|
||||
margin-left: 5em;
|
||||
}
|
||||
.replyTreeLevel6 {
|
||||
margin-left: 6em;
|
||||
}
|
||||
.replyTreeLevel7 {
|
||||
margin-left: 7em;
|
||||
}
|
||||
.replyTreeLevel8 {
|
||||
margin-left: 8em;
|
||||
}
|
||||
.replyTreeLevel9 {
|
||||
margin-left: 9em;
|
||||
}
|
||||
.replyTreeLevel10 {
|
||||
margin-left: 10em;
|
||||
}
|
||||
|
||||
|
||||
/* Reply Form
|
||||
-------------------------------------------------------------------------- */
|
||||
@ -120,6 +162,10 @@
|
||||
|
||||
#review-comments {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
}
|
||||
#review-comments tbody tr {
|
||||
vertical-align: top
|
||||
}
|
||||
|
||||
#fieldset-moderate-comments {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user