From 9012baccf1221226fb06fc1a85ddeb90b2d5c05b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 13:59:13 +0000
Subject: [PATCH 01/13] Added edit bird

---
 wagtail/wagtailadmin/edit_bird.py             | 44 +++++++++++++++++++
 .../static/wagtailadmin/js/edit_bird.js       |  0
 .../static/wagtailadmin/scss/edit_bird.css    |  0
 .../wagtailadmin/edit_bird/base_item.html     |  1 +
 .../wagtailadmin/edit_bird/edit_bird.html     | 14 ++++++
 .../edit_bird/edit_page_item.html             |  5 +++
 .../templatetags/wagtail_edit_bird.py         | 40 +++++++++++++++++
 7 files changed, 104 insertions(+)
 create mode 100644 wagtail/wagtailadmin/edit_bird.py
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/base_item.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
 create mode 100644 wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py

diff --git a/wagtail/wagtailadmin/edit_bird.py b/wagtail/wagtailadmin/edit_bird.py
new file mode 100644
index 000000000..1bdff2f1f
--- /dev/null
+++ b/wagtail/wagtailadmin/edit_bird.py
@@ -0,0 +1,44 @@
+from django.core.urlresolvers import reverse
+from django.template import RequestContext
+from django.template.loader import render_to_string
+
+
+class BaseItem(object):
+    template = 'wagtailadmin/edit_bird/base_item.html'
+
+    @property
+    def can_render(self):
+        return True
+
+    def render(self, request):
+        if self.can_render:
+            return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request))
+
+
+class EditPageItem(BaseItem):
+    template = 'wagtailadmin/edit_bird/edit_page_item.html'
+
+    def __init__(self, page):
+        self.page = page
+
+    @property
+    def can_render(self):
+        # Don't render if the page doesn't have an id
+        return self.page.id
+
+
+def render_edit_bird(request, items):
+    # Render the items
+    rendered_items = [item.render(request) for item in items]
+
+    # Remove any unrendered items
+    rendered_items = [item for item in rendered_items if item]
+
+    # Quit if no items rendered
+    if not rendered_items:
+        return
+
+    # Render the edit bird
+    return render_to_string('wagtailadmin/edit_bird/edit_bird.html', {
+        'items': [item.render(request) for item in items],
+    })
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js b/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/base_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/base_item.html
new file mode 100644
index 000000000..8e9666d4c
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/base_item.html
@@ -0,0 +1 @@
+<li class="{% block item_classes %}{% endblock %}">{% block item_content %}{% endblock %}</li>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
new file mode 100644
index 000000000..7349df113
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
@@ -0,0 +1,14 @@
+{% load static %}
+
+<link rel="stylesheet" href="{% static 'wagtailadmin/scss/edit-bird.css' %}" type="text/css" />
+<script src="{% static 'wagtailadmin/js/edit-bird.js' %}"></script>
+
+<div class="wagtail-edit-bird">
+    Edit bird here!
+
+    <ul>
+        {% for item in items %}
+            {{ item|safe }}
+        {% endfor %}
+    </ul>
+</div>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
new file mode 100644
index 000000000..ec791836a
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
@@ -0,0 +1,5 @@
+{% extends "wagtailadmin/edit_bird/base_item.html" %}
+
+{% block item_content %}
+  <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}">Edit</a>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
new file mode 100644
index 000000000..3905a8cde
--- /dev/null
+++ b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
@@ -0,0 +1,40 @@
+from django import template
+from wagtail.wagtailadmin import edit_bird, hooks
+from wagtail.wagtailcore.models import Page
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def wagtail_edit_bird(context, current_page=None, items=None):
+    # Find page object
+    if not current_page:
+        if 'self' in context and isinstance(context['self'], Page):
+            current_page = context['self']
+        else:
+            return ''
+
+    # Find request object
+    request = context['request']
+
+    # Get items
+    if items is None:
+        if hasattr(request, 'wagtail_edit_bird_items'):
+            items = request.wagtail_edit_bird_items
+        else:
+            items = [
+                edit_bird.EditPageItem(current_page),
+            ]
+    for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
+        fn(request, items)
+
+    # Render edit bird
+    edit_bird_rendered = edit_bird.render_edit_bird(request, items)
+
+    if edit_bird_rendered:
+        # Disable cache
+        request.disable_cache = True
+
+        return edit_bird_rendered
+    else:
+        return ''

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 02/13] 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 000000000..209a1bf25
--- /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 000000000..e8e5b4205
--- /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 769fd4662..5c9f63810 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)

From ffeb98b03cb08d1cb5632601a5b71089e9460b5f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 14:05:56 +0000
Subject: [PATCH 03/13] Removed disable_cache from wagtail_edit_bird_tag This
 was used to disable caching when the edit bird was rendered. It is no longer
 needed.

---
 wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
index 3905a8cde..13fe4a632 100644
--- a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
+++ b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
@@ -29,12 +29,4 @@ def wagtail_edit_bird(context, current_page=None, items=None):
         fn(request, items)
 
     # Render edit bird
-    edit_bird_rendered = edit_bird.render_edit_bird(request, items)
-
-    if edit_bird_rendered:
-        # Disable cache
-        request.disable_cache = True
-
-        return edit_bird_rendered
-    else:
-        return ''
+    return edit_bird.render_edit_bird(request, items)

From cf759dbb2f0ce867806194f4b612e3a3dcab7698 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 15:40:34 +0000
Subject: [PATCH 04/13] Don't render edit bird if user is not logged in

---
 wagtail/wagtailadmin/edit_bird.py                      | 4 ++++
 wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/edit_bird.py b/wagtail/wagtailadmin/edit_bird.py
index 1bdff2f1f..cb1decc49 100644
--- a/wagtail/wagtailadmin/edit_bird.py
+++ b/wagtail/wagtailadmin/edit_bird.py
@@ -28,6 +28,10 @@ class EditPageItem(BaseItem):
 
 
 def render_edit_bird(request, items):
+    # Don't render if the user is not logged in
+    if not request.user.is_authenticated():
+        return
+
     # Render the items
     rendered_items = [item.render(request) for item in items]
 
diff --git a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
index 13fe4a632..1112517bf 100644
--- a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
+++ b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
@@ -29,4 +29,4 @@ def wagtail_edit_bird(context, current_page=None, items=None):
         fn(request, items)
 
     # Render edit bird
-    return edit_bird.render_edit_bird(request, items)
+    return edit_bird.render_edit_bird(request, items) or ''

From 91faf4fd5fa3d5878e2792bcd87f81c261ec5033 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 16:03:21 +0000
Subject: [PATCH 05/13] Edit bird: Clean up render method of EditPageItem

---
 wagtail/wagtailadmin/edit_bird.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_bird.py b/wagtail/wagtailadmin/edit_bird.py
index cb1decc49..8cdca6676 100644
--- a/wagtail/wagtailadmin/edit_bird.py
+++ b/wagtail/wagtailadmin/edit_bird.py
@@ -6,13 +6,8 @@ from django.template.loader import render_to_string
 class BaseItem(object):
     template = 'wagtailadmin/edit_bird/base_item.html'
 
-    @property
-    def can_render(self):
-        return True
-
     def render(self, request):
-        if self.can_render:
-            return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request))
+        return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request))
 
 
 class EditPageItem(BaseItem):
@@ -21,10 +16,12 @@ class EditPageItem(BaseItem):
     def __init__(self, page):
         self.page = page
 
-    @property
-    def can_render(self):
+    def render(self, request):
         # Don't render if the page doesn't have an id
-        return self.page.id
+        if not self.page.id:
+            return
+
+        return super(EditPageItem, self).render(request)
 
 
 def render_edit_bird(request, items):

From 4e67491bda3204d449c540fa80cbbb8ab73921dd Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 12 Mar 2014 16:53:43 +0000
Subject: [PATCH 06/13] Edit bird now checks if the user has permission to
 access admin and edit the page before displaying edit page option

