From 83a54552519854197d539211728ea2bf0834402e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 19 Mar 2014 11:37:57 +0000
Subject: [PATCH] old reference to edit bird removed. wagtail set to use
 offline js libs to avoid internet outage issues for local/intranet builds.
 Tweaks to way userbar is added to page to ensure resulting html is still
 valid

---
 .../js/{edit_bird.js => userbar.js}           |  0
 .../static/wagtailadmin/scss/userbar.scss     |  4 +--
 .../wagtailadmin/scss/userbar_embed.css       | 10 +++++++
 .../templates/wagtailadmin/admin_base.html    |  4 +--
 .../templates/wagtailadmin/skeleton.html      |  2 +-
 .../templates/wagtailadmin/userbar/base.html  |  2 +-
 .../templates/wagtailadmin/userbar/frame.html | 27 ++++++++++---------
 7 files changed, 30 insertions(+), 19 deletions(-)
 rename wagtail/wagtailadmin/static/wagtailadmin/js/{edit_bird.js => userbar.js} (100%)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js b/wagtail/wagtailadmin/static/wagtailadmin/js/userbar.js
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/js/edit_bird.js
rename to wagtail/wagtailadmin/static/wagtailadmin/js/userbar.js
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
index 362757e7f..3045cfd7e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
@@ -17,7 +17,7 @@ nav{
     float:right;
 
     /* moving menu only for browser that can support hover and transitions */
-    .no-touch.csstransitions & {
+    .no-touch & {
         ul{
             height:0;
         }
@@ -114,7 +114,7 @@ div.action{
         display:block;
         text-transform:uppercase;
         padding:1em;
-        width:100%;
+        width:10em;
         position:relative;
         z-index:1;
         text-align:left;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css
new file mode 100644
index 000000000..f6286c10a
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css
@@ -0,0 +1,10 @@
+#wagtail-userbar{
+    background:transparent;
+    position:fixed;
+    top:0;
+    right:0;
+    z-index:9000;
+    border:0;
+    width:150px;
+    height:300px;
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index 00559e7b4..f895cc32c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -12,12 +12,12 @@
 {% 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-1.10.3.js"></script>
         <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>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index fa45d0702..e46ac8ab7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -11,7 +11,7 @@
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     
-    <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/modernizr-2.6.2.min.js"></script>
 
     <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" /> 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
index 293d43bc7..b2451d026 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
@@ -23,6 +23,6 @@
 
 {% block js %}
     {% compress js %}
-        <script src="{{ STATIC_URL }}wagtailadmin/js/edit_bird.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/userbar.js"></script>
     {% endcompress %}
 {% 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 d4b69de1c..ec1243ca2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -1,13 +1,14 @@
-<style type="text/css">
-    #wagtail-userbar{
-    	background:transparent;
-        position:absolute;
-        top:0;
-        right:0;
-        z-index:9000;
-        border:0;
-        width:150px;
-        height:300px;
-    }
-</style>
-<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
+{% load static %}
+<!-- Wagtail user bar embed code -->
+<script type="text/javascript">
+    (function(w,d){
+        var l, f, h;
+        l = d.createElement('link'); l.rel = 'stylesheet';
+        l.href = '{% static "wagtailadmin/scss/userbar_embed.css" %}';
+        f = d.createElement('iframe'); f.id = 'wagtail-userbar'; f.frameborder = '0'; f.allowtransparency = 'true'; f.scrolling = 'no';
+        f.src = '{% if revision_id %}{% url "wagtailadmin_userbar_moderation" revision_id %}{% else %}{% url "wagtailadmin_userbar_frontend" page.self.id %}{% endif %}';
+        t = d.getElementsByTagName('title')[0]; t.parentNode.insertBefore(l, t.nextSibling);
+        d.body.appendChild(f); 
+    }(window,document));
+</script>
+<!-- end Wagtail user bar embed code -->
\ No newline at end of file