From ee5d6b8a2c8cb2e53941b7d235a4096765485691 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 13:59:54 +0000
Subject: [PATCH] Added edit bird to moderation views

---
 .../edit_bird/approve_moderation_item.html    |  8 ++++++
 .../edit_bird/reject_moderation_item.html     |  8 ++++++
 wagtail/wagtailadmin/views/pages.py           | 28 +++++++++++++------
 3 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
new file mode 100644
index 0000000000..209a1bf251
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
@@ -0,0 +1,8 @@
+{% extends "wagtailadmin/edit_bird/base_item.html" %}
+
+{% block item_content %}
+  <form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision_id %}" method="post">
+    {% csrf_token %}
+    <input type="submit" value="Approve" />
+  </form>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html
new file mode 100644
index 0000000000..e8e5b42050
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html
@@ -0,0 +1,8 @@
+{% extends "wagtailadmin/edit_bird/base_item.html" %}
+
+{% block item_content %}
+  <form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision_id %}" method="post">
+    {% csrf_token %}
+    <input type="submit" value="Reject" />
+  </form>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 769fd46621..5c9f638106 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -11,7 +11,7 @@ from django.utils.translation import ugettext as _
 
 from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
 from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin import tasks, hooks
+from wagtail.wagtailadmin import tasks, hooks, edit_bird
 
 from wagtail.wagtailcore.models import Page, PageRevision, get_page_types
 
@@ -611,6 +611,19 @@ def reject_moderation(request, revision_id):
     return redirect('wagtailadmin_home')
 
 
+class ModerationEditBirdItem(edit_bird.BaseItem):
+    def __init__(self, revision_id):
+        self.revision_id = revision_id
+
+
+class ApproveModerationEditBirdItem(ModerationEditBirdItem):
+    template = 'wagtailadmin/edit_bird/approve_moderation_item.html'
+
+
+class RejectModerationEditBirdItem(ModerationEditBirdItem):
+    template = 'wagtailadmin/edit_bird/reject_moderation_item.html'
+
+
 @permission_required('wagtailadmin.access_admin')
 def preview_for_moderation(request, revision_id):
     revision = get_object_or_404(PageRevision, id=revision_id)
@@ -622,12 +635,11 @@ def preview_for_moderation(request, revision_id):
         return redirect('wagtailadmin_home')
 
     page = revision.as_page_object()
-    if not hasattr(request, 'userbar'):
-        request.userbar = []
-    request.userbar.append(
-        render_to_string('wagtailadmin/pages/_moderator_userbar.html', {
-            'revision': revision,
-        }, context_instance=RequestContext(request))
-    )
+
+    request.wagtail_edit_bird_items = [
+        edit_bird.EditPageItem(page),
+        ApproveModerationEditBirdItem(revision.id),
+        RejectModerationEditBirdItem(revision.id),
+    ]
 
     return page.serve(request)