Attempt to make dropdowns in toolbars work, update head refs

This commit is contained in:
Samuel Georges 2015-07-29 19:19:08 +10:00
parent d2da170864
commit ebfa4596ea
3 changed files with 27 additions and 8 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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() {