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] 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' %}" />