You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/02/11 20:53:06 UTC
[3/4] git commit: [#284] ticket:258 changed templates and refactored
js
[#284] ticket:258 changed templates and refactored js
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c3f1ed40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c3f1ed40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c3f1ed40
Branch: refs/heads/master
Commit: c3f1ed40e73b00ceac9771f88bbf37bfa95b46d1
Parents: 19d0233
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Thu Feb 7 17:49:17 2013 +0400
Committer: Cory Johns <jo...@geek.net>
Committed: Mon Feb 11 19:52:19 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 52 +++++++--------
Allura/allura/templates/widgets/moderate_post.html | 20 +++---
Allura/allura/templates/widgets/post_widget.html | 14 ++--
.../forgediscussion/tests/functional/test_forum.py | 7 ++-
4 files changed, 47 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3f1ed40/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index eeb75ad..0c6774b 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -269,37 +269,31 @@ class Post(HierWidget):
this.parentNode.submit();
return false;
});
-
- if($('.moderate_post', post)){
- $('.moderate_post', post).click(function(e){
- e.preventDefault();
- var mod = $(this).text();
- var id_post = $(post).attr('id');
- var session_id = $('input[name=_session_id]').val();
- $.ajax({
- type: 'POST',
- url: this.parentNode.action,
- data: jQuery(this.parentNode).serialize(),
- success: function() {
- if (mod == 'Delete'){
- $(post).remove();
- }
- else if (mod == 'Approve'){
- $('a.reply_post', post).show();
- $('a.shortlink', post).show();
- $('a.edit_post', post).show();
- $('div.moderate', post).removeClass('moderate');
- $('form.moderate_spam', post).hide();
- $('form.moderate_approve', post).hide();
- }
- else if (mod == 'Spam'){
- $(post).remove();
- }
+ $('.moderate_post', post).click(function(e){
+ e.preventDefault();
+ var mod = $(this).text();
+ var id_post = $(post).attr('id');
+ $.ajax({
+ type: 'POST',
+ url: this.parentNode.action,
+ data: jQuery(this.parentNode).serialize(),
+ success: function() {
+ if (mod == 'Delete'){
+ $(post).remove();
}
- });
+ else if (mod == 'Approve'){
+ $('a.reply_post', post).show();
+ $('div.little_link', post).show();
+ $('div.moderate', post).removeClass('moderate');
+ $('form.moderate_spam', post).hide();
+ $('form.moderate_approve', post).hide();
+ }
+ else if (mod == 'Spam'){
+ $(post).remove();
+ }
+ }
});
- };
-
+ });
if($('a.edit_post', post)){
$('a.edit_post', post).click(function (ele) {
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3f1ed40/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 897b60a..6ea4744 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -3,13 +3,15 @@
<a href="" class="moderate_post little_link"><span>Delete</span></a>
</form>
<br/>
-<form method="POST" class="moderate_approve" action="{{action}}" {%if status != 'pending'%} style="display:none"{%endif%}>
- <input type="hidden" name="approve" value="True"/>
- <a href="" class="moderate_post little_link"><span>Approve</span></a>
-</form>
+{%if status == 'pending'%}
+ <form method="POST" class="moderate_approve" action="{{action}}">
+ <input type="hidden" name="approve" value="True"/>
+ <a href="" class="moderate_post little_link"><span>Approve</span></a>
+ </form>
+ <br/>
+ <form method="POST" class="moderate_spam" action="{{action}}">
+ <input type="hidden" name="spam" value="True"/>
+ <a href="" class="moderate_post little_link"><span>Spam</span></a>
+ </form>
+{%endif%}
<br/>
-<form method="POST" class="moderate_spam" action="{{action}}" {%if status != 'pending'%} style="display:none"{%endif%}>
- <input type="hidden" name="spam" value="True"/>
- <a href="" class="moderate_post little_link"><span>Spam</span></a>
-</form>
-<br/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3f1ed40/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 27d4739..a53f516 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -79,13 +79,15 @@
<a href="" class="reply_post btn"{%if value.status == 'pending'%} style="display:none"{%endif%}><b data-icon="{{g.icons['reply'].char}}" class="ico {{g.icons['reply'].css}}"></b>Reply</a>
{% endif %}
<div style="clear:both">
- <a href="{{shortlink_url}}" class="little_link shortlink"{%if value.status == 'pending'%} style="display:none"{%endif%}><span>Link</span></a><br/>
- {% if h.has_access(value, 'moderate')()%}
- <a href="" class="edit_post little_link"{%if value.status == 'pending'%} style="display:none"{%endif%}><span>Edit</span></a><br/>
- {% endif %}
- {% if h.has_access(value, 'moderate')()%}
+ <div class="little_link"{%if value.status == 'pending'%} style="display:none"{%endif%}>
+ <a href="{{shortlink_url}}" class="little_link shortlink"><span>Link</span></a><br/>
+ {% if h.has_access(value, 'moderate')()%}
+ <a href="" class="edit_post little_link"><span>Edit</span></a><br/>
+ {% endif %}
+ </div>
+ {% if h.has_access(value.thread, 'moderate')() %}
{{widgets.moderate_post.display(value=value, action=value.url()+'moderate', status = value.status)}}
- {% endif %}
+ {%endif%}
{% if h.has_access(value.thread, 'post')() %}
<a href="#" class="add_attachment little_link"><span>Attach</span></a>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3f1ed40/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 60866e9..e10f506 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -424,11 +424,14 @@ class TestForum(TestController):
r = self.app.get(thread.request.url, extra_environ=dict(username='*anonymous'))
assert 'Post awaiting moderation' in r
+ assert 'name="delete"' not in r
+ assert 'name="approve"' not in r
+ assert 'name="spam"' not in r
+
r = self.app.get(thread.request.url)
assert '<div class="display_post moderate">' in r
- assert '<a href="" class="edit_post little_link" style="display:none">' in r
assert '<a href="" class="reply_post btn" style="display:none">' in r
- assert 'class="little_link shortlink" style="display:none">' in r
+ assert '<div class="little_link" style="display:none">' in r
assert 'name="delete"' in r
assert 'name="approve"' in r
assert 'name="spam"' in r