@@ -27,7 +27,7 @@
-
+
@@ -37,14 +37,14 @@
-
+
diff --git a/src/UI/Calendar/CalendarLayout.js b/src/UI/Calendar/CalendarLayout.js
index 15aa74dfe..441d51404 100644
--- a/src/UI/Calendar/CalendarLayout.js
+++ b/src/UI/Calendar/CalendarLayout.js
@@ -42,7 +42,7 @@ module.exports = Marionette.Layout.extend({
items : [
{
title : 'Get iCal Link',
- icon : 'icon-sonarr-calendar-o',
+ icon : 'icon-radarr-calendar-o',
callback : this._showiCal,
ownerContext : this
}
@@ -59,14 +59,14 @@ module.exports = Marionette.Layout.extend({
key : 'all',
title : '',
tooltip : 'All',
- icon : 'icon-sonarr-all',
+ icon : 'icon-radarr-all',
callback : this._setCalendarFilter
},
{
key : 'monitored',
title : '',
tooltip : 'Monitored Only',
- icon : 'icon-sonarr-monitored',
+ icon : 'icon-radarr-monitored',
callback : this._setCalendarFilter
}
]
diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js
index 389150148..63ea22a9d 100644
--- a/src/UI/Calendar/CalendarView.js
+++ b/src/UI/Calendar/CalendarView.js
@@ -59,23 +59,23 @@ module.exports = Marionette.ItemView.extend({
var errorMessage = event.downloading.get('errorMessage');
if (status === 'pending') {
- this._addStatusIcon(element, 'icon-sonarr-pending', 'Release will be processed {0}'.format(estimatedCompletionTime));
+ this._addStatusIcon(element, 'icon-radarr-pending', 'Release will be processed {0}'.format(estimatedCompletionTime));
}
else if (errorMessage) {
if (status === 'completed') {
- this._addStatusIcon(element, 'icon-sonarr-import-failed', 'Import failed: {0}'.format(errorMessage));
+ this._addStatusIcon(element, 'icon-radarr-import-failed', 'Import failed: {0}'.format(errorMessage));
} else {
- this._addStatusIcon(element, 'icon-sonarr-download-failed', 'Download failed: {0}'.format(errorMessage));
+ this._addStatusIcon(element, 'icon-radarr-download-failed', 'Download failed: {0}'.format(errorMessage));
}
}
else if (status === 'failed') {
- this._addStatusIcon(element, 'icon-sonarr-download-failed', 'Download failed: check download client for more details');
+ this._addStatusIcon(element, 'icon-radarr-download-failed', 'Download failed: check download client for more details');
}
else if (status === 'warning') {
- this._addStatusIcon(element, 'icon-sonarr-download-warning', 'Download warning: check download client for more details');
+ this._addStatusIcon(element, 'icon-radarr-download-warning', 'Download warning: check download client for more details');
}
else {
@@ -98,7 +98,7 @@ module.exports = Marionette.ItemView.extend({
}
else if (event.model.get('unverifiedSceneNumbering')) {
- this._addStatusIcon(element, 'icon-sonarr-form-warning', 'Scene number hasn\'t been verified yet.');
+ this._addStatusIcon(element, 'icon-radarr-form-warning', 'Scene number hasn\'t been verified yet.');
}
},
diff --git a/src/UI/Cells/ApprovalStatusCell.js b/src/UI/Cells/ApprovalStatusCell.js
index 08c6ba575..a3e62058c 100644
--- a/src/UI/Cells/ApprovalStatusCell.js
+++ b/src/UI/Cells/ApprovalStatusCell.js
@@ -17,7 +17,7 @@ module.exports = Backgrid.Cell.extend({
this.templateFunction = Marionette.TemplateCache.get(this.template);
var html = this.templateFunction(rejections);
- this.$el.html('
');
+ this.$el.html('
');
this.$el.popover({
content : html,
diff --git a/src/UI/Cells/DeleteEpisodeFileCell.js b/src/UI/Cells/DeleteEpisodeFileCell.js
index 88ddf8b82..72d324253 100644
--- a/src/UI/Cells/DeleteEpisodeFileCell.js
+++ b/src/UI/Cells/DeleteEpisodeFileCell.js
@@ -10,7 +10,7 @@ module.exports = Backgrid.Cell.extend({
render : function() {
this.$el.empty();
- this.$el.html('
');
+ this.$el.html('
');
return this;
},
diff --git a/src/UI/Cells/EditionCell.js b/src/UI/Cells/EditionCell.js
index c110807f5..814777b0d 100644
--- a/src/UI/Cells/EditionCell.js
+++ b/src/UI/Cells/EditionCell.js
@@ -22,9 +22,9 @@ module.exports = Backgrid.Cell.extend({
//var html = this.templateFunction(edition);
if (cut) {
- this.$el.html('
'.format(edition));
+ this.$el.html(''.format(edition));
} else {
- this.$el.html(''.format(edition));
+ this.$el.html(''.format(edition));
}
/*this.$el.popover({
diff --git a/src/UI/Cells/EpisodeActionsCell.js b/src/UI/Cells/EpisodeActionsCell.js
deleted file mode 100644
index 0a8d20211..000000000
--- a/src/UI/Cells/EpisodeActionsCell.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var vent = require('vent');
-var NzbDroneCell = require('./NzbDroneCell');
-var CommandController = require('../Commands/CommandController');
-
-module.exports = NzbDroneCell.extend({
- className : 'episode-actions-cell',
-
- events : {
- 'click .x-automatic-search' : '_automaticSearch',
- 'click .x-manual-search' : '_manualSearch'
- },
-
- render : function() {
- this.$el.empty();
-
- this.$el.html('' + '');
-
- CommandController.bindToCommand({
- element : this.$el.find('.x-automatic-search'),
- command : {
- name : 'episodeSearch',
- episodeIds : [this.model.get('id')]
- }
- });
-
- this.delegateEvents();
- return this;
- },
-
- _automaticSearch : function() {
- CommandController.Execute('episodeSearch', {
- name : 'episodeSearch',
- episodeIds : [this.model.get('id')]
- });
- },
-
- _manualSearch : function() {
- console.warn(this.cellValue);
- vent.trigger(vent.Commands.ShowEpisodeDetails, {
- episode : this.cellValue,
- hideSeriesLink : true,
- openingTab : 'search'
- });
- }
-});
diff --git a/src/UI/Cells/EpisodeMonitoredCell.js b/src/UI/Cells/EpisodeMonitoredCell.js
deleted file mode 100644
index b615d2909..000000000
--- a/src/UI/Cells/EpisodeMonitoredCell.js
+++ /dev/null
@@ -1,57 +0,0 @@
-var _ = require('underscore');
-var ToggleCell = require('./ToggleCell');
-var SeriesCollection = require('../Series/SeriesCollection');
-var Messenger = require('../Shared/Messenger');
-
-module.exports = ToggleCell.extend({
- className : 'toggle-cell episode-monitored',
-
- _originalOnClick : ToggleCell.prototype._onClick,
-
- _onClick : function(e) {
-
- var series = SeriesCollection.get(this.model.get('seriesId'));
-
- if (!series.get('monitored')) {
-
- Messenger.show({
- message : 'Unable to change monitored state when series is not monitored',
- type : 'error'
- });
-
- return;
- }
-
- if (e.shiftKey && this.model.episodeCollection.lastToggled) {
- this._selectRange();
-
- return;
- }
-
- this._originalOnClick.apply(this, arguments);
- this.model.episodeCollection.lastToggled = this.model;
- },
-
- _selectRange : function() {
- var episodeCollection = this.model.episodeCollection;
- var lastToggled = episodeCollection.lastToggled;
-
- var currentIndex = episodeCollection.indexOf(this.model);
- var lastIndex = episodeCollection.indexOf(lastToggled);
-
- var low = Math.min(currentIndex, lastIndex);
- var high = Math.max(currentIndex, lastIndex);
- var range = _.range(low + 1, high);
-
- _.each(range, function(index) {
- var model = episodeCollection.at(index);
-
- model.set('monitored', lastToggled.get('monitored'));
- model.save();
- });
-
- this.model.set('monitored', lastToggled.get('monitored'));
- this.model.save();
- this.model.episodeCollection.lastToggled = undefined;
- }
-});
\ No newline at end of file
diff --git a/src/UI/Cells/EventTypeCell.js b/src/UI/Cells/EventTypeCell.js
index ed58b17f3..8768c1546 100644
--- a/src/UI/Cells/EventTypeCell.js
+++ b/src/UI/Cells/EventTypeCell.js
@@ -12,31 +12,31 @@ module.exports = NzbDroneCell.extend({
switch (this.cellValue.get('eventType')) {
case 'grabbed':
- icon = 'icon-sonarr-downloading';
+ icon = 'icon-radarr-downloading';
toolTip = 'Movie grabbed from {0} and sent to download client'.format(this.cellValue.get('data').indexer);
break;
case 'seriesFolderImported':
- icon = 'icon-sonarr-hdd';
+ icon = 'icon-radarr-hdd';
toolTip = 'Existing movie file added to library';
break;
case 'downloadFolderImported':
- icon = 'icon-sonarr-imported';
+ icon = 'icon-radarr-imported';
toolTip = 'Movie downloaded successfully and picked up from download client';
break;
case 'downloadFailed':
- icon = 'icon-sonarr-download-failed';
+ icon = 'icon-radarr-download-failed';
toolTip = 'Movie download failed';
break;
case 'episodeFileDeleted':
- icon = 'icon-sonarr-deleted';
+ icon = 'icon-radarr-deleted';
toolTip = 'Movie file deleted';
break;
case 'movieFileDeleted':
- icon = 'icon-sonarr-deleted';
+ icon = 'icon-radarr-deleted';
toolTip = 'Movie file deleted';
break;
default:
- icon = 'icon-sonarr-unknown';
+ icon = 'icon-radarr-unknown';
toolTip = 'unknown event';
}
diff --git a/src/UI/Cells/MovieActionCell.js b/src/UI/Cells/MovieActionCell.js
index e2d18cdea..d5f50e750 100644
--- a/src/UI/Cells/MovieActionCell.js
+++ b/src/UI/Cells/MovieActionCell.js
@@ -3,22 +3,25 @@ var NzbDroneCell = require('./NzbDroneCell');
var CommandController = require('../Commands/CommandController');
module.exports = NzbDroneCell.extend({
- className : 'series-actions-cell',
+ className : 'movie-actions-cell',
ui : {
- refresh : '.x-refresh'
+ refresh : '.x-refresh',
+ search : '.x-search'
},
events : {
- 'click .x-edit' : '_editSeries',
- 'click .x-refresh' : '_refreshSeries'
+ 'click .x-edit' : '_editMovie',
+ 'click .x-refresh' : '_refreshMovie',
+ 'click .x-search' : '_searchMovie'
},
render : function() {
this.$el.empty();
- this.$el.html(' ' +
- '');
+ this.$el.html(' ' +
+ ' ' +
+ '');
CommandController.bindToCommand({
element : this.$el.find('.x-refresh'),
@@ -28,18 +31,33 @@ module.exports = NzbDroneCell.extend({
}
});
+ CommandController.bindToCommand({
+ element : this.$el.find('.x-search'),
+ command : {
+ name : 'moviesSearch',
+ movieIds : [this.model.get('id')]
+ }
+ });
+
this.delegateEvents();
return this;
},
- _editSeries : function() {
+ _editMovie : function() {
vent.trigger(vent.Commands.EditMovieCommand, { movie : this.model });
},
- _refreshSeries : function() {
+ _refreshMovie : function() {
CommandController.Execute('refreshMovie', {
name : 'refreshMovie',
movieId : this.model.id
});
+ },
+
+ _searchMovie : function() {
+ CommandController.Execute('moviesSearch', {
+ name : 'moviesSearch',
+ movieIds : [this.model.id]
+ });
}
});
diff --git a/src/UI/Cells/MovieLinksTemplate.hbs b/src/UI/Cells/MovieLinksTemplate.hbs
index 7c62ad4d4..737dd2c02 100644
--- a/src/UI/Cells/MovieLinksTemplate.hbs
+++ b/src/UI/Cells/MovieLinksTemplate.hbs
@@ -1,4 +1,4 @@
-
+
{{#if tmdbId}}
Trakt
{{/if}}
diff --git a/src/UI/Cells/MovieListTitleCell.js b/src/UI/Cells/MovieListTitleCell.js
index 6d9142131..13adf5bc7 100644
--- a/src/UI/Cells/MovieListTitleCell.js
+++ b/src/UI/Cells/MovieListTitleCell.js
@@ -1,7 +1,7 @@
var TemplatedCell = require('./TemplatedCell');
module.exports = TemplatedCell.extend({
- className : 'series-title-cell',
+ className : 'movie-title-cell',
template : 'Cells/MovieListTitleTemplate',
});
diff --git a/src/UI/Cells/MovieStatusCell.js b/src/UI/Cells/MovieStatusCell.js
index d896d7030..93d121df7 100644
--- a/src/UI/Cells/MovieStatusCell.js
+++ b/src/UI/Cells/MovieStatusCell.js
@@ -14,16 +14,16 @@ module.exports = NzbDroneCell.extend({
if (status === 'released') {
- this.$el.html('');
+ this.$el.html('');
this._setStatusWeight(3);
}
if (status === 'inCinemas') {
- this.$el.html('');
+ this.$el.html('');
this._setStatusWeight(2);
}
if (status === "announced") {
- this.$el.html('');
+ this.$el.html('');
this._setStatusWeight(1);
}
diff --git a/src/UI/Cells/MovieStatusWithTextCell.js b/src/UI/Cells/MovieStatusWithTextCell.js
index a40b89040..505be0260 100644
--- a/src/UI/Cells/MovieStatusWithTextCell.js
+++ b/src/UI/Cells/MovieStatusWithTextCell.js
@@ -14,17 +14,17 @@ module.exports = NzbDroneCell.extend({
var numOfMonths = timeSince / 1000 / 60 / 60 / 24 / 30;
if (status === 'released') {
- this.$el.html(' Released
');
+ this.$el.html(' Released
');
this._setStatusWeight(3);
}
if (status ==='inCinemas') {
- this.$el.html(' In Cinemas
');
+ this.$el.html(' In Cinemas
');
this._setStatusWeight(2);
}
if (status === "announced") {
- this.$el.html(' Announced
');
+ this.$el.html(' Announced
');
this._setStatusWeight(1);
}
diff --git a/src/UI/Cells/MovieTitleCell.js b/src/UI/Cells/MovieTitleCell.js
index 8158d6300..32a2f4a63 100644
--- a/src/UI/Cells/MovieTitleCell.js
+++ b/src/UI/Cells/MovieTitleCell.js
@@ -1,7 +1,7 @@
var TemplatedCell = require('./TemplatedCell');
module.exports = TemplatedCell.extend({
- className : 'series-title-cell',
- template : 'Cells/SeriesTitleTemplate',
+ className : 'movie-title-cell',
+ template : 'Cells/MovieTitleTemplate',
});
diff --git a/src/UI/Cells/SeriesTitleTemplate.hbs b/src/UI/Cells/MovieTitleTemplate.hbs
similarity index 100%
rename from src/UI/Cells/SeriesTitleTemplate.hbs
rename to src/UI/Cells/MovieTitleTemplate.hbs
diff --git a/src/UI/Cells/SeriesActionsCell.js b/src/UI/Cells/SeriesActionsCell.js
deleted file mode 100644
index eb62191ef..000000000
--- a/src/UI/Cells/SeriesActionsCell.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var vent = require('vent');
-var NzbDroneCell = require('./NzbDroneCell');
-var CommandController = require('../Commands/CommandController');
-
-module.exports = NzbDroneCell.extend({
- className : 'series-actions-cell',
-
- ui : {
- refresh : '.x-refresh'
- },
-
- events : {
- 'click .x-edit' : '_editSeries',
- 'click .x-refresh' : '_refreshSeries'
- },
-
- render : function() {
- this.$el.empty();
-
- this.$el.html(' ' +
- '');
-
- CommandController.bindToCommand({
- element : this.$el.find('.x-refresh'),
- command : {
- name : 'refreshSeries',
- seriesId : this.model.get('id')
- }
- });
-
- this.delegateEvents();
- return this;
- },
-
- _editSeries : function() {
- vent.trigger(vent.Commands.EditSeriesCommand, { series : this.model });
- },
-
- _refreshSeries : function() {
- CommandController.Execute('refreshSeries', {
- name : 'refreshSeries',
- seriesId : this.model.id
- });
- }
-});
\ No newline at end of file
diff --git a/src/UI/Cells/SeriesStatusCell.js b/src/UI/Cells/SeriesStatusCell.js
deleted file mode 100644
index e240f6100..000000000
--- a/src/UI/Cells/SeriesStatusCell.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var NzbDroneCell = require('./NzbDroneCell');
-
-module.exports = NzbDroneCell.extend({
- className : 'series-status-cell',
-
- render : function() {
- this.$el.empty();
- var monitored = this.model.get('monitored');
- var status = this.model.get('status');
-
- if (status === 'ended') {
- this.$el.html('');
- this._setStatusWeight(3);
- }
-
- else if (!monitored) {
- this.$el.html('');
- this._setStatusWeight(2);
- }
-
- else {
- this.$el.html('');
- this._setStatusWeight(1);
- }
-
- return this;
- },
-
- _setStatusWeight : function(weight) {
- this.model.set('statusWeight', weight, { silent : true });
- }
-});
\ No newline at end of file
diff --git a/src/UI/Cells/SeriesTitleCell.js b/src/UI/Cells/SeriesTitleCell.js
deleted file mode 100644
index a516b4e09..000000000
--- a/src/UI/Cells/SeriesTitleCell.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var TemplatedCell = require('./TemplatedCell');
-
-module.exports = TemplatedCell.extend({
- className : 'series-title-cell',
- template : 'Cells/SeriesTitleTemplate'
-});
\ No newline at end of file
diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less
index 05dda30a1..8c7a408bf 100644
--- a/src/UI/Cells/cells.less
+++ b/src/UI/Cells/cells.less
@@ -5,10 +5,10 @@
@import "../Content/mixins";
@import "../Content/variables";
-.series-title-cell {
+.movie-title-cell {
.text-overflow();
- max-width: 350px;
+ max-width: 322px;
@media @sm {
max-width: 250px
@@ -166,9 +166,13 @@ td.episode-status-cell, td.quality-cell, td.history-quality-cell, td.progress-ce
}
}
-.series-actions-cell {
- width : 56px;
- min-width : 56px;
+.movie-actions-cell {
+ width : 84px;
+ min-width : 84px;
+
+ i {
+ .clickable();
+ }
}
.timeleft-cell {
@@ -209,10 +213,6 @@ td.delete-episode-file-cell {
}
}
-.series-status-cell {
- width: 16px;
-}
-
.episode-number-cell {
cursor : default;
}
diff --git a/src/UI/Content/Overrides/bootstrap.less b/src/UI/Content/Overrides/bootstrap.less
index 8615a130a..40d5d8415 100644
--- a/src/UI/Content/Overrides/bootstrap.less
+++ b/src/UI/Content/Overrides/bootstrap.less
@@ -19,7 +19,7 @@
text-transform : none;
}
-.line &>[class^="icon-sonarr-"], .line &>[class*="icon-sonarr-"] {
+.line &>[class^="icon-radarr-"], .line &>[class*="icon-radarr-"] {
margin-top : 1em;
height : 1em;
line-height : 1em;
diff --git a/src/UI/Content/icons.less b/src/UI/Content/icons.less
index de2b281fd..79e987d38 100644
--- a/src/UI/Content/icons.less
+++ b/src/UI/Content/icons.less
@@ -55,26 +55,26 @@
&:before { color: @color; }
}
-.icon-sonarr-warning {
+.icon-radarr-warning {
.fa-icon-content(@fa-var-exclamation-triangle);
.fa-icon-color(@brand-warning);
}
-.icon-sonarr-available {
+.icon-radarr-available {
.fa-icon-content(@fa-var-clock-o);
}
-.icon-sonarr-edit {
+.icon-radarr-edit {
.fa-icon-content(@fa-var-wrench);
}
-.icon-sonarr-blacklist {
+.icon-radarr-blacklist {
.fa-icon-content(@fa-var-ban);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-spinner {
+.icon-radarr-spinner {
.fa-icon-content(@fa-var-spinner);
}
@@ -88,7 +88,7 @@
opacity : 0.0;
margin : 0 !important;
- &.icon-sonarr-spinner {
+ &.icon-radarr-spinner {
opacity : 1.0;
margin : 0 -0.5em !important;
}
@@ -103,167 +103,167 @@
}
}
-.icon-sonarr-rename {
+.icon-radarr-rename {
.fa-icon-content(@fa-var-sitemap)
}
-.icon-sonarr-add {
+.icon-radarr-add {
.fa-icon-content(@fa-var-plus);
}
-.icon-sonarr-form-info {
+.icon-radarr-form-info {
.fa-icon-content(@fa-var-question-circle);
}
-.icon-sonarr-form-warning {
+.icon-radarr-form-warning {
.fa-icon-content(@fa-var-exclamation-triangle);
.fa-icon-color(@brand-warning);
}
-.icon-sonarr-form-danger {
+.icon-radarr-form-danger {
.fa-icon-content(@fa-var-exclamation-circle);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-form-cut {
+.icon-radarr-form-cut {
.fa-icon-content(@fa-var-scissors);
}
-.icon-sonarr-form-special {
+.icon-radarr-form-special {
.fa-icon-content(@fa-var-exclamation-circle);
}
-.icon-sonarr-form-info-link {
+.icon-radarr-form-info-link {
.clickable();
.fa-icon-content(@fa-var-info-circle);
.fa-icon-color(@brand-primary)
}
-.icon-sonarr-form-external-link {
+.icon-radarr-form-external-link {
.fa-icon-content(@fa-var-external-link);
}
-.icon-sonarr-update {
+.icon-radarr-update {
.fa-icon-content(@fa-var-download);
}
-.icon-sonarr-download {
+.icon-radarr-download {
.fa-icon-content(@fa-var-download);
}
-.icon-sonarr-downloading {
+.icon-radarr-downloading {
.fa-icon-content(@fa-var-cloud-download);
}
-.icon-sonarr-downloaded {
+.icon-radarr-downloaded {
.fa-icon-content(@fa-var-inbox);
}
-.icon-sonarr-pending {
+.icon-radarr-pending {
.fa-icon-content(@fa-var-clock-o);
}
-.icon-sonarr-queued {
+.icon-radarr-queued {
.fa-icon-content(@fa-var-cloud);
}
-.icon-sonarr-paused {
+.icon-radarr-paused {
.fa-icon-content(@fa-var-pause);
}
-.icon-sonarr-active {
+.icon-radarr-active {
.fa-icon-content(@fa-var-play);
}
-.icon-sonarr-tba {
+.icon-radarr-tba {
.fa-icon-content(@fa-var-question-circle);
}
-.icon-sonarr-missing {
+.icon-radarr-missing {
.fa-icon-content(@fa-var-exclamation-triangle);
}
-.icon-sonarr-not-aired {
+.icon-radarr-not-aired {
.fa-icon-content(@fa-var-clock-o);
}
-.icon-sonarr-import {
+.icon-radarr-import {
.fa-icon-content(@fa-var-inbox);
}
-.icon-sonarr-import-manual {
+.icon-radarr-import-manual {
.fa-icon-content(@fa-var-user);
}
-.icon-sonarr-imported {
+.icon-radarr-imported {
.fa-icon-content(@fa-var-download);
}
-.icon-sonarr-status {
+.icon-radarr-status {
.fa-icon-content(@fa-var-circle);
}
-.icon-sonarr-monitored {
+.icon-radarr-monitored {
.fa-icon-content(@fa-var-bookmark);
}
-.icon-sonarr-unmonitored {
+.icon-radarr-unmonitored {
.fa-icon-content(@fa-var-bookmark-o);
}
-.icon-sonarr-movie-announced {
+.icon-radarr-movie-announced {
.fa-icon-content(@fa-var-bullhorn);
}
-.icon-sonarr-movie-released {
+.icon-radarr-movie-released {
.fa-icon-content(@fa-var-file-video-o);
}
-.icon-sonarr-movie-cinemas {
+.icon-radarr-movie-cinemas {
.fa-icon-content(@fa-var-ticket);
}
-.icon-sonarr-log-info {
+.icon-radarr-log-info {
.fa-icon-content(@fa-var-info-circle);
.fa-icon-color(dodgerblue);
}
-.icon-sonarr-log-debug {
+.icon-radarr-log-debug {
.fa-icon-content(@fa-var-info-circle);
.fa-icon-color(gray);
}
-.icon-sonarr-log-trace {
+.icon-radarr-log-trace {
.fa-icon-content(@fa-var-info-circle);
.fa-icon-color(lightgrey);
}
-.icon-sonarr-log-warn {
+.icon-radarr-log-warn {
.fa-icon-content(@fa-var-exclamation-circle);
.fa-icon-color(@brand-warning);
}
-.icon-sonarr-log-error {
+.icon-radarr-log-error {
.fa-icon-content(@fa-var-bug);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-log-fatal {
+.icon-radarr-log-fatal {
.fa-icon-content(@fa-var-times-circle);
.fa-icon-color(purple);
}
-.icon-sonarr-import-failed {
+.icon-radarr-import-failed {
.fa-icon-content(@fa-var-download);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-download-failed {
+.icon-radarr-download-failed {
.fa-icon-content(@fa-var-cloud-download);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-download-warning {
+.icon-radarr-download-warning {
.fa-icon-content(@fa-var-cloud-download);
.fa-icon-color(@brand-warning);
}
@@ -273,38 +273,38 @@
.fa-icon-color(@brand-warning);
}
-.icon-sonarr-shutdown {
+.icon-radarr-shutdown {
.fa-icon-content(@fa-var-power-off);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-restart {
+.icon-radarr-restart {
.fa-icon-content(@fa-var-repeat);
}
-.icon-sonarr-health-warning {
+.icon-radarr-health-warning {
.fa-icon-content(@fa-var-exclamation-circle);
.fa-icon-color(@brand-warning);
}
-.icon-sonarr-health-error {
+.icon-radarr-health-error {
.fa-icon-content(@fa-var-exclamation-circle);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-search {
+.icon-radarr-search {
.fa-icon-content(@fa-var-search);
}
-.icon-sonarr-search-manual {
+.icon-radarr-search-manual {
.fa-icon-content(@fa-var-user);
}
-.icon-sonarr-search-automatic {
+.icon-radarr-search-automatic {
.fa-icon-content(@fa-var-rocket);
}
-.icon-sonarr-delete {
+.icon-radarr-delete {
.fa-icon-content(@fa-var-remove);
.fa-icon-color(@brand-danger);
}
@@ -313,233 +313,233 @@
.fa-icon-content(@fa-var-remove);
}
-.icon-sonarr-ignore {
+.icon-radarr-ignore {
.fa-icon-content(@fa-var-eye-slash);
}
-.icon-sonarr-deleted {
+.icon-radarr-deleted {
.fa-icon-content(@fa-var-trash);
}
-.icon-sonarr-star {
+.icon-radarr-star {
.fa-icon-content(@fa-var-star);
}
-.icon-sonarr-clear {
+.icon-radarr-clear {
.fa-icon-content(@fa-var-trash);
}
-.icon-sonarr-existing {
+.icon-radarr-existing {
.fa-icon-content(@fa-var-minus);
.fa-icon-color(@brand-danger);
}
-.icon-sonarr-suggested {
+.icon-radarr-suggested {
.fa-icon-content(@fa-var-plus);
.fa-icon-color(@brand-success);
}
-.icon-sonarr-info {
+.icon-radarr-info {
.fa-icon-content(@fa-var-info-circle);
}
-.icon-sonarr-all {
+.icon-radarr-all {
.fa-icon-content(@fa-var-circle-o);
}
//Navbar
-.icon-sonarr-navbar-collapsed {
+.icon-radarr-navbar-collapsed {
.fa-icon-content(@fa-var-bars);
}
-.icon-sonarr-navbar-series {
+.icon-radarr-navbar-movies {
.fa-icon-content(@fa-var-film);
}
-.icon-sonarr-navbar-calendar {
+.icon-radarr-navbar-calendar {
.fa-icon-content(@fa-var-calendar);
}
-.icon-sonarr-navbar-activity {
+.icon-radarr-navbar-activity {
.fa-icon-content(@fa-var-clock-o);
}
-.icon-sonarr-navbar-wanted {
+.icon-radarr-navbar-wanted {
.fa-icon-content(@fa-var-exclamation-triangle);
}
-.icon-sonarr-navbar-settings {
+.icon-radarr-navbar-settings {
.fa-icon-content(@fa-var-cogs);
}
-.icon-sonarr-navbar-system {
+.icon-radarr-navbar-system {
.fa-icon-content(@fa-var-laptop);
}
-.icon-sonarr-navbar-donate {
+.icon-radarr-navbar-donate {
.fa-icon-content(@fa-var-heart);
.fa-icon-color(@nzbdroneRed);
}
-.icon-sonarr-back-to-top {
+.icon-radarr-back-to-top {
.fa-icon-content(@fa-var-arrow-circle-up);
}
-.icon-sonarr-hdd {
+.icon-radarr-hdd {
.fa-icon-content(@fa-var-hdd-o);
}
-.icon-sonarr-copy {
+.icon-radarr-copy {
.fa-icon-content(@fa-var-clipboard);
}
-.icon-sonarr-unknown {
+.icon-radarr-unknown {
.fa-icon-content(@fa-var-question);
}
-.icon-sonarr-load-more {
+.icon-radarr-load-more {
.fa-icon-content(@fa-var-angle-down);
}
-.icon-sonarr-ok {
+.icon-radarr-ok {
.fa-icon-content(@fa-var-check);
}
-.icon-sonarr-calendar-o {
+.icon-radarr-calendar-o {
.fa-icon-content(@fa-var-calendar-o);
}
-.icon-sonarr-folder-open {
+.icon-radarr-folder-open {
.fa-icon-content(@fa-var-folder-open);
}
-.icon-sonarr-refresh {
+.icon-radarr-refresh {
.fa-icon-content(@fa-var-refresh);
}
-.icon-sonarr-series-ended {
+.icon-radarr-series-ended {
.fa-icon-content(@fa-var-stop);
}
-.icon-sonarr-series-continuing {
+.icon-radarr-series-continuing {
.fa-icon-content(@fa-var-play);
}
-.icon-sonarr-series-unmonitored {
+.icon-radarr-series-unmonitored {
.fa-icon-content(@fa-var-pause);
}
-.icon-sonarr-checked {
+.icon-radarr-checked {
.fa-icon-content(@fa-var-check-square);
}
-.icon-sonarr-unchecked {
+.icon-radarr-unchecked {
.fa-icon-content(@fa-var-square-o);
}
-.icon-sonarr-expand {
+.icon-radarr-expand {
.fa-icon-content(@fa-var-chevron-right);
}
-.icon-sonarr-expanded {
+.icon-radarr-expanded {
.fa-icon-content(@fa-var-chevron-down);
}
-.icon-sonarr-panel-show {
+.icon-radarr-panel-show {
.fa-icon-content(@fa-var-chevron-circle-down);
}
-.icon-sonarr-panel-hide {
+.icon-radarr-panel-hide {
.fa-icon-content(@fa-var-chevron-circle-up);
}
-.icon-sonarr-comment {
+.icon-radarr-comment {
.fa-icon-content(@fa-var-comment)
}
-.icon-sonarr-rss {
+.icon-radarr-rss {
.fa-icon-content(@fa-var-rss)
}
-.icon-sonarr-view-poster {
+.icon-radarr-view-poster {
.fa-icon-content(@fa-var-th-large)
}
-.icon-sonarr-view-list {
+.icon-radarr-view-list {
.fa-icon-content(@fa-var-th-list)
}
-.icon-sonarr-view-table {
+.icon-radarr-view-table {
.fa-icon-content(@fa-var-table)
}
-.icon-sonarr-reorder {
+.icon-radarr-reorder {
.fa-icon-content(@fa-var-bars);
}
-.icon-sonarr-browser-computer {
+.icon-radarr-browser-computer {
.fa-icon-content(@fa-var-desktop);
}
-.icon-sonarr-browser-up {
+.icon-radarr-browser-up {
.fa-icon-content(@fa-var-level-up);
}
-.icon-sonarr-browser-folder {
+.icon-radarr-browser-folder {
.fa-icon-content(@fa-var-folder-o);
}
-.icon-sonarr-browser-file {
+.icon-radarr-browser-file {
.fa-icon-content(@fa-var-file-o);
}
-.icon-sonarr-sort-asc {
+.icon-radarr-sort-asc {
.fa-icon-content(@fa-var-sort-asc);
}
-.icon-sonarr-sort-desc {
+.icon-radarr-sort-desc {
.fa-icon-content(@fa-var-sort-desc);
}
-.icon-sonarr-pager-first {
+.icon-radarr-pager-first {
.fa-icon-content(@fa-var-fast-backward);
}
-.icon-sonarr-pager-previous {
+.icon-radarr-pager-previous {
.fa-icon-content(@fa-var-backward);
}
-.icon-sonarr-pager-next {
+.icon-radarr-pager-next {
.fa-icon-content(@fa-var-forward);
}
-.icon-sonarr-pager-last {
+.icon-radarr-pager-last {
.fa-icon-content(@fa-var-fast-forward);
}
-.icon-sonarr-logout {
+.icon-radarr-logout {
.fa-icon-content(@fa-var-sign-out);
}
-.icon-sonarr-file-text {
+.icon-radarr-file-text {
.fa-icon-content(@fa-var-file-text);
}
-.icon-sonarr-backup-scheduled {
+.icon-radarr-backup-scheduled {
.fa-icon-content(@fa-var-clock-o);
}
-.icon-sonarr-backup-manual {
+.icon-radarr-backup-manual {
.fa-icon-content(@fa-var-book);
}
-.icon-sonarr-backup-update {
+.icon-radarr-backup-update {
.fa-icon-content(@fa-var-retweet);
}
-.icon-sonarr-episode-file {
+.icon-radarr-episode-file {
.fa-icon-content(@fa-var-file-video-o);
}
-.icon-sonarr-header-rejections {
+.icon-radarr-header-rejections {
.fa-icon-content(@fa-var-exclamation-circle);
}
diff --git a/src/UI/Content/navbar.less b/src/UI/Content/navbar.less
index a8494d569..2cb3c017e 100644
--- a/src/UI/Content/navbar.less
+++ b/src/UI/Content/navbar.less
@@ -21,7 +21,7 @@
margin-bottom : 1px;
}
- .icon-sonarr-navbar-icon {
+ .icon-radarr-navbar-icon {
display: inline;
}
diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less
index 8688c40c7..ca2c95de0 100644
--- a/src/UI/Content/theme.less
+++ b/src/UI/Content/theme.less
@@ -208,7 +208,7 @@ body.debug {
.card(#aaaaaa);
/* width : 1210px;
min-width : 1210px; */
- max-width : 1478px;
+ max-width : 1489px;
margin : auto;
// margin-top : -70px;
padding : 20px 0;
diff --git a/src/UI/Form/CaptchaTemplate.hbs b/src/UI/Form/CaptchaTemplate.hbs
index 12e472df0..71928382b 100644
--- a/src/UI/Form/CaptchaTemplate.hbs
+++ b/src/UI/Form/CaptchaTemplate.hbs
@@ -4,12 +4,12 @@
-
-
+
+
diff --git a/src/UI/Form/CheckboxTemplate.hbs b/src/UI/Form/CheckboxTemplate.hbs
index 526804714..a2e619a3b 100644
--- a/src/UI/Form/CheckboxTemplate.hbs
+++ b/src/UI/Form/CheckboxTemplate.hbs
@@ -15,7 +15,7 @@
{{#if helpText}}
-
+
{{/if}}
diff --git a/src/UI/Form/FormHelpPartial.hbs b/src/UI/Form/FormHelpPartial.hbs
index b698ccdea..f97b2f263 100644
--- a/src/UI/Form/FormHelpPartial.hbs
+++ b/src/UI/Form/FormHelpPartial.hbs
@@ -1,8 +1,8 @@
{{#if helpText}}
-
+
{{/if}}
{{#if helpLink}}
-
+
{{/if}}
diff --git a/src/UI/Handlebars/Helpers/Movie.js b/src/UI/Handlebars/Helpers/Movie.js
index 13ca0d51f..0e2d258fb 100644
--- a/src/UI/Handlebars/Helpers/Movie.js
+++ b/src/UI/Handlebars/Helpers/Movie.js
@@ -15,20 +15,20 @@ Handlebars.registerHelper('GetStatus', function() {
if (status === "announced") {
- return new Handlebars.SafeString('
Announced');
+ return new Handlebars.SafeString('
Announced');
}
if (status ==="inCinemas") {
- return new Handlebars.SafeString('
In Cinemas');
+ return new Handlebars.SafeString('
In Cinemas');
}
if (status === 'released') {
- return new Handlebars.SafeString('
Released');
+ return new Handlebars.SafeString('
Released');
}
if (!monitored) {
- return new Handlebars.SafeString('
Not Monitored');
+ return new Handlebars.SafeString('
Not Monitored');
}
});
@@ -76,14 +76,14 @@ Handlebars.registerHelper('poster', function() {
if (poster[0]) {
if (!poster[0].url.match(/^https?:\/\//)) {
- return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, poster[0].url, 250)));
+ return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, poster[0].url, 250)));
} else {
var url = poster[0].url.replace(/^https?\:/, 'https://'); //IMDb posters need https to work, k?
- return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, url)));
+ return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, url)));
}
}
- return new Handlebars.SafeString('
'.format(placeholder));
+ return new Handlebars.SafeString('
'.format(placeholder));
});
Handlebars.registerHelper('remotePoster', function() {
@@ -92,14 +92,14 @@ Handlebars.registerHelper('remotePoster', function() {
if (poster) {
if (!poster.match(/^https?:\/\//)) {
- return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, poster, 250)));
+ return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, poster, 250)));
} else {
var url = poster.replace(/^https?\:/, 'https://'); //IMDb posters need https to work, k?
- return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, url)));
+ return new Handlebars.SafeString('
'.format(Handlebars.helpers.defaultImg.call(null, url)));
}
}
- return new Handlebars.SafeString('
'.format(placeholder));
+ return new Handlebars.SafeString('
'.format(placeholder));
});
Handlebars.registerHelper('traktUrl', function() {
@@ -152,14 +152,14 @@ Handlebars.registerHelper('GetBannerStatus', function() {
if (status === "inCinemas") {
- return new Handlebars.SafeString('
In Cinemas
');
+ return new Handlebars.SafeString('
In Cinemas
');
}
if (status === "announced") {
- return new Handlebars.SafeString('
Announced
');
+ return new Handlebars.SafeString('
Announced
');
}
else if (!monitored) {
- return new Handlebars.SafeString('
Not Monitored
');
+ return new Handlebars.SafeString('
Not Monitored
');
}
});
diff --git a/src/UI/ManualImport/Cells/MovieCell.js b/src/UI/ManualImport/Cells/MovieCell.js
index ebd2f6261..0a88c1a49 100644
--- a/src/UI/ManualImport/Cells/MovieCell.js
+++ b/src/UI/ManualImport/Cells/MovieCell.js
@@ -3,7 +3,7 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
var SelectMovieLayout = require('../Movie/SelectMovieLayout');
module.exports = NzbDroneCell.extend({
- className : 'series-title-cell editable',
+ className : 'movie-title-cell editable',
events : {
'click' : '_onClick'
diff --git a/src/UI/ManualImport/Folder/SelectFolderViewTemplate.hbs b/src/UI/ManualImport/Folder/SelectFolderViewTemplate.hbs
index 0e0dc18f2..5c8763fa7 100644
--- a/src/UI/ManualImport/Folder/SelectFolderViewTemplate.hbs
+++ b/src/UI/ManualImport/Folder/SelectFolderViewTemplate.hbs
@@ -31,12 +31,12 @@
diff --git a/src/UI/ManualImport/ManualImportCollection.js b/src/UI/ManualImport/ManualImportCollection.js
index 10778af38..cb3d70f59 100644
--- a/src/UI/ManualImport/ManualImportCollection.js
+++ b/src/UI/ManualImport/ManualImportCollection.js
@@ -38,10 +38,10 @@ var Collection = PageableCollection.extend({
sortMappings : {
movie : {
sortValue : function(model, attr, order) {
- var series = model.get(attr);
+ var movie = model.get(attr);
- if (series) {
- return series.sortTitle;
+ if (movie) {
+ return movie.sortTitle;
}
return '';
diff --git a/src/UI/ManualImport/ManualImportLayout.js b/src/UI/ManualImport/ManualImportLayout.js
index 2872636bb..59b37e378 100644
--- a/src/UI/ManualImport/ManualImportLayout.js
+++ b/src/UI/ManualImport/ManualImportLayout.js
@@ -67,7 +67,7 @@ module.exports = Marionette.Layout.extend({
},
{
name : 'rejections',
- label : '',
+ label : '',
tooltip : 'Rejections',
cell : ApprovalStatusCell,
sortable : false,
diff --git a/src/UI/ManualImport/Movie/SelectMovieLayout.js b/src/UI/ManualImport/Movie/SelectMovieLayout.js
index 9dc312b25..5de935741 100644
--- a/src/UI/ManualImport/Movie/SelectMovieLayout.js
+++ b/src/UI/ManualImport/Movie/SelectMovieLayout.js
@@ -57,7 +57,7 @@ module.exports = Marionette.Layout.extend({
_setupFilter : function () {
var self = this;
- //TODO: This should be a mixin (same as Add Series searching)
+ //TODO: This should be a mixin (same as Add Movie searching)
this.ui.filter.keyup(function(e) {
if (_.contains([
9,
diff --git a/src/UI/ManualImport/Movie/SelectMovieRow.js b/src/UI/ManualImport/Movie/SelectMovieRow.js
index 38a2d5ca6..5708736bd 100644
--- a/src/UI/ManualImport/Movie/SelectMovieRow.js
+++ b/src/UI/ManualImport/Movie/SelectMovieRow.js
@@ -1,7 +1,7 @@
var Backgrid = require('backgrid');
module.exports = Backgrid.Row.extend({
- className : 'select-row select-series-row',
+ className : 'select-row select-movie-row',
events : {
'click' : '_onClick'
diff --git a/src/UI/ManualImport/manualimport.less b/src/UI/ManualImport/manualimport.less
index c1d7af5a2..2e80e5594 100644
--- a/src/UI/ManualImport/manualimport.less
+++ b/src/UI/ManualImport/manualimport.less
@@ -11,7 +11,7 @@
min-width : 80px;
}
- .has-series {
+ .has-movie {
.season-cell {
.clickable();
}
diff --git a/src/UI/Mixins/FileBrowser.js b/src/UI/Mixins/FileBrowser.js
index ddcbefabf..f98c27971 100644
--- a/src/UI/Mixins/FileBrowser.js
+++ b/src/UI/Mixins/FileBrowser.js
@@ -12,7 +12,7 @@ $.fn.fileBrowser = function(options) {
var inputGroup = $('
');
var inputGroupButton = $('
');
- var button = $('
');
+ var button = $('
');
if (input.parent('.input-group').length > 0) {
input.parent('.input-group').find('.input-group-btn').prepend(button);
diff --git a/src/UI/Movies/Delete/DeleteMovieTemplate.hbs b/src/UI/Movies/Delete/DeleteMovieTemplate.hbs
index 92e0aa1cc..bb765cd2f 100644
--- a/src/UI/Movies/Delete/DeleteMovieTemplate.hbs
+++ b/src/UI/Movies/Delete/DeleteMovieTemplate.hbs
@@ -29,8 +29,8 @@
-
-
+
+