From ebfa4596ea6e0a1908c79f168af9c81be22d5784 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 29 Jul 2015 19:19:08 +1000
Subject: [PATCH] Attempt to make dropdowns in toolbars work, update head refs

---
 modules/backend/layouts/_head.htm        | 15 ++++++++++-----
 modules/system/assets/ui/docs/toolbar.md |  6 +++---
 modules/system/assets/ui/js/toolbar.js   | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index 72c0d1067..46445d936 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -7,12 +7,17 @@
 <title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
     <?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
 </title>
-
-<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>" rel="stylesheet">
-<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>"></script>
-<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>"></script>
-<script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>"></script>
+<?php
+    $coreBuild = System\Models\Parameters::get('system::core.build', 1);
+?>
+<link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
+<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
+<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= URL::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>"></script>
 <script src="<?= URL::asset('modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js') ?>"></script>
+<script src="<?= URL::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
 
 <script src="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>"></script>
 
diff --git a/modules/system/assets/ui/docs/toolbar.md b/modules/system/assets/ui/docs/toolbar.md
index c3cbf4538..920a20d81 100644
--- a/modules/system/assets/ui/docs/toolbar.md
+++ b/modules/system/assets/ui/docs/toolbar.md
@@ -4,8 +4,8 @@ Toolbar
 
 # Example
 
-    <div class="layout-row control-toolbar" >
-        <div class="layout-item stretch toolbar-item">
+    <div class="layout control-toolbar">
+        <div class="layout-cell toolbar-item">
             <div data-control="toolbar">
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary oc-icon-plus">Create post</button>
@@ -26,7 +26,7 @@ Toolbar
                 </div>
             </div>
         </div>
-        <div class="layout-item fix relative toolbar-item">
+        <div class="layout-cell toolbar-item width-fix">
             <input placeholder="search..." type="text" name="" value="" class="form-control icon search growable" autocomplete="off"/>
         </div>
     </div>
\ No newline at end of file
diff --git a/modules/system/assets/ui/js/toolbar.js b/modules/system/assets/ui/js/toolbar.js
index ffc7c2f7a..027874c70 100644
--- a/modules/system/assets/ui/js/toolbar.js
+++ b/modules/system/assets/ui/js/toolbar.js
@@ -50,6 +50,20 @@
             update()
         })
 
+        $el.on('shown.bs.dropdown', '.dropdown', function(event, eventData) {
+            var $this = $(this),
+                $dropdown = $('.dropdown-menu', $this),
+                $target = $(eventData.relatedTarget),
+                $window = $(window),
+                position = $this.offset()
+
+            $dropdown.css({
+                position: 'fixed',
+                top: position.top - $window.scrollTop() + $target.outerHeight(),
+                left: position.left
+            })
+        })
+
         this.$el.one('dispose-control', this.proxy(this.dispose))
 
         function update() {