---
 wagtail/wagtailadmin/edit_bird.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/wagtail/wagtailadmin/edit_bird.py b/wagtail/wagtailadmin/edit_bird.py
index 8cdca6676..ccfb461f9 100644
--- a/wagtail/wagtailadmin/edit_bird.py
+++ b/wagtail/wagtailadmin/edit_bird.py
@@ -21,6 +21,15 @@ class EditPageItem(BaseItem):
         if not self.page.id:
             return
 
+        # Don't render if user doesn't have permission to access the admin area
+        if not request.user.has_perm('wagtailadmin.access_admin'):
+            return
+
+        # Don't render if the user doesn't have permission to edit this page
+        permission_checker = self.page.permissions_for_user(request.user)
+        if not permission_checker.can_edit():
+            return
+
         return super(EditPageItem, self).render(request)
 
 

From edd757c5787fd971f620902f6421cc1b51a2b76b Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Mar 2014 15:04:17 +0000
Subject: [PATCH 07/13] first commit of karl's code, refactored to appear
 within an iframe

---
 .../static/wagtailadmin/js/edit_bird.js       |  3 +
 .../static/wagtailadmin/scss/edit_bird.css    |  0
 .../static/wagtailadmin/scss/edit_bird.scss   | 75 +++++++++++++++++++
 .../templates/wagtailadmin/admin_base.html    | 31 ++++++++
 .../templates/wagtailadmin/base.html          |  4 +-
 .../edit_bird/approve_moderation_item.html    |  8 --
 .../wagtailadmin/edit_bird/edit_bird.html     | 14 ----
 .../edit_bird/edit_page_item.html             |  5 --
 .../edit_bird/reject_moderation_item.html     |  8 --
 .../templates/wagtailadmin/skeleton.html      | 38 ++--------
 .../userbar/approve_moderation_item.html      |  8 ++
 .../{edit_bird => userbar}/base_item.html     |  0
 .../wagtailadmin/userbar/edit_bird.html       | 29 +++++++
 .../wagtailadmin/userbar/edit_page_item.html  |  5 ++
 .../templates/wagtailadmin/userbar/frame.html | 12 +++
 .../userbar/reject_moderation_item.html       |  8 ++
 .../templatetags/wagtail_edit_bird.py         | 16 +---
 wagtail/wagtailadmin/urls.py                  |  2 +
 .../wagtailadmin/{edit_bird.py => userbar.py} | 28 +------
 wagtail/wagtailadmin/views/userbar.py         | 41 ++++++++++
 20 files changed, 230 insertions(+), 105 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
 rename wagtail/wagtailadmin/templates/wagtailadmin/{edit_bird => userbar}/base_item.html (100%)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
 rename wagtail/wagtailadmin/{edit_bird.py => userbar.py} (55%)
 create mode 100644 wagtail/wagtailadmin/views/userbar.py

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js b/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
index e69de29bb..ffe368aab 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
@@ -0,0 +1,3 @@
+$(function(){
+	$('body').addClass('ready');
+})
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
new file mode 100644
index 000000000..99d4a1101
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
@@ -0,0 +1,75 @@
+@import "variables.scss";
+@import "mixins.scss";
+
+@import "components/icons.scss";
+
+html, body{
+    background-color:transparent;
+}
+body{
+    -webkit-font-smoothing: antialiased; /* Do not remove! */
+    font-family:Open Sans,Arial,sans-serif;
+    font-size:80%;
+}
+
+nav{
+    float:right;
+    &:hover ul{
+        height:200px;
+    }
+}
+
+.home{
+    float:right;
+    width:1.5em;
+    margin-bottom:1px;
+    background-color:white;
+    color:$color-text-base;
+
+    &.icon:before{
+        margin:-0.1em 0 0 -0.2em;
+        font-size:35px;
+    }
+}
+
+ul{
+    @include transition(height 0.2s ease);
+    @include unlist();
+    height:0px;
+    overflow:hidden;
+    clear:both;
+}
+
+li{
+    @include transition(width 0.2s ease);
+    width:3.5em;
+    overflow:hidden;
+    margin-bottom:1px;
+    position:relative;
+
+    &:hover{
+        width:8em;
+    }
+}
+
+a{
+    @include transition(background-color 0.2s ease, color 0.2s ease);
+    display:block;
+    background-color:$color-teal;
+    color:white;
+    width:10em;
+    height:1.5em;
+    text-align:left;
+    overflow:hidden;
+    text-decoration:none;
+    text-transform:uppercase;
+    padding:1em;
+
+    &:before{
+        margin-right:0.3em;
+    }
+    &:hover{
+        background-color:$color-teal-darker;
+        color:white;
+    }
+}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
new file mode 100644
index 000000000..00559e7b4
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -0,0 +1,31 @@
+{% extends "wagtailadmin/skeleton.html" %}
+{% load compress %}
+
+{% block css %}
+    {% compress css %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css" />
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.timepicker.css" />
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/core.scss" type="text/x-scss" />
+    {% endcompress %}
+
+    {% block extra_css %}{% endblock %}
+{% endblock %}
+
+{% block js %}
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
+    {% compress js %}
+        {% comment %}
+            Core JS includes (for inclusion on all pages) to be specified here
+        {% endcomment %}
+
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery-ui-1.10.3.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.timepicker.min.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.autosize.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-modal.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-tab.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.dlmenu.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/core.js"></script>
+    {% endcompress %}
+    
+    {% block extra_js %}{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
index 6a7b2f567..a847ada18 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/skeleton.html" %}
+{% extends "wagtailadmin/admin_base.html" %}
 {% load wagtailadmin_nav %}
 {% load i18n %}
 {% block furniture %}
@@ -33,4 +33,4 @@
             {% block content %}{% endblock %}
         </div>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
deleted file mode 100644
index 209a1bf25..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/approve_moderation_item.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% 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/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
deleted file mode 100644
index 7349df113..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_bird.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load static %}
-
-<link rel="stylesheet" href="{% static 'wagtailadmin/scss/edit-bird.css' %}" type="text/css" />
-<script src="{% static 'wagtailadmin/js/edit-bird.js' %}"></script>
-
-<div class="wagtail-edit-bird">
-    Edit bird here!
-
-    <ul>
-        {% for item in items %}
-            {{ item|safe }}
-        {% endfor %}
-    </ul>
-</div>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
deleted file mode 100644
index ec791836a..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/edit_page_item.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "wagtailadmin/edit_bird/base_item.html" %}
-
-{% block item_content %}
-  <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}">Edit</a>
-{% 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
deleted file mode 100644
index e8e5b4205..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/reject_moderation_item.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% 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/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index 1ddda14d6..fa45d0702 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -13,19 +13,14 @@
     
     <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
 
-    {% block css %}{# Block defined for timing breakdowns in django debug toolbar - not expected to be overridden #}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" />
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Bitter:400,700" /> 
-        
-        {% compress css %}
-            <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/normalize.css" />
-            <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css" />
-            <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.timepicker.css" />
-            <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/core.scss" type="text/x-scss" />
-        {% endcompress %}
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" />
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Bitter:400,700" /> 
 
-        {% block extra_css %}{% endblock %}
-    {% endblock %}
+    {% compress css %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/normalize.css" />
+    {% endcompress %}
+
+    {% block css %}{% endblock %}
 </head>
 <body class="{% block bodyclass %}{% endblock %} {% if messages %}has-messages{% endif %}">
     <!--[if lt IE 9]>
@@ -36,23 +31,6 @@
        {% block furniture %}{% endblock %}
     </div>
 
-    {% block js %}
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-        {% compress js %}
-            {% comment %}
-                Core JS includes (for inclusion on all pages) to be specified here
-            {% endcomment %}
-
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery-ui-1.10.3.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.timepicker.min.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.autosize.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-modal.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-tab.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.dlmenu.js"></script>
-            <script src="{{ STATIC_URL }}wagtailadmin/js/core.js"></script>
-        {% endcompress %}
-        
-        {% block extra_js %}{% endblock %}
-    {% endblock %}
+    {% block js %}{% endblock %}
 </body>
 </html>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
new file mode 100644
index 000000000..a2e03a3e5
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
@@ -0,0 +1,8 @@
+{% extends "wagtailadmin/userbar/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/base_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base_item.html
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_bird/base_item.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/base_item.html
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
new file mode 100644
index 000000000..497e61ea1
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
@@ -0,0 +1,29 @@
+{% extends "wagtailadmin/skeleton.html" %}
+{% load compress i18n %}
+
+{% block titletag %}{% trans 'User bar' %}{% endblock %}
+{% block css %}
+    {% compress css %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/edit_bird.scss" type="text/x-scss" />
+    {% endcompress %}
+{% endblock %}
+
+{% block furniture %}
+    <div class="wagtail-userbar">
+        <nav>
+            <a href="{% url 'wagtailadmin_home' %}" class="home icon icon-wagtail">Admin interface</a>
+            <ul>
+                {% for item in items %}
+                    {{ item|safe }}
+                {% endfor %}
+            </ul>
+        </nav>
+    </div>
+{% endblock %}
+
+{% block js %}
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
+    {% compress js %}
+        <script src="{{ STATIC_URL }}wagtailadmin/js/edit_bird.js"></script>
+    {% endcompress %}
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
new file mode 100644
index 000000000..4c8acd5d7
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
@@ -0,0 +1,5 @@
+{% extends "wagtailadmin/userbar/base_item.html" %}
+
+{% block item_content %}
+    <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" class="icon icon-edit">Edit</a>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
new file mode 100644
index 000000000..263c9c9b7
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -0,0 +1,12 @@
+<style type="text/css">
+    #wagtail-userbar{
+        position:absolute;
+        top:0;
+        right:0;
+        z-index:9000;
+        border:0;
+        width:100px;
+        height:100px;
+    }
+</style>
+<iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no" style="background:transparent"></iframe>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
new file mode 100644
index 000000000..a66c6f8a0
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
@@ -0,0 +1,8 @@
+{% extends "wagtailadmin/userbar/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/templatetags/wagtail_edit_bird.py b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
index 1112517bf..09975c2a7 100644
--- a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
+++ b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
@@ -1,10 +1,9 @@
 from django import template
-from wagtail.wagtailadmin import edit_bird, hooks
+from wagtail.wagtailadmin.views import userbar
 from wagtail.wagtailcore.models import Page
 
 register = template.Library()
 
-
 @register.simple_tag(takes_context=True)
 def wagtail_edit_bird(context, current_page=None, items=None):
     # Find page object
@@ -17,16 +16,7 @@ def wagtail_edit_bird(context, current_page=None, items=None):
     # Find request object
     request = context['request']
 
-    # Get items
-    if items is None:
-        if hasattr(request, 'wagtail_edit_bird_items'):
-            items = request.wagtail_edit_bird_items
-        else:
-            items = [
-                edit_bird.EditPageItem(current_page),
-            ]
-    for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
-        fn(request, items)
+    print context
 
     # Render edit bird
-    return edit_bird.render_edit_bird(request, items) or ''
+    return userbar.render_edit_frame(request, context) or ''
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index b26591905..cc72e29f5 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -79,4 +79,6 @@ urlpatterns += patterns(
 
     url(r'^account/$', 'account.account', name='wagtailadmin_account'),
     url(r'^account/change_password/$', 'account.change_password', name='wagtailadmin_account_change_password'),
+
+    url(r'^userbar/(\d+)/$', 'userbar.userbar', name='wagtailadmin_userbar'),
 )
diff --git a/wagtail/wagtailadmin/edit_bird.py b/wagtail/wagtailadmin/userbar.py
similarity index 55%
rename from wagtail/wagtailadmin/edit_bird.py
rename to wagtail/wagtailadmin/userbar.py
index ccfb461f9..03434dfc2 100644
--- a/wagtail/wagtailadmin/edit_bird.py
+++ b/wagtail/wagtailadmin/userbar.py
@@ -2,16 +2,15 @@ from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.template.loader import render_to_string
 
-
 class BaseItem(object):
-    template = 'wagtailadmin/edit_bird/base_item.html'
+    template = 'wagtailadmin/userbar/base_item.html'
 
     def render(self, request):
         return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request))
 
 
 class EditPageItem(BaseItem):
-    template = 'wagtailadmin/edit_bird/edit_page_item.html'
+    template = 'wagtailadmin/userbar/edit_page_item.html'
 
     def __init__(self, page):
         self.page = page
@@ -30,25 +29,4 @@ class EditPageItem(BaseItem):
         if not permission_checker.can_edit():
             return
 
-        return super(EditPageItem, self).render(request)
-
-
-def render_edit_bird(request, items):
-    # Don't render if the user is not logged in
-    if not request.user.is_authenticated():
-        return
-
-    # Render the items
-    rendered_items = [item.render(request) for item in items]
-
-    # Remove any unrendered items
-    rendered_items = [item for item in rendered_items if item]
-
-    # Quit if no items rendered
-    if not rendered_items:
-        return
-
-    # Render the edit bird
-    return render_to_string('wagtailadmin/edit_bird/edit_bird.html', {
-        'items': [item.render(request) for item in items],
-    })
+        return super(EditPageItem, self).render(request)
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py
new file mode 100644
index 000000000..462c5f701
--- /dev/null
+++ b/wagtail/wagtailadmin/views/userbar.py
@@ -0,0 +1,41 @@
+from django.conf import settings
+from django.shortcuts import render, redirect
+from django.template.loader import render_to_string
+from django.contrib import messages
+from django.contrib.auth.forms import SetPasswordForm
+from django.contrib.auth.decorators import permission_required
+from django.utils.translation import ugettext as _ 
+
+from wagtail.wagtailadmin.userbar import EditPageItem
+from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore.models import Page
+
+def render_edit_frame(request, context):
+    # Render the frame to contain the userbar items
+    return render_to_string('wagtailadmin/userbar/frame.html', {
+        'page': context
+    })
+
+@permission_required('wagtailadmin.access_admin')
+def userbar(request, page_id):
+    items = [
+        EditPageItem(Page.objects.get(id=page_id)),
+    ]
+
+    for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
+        fn(request, items)
+
+    # Render the items
+    rendered_items = [item.render(request) for item in items]
+
+    # Remove any unrendered items
+    rendered_items = [item for item in rendered_items if item]
+
+    # Quit if no items rendered
+    if not rendered_items:
+        return
+
+    # Render the edit bird
+    return render(request, 'wagtailadmin/userbar/edit_bird.html', {
+        'items': [item.render(request) for item in items],
+    })
\ No newline at end of file

From 637899f6c2b82a27bc774121be2dac5c97f6f94c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Mar 2014 16:20:53 +0000
Subject: [PATCH 08/13] implemented moderation user buttons the same as edit
 button

---
 .../static/wagtailadmin/scss/edit_bird.scss   | 55 +++++++++++++++----
 .../userbar/approve_moderation_item.html      | 11 ++--
 .../wagtailadmin/userbar/edit_bird.html       |  2 +-
 .../wagtailadmin/userbar/edit_page_item.html  |  3 +-
 .../templates/wagtailadmin/userbar/frame.html |  5 +-
 .../userbar/reject_moderation_item.html       | 11 ++--
 wagtail/wagtailadmin/userbar.py               | 38 +++++++++++--
 wagtail/wagtailadmin/views/pages.py           | 19 -------
 wagtail/wagtailadmin/views/userbar.py         |  8 ++-
 9 files changed, 104 insertions(+), 48 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
index 99d4a1101..3f3247147 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
@@ -14,8 +14,9 @@ body{
 
 nav{
     float:right;
+
     &:hover ul{
-        height:200px;
+        height:300px;
     }
 }
 
@@ -42,34 +43,66 @@ ul{
 
 li{
     @include transition(width 0.2s ease);
+    float:right;
+    clear:both;
     width:3.5em;
     overflow:hidden;
-    margin-bottom:1px;
     position:relative;
+    padding-bottom:1px;
 
     &:hover{
-        width:8em;
+        width:10em;
     }
 }
 
-a{
+.action{
     @include transition(background-color 0.2s ease, color 0.2s ease);
-    display:block;
     background-color:$color-teal;
     color:white;
+
+    &:before{
+        margin-right:0.3em;
+    }
+
+    &:hover{
+        background-color:$color-teal-darker;
+        color:white;
+    }
+}
+
+/* actions which can be accomplished just with a link tag */
+a.action, a{
+    display:block;
     width:10em;
     height:1.5em;
     text-align:left;
     overflow:hidden;
     text-decoration:none;
     text-transform:uppercase;
-    padding:1em;
+    padding:1em;   
+}
 
-    &:before{
-        margin-right:0.3em;
-    }
-    &:hover{
-        background-color:$color-teal-darker;
+/* actions which require wrapping a form input */
+div.action{
+    input{
         color:white;
+        -webkit-font-smoothing: antialiased; /* Do not remove! */
+        font-family:Open Sans,Arial,sans-serif;
+        border:0;
+        background:none;
+        display:block;
+        text-transform:uppercase;
+        padding:1em;
+        width:100%;
+        position:relative;
+        z-index:1;
+        text-align:left;
+        padding-left:3.5em;
+    }
+    &:before{
+        position:absolute;
+        top:0.6em;
+        left:0.6em;
+        z-index:0;
     }
 }
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
index a2e03a3e5..a02669575 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
@@ -1,8 +1,11 @@
 {% extends "wagtailadmin/userbar/base_item.html" %}
+{% load i18n %}
 
 {% block item_content %}
-	<form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision_id %}" method="post">
-		{% csrf_token %}
-		<input type="submit" value="Approve" />
-	</form>
+    <form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision.id %}" method="post">
+        {% csrf_token %}
+        <div class="action icon icon-tick">
+            <input type="submit" value="{% trans 'Approve' %}" />
+        </div>
+    </form>
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
index 497e61ea1..f937e20e5 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
@@ -11,7 +11,7 @@
 {% block furniture %}
     <div class="wagtail-userbar">
         <nav>
-            <a href="{% url 'wagtailadmin_home' %}" class="home icon icon-wagtail">Admin interface</a>
+            <a href="{% url 'wagtailadmin_home' %}" class="home icon icon-wagtail" title="{% trans 'Go to Wagtail admin interface' %}">{% trans 'Go to Wagtail admin interface' %}</a>
             <ul>
                 {% for item in items %}
                     {{ item|safe }}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
index 4c8acd5d7..4f6ee9ff1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
@@ -1,5 +1,6 @@
 {% extends "wagtailadmin/userbar/base_item.html" %}
+{% load i18n %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" class="icon icon-edit">Edit</a>
+    <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" class="action icon icon-edit">{% trans 'Edit' %}</a>
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
index 263c9c9b7..adfbf958b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -5,8 +5,9 @@
         right:0;
         z-index:9000;
         border:0;
-        width:100px;
-        height:100px;
+        width:150px;
+        height:300px;
+        transition
     }
 </style>
 <iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no" style="background:transparent"></iframe>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
index a66c6f8a0..8a1031c22 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
@@ -1,8 +1,11 @@
 {% extends "wagtailadmin/userbar/base_item.html" %}
+{% load i18n %}
 
 {% block item_content %}
-	<form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision_id %}" method="post">
-		{% csrf_token %}
-		<input type="submit" value="Reject" />
-	</form>
+    <form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision.id %}" method="post">
+        {% csrf_token %}
+        <div class="action icon icon-cross">
+            <input type="submit" value="{% trans 'Reject' %}" />
+        </div>
+    </form>
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/wagtailadmin/userbar.py
index 03434dfc2..9a4582c1a 100644
--- a/wagtail/wagtailadmin/userbar.py
+++ b/wagtail/wagtailadmin/userbar.py
@@ -18,15 +18,43 @@ class EditPageItem(BaseItem):
     def render(self, request):
         # Don't render if the page doesn't have an id
         if not self.page.id:
-            return
+            return ""
 
         # Don't render if user doesn't have permission to access the admin area
         if not request.user.has_perm('wagtailadmin.access_admin'):
-            return
-
+            return ""
+ 
         # Don't render if the user doesn't have permission to edit this page
         permission_checker = self.page.permissions_for_user(request.user)
         if not permission_checker.can_edit():
-            return
+            return ""
 
-        return super(EditPageItem, self).render(request)
\ No newline at end of file
+        return super(EditPageItem, self).render(request)
+
+class ModeratePageItem(BaseItem):
+
+    def __init__(self, page):
+        self.page = page
+
+    def render(self, request):
+        if not self.page.id:
+            return ""
+
+        if not self.page.get_latest_revision().submitted_for_moderation:
+            return ""
+
+        self.revision = self.page.get_latest_revision()
+
+        if not request.user.has_perm('wagtailadmin.access_admin'):
+            return ""
+
+        if not self.page.permissions_for_user(request.user).can_publish():
+            return ""
+       
+        return super(ModeratePageItem, self).render(request)
+
+class ApproveModerationEditPageItem(ModeratePageItem):
+    template = 'wagtailadmin/userbar/approve_moderation_item.html'
+
+class RejectModerationEditPageItem(ModeratePageItem):
+    template = 'wagtailadmin/userbar/reject_moderation_item.html'
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 5c9f63810..dd8024682 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -611,19 +611,6 @@ 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)
@@ -636,10 +623,4 @@ def preview_for_moderation(request, revision_id):
 
     page = revision.as_page_object()
 
-    request.wagtail_edit_bird_items = [
-        edit_bird.EditPageItem(page),
-        ApproveModerationEditBirdItem(revision.id),
-        RejectModerationEditBirdItem(revision.id),
-    ]
-
     return page.serve(request)
diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py
index 462c5f701..e4a45c270 100644
--- a/wagtail/wagtailadmin/views/userbar.py
+++ b/wagtail/wagtailadmin/views/userbar.py
@@ -6,7 +6,7 @@ from django.contrib.auth.forms import SetPasswordForm
 from django.contrib.auth.decorators import permission_required
 from django.utils.translation import ugettext as _ 
 
-from wagtail.wagtailadmin.userbar import EditPageItem
+from wagtail.wagtailadmin.userbar import EditPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
 from wagtail.wagtailadmin import hooks
 from wagtail.wagtailcore.models import Page
 
@@ -20,11 +20,17 @@ def render_edit_frame(request, context):
 def userbar(request, page_id):
     items = [
         EditPageItem(Page.objects.get(id=page_id)),
+        ApproveModerationEditPageItem(Page.objects.get(id=page_id)),
+        RejectModerationEditPageItem(Page.objects.get(id=page_id)),
     ]
 
     for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
         fn(request, items)
 
+
+    for item in items:
+        print item.render(request)
+
     # Render the items
     rendered_items = [item.render(request) for item in items]
 

From 5a4caabd44cc31314a67ee414f872f94c4537777 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Mar 2014 16:47:20 +0000
Subject: [PATCH 09/13] clicking user bar buttons now redirects parent page

---
 wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss    | 2 +-
 wagtail/wagtailadmin/templates/wagtailadmin/login.html          | 2 +-
 .../templates/wagtailadmin/userbar/approve_moderation_item.html | 2 +-
 .../wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html  | 2 +-
 .../templates/wagtailadmin/userbar/edit_page_item.html          | 2 +-
 wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html  | 1 -
 .../templates/wagtailadmin/userbar/reject_moderation_item.html  | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
index 3f3247147..8b824e606 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
@@ -42,7 +42,7 @@ ul{
 }
 
 li{
-    @include transition(width 0.2s ease);
+    @include transition(width 0.1s ease);
     float:right;
     clear:both;
     width:3.5em;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index cf28de7f1..9cb28ed86 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/skeleton.html" %}
+{% extends "wagtailadmin/admin_base.html" %}
 {% load compress %}
 {% load i18n %}
 {% block titletag %}{% trans "Sign in" %}{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
index a02669575..accbea856 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block item_content %}
-    <form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision.id %}" method="post">
+    <form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision.id %}" target="_parent" method="post">
         {% csrf_token %}
         <div class="action icon icon-tick">
             <input type="submit" value="{% trans 'Approve' %}" />
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
index f937e20e5..f38488f6b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
@@ -11,7 +11,7 @@
 {% block furniture %}
     <div class="wagtail-userbar">
         <nav>
-            <a href="{% url 'wagtailadmin_home' %}" class="home icon icon-wagtail" title="{% trans 'Go to Wagtail admin interface' %}">{% trans 'Go to Wagtail admin interface' %}</a>
+            <a href="{% url 'wagtailadmin_home' %}" target="_parent" class="home icon icon-wagtail" title="{% trans 'Go to Wagtail admin interface' %}">{% trans 'Go to Wagtail admin interface' %}</a>
             <ul>
                 {% for item in items %}
                     {{ item|safe }}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
index 4f6ee9ff1..58fce01af 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
@@ -2,5 +2,5 @@
 {% load i18n %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" class="action icon icon-edit">{% trans 'Edit' %}</a>
+    <a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" target="_parent" class="action icon icon-edit">{% trans 'Edit' %}</a>
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
index adfbf958b..65e334ceb 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -7,7 +7,6 @@
         border:0;
         width:150px;
         height:300px;
-        transition
     }
 </style>
 <iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no" style="background:transparent"></iframe>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
index 8a1031c22..99c389bd2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block item_content %}
-    <form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision.id %}" method="post">
+    <form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision.id %}" target="_parent" method="post">
         {% csrf_token %}
         <div class="action icon icon-cross">
             <input type="submit" value="{% trans 'Reject' %}" />

