Fixed: Multiple UI Fixes and Additions (#2894)

* Fixed: Misc UI Style Fixes and Cleanup

* Fixed: Change Icon names from Sonarr to Radarr

* Added: Search from Movies Index

src/UI/Activity/Blacklist/BlacklistActionsCell.js

@@ -12,8 +12,8 @@ module.exports = NzbDroneCell.extend({
 
     render : function() {
         this.$el.empty();
-        this.$el.html('<i class="icon-sonarr-info x-details"></i>' +
+        this.$el.html('<i class="icon-radarr-info x-details"></i>' +
-                      '<i class="icon-sonarr-delete x-delete"></i>');
+                      '<i class="icon-radarr-delete x-delete"></i>');
 
         return this;
     },

src/UI/Activity/Blacklist/BlacklistLayout.js

@@ -84,7 +84,7 @@ module.exports = Marionette.Layout.extend({
             items      : [
                 {
                     title   : 'Clear Blacklist',
-                    icon    : 'icon-sonarr-clear',
+                    icon    : 'icon-radarr-clear',
                     command : 'clearBlacklist'
                 }
             ]

src/UI/Activity/History/HistoryDetailsCell.js

@@ -10,7 +10,7 @@ module.exports = NzbDroneCell.extend({
 
     render : function() {
         this.$el.empty();
-        this.$el.html('<i class="icon-sonarr-info"></i>');
+        this.$el.html('<i class="icon-radarr-info"></i>');
 
         return this;
     },

src/UI/Activity/History/HistoryLayout.js

@@ -85,35 +85,35 @@ module.exports = Marionette.Layout.extend({
                     key      : 'all',
                     title    : '',
                     tooltip  : 'All',
-                    icon     : 'icon-sonarr-all',
+                    icon     : 'icon-radarr-all',
                     callback : this._setFilter
                 },
                 {
                     key      : 'grabbed',
                     title    : '',
                     tooltip  : 'Grabbed',
-                    icon     : 'icon-sonarr-downloading',
+                    icon     : 'icon-radarr-downloading',
                     callback : this._setFilter
                 },
                 {
                     key      : 'imported',
                     title    : '',
                     tooltip  : 'Imported',
-                    icon     : 'icon-sonarr-imported',
+                    icon     : 'icon-radarr-imported',
                     callback : this._setFilter
                 },
                 {
                     key      : 'failed',
                     title    : '',
                     tooltip  : 'Failed',
-                    icon     : 'icon-sonarr-download-failed',
+                    icon     : 'icon-radarr-download-failed',
                     callback : this._setFilter
                 },
                 {
                     key      : 'deleted',
                     title    : '',
                     tooltip  : 'Deleted',
-                    icon     : 'icon-sonarr-deleted',
+                    icon     : 'icon-radarr-deleted',
                     callback : this._setFilter
                 }
             ]

src/UI/Activity/Queue/QueueActionsCellTemplate.hbs

@@ -1,12 +1,12 @@
 {{#if_eq status compare="Completed"}}
     {{#if_eq trackedDownloadStatus compare="Warning"}}
-        <i class="icon-sonarr-import-manual x-manual-import" title="Manual import"></i>
+        <i class="icon-radarr-import-manual x-manual-import" title="Manual import"></i>
     {{/if_eq}}
 {{/if_eq}}
 
 {{#if_eq status compare="Pending"}}
-    <i class="icon-sonarr-download x-grab" title="Add to download queue (Override Delay Profile)"></i>
+    <i class="icon-radarr-download x-grab" title="Add to download queue (Override Delay Profile)"></i>
-    <i class="icon-sonarr-delete x-remove" title="Remove pending release"></i>
+    <i class="icon-radarr-delete x-remove" title="Remove pending release"></i>
 {{else}}
-    <i class="icon-sonarr-delete x-remove" title="Remove from download client"></i>
+    <i class="icon-radarr-delete x-remove" title="Remove from download client"></i>
 {{/if_eq}}

src/UI/Activity/Queue/QueueStatusCell.js

@@ -11,43 +11,43 @@ module.exports = NzbDroneCell.extend({
         if (this.cellValue) {
             var status = this.cellValue.get('status').toLowerCase();
             var trackedDownloadStatus = this.cellValue.has('trackedDownloadStatus') ? this.cellValue.get('trackedDownloadStatus').toLowerCase() : 'ok';
-            var icon = 'icon-sonarr-downloading';
+            var icon = 'icon-radarr-downloading';
             var title = 'Downloading';
             var itemTitle = this.cellValue.get('title');
             var content = itemTitle;
 
             if (status === 'paused') {
-                icon = 'icon-sonarr-paused';
+                icon = 'icon-radarr-paused';
                 title = 'Paused';
             }
 
             if (status === 'queued') {
-                icon = 'icon-sonarr-queued';
+                icon = 'icon-radarr-queued';
                 title = 'Queued';
             }
 
             if (status === 'completed') {
-                icon = 'icon-sonarr-downloaded';
+                icon = 'icon-radarr-downloaded';
                 title = 'Downloaded';
             }
 
             if (status === 'pending') {
-                icon = 'icon-sonarr-pending';
+                icon = 'icon-radarr-pending';
                 title = 'Pending';
             }
 
             if (status === 'failed') {
-                icon = 'icon-sonarr-download-failed';
+                icon = 'icon-radarr-download-failed';
                 title = 'Download failed';
             }
 
             if (status === 'warning') {
-                icon = 'icon-sonarr-download-warning';
+                icon = 'icon-radarr-download-warning';
                 title = 'Download warning: check download client for more details';
             }
 
             if (trackedDownloadStatus === 'warning') {
-                icon += ' icon-sonarr-warning';
+                icon += ' icon-radarr-warning';
 
                 this.templateFunction = Marionette.TemplateCache.get(this.template);
                 content = this.templateFunction(this.cellValue.toJSON());
@@ -55,10 +55,10 @@ module.exports = NzbDroneCell.extend({
 
             if (trackedDownloadStatus === 'error') {
                 if (status === 'completed') {
-                    icon = 'icon-sonarr-import-failed';
+                    icon = 'icon-radarr-import-failed';
                     title = 'Import failed: ' + itemTitle;
                 } else {
-                    icon = 'icon-sonarr-download-failed';
+                    icon = 'icon-radarr-download-failed';
                     title = 'Download failed';
                 }
 

src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs

@@ -31,7 +31,7 @@
                                 </label>
 
                                     <span class="help-inline-checkbox">
-                                        <i class="icon-sonarr-form-info" title="Do you want to blacklist this release?"/>
+                                        <i class="icon-radarr-form-info" title="Do you want to blacklist this release?"/>
                                     </span>
                                 </div>
                         </div>
@@ -42,7 +42,7 @@
         {{/if}}
     </div>
     <div class="modal-footer">
-        <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
+        <span class="indicator x-indicator"><i class="icon-radarr-spinner fa-spin"></i></span>
         <button class="btn" data-dismiss="modal">Cancel</button>
         <button class="btn btn-danger x-confirm-remove">Remove</button>
     </div>

src/UI/AddMovies/AddMoviesLayoutTemplate.hbs

@@ -2,19 +2,19 @@
 		<div class="col-md-12">
 				<div class="btn-group add-movies-btn-group btn-group-lg btn-block btn-group-collapse">
 						<button class="btn btn-default col-md-3 col-xs-12 x-bulk-import">
-                            <i class="icon-sonarr-view-list hidden-xs" aria-hidden="true"></i>
+                            <i class="icon-radarr-view-list hidden-xs" aria-hidden="true"></i>
                             Bulk Import Movies
                         </button>
 						<button type="button" class="btn btn-default col-md-4 col-xs-12 add-movies-import-btn x-discover">
-                            <i class="icon-sonarr-star hidden-xs" aria-hidden="true"></i>
+                            <i class="icon-radarr-star hidden-xs" aria-hidden="true"></i>
                             Discover New movies
                         </button>
 						<button class="btn btn-default col-md-2 col-xs-12 x-add-new">
-                            <i class="icon-sonarr-active hidden-xs" aria-hidden="true"></i>
+                            <i class="icon-radarr-active hidden-xs" aria-hidden="true"></i>
                             Add New Movie
                         </button>
 						<button class="btn btn-default col-md-3 col-xs-12 x-add-lists">
-                            <i class="icon-sonarr-active hidden-xs" aria-hidden="true"></i>
+                            <i class="icon-radarr-active hidden-xs" aria-hidden="true"></i>
                             Add Movies from Lists
                         </button>
 				</div>
@@ -40,7 +40,7 @@
 							</label>
 
 							<span class="help-inline-checkbox">
-                                <i class="icon-sonarr-form-info" title="Should Radarr display movies already in your collection?"></i>
+                                <i class="icon-radarr-form-info" title="Should Radarr display movies already in your collection?"></i>
 							</span>
 						</div>
 					</div>

src/UI/AddMovies/AddMoviesViewTemplate.hbs

@@ -25,7 +25,7 @@
 
 <div class="x-search-bar">
     <div class="input-group input-group-lg add-movies-search">
-        <span class="input-group-addon"><i class="icon-sonarr-search"/></span>
+        <span class="input-group-addon"><i class="icon-radarr-search"/></span>
 
         {{#if folder}}
         <input type="text" class="form-control x-movies-search" value="{{folder.name}}">
@@ -38,6 +38,6 @@
     <div id="search-result" class="result-list col-md-12"/>
 </div>
 <div class="btn btn-block text-center new-movies-loadmore x-load-more" style="display: none;">
-    <i class="icon-sonarr-load-more"/>
+    <i class="icon-radarr-load-more"/>
     more
 </div>

src/UI/AddMovies/BulkImport/BulkImportMovieTitleCell.js

@@ -2,7 +2,7 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 var BulkImportCollection = require("./BulkImportCollection");
 
 module.exports = NzbDroneCell.extend({
-		className : 'series-title-cell',
+		className : 'movie-title-cell',
 
         render : function() {
             var collection = this.model.collection;

src/UI/AddMovies/BulkImport/BulkImportView.js

@@ -130,14 +130,14 @@ module.exports = Marionette.Layout.extend({
 				items : [
 					{
 						title        : 'Add Selected',
-						icon         : 'icon-sonarr-add',
+						icon         : 'icon-radarr-add',
 						callback     : this._addSelected,
 						ownerContext : this,
 						className    : 'x-add-selected'
 					}//,
 					// {
 					// 	title        : 'Add All',
-					// 	icon         : 'icon-sonarr-add',
+					// 	icon         : 'icon-radarr-add',
 					// 	callback     : this._addAll,
 					// 	ownerContext : this,
 					// 	className    : 'x-add-all'

src/UI/AddMovies/BulkImport/MoviePathCell.js

@@ -1,7 +1,7 @@
 var TemplatedCell = require('../../Cells/TemplatedCell');
 
 module.exports = TemplatedCell.extend({
-		className : 'series-title-cell',
+		className : 'movie-title-cell',
 		template  : 'AddMovies/BulkImport/MoviePathTemplate',
 
 });

src/UI/AddMovies/BulkImport/TmdbIdCell.js

@@ -15,7 +15,7 @@ module.exports = NzbDroneCell.extend({
         render : function() {
             this.$el.empty();
 
-            this.$el.html('<i class="icon-sonarr-info hidden"></i><input type="text" class="x-tmdbId tmdbId-input form-control" value="' + this.cellValue.get('tmdbId') + '" />');
+            this.$el.html('<i class="icon-radarr-info hidden"></i><input type="text" class="x-tmdbId tmdbId-input form-control" value="' + this.cellValue.get('tmdbId') + '" />');
 
             return this;
         },
@@ -33,7 +33,7 @@ module.exports = NzbDroneCell.extend({
 
             field.prop("disabled", true);
 
-            var icon = this.$(".icon-sonarr-info");
+            var icon = this.$(".icon-radarr-info");
 
             icon.removeClass("hidden");
 

src/UI/AddMovies/List/AddFromListViewTemplate.hbs

@@ -9,7 +9,7 @@
 				<button class="btn btn-info x-fetch-list">Fetch List</button>
 			</div>
 			<div class="col-sm-2">
-				<button class="btn btn-success x-import-selected"><i class="icon-sonarr-add"></i> Import Selected</button>
+				<button class="btn btn-success x-import-selected"><i class="icon-radarr-add"></i> Import Selected</button>
 			</div>
 	</div>
 </div>

src/UI/AddMovies/RootFolders/RootFolderItemViewTemplate.hbs

@@ -5,5 +5,5 @@
     <span>{{Bytes freeSpace}}</span>
 </td>
 <td class="col-md-1">
-    <i class="icon-sonarr-delete x-delete"></i>
+    <i class="icon-radarr-delete x-delete"></i>
 </td>

src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs

@@ -13,9 +13,9 @@
                 <div class="col-md-12">
 
                     <div class="input-group">
-                        <span class="input-group-addon">&nbsp;<i class="icon-sonarr-folder-open"></i></span>
+                        <span class="input-group-addon">&nbsp;<i class="icon-radarr-folder-open"></i></span>
                         <input class="form-control x-path" type="text" validation-name="path" placeholder="Enter path to folder that contains your movies">
-                        <span class="input-group-btn"><button class="btn btn-success x-add"><i class="icon-sonarr-ok"/></button></span>
+                        <span class="input-group-btn"><button class="btn btn-success x-add"><i class="icon-radarr-ok"/></button></span>
                     </div>
                 </div>
             </div>

src/UI/AddMovies/SearchResultView.js

@@ -236,7 +236,7 @@ var view = Marionette.ItemView.extend({
             Messenger.show({
                 message        : 'Added: ' + self.model.get('title'),
                 actions        : {
-                    goToSeries : {
+                    goToMovie : {
                         label  : 'Go to Movie',
                         action : function() {
                             Backbone.history.navigate('/movies/' + self.model.get('titleSlug'), { trigger : true });

src/UI/AddMovies/SearchResultViewTemplate.hbs

@@ -56,7 +56,7 @@
                     {{/unless}}
 
                     <div class="form-group col-md-2">
-                        <label>Monitor <i class="icon-sonarr-form-info monitor-tooltip x-monitor-tooltip"></i></label>
+                        <label>Monitor <i class="icon-radarr-form-info monitor-tooltip x-monitor-tooltip"></i></label>
                         <select class="form-control col-md-2 x-monitor">
                             <option value="all">Yes</option>
                             {{!--<option value="missing">Missing</option>--}}
@@ -65,7 +65,7 @@
                     </div>
 
 		    <div class="form-group col-md-2">
-		        <label>Min Availability <i class="icon-sonarr-form-info minimumavailability-tooltip x-minimumavailability-tooltip"></i></label>
+		        <label>Min Availability <i class="icon-radarr-form-info minimumavailability-tooltip x-minimumavailability-tooltip"></i></label>
 			<select class="form-control col-md-2 x-minimumavailability">
 			    <option value="announced">Announced</option>
 			    <option value="inCinemas">In Cinemas</option>
@@ -101,15 +101,15 @@
                         <label style="visibility: hidden">Add</label>
                         <div class="btn-group">
                             <button class="btn btn-success add x-add" title="Add">
-                                <i class="icon-sonarr-add"></i>
+                                <i class="icon-radarr-add"></i>
                             </button>
 
                             <button class="btn btn-success add x-add-search" title="Add and Search for movie">
-                                <i class="icon-sonarr-search"></i>
+                                <i class="icon-radarr-search"></i>
                             </button>
 
                             <button class="btn btn-warning ignore x-ignore" title="Ignore this movie, so it does not show up anymore">
-                                <i class="icon-sonarr-ignore"></i>
+                                <i class="icon-radarr-ignore"></i>
                             </button>
                         </div>
                     </div>

src/UI/Calendar/CalendarFeedViewTemplate.hbs

@@ -3,7 +3,7 @@
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 				<h3>Radarr Calendar feed</h3>
 		</div>
-		<div class="modal-body edit-series-modal">
+		<div class="modal-body edit-movie-modal">
 				<div class="form-horizontal">
 						<div class="form-group">
 								<label class="col-sm-3 control-label">Include Unmonitored</label>
@@ -27,7 +27,7 @@
 								<label class="col-sm-3 control-label">Tags</label>
 
 								<div class="col-sm-1 col-sm-push-5 help-inline">
-										<i class="icon-sonarr-form-info" title="One or more tags only show matching series" />
+										<i class="icon-radarr-form-info" title="One or more tags only show matching series" />
 								</div>
 
 								<div class="col-sm-5 col-sm-pull-1">
@@ -37,14 +37,14 @@
 						<div class="form-group">
 								<label class="col-sm-3 control-label">iCal feed</label>
 								<div class="col-sm-1 col-sm-push-8 help-inline">
-										<i class="icon-sonarr-form-info" title="Copy this url into your clients subscription form or use the subscribe button if your browser support webcal" />
+										<i class="icon-radarr-form-info" title="Copy this url into your clients subscription form or use the subscribe button if your browser support webcal" />
 								</div>
 								<div class="col-sm-8 col-sm-pull-1">
 										<div class="input-group ical-url">
 												<input type="text" class="form-control x-ical-url" readonly="readonly" />
 												<div class="input-group-btn">
-														<button class="btn btn-icon-only x-ical-copy"><i class="icon-sonarr-copy"></i></button>
+														<button class="btn btn-icon-only x-ical-copy"><i class="icon-radarr-copy"></i></button>
-														<button class="btn btn-icon-only no-router x-ical-webcal" title="Subscribe" target="_blank"><i class="icon-sonarr-calendar-o"></i></button>
+														<button class="btn btn-icon-only no-router x-ical-webcal" title="Subscribe" target="_blank"><i class="icon-radarr-calendar-o"></i></button>
 												</div>
 										</div>
 								</div>

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
                 }
             ]

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

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('<i class="icon-sonarr-form-danger"/>');
+        this.$el.html('<i class="icon-radarr-form-danger"/>');
 
         this.$el.popover({
             content   : html,

src/UI/Cells/DeleteEpisodeFileCell.js

@@ -10,7 +10,7 @@ module.exports = Backgrid.Cell.extend({
 
     render : function() {
         this.$el.empty();
-        this.$el.html('<i class="icon-sonarr-delete" title="Delete episode file from disk"></i>');
+        this.$el.html('<i class="icon-radarr-delete" title="Delete episode file from disk"></i>');
 
         return this;
     },

src/UI/Cells/EditionCell.js

@@ -22,9 +22,9 @@ module.exports = Backgrid.Cell.extend({
 
         //var html = this.templateFunction(edition);
         if (cut) {
-          this.$el.html('<i class="icon-sonarr-form-cut"/ title="{0}">'.format(edition));
+          this.$el.html('<i class="icon-radarr-form-cut"/ title="{0}">'.format(edition));
         } else {
-          this.$el.html('<i class="icon-sonarr-form-special"/ title="{0}">'.format(edition));
+          this.$el.html('<i class="icon-radarr-form-special"/ title="{0}">'.format(edition));
         }
 
         /*this.$el.popover({

src/UI/Cells/EpisodeActionsCell.js

@@ -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('<i class="icon-sonarr-search x-automatic-search" title="Automatic Search"></i>' + '<i class="icon-sonarr-search-manual x-manual-search" title="Manual Search"></i>');
-
-        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'
-        });
-    }
-});

src/UI/Cells/EpisodeMonitoredCell.js

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

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

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-edit'    : '_editMovie',
-        'click .x-refresh' : '_refreshSeries'
+        'click .x-refresh' : '_refreshMovie',
+        'click .x-search'  : '_searchMovie'
     },
 
     render : function() {
         this.$el.empty();
 
-        this.$el.html('<i class="icon-sonarr-refresh x-refresh hidden-xs" title="" data-original-title="Update movie info and scan disk"></i> ' +
+        this.$el.html('<i class="icon-radarr-refresh x-refresh hidden-xs" title="" data-original-title="Update movie info and scan disk"></i> ' +
-                      '<i class="icon-sonarr-edit x-edit" title="" data-original-title="Edit Movie"></i>');
+                      '<i class="icon-radarr-edit x-edit" title="" data-original-title="Edit Movie"></i> ' +
+                      '<i class="icon-radarr-search x-search" title="" data-original-title="Search Movie"></i>');
 
         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]
+        });
     }
 });

src/UI/Cells/MovieLinksTemplate.hbs

@@ -1,4 +1,4 @@
-<span class="series-info-links">
+<span class="movie-info-links">
     {{#if tmdbId}}
         <a href="{{traktUrl}}" class="label label-primary">Trakt</a>
     {{/if}}

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

src/UI/Cells/MovieStatusCell.js

@@ -14,16 +14,16 @@ module.exports = NzbDroneCell.extend({
 
 
         if (status === 'released') {
-		  this.$el.html('<i class="icon-sonarr-movie-released grid-icon" title="Released"></i>');
+		  this.$el.html('<i class="icon-radarr-movie-released grid-icon" title="Released"></i>');
 		  this._setStatusWeight(3);
 		}
         if (status === 'inCinemas') {
-          this.$el.html('<i class="icon-sonarr-movie-cinemas grid-icon" title="In Cinemas"></i>');
+          this.$el.html('<i class="icon-radarr-movie-cinemas grid-icon" title="In Cinemas"></i>');
           this._setStatusWeight(2);
         }
 
         if (status === "announced") {
-          this.$el.html('<i class="icon-sonarr-movie-announced grid-icon" title="Announced"></i>');
+          this.$el.html('<i class="icon-radarr-movie-announced grid-icon" title="Announced"></i>');
           this._setStatusWeight(1);
         }
 

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('<div class="released-banner"><i class="icon-sonarr-movie-released grid-icon" title=""></i>&nbsp;Released</div>');
+            this.$el.html('<div class="released-banner"><i class="icon-radarr-movie-released grid-icon" title=""></i>&nbsp;Released</div>');
             this._setStatusWeight(3);
         }
 
         if (status ==='inCinemas') {
-            this.$el.html('<div class="cinemas-banner"><i class="icon-sonarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas</div>');
+            this.$el.html('<div class="cinemas-banner"><i class="icon-radarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas</div>');
             this._setStatusWeight(2);
         }
 
         if (status === "announced") {
-            this.$el.html('<div class="announced-banner"><i class="icon-sonarr-movie-announced grid-icon" title=""></i>&nbsp;Announced</div>');
+            this.$el.html('<div class="announced-banner"><i class="icon-radarr-movie-announced grid-icon" title=""></i>&nbsp;Announced</div>');
             this._setStatusWeight(1);
         }
 

src/UI/Cells/MovieTitleCell.js

@@ -1,7 +1,7 @@
 var TemplatedCell = require('./TemplatedCell');
 
 module.exports = TemplatedCell.extend({
-    className : 'series-title-cell',
+    className : 'movie-title-cell',
-    template  : 'Cells/SeriesTitleTemplate',
+    template  : 'Cells/MovieTitleTemplate',
 
 });

src/UI/Cells/SeriesActionsCell.js

@@ -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('<i class="icon-sonarr-refresh x-refresh hidden-xs" title="" data-original-title="Update series info and scan disk"></i> ' +
-                      '<i class="icon-sonarr-edit x-edit" title="" data-original-title="Edit Series"></i>');
-
-        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
-        });
-    }
-});

src/UI/Cells/SeriesStatusCell.js

@@ -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('<i class="icon-sonarr-series-ended grid-icon" title="Ended"></i>');
-            this._setStatusWeight(3);
-        }
-
-        else if (!monitored) {
-            this.$el.html('<i class="icon-sonarr-series-unmonitored grid-icon" title="Not Monitored"></i>');
-            this._setStatusWeight(2);
-        }
-
-        else {
-            this.$el.html('<i class="icon-sonarr-series-continuing grid-icon" title="Continuing"></i>');
-            this._setStatusWeight(1);
-        }
-
-        return this;
-    },
-
-    _setStatusWeight : function(weight) {
-        this.model.set('statusWeight', weight, { silent : true });
-    }
-});

src/UI/Cells/SeriesTitleCell.js

@@ -1,6 +0,0 @@
-var TemplatedCell = require('./TemplatedCell');
-
-module.exports = TemplatedCell.extend({
-    className : 'series-title-cell',
-    template  : 'Cells/SeriesTitleTemplate'
-});

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 {
+.movie-actions-cell {
-  width     : 56px;
+  width     : 84px;
-  min-width : 56px;
+  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;
 }

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;

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

src/UI/Content/navbar.less

@@ -21,7 +21,7 @@
     margin-bottom : 1px;
   }
 
-  .icon-sonarr-navbar-icon  {
+  .icon-radarr-navbar-icon  {
     display: inline;
   }
   

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;

src/UI/Form/CaptchaTemplate.hbs

@@ -4,12 +4,12 @@
     <div class="col-sm-5">
         <div class="input-group">
             <input type="text" name="fields.{{order}}.value" validation-name="{{name}}" spellcheck="false" class="form-control x-captcha" readonly placeholder="(optional)" />
-            <span class="input-group-btn"><button class="btn btn-primary x-captcha-refresh" title="Refresh CAPTCHA Token"><i class="icon-sonarr-refresh" /></button></span>
+            <span class="input-group-btn"><button class="btn btn-primary x-captcha-refresh" title="Refresh CAPTCHA Token"><i class="icon-radarr-refresh" /></button></span>
         </div>
     </div>
 
     <span class="col-sm-1 help-inline">
-        <i class="icon-sonarr-form-warning" title="Expires periodically and will need to be refreshed."/>
+        <i class="icon-radarr-form-warning" title="Expires periodically and will need to be refreshed."/>
-        <i class="icon-sonarr-form-warning" title="Refreshing the CAPTCHA Token will embed a temporary Google reCaptcha widget on this page."/>
+        <i class="icon-radarr-form-warning" title="Refreshing the CAPTCHA Token will embed a temporary Google reCaptcha widget on this page."/>
     </span>
 </div>

src/UI/Form/CheckboxTemplate.hbs

@@ -15,7 +15,7 @@
 
             {{#if helpText}}
                 <span class="help-inline-checkbox">
-                    <i class="icon-sonarr-form-info" title="{{helpText}}"/>
+                    <i class="icon-radarr-form-info" title="{{helpText}}"/>
                 </span>
             {{/if}}
         </div>

src/UI/Form/FormHelpPartial.hbs

@@ -1,8 +1,8 @@
 <span class="col-sm-1 help-inline">
     {{#if helpText}}
-        <i class="icon-sonarr-form-info" title="{{helpText}}"/>
+        <i class="icon-radarr-form-info" title="{{helpText}}"/>
     {{/if}}
     {{#if helpLink}}
-        <a href="{{helpLink}}" class="help-link"><i class="icon-sonarr-form-info-link"/></a>
+        <a href="{{helpLink}}" class="help-link"><i class="icon-radarr-form-info-link"/></a>
     {{/if}}
 </span>

src/UI/Handlebars/Helpers/Movie.js

@@ -15,20 +15,20 @@ Handlebars.registerHelper('GetStatus', function() {
   
   
     if (status === "announced") {
-      return new Handlebars.SafeString('<i class="icon-sonarr-movie-announced grid-icon" title=""></i>&nbsp;Announced');
+      return new Handlebars.SafeString('<i class="icon-radarr-movie-announced grid-icon" title=""></i>&nbsp;Announced');
     }
   
   
     if (status ==="inCinemas") {
-      return new Handlebars.SafeString('<i class="icon-sonarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas');
+      return new Handlebars.SafeString('<i class="icon-radarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas');
     }
   
     if (status === 'released') {
-        return new Handlebars.SafeString('<i class="icon-sonarr-movie-released grid-icon" title=""></i>&nbsp;Released');
+        return new Handlebars.SafeString('<i class="icon-radarr-movie-released grid-icon" title=""></i>&nbsp;Released');
     }
   
     if (!monitored) {
-        return new Handlebars.SafeString('<i class="icon-sonarr-series-unmonitored grid-icon" title=""></i>&nbsp;Not Monitored');
+        return new Handlebars.SafeString('<i class="icon-radarr-series-unmonitored grid-icon" title=""></i>&nbsp;Not Monitored');
     }
   });
 
@@ -76,14 +76,14 @@ Handlebars.registerHelper('poster', function() {
 
     if (poster[0]) {
         if (!poster[0].url.match(/^https?:\/\//)) {
-            return new Handlebars.SafeString('<img class="series-poster x-series-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, poster[0].url, 250)));
+            return new Handlebars.SafeString('<img class="movie-poster x-movie-poster" {0}>'.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('<img class="series-poster x-series-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, url)));
+            return new Handlebars.SafeString('<img class="movie-poster x-movie-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, url)));
         }
     }
 
-    return new Handlebars.SafeString('<img class="series-poster placeholder-image" src="{0}">'.format(placeholder));
+    return new Handlebars.SafeString('<img class="movie-poster placeholder-image" src="{0}">'.format(placeholder));
 });
 
 Handlebars.registerHelper('remotePoster', function() {
@@ -92,14 +92,14 @@ Handlebars.registerHelper('remotePoster', function() {
 
   if (poster) {
       if (!poster.match(/^https?:\/\//)) {
-          return new Handlebars.SafeString('<img class="series-poster x-series-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, poster, 250)));
+          return new Handlebars.SafeString('<img class="movie-poster x-movie-poster" {0}>'.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('<img class="series-poster x-series-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, url)));
+          return new Handlebars.SafeString('<img class="movie-poster x-movie-poster" {0}>'.format(Handlebars.helpers.defaultImg.call(null, url)));
       }
   }
 
-  return new Handlebars.SafeString('<img class="series-poster placeholder-image" src="{0}">'.format(placeholder));
+  return new Handlebars.SafeString('<img class="movie-poster placeholder-image" src="{0}">'.format(placeholder));
 });
 
 Handlebars.registerHelper('traktUrl', function() {
@@ -152,14 +152,14 @@ Handlebars.registerHelper('GetBannerStatus', function() {
 
 
   if (status === "inCinemas") {
-    return new Handlebars.SafeString('<div class="cinemas-banner"><i class="icon-sonarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas</div>');
+    return new Handlebars.SafeString('<div class="cinemas-banner"><i class="icon-radarr-movie-cinemas grid-icon" title=""></i>&nbsp;In Cinemas</div>');
   }
 
   if (status === "announced") {
-    return new Handlebars.SafeString('<div class="announced-banner"><i class="icon-sonarr-movie-announced grid-icon" title=""></i>&nbsp;Announced</div>');
+    return new Handlebars.SafeString('<div class="announced-banner"><i class="icon-radarr-movie-announced grid-icon" title=""></i>&nbsp;Announced</div>');
   }
   else if (!monitored) {
-      return new Handlebars.SafeString('<div class="announced-banner"><i class="icon-sonarr-series-unmonitored grid-icon" title=""></i>&nbsp;Not Monitored</div>');
+      return new Handlebars.SafeString('<div class="announced-banner"><i class="icon-radarr-series-unmonitored grid-icon" title=""></i>&nbsp;Not Monitored</div>');
   }
 });
 

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'

src/UI/ManualImport/Folder/SelectFolderViewTemplate.hbs

@@ -31,12 +31,12 @@
     <div class="buttons">
         <div class="row">
             <div class="col-md-4 col-md-offset-4">
-                <button class="btn btn-primary btn-lg btn-block x-automatic-import x-button"><i class="icon-sonarr-search-automatic"></i> Import File(s) Automatically</button>
+                <button class="btn btn-primary btn-lg btn-block x-automatic-import x-button"><i class="icon-radarr-search-automatic"></i> Import File(s) Automatically</button>
             </div>
         </div>
         <div class="row">
             <div class="col-md-4 col-md-offset-4">
-                <button class="btn btn-primary btn-lg btn-block x-manual-import x-button"><i class="icon-sonarr-search-manual"></i> Manual Import</button>
+                <button class="btn btn-primary btn-lg btn-block x-manual-import x-button"><i class="icon-radarr-search-manual"></i> Manual Import</button>
             </div>
         </div>
     </div>

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) {
+                if (movie) {
-                    return series.sortTitle;
+                    return movie.sortTitle;
                 }
 
                 return '';

src/UI/ManualImport/ManualImportLayout.js

@@ -67,7 +67,7 @@ module.exports = Marionette.Layout.extend({
         },
         {
             name       : 'rejections',
-            label      : '<i class="icon-sonarr-header-rejections" />',
+            label      : '<i class="icon-radarr-header-rejections" />',
             tooltip    : 'Rejections',
             cell       : ApprovalStatusCell,
             sortable   : false,

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,

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'

src/UI/ManualImport/manualimport.less

@@ -11,7 +11,7 @@
     min-width : 80px;
   }
 
-  .has-series {
+  .has-movie {
     .season-cell {
       .clickable();
     }

src/UI/Mixins/FileBrowser.js

@@ -12,7 +12,7 @@ $.fn.fileBrowser = function(options) {
         var inputGroup = $('<div class="input-group"></div>');
         var inputGroupButton = $('<span class="input-group-btn"></span>');
 
-        var button = $('<button class="btn btn-primary x-file-browser" title="Browse"><i class="icon-sonarr-folder-open"/></button>');
+        var button = $('<button class="btn btn-primary x-file-browser" title="Browse"><i class="icon-radarr-folder-open"/></button>');
 
         if (input.parent('.input-group').length > 0) {
             input.parent('.input-group').find('.input-group-btn').prepend(button);

src/UI/Movies/Delete/DeleteMovieTemplate.hbs

@@ -29,8 +29,8 @@
                                 </label>
 
                                     <span class="help-inline-checkbox">
-                                        <i class="icon-sonarr-form-info" title="Do you want to delete all files from disk?"/>
+                                        <i class="icon-radarr-form-info" title="Do you want to delete all files from disk?"/>
-                                        <i class="icon-sonarr-form-warning" title="This option is irreversible, use with extreme caution"/>
+                                        <i class="icon-radarr-form-warning" title="This option is irreversible, use with extreme caution"/>
                                     </span>
                                 </div>
                         </div>
@@ -57,8 +57,8 @@
                                 </label>
 
                                     <span class="help-inline-checkbox">
-                                        <i class="icon-sonarr-form-info" title="Do you want to prevent this movie from being readded during Automatic List syncing?"/>
+                                        <i class="icon-radarr-form-info" title="Do you want to prevent this movie from being readded during Automatic List syncing?"/>
-                                        <i class="icon-sonarr-form-info" title="Movies can be removed from the exclusions list via Lists tab in Settings"/>
+                                        <i class="icon-radarr-form-info" title="Movies can be removed from the exclusions list via Lists tab in Settings"/>
                                     </span>
                                 </div>
                         </div>
@@ -69,7 +69,7 @@
         </div>
     </div>
     <div class="modal-footer">
-        <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
+        <span class="indicator x-indicator"><i class="icon-radarr-spinner fa-spin"></i></span>
         <button class="btn" data-dismiss="modal">Cancel</button>
         <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>

src/UI/Movies/Delete/DeleteMovieView.js

@@ -5,7 +5,7 @@ module.exports = Marionette.ItemView.extend({
     template : 'Movies/Delete/DeleteMovieTemplate',
 
     events : {
-        'click .x-confirm-delete' : 'removeSeries',
+        'click .x-confirm-delete' : 'removeMovie',
         'change .x-delete-files'  : 'changeDeletedFiles'
     },
 
@@ -16,7 +16,7 @@ module.exports = Marionette.ItemView.extend({
         addExclusion    : '.x-add-exclusion'
     },
 
-    removeSeries : function() {
+    removeMovie : function() {
         var self = this;
         var deleteFiles = this.ui.deleteFiles.prop('checked');
         var addExclusion = this.ui.addExclusion.prop('checked');
@@ -27,7 +27,7 @@ module.exports = Marionette.ItemView.extend({
                      'addExclusion' : addExclusion },
             wait : true
         }).done(function() {
-            vent.trigger(vent.Events.SeriesDeleted, { series : self.model });
+            vent.trigger(vent.Events.MovieDeleted, { series : self.model });
             vent.trigger(vent.Commands.CloseModalCommand);
         });
     },

src/UI/Movies/Details/InfoViewTemplate.hbs

@@ -25,7 +25,7 @@
         <span class="label label-{{DownloadedStatusColor}}" title="{{DownloadedQuality}}">{{DownloadedStatus}}</span>
     </div>
     <div class="col-md-4">
-        <span class="series-info-links">
+        <span class="movie-info-links">
             <a href="{{traktUrl}}" class="label label-primary">Trakt</a>
             <a href="{{tmdbUrl}}" class="label label-primary">The Movie DB</a>
 

src/UI/Movies/Details/MoviesDetailsLayout.js

@@ -186,15 +186,15 @@ module.exports = Marionette.Layout.extend({
 				var monitored = this.model.get('monitored');
 
 				this.ui.monitored.removeAttr('data-idle-icon');
-				this.ui.monitored.removeClass('fa-spin icon-sonarr-spinner');
+				this.ui.monitored.removeClass('fa-spin icon-radarr-spinner');
 
 				if (monitored) {
-						this.ui.monitored.addClass('icon-sonarr-monitored');
+						this.ui.monitored.addClass('icon-radarr-monitored');
-						this.ui.monitored.removeClass('icon-sonarr-unmonitored');
+						this.ui.monitored.removeClass('icon-radarr-unmonitored');
 						this.$el.removeClass('movie-not-monitored');
 				} else {
-						this.ui.monitored.addClass('icon-sonarr-unmonitored');
+						this.ui.monitored.addClass('icon-radarr-unmonitored');
-						this.ui.monitored.removeClass('icon-sonarr-monitored');
+						this.ui.monitored.removeClass('icon-radarr-monitored');
 						this.$el.addClass('movie-not-monitored');
 				}
 		},

src/UI/Movies/Details/MoviesDetailsTemplate.hbs

@@ -10,19 +10,19 @@
                 Click to head on over there and tell us whether this is correct or not.">{{secondaryYear}}</span></a>{{/if}})</span>
                 <div class="movie-actions pull-right">
                     <div class="x-refresh">
-                        <i class="icon-sonarr-refresh icon-can-spin" title="Update movie info and scan disk"/>
+                        <i class="icon-radarr-refresh icon-can-spin" title="Update movie info and scan disk"/>
                     </div>
                     <div class="x-rename">
-                        <i class="icon-sonarr-rename" title="Preview rename for movie"/>
+                        <i class="icon-radarr-rename" title="Preview rename for movie"/>
                     </div>
                     <div class="x-search">
-                        <i class="icon-sonarr-search" title="Search for movie"/>
+                        <i class="icon-radarr-search" title="Search for movie"/>
                     </div>
                     <div class="x-manual-search">
-                      <i class="icon-sonarr-search-manual" title="Manual Search"/>
+                      <i class="icon-radarr-search-manual" title="Manual Search"/>
                     </div>
                     <div class="x-edit">
-                        <i class="icon-sonarr-edit" title="Edit movie"/>
+                        <i class="icon-radarr-edit" title="Edit movie"/>
                     </div>
                 </div>
             </h1>

src/UI/Movies/Edit/EditMovieTemplate.hbs

@@ -3,7 +3,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>{{title}}</h3>
     </div>
-    <div class="modal-body edit-series-modal">
+    <div class="modal-body edit-movie-modal">
         <div class="row">
             <div class="col-sm-3 hidden-xs">
                 {{poster}}
@@ -27,7 +27,7 @@
                                 </label>
 
                                 <span class="help-inline-checkbox">
-                                    <i class="icon-sonarr-form-info" title="Should Radarr download the movie?"/>
+                                    <i class="icon-radarr-form-info" title="Should Radarr download the movie?"/>
                                 </span>
                             </div>
                         </div>
@@ -35,7 +35,7 @@
 		    <div class="form-group">
 		        <label class="col-sm-4 control-label">Minimum Availability</label>
 			<div class="col-sm-1 col-sm-push-4 help-inline">
-			    <i class="icon-sonarr-form-info" title="When the movie is considered Available"/>
+			    <i class="icon-radarr-form-info" title="When the movie is considered Available"/>
 			</div>
 			<div class="col-sm-4 col-sm-pull-1">
 			        <select class="form-control x-minimumavailability" name="minimumAvailability">
@@ -64,7 +64,7 @@
                                 </label>
 
                                 <span class="help-inline-checkbox">
-                                    <i class="icon-sonarr-form-info" title="Should movie path stay static or should it change on each disk scan according to your naming config? Note: Auto Rename Folders under Settings -&gt; Media Management must be enabled too."/>
+                                    <i class="icon-radarr-form-info" title="Should movie path stay static or should it change on each disk scan according to your naming config? Note: Auto Rename Folders under Settings -&gt; Media Management must be enabled too."/>
                                 </span>
                             </div>
                         </div>
@@ -106,7 +106,7 @@
     <div class="modal-footer">
         <button class="btn btn-danger pull-left x-remove">Delete</button>
 
-        <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
+        <span class="indicator x-indicator"><i class="icon-radarr-spinner fa-spin"></i></span>
         <button class="btn" data-dismiss="modal">Cancel</button>
         <button class="btn btn-primary x-save">Save</button>
     </div>

src/UI/Movies/Editor/Delete/DeleteSelectedTemplate.hbs

@@ -20,8 +20,8 @@
                                     <div class="btn slide-button btn-danger"></div>
                                 </label>
                                 <span class="help-inline-checkbox">
-                                    <i class="icon-sonarr-form-info" title="Do you want to delete all files from disk?"></i>
+                                    <i class="icon-radarr-form-info" title="Do you want to delete all files from disk?"></i>
-                                    <i class="icon-sonarr-form-warning" title="This option is irreversible, use with extreme caution!"></i>
+                                    <i class="icon-radarr-form-warning" title="This option is irreversible, use with extreme caution!"></i>
                                 </span>
                             </div>
                         </div>
@@ -44,8 +44,8 @@
                                     <div class="btn slide-button btn-danger"></div>
                                 </label>
                                 <span class="help-inline-checkbox">
-                                    <i class="icon-sonarr-form-info" title="Do you want to prevent these movies from being read during automatic list syncing?"></i>
+                                    <i class="icon-radarr-form-info" title="Do you want to prevent these movies from being read during automatic list syncing?"></i>
-                                    <i class="icon-sonarr-form-info" title="Movies can be removed from the exclusions list via the lists tab in settings."></i>
+                                    <i class="icon-radarr-form-info" title="Movies can be removed from the exclusions list via the lists tab in settings."></i>
                                 </span>
                             </div>
                         </div>
@@ -57,7 +57,7 @@
     </div>
     <div class="modal-footer">
         <span class="indicator x-indicator">
-            <i class="icon-sonarr-spinner fa-spin" aria-hidden="true"></i>
+            <i class="icon-radarr-spinner fa-spin" aria-hidden="true"></i>
         </span>
         <button class="btn" data-dismiss="modal">Cancel</button>
         <button class="btn btn-danger x-confirm-delete">Delete</button>

src/UI/Movies/Editor/Delete/DeleteSelectedView.js

@@ -6,7 +6,7 @@ module.exports = Marionette.ItemView.extend({
     template : 'Movies/Editor/Delete/DeleteSelectedTemplate',
 
     events : {
-        'click .x-confirm-delete' : 'removeSeries',
+        'click .x-confirm-delete' : 'removeMovie',
         'change .x-delete-files'  : 'changeDeletedFiles'
     },
 
@@ -27,7 +27,7 @@ module.exports = Marionette.ItemView.extend({
         };
     },
 
-    removeSeries : function() {
+    removeMovie : function() {
         var self = this;
         var deleteFiles = this.ui.deleteFiles.prop('checked');
         var addExclusion = this.ui.addExclusion.prop('checked');
@@ -43,7 +43,7 @@ module.exports = Marionette.ItemView.extend({
         });
 
         proxy.save().done(function() {
-            //vent.trigger(vent.Events.SeriesDeleted, { series : self.model });
+            //vent.trigger(vent.Events.MovieDeleted, { series : self.model });
             vent.trigger(vent.Commands.CloseModalCommand);
         });
     },

src/UI/Movies/Editor/MovieEditorFooterView.js

@@ -18,7 +18,7 @@ module.exports = Marionette.ItemView.extend({
         staticPath        : '.x-static-path',
         rootFolder          : '.x-root-folder',
         selectedCount       : '.x-selected-count',
-        container           : '.series-editor-footer',
+        container           : '.movie-editor-footer',
         actions             : '.x-action'
     },
 

src/UI/Movies/Editor/MovieEditorFooterViewTemplate.hbs

@@ -1,4 +1,4 @@
-<div class="series-editor-footer">
+<div class="movie-editor-footer">
     <div class="row">
         <div class="form-group col-md-1">
             <label>Monitored</label>

src/UI/Movies/Editor/MovieEditorLayout.js

@@ -22,7 +22,7 @@ module.exports = Marionette.Layout.extend({
     template : 'Movies/Editor/MovieEditorLayoutTemplate',
 
     regions : {
-        seriesRegion : '#x-series-editor',
+        moviesRegion : '#x-movie-editor',
         toolbar      : '#x-toolbar',
         pagerTop : "#x-movie-pager-top",
         pager : "#x-movie-pager"
@@ -51,8 +51,8 @@ module.exports = Marionette.Layout.extend({
             name       : 'monitored',
             label      : '',
             cell       : MovieMonitoredCell,
-            trueClass  : 'icon-sonarr-monitored',
+            trueClass  : 'icon-radarr-monitored',
-            falseClass : 'icon-sonarr-unmonitored',
+            falseClass : 'icon-radarr-unmonitored',
             tooltip    : 'Toggle movie monitored status',
             sortable   : false
         },
@@ -111,7 +111,7 @@ module.exports = Marionette.Layout.extend({
                 items      : [
                 {
                     title          : 'Update library',
-                    icon           : 'icon-sonarr-refresh',
+                    icon           : 'icon-radarr-refresh',
                     command        : 'refreshmovie',
                     successMessage : 'Library was updated!',
                     errorMessage   : 'Library update failed!'
@@ -124,13 +124,13 @@ module.exports = Marionette.Layout.extend({
                 },
 				{
                     title : 'Select All',
-                    icon : 'icon-sonarr-checked',
+                    icon : 'icon-radarr-checked',
                     className: 'btn-primary',
                     callback : this._selectAll
                 },
 				{
                     title : 'Unselect All',
-                    icon : 'icon-sonarr-unchecked',
+                    icon : 'icon-radarr-unchecked',
                     className: 'btn-primary',
                     callback : this._unselectAll
                 }
@@ -143,56 +143,56 @@ module.exports = Marionette.Layout.extend({
         this.filteringOptions = {
             type          : 'radio',
             storeState    : false,
-            menuKey       : 'serieseditor.filterMode',
+            menuKey       : 'movieeditor.filterMode',
             defaultAction : 'all',
             items         : [
                 {
                     key      : 'all',
                     title    : '',
                     tooltip  : 'All',
-                    icon     : 'icon-sonarr-all',
+                    icon     : 'icon-radarr-all',
                     callback : this._setFilter
                 },
                 {
                     key      : 'monitored',
                     title    : '',
                     tooltip  : 'Monitored Only',
-                    icon     : 'icon-sonarr-monitored',
+                    icon     : 'icon-radarr-monitored',
                     callback : this._setFilter
                 },
                 {
                     key      : 'unmonitored',
                     title    : '',
                     tooltip  : 'UnMonitored Only',
-                    icon     : 'icon-sonarr-unmonitored',
+                    icon     : 'icon-radarr-unmonitored',
                     callback : this._setFilter
                 },
 		        {
                     key      : 'missing',
                     title    : '',
                     tooltip  : 'Missing Only',
-                    icon     : 'icon-sonarr-missing',
+                    icon     : 'icon-radarr-missing',
                     callback : this._setFilter
                 },
                 {
                     key      : 'released',
                     title    : '',
                     tooltip  : 'Released',
-                    icon     : 'icon-sonarr-movie-released',
+                    icon     : 'icon-radarr-movie-released',
                     callback : this._setFilter
                 },
                 {
                     key      : 'announced',
                     title    : '',
                     tooltip  : 'Announced',
-                    icon     : 'icon-sonarr-movie-announced',
+                    icon     : 'icon-radarr-movie-announced',
                     callback : this._setFilter
                 },
                 {
                     key      : 'cinemas',
                     title    : '',
                     tooltip  : 'In Cinemas',
-                    icon     : 'icon-sonarr-movie-cinemas',
+                    icon     : 'icon-radarr-movie-cinemas',
                     callback : this._setFilter
                 }
             ]
@@ -228,7 +228,7 @@ module.exports = Marionette.Layout.extend({
 
     _showTable : function() {
         if (this.movieCollection.length === 0) {
-            this.seriesRegion.show(new EmptyView());
+            this.moviesRegion.show(new EmptyView());
             this.toolbar.close();
             return;
         }
@@ -240,7 +240,7 @@ module.exports = Marionette.Layout.extend({
             className  : 'table table-hover'
         });
 
-        this.seriesRegion.show(this.editorGrid);
+        this.moviesRegion.show(this.editorGrid);
        	this._showFooter();
 
     },

src/UI/Movies/Editor/MovieEditorLayoutTemplate.hbs

@@ -5,7 +5,7 @@
 
 <div class="row">
     <div class="col-md-12">
-        <div id="x-series-editor" class="table-responsive"></div>
+        <div id="x-movie-editor" class="table-responsive"></div>
     </div>
 </div>
 

src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs

@@ -3,10 +3,10 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Organize Selected Movies</h3>
     </div>
-    <div class="modal-body update-files-series-modal">
+    <div class="modal-body update-files-movie-modal">
         <div class="alert alert-info">
             <button type="button" class="close" data-dismiss="alert">&times;</button>
-            Tip: To preview a rename... select "Cancel" then any movie title and use the <i data-original-title="" class="icon-sonarr-rename" title=""></i>
+            Tip: To preview a rename... select "Cancel" then any movie title and use the <i data-original-title="" class="icon-radarr-rename" title=""></i>
         </div>
 
         Are you sure you want to update all files in the {{numberOfMovies}} selected movies?

src/UI/Movies/Files/Media/DeleteFileCell.js

@@ -10,7 +10,7 @@ module.exports = Backgrid.Cell.extend({
 
     render : function() {
         this.$el.empty();
-        this.$el.html('<i class="icon-sonarr-delete" title="Delete movie file from disk"></i>');
+        this.$el.html('<i class="icon-radarr-delete" title="Delete movie file from disk"></i>');
 
         return this;
     },

src/UI/Movies/Files/Media/Edit/EditFileTemplate.hbs

@@ -3,7 +3,7 @@
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 				<h3>{{relativePath}}</h3>
 		</div>
-		<div class="modal-body edit-series-modal">
+		<div class="modal-body edit-movie-modal">
 				<div class="row">
 						<div class="col-sm-12">
 								<div class="form-horizontal">
@@ -25,7 +25,7 @@
 		</div>
 		<div class="modal-footer">
 
-				<span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
+				<span class="indicator x-indicator"><i class="icon-radarr-spinner fa-spin"></i></span>
 				<button class="btn" data-dismiss="modal">Cancel</button>
 				<button class="btn btn-primary x-save">Save</button>
 		</div>

src/UI/Movies/Files/Media/EditFileCell.js

@@ -10,7 +10,7 @@ module.exports = Backgrid.Cell.extend({
 
 		render : function() {
 				this.$el.empty();
-				this.$el.html('<i class="icon-sonarr-edit" title="Edit information about this file."></i>');
+				this.$el.html('<i class="icon-radarr-edit" title="Edit information about this file."></i>');
 
 				return this;
 		},

src/UI/Movies/History/MovieHistoryActionsCell.js

@@ -14,7 +14,7 @@ module.exports = NzbDroneCell.extend({
         this.$el.empty();
 
         if (this.model.get('eventType') === 'grabbed') {
-            this.$el.html('<i class="icon-sonarr-delete x-failed" title="Mark download as failed"></i>');
+            this.$el.html('<i class="icon-radarr-delete x-failed" title="Mark download as failed"></i>');
         }
 
         return this;

src/UI/Movies/History/MovieHistoryDetailsCell.js

@@ -10,7 +10,7 @@ module.exports = NzbDroneCell.extend({
 
     render : function() {
         this.$el.empty();
-        this.$el.html('<i class="icon-sonarr-form-info"></i>');
+        this.$el.html('<i class="icon-radarr-form-info"></i>');
 
         var html = new HistoryDetailsView({ model : this.model }).render().$el;
 

src/UI/Movies/Index/EmptyTemplate.hbs

@@ -1,7 +1,7 @@
 <div class="no-movies">
     <div class="row">
         <div class="well col-md-12">
-            <i class="icon-sonarr-comment"/>
+            <i class="icon-radarr-comment"/>
             &nbsp;You must be new around here, before you start adding movies you may want to check out the following links on our <a href="https://github.com/Radarr/Radarr/wiki">wiki</a>:
             <ul>
                 <li><a href="https://github.com/Radarr/Radarr/wiki/Setup-Guide">Our setup guide</a></li>

src/UI/Movies/Index/FooterViewTemplate.hbs

@@ -10,7 +10,7 @@
     </div>
     <div class="col-xs-5 col-sm-7">
         <div class="row">
-            <div class="series-stats col-sm-4">
+            <div class="movies-stats col-sm-4">
                 <dl class="dl-horizontal">
                     <dt>Movies</dt>
                     <dd>{{movies}}</dd>
@@ -26,7 +26,7 @@
                 </dl>
             </div>
 
-            <div class="series-stats col-sm-4">
+            <div class="movies-stats col-sm-4">
                 <dl class="dl-horizontal">
   			<dt>Downloaded</dt>
 			<dd>{{downloaded}}</dd>

src/UI/Movies/Index/MoviesIndexItemView.js

@@ -4,12 +4,14 @@ var CommandController = require('../../Commands/CommandController');
 
 module.exports = Marionette.ItemView.extend({
     ui : {
-        refresh : '.x-refresh'
+        refresh : '.x-refresh',
+        search  : '.x-search'
     },
 
     events : {
-        'click .x-edit'    : '_editSeries',
+        'click .x-edit'    : '_editMovie',
-        'click .x-refresh' : '_refreshSeries'
+        'click .x-refresh' : '_refreshMovie',
+        'click .x-search'  : '_searchMovie'
     },
 
     onRender : function() {
@@ -17,19 +19,34 @@ module.exports = Marionette.ItemView.extend({
             element : this.ui.refresh,
             command : {
                 name     : 'refreshMovie',
-                seriesId : this.model.get('id')
+                movieId : this.model.get('id')
+            }
+        });
+
+        CommandController.bindToCommand({
+            element : this.ui.search,
+            command : {
+                name     : 'moviesSearch',
+                movieIds : [this.model.get('id')]
             }
         });
     },
 
-    _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]
+        });
     }
 });

src/UI/Movies/Index/MoviesIndexLayout.js

@@ -1,8 +1,8 @@
 var _ = require('underscore');
 var Marionette = require('marionette');
 var Backgrid = require('backgrid');
-var PosterCollectionView = require('./Posters/SeriesPostersCollectionView');
+var PosterCollectionView = require('./Posters/MoviePostersCollectionView');
-var ListCollectionView = require('./Overview/SeriesOverviewCollectionView');
+var ListCollectionView = require('./Overview/MovieOverviewCollectionView');
 var EmptyView = require('./EmptyView');
 var MoviesCollection = require('../MoviesCollection');
 
@@ -37,10 +37,10 @@ module.exports = Marionette.Layout.extend({
     template : 'Movies/Index/MoviesIndexLayoutTemplate',
 
     regions : {
-        seriesRegion : '#x-series',
+        moviesRegion : '#x-movies',
         toolbar      : '#x-toolbar',
         toolbar2     : '#x-toolbar2',
-        footer       : '#x-series-footer',
+        footer       : '#x-movies-footer',
         pager : "#x-movie-pager",
         pagerTop : "#x-movie-pager-top"
     },
@@ -112,29 +112,29 @@ module.exports = Marionette.Layout.extend({
         items      : [
             {
                 title : 'Add Movie',
-                icon  : 'icon-sonarr-add',
+                icon  : 'icon-radarr-add',
                 route : 'addmovies'
             },
             {
                 title : 'Movie Editor',
-                icon  : 'icon-sonarr-edit',
+                icon  : 'icon-radarr-edit',
                 route : 'movieeditor'
             },
             {
                 title        : 'RSS Sync',
-                icon         : 'icon-sonarr-rss',
+                icon         : 'icon-radarr-rss',
                 command      : 'rsssync',
                 errorMessage : 'RSS Sync Failed!'
             },
             {
               title : "PreDB Sync",
-              icon : "icon-sonarr-refresh",
+              icon : "icon-radarr-refresh",
               command : "predbsync",
               errorMessage : "PreDB Sync Failed!"
             },
             {
                 title          : 'Update Library',
-                icon           : 'icon-sonarr-refresh',
+                icon           : 'icon-radarr-refresh',
                 command        : 'refreshmovie',
                 successMessage : 'Library was updated!',
                 errorMessage   : 'Library update failed!'
@@ -143,19 +143,19 @@ module.exports = Marionette.Layout.extend({
     },
 
     initialize : function() {
-    	//this variable prevents us from showing the list before seriesCollection has been fetched the first time
+    	//this variable prevents us from showing the list before moviesCollection has been fetched the first time
-        this.seriesCollection = MoviesCollection.clone();
+        this.moviesCollection = MoviesCollection.clone();
         //debugger;
-        this.seriesCollection.bindSignalR();
+        this.moviesCollection.bindSignalR();
 		var pageSize = parseInt(Config.getValue("pageSize")) || 10;
-		if (this.seriesCollection.state.pageSize !== pageSize) {
+		if (this.moviesCollection.state.pageSize !== pageSize) {
-        	this.seriesCollection.setPageSize(pageSize);
+        	this.moviesCollection.setPageSize(pageSize);
 		}
         //this.listenTo(MoviesCollection, 'sync', function() {
-		//	this.seriesCollection.fetch();
+		//	this.moviesCollection.fetch();
 		//});
 
- 		this.listenToOnce(this.seriesCollection, 'sync', function() {
+ 		this.listenToOnce(this.moviesCollection, 'sync', function() {
             this._showToolbar();
             //this._fetchCollection();
             if (window.shownOnce) {
@@ -171,14 +171,14 @@ module.exports = Marionette.Layout.extend({
 			this._showFooter();
 		});
 
-        /*this.listenTo(this.seriesCollection, 'sync', function(model, collection, options) {
+        /*this.listenTo(this.moviesCollection, 'sync', function(model, collection, options) {
             this._renderView();
 			//MoviesCollectionClient.fetch();
         });*/
-        this.listenTo(this.seriesCollection, "change", function(model) {
+        this.listenTo(this.moviesCollection, "change", function(model) {
 			if (model.get('saved'))	{
 				model.set('saved', false);
-				this.seriesCollection.fetch();
+				this.moviesCollection.fetch();
 				//FullMovieCollection.fetch({reset : true });
 				//this._showFooter();
 				var m = FullMovieCollection.findWhere( { tmdbId : model.get('tmdbId') });
@@ -191,22 +191,22 @@ module.exports = Marionette.Layout.extend({
 		});
 
 
-        this.listenTo(this.seriesCollection, 'remove', function(model, collection, options) {
+        this.listenTo(this.moviesCollection, 'remove', function(model, collection, options) {
 			if (model.get('deleted')) {
-				this.seriesCollection.fetch(); //need to do this so that the page shows a full page and the 'total records' number is updated
+				this.moviesCollection.fetch(); //need to do this so that the page shows a full page and the 'total records' number is updated
 				//FullMovieCollection.fetch({reset : true}); //need to do this to update the footer
 				FullMovieCollection.remove(model);
 				this._showFooter();
 			}
 
         });
-		//this.seriesCollection.setPageSize(pageSize);
+		//this.moviesCollection.setPageSize(pageSize);
 
 
         this.sortingOptions = {
             type           : 'sorting',
             storeState     : false,
-            viewCollection : this.seriesCollection,
+            viewCollection : this.moviesCollection,
             callback : this._sort,
             items          : [
                 {
@@ -235,56 +235,56 @@ module.exports = Marionette.Layout.extend({
         this.filteringOptions = {
             type          : 'radio',
             storeState    : true,
-            menuKey       : 'series.filterMode',
+            menuKey       : 'movie.filterMode',
             defaultAction : 'all',
             items         : [
                 {
                     key      : 'all',
                     title    : '',
                     tooltip  : 'All',
-                    icon     : 'icon-sonarr-all',
+                    icon     : 'icon-radarr-all',
                     callback : this._setFilter
                 },
                 {
                     key      : 'monitored',
                     title    : '',
                     tooltip  : 'Monitored Only',
-                    icon     : 'icon-sonarr-monitored',
+                    icon     : 'icon-radarr-monitored',
                     callback : this._setFilter
                 },
                 {
                     key      : 'unmonitored',
                     title    : '',
                     tooltip  : 'UnMonitored Only',
-                    icon     : 'icon-sonarr-unmonitored',
+                    icon     : 'icon-radarr-unmonitored',
                     callback : this._setFilter
                 },
                 {
                     key      : 'missing',
                     title    : '',
                     tooltip  : 'Missing Only',
-                    icon     : 'icon-sonarr-missing',
+                    icon     : 'icon-radarr-missing',
                     callback : this._setFilter
                 },
                 {
                     key      : 'released',
                     title    : '',
                     tooltip  : 'Released',
-                    icon     : 'icon-sonarr-movie-released',
+                    icon     : 'icon-radarr-movie-released',
                     callback : this._setFilter
                 },
                 {
                     key      : 'announced',
                     title    : '',
                     tooltip  : 'Announced',
-                    icon     : 'icon-sonarr-movie-announced',
+                    icon     : 'icon-radarr-movie-announced',
                     callback : this._setFilter
                 },
                 {
                     key      : 'cinemas',
                     title    : '',
                     tooltip  : 'In Cinemas',
-                    icon     : 'icon-sonarr-movie-cinemas',
+                    icon     : 'icon-radarr-movie-cinemas',
                     callback : this._setFilter
                 }
             ]
@@ -293,28 +293,28 @@ module.exports = Marionette.Layout.extend({
         this.viewButtons = {
             type          : 'radio',
             storeState    : true,
-            menuKey       : 'seriesViewMode',
+            menuKey       : 'moviesViewMode',
             defaultAction : 'listView',
             items         : [
                 {
                     key      : 'posterView',
                     title    : '',
                     tooltip  : 'Posters',
-                    icon     : 'icon-sonarr-view-poster',
+                    icon     : 'icon-radarr-view-poster',
                     callback : this._showPosters
                 },
                 {
                     key      : 'listView',
                     title    : '',
                     tooltip  : 'Overview List',
-                    icon     : 'icon-sonarr-view-list',
+                    icon     : 'icon-radarr-view-list',
                     callback : this._showList
                 },
                 {
                     key      : 'tableView',
                     title    : '',
                     tooltip  : 'Table',
-                    icon     : 'icon-sonarr-view-table',
+                    icon     : 'icon-radarr-view-table',
                     callback : this._showTable
                 }
             ]
@@ -328,7 +328,7 @@ module.exports = Marionette.Layout.extend({
     },
 
     onShow : function() {
-/*		this.listenToOnce(this.seriesCollection, 'sync', function() {
+/*		this.listenToOnce(this.moviesCollection, 'sync', function() {
         	this._showToolbar();
 			//this._fetchCollection();
 			if (window.shownOnce) {
@@ -341,7 +341,7 @@ module.exports = Marionette.Layout.extend({
 
     _showTable : function() {
         this.currentView = new Backgrid.Grid({
-            collection : this.seriesCollection,
+            collection : this.moviesCollection,
             columns    : this.columns,
             className  : 'table table-hover'
         });
@@ -353,7 +353,7 @@ module.exports = Marionette.Layout.extend({
     _showList : function() {
         //this.current = "list";
         this.currentView = new ListCollectionView({
-            collection : this.seriesCollection
+            collection : this.moviesCollection
         });
 
         this._renderView();
@@ -361,7 +361,7 @@ module.exports = Marionette.Layout.extend({
 
     _showPosters : function() {
         this.currentView = new PosterCollectionView({
-            collection : this.seriesCollection
+            collection : this.moviesCollection
         });
 
         this._renderView();
@@ -373,13 +373,13 @@ module.exports = Marionette.Layout.extend({
 
     _renderView : function() {
         if (MoviesCollection.length === 0) {
-            this.seriesRegion.show(new EmptyView());
+            this.moviesRegion.show(new EmptyView());
 
             this.toolbar.close();
             this.toolbar2.close();
         } else {
             this.renderedOnce = true;
-            this.seriesRegion.show(this.currentView);
+            this.moviesRegion.show(this.currentView);
 			this.listenTo(this.currentView.collection, 'sync', function(eventName){
 				this._showPager();
 			});
@@ -388,12 +388,12 @@ module.exports = Marionette.Layout.extend({
     },
 
 	_fetchCollection : function() {
-		this.seriesCollection.fetch();
+		this.moviesCollection.fetch();
 	},
 
     _setFilter : function(buttonContext) {
         var mode = buttonContext.model.get('key');
-        this.seriesCollection.setFilterMode(mode);
+        this.moviesCollection.setFilterMode(mode);
     },
 
     _showToolbar : function() {
@@ -424,11 +424,11 @@ module.exports = Marionette.Layout.extend({
     _showPager : function() {
       var pager = new GridPager({
           columns    : this.columns,
-          collection : this.seriesCollection,
+          collection : this.moviesCollection,
       });
       var pagerTop = new GridPager({
           columns    : this.columns,
-          collection : this.seriesCollection,
+          collection : this.moviesCollection,
       });
       this.pager.show(pager);
       this.pagerTop.show(pagerTop);
@@ -503,18 +503,18 @@ module.exports = Marionette.Layout.extend({
     	});
 
         footerModel.set({
-            movies      				: movies,
+            movies      				    : movies,
-            announced   				: announced,
+            announced   				    : announced,
-	    	incinemas   				: incinemas,
+	    	incinemas   				    : incinemas,
-	    	released     				: released,
+	    	released     				    : released,
-            monitored   				: monitored,
+            monitored   				    : monitored,
-            downloaded  				: downloaded,
+            downloaded  				    : downloaded,
-			downloadedMonitored			: downloadedMonitored,
+			downloadedMonitored			    : downloadedMonitored,
-	    	downloadedNotMonitored 		: downloadedNotMonitored,
+	    	downloadedNotMonitored 		    : downloadedNotMonitored,
-	    	missingMonitored 			: missingMonitored,
+	    	missingMonitored 			    : missingMonitored,
-            missingMonitoredAvailable   : missingMonitoredAvailable,
+            missingMonitoredAvailable       : missingMonitoredAvailable,
-	    	missingMonitoredNotAvailable 		: missingMonitoredNotAvailable,
+	    	missingMonitoredNotAvailable    : missingMonitoredNotAvailable,
-	    	missingNotMonitored 		: missingNotMonitored
+	    	missingNotMonitored 		    : missingNotMonitored
         });
 
         this.footer.show(new FooterView({ model : footerModel }));

src/UI/Movies/Index/MoviesIndexLayoutTemplate.hbs

@@ -8,11 +8,11 @@
 
 <div class="row">
     <div class="col-md-12">
-        <div id="x-series" class="table-responsive"></div>
+        <div id="x-movies" class="table-responsive"></div>
     </div>
 </div>
 
 <div id="x-movie-pager">
 </div>
 
-<div id="x-series-footer"></div>
+<div id="x-movies-footer"></div>

src/UI/Movies/Index/Overview/MovieOverviewCollectionView.js

@@ -0,0 +1,8 @@
+var Marionette = require('marionette');
+var ListItemView = require('./MovieOverviewItemView');
+
+module.exports = Marionette.CompositeView.extend({
+    itemView          : ListItemView,
+    itemViewContainer : '#x-movie-list',
+    template          : 'Movies/Index/Overview/MovieOverviewCollectionViewTemplate'
+});

src/UI/Movies/Index/Overview/MovieOverviewCollectionViewTemplate.hbs

@@ -0,0 +1 @@
+<div id="x-movie-list"/>

src/UI/Movies/Index/Overview/MovieOverviewItemView.js

@@ -0,0 +1,7 @@
+var vent = require('vent');
+var Marionette = require('marionette');
+var MoviesIndexItemView = require('../MoviesIndexItemView');
+
+module.exports = MoviesIndexItemView.extend({
+    template : 'Movies/Index/Overview/MovieOverviewItemViewTemplate'
+});

src/UI/Movies/Index/Overview/MovieOverviewItemViewTemplate.hbs

@@ -13,9 +13,10 @@
                     </a>
                 </div>
                 <div class="col-md-2 col-xs-2">
-                    <div class="pull-right series-overview-list-actions">
+                    <div class="pull-right movie-overview-list-actions">
-                        <i class="icon-sonarr-refresh x-refresh" title="Update movie info and scan disk"/>
+                        <i class="icon-radarr-refresh x-refresh" title="Update movie info and scan disk"/>
-                        <i class="icon-sonarr-edit x-edit" title="Edit Movie"/>
+                        <i class="icon-radarr-edit x-edit" title="Edit Movie"/>
+                        <i class="icon-radarr-search x-search" title="Search Movie"/>
                     </div>
                 </div>
             </div>

src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js

@@ -1,8 +0,0 @@
-var Marionette = require('marionette');
-var ListItemView = require('./SeriesOverviewItemView');
-
-module.exports = Marionette.CompositeView.extend({
-    itemView          : ListItemView,
-    itemViewContainer : '#x-series-list',
-    template          : 'Movies/Index/Overview/SeriesOverviewCollectionViewTemplate'
-});

src/UI/Movies/Index/Overview/SeriesOverviewCollectionViewTemplate.hbs

@@ -1 +0,0 @@
-<div id="x-series-list"/>

src/UI/Movies/Index/Overview/SeriesOverviewItemView.js

@@ -1,7 +0,0 @@
-var vent = require('vent');
-var Marionette = require('marionette');
-var SeriesIndexItemView = require('../MoviesIndexItemView');
-
-module.exports = SeriesIndexItemView.extend({
-    template : 'Movies/Index/Overview/SeriesOverviewItemViewTemplate'
-});

src/UI/Movies/Index/Posters/MoviePostersCollectionView.js

@@ -0,0 +1,8 @@
+var Marionette = require('marionette');
+var PosterItemView = require('./MoviePostersItemView');
+
+module.exports = Marionette.CompositeView.extend({
+    itemView          : PosterItemView,
+    itemViewContainer : '#x-movie-posters',
+    template          : 'Movies/Index/Posters/MoviePostersCollectionViewTemplate'
+});

src/UI/Movies/Index/Posters/MoviePostersCollectionViewTemplate.hbs

@@ -0,0 +1 @@
+<ul id="x-movie-posters" class="movie-posters"></ul>

src/UI/Movies/Index/Posters/MoviePostersItemView.js

@@ -1,8 +1,8 @@
-var SeriesIndexItemView = require('../MoviesIndexItemView');
+var MoviesIndexItemView = require('../MoviesIndexItemView');
 
-module.exports = SeriesIndexItemView.extend({
+module.exports = MoviesIndexItemView.extend({
     tagName  : 'li',
-    template : 'Movies/Index/Posters/SeriesPostersItemViewTemplate',
+    template : 'Movies/Index/Posters/MoviePostersItemViewTemplate',
 
     initialize : function() {
         this.events['mouseenter .x-movie-poster-container'] = 'posterHoverAction';

src/UI/Movies/Index/Posters/MoviePostersItemViewTemplate.hbs

@@ -2,8 +2,9 @@
     <div class="center">
         <div class="movie-poster-container x-movie-poster-container">
             <div class="movie-controls x-movie-controls">
-                <i class="icon-sonarr-refresh x-refresh" title="Refresh Movie"/>
+                <i class="icon-radarr-refresh x-refresh" title="Refresh Movie"/>
-                <i class="icon-sonarr-edit x-edit" title="Edit Movie"/>
+                <i class="icon-radarr-edit x-edit" title="Edit Movie"/>
+                <i class="icon-radarr-search x-search" title="Search Movie"/>
             </div>
             {{GetBannerStatus}}
             <a href="{{route}}">

src/UI/Movies/Index/Posters/SeriesPostersCollectionView.js

@@ -1,8 +0,0 @@
-var Marionette = require('marionette');
-var PosterItemView = require('./SeriesPostersItemView');
-
-module.exports = Marionette.CompositeView.extend({
-    itemView          : PosterItemView,
-    itemViewContainer : '#x-series-posters',
-    template          : 'Movies/Index/Posters/SeriesPostersCollectionViewTemplate'
-});

src/UI/Movies/Index/Posters/SeriesPostersCollectionViewTemplate.hbs

@@ -1 +0,0 @@
-<ul id="x-series-posters" class="series-posters"></ul>

src/UI/Movies/MoviesCollection.js

@@ -175,7 +175,7 @@ var Collection = PageableCollection.extend({
 
     sortMappings : {
         movie : {
-            sortKey : 'series.sortTitle'
+            sortKey : 'movie.sortTitle'
         },
         title : {
             sortKey : 'sortTitle'
@@ -270,7 +270,7 @@ Collection = AsFilteredCollection.call(Collection);
 Collection = AsSortedCollection.call(Collection);
 Collection = AsPersistedStateCollection.call(Collection);
 
-var filterMode = Config.getValue("series.filterMode", "all");
+var filterMode = Config.getValue("movie.filterMode", "all");
 var sortKey = Config.getValue("movie.sortKey", "sortTitle");
 var sortDir = Config.getValue("movie.sortDirection", -1);
 var sortD = "asc";

src/UI/Movies/MoviesController.js

@@ -10,19 +10,19 @@ module.exports = NzbDroneController.extend({
 		_originalInit : NzbDroneController.prototype.initialize,
 
 		initialize : function() {
-				this.route('', this.series);
+				this.route('', this.movies);
-				this.route('movies', this.series);
+				this.route('movies', this.movies);
-				this.route('movies/:query', this.seriesDetails);
+				this.route('movies/:query', this.movieDetails);
 
 				this._originalInit.apply(this, arguments);
 		},
 
-		series : function() {
+		movies : function() {
 				this.setTitle('Movies');
 				this.showMainRegion(new MoviesIndexLayout());
 		},
 
-		seriesDetails : function(query) {
+		movieDetails : function(query) {
 
 			if(FullMovieCollection.length > 0) {
 				this._renderMovieDetails(query);

src/UI/Movies/Search/ButtonsViewTemplate.hbs

@@ -1,4 +1,4 @@
 <div class="search-buttons">
-    <button class="btn btn-lg btn-block x-search-auto"><i class="icon-sonarr-search-automatic"/> Automatic Search</button>
+    <button class="btn btn-lg btn-block x-search-auto"><i class="icon-radarr-search-automatic"/> Automatic Search</button>
-    <button class="btn btn-lg btn-block btn-primary x-search-manual"><i class="icon-sonarr-search-manual"/> Manual Search</button>
+    <button class="btn btn-lg btn-block btn-primary x-search-manual"><i class="icon-radarr-search-manual"/> Manual Search</button>
 </div>

src/UI/Movies/Search/ManualLayout.js

@@ -67,7 +67,7 @@ module.exports = Marionette.Layout.extend({
         },
         {
             name      : 'rejections',
-            label     : '<i class="icon-sonarr-header-rejections" />',
+            label     : '<i class="icon-radarr-header-rejections" />',
             tooltip   : 'Rejections',
             cell      : ApprovalStatusCell,
             sortable  : true,
@@ -77,7 +77,7 @@ module.exports = Marionette.Layout.extend({
         },
         {
             name      : 'download',
-            label     : '<i class="icon-sonarr-download" />',
+            label     : '<i class="icon-radarr-download" />',
             tooltip   : 'Auto-Search Prioritization',
             cell      : DownloadReportCell,
             sortable  : true,

src/UI/Movies/Titles/TitleCell.js

@@ -1,6 +1,6 @@
 var TemplatedCell = require('../../Cells/TemplatedCell');
 
 module.exports = TemplatedCell.extend({
-    className : 'series-title-cell',
+    className : 'movie-title-cell',
     template  : 'Movies/Titles/TitleTemplate'
 });

src/UI/Movies/movies.less

@@ -3,7 +3,7 @@
 @import "../Shared/Styles/clickable.less";
 @import "../Content/prefixer";
 
-.series-poster {
+.movie-poster {
   min-width: 56px;
   max-width: 100%;
 }
@@ -31,7 +31,7 @@
 .edit-movie-modal, .delete-movie-modal {
   overflow : visible;
 
-  .series-poster {
+  .movie-poster {
     padding-left : 20px;
     width        : 168px;
   }
@@ -113,7 +113,7 @@
   }
 }
 
-.series-posters {
+.movie-posters {
   list-style-type: none;
 
   @media (max-width: @screen-xs-max) {
@@ -285,7 +285,7 @@
       display          : none;
     }
 
-    .series-poster {
+    .movie-poster {
       width       : 168px;
       height      : 247px;
       display     : block;
@@ -294,7 +294,7 @@
     }
 
     @media (max-width: @screen-xs-max) {
-      .series-poster {
+      .movie-poster {
         width       : 120px;
         height      : 176px;
       }
@@ -395,7 +395,7 @@
   }
 }
 
-.movie-stats {
+.movies-stats {
   font-size : 11px;
 }
 
@@ -451,8 +451,8 @@
 
 //Overview List
 .movie-overview-list-actions {
-  min-width: 56px;
+  min-width: 84px;
-  max-width: 56px;
+  max-width: 84px;
 
   i {
     .clickable();
@@ -478,7 +478,7 @@
   }
 }
 
-//Series Details
+//Movie Details
 
 .movie-not-monitored {
   .season-monitored, .episode-monitored {

src/UI/Navbar/NavbarLayout.js

@@ -13,7 +13,7 @@ module.exports = Marionette.Layout.extend({
     },
 
     ui : {
-        search   : '.x-series-search',
+        search   : '.x-movies-search',
         collapse : '.x-navbar-collapse'
     },
 

src/UI/Navbar/NavbarLayoutTemplate.hbs

@@ -4,7 +4,7 @@
         <div class="navbar-header">
             <button type="button" class="navbar-toggle navbar-inverse" data-toggle="collapse" data-target=".navbar-collapse">
 				<span class="sr-only">Toggle navigation</span>
-				<span class="icon-sonarr-navbar-collapsed fa-lg"></span>
+				<span class="icon-radarr-navbar-collapsed fa-lg"></span>
 			</button>
 			<a class="navbar-brand" href="{{UrlBase}}/">
 				<img src="{{UrlBase}}/Content/Images/logos/128.png" class="visible-md visible-lg">
@@ -18,50 +18,50 @@
         <div class="navbar-collapse collapse x-navbar-collapse">
             <ul class="nav navbar-nav">
 				<li>
-                    <a href="{{UrlBase}}/addmovies" class="x-series-nav">
+                    <a href="{{UrlBase}}/addmovies" class="x-addmovies-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-add" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-add" aria-hidden="true"></i>
                         Add Movies
                     </a>
                 </li>
 				<li>
-                    <a href="{{UrlBase}}/" class="x-series-nav">
+                    <a href="{{UrlBase}}/" class="x-movies-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-movies" aria-hidden="true"></i>
                         Movies
                     </a>
                 </li>
 				<li>
                     <a href="{{UrlBase}}/calendar" class="x-calendar-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-calendar" aria-hidden="true"></i>
                         Calendar
                     </a>
                 </li>
 				<li>
                     <a href="{{UrlBase}}/activity" class="x-activity-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-activity" aria-hidden="true"></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-sonarr-navbar-icon icon-sonarr-navbar-wanted" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-wanted" aria-hidden="true"></i>
                         Wanted
                     </a>
                 </li>
 				<li>
                     <a href="{{UrlBase}}/settings" class="x-settings-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-settings" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-settings" aria-hidden="true"></i>
                         Settings
                     </a>
                 </li>
 				<li>
                     <a href="{{UrlBase}}/system" class="x-system-nav">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-system" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-system" aria-hidden="true"></i>
                         System <span id="x-health" class="navbar-info"></span>
                     </a>
                 </li>
 				<li>
                     <a href="https://radarr.video/donate.html" target="_blank">
-                        <i class="icon-sonarr-navbar-icon icon-sonarr-navbar-donate" aria-hidden="true"></i>
+                        <i class="icon-radarr-navbar-icon icon-radarr-navbar-donate" aria-hidden="true"></i>
                         Donate
                     </a>
                 </li>
@@ -74,7 +74,7 @@
 				<span class="input-group-addon">
                     <i class="fa fa-search"></i>
                 </span>
-				<input type="text" class="col-md-6 form-control x-series-search" placeholder="Search the movies in your library">
+				<input type="text" class="col-md-6 form-control x-movies-search" placeholder="Search the movies in your library">
 			</div>
 		</div>
 	</div>

src/UI/Navbar/Search.js

@@ -6,13 +6,13 @@ var FullMovieCollection = require('../Movies/FullMovieCollection');
 require('typeahead');
 
 vent.on(vent.Hotkeys.NavbarSearch, function() {
-    $('.x-series-search').focus();
+    $('.x-movies-search').focus();
 });
 
 var substringMatcher = function() {
     return function findMatches (q, cb) {
-        var matches = _.select(FullMovieCollection.toJSON(), function(series) {
+        var matches = _.select(FullMovieCollection.toJSON(), function(movie) {
-            return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
+            return movie.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
         });
         cb(matches);    
     };
@@ -24,9 +24,9 @@ $.fn.bindSearch = function() {
         highlight : true,
         minLength : 1
     }, {
-        name       : 'series',
+        name       : 'movie',
-        displayKey : function(series) {
+        displayKey : function(movie) {
-           return series.title + ' (' + series.year + ')';
+           return movie.title + ' (' + movie.year + ')';
         },
         templates  : {
           empty : function(input) {
@@ -38,9 +38,9 @@ $.fn.bindSearch = function() {
         source     : substringMatcher()
     });
 
-    $(this).on('typeahead:selected typeahead:autocompleted', function(e, series) {
+    $(this).on('typeahead:selected typeahead:autocompleted', function(e, movie) {
         this.blur();
         $(this).val('');
-        Backbone.history.navigate('/movies/{0}'.format(series.titleSlug), { trigger : true });
+        Backbone.history.navigate('/movies/{0}'.format(movie.titleSlug), { trigger : true });
     });
 };

src/UI/Release/DownloadReportCell.js

@@ -21,7 +21,7 @@ module.exports = Backgrid.Cell.extend({
 
         var self = this;
 
-        this.$el.html('<i class="icon-sonarr-spinner fa-spin" title="Adding to download queue" />');
+        this.$el.html('<i class="icon-radarr-spinner fa-spin" title="Adding to download queue" />');
 
         //Using success callback instead of promise so it
         //gets called before the sync event is triggered
@@ -33,9 +33,9 @@ module.exports = Backgrid.Cell.extend({
 
         promise.fail(function (xhr) {
             if (xhr.responseJSON && xhr.responseJSON.message) {
-                self.$el.html('<i class="icon-sonarr-download-failed" title="{0}" />'.format(xhr.responseJSON.message));
+                self.$el.html('<i class="icon-radarr-download-failed" title="{0}" />'.format(xhr.responseJSON.message));
             } else {
-                self.$el.html('<i class="icon-sonarr-download-failed" title="Failed to add to download queue" />');
+                self.$el.html('<i class="icon-radarr-download-failed" title="Failed to add to download queue" />');
             }
         });
     },
@@ -44,9 +44,9 @@ module.exports = Backgrid.Cell.extend({
         this.$el.empty();
 
         if (this.model.get('queued')) {
-            this.$el.html('<i class="icon-sonarr-downloading" title="Added to downloaded queue" />');
+            this.$el.html('<i class="icon-radarr-downloading" title="Added to downloaded queue" />');
         } else if (this.model.downloadOk()) {
-            this.$el.html('<i class="icon-sonarr-download" title="Add to download queue" />');
+            this.$el.html('<i class="icon-radarr-download" title="Add to download queue" />');
         } else if (this.model.forceDownloadOk()){
             this.$el.html('<i class="icon-radarr-download-warning" title="Force add to download queue."/>');
             this.className = 'force-download-report-cell';