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

remove inline styles, this also fixes #12399

Browse Source
This commit is contained in:
maartenkling 2012-10-22 09:53:09 +02:00
parent 07140cd136
commit 66898bb87a
3 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plone/app/discussion/browser/comments.pt
View File

@ -14,8 +14,7 @@
<div class="reply" <div class="reply"
tal:condition="python:isAnon and not isAnonymousDiscussionAllowed"> tal:condition="python:isAnon and not isAnonymousDiscussionAllowed">
<form tal:attributes="action view/login_action"> <form tal:attributes="action view/login_action">
<input class="standalone" <input class="standalone loginbutton"
style="margin-bottom: 1.25em;"
type="submit" type="submit"
value="Log in to add comments" value="Log in to add comments"
i18n:attributes="value label_login_to_add_comments;" i18n:attributes="value label_login_to_add_comments;"
@ -31,12 +30,12 @@
<div class="comment" <div class="comment"
tal:define="reply reply_dict/comment; tal:define="reply reply_dict/comment;
depth reply_dict/depth|python:0; 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); author_home_url python:view.get_commenter_home_url(username=reply.author_username);
has_author_link python:author_home_url and not isAnon; has_author_link python:author_home_url and not isAnon;
portrait_url python:view.get_commenter_portrait(reply.author_username); portrait_url python:view.get_commenter_portrait(reply.author_username);
review_state python:wtool.getInfoFor(reply, 'review_state', 'none');" review_state python:wtool.getInfoFor(reply, 'review_state', 'none');"
tal:attributes="class python:'comment replyTreeLevel'+str(depth)+' state-'+str(review_state); tal:attributes="class python:'comment replyTreeLevel'+str(depth)+' state-'+str(review_state);
style string:margin-left: ${depth}em;
id string:${reply/getId}" id string:${reply/getId}"
tal:condition="python:canReview or review_state == 'published'"> tal:condition="python:canReview or review_state == 'published'">
@ -87,7 +86,7 @@
<form name="delete" <form name="delete"
action="" action=""
method="post" method="post"
style="display: inline;" class="commentactionsform"
tal:condition="canReview" tal:condition="canReview"
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"
@ -102,7 +101,7 @@
<form name="" <form name=""
action="" action=""
method="get" method="get"
style="display: inline;" class="commentactionsform"
tal:condition="canReview" tal:condition="canReview"
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;
@ -140,8 +139,7 @@
<div class="reply" <div class="reply"
tal:condition="python:has_replies and (isAnon and not isAnonymousDiscussionAllowed)"> tal:condition="python:has_replies and (isAnon and not isAnonymousDiscussionAllowed)">
<form tal:attributes="action view/login_action"> <form tal:attributes="action view/login_action">
<input class="standalone" <input class="standalone loginbutton"
style="margin-bottom: 1.25em;"
type="submit" type="submit"
value="Log in to add comments" value="Log in to add comments"
i18n:attributes="value label_login_to_add_comments;" i18n:attributes="value label_login_to_add_comments;"

4
plone/app/discussion/browser/moderation.pt
View File

@ -56,7 +56,7 @@
<div metal:use-macro="here/batch_macros/macros/navigation" /> <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> <thead>
<tr> <tr>
<th id="bulkactions" class="nosort" colspan="7"> <th id="bulkactions" class="nosort" colspan="7">
@ -87,7 +87,7 @@
</thead> </thead>
<tbody> <tbody>
<tal:block repeat="item batch"> <tal:block repeat="item batch">
<tr style="vertical-align: top" class="commentrow" <tr class="commentrow"
tal:define="even repeat/item/even" tal:define="even repeat/item/even"
tal:attributes="class python: even and 'odd' or 'even'"> tal:attributes="class python: even and 'odd' or 'even'">
<td class="notDraggable"> <td class="notDraggable">

45
plone/app/discussion/browser/stylesheets/discussion.css
View File

@ -67,6 +67,47 @@
color: #666666; color: #666666;
font-size: 85%; 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 /* Reply Form
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@ -120,6 +161,10 @@
#review-comments { #review-comments {
margin: 0; margin: 0;
width: 100%;
}
#review-comments tbody tr {
vertical-align: top
} }
#fieldset-moderate-comments { #fieldset-moderate-comments {