From 37ec1ab151b76e07f40d277284eae0d5b020df87 Mon Sep 17 00:00:00 2001
From: Mackovey <mackovey@gmail.com>
Date: Thu, 6 Feb 2014 14:27:21 +0200
Subject: [PATCH 1/2] Fixed bug in backend "$.template is not a function
 (?)()notification.js (line 27)"

---
 .../Backend/view/adminhtml/layout/default.xml | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 6ac8380a4c0c8..bd77678d7003e 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -34,44 +34,49 @@
                     <argument name="file" xsi:type="string">jquery/jquery.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-jquery-no-conflict-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-jquery-no-conflict-js" after="jquery-jquery-js">
                 <arguments>
                     <argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-js" after="magento-jquery-no-conflict-js">
                 <arguments>
                     <argument name="file" xsi:type="string">jquery/jquery-ui.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js" after="jquery-jquery-ui-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-validate-js" after="jquery-jquery-tmpl-min-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">underscore.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-magento-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js" after="jquery-jquery-validate-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">mage/mage.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js" after="jquery-jquery-hoverintent-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-validate-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
+                    <argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
+                    <argument name="file" xsi:type="string">underscore.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-magento-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/mage.js</argument>
                 </arguments>
             </block>
             <block class="Magento\Theme\Block\Html\Head\Script" name="magento-translate-js">
@@ -201,11 +206,6 @@
                     </argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
-                </arguments>
-            </block>
             <block class="Magento\Theme\Block\Html\Head\Script" name="magento-calendar-js">
                 <arguments>
                     <argument name="file" xsi:type="string">mage/calendar.js</argument>

From f07cba3daf32eef3d3e197634334d44380695a69 Mon Sep 17 00:00:00 2001
From: Mackovey <mackovey@gmail.com>
Date: Fri, 7 Feb 2014 18:45:32 +0200
Subject: [PATCH 2/2] fixed admin notification javascript dependencies

---
 .../Magento/AdminNotification/etc/module.xml  |  1 +
 .../view/adminhtml/layout/default.xml         |  4 +-
 .../Backend/view/adminhtml/layout/default.xml | 38 +++++++++----------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/AdminNotification/etc/module.xml b/app/code/Magento/AdminNotification/etc/module.xml
index 38da413450c05..82d8815049a2b 100755
--- a/app/code/Magento/AdminNotification/etc/module.xml
+++ b/app/code/Magento/AdminNotification/etc/module.xml
@@ -27,6 +27,7 @@
     <module name="Magento_AdminNotification" version="2.0.0.0" active="true">
         <sequence>
             <module name="Magento_Core"/>
+            <module name="Magento_Backend"/>
         </sequence>
         <depends>
             <module name="Magento_Core"/>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
index 8739961593be6..c707579d2b773 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -33,12 +33,12 @@
         <block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" before="-"/>
     </referenceBlock>
     <referenceBlock name="head">
-        <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="jquery-jquery-js">
+        <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="-">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_AdminNotification::toolbar_entry.js</argument>
             </arguments>
         </block>
-        <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js" after="jquery-jquery-js">
+        <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js" after="-">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_AdminNotification::system/notification.js</argument>
             </arguments>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index bd77678d7003e..6ac8380a4c0c8 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -34,49 +34,44 @@
                     <argument name="file" xsi:type="string">jquery/jquery.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-jquery-no-conflict-js" after="jquery-jquery-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-jquery-no-conflict-js">
                 <arguments>
                     <argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-js" after="magento-jquery-no-conflict-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-js">
                 <arguments>
                     <argument name="file" xsi:type="string">jquery/jquery-ui.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js" after="jquery-jquery-ui-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-validate-js" after="jquery-jquery-tmpl-min-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
+                    <argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js" after="jquery-jquery-validate-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
+                    <argument name="file" xsi:type="string">underscore.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js" after="jquery-jquery-hoverintent-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-magento-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
+                    <argument name="file" xsi:type="string">mage/mage.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-validate-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">underscore.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-magento-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">mage/mage.js</argument>
+                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
                 </arguments>
             </block>
             <block class="Magento\Theme\Block\Html\Head\Script" name="magento-translate-js">
@@ -206,6 +201,11 @@
                     </argument>
                 </arguments>
             </block>
+            <block class="Magento\Theme\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
+                </arguments>
+            </block>
             <block class="Magento\Theme\Block\Html\Head\Script" name="magento-calendar-js">
                 <arguments>
                     <argument name="file" xsi:type="string">mage/calendar.js</argument>