Changed buttons on series/logs views to look less cramped

pull/4/head
markus101 11 years ago
parent 9515c28729
commit 298837f96a

@ -15,7 +15,18 @@
@import "../Shared/Styles/card";
@import "../Rename/rename";
.page-toolbar {
.toolbar {
&:after {
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
}
.page-toolbar {
margin-top : 10px;
margin-bottom : 30px;
@ -29,6 +40,17 @@
width: 110px;
}
}
}
}
.toolbars {
margin-top : 5px;
margin-bottom : 30px;
.page-toolbar {
margin-top : 5px;
margin-bottom : 0px;
}
}
.page-container {

@ -41,6 +41,7 @@ define(
regions: {
seriesRegion : '#x-series',
toolbar : '#x-toolbar',
toolbar2 : '#x-toolbar2',
footer : '#x-series-footer'
},
@ -237,6 +238,12 @@ define(
};
},
onShow: function () {
this._showToolbar();
this._renderView();
this._fetchCollection();
},
_showTable: function () {
this.currentView = new Backgrid.Grid({
collection: this.seriesCollection,
@ -277,12 +284,6 @@ define(
}
},
onShow: function () {
this._showToolbar();
this._renderView();
this._fetchCollection();
},
_fetchCollection: function () {
this.seriesCollection.fetch();
},
@ -300,8 +301,6 @@ define(
}
var rightButtons = [
this.sortingOptions,
this.filteringOptions,
this.viewButtons
];
@ -313,6 +312,17 @@ define(
],
context: this
}));
this.toolbar2.show(new ToolbarLayout({
right : [
this.filteringOptions
],
left :
[
this.sortingOptions
],
context: this
}));
},
_showFooter: function () {

@ -1,4 +1,7 @@
<div id="x-toolbar"></div>
<div class="toolbars">
<div id="x-toolbar"></div>
<div id="x-toolbar2"></div>
</div>
<div class="row">
<div class="span12">

@ -10,7 +10,8 @@ define(
'underscore'
], function (Marionette, ButtonCollection, ButtonModel, RadioButtonCollectionView, ButtonCollectionView, SortingButtonCollectionView, _) {
return Marionette.Layout.extend({
template: 'Shared/Toolbar/ToolbarLayoutTemplate',
template : 'Shared/Toolbar/ToolbarLayoutTemplate',
className: 'toolbar',
ui: {
left_x : '.x-toolbar-left',

@ -72,7 +72,7 @@ define(
_showToolbar: function () {
var rightSideButtons = {
var leftSideButtons = {
type : 'default',
storeState: false,
items :
@ -95,9 +95,9 @@ define(
};
this.toolbar.show(new ToolbarLayout({
right :
left :
[
rightSideButtons
leftSideButtons
],
context: this
}));

@ -125,7 +125,7 @@ define(
]
};
var rightSideButtons = {
var leftSideButtons = {
type : 'default',
storeState: false,
items :
@ -146,10 +146,13 @@ define(
};
this.toolbar.show(new ToolbarLayout({
left :
[
leftSideButtons
],
right :
[
filterButtons,
rightSideButtons
filterButtons
],
context: this
}));

Loading…
Cancel
Save