From c5e4dd94c4279678db919506981aa52bd628b0b2 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Mar 2014 17:20:55 +0000
Subject: [PATCH 10/13] removed unused import of edit_bird (now userbar)

---
 wagtail/wagtailadmin/views/pages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index dd8024682..dbf17a2a4 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, edit_bird
+from wagtail.wagtailadmin import tasks, hooks
 
 from wagtail.wagtailcore.models import Page, PageRevision, get_page_types
 

From d61ac002c0f320d74af1c3ab7f3e6599427da762 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 18 Mar 2014 12:08:23 +0000
Subject: [PATCH 11/13] updated animation and js requirements

---
 .../static/wagtailadmin/js/edit_bird.js       | 14 +++++--
 .../static/wagtailadmin/scss/edit_bird.scss   | 30 ++++++++++++---
 .../static/wagtailadmin/scss/mixins.scss      | 37 ++++++++++++-------
 .../wagtailadmin/userbar/edit_bird.html       |  1 -
 .../templates/wagtailadmin/userbar/frame.html |  3 +-
 5 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js b/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
index ffe368aab..afc06b24a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
@@ -1,3 +1,11 @@
-$(function(){
-	$('body').addClass('ready');
-})
\ No newline at end of file
+/* No jQuery to speed up loading */
+document.addEventListener('DOMContentLoaded', function(){
+    var body = document.querySelectorAll('body')[0];
+    var className = 'ready';
+
+    if (body.classList){
+        body.classList.add(className);
+    }else{
+        body.className += ' ' + className;
+    }
+});
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
index 8b824e606..ee518b445 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
@@ -13,10 +13,26 @@ body{
 }
 
 nav{
+    padding:0 0 3em 3em;
     float:right;
 
-    &:hover ul{
-        height:300px;
+     /* moving menu only for browser that can support hover and transitions */
+    .no-touch.csstransitions & {
+        ul{
+            height:0;
+        }
+        li{
+            left:50px;
+        }
+
+        &:hover{
+            ul{
+                height:300px;
+            }
+            li{
+                left:0;
+            }
+        }
     }
 }
 
@@ -28,21 +44,25 @@ nav{
     color:$color-text-base;
 
     &.icon:before{
+        @include transition(color 0.2s ease);
         margin:-0.1em 0 0 -0.2em;
         font-size:35px;
     }
+
+    &:hover:before{
+        color:black;
+    }
 }
 
 ul{
     @include transition(height 0.2s ease);
     @include unlist();
-    height:0px;
     overflow:hidden;
     clear:both;
 }
 
 li{
-    @include transition(width 0.1s ease);
+    @include transition(left 0.2s ease, width 0.1s ease);
     float:right;
     clear:both;
     width:3.5em;
@@ -65,7 +85,7 @@ li{
     }
 
     &:hover{
-        background-color:$color-teal-darker;
+        background-color:$color-teal-dark;
         color:white;
     }
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss
index c990eb43c..48a577483 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss
@@ -1,8 +1,8 @@
 @mixin clearfix() {
     &:before,
     &:after {
-        content: " "; /* 1 */
-        display: table; /* 2 */
+        content: " ";
+        display: table;
     }
     &:after {
         clear: both;
@@ -24,16 +24,16 @@
 @mixin transition($transition...){
     body.ready &{
         -webkit-transition: $transition;
-        -moz-transition: $transition;
-        -o-transition: $transition;
-        transition: $transition;
+           -moz-transition: $transition;
+             -o-transition: $transition;
+                transition: $transition;
     }
 }
 @mixin transition-immediate($transition...){
     -webkit-transition: $transition;
-    -moz-transition: $transition;
-    -o-transition: $transition;
-    transition: $transition;
+       -moz-transition: $transition;
+         -o-transition: $transition;
+            transition: $transition;
 }
 
 @mixin transition-transform($transition...) {
@@ -43,22 +43,31 @@
           transition: transform $transition;
 }
 
+@mixin transition-delay($delay...){
+    body.ready &{
+        -webkit-transition-delay: $delay;
+           -moz-transition-delay: $delay;
+             -o-transition-delay: $delay;
+                transition-delay: $delay;
+    }
+}
+
 @mixin notransition() {
     -webkit-transition: none !important;
-    -moz-transition: none !important;
-    -o-transition: none !important;
-    -ms-transition: none !important;
-    transition: none !important;
+       -moz-transition: none !important;
+         -o-transition: none !important;
+        -ms-transition: none !important;
+            transition: none !important;
 }
 
 @mixin border-radius($radius){
     -webkit-border-radius: $radius;
-    border-radius: $radius;
+            border-radius: $radius;
 }
 
 @mixin box-shadow($shadow){  
     -webkit-box-shadow: $shadow; //e.g inset 2px 2px 3px 2px rgba(0, 0, 0, 1)
-    box-shadow: $shadow;
+            box-shadow: $shadow;
 }
 
 @mixin visuallyhidden{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
index f38488f6b..7f1ddd6b4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
@@ -22,7 +22,6 @@
 {% endblock %}
 
 {% block js %}
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
     {% compress js %}
         <script src="{{ STATIC_URL }}wagtailadmin/js/edit_bird.js"></script>
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
index 65e334ceb..026e3168a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -1,5 +1,6 @@
 <style type="text/css">
     #wagtail-userbar{
+    	background:transparent;
         position:absolute;
         top:0;
         right:0;
@@ -9,4 +10,4 @@
         height:300px;
     }
 </style>
-<iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no" style="background:transparent"></iframe>
\ No newline at end of file
+<iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no"></iframe>
\ No newline at end of file

From 5e17881f2d85e8f153c88fdf3bb35e4eecdfcc07 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 18 Mar 2014 16:53:56 +0000
Subject: [PATCH 12/13] renamed all userbar templates to be more uniform and
 changed 'edit bird' to 'userbar' throughout

---
 .../scss/{edit_bird.scss => userbar.scss}     |   0
 .../wagtailadmin/scss/wagtail-userbar.css     | 117 ------------------
 .../userbar/{edit_bird.html => base.html}     |   2 +-
 .../templates/wagtailadmin/userbar/frame.html |   2 +-
 .../{base_item.html => item_base.html}        |   0
 .../wagtailadmin/userbar/item_page_add.html   |   6 +
 ...ation_item.html => item_page_approve.html} |   2 +-
 ...dit_page_item.html => item_page_edit.html} |   2 +-
 ...ration_item.html => item_page_reject.html} |   2 +-
 .../templatetags/wagtail_edit_bird.py         |  22 ----
 .../templatetags/wagtailuserbar.py            |  30 +++--
 wagtail/wagtailadmin/urls.py                  |   3 +-
 wagtail/wagtailadmin/userbar.py               |  42 +++++--
 wagtail/wagtailadmin/views/pages.py           |   2 +
 wagtail/wagtailadmin/views/userbar.py         |  50 +++++---
 15 files changed, 99 insertions(+), 183 deletions(-)
 rename wagtail/wagtailadmin/static/wagtailadmin/scss/{edit_bird.scss => userbar.scss} (100%)
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/wagtail-userbar.css
 rename wagtail/wagtailadmin/templates/wagtailadmin/userbar/{edit_bird.html => base.html} (95%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/userbar/{base_item.html => item_base.html} (100%)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
 rename wagtail/wagtailadmin/templates/wagtailadmin/userbar/{approve_moderation_item.html => item_page_approve.html} (86%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/userbar/{edit_page_item.html => item_page_edit.html} (78%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/userbar/{reject_moderation_item.html => item_page_reject.html} (86%)
 delete mode 100644 wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/edit_bird.scss
rename to wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/wagtail-userbar.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/wagtail-userbar.css
deleted file mode 100644
index 44103abcf..000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/wagtail-userbar.css
+++ /dev/null
@@ -1,117 +0,0 @@
-/* NB: This embedding format references ttf/eo/svg files that don't exist. 
-This is a deliberate means of forcing the browser to use the base64 encoded woff instead. Somehow. */
-@font-face {
-    font-family: 'wagtailuserbar';
-    src: url('wagtailuserbar.eot');
-}
-
-@font-face {
-    font-family: 'wagtailuserbar';
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAgoABEAAAAAC6gAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABgAAAABwAAAAcanJcQ0dERUYAAAGcAAAAHQAAACAAPwAET1MvMgAAAbwAAABEAAAAVmLhkIljbWFwAAACAAAAAFkAAAFyQ7RK0GN2dCAAAAJcAAAADgAAAA4BiQG1ZnBnbQAAAmwAAAGxAAACZVO0L6dnYXNwAAAEIAAAAAgAAAAIAAAAEGdseWYAAAQoAAABtgAAAkyzcIkoaGVhZAAABeAAAAAsAAAANgPbCqFoaGVhAAAGDAAAAB0AAAAkDXoH62htdHgAAAYsAAAAMwAAAEhBGwGQbG9jYQAABmAAAAAQAAAAJgj4B9JtYXhwAAAGcAAAACAAAAAgAS4BEW5hbWUAAAaQAAAAvgAAAY4d5DtIcG9zdAAAB1AAAABoAAAAxTGUOHdwcmVwAAAHuAAAAGYAAABsPLbKh3dlYmYAAAggAAAABgAAAAau0VL0AAAAAQAAAADMPaLPAAAAAM8aWiMAAAAAzxpfUHjaY2BkYGDgA2IJBhBgYmAEQkEgZgHzGAAFBQBEAAAAeNpjYGSeyDiBgZWBhdWAdQYDA6MMhGa+wpDCJMDAwMTAyskAA4wMSCAgzTWFwYGBV/UPe8P/BgYGdhYGDZgaAJAGCVZ42mNgYGBmgGAZBkYGEMgB8hjBfBaGACAtAITMYBlehjIFLgV9hXjVP///w0UYECL/v/7vfcBy/8H9jbdEoaahAEY2BrgwIxOQYEJXwEAjwMwwWAAATTITBQAAAAAAAPwAUAAIAIgAsQCxAAB42l1Ru05bQRDdDQ8DgcTYIDnaFLOZkMZ7oQUJxNWNYmQ7heUIaTdykYtxAR9AgUQN2q8ZoKGkSJsGIRdIfEI+IRIza4iiNDs7s3POmTNLypGqd+lrz1PnJJDC3QbNNv1OSLWzAPek6+uNjLSDB1psZvTKdfv+Cwab0ZQ7agDlPW8pDxlNO4FatKf+0fwKhvv8H/M7GLQ00/TUOgnpIQTmm3FLg+8ZzbrLD/qC1eFiMDCkmKbiLj+mUv63NOdqy7C1kdG8gzMR+ck0QFNrbQSa/tQh1fNxFEuQy6axNpiYsv4kE8GFyXRVU7XM+NrBXbKz6GCDKs2BB9jDVnkMHg4PJhTStyTKLA0R9mKrxAgRkxwKOeXcyf6kQPlIEsa8SUo744a1BsaR18CgNk+z/zybTW1vHcL4WRzBd78ZSzr4yIbaGBFiO2IpgAlEQkZV+YYaz70sBuRS+89AlIDl8Y9/nQi07thEPJe1dQ4xVgh6ftvc8suKu1a5zotCd2+qaqjSKc37Xs6+xwOeHgvDQWPBm8/7/kqB+jwsrjRoDgRDejd6/6K16oirvBc+sifTv7FaAAAAAAEAAf//AA942k1Pv28TMRS2L6/2U2UFJz1yV2TE0ZikVaT2mtwPTgKlQwcGNgYmmAJkYMzOQAfGDjCUqkJqVVgYcodg4k9g6MTfQHbGCGH7gsR7ev4+f8/+/EyAHpMlm3EgEXlPzskleUGqd4QMSg8W1YkltxuLKrLkydloVCnLOt7iSzNSOKDzj3vzyc/y6fPhsGRri/ITHZRs0mp/w87mjdMPFzooSNk8abVLhkUx77SqzYvLoiji/Tv5RpRnadKP+73uFu+lSZ7l2Wh4i6a9LuN0TIdWcKKpMXV07NXQyPLY3M7yxHqYNUmT1LH7NA98bvJ6vTKbvikem2ScXfOYg4YDl1ucdS3G5pFOwHgvGPXp8ecj+uvHs7XowSu9s76rk5tBu6nvPrya/NFvZqhQaYmhj8IP8UCGEkEIBYiAAK4cOOKvdgL+hW2Yo0rIA8AwtCZCyBClioQ3BaWsuv19uozo7PfrrzuDw8d8t/8o0esM8DDEq+XbUDsLqJ0ilMK+oECYQYwmcdUUAoR0J1cltTG3HQl+bSEE+obYsGDvCzMbbtczO9X+pHHPzqUAXk4JIZT8F/vkLzbbWJAAAHjaY2BkYGAA4tnn3Ozj+W2+MshzMIDAean4AGSarYSdBUhxMDCBeADz3gd2eNpjYGRgYGf5f4OBgYMBBNhKGBgZUIEQAEIEAnkAAAB42uNggAAOMGacwNzEwMDOwsAAo5nCGBgYDwKxNgQzPADS6UA6GUKD5NgvMDAAAL+zBugAeNpjYIAARjk8UA0AG3wB2gABAAAAEgCmAAQAAAAAAAIAAQACABYAAAEAAGcAAAAAeNqFkE8OwUAUh79qCRtLS+kBkGoI6QF6AmGtSUkTIWmJrRM5hQXXcApLv07HgkVl8ma+9+b9+c0AbTa4OF4Hhz5YbtCVV7HLgoFljxEXy016XC23lH2zfFf8aflBwIsza7YctWfsGHKiICUnUST/8WIO7JVbnrmqUnxCTQ10RrL6XlXOTPHQWMCYyd+ab39puFBuqcRXh3J6fY+VONFPVto/NbFuMnmxufWNMl/xqVQGWpG0zc37jM43cII5TQAAeNp9xkEOgjAURdH/ACkgKrCStlLQodGwB1YAJMQwYeDugfSNvZNzJZD/VSIIEEqPCCfEUEiQIsMZOS644oYCZTzMv2U0av1OWuvPod2HGmrpndbU0Ya29EGf9OW1ndd5XffeAEOpI1142tvB+L91A2Mvg/cGjoCIjYyMfZEb3di0IxQ3CER6bxAJAjIaImU3sGnHRDBsYFJw3cCs7bKBWcF1E5M6kzaYwwLiyEE4jBtYoUrYFFx3MbDW/2dg0t7I7Fam7RK5QUQbAEZLIC4AAAABUvSu0AAA) format('woff'),
-         url('wagtailuserbar.ttf') format('truetype'),
-         url('wagtailuserbar.svg#wagtailuserbar') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-body{
-	padding-top:50px;
-}
-
-#wagtail-userbar{
-	-webkit-box-sizing: border-box; 
-    -moz-box-sizing: border-box; 
-    box-sizing: border-box;
-	-webkit-font-smoothing: antialiased; 
-	font-family:Open Sans,sans-serif;
-	font-size:13px;
-	min-height:50px;
-	position:fixed;
-	width:100%;
-	top:0;
-	background-color:#333;
-	z-index:10000;
-	padding:10px 10px 0px 70px;
-	color:white;
-}
-	#wagtail-userbar:before,
-	#wagtail-userbar:after {
-	    content: " ";
-	    display: table;
-	}
-	#wagtail-userbar:after {
-	    clear: both;
-	}
-
-	#wagtail-userbar:before{
-		position:absolute;
-		font-family:wagtailuserbar;
-		content:"v";
-		width:50px;
-		height:100%;
-		min-height:50px;
-		line-height:57px;
-		font-size:40px;
-		background-color:blue;
-		display:block;
-		float:left;
-		margin:-10px 0 0 -70px;
-		background-color:#000;
-		color:white;
-		opacity:0.4;
-		text-align:center;
-	}
-
-	#wagtail-userbar ul,
-	#wagtail-userbar li{
-		margin:0;
-		padding:0;
-		list-style-type:none;
-	}
-	#wagtail-userbar li{
-		margin-bottom:10px;
-	}
-	#wagtail-userbar p{
-		margin:0.5em 0 1em 0;
-	}
-	#wagtail-userbar .message{
-		float:left;
-	}
-	#wagtail-userbar .actions{
-		float:right;
-	}
-		#wagtail-userbar .actions form{
-			float:left;
-		}
-	#wagtail-userbar .button{
-		border:0;
-		font-family:Open Sans,Arial,sans-serif;
-		border-radius:2px;
-		background-color:#666;
-		-webkit-font-smoothing: antialiased; 
-		text-transform:uppercase;
-		padding:0.5em 1em;
-		float:left;
-		margin:0 1em 1em 0;
-		font-weight:normal;
-		font-size:0.9em;
-		color:white;
-		line-height:1.2em;
-		text-decoration:none;
-	}
-		#wagtail-userbar .button:hover{
-			background-color:#555;
-		}
-		#wagtail-userbar .button.yes{
-			background-color:#43b1b0;
-		}
-		#wagtail-userbar .button.yes:hover{
-			background-color:#2c7d7b;
-		}
-		#wagtail-userbar .button.no{
-			background-color:#f7474e;
-		}
-		#wagtail-userbar .button.no:hover{
-			background-color:#cf0911;
-		}
-
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
similarity index 95%
rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
index 7f1ddd6b4..293d43bc7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_bird.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
@@ -4,7 +4,7 @@
 {% block titletag %}{% trans 'User bar' %}{% endblock %}
 {% block css %}
     {% compress css %}
