Fixed series actions wrapping to two lines

This commit is contained in:
Mark McDowall
2013-09-21 12:16:48 -07:00
parent a5528f00cb
commit 8ff34aac4d
7 changed files with 45 additions and 31 deletions
+4 -6
View File
@@ -11,9 +11,9 @@ define(
'Cells/TemplatedCell',
'Cells/QualityProfileCell',
'Cells/EpisodeProgressCell',
'Cells/SeriesActionsCell',
'Shared/Grid/DateHeaderCell',
'Series/Index/Table/SeriesStatusCell',
'Series/Index/Table/Row',
'Cells/SeriesStatusCell',
'Series/Index/FooterView',
'Series/Index/FooterModel',
'Shared/Toolbar/ToolbarLayout'
@@ -27,9 +27,9 @@ define(
TemplatedCell,
QualityProfileCell,
EpisodeProgressCell,
SeriesActionsCell,
DateHeaderCell,
SeriesStatusCell,
SeriesIndexRow,
FooterView,
FooterModel,
ToolbarLayout) {
@@ -86,8 +86,7 @@ define(
name : 'this',
label : '',
sortable: false,
template: 'Series/Index/Table/ControlsColumnTemplate',
cell : TemplatedCell
cell : SeriesActionsCell
}
],
@@ -124,7 +123,6 @@ define(
_showTable: function () {
this.currentView = new Backgrid.Grid({
row : SeriesIndexRow,
collection: SeriesCollection,
columns : this.columns,
className : 'table table-hover'
@@ -1,2 +0,0 @@
<i class="icon-cog x-edit" title="Edit Series"/>
<i class="icon-remove x-remove" title="Delete Series"/>
-22
View File
@@ -1,22 +0,0 @@
'use strict';
define(
[
'app',
'backgrid'
], function (App, Backgrid) {
return Backgrid.Row.extend({
events: {
'click .x-edit' : 'editSeries',
'click .x-remove': 'removeSeries'
},
editSeries: function () {
App.vent.trigger(App.Commands.EditSeriesCommand, {series:this.model});
},
removeSeries: function () {
App.vent.trigger(App.Commands.DeleteSeriesCommand, {series:this.model});
},
});
});
-32
View File
@@ -1,32 +0,0 @@
'use strict';
define(
[
'backgrid'
], function (Backgrid) {
return Backgrid.Cell.extend({
className: 'series-status-cell',
render: function () {
this.$el.empty();
var monitored = this.model.get('monitored');
var status = this.model.get('status');
if (status === 'ended') {
this.$el.html('<i class="icon-stop grid-icon" title="Ended"></i>');
this.model.set('statusWeight', 3);
}
else if (!monitored) {
this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
this.model.set('statusWeight', 2);
}
else {
this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
this.model.set('statusWeight', 1);
}
return this;
}
});
});
@@ -1 +0,0 @@
<a href="{{route}}">{{title}}</a>