diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-04-20 04:20:35 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-04-20 04:20:35 -0400 |
commit | a7ff97ac49fc63119cad12d432fa1e4964d1d859 (patch) | |
tree | ec9a1831defa7c83a9309a36d2ec6d763e33d674 | |
parent | 1d12eab728e0ccb07dd26713415eb01e810fe0e0 (diff) | |
download | askbot-a7ff97ac49fc63119cad12d432fa1e4964d1d859.tar.gz askbot-a7ff97ac49fc63119cad12d432fa1e4964d1d859.tar.bz2 askbot-a7ff97ac49fc63119cad12d432fa1e4964d1d859.zip |
part way through implemented post reject reasons in the moderation view
-rw-r--r-- | askbot/skins/common/media/js/user.js | 50 | ||||
-rw-r--r-- | askbot/skins/default/templates/user_profile/user_inbox.html | 49 | ||||
-rw-r--r-- | askbot/views/users.py | 1 |
3 files changed, 86 insertions, 14 deletions
diff --git a/askbot/skins/common/media/js/user.js b/askbot/skins/common/media/js/user.js index 24ca060f..2138746b 100644 --- a/askbot/skins/common/media/js/user.js +++ b/askbot/skins/common/media/js/user.js @@ -78,13 +78,6 @@ $(document).ready(function(){ return; } } - if (action_type == 'delete_post'){ - msg = ngettext('Delete this entry?', - 'Delete these entries?', data['id_list'].length); - if (confirm(msg) === false){ - return; - } - } submit(data['id_list'], data['elements'], action_type); }; setupButtonEventHandlers($('#re_mark_seen'), function(){startAction('mark_seen')}); @@ -92,7 +85,16 @@ $(document).ready(function(){ setupButtonEventHandlers($('#re_dismiss'), function(){startAction('delete')}); setupButtonEventHandlers($('#re_remove_flag'), function(){startAction('remove_flag')}); //setupButtonEventHandlers($('#re_close'), function(){startAction('close')}); - setupButtonEventHandlers($('#re_delete_post'), function(){startAction('delete_post')}); + setupButtonEventHandlers( + $('#re_delete_post'), + function(){ + var data = getSelected(); + if (data['id_list'].length === 0){ + return; + } + $('#rejectEditModal').modal('show'); + } + ); setupButtonEventHandlers( $('#sel_all'), function(){ @@ -119,6 +121,38 @@ $(document).ready(function(){ setCheckBoxesIn('#responses .seen', false); } ); + setupButtonEventHandlers( + $('.cancel-reject'), + function(){ + $('#rejectEditModal').modal('hide'); + } + ) + setupButtonEventHandlers( + $('#doReject'), + function(){ + $('#rejectEditModal').modal('hide'); + } + ); + setupButtonEventHandlers( + $('#doRejectWithNewReason'), + function(){ + $('#rejectEditModal').modal('hide'); + } + ); + setupButtonEventHandlers( + $('#useOldReason'), + function(){ + $('#old-reason-btns').show(); + $('#new-reason-btns').hide(); + } + ); + setupButtonEventHandlers( + $('#addReason'), + function(){ + $('#old-reason-btns').hide(); + $('#new-reason-btns').show(); + } + ); //setupButtonEventHandlers($('.re_expand'), // function(e){ diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html index 39682a29..cdd73599 100644 --- a/askbot/skins/default/templates/user_profile/user_inbox.html +++ b/askbot/skins/default/templates/user_profile/user_inbox.html @@ -63,8 +63,6 @@ inbox_section - forum|flags <a class="btn" id="re_delete_post" - data-toggle="modal" - href="#rejectEditModal" >{% trans %}delete post{% endtrans %}</a> {% endif %} </div> @@ -72,14 +70,47 @@ inbox_section - forum|flags <div class="modal" style="display:none" id="rejectEditModal"> <div class="modal-header"> <a class="close" data-dismiss="modal">x</a> - <h3 class="modal-header">Reject the post?</h3> + <h3>{% trans %}Want to reject the post(s)?{% endtrans %}</h3> </div> <div class="modal-body"> - <p>This is the body</p> + <div id="old-reason-content"> + <p id="details"></p> + </div> + <div id="new-reason-content"> + <input + id="id_title" + class="questionTitleInput" + name="title" + autocomplete="off" + /> + {{ macros.edit_post( + + ) + }} </div> <div class="modal-footer"> - <a href="#" class="btn">Close</a> - <a href="#" class="btn btn-primary">Save changes</a> + <div id="old-reason-btns"> + <a href="#" class="btn cancel-reject">{% trans %}Do nothing{% endtrans %}</a> + <a + id="addReason" + href="#" + class="btn" + >{% trans %}Add new rejection reason{% endtrans %}</a> + <a id="doReject" href="#" class="btn btn-primary">{% trans %}Reject post{% endtrans %}</a> + </div> + <div id="new-reason-btns" style="display:none"> + <a href="#" class="btn cancel-reject">{% trans %}Do nothing{% endtrans %}</a> + <a + id="useOldReason" + href="#" + class="btn" + >{% trans %}Use existing rejection reason{% endtrans %}</a> + <a + id="doRejectWithNewReason" + href="#" + class="btn btn-primary" + >{% trans %}Save reason and reject post{% endtrans %}</a> + </div> </div> </div> <div id="responses"> @@ -102,6 +133,12 @@ inbox_section - forum|flags var askbot = askbot || {}; askbot['urls'] = askbot['urls'] || {}; askbot['urls']['manageInbox'] = '{% url manage_inbox %}'; + askbot['data']['rejectReasonDetails'] = []; + {% for reason in post_reject_reasons %} + askbot['data']['rejectReasonDetails'].push( + "{{reason.html|escapejs}}" + ) + {% endfor %} </script> <script type="text/javascript" src="{{'/bootstrap/js/bootstrap.js'|media}}" /> <!-- end user_responses.html --> diff --git a/askbot/views/users.py b/askbot/views/users.py index 61273e95..2131c206 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -682,6 +682,7 @@ def user_responses(request, user, context): 'inbox_section':section, 'tab_description' : _('comments and answers to others questions'), 'page_title' : _('profile - responses'), + 'post_reject_reasons': models.Post.objects.filter(post_type = 'reject_reason'), 'responses' : filtered_response_list, } context.update(data) |