-        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/edit_bird.scss" type="text/x-scss" />
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/userbar.scss" type="text/x-scss" />
     {% endcompress %}
 {% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
index 026e3168a..d4b69de1c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -10,4 +10,4 @@
         height:300px;
     }
 </style>
-<iframe id="wagtail-userbar" src="{% url 'wagtailadmin_userbar' page.self.id %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no"></iframe>
\ No newline at end of file
+<iframe id="wagtail-userbar" src="{% if revision_id %}{% url 'wagtailadmin_userbar_moderation' revision_id %}{% else %}{% url 'wagtailadmin_userbar_frontend' page.self.id %}{% endif %}" width="1000px" height="1000px" frameborder="0" allowtransparency="true" scrolling="no"></iframe>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_base.html
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/base_item.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_base.html
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
new file mode 100644
index 000000000..45f0002e9
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
@@ -0,0 +1,6 @@
+{% extends "wagtailadmin/userbar/item_base.html" %}
+{% load i18n  %}
+
+{% block item_content %}
+    <a href="{% url 'wagtailadmin_pages_add_subpage' self.parent_page.id %}" target="_parent" class="action icon icon-plus" title="{% trans 'Add another page at this level' %}">{% trans 'Add' %}</a>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html
similarity index 86%
rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html
index accbea856..eed4b5b85 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/approve_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/userbar/base_item.html" %}
+{% extends "wagtailadmin/userbar/item_base.html" %}
 {% load i18n %}
 
 {% block item_content %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html
similarity index 78%
rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html
index 58fce01af..c6bb077ad 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/edit_page_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/userbar/base_item.html" %}
+{% extends "wagtailadmin/userbar/item_base.html" %}
 {% load i18n %}
 
 {% block item_content %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html
similarity index 86%
rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html
index 99c389bd2..ff145a508 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/reject_moderation_item.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/userbar/base_item.html" %}
+{% extends "wagtailadmin/userbar/item_base.html" %}
 {% load i18n %}
 
 {% block item_content %}
diff --git a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py b/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
deleted file mode 100644
index 09975c2a7..000000000
--- a/wagtail/wagtailadmin/templatetags/wagtail_edit_bird.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django import template
-from wagtail.wagtailadmin.views import userbar
-from wagtail.wagtailcore.models import Page
-
-register = template.Library()
-
-@register.simple_tag(takes_context=True)
-def wagtail_edit_bird(context, current_page=None, items=None):
-    # Find page object
-    if not current_page:
-        if 'self' in context and isinstance(context['self'], Page):
-            current_page = context['self']
-        else:
-            return ''
-
-    # Find request object
-    request = context['request']
-
-    print context
-
-    # Render edit bird
-    return userbar.render_edit_frame(request, context) or ''
diff --git a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
index e708740ff..b7d7de35a 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py
@@ -1,17 +1,25 @@
 from django import template
-from django.contrib.staticfiles.storage import staticfiles_storage
-from django.utils.html import format_html, format_html_join
+from wagtail.wagtailadmin.views import userbar
+from wagtail.wagtailcore.models import Page
 
 register = template.Library()
 
-
 @register.simple_tag(takes_context=True)
-def wagtailuserbar(context, cssfile=None):
-    try:
-        items = format_html_join(u'', u'<li>{0}</li>', [(item,) for item in context['request'].userbar])
-        context.hasuserbar = True
-        if not cssfile:
-            cssfile = staticfiles_storage.url('wagtailadmin/css/wagtail-userbar.css')
-        return format_html(u'<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400" /><link rel="stylesheet" href="{0}" /><ul id="wagtail-userbar">{1}</ul>', cssfile, items)
-    except AttributeError:
+def wagtailuserbar(context, current_page=None, items=None):
+
+    # Find request object
+    request = context['request']
+    
+    # Don't render if user doesn't have permission to access the admin area
+    if not request.user.has_perm('wagtailadmin.access_admin'):
         return ''
+
+    # Find page object
+    if not current_page:
+        if 'self' in context and isinstance(context['self'], Page):
+            current_page = context['self']
+        else:
+            return ''
+
+    # Render edit bird
+    return userbar.render_edit_frame(request, context) or ''
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index cc72e29f5..081337803 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -80,5 +80,6 @@ urlpatterns += patterns(
     url(r'^account/$', 'account.account', name='wagtailadmin_account'),
     url(r'^account/change_password/$', 'account.change_password', name='wagtailadmin_account_change_password'),
 
-    url(r'^userbar/(\d+)/$', 'userbar.userbar', name='wagtailadmin_userbar'),
+    url(r'^userbar/(\d+)/$', 'userbar.for_frontend', name='wagtailadmin_userbar_frontend'),
+    url(r'^userbar/moderation/(\d+)/$', 'userbar.for_moderation', name='wagtailadmin_userbar_moderation'),
 )
diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/wagtailadmin/userbar.py
index 9a4582c1a..a641a7b1d 100644
--- a/wagtail/wagtailadmin/userbar.py
+++ b/wagtail/wagtailadmin/userbar.py
@@ -3,14 +3,36 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 
 class BaseItem(object):
-    template = 'wagtailadmin/userbar/base_item.html'
+    template = 'wagtailadmin/userbar/item_base.html'
 
     def render(self, request):
         return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request))
 
