From 08714f79da965250665d93850fa2e2a66c63aa6c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 17 Jul 2015 00:15:49 -0700 Subject: [PATCH] Renamed Activity to History in episode details modal Closes #624 --- src/UI/Cells/cells.less | 2 +- .../EpisodeActivityLayoutTemplate.hbs | 1 - .../Activity/NoActivityViewTemplate.hbs | 3 --- src/UI/Episode/EpisodeDetailsLayout.js | 18 +++++++-------- .../Episode/EpisodeDetailsLayoutTemplate.hbs | 4 ++-- .../EpisodeHistoryActionsCell.js} | 0 .../EpisodeHistoryDetailsCell.js} | 2 +- .../EpisodeHistoryLayout.js} | 22 +++++++++---------- .../History/EpisodeHistoryLayoutTemplate.hbs | 1 + .../NoHistoryView.js} | 2 +- .../Episode/History/NoHistoryViewTemplate.hbs | 3 +++ src/UI/Series/series.less | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs delete mode 100644 src/UI/Episode/Activity/NoActivityViewTemplate.hbs rename src/UI/Episode/{Activity/EpisodeActivityActionsCell.js => History/EpisodeHistoryActionsCell.js} (100%) rename src/UI/Episode/{Activity/EpisodeActivityDetailsCell.js => History/EpisodeHistoryDetailsCell.js} (93%) rename src/UI/Episode/{Activity/EpisodeActivityLayout.js => History/EpisodeHistoryLayout.js} (74%) create mode 100644 src/UI/Episode/History/EpisodeHistoryLayoutTemplate.hbs rename src/UI/Episode/{Activity/NoActivityView.js => History/NoHistoryView.js} (59%) create mode 100644 src/UI/Episode/History/NoHistoryViewTemplate.hbs diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less index e0dea4d3e..7517cb6ce 100644 --- a/src/UI/Cells/cells.less +++ b/src/UI/Cells/cells.less @@ -129,7 +129,7 @@ td.episode-status-cell, td.quality-cell, td.history-quality-cell, td.progress-ce } } -.episode-activity-details-cell { +.episode-history-details-cell { width : 18px; } diff --git a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs b/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs deleted file mode 100644 index fc3eb57fb..000000000 --- a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/src/UI/Episode/Activity/NoActivityViewTemplate.hbs b/src/UI/Episode/Activity/NoActivityViewTemplate.hbs deleted file mode 100644 index 6f3b107be..000000000 --- a/src/UI/Episode/Activity/NoActivityViewTemplate.hbs +++ /dev/null @@ -1,3 +0,0 @@ -

- No activity for this episode. -

