Cleaned up modals in the UI.

added empty modal for episode info
This commit is contained in:
Keivan Beigi 2013-05-14 18:17:24 -07:00
commit 27fc51da48
16 changed files with 118 additions and 67 deletions

View file

@ -3,8 +3,6 @@ define(['app', 'Series/SeriesModel'], function () {
NzbDrone.Series.Delete.DeleteSeriesView = Backbone.Marionette.ItemView.extend({
template : 'Series/Delete/DeleteSeriesTemplate',
tagName : 'div',
className: "modal",
events: {
'click .x-confirm-delete': 'removeSeries'

View file

@ -0,0 +1,20 @@
"use strict";
define(['app', 'Episode/Layout'], function () {
NzbDrone.Series.Details.EpisodeDetailCell = Backgrid.Cell.extend({
events: {
'click': 'showDetails'
},
render: function () {
this.$el.empty();
this.$el.html('<i class="icon-ellipsis-vertical x-detail-icon"/>');
return this;
},
showDetails: function () {
var view = new NzbDrone.Episode.Layout({ model: this.model });
NzbDrone.modalRegion.show(view);
}
});
});

View file

@ -1,5 +1,5 @@
'use strict';
define(['app'], function () {
define(['app', 'Series/Details/EpisodeDetailCell'], function () {
NzbDrone.Series.Details.SeasonLayout = Backbone.Marionette.Layout.extend({
template: 'Series/Details/SeasonLayoutTemplate',
@ -8,6 +8,11 @@ define(['app'], function () {
},
columns: [
{
name : 'details',
editable: false,
cell : NzbDrone.Series.Details.EpisodeDetailCell
},
{
name : 'episodeNumber',
label : '#',
@ -22,10 +27,10 @@ define(['app'], function () {
cell : 'string'
},
{
name : 'airDate',
label : 'Air Date',
editable : false,
cell : 'date'
name : 'airDate',
label : 'Air Date',
editable: false,
cell : 'date'
//formatter: new Backgrid.AirDateFormatter()
}
],

View file

@ -3,8 +3,6 @@ define(['app', 'Series/SeriesModel', 'Series/Delete/DeleteSeriesView', 'Quality/
NzbDrone.Series.Edit.EditSeriesView = Backbone.Marionette.ItemView.extend({
template : 'Series/Edit/EditSeriesTemplate',
tagName : 'div',
className: "modal",
ui: {
progressbar : '.progress .bar',

View file

@ -28,17 +28,12 @@ define([
editSeries: function () {
var view = new NzbDrone.Series.Edit.EditSeriesView({ model: this.model});
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
},
removeSeries: function () {
var view = new NzbDrone.Series.Delete.DeleteSeriesView({ model: this.model });
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
},
showEpisodeList: function (e) {

View file

@ -37,17 +37,12 @@ define([
editSeries: function () {
var view = new NzbDrone.Series.Edit.EditSeriesView({ model: this.model});
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
},
removeSeries: function () {
var view = new NzbDrone.Series.Delete.DeleteSeriesView({ model: this.model });
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
},
posterHoverAction: function () {

View file

@ -1,3 +1,4 @@
"use strict";
NzbDrone.Series.Index.Table.Row = Backgrid.Row.extend({
events: {
'click .x-edit' : 'editSeries',
@ -6,16 +7,11 @@ NzbDrone.Series.Index.Table.Row = Backgrid.Row.extend({
editSeries: function () {
var view = new NzbDrone.Series.Edit.EditSeriesView({ model: this.model});
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
},
removeSeries: function () {
var view = new NzbDrone.Series.Delete.DeleteSeriesView({ model: this.model });
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view
});
NzbDrone.modalRegion.show(view);
}
});