+class AddPageItem(BaseItem):
+    template = 'wagtailadmin/userbar/item_page_add.html'
+
+    def __init__(self, page):
+        self.page = page
+        self.parent_page = page.get_parent()
+
+    def render(self, request):
+        # Don't render if the page doesn't have an id
+        if not self.page.id:
+            return ""
+
+        # Don't render if user doesn't have permission to access the admin area
+        if not request.user.has_perm('wagtailadmin.access_admin'):
+            return ""
+
+        # Don't render if user doesn't have ability to add siblings
+        permission_checker = self.page.get_parent().permissions_for_user(request.user)
+        if not permission_checker.can_add_subpage():
+            return ""
+
+        return super(AddPageItem, self).render(request)
 
 class EditPageItem(BaseItem):
-    template = 'wagtailadmin/userbar/edit_page_item.html'
+    template = 'wagtailadmin/userbar/item_page_edit.html'
 
     def __init__(self, page):
         self.page = page
@@ -33,28 +55,26 @@ class EditPageItem(BaseItem):
 
 class ModeratePageItem(BaseItem):
 
-    def __init__(self, page):
-        self.page = page
+    def __init__(self, revision):
+        self.revision = revision
 
     def render(self, request):
-        if not self.page.id:
+        if not self.revision.id:
             return ""
 
