Activity instead of History

New: Renamed history to activity
New: Queue is default tab of activity

src/NzbDrone.Automation.Test/MainPagesTest.cs

@@ -34,12 +34,12 @@ public void calendar_page()
         }
 
         [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]

src/NzbDrone.Automation.Test/PageModel/PageBase.cs

@@ -63,11 +63,11 @@ public IWebElement CalendarNavIcon
             }
         }
 
-        public IWebElement HistoryNavIcon
+        public IWebElement ActivityNavIcon
         {
             get
             {
-                return FindByClass("x-history-nav");
+                return FindByClass("x-activity-nav");
             }
         }
 

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: {
+                queueRegion : '#queue',
                 history     : '#history',
-                blacklist  : '#blacklist',
-                queueRegion: '#queue'
+                blacklist   : '#blacklist'
             },
 
             ui: {
+                queueTab     : '.x-queue-tab',
                 historyTab   : '.x-history-tab',
-                blacklistTab: '.x-blacklist-tab',
-                queueTab  : '.x-queue-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');
             }
         });
     });

src/UI/Activity/ActivityLayoutTemplate.hbs

@@ -1,11 +1,11 @@
 <ul class="nav nav-tabs">
+    <li><a href="#queue" class="x-queue-tab no-router">Queue</a></li>
     <li><a href="#history" class="x-history-tab no-router">History</a></li>
     <li><a href="#blacklist" class="x-blacklist-tab no-router">Blacklist</a></li>
-    <li><a href="#queue" class="x-queue-tab no-router">Queue</a></li>
 </ul>
 
 <div class="tab-content">
+    <div class="tab-pane" id="queue"></div>
     <div class="tab-pane" id="history"></div>
     <div class="tab-pane" id="blacklist"></div>
-    <div class="tab-pane" id="queue"></div>
 </div>

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'

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',

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'

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'
         });
     });

src/UI/Activity/History/HistoryCollection.js

@@ -1,7 +1,7 @@
 'use strict';
 define(
     [
-        'History/HistoryModel',
+        'Activity/History/HistoryModel',
         'backbone.pageable',
         'Mixins/AsFilteredCollection',
         'Mixins/AsSortedCollection',

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',

src/UI/Activity/History/HistoryQualityCell.js

@@ -32,7 +32,5 @@ define(
 
                 return this;
             }
-
-
         });
     });

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({

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',

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();

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',

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',

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) {

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());
             }
-
         });
     });
-

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({

src/UI/Episode/Activity/EpisodeActivityLayout.js

@@ -3,7 +3,7 @@ define(
     [
         'marionette',
         'backgrid',
-        'History/HistoryCollection',
+        'Activity/History/HistoryCollection',
         'Cells/EventTypeCell',
         'Cells/QualityCell',
         'Cells/RelativeDateCell',

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);

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({

src/UI/Navbar/NavbarLayoutTemplate.hbs

@@ -23,7 +23,7 @@
             <ul class="nav navbar-nav">
                 <li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-play"></i> Series</a></li>
                 <li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-calendar"></i> Calendar</a></li>
-                <li><a href="{{UrlBase}}/history" class="x-history-nav"><i class="icon-time"></i> History<span id="x-queue-count" class="navbar-info"></span></a></li>
+                <li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-time"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li>
                 <li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-warning-sign"></i> Wanted</a></li>
                 <li><a href="{{UrlBase}}/settings" class="x-settings-nav"><i class="icon-cogs"></i> Settings</a></li>
                 <li><a href="{{UrlBase}}/system" class="x-system-nav"><i class="icon-laptop"></i> System<span id="x-health" class="navbar-info"></span></a></li>

src/UI/Router.js

@@ -16,8 +16,10 @@ define(
                 'settings/:action(/:query)' : 'settings',
                 'wanted'                    : 'wanted',
                 'wanted/:action'            : 'wanted',
-                'history'                   : 'history',
-                'history/:action'           : 'history',
+                'history'                   : 'activity',
+                'history/:action'           : 'activity',
+                'activity'                  : 'activity',
+                'activity/:action'          : 'activity',
                 'rss'                       : 'rss',
                 'system'                    : 'system',
                 'system/:action'            : 'system',

src/UI/Shared/Modal/ModalController.js

@@ -7,7 +7,7 @@ define(
         'Series/Edit/EditSeriesView',
         'Series/Delete/DeleteSeriesView',
         'Episode/EpisodeDetailsLayout',
-        'History/Details/HistoryDetailsLayout',
+        'Activity/History/Details/HistoryDetailsLayout',
         'System/Logs/Table/Details/LogDetailsView',
         'Rename/RenamePreviewLayout'
     ], function (vent, AppLayout, Marionette, EditSeriesView, DeleteSeriesView, EpisodeDetailsLayout, HistoryDetailsLayout, LogDetailsView, RenamePreviewLayout) {