diff --git a/src/NzbDrone.Automation.Test/MainPagesTest.cs b/src/NzbDrone.Automation.Test/MainPagesTest.cs index df082ed3c..bbf89690a 100644 --- a/src/NzbDrone.Automation.Test/MainPagesTest.cs +++ b/src/NzbDrone.Automation.Test/MainPagesTest.cs @@ -34,12 +34,12 @@ namespace NzbDrone.Automation.Test } [Test] - public void history_page() + public void activity_page() { - page.HistoryNavIcon.Click(); + page.ActivityNavIcon.Click(); page.WaitForNoSpinner(); - page.FindByClass("iv-history-historylayout").Should().NotBeNull(); + page.FindByClass("iv-activity-activitylayout").Should().NotBeNull(); } [Test] diff --git a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs index bf54db7e3..de4485a93 100644 --- a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs +++ b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs @@ -63,11 +63,11 @@ namespace NzbDrone.Automation.Test.PageModel } } - public IWebElement HistoryNavIcon + public IWebElement ActivityNavIcon { get { - return FindByClass("x-history-nav"); + return FindByClass("x-activity-nav"); } } diff --git a/src/UI/History/HistoryLayout.js b/src/UI/Activity/ActivityLayout.js similarity index 60% rename from src/UI/History/HistoryLayout.js rename to src/UI/Activity/ActivityLayout.js index fc13cd2fe..97fd4e7b3 100644 --- a/src/UI/History/HistoryLayout.js +++ b/src/UI/Activity/ActivityLayout.js @@ -4,29 +4,29 @@ define( 'marionette', 'backbone', 'backgrid', - 'History/Table/HistoryTableLayout', - 'History/Blacklist/BlacklistLayout', - 'History/Queue/QueueLayout' - ], function (Marionette, Backbone, Backgrid, HistoryTableLayout, BlacklistLayout, QueueLayout) { + 'Activity/History/HistoryLayout', + 'Activity/Blacklist/BlacklistLayout', + 'Activity/Queue/QueueLayout' + ], function (Marionette, Backbone, Backgrid, HistoryLayout, BlacklistLayout, QueueLayout) { return Marionette.Layout.extend({ - template: 'History/HistoryLayoutTemplate', + template: 'Activity/ActivityLayoutTemplate', regions: { - history : '#history', - blacklist : '#blacklist', - queueRegion: '#queue' + queueRegion : '#queue', + history : '#history', + blacklist : '#blacklist' }, ui: { - historyTab: '.x-history-tab', - blacklistTab: '.x-blacklist-tab', - queueTab : '.x-queue-tab' + queueTab : '.x-queue-tab', + historyTab : '.x-history-tab', + blacklistTab : '.x-blacklist-tab' }, events: { + 'click .x-queue-tab' : '_showQueue', 'click .x-history-tab' : '_showHistory', - 'click .x-blacklist-tab' : '_showBlacklist', - 'click .x-queue-tab' : '_showQueue' + 'click .x-blacklist-tab' : '_showBlacklist' }, initialize: function (options) { @@ -37,11 +37,14 @@ define( onShow: function () { switch (this.action) { - case 'queue': - this._showQueue(); + case 'history': + this._showHistory(); + break; + case 'blacklist': + this._showBlacklist(); break; default: - this._showHistory(); + this._showQueue(); } }, @@ -54,9 +57,9 @@ define( e.preventDefault(); } - this.history.show(new HistoryTableLayout()); + this.history.show(new HistoryLayout()); this.ui.historyTab.tab('show'); - this._navigate('/history'); + this._navigate('/activity/history'); }, _showBlacklist: function (e) { @@ -66,7 +69,7 @@ define( this.blacklist.show(new BlacklistLayout()); this.ui.blacklistTab.tab('show'); - this._navigate('/history/blacklist'); + this._navigate('/activity/blacklist'); }, _showQueue: function (e) { @@ -76,7 +79,7 @@ define( this.queueRegion.show(new QueueLayout()); this.ui.queueTab.tab('show'); - this._navigate('/history/queue'); + this._navigate('/activity/queue'); } }); }); diff --git a/src/UI/History/HistoryLayoutTemplate.hbs b/src/UI/Activity/ActivityLayoutTemplate.hbs similarity index 98% rename from src/UI/History/HistoryLayoutTemplate.hbs rename to src/UI/Activity/ActivityLayoutTemplate.hbs index 4faa2d28b..c10fa733c 100644 --- a/src/UI/History/HistoryLayoutTemplate.hbs +++ b/src/UI/Activity/ActivityLayoutTemplate.hbs @@ -1,11 +1,11 @@ 
+
-
\ No newline at end of file diff --git a/src/UI/History/Blacklist/BlacklistActionsCell.js b/src/UI/Activity/Blacklist/BlacklistActionsCell.js similarity index 100% rename from src/UI/History/Blacklist/BlacklistActionsCell.js rename to src/UI/Activity/Blacklist/BlacklistActionsCell.js diff --git a/src/UI/History/Blacklist/BlacklistCollection.js b/src/UI/Activity/Blacklist/BlacklistCollection.js similarity index 96% rename from src/UI/History/Blacklist/BlacklistCollection.js rename to src/UI/Activity/Blacklist/BlacklistCollection.js index 49d49a700..d5598201b 100644 --- a/src/UI/History/Blacklist/BlacklistCollection.js +++ b/src/UI/Activity/Blacklist/BlacklistCollection.js @@ -1,7 +1,7 @@ 'use strict'; define( [ - 'History/Blacklist/BlacklistModel', + 'Activity/Blacklist/BlacklistModel', 'backbone.pageable', 'Mixins/AsSortedCollection', 'Mixins/AsPersistedStateCollection' diff --git a/src/UI/History/Blacklist/BlacklistLayout.js b/src/UI/Activity/Blacklist/BlacklistLayout.js similarity index 96% rename from src/UI/History/Blacklist/BlacklistLayout.js rename to src/UI/Activity/Blacklist/BlacklistLayout.js index d91abe620..26865615f 100644 --- a/src/UI/History/Blacklist/BlacklistLayout.js +++ b/src/UI/Activity/Blacklist/BlacklistLayout.js @@ -4,11 +4,11 @@ define( 'vent', 'marionette', 'backgrid', - 'History/Blacklist/BlacklistCollection', + 'Activity/Blacklist/BlacklistCollection', 'Cells/SeriesTitleCell', 'Cells/QualityCell', 'Cells/RelativeDateCell', - 'History/Blacklist/BlacklistActionsCell', + 'Activity/Blacklist/BlacklistActionsCell', 'Shared/Grid/Pager', 'Shared/LoadingView', 'Shared/Toolbar/ToolbarLayout' @@ -24,7 +24,7 @@ define( LoadingView, ToolbarLayout) { return Marionette.Layout.extend({ - template: 'History/Blacklist/BlacklistLayoutTemplate', + template: 'Activity/Blacklist/BlacklistLayoutTemplate', regions: { blacklist : '#x-blacklist', diff --git a/src/UI/History/Blacklist/BlacklistLayoutTemplate.hbs b/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs similarity index 100% rename from src/UI/History/Blacklist/BlacklistLayoutTemplate.hbs rename to src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs diff --git a/src/UI/History/Blacklist/BlacklistModel.js b/src/UI/Activity/Blacklist/BlacklistModel.js similarity index 100% rename from src/UI/History/Blacklist/BlacklistModel.js rename to src/UI/Activity/Blacklist/BlacklistModel.js diff --git a/src/UI/History/Details/HistoryDetailsAge.js b/src/UI/Activity/History/Details/HistoryDetailsAge.js similarity index 100% rename from src/UI/History/Details/HistoryDetailsAge.js rename to src/UI/Activity/History/Details/HistoryDetailsAge.js diff --git a/src/UI/History/Details/HistoryDetailsLayout.js b/src/UI/Activity/History/Details/HistoryDetailsLayout.js similarity index 87% rename from src/UI/History/Details/HistoryDetailsLayout.js rename to src/UI/Activity/History/Details/HistoryDetailsLayout.js index 0545aefee..d5a897aaa 100644 --- a/src/UI/History/Details/HistoryDetailsLayout.js +++ b/src/UI/Activity/History/Details/HistoryDetailsLayout.js @@ -4,11 +4,11 @@ define( 'jquery', 'vent', 'marionette', - 'History/Details/HistoryDetailsView' + 'Activity/History/Details/HistoryDetailsView' ], function ($, vent, Marionette, HistoryDetailsView) { return Marionette.Layout.extend({ - template: 'History/Details/HistoryDetailsLayoutTemplate', + template: 'Activity/History/Details/HistoryDetailsLayoutTemplate', regions: { bodyRegion: '.modal-body' diff --git a/src/UI/History/Details/HistoryDetailsLayoutTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs similarity index 100% rename from src/UI/History/Details/HistoryDetailsLayoutTemplate.hbs rename to src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs diff --git a/src/UI/History/Details/HistoryDetailsView.js b/src/UI/Activity/History/Details/HistoryDetailsView.js similarity index 53% rename from src/UI/History/Details/HistoryDetailsView.js rename to src/UI/Activity/History/Details/HistoryDetailsView.js index c7be5ad23..c6431026a 100644 --- a/src/UI/History/Details/HistoryDetailsView.js +++ b/src/UI/Activity/History/Details/HistoryDetailsView.js @@ -2,10 +2,10 @@ define( [ 'marionette', - 'History/Details/HistoryDetailsAge' + 'Activity/History/Details/HistoryDetailsAge' ], function (Marionette) { return Marionette.ItemView.extend({ - template: 'History/Details/HistoryDetailsViewTemplate' + template: 'Activity/History/Details/HistoryDetailsViewTemplate' }); }); diff --git a/src/UI/History/Details/HistoryDetailsViewTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs similarity index 100% rename from src/UI/History/Details/HistoryDetailsViewTemplate.hbs rename to src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs diff --git a/src/UI/History/HistoryCollection.js b/src/UI/Activity/History/HistoryCollection.js similarity index 98% rename from src/UI/History/HistoryCollection.js rename to src/UI/Activity/History/HistoryCollection.js index 05e70073e..19eed7773 100644 --- a/src/UI/History/HistoryCollection.js +++ b/src/UI/Activity/History/HistoryCollection.js @@ -1,7 +1,7 @@ 'use strict'; define( [ - 'History/HistoryModel', + 'Activity/History/HistoryModel', 'backbone.pageable', 'Mixins/AsFilteredCollection', 'Mixins/AsSortedCollection', diff --git a/src/UI/History/Table/HistoryDetailsCell.js b/src/UI/Activity/History/HistoryDetailsCell.js similarity index 100% rename from src/UI/History/Table/HistoryDetailsCell.js rename to src/UI/Activity/History/HistoryDetailsCell.js diff --git a/src/UI/History/Table/HistoryTableLayout.js b/src/UI/Activity/History/HistoryLayout.js similarity index 96% rename from src/UI/History/Table/HistoryTableLayout.js rename to src/UI/Activity/History/HistoryLayout.js index ccf1a9e11..822fc1f8a 100644 --- a/src/UI/History/Table/HistoryTableLayout.js +++ b/src/UI/Activity/History/HistoryLayout.js @@ -3,14 +3,14 @@ define( [ 'marionette', 'backgrid', - 'History/HistoryCollection', + 'Activity/History/HistoryCollection', 'Cells/EventTypeCell', 'Cells/SeriesTitleCell', 'Cells/EpisodeNumberCell', 'Cells/EpisodeTitleCell', - 'History/Table/HistoryQualityCell', + 'Activity/History/HistoryQualityCell', 'Cells/RelativeDateCell', - 'History/Table/HistoryDetailsCell', + 'Activity/History/HistoryDetailsCell', 'Shared/Grid/Pager', 'Shared/Toolbar/ToolbarLayout', 'Shared/LoadingView' @@ -28,7 +28,7 @@ define( ToolbarLayout, LoadingView) { return Marionette.Layout.extend({ - template: 'History/Table/HistoryTableLayoutTemplate', + template: 'Activity/History/HistoryLayoutTemplate', regions: { history: '#x-history', diff --git a/src/UI/History/Table/HistoryTableLayoutTemplate.hbs b/src/UI/Activity/History/HistoryLayoutTemplate.hbs similarity index 100% rename from src/UI/History/Table/HistoryTableLayoutTemplate.hbs rename to src/UI/Activity/History/HistoryLayoutTemplate.hbs diff --git a/src/UI/History/HistoryModel.js b/src/UI/Activity/History/HistoryModel.js similarity index 100% rename from src/UI/History/HistoryModel.js rename to src/UI/Activity/History/HistoryModel.js diff --git a/src/UI/History/Table/HistoryQualityCell.js b/src/UI/Activity/History/HistoryQualityCell.js similarity index 99% rename from src/UI/History/Table/HistoryQualityCell.js rename to src/UI/Activity/History/HistoryQualityCell.js index ef53855ad..5f2738b92 100644 --- a/src/UI/History/Table/HistoryQualityCell.js +++ b/src/UI/Activity/History/HistoryQualityCell.js @@ -32,7 +32,5 @@ define( return this; } - - }); }); diff --git a/src/UI/History/Queue/QueueCollection.js b/src/UI/Activity/Queue/QueueCollection.js similarity index 95% rename from src/UI/History/Queue/QueueCollection.js rename to src/UI/Activity/Queue/QueueCollection.js index 7d03486c9..ed408c3b4 100644 --- a/src/UI/History/Queue/QueueCollection.js +++ b/src/UI/Activity/Queue/QueueCollection.js @@ -4,7 +4,7 @@ define( 'underscore', 'backbone', 'backbone.pageable', - 'History/Queue/QueueModel', + 'Activity/Queue/QueueModel', 'Mixins/backbone.signalr.mixin' ], function (_, Backbone, PageableCollection, QueueModel) { var QueueCollection = PageableCollection.extend({ diff --git a/src/UI/History/Queue/QueueLayout.js b/src/UI/Activity/Queue/QueueLayout.js similarity index 93% rename from src/UI/History/Queue/QueueLayout.js rename to src/UI/Activity/Queue/QueueLayout.js index 886381c49..ac5cb0e16 100644 --- a/src/UI/History/Queue/QueueLayout.js +++ b/src/UI/Activity/Queue/QueueLayout.js @@ -3,13 +3,13 @@ define( [ 'marionette', 'backgrid', - 'History/Queue/QueueCollection', + 'Activity/Queue/QueueCollection', 'Cells/SeriesTitleCell', 'Cells/EpisodeNumberCell', 'Cells/EpisodeTitleCell', 'Cells/QualityCell', - 'History/Queue/QueueStatusCell', - 'History/Queue/TimeleftCell', + 'Activity/Queue/QueueStatusCell', + 'Activity/Queue/TimeleftCell', 'Shared/Grid/Pager' ], function (Marionette, Backgrid, @@ -22,7 +22,7 @@ define( TimeleftCell, GridPager) { return Marionette.Layout.extend({ - template: 'History/Queue/QueueLayoutTemplate', + template: 'Activity/Queue/QueueLayoutTemplate', regions: { table: '#x-queue', diff --git a/src/UI/History/Queue/QueueLayoutTemplate.hbs b/src/UI/Activity/Queue/QueueLayoutTemplate.hbs similarity index 100% rename from src/UI/History/Queue/QueueLayoutTemplate.hbs rename to src/UI/Activity/Queue/QueueLayoutTemplate.hbs diff --git a/src/UI/History/Queue/QueueModel.js b/src/UI/Activity/Queue/QueueModel.js similarity index 100% rename from src/UI/History/Queue/QueueModel.js rename to src/UI/Activity/Queue/QueueModel.js diff --git a/src/UI/History/Queue/QueueStatusCell.js b/src/UI/Activity/Queue/QueueStatusCell.js similarity index 97% rename from src/UI/History/Queue/QueueStatusCell.js rename to src/UI/Activity/Queue/QueueStatusCell.js index 1cd6eaafe..52e30b3dc 100644 --- a/src/UI/History/Queue/QueueStatusCell.js +++ b/src/UI/Activity/Queue/QueueStatusCell.js @@ -8,7 +8,7 @@ define( return NzbDroneCell.extend({ className : 'queue-status-cell', - template : 'History/Queue/QueueStatusCellTemplate', + template : 'Activity/Queue/QueueStatusCellTemplate', render: function () { this.$el.empty(); diff --git a/src/UI/History/Queue/QueueStatusCellTemplate.hbs b/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs similarity index 100% rename from src/UI/History/Queue/QueueStatusCellTemplate.hbs rename to src/UI/Activity/Queue/QueueStatusCellTemplate.hbs diff --git a/src/UI/History/Queue/QueueView.js b/src/UI/Activity/Queue/QueueView.js similarity index 97% rename from src/UI/History/Queue/QueueView.js rename to src/UI/Activity/Queue/QueueView.js index 79cf76016..3c56bc73b 100644 --- a/src/UI/History/Queue/QueueView.js +++ b/src/UI/Activity/Queue/QueueView.js @@ -3,7 +3,7 @@ define( [ 'underscore', 'marionette', - 'History/Queue/QueueCollection' + 'Activity/Queue/QueueCollection' ], function (_, Marionette, QueueCollection) { return Marionette.ItemView.extend({ tagName: 'span', diff --git a/src/UI/History/Queue/TimeleftCell.js b/src/UI/Activity/Queue/TimeleftCell.js similarity index 100% rename from src/UI/History/Queue/TimeleftCell.js rename to src/UI/Activity/Queue/TimeleftCell.js diff --git a/src/UI/History/history.less b/src/UI/Activity/activity.less similarity index 100% rename from src/UI/History/history.less rename to src/UI/Activity/activity.less diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index 4c82e295a..112fbeebf 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -8,7 +8,7 @@ define( 'moment', 'Calendar/Collection', 'Shared/UiSettingsModel', - 'History/Queue/QueueCollection', + 'Activity/Queue/QueueCollection', 'Config', 'Mixins/backbone.signalr.mixin', 'fullcalendar', diff --git a/src/UI/Cells/EpisodeStatusCell.js b/src/UI/Cells/EpisodeStatusCell.js index baec32371..5f90eb2a4 100644 --- a/src/UI/Cells/EpisodeStatusCell.js +++ b/src/UI/Cells/EpisodeStatusCell.js @@ -5,7 +5,7 @@ define( 'reqres', 'backbone', 'Cells/NzbDroneCell', - 'History/Queue/QueueCollection', + 'Activity/Queue/QueueCollection', 'moment', 'Shared/FormatHelpers' ], function (reqres, Backbone, NzbDroneCell, QueueCollection, moment, FormatHelpers) { diff --git a/src/UI/Controller.js b/src/UI/Controller.js index 87ef4e535..111568b84 100644 --- a/src/UI/Controller.js +++ b/src/UI/Controller.js @@ -4,7 +4,7 @@ define( 'Shared/NzbDroneController', 'AppLayout', 'marionette', - 'History/HistoryLayout', + 'Activity/ActivityLayout', 'Settings/SettingsLayout', 'AddSeries/AddSeriesLayout', 'Wanted/WantedLayout', @@ -16,7 +16,7 @@ define( ], function (NzbDroneController, AppLayout, Marionette, - HistoryLayout, + ActivityLayout, SettingsLayout, AddSeriesLayout, WantedLayout, @@ -48,10 +48,10 @@ define( this.showMainRegion(new WantedLayout({ action: action })); }, - history: function (action) { - this.setTitle('History'); + activity: function (action) { + this.setTitle('Activity'); - this.showMainRegion(new HistoryLayout({ action: action })); + this.showMainRegion(new ActivityLayout({ action: action })); }, rss: function () { @@ -73,7 +73,5 @@ define( this.setTitle('Series Editor'); this.showMainRegion(new SeriesEditorLayout()); } - }); }); - diff --git a/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js b/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js index d4b7c5452..9d1388727 100644 --- a/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js +++ b/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js @@ -6,7 +6,7 @@ define( 'vent', 'marionette', 'Cells/NzbDroneCell', - 'History/Details/HistoryDetailsView', + 'Activity/History/Details/HistoryDetailsView', 'bootstrap' ], function ($, vent, Marionette, NzbDroneCell, HistoryDetailsView) { return NzbDroneCell.extend({ diff --git a/src/UI/Episode/Activity/EpisodeActivityLayout.js b/src/UI/Episode/Activity/EpisodeActivityLayout.js index 519a7d283..00707a28f 100644 --- a/src/UI/Episode/Activity/EpisodeActivityLayout.js +++ b/src/UI/Episode/Activity/EpisodeActivityLayout.js @@ -3,7 +3,7 @@ define( [ 'marionette', 'backgrid', - 'History/HistoryCollection', + 'Activity/History/HistoryCollection', 'Cells/EventTypeCell', 'Cells/QualityCell', 'Cells/RelativeDateCell', diff --git a/src/UI/Handlebars/Helpers/Episode.js b/src/UI/Handlebars/Helpers/Episode.js index a62df8fc9..6c864b468 100644 --- a/src/UI/Handlebars/Helpers/Episode.js +++ b/src/UI/Handlebars/Helpers/Episode.js @@ -24,7 +24,7 @@ define( Handlebars.registerHelper('StatusLevel', function () { var hasFile = this.hasFile; - var downloading = require('History/Queue/QueueCollection').findEpisode(this.id) || this.downloading; + var downloading = require('Activity/Queue/QueueCollection').findEpisode(this.id) || this.downloading; var currentTime = moment(); var start = moment(this.airDateUtc); var end = moment(this.end); diff --git a/src/UI/Navbar/NavbarLayout.js b/src/UI/Navbar/NavbarLayout.js index 8a2cd7770..2b88a04e7 100644 --- a/src/UI/Navbar/NavbarLayout.js +++ b/src/UI/Navbar/NavbarLayout.js @@ -4,7 +4,7 @@ define( 'marionette', 'jquery', 'Health/HealthView', - 'History/Queue/QueueView', + 'Activity/Queue/QueueView', 'Navbar/Search' ], function (Marionette, $, HealthView, QueueView) { return Marionette.Layout.extend({ diff --git a/src/UI/Navbar/NavbarLayoutTemplate.hbs b/src/UI/Navbar/NavbarLayoutTemplate.hbs index ec5252757..596a42a99 100644 --- a/src/UI/Navbar/NavbarLayoutTemplate.hbs +++ b/src/UI/Navbar/NavbarLayoutTemplate.hbs @@ -23,7 +23,7 @@