-        if not self.page.get_latest_revision().submitted_for_moderation:
+        if not self.revision.submitted_for_moderation:
             return ""
 
-        self.revision = self.page.get_latest_revision()
-
         if not request.user.has_perm('wagtailadmin.access_admin'):
             return ""
 
-        if not self.page.permissions_for_user(request.user).can_publish():
+        if not self.revision.page.permissions_for_user(request.user).can_publish():
             return ""
        
         return super(ModeratePageItem, self).render(request)
 
 class ApproveModerationEditPageItem(ModeratePageItem):
-    template = 'wagtailadmin/userbar/approve_moderation_item.html'
+    template = 'wagtailadmin/userbar/item_page_approve.html'
 
 class RejectModerationEditPageItem(ModeratePageItem):
-    template = 'wagtailadmin/userbar/reject_moderation_item.html'
+    template = 'wagtailadmin/userbar/item_page_reject.html'
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index dbf17a2a4..9032d3410 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -623,4 +623,6 @@ def preview_for_moderation(request, revision_id):
 
     page = revision.as_page_object()
 
+    request.revision_id = revision_id
+
     return page.serve(request)
diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py
index e4a45c270..9d15dfe45 100644
--- a/wagtail/wagtailadmin/views/userbar.py
+++ b/wagtail/wagtailadmin/views/userbar.py
@@ -6,42 +6,60 @@ from django.contrib.auth.forms import SetPasswordForm
 from django.contrib.auth.decorators import permission_required
 from django.utils.translation import ugettext as _ 
 
-from wagtail.wagtailadmin.userbar import EditPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
+from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
 from wagtail.wagtailadmin import hooks
-from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.models import Page, PageRevision
 
 def render_edit_frame(request, context):
+    try:
+        revision_id = request.revision_id
+    except:
+        revision_id = None
+
     # Render the frame to contain the userbar items
     return render_to_string('wagtailadmin/userbar/frame.html', {
-        'page': context
+        'page': context,
+        'revision_id': revision_id
     })
 
-@permission_required('wagtailadmin.access_admin')
-def userbar(request, page_id):
+def for_frontend(request, page_id):
     items = [
         EditPageItem(Page.objects.get(id=page_id)),
-        ApproveModerationEditPageItem(Page.objects.get(id=page_id)),
-        RejectModerationEditPageItem(Page.objects.get(id=page_id)),
+        AddPageItem(Page.objects.get(id=page_id)),
     ]
 
     for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
         fn(request, items)
 
-
-    for item in items:
-        print item.render(request)
-
     # Render the items
     rendered_items = [item.render(request) for item in items]
 
     # Remove any unrendered items
     rendered_items = [item for item in rendered_items if item]
 
-    # Quit if no items rendered
-    if not rendered_items:
-        return
+    # Render the edit bird
+    return render(request, 'wagtailadmin/userbar/base.html', {
+        'items': rendered_items,
+    })
+
+def for_moderation(request, revision_id):
+    items = [
+        EditPageItem(PageRevision.objects.get(id=revision_id).page),
+        AddPageItem(PageRevision.objects.get(id=revision_id).page),
+        ApproveModerationEditPageItem(PageRevision.objects.get(id=revision_id)),
+        RejectModerationEditPageItem(PageRevision.objects.get(id=revision_id)),
+    ]
+
+    for fn in hooks.get_hooks('construct_wagtail_edit_bird'):
+        fn(request, items)
+
+    # Render the items
+    rendered_items = [item.render(request) for item in items]
+
+    # Remove any unrendered items
+    rendered_items = [item for item in rendered_items if item]
 
     # Render the edit bird
-    return render(request, 'wagtailadmin/userbar/edit_bird.html', {
-        'items': [item.render(request) for item in items],
+    return render(request, 'wagtailadmin/userbar/base.html', {
+        'items': rendered_items,
     })
\ No newline at end of file

From fa94df6b033b169270f60df79f5e4a06b3c8d4e8 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 18 Mar 2014 16:56:53 +0000
Subject: [PATCH 13/13] tweak to alignment of text

---
 wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
index ee518b445..759026744 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
@@ -16,8 +16,8 @@ nav{
     padding:0 0 3em 3em;
     float:right;
 
-     /* moving menu only for browser that can support hover and transitions */
-    .no-touch.csstransitions & {
+    /* moving menu only for browser that can support hover and transitions */
+    /*.no-touch.csstransitions & {
         ul{
             height:0;
         }
@@ -33,7 +33,7 @@ nav{
                 left:0;
             }
         }
-    }
+    }*/
 }
 
 .home{
@@ -82,6 +82,7 @@ li{
 
     &:before{
         margin-right:0.3em;
+        vertical-align:middle;
     }
 
     &:hover{