diff --git a/src/UI/.idea/codeStyleSettings.xml b/src/UI/.idea/codeStyleSettings.xml
index 83bfe2c0c..c05f974b7 100644
--- a/src/UI/.idea/codeStyleSettings.xml
+++ b/src/UI/.idea/codeStyleSettings.xml
@@ -17,6 +17,7 @@
+
@@ -33,8 +34,7 @@
-
-
+
diff --git a/src/UI/Shared/Toolbar/Button/ButtonView.js b/src/UI/Shared/Toolbar/Button/ButtonView.js
index f853ca239..9356acc21 100644
--- a/src/UI/Shared/Toolbar/Button/ButtonView.js
+++ b/src/UI/Shared/Toolbar/Button/ButtonView.js
@@ -33,6 +33,10 @@ define(
this.$el.addClass('btn-icon-only');
}
+ if (this.model.get('className')) {
+ this.$el.addClass(this.model.get('className'));
+ }
+
var command = this.model.get('command');
if (command) {
var properties = _.extend({ name: command }, this.model.get('properties'));
diff --git a/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js b/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
index be181e9e0..d01397bd4 100644
--- a/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
+++ b/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
@@ -1,207 +1,202 @@
'use strict';
-define(
- [
- 'underscore',
- 'marionette',
- 'backgrid',
- 'Wanted/Cutoff/CutoffUnmetCollection',
- 'Cells/SeriesTitleCell',
- 'Cells/EpisodeNumberCell',
- 'Cells/EpisodeTitleCell',
- 'Cells/RelativeDateCell',
- 'Cells/EpisodeStatusCell',
- 'Shared/Grid/Pager',
- 'Shared/Toolbar/ToolbarLayout',
- 'Shared/LoadingView',
- 'Shared/Messenger',
- 'Commands/CommandController',
- 'backgrid.selectall'
- ], function (_,
- Marionette,
- Backgrid,
- CutoffUnmetCollection,
- SeriesTitleCell,
- EpisodeNumberCell,
- EpisodeTitleCell,
- RelativeDateCell,
- EpisodeStatusCell,
- GridPager,
- ToolbarLayout,
- LoadingView,
- Messenger,
- CommandController) {
- return Marionette.Layout.extend({
- template: 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
+define([
+ 'underscore',
+ 'marionette',
+ 'backgrid',
+ 'Wanted/Cutoff/CutoffUnmetCollection',
+ 'Cells/SeriesTitleCell',
+ 'Cells/EpisodeNumberCell',
+ 'Cells/EpisodeTitleCell',
+ 'Cells/RelativeDateCell',
+ 'Cells/EpisodeStatusCell',
+ 'Shared/Grid/Pager',
+ 'Shared/Toolbar/ToolbarLayout',
+ 'Shared/LoadingView',
+ 'Shared/Messenger',
+ 'Commands/CommandController',
+ 'backgrid.selectall'
+], function (_,
+ Marionette,
+ Backgrid,
+ CutoffUnmetCollection,
+ SeriesTitleCell,
+ EpisodeNumberCell,
+ EpisodeTitleCell,
+ RelativeDateCell,
+ EpisodeStatusCell,
+ GridPager,
+ ToolbarLayout,
+ LoadingView,
+ Messenger,
+ CommandController) {
+ return Marionette.Layout.extend({
+ template : 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
- regions: {
- cutoff : '#x-cutoff-unmet',
- toolbar : '#x-toolbar',
- pager : '#x-pager'
+ regions : {
+ cutoff : '#x-cutoff-unmet',
+ toolbar : '#x-toolbar',
+ pager : '#x-pager'
+ },
+
+ ui : {
+ searchSelectedButton : '.btn i.icon-search'
+ },
+
+ columns : [
+ {
+ name : '',
+ cell : 'select-row',
+ headerCell : 'select-all',
+ sortable : false
},
-
- ui: {
- searchSelectedButton: '.btn i.icon-search'
+ {
+ name : 'series',
+ label : 'Series Title',
+ sortable : false,
+ cell : SeriesTitleCell
},
-
- columns:
- [
- {
- name : '',
- cell : 'select-row',
- headerCell: 'select-all',
- sortable : false
- },
- {
- name : 'series',
- label : 'Series Title',
- sortable : false,
- cell : SeriesTitleCell
- },
- {
- name : 'this',
- label : 'Episode',
- sortable : false,
- cell : EpisodeNumberCell
- },
- {
- name : 'this',
- label : 'Episode Title',
- sortable : false,
- cell : EpisodeTitleCell,
- },
- {
- name : 'airDateUtc',
- label : 'Air Date',
- cell : RelativeDateCell
- },
- {
- name : 'status',
- label : 'Status',
- cell : EpisodeStatusCell,
- sortable: false
- }
- ],
-
- initialize: function () {
- this.collection = new CutoffUnmetCollection();
-
- this.listenTo(this.collection, 'sync', this._showTable);
+ {
+ name : 'this',
+ label : 'Episode',
+ sortable : false,
+ cell : EpisodeNumberCell
},
-
- onShow: function () {
- this.cutoff.show(new LoadingView());
- this._showToolbar();
- this.collection.fetch();
+ {
+ name : 'this',
+ label : 'Episode Title',
+ sortable : false,
+ cell : EpisodeTitleCell
},
-
- _showTable: function () {
- this.cutoffGrid = new Backgrid.Grid({
- columns : this.columns,
- collection: this.collection,
- className : 'table table-hover'
- });
-
- this.cutoff.show(this.cutoffGrid);
-
- this.pager.show(new GridPager({
- columns : this.columns,
- collection: this.collection
- }));
+ {
+ name : 'airDateUtc',
+ label : 'Air Date',
+ cell : RelativeDateCell
},
-
- _showToolbar: function () {
- var leftSideButtons = {
- type : 'default',
- storeState: false,
- items :
- [
- {
- title: 'Search Selected',
- icon : 'icon-search',
- callback: this._searchSelected,
- ownerContext: this
- },
- {
- title: 'Season Pass',
- icon : 'icon-bookmark',
- route: 'seasonpass'
- }
- ]
- };
-
- var filterOptions = {
- type : 'radio',
- storeState : false,
- menuKey : 'wanted.filterMode',
- defaultAction : 'monitored',
- items :
- [
- {
- key : 'monitored',
- title : '',
- tooltip : 'Monitored Only',
- icon : 'icon-nd-monitored',
- callback : this._setFilter
- },
- {
- key : 'unmonitored',
- title : '',
- tooltip : 'Unmonitored Only',
- icon : 'icon-nd-unmonitored',
- callback : this._setFilter
- }
- ]
- };
-
- this.toolbar.show(new ToolbarLayout({
- left :
- [
- leftSideButtons
- ],
- right :
- [
- filterOptions
- ],
- context: this
- }));
-
- CommandController.bindToCommand({
- element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
- command: {
- name: 'episodeSearch'
- }
- });
- },
-
- _setFilter: function(buttonContext) {
- var mode = buttonContext.model.get('key');
-
- this.collection.state.currentPage = 1;
- var promise = this.collection.setFilterMode(mode);
-
- if (buttonContext) {
- buttonContext.ui.icon.spinForPromise(promise);
- }
- },
-
- _searchSelected: function () {
- var selected = this.cutoffGrid.getSelectedModels();
-
- if (selected.length === 0) {
- Messenger.show({
- type: 'error',
- message: 'No episodes selected'
- });
-
- return;
- }
-
- var ids = _.pluck(selected, 'id');
-
- CommandController.Execute('episodeSearch', {
- name : 'episodeSearch',
- episodeIds: ids
- });
+ {
+ name : 'status',
+ label : 'Status',
+ cell : EpisodeStatusCell,
+ sortable : false
}
- });
+ ],
+
+ initialize : function () {
+ this.collection = new CutoffUnmetCollection();
+
+ this.listenTo(this.collection, 'sync', this._showTable);
+ },
+
+ onShow : function () {
+ this.cutoff.show(new LoadingView());
+ this._showToolbar();
+ this.collection.fetch();
+ },
+
+ _showTable : function () {
+ this.cutoffGrid = new Backgrid.Grid({
+ columns : this.columns,
+ collection : this.collection,
+ className : 'table table-hover'
+ });
+
+ this.cutoff.show(this.cutoffGrid);
+
+ this.pager.show(new GridPager({
+ columns : this.columns,
+ collection : this.collection
+ }));
+ },
+
+ _showToolbar : function () {
+ var leftSideButtons = {
+ type : 'default',
+ storeState : false,
+ items : [
+ {
+ title : 'Search Selected',
+ icon : 'icon-search',
+ callback : this._searchSelected,
+ ownerContext : this,
+ className : 'x-search-selected'
+ },
+ {
+ title : 'Season Pass',
+ icon : 'icon-bookmark',
+ route : 'seasonpass'
+ }
+ ]
+ };
+
+ var filterOptions = {
+ type : 'radio',
+ storeState : false,
+ menuKey : 'wanted.filterMode',
+ defaultAction : 'monitored',
+ items : [
+ {
+ key : 'monitored',
+ title : '',
+ tooltip : 'Monitored Only',
+ icon : 'icon-nd-monitored',
+ callback : this._setFilter
+ },
+ {
+ key : 'unmonitored',
+ title : '',
+ tooltip : 'Unmonitored Only',
+ icon : 'icon-nd-unmonitored',
+ callback : this._setFilter
+ }
+ ]
+ };
+
+ this.toolbar.show(new ToolbarLayout({
+ left : [
+ leftSideButtons
+ ],
+ right : [
+ filterOptions
+ ],
+ context : this
+ }));
+
+ CommandController.bindToCommand({
+ element : this.$('.x-search-selected'),
+ command : {
+ name : 'episodeSearch'
+ }
+ });
+ },
+
+ _setFilter : function (buttonContext) {
+ var mode = buttonContext.model.get('key');
+
+ this.collection.state.currentPage = 1;
+ var promise = this.collection.setFilterMode(mode);
+
+ if (buttonContext) {
+ buttonContext.ui.icon.spinForPromise(promise);
+ }
+ },
+
+ _searchSelected : function () {
+ var selected = this.cutoffGrid.getSelectedModels();
+
+ if (selected.length === 0) {
+ Messenger.show({
+ type : 'error',
+ message : 'No episodes selected'
+ });
+
+ return;
+ }
+
+ var ids = _.pluck(selected, 'id');
+
+ CommandController.Execute('episodeSearch', {
+ name : 'episodeSearch',
+ episodeIds : ids
+ });
+ }
});
+});
diff --git a/src/UI/Wanted/Missing/MissingLayout.js b/src/UI/Wanted/Missing/MissingLayout.js
index b5b1e6be9..45bfb9d4e 100644
--- a/src/UI/Wanted/Missing/MissingLayout.js
+++ b/src/UI/Wanted/Missing/MissingLayout.js
@@ -1,231 +1,233 @@
'use strict';
-define(
- [
- 'underscore',
- 'marionette',
- 'backgrid',
- 'Wanted/Missing/MissingCollection',
- 'Cells/SeriesTitleCell',
- 'Cells/EpisodeNumberCell',
- 'Cells/EpisodeTitleCell',
- 'Cells/RelativeDateCell',
- 'Cells/EpisodeStatusCell',
- 'Shared/Grid/Pager',
- 'Shared/Toolbar/ToolbarLayout',
- 'Shared/LoadingView',
- 'Shared/Messenger',
- 'Commands/CommandController',
- 'backgrid.selectall'
- ], function (_,
- Marionette,
- Backgrid,
- MissingCollection,
- SeriesTitleCell,
- EpisodeNumberCell,
- EpisodeTitleCell,
- RelativeDateCell,
- EpisodeStatusCell,
- GridPager,
- ToolbarLayout,
- LoadingView,
- Messenger,
- CommandController) {
- return Marionette.Layout.extend({
- template: 'Wanted/Missing/MissingLayoutTemplate',
+define([
+ 'underscore',
+ 'marionette',
+ 'backgrid',
+ 'Wanted/Missing/MissingCollection',
+ 'Cells/SeriesTitleCell',
+ 'Cells/EpisodeNumberCell',
+ 'Cells/EpisodeTitleCell',
+ 'Cells/RelativeDateCell',
+ 'Cells/EpisodeStatusCell',
+ 'Shared/Grid/Pager',
+ 'Shared/Toolbar/ToolbarLayout',
+ 'Shared/LoadingView',
+ 'Shared/Messenger',
+ 'Commands/CommandController',
+ 'backgrid.selectall'
+], function (_,
+ Marionette,
+ Backgrid,
+ MissingCollection,
+ SeriesTitleCell,
+ EpisodeNumberCell,
+ EpisodeTitleCell,
+ RelativeDateCell,
+ EpisodeStatusCell,
+ GridPager,
+ ToolbarLayout,
+ LoadingView,
+ Messenger,
+ CommandController) {
+ return Marionette.Layout.extend({
+ template : 'Wanted/Missing/MissingLayoutTemplate',
- regions: {
- missing: '#x-missing',
- toolbar: '#x-toolbar',
- pager : '#x-pager'
+ regions : {
+ missing : '#x-missing',
+ toolbar : '#x-toolbar',
+ pager : '#x-pager'
+ },
+
+ ui : {
+ searchSelectedButton : '.btn i.icon-search'
+ },
+
+ columns : [
+ {
+ name : '',
+ cell : 'select-row',
+ headerCell : 'select-all',
+ sortable : false
},
-
- ui: {
- searchSelectedButton: '.btn i.icon-search'
+ {
+ name : 'series',
+ label : 'Series Title',
+ sortable : false,
+ cell : SeriesTitleCell
},
-
- columns:
- [
- {
- name : '',
- cell : 'select-row',
- headerCell: 'select-all',
- sortable : false
- },
- {
- name : 'series',
- label : 'Series Title',
- sortable : false,
- cell : SeriesTitleCell
- },
- {
- name : 'this',
- label : 'Episode',
- sortable : false,
- cell : EpisodeNumberCell
- },
- {
- name : 'this',
- label : 'Episode Title',
- sortable : false,
- cell : EpisodeTitleCell
- },
- {
- name : 'airDateUtc',
- label : 'Air Date',
- cell : RelativeDateCell
- },
- {
- name : 'status',
- label : 'Status',
- cell : EpisodeStatusCell,
- sortable: false
- }
- ],
-
- initialize: function () {
- this.collection = new MissingCollection();
-
- this.listenTo(this.collection, 'sync', this._showTable);
+ {
+ name : 'this',
+ label : 'Episode',
+ sortable : false,
+ cell : EpisodeNumberCell
},
-
- onShow: function () {
- this.missing.show(new LoadingView());
- this._showToolbar();
- this.collection.fetch();
+ {
+ name : 'this',
+ label : 'Episode Title',
+ sortable : false,
+ cell : EpisodeTitleCell
},
-
- _showTable: function () {
- this.missingGrid = new Backgrid.Grid({
- columns : this.columns,
- collection: this.collection,
- className : 'table table-hover'
- });
-
- this.missing.show(this.missingGrid);
-
- this.pager.show(new GridPager({
- columns : this.columns,
- collection: this.collection
- }));
+ {
+ name : 'airDateUtc',
+ label : 'Air Date',
+ cell : RelativeDateCell
},
-
- _showToolbar: function () {
- var leftSideButtons = {
- type : 'default',
- storeState : false,
- collapse : true,
- items :
- [
- {
- title: 'Search Selected',
- icon : 'icon-search',
- callback: this._searchSelected,
- ownerContext: this
- },
- {
- title: 'Search All Missing',
- icon : 'icon-search',
- callback: this._searchMissing,
- ownerContext: this
- },
- {
- title: 'Season Pass',
- icon : 'icon-bookmark',
- route: 'seasonpass'
- },
- {
- title: 'Rescan Drone Factory Folder',
- icon : 'icon-refresh',
- command: 'downloadedepisodesscan',
- properties: {
- sendUpdates: true
- }
- }
- ]
- };
-
- var filterOptions = {
- type : 'radio',
- storeState : false,
- menuKey : 'wanted.filterMode',
- defaultAction : 'monitored',
- items :
- [
- {
- key : 'monitored',
- title : '',
- tooltip : 'Monitored Only',
- icon : 'icon-nd-monitored',
- callback : this._setFilter
- },
- {
- key : 'unmonitored',
- title : '',
- tooltip : 'Unmonitored Only',
- icon : 'icon-nd-unmonitored',
- callback : this._setFilter
- }
- ]
- };
-
- this.toolbar.show(new ToolbarLayout({
- left :
- [
- leftSideButtons
- ],
- right :
- [
- filterOptions
- ],
- context: this
- }));
-
- CommandController.bindToCommand({
- element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
- command: {
- name: 'episodeSearch'
- }
- });
- },
-
- _setFilter: function(buttonContext) {
- var mode = buttonContext.model.get('key');
-
- this.collection.state.currentPage = 1;
- var promise = this.collection.setFilterMode(mode);
-
- if (buttonContext)
- buttonContext.ui.icon.spinForPromise(promise);
- },
-
- _searchSelected: function () {
- var selected = this.missingGrid.getSelectedModels();
-
- if (selected.length === 0) {
- Messenger.show({
- type: 'error',
- message: 'No episodes selected'
- });
-
- return;
- }
-
- var ids = _.pluck(selected, 'id');
-
- CommandController.Execute('episodeSearch', {
- name : 'episodeSearch',
- episodeIds: ids
- });
- },
-
- _searchMissing: function () {
- if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) +
- 'One API request to each indexer will be used for each episode. ' +
- 'This cannot be stopped once started.')) {
- CommandController.Execute('missingEpisodeSearch', {
- name : 'missingEpisodeSearch'
- });
- }
+ {
+ name : 'status',
+ label : 'Status',
+ cell : EpisodeStatusCell,
+ sortable : false
}
- });
+ ],
+
+ initialize : function () {
+ this.collection = new MissingCollection();
+
+ this.listenTo(this.collection, 'sync', this._showTable);
+ },
+
+ onShow : function () {
+ this.missing.show(new LoadingView());
+ this._showToolbar();
+ this.collection.fetch();
+ },
+
+ _showTable : function () {
+ this.missingGrid = new Backgrid.Grid({
+ columns : this.columns,
+ collection : this.collection,
+ className : 'table table-hover'
+ });
+
+ this.missing.show(this.missingGrid);
+
+ this.pager.show(new GridPager({
+ columns : this.columns,
+ collection : this.collection
+ }));
+ },
+
+ _showToolbar : function () {
+ var leftSideButtons = {
+ type : 'default',
+ storeState : false,
+ collapse : true,
+ items : [
+ {
+ title : 'Search Selected',
+ icon : 'icon-search',
+ callback : this._searchSelected,
+ ownerContext : this,
+ className : 'x-search-selected'
+ },
+ {
+ title : 'Search All Missing',
+ icon : 'icon-search',
+ callback : this._searchMissing,
+ ownerContext : this,
+ className : 'x-search-missing'
+ },
+ {
+ title : 'Season Pass',
+ icon : 'icon-bookmark',
+ route : 'seasonpass'
+ },
+ {
+ title : 'Rescan Drone Factory Folder',
+ icon : 'icon-refresh',
+ command : 'downloadedepisodesscan',
+ properties : {
+ sendUpdates : true
+ }
+ }
+ ]
+ };
+
+ var filterOptions = {
+ type : 'radio',
+ storeState : false,
+ menuKey : 'wanted.filterMode',
+ defaultAction : 'monitored',
+ items : [
+ {
+ key : 'monitored',
+ title : '',
+ tooltip : 'Monitored Only',
+ icon : 'icon-nd-monitored',
+ callback : this._setFilter
+ },
+ {
+ key : 'unmonitored',
+ title : '',
+ tooltip : 'Unmonitored Only',
+ icon : 'icon-nd-unmonitored',
+ callback : this._setFilter
+ }
+ ]
+ };
+
+ this.toolbar.show(new ToolbarLayout({
+ left : [
+ leftSideButtons
+ ],
+ right : [
+ filterOptions
+ ],
+ context : this
+ }));
+
+ CommandController.bindToCommand({
+ element : this.$('.x-search-selected'),
+ command : {
+ name : 'episodeSearch'
+ }
+ });
+
+ CommandController.bindToCommand({
+ element : this.$('.x-search-missing'),
+ command : {
+ name : 'missingEpisodeSearch'
+ }
+ });
+ },
+
+ _setFilter : function (buttonContext) {
+ var mode = buttonContext.model.get('key');
+
+ this.collection.state.currentPage = 1;
+ var promise = this.collection.setFilterMode(mode);
+
+ if (buttonContext) {
+ buttonContext.ui.icon.spinForPromise(promise);
+ }
+ },
+
+ _searchSelected : function () {
+ var selected = this.missingGrid.getSelectedModels();
+
+ if (selected.length === 0) {
+ Messenger.show({
+ type : 'error',
+ message : 'No episodes selected'
+ });
+
+ return;
+ }
+
+ var ids = _.pluck(selected, 'id');
+
+ CommandController.Execute('episodeSearch', {
+ name : 'episodeSearch',
+ episodeIds : ids
+ });
+ },
+
+ _searchMissing : function () {
+ if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) + 'One API request to each indexer will be used for each episode. ' + 'This cannot be stopped once started.')) {
+ CommandController.Execute('missingEpisodeSearch', {
+ name : 'missingEpisodeSearch'
+ });
+ }
+ }
});
+});