\ No newline at end of file diff --git a/src/UI/Episode/EpisodeDetailsLayout.js b/src/UI/Episode/EpisodeDetailsLayout.js index fc1cc2189..ba1631d0e 100644 --- a/src/UI/Episode/EpisodeDetailsLayout.js +++ b/src/UI/Episode/EpisodeDetailsLayout.js @@ -1,7 +1,7 @@ var Marionette = require('marionette'); var SummaryLayout = require('./Summary/EpisodeSummaryLayout'); var SearchLayout = require('./Search/EpisodeSearchLayout'); -var EpisodeActivityLayout = require('./Activity/EpisodeActivityLayout'); +var EpisodeHistoryLayout = require('./History/EpisodeHistoryLayout'); var SeriesCollection = require('../Series/SeriesCollection'); var Messenger = require('../Shared/Messenger'); @@ -10,14 +10,14 @@ module.exports = Marionette.Layout.extend({ template : 'Episode/EpisodeDetailsLayoutTemplate', regions : { - summary : '#episode-summary', - activity : '#episode-activity', - search : '#episode-search' + summary : '#episode-summary', + history : '#episode-history', + search : '#episode-search' }, ui : { summary : '.x-episode-summary', - activity : '.x-episode-activity', + history : '.x-episode-history', search : '.x-episode-search', monitored : '.x-episode-monitored' }, @@ -25,7 +25,7 @@ module.exports = Marionette.Layout.extend({ events : { 'click .x-episode-summary' : '_showSummary', - 'click .x-episode-activity' : '_showActivity', + 'click .x-episode-history' : '_showHistory', 'click .x-episode-search' : '_showSearch', 'click .x-episode-monitored' : '_toggleMonitored' }, @@ -77,13 +77,13 @@ module.exports = Marionette.Layout.extend({ })); }, - _showActivity : function(e) { + _showHistory : function(e) { if (e) { e.preventDefault(); } - this.ui.activity.tab('show'); - this.activity.show(new EpisodeActivityLayout({ + this.ui.history.tab('show'); + this.history.show(new EpisodeHistoryLayout({ model : this.model, series : this.series })); diff --git a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs index d85991279..bac2e4559 100644 --- a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs +++ b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs @@ -13,12 +13,12 @@
-
+
diff --git a/src/UI/Episode/Activity/EpisodeActivityActionsCell.js b/src/UI/Episode/History/EpisodeHistoryActionsCell.js similarity index 100% rename from src/UI/Episode/Activity/EpisodeActivityActionsCell.js rename to src/UI/Episode/History/EpisodeHistoryActionsCell.js diff --git a/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js b/src/UI/Episode/History/EpisodeHistoryDetailsCell.js similarity index 93% rename from src/UI/Episode/Activity/EpisodeActivityDetailsCell.js rename to src/UI/Episode/History/EpisodeHistoryDetailsCell.js index e9a1e08ba..366a25040 100644 --- a/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js +++ b/src/UI/Episode/History/EpisodeHistoryDetailsCell.js @@ -6,7 +6,7 @@ var HistoryDetailsView = require('../../Activity/History/Details/HistoryDetailsV require('bootstrap'); module.exports = NzbDroneCell.extend({ - className : 'episode-activity-details-cell', + className : 'episode-history-details-cell', render : function() { this.$el.empty(); diff --git a/src/UI/Episode/Activity/EpisodeActivityLayout.js b/src/UI/Episode/History/EpisodeHistoryLayout.js similarity index 74% rename from src/UI/Episode/Activity/EpisodeActivityLayout.js rename to src/UI/Episode/History/EpisodeHistoryLayout.js index 98e4f3947..f474f4566 100644 --- a/src/UI/Episode/Activity/EpisodeActivityLayout.js +++ b/src/UI/Episode/History/EpisodeHistoryLayout.js @@ -4,16 +4,16 @@ var HistoryCollection = require('../../Activity/History/HistoryCollection'); var EventTypeCell = require('../../Cells/EventTypeCell'); var QualityCell = require('../../Cells/QualityCell'); var RelativeDateCell = require('../../Cells/RelativeDateCell'); -var EpisodeActivityActionsCell = require('./EpisodeActivityActionsCell'); -var EpisodeActivityDetailsCell = require('./EpisodeActivityDetailsCell'); -var NoActivityView = require('./NoActivityView'); +var EpisodeHistoryActionsCell = require('./EpisodeHistoryActionsCell'); +var EpisodeHistoryDetailsCell = require('./EpisodeHistoryDetailsCell'); +var NoHistoryView = require('./NoHistoryView'); var LoadingView = require('../../Shared/LoadingView'); module.exports = Marionette.Layout.extend({ - template : 'Episode/Activity/EpisodeActivityLayoutTemplate', + template : 'Episode/History/EpisodeHistoryLayoutTemplate', regions : { - activityTable : '.activity-table' + historyTable : '.history-table' }, columns : [ @@ -41,13 +41,13 @@ module.exports = Marionette.Layout.extend({ { name : 'this', label : '', - cell : EpisodeActivityDetailsCell, + cell : EpisodeHistoryDetailsCell, sortable : false }, { name : 'this', label : '', - cell : EpisodeActivityActionsCell, + cell : EpisodeHistoryActionsCell, sortable : false } ], @@ -58,19 +58,19 @@ module.exports = Marionette.Layout.extend({ this.collection = new HistoryCollection({ episodeId : this.model.id, - tableName : 'episodeActivity' + tableName : 'episodeHistory' }); this.collection.fetch(); this.listenTo(this.collection, 'sync', this._showTable); }, onRender : function() { - this.activityTable.show(new LoadingView()); + this.historyTable.show(new LoadingView()); }, _showTable : function() { if (this.collection.any()) { - this.activityTable.show(new Backgrid.Grid({ + this.historyTable.show(new Backgrid.Grid({ collection : this.collection, columns : this.columns, className : 'table table-hover table-condensed' @@ -78,7 +78,7 @@ module.exports = Marionette.Layout.extend({ } else { - this.activityTable.show(new NoActivityView()); + this.historyTable.show(new NoHistoryView()); } } }); \ No newline at end of file diff --git a/src/UI/Episode/History/EpisodeHistoryLayoutTemplate.hbs b/src/UI/Episode/History/EpisodeHistoryLayoutTemplate.hbs new file mode 100644 index 000000000..54fb50522 --- /dev/null +++ b/src/UI/Episode/History/EpisodeHistoryLayoutTemplate.hbs @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/src/UI/Episode/Activity/NoActivityView.js b/src/UI/Episode/History/NoHistoryView.js similarity index 59% rename from src/UI/Episode/Activity/NoActivityView.js rename to src/UI/Episode/History/NoHistoryView.js index 7fc750a33..883b5dfdc 100644 --- a/src/UI/Episode/Activity/NoActivityView.js +++ b/src/UI/Episode/History/NoHistoryView.js @@ -1,5 +1,5 @@ var Marionette = require('marionette'); module.exports = Marionette.ItemView.extend({ - template : 'Episode/Activity/NoActivityViewTemplate' + template : 'Episode/History/NoHistoryViewTemplate' }); \ No newline at end of file diff --git a/src/UI/Episode/History/NoHistoryViewTemplate.hbs b/src/UI/Episode/History/NoHistoryViewTemplate.hbs new file mode 100644 index 000000000..561e84d59 --- /dev/null +++ b/src/UI/Episode/History/NoHistoryViewTemplate.hbs @@ -0,0 +1,3 @@ +

+ No history for this episode. +

\ No newline at end of file diff --git a/src/UI/Series/series.less b/src/UI/Series/series.less index 92774aab8..6b5daab89 100644 --- a/src/UI/Series/series.less +++ b/src/UI/Series/series.less @@ -287,7 +287,7 @@ font-size : 12px; } - .episode-activity-details-cell .popover { + .episode-history-details-cell .popover { max-width